diff --git a/ChangeLog b/ChangeLog
index 73008ad777..94f3ebe0a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@ phpMyAdmin - ChangeLog
 - issue #14289 Fix multi-column sorting
 - issue #14278 Fix central columns in-line edit bug
 - issue #14066 Fix AUTO_INCREMENT error when only exporting table structure in database-level exports
+- issue #13893 Simulating queries produces unexpected results
+- issue #14309 Setup script icons missing
 
 4.8.0.1 (2018-04-19)
 - issue        [security] Multiple CSRF vulnerabilities, See PMASA-2018-02
diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php
index 62c5005f1f..c4f0b8f7e3 100644
--- a/libraries/classes/Config/FormDisplayTemplate.php
+++ b/libraries/classes/Config/FormDisplayTemplate.php
@@ -162,15 +162,21 @@ class FormDisplayTemplate
             // The first element contains the filename and the second
             // element is used for the "alt" and "title" attributes.
             $icon_init = array(
-                'edit'   => array('b_edit.png',   ''),
-                'help'   => array('b_help.png',   __('Documentation')),
-                'reload' => array('s_reload.png', ''),
-                'tblops' => array('b_tblops.png', '')
+                'edit'   => array('b_edit', ''),
+                'help'   => array('b_help', __('Documentation')),
+                'reload' => array('s_reload', ''),
+                'tblops' => array('b_tblops', '')
             );
             if ($is_setup_script) {
                 // When called from the setup script, we don't have access to the
                 // sprite-aware getImage() function because the PMA_theme class
                 // has not been loaded, so we generate the img tags manually.
+                $icon_init = array(
+                    'edit'   => array('b_edit.png', ''),
+                    'help'   => array('b_help.png', __('Documentation')),
+                    'reload' => array('s_reload.png', ''),
+                    'tblops' => array('b_tblops.png', '')
+                );
                 foreach ($icon_init as $k => $v) {
                     $title = '';
                     if (! empty($v[1])) {
@@ -179,7 +185,7 @@ class FormDisplayTemplate
                     $icons[$k] = sprintf(
                         '<img alt="%s" src="%s"%s />',
                         $v[1],
-                        "../themes/original/img/{$v[0]}",
+                        "../themes/pmahomme/img/{$v[0]}",
                         $title
                     );
                 }