diff --git a/Documentation.html b/Documentation.html
index 307a24a41c..42b906ef49 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -3298,9 +3298,9 @@ RewriteRule .* - [F]
     <a href="#cfg_ThemeDefault" class="configrule">$cfg['ThemeDefault']</a>.<br />
     <br />
     Under <a href="#cfg_ThemePath" class="configrule">$cfg['ThemePath']</a>, you
-    should not delete the directory &quot;original&quot; or its underlying
+    should not delete the directory &quot;pmahomme&quot; or its underlying
     structure, because this is the system theme used by phpMyAdmin.
-    &quot;original&quot; contains all images and styles, for backwards
+    &quot;pmahomme&quot; contains all images and styles, for backwards
     compatibility and for all themes that would not include images or css-files.
     <br /><br />
 
@@ -3313,7 +3313,7 @@ RewriteRule .* - [F]
 <ul><li>make a new subdirectory (for example &quot;your_theme_name&quot;) under
         <a href="#cfg_ThemePath" class="configrule">$cfg['ThemePath']</a>
         (by default <code>themes</code>)</li>
-    <li>copy the files and directories from &quot;original&quot; to
+    <li>copy the files and directories from &quot;pmahomme&quot; to
         &quot;your_theme_name&quot;</li>
     <li>edit the css-files in &quot;your_theme_name/css&quot;</li>
     <li>put your new images in &quot;your_theme_name/img&quot;</li>
@@ -3333,7 +3333,7 @@ RewriteRule .* - [F]
 
 <p> If you do not want to use your own symbols and buttons, remove the
     directory &quot;img&quot; in &quot;your_theme_name&quot;. phpMyAdmin will
-    use the default icons and buttons (from the system-theme &quot;original&quot;).
+    use the default icons and buttons (from the system-theme &quot;pmahomme&quot;).
 </p>
 
 <h4 id="faqmissingparameters">
@@ -4433,7 +4433,7 @@ chmod o+rwx tmp
     <a href="#faq6_31">6.31 How do I create a relation in designer?</a></h4>
 
     <p>To select relation, click:<br />
-    <img src="themes/original/img/pmd/help_relation.png" width="100" height="100" alt="[relation icon]" /><br />
+    <img src="themes/pmahomme/img/pmd/help_relation.png" width="100" height="100" alt="[relation icon]" /><br />
     The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.</p>
 
 <h4 id="faq6_32">
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index d0eccf7828..cdb91b5334 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -148,22 +148,30 @@ class PMA_Theme
      */
     public function checkImgPath()
     {
+        // try current theme first
         if (is_dir($this->getPath() . '/img/')) {
             $this->setImgPath($this->getPath() . '/img/');
             return true;
-        } elseif (is_dir($GLOBALS['cfg']['ThemePath'] . '/' . PMA_Theme_Manager::FALLBACK_THEME . '/img/')) {
-            $this->setImgPath($GLOBALS['cfg']['ThemePath'] . '/' . PMA_Theme_Manager::FALLBACK_THEME . '/img/');
-            return true;
-        } else {
-            trigger_error(
-                sprintf(
-                    __('No valid image path for theme %s found!'),
-                    $this->getName()
-                ),
-                E_USER_ERROR
-            );
-            return false;
         }
+
+        // try fallback theme
+        $fallback = $GLOBALS['cfg']['ThemePath'] . '/'
+            . PMA_Theme_Manager::FALLBACK_THEME
+            . '/img/';
+        if (is_dir($fallback)) {
+            $this->setImgPath($fallback);
+            return true;
+        }
+
+        // we failed
+        trigger_error(
+            sprintf(
+                __('No valid image path for theme %s found!'),
+                $this->getName()
+            ),
+            E_USER_ERROR
+        );
+        return false;
     }
 
     /**
@@ -301,14 +309,27 @@ class PMA_Theme
     }
 
     /**
-     * Returns the path to images for the theme
+     * Returns the path to image for the theme.
+     * If filename is given, it possibly fallbacks to fallback
+     * theme for it if image does not exist.
+     *
+     * @param string $file file name for image
      *
      * @access public
      * @return string image path for this theme
      */
-    public function getImgPath()
+    public function getImgPath($file = null)
     {
-        return $this->img_path;
+        if (is_null($file)) {
+            return $this->img_path;
+        } else {
+            if (is_readable($this->img_path . $file)) {
+                return $this->img_path . $file;
+            } else {
+                return $GLOBALS['cfg']['ThemePath'] . '/'
+                    . PMA_Theme_Manager::FALLBACK_THEME . '/img/' . $file;
+            }
+        }
     }
 
     /**
@@ -324,7 +345,7 @@ class PMA_Theme
      *
      * @see    PMA_SQP_buildCssData()
      */
-    public function SQP_buildCssRule($classname, $property, $value)
+    public function buildSQPCssRule($classname, $property, $value)
     {
         $str     = '.' . $classname . ' {';
         if ($value != '') {
@@ -347,17 +368,17 @@ class PMA_Theme
      *
      * @see    PMA_SQP_buildCssRule()
      */
-    public function SQP_buildCssData()
+    public function buildSQPCssData()
     {
         global $cfg;
 
         $css_string     = '';
         foreach ($cfg['SQP']['fmtColor'] AS $key => $col) {
-            $css_string .= $this->SQP_buildCssRule('syntax_' . $key, 'color', $col);
+            $css_string .= $this->buildSQPCssRule('syntax_' . $key, 'color', $col);
         }
 
         for ($i = 0; $i < 8; $i++) {
-            $css_string .= $this->SQP_buildCssRule(
+            $css_string .= $this->buildSQPCssRule(
                 'syntax_indent' . $i, 'margin-left',
                 ($i * $cfg['SQP']['fmtInd']) . $cfg['SQP']['fmtIndUnit']
             );
@@ -376,7 +397,7 @@ class PMA_Theme
     {
         $success = true;
 
-        echo $this->SQP_buildCssData();
+        echo $this->buildSQPCssData();
 
         if ($GLOBALS['text_dir'] === 'ltr') {
             $right = 'right';
@@ -388,7 +409,8 @@ class PMA_Theme
 
         foreach ($this->_cssFiles as $file) {
             $path = $this->getPath() . "/css/$file.css.php";
-            $fallback = "./themes/" . PMA_Theme_Manager::FALLBACK_THEME .  "/css/$file.css.php";
+            $fallback = "./themes/"
+                . PMA_Theme_Manager::FALLBACK_THEME .  "/css/$file.css.php";
 
             if (is_readable($path)) {
                 echo "\n/* FILE: $file.css.php */\n";
@@ -481,21 +503,33 @@ class PMA_Theme
     {
         $result = array();
         // Opera 9.5+, IE 9
-        $result[] = 'background-image: url(./themes/svg_gradient.php?from=' . $start_color . '&to=' . $end_color . ');';
+        $result[] = 'background-image: url(./themes/svg_gradient.php?from='
+            . $start_color . '&to=' . $end_color . ');';
         $result[] = 'background-size: 100% 100%;';
         // Safari 4-5, Chrome 1-9
-        $result[] = 'background: -webkit-gradient(linear, left top, left bottom, from(#' . $start_color . '), to(#' . $end_color . '));';
+        $result[] = 'background: '
+            . '-webkit-gradient(linear, left top, left bottom, from(#'
+            . $start_color . '), to(#' . $end_color . '));';
         // Safari 5.1, Chrome 10+
-        $result[] = 'background: -webkit-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');';
+        $result[] = 'background: -webkit-linear-gradient(top, #'
+            . $start_color . ', #' . $end_color . ');';
         // Firefox 3.6+
-        $result[] = 'background: -moz-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');';
+        $result[] = 'background: -moz-linear-gradient(top, #'
+            . $start_color . ', #' . $end_color . ');';
         // IE 10
-        $result[] = 'background: -ms-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');';
+        $result[] = 'background: -ms-linear-gradient(top, #'
+            . $start_color . ', #' . $end_color . ');';
         // Opera 11.10
-        $result[] = 'background: -o-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');';
+        $result[] = 'background: -o-linear-gradient(top, #'
+            . $start_color . ', #' . $end_color . ');';
         // IE 6-8
-        if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8) {
-            $result[] = 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#' . $start_color . '", endColorstr="#' . $end_color . '");';
+        if (PMA_USR_BROWSER_AGENT == 'IE'
+            && PMA_USR_BROWSER_VER >= 6
+            && PMA_USR_BROWSER_VER <= 8
+        ) {
+            $result[] = 'filter: '
+                . 'progid:DXImageTransform.Microsoft.gradient(startColorstr="#'
+                . $start_color . '", endColorstr="#' . $end_color . '");';
         }
         return implode("\n", $result);
     }
@@ -512,37 +546,48 @@ class PMA_Theme
         }
 
         $result[] = 'span.cm-keyword, span.cm-statement-verb {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-variable {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-comment {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['comment'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['comment'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-mysql-string {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['quote'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['quote'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-operator {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-mysql-word {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-builtin {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-variable-2 {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnType'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnType'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-variable-3 {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnAttrib'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnAttrib'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-separator {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-number {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer'] . ';';
         $result[] = '}';
 
         return implode("\n", $result);
diff --git a/libraries/config.default.php b/libraries/config.default.php
index ba0e9e1e35..5ec68f017d 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -518,9 +518,9 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true;
 $cfg['Servers'][$i]['tracking_add_drop_database'] = true;
 
 /**
- * Enables caching of TABLE STATUS outputs for specific databases on this server 
- * (in some cases TABLE STATUS can be very slow, so you may want to cache it). 
- * APC is used (if the PHP extension is available, if not, this setting is ignored 
+ * Enables caching of TABLE STATUS outputs for specific databases on this server
+ * (in some cases TABLE STATUS can be very slow, so you may want to cache it).
+ * APC is used (if the PHP extension is available, if not, this setting is ignored
  * silently). You have to provide StatusCacheLifetime.
  * Takes effect only if DisableIS is true.
  *
diff --git a/pmd_general.php b/pmd_general.php
index f9a8c45948..bdc52f376d 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -79,64 +79,64 @@ echo $script_tabs . $script_contr . $script_display_field;
     <a href="#"
         onclick="Show_left_menu(document.getElementById('key_Show_left_menu')); return false" class="M_butt first" target="_self">
         <img id='key_Show_left_menu' title="<?php echo __('Show/Hide left menu'); ?>"
-            alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2_m.png" /></a>
+            alt="v" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2_m.png'); ?>" /></a>
     <a href="#" onclick="Save2(); return false"
         class="M_butt" target="_self"
     ><img title="<?php echo __('Save position') ?>"
-        src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/save.png" alt=""
+        src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/save.png'); ?>" alt=""
     /></a><a href="#" onclick="Start_table_new(); return false"
         class="M_butt" target="_self"
-    ><img title="<?php echo __('Create table')?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/table.png" alt=""
+    ><img title="<?php echo __('Create table')?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/table.png'); ?>" alt=""
     /></a><a href="#" onclick="Start_relation(); return false"
         class="M_butt" id="rel_button" target="_self"
-    ><img title="<?php echo __('Create relation') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/relation.png" alt=""
+    ><img title="<?php echo __('Create relation') ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/relation.png'); ?>" alt=""
     /></a><a href="#" onclick="Start_display_field(); return false"
         class="M_butt" id="display_field_button" target="_self"
-    ><img title="<?php echo __('Choose column to display') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/display_field.png" alt=""
+    ><img title="<?php echo __('Choose column to display') ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/display_field.png'); ?>" alt=""
     /></a><a href="#" onclick="location.reload(); return false"
         class="M_butt" target="_self"
-    ><img title="<?php echo __('Reload'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/reload.png" alt=""
+    ><img title="<?php echo __('Reload'); ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/reload.png'); ?>" alt=""
     /></a><a href="Documentation.html#faq6_31" target="documentation"
         class="M_butt" target="_self"
-    ><img title="<?php echo __('Help'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/help.png" alt=""
-    /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt=""
+    ><img title="<?php echo __('Help'); ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/help.png'); ?>" alt=""
+    /></a><img class="M_bord" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png'); ?>" alt=""
     /><a href="#" onclick="Angular_direct(); return false"
         class="M_butt" id="angular_direct_button" target="_self"
     ><img title="<?php echo __('Angular links') . ' / ' . __('Direct links'); ?>"
-            src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/ang_direct.png" alt=""
+            src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/ang_direct.png'); ?>" alt=""
     /></a><a href="#" onclick="Grid(); return false"
         class="M_butt" id="grid_button" target="_self"
-    ><img title="<?php echo __('Snap to grid') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/grid.png" alt=""
-    /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt=""
+    ><img title="<?php echo __('Snap to grid') ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/grid.png'); ?>" alt=""
+    /></a><img class="M_bord" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png'); ?>" alt=""
     /><a href="#"
         onclick="Small_tab_all(document.getElementById('key_SB_all')); return false" class="M_butt" target="_self"
     ><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v"
-            src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png"
+            src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>"
     /></a>
     <a href="#" onclick="Small_tab_invert(); return false" class="M_butt" target="_self" >
-    <img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" />
+    <img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/bottom.png'); ?>" />
     </a>
     <a href="#" onclick="Relation_lines_invert(); return false" class="M_butt" target="_self" >
-    <img title="<?php echo __('Toggle relation lines'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/toggle_lines.png" />
+    <img title="<?php echo __('Toggle relation lines'); ?>" alt="key" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/toggle_lines.png'); ?>" />
     </a>
-    <img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" />
+    <img class="M_bord" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png'); ?>" alt="" />
     <a href="#" onclick="PDF_save(); return false"
         class="M_butt" target="_self"
-    ><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/pdf.png" alt="key" width="20" height="20"
+    ><img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/pdf.png'); ?>" alt="key" width="20" height="20"
             title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a
      >
 <?php
 if (isset($_REQUEST['query'])) {
     echo '<a href="#" onclick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;"
     class="M_butt" target="_self">';
-    echo '<img src="'. $GLOBALS['pmaThemeImage'] . 'pmd/query_builder.png" alt="key" width="20" height="20" title="';
+    echo '<img src="'. $_SESSION['PMA_Theme']->getImgPath('pmd/query_builder.png') . '" alt="key" width="20" height="20" title="';
     echo __('Build Query');
     echo '"/></a>';
 }
 ?>
     <a href="#"
         onclick="Top_menu_right(document.getElementById('key_Left_Right')); return false" class="M_butt last" target="_self">
-        <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2rightarrow_m.png" id="key_Left_Right" alt=">"
+        <img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/2rightarrow_m.png'); ?>" id="key_Left_Right" alt=">"
             title="<?php echo __('Move Menu'); ?>" /></a>
 </div>
 
@@ -149,11 +149,11 @@ if (isset($_REQUEST['query'])) {
     <a href="#"
         onclick="Hide_tab_all(document.getElementById('key_HS_all')); return false" class="M_butt" target="_self">
     <img title="<?php echo __('Hide/Show all'); ?>" alt="v"
-        src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" id='key_HS_all' /></a>
+        src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>" id='key_HS_all' /></a>
     <a href="#"
         onclick="No_have_constr(document.getElementById('key_HS')); return false" class="M_butt" target="_self">
     <img title="<?php echo __('Hide/Show Tables with no relation'); ?>" alt="v"
-        src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2.png" id='key_HS' /></a>
+        src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>" id='key_HS' /></a>
 </div>
 
 <div id="id_scroll_tab" class="scroll_tab">
@@ -166,7 +166,7 @@ for ($i = 0; $i < $name_cnt; $i++) {
             onmouseover="this.className='L_butt2_2'"
             onmouseout="this.className='L_butt2_1'">
             <img onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');"
-                src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec.png" alt="" /></td>
+                src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/exec.png'); ?>" alt="" /></td>
         <td width="1px">
             <input onclick="VisibleTab(this,'<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>')"
                 title="<?php echo __('Hide'); ?>"
@@ -247,7 +247,7 @@ if (! isset($tab_pos[$t_n]) || ! empty($tab_pos[$t_n]["V"])) {
     <td class="small_tab_pref" onmouseover="this.className='small_tab_pref2';"
         onmouseout="this.className='small_tab_pref';"
         onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');">
-        <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec_small.png" alt="" /></td>
+        <img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>" alt="" /></td>
     <td id="id_zag_<?php echo $t_n_url ?>" class="tab_zag nowrap"
         onmousedown="cur_click=document.getElementById('<?php echo $t_n_url ?>');"/
         onmouseover="Table_onover('<?php echo $t_n_url ?>',0,<?php echo (isset($_REQUEST['query'])? 1 : 0 )?> )"
@@ -349,7 +349,7 @@ for ($j = 0, $id_cnt = count($tab_column[$t_n]["COLUMN_ID"]); $j < $id_cnt; $j++
        echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"';
        echo 'onmouseout="this.className=\'small_tab_pref\';"';
        echo 'onclick="Click_option(\'pmd_optionse\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >';
-       echo  '<img src="' . $GLOBALS['pmaThemeImage'] . 'pmd/exec_small.png" title="options" alt="" /></td> ';
+       echo  '<img src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png') . '" title="options" alt="" /></td> ';
     }
     ?>
 </tr>
@@ -852,10 +852,10 @@ if (! empty($_REQUEST['query'])) {
 
 
 <!-- cache images -->
-<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2leftarrow_m.png" width="0" height="0" alt="" />
-<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow1.png" width="0" height="0" alt="" />
-<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow2.png" width="0" height="0" alt="" />
-<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/uparrow2_m.png" width="0" height="0" alt="" />
+<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/2leftarrow_m.png'); ?>" width="0" height="0" alt="" />
+<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow1.png'); ?>" width="0" height="0" alt="" />
+<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow2.png'); ?>" width="0" height="0" alt="" />
+<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/uparrow2_m.png'); ?>" width="0" height="0" alt="" />
 <div id="PMA_disable_floating_menubar"></div>
 </body>
 </html>
diff --git a/themes/original/img/pmd/1.png b/themes/original/img/pmd/1.png
deleted file mode 100644
index 48b9d3f953..0000000000
Binary files a/themes/original/img/pmd/1.png and /dev/null differ
diff --git a/themes/original/img/pmd/2.png b/themes/original/img/pmd/2.png
deleted file mode 100644
index 7545d86fef..0000000000
Binary files a/themes/original/img/pmd/2.png and /dev/null differ
diff --git a/themes/original/img/pmd/2leftarrow.png b/themes/original/img/pmd/2leftarrow.png
deleted file mode 100644
index c3565bcd5a..0000000000
Binary files a/themes/original/img/pmd/2leftarrow.png and /dev/null differ
diff --git a/themes/original/img/pmd/2leftarrow_m.png b/themes/original/img/pmd/2leftarrow_m.png
deleted file mode 100644
index 6ec8d81cb7..0000000000
Binary files a/themes/original/img/pmd/2leftarrow_m.png and /dev/null differ
diff --git a/themes/original/img/pmd/2rightarrow.png b/themes/original/img/pmd/2rightarrow.png
deleted file mode 100644
index 0a4e236de2..0000000000
Binary files a/themes/original/img/pmd/2rightarrow.png and /dev/null differ
diff --git a/themes/original/img/pmd/2rightarrow_m.png b/themes/original/img/pmd/2rightarrow_m.png
deleted file mode 100644
index e5ff1f0b4d..0000000000
Binary files a/themes/original/img/pmd/2rightarrow_m.png and /dev/null differ
diff --git a/themes/original/img/pmd/3.png b/themes/original/img/pmd/3.png
deleted file mode 100644
index 46179111a3..0000000000
Binary files a/themes/original/img/pmd/3.png and /dev/null differ
diff --git a/themes/original/img/pmd/4.png b/themes/original/img/pmd/4.png
deleted file mode 100644
index 9b5345944d..0000000000
Binary files a/themes/original/img/pmd/4.png and /dev/null differ
diff --git a/themes/original/img/pmd/5.png b/themes/original/img/pmd/5.png
deleted file mode 100644
index 51f536dcb5..0000000000
Binary files a/themes/original/img/pmd/5.png and /dev/null differ
diff --git a/themes/original/img/pmd/6.png b/themes/original/img/pmd/6.png
deleted file mode 100644
index ed93cfee52..0000000000
Binary files a/themes/original/img/pmd/6.png and /dev/null differ
diff --git a/themes/original/img/pmd/7.png b/themes/original/img/pmd/7.png
deleted file mode 100644
index 7c7530f14a..0000000000
Binary files a/themes/original/img/pmd/7.png and /dev/null differ
diff --git a/themes/original/img/pmd/8.png b/themes/original/img/pmd/8.png
deleted file mode 100644
index 451998d1e9..0000000000
Binary files a/themes/original/img/pmd/8.png and /dev/null differ
diff --git a/themes/original/img/pmd/FieldKey_small.png b/themes/original/img/pmd/FieldKey_small.png
deleted file mode 100644
index 8a55b161cf..0000000000
Binary files a/themes/original/img/pmd/FieldKey_small.png and /dev/null differ
diff --git a/themes/original/img/pmd/Field_small.png b/themes/original/img/pmd/Field_small.png
deleted file mode 100644
index 4d80059a38..0000000000
Binary files a/themes/original/img/pmd/Field_small.png and /dev/null differ
diff --git a/themes/original/img/pmd/Field_small_char.png b/themes/original/img/pmd/Field_small_char.png
deleted file mode 100644
index dcaa1c61d2..0000000000
Binary files a/themes/original/img/pmd/Field_small_char.png and /dev/null differ
diff --git a/themes/original/img/pmd/Field_small_date.png b/themes/original/img/pmd/Field_small_date.png
deleted file mode 100644
index 259a8d98a5..0000000000
Binary files a/themes/original/img/pmd/Field_small_date.png and /dev/null differ
diff --git a/themes/original/img/pmd/Field_small_int.png b/themes/original/img/pmd/Field_small_int.png
deleted file mode 100644
index 70f3f38d1e..0000000000
Binary files a/themes/original/img/pmd/Field_small_int.png and /dev/null differ
diff --git a/themes/original/img/pmd/Header.png b/themes/original/img/pmd/Header.png
deleted file mode 100644
index 3e3e4e9187..0000000000
Binary files a/themes/original/img/pmd/Header.png and /dev/null differ
diff --git a/themes/original/img/pmd/Header_Linked.png b/themes/original/img/pmd/Header_Linked.png
deleted file mode 100644
index cb0a4b374b..0000000000
Binary files a/themes/original/img/pmd/Header_Linked.png and /dev/null differ
diff --git a/themes/original/img/pmd/and_icon.png b/themes/original/img/pmd/and_icon.png
deleted file mode 100644
index 3767aba9b5..0000000000
Binary files a/themes/original/img/pmd/and_icon.png and /dev/null differ
diff --git a/themes/original/img/pmd/ang_direct.png b/themes/original/img/pmd/ang_direct.png
deleted file mode 100644
index 3bd28e8124..0000000000
Binary files a/themes/original/img/pmd/ang_direct.png and /dev/null differ
diff --git a/themes/original/img/pmd/bord.png b/themes/original/img/pmd/bord.png
deleted file mode 100644
index 351b9591b3..0000000000
Binary files a/themes/original/img/pmd/bord.png and /dev/null differ
diff --git a/themes/original/img/pmd/bottom.png b/themes/original/img/pmd/bottom.png
deleted file mode 100644
index 97abfc9346..0000000000
Binary files a/themes/original/img/pmd/bottom.png and /dev/null differ
diff --git a/themes/original/img/pmd/def.png b/themes/original/img/pmd/def.png
deleted file mode 100644
index 33d5593070..0000000000
Binary files a/themes/original/img/pmd/def.png and /dev/null differ
diff --git a/themes/original/img/pmd/display_field.png b/themes/original/img/pmd/display_field.png
deleted file mode 100644
index a7d7cb4eb6..0000000000
Binary files a/themes/original/img/pmd/display_field.png and /dev/null differ
diff --git a/themes/original/img/pmd/downarrow1.png b/themes/original/img/pmd/downarrow1.png
deleted file mode 100644
index 80632dd566..0000000000
Binary files a/themes/original/img/pmd/downarrow1.png and /dev/null differ
diff --git a/themes/original/img/pmd/downarrow2.png b/themes/original/img/pmd/downarrow2.png
deleted file mode 100644
index 2c925e9dcc..0000000000
Binary files a/themes/original/img/pmd/downarrow2.png and /dev/null differ
diff --git a/themes/original/img/pmd/downarrow2_m.png b/themes/original/img/pmd/downarrow2_m.png
deleted file mode 100644
index 461eeefb85..0000000000
Binary files a/themes/original/img/pmd/downarrow2_m.png and /dev/null differ
diff --git a/themes/original/img/pmd/exec.png b/themes/original/img/pmd/exec.png
deleted file mode 100644
index d5eaa767bb..0000000000
Binary files a/themes/original/img/pmd/exec.png and /dev/null differ
diff --git a/themes/original/img/pmd/exec_small.png b/themes/original/img/pmd/exec_small.png
deleted file mode 100644
index d5162ea19c..0000000000
Binary files a/themes/original/img/pmd/exec_small.png and /dev/null differ
diff --git a/themes/original/img/pmd/favicon.ico b/themes/original/img/pmd/favicon.ico
deleted file mode 100644
index 29c2595b1d..0000000000
Binary files a/themes/original/img/pmd/favicon.ico and /dev/null differ
diff --git a/themes/original/img/pmd/grid.png b/themes/original/img/pmd/grid.png
deleted file mode 100644
index 6aee6e5bf7..0000000000
Binary files a/themes/original/img/pmd/grid.png and /dev/null differ
diff --git a/themes/original/img/pmd/help.png b/themes/original/img/pmd/help.png
deleted file mode 100644
index fe200d8d3f..0000000000
Binary files a/themes/original/img/pmd/help.png and /dev/null differ
diff --git a/themes/original/img/pmd/help_relation.png b/themes/original/img/pmd/help_relation.png
deleted file mode 100644
index 8856604feb..0000000000
Binary files a/themes/original/img/pmd/help_relation.png and /dev/null differ
diff --git a/themes/original/img/pmd/left_panel_butt.png b/themes/original/img/pmd/left_panel_butt.png
deleted file mode 100644
index 98ead4e602..0000000000
Binary files a/themes/original/img/pmd/left_panel_butt.png and /dev/null differ
diff --git a/themes/original/img/pmd/left_panel_tab.png b/themes/original/img/pmd/left_panel_tab.png
deleted file mode 100644
index 733588e337..0000000000
Binary files a/themes/original/img/pmd/left_panel_tab.png and /dev/null differ
diff --git a/themes/original/img/pmd/minus.png b/themes/original/img/pmd/minus.png
deleted file mode 100644
index 664956f3ce..0000000000
Binary files a/themes/original/img/pmd/minus.png and /dev/null differ
diff --git a/themes/original/img/pmd/or_icon.png b/themes/original/img/pmd/or_icon.png
deleted file mode 100644
index 5a12061c48..0000000000
Binary files a/themes/original/img/pmd/or_icon.png and /dev/null differ
diff --git a/themes/original/img/pmd/pdf.png b/themes/original/img/pmd/pdf.png
deleted file mode 100644
index 8c110d30b9..0000000000
Binary files a/themes/original/img/pmd/pdf.png and /dev/null differ
diff --git a/themes/original/img/pmd/plus.png b/themes/original/img/pmd/plus.png
deleted file mode 100644
index 11ef002395..0000000000
Binary files a/themes/original/img/pmd/plus.png and /dev/null differ
diff --git a/themes/original/img/pmd/query_builder.png b/themes/original/img/pmd/query_builder.png
deleted file mode 100644
index 13262f92bb..0000000000
Binary files a/themes/original/img/pmd/query_builder.png and /dev/null differ
diff --git a/themes/original/img/pmd/relation.png b/themes/original/img/pmd/relation.png
deleted file mode 100644
index ecc49fac5a..0000000000
Binary files a/themes/original/img/pmd/relation.png and /dev/null differ
diff --git a/themes/original/img/pmd/reload.png b/themes/original/img/pmd/reload.png
deleted file mode 100644
index 63f0b6c92b..0000000000
Binary files a/themes/original/img/pmd/reload.png and /dev/null differ
diff --git a/themes/original/img/pmd/resize.png b/themes/original/img/pmd/resize.png
deleted file mode 100644
index 3c0492a3f4..0000000000
Binary files a/themes/original/img/pmd/resize.png and /dev/null differ
diff --git a/themes/original/img/pmd/rightarrow1.png b/themes/original/img/pmd/rightarrow1.png
deleted file mode 100644
index 6d4f63b094..0000000000
Binary files a/themes/original/img/pmd/rightarrow1.png and /dev/null differ
diff --git a/themes/original/img/pmd/rightarrow2.png b/themes/original/img/pmd/rightarrow2.png
deleted file mode 100644
index 5cecf9eeb3..0000000000
Binary files a/themes/original/img/pmd/rightarrow2.png and /dev/null differ
diff --git a/themes/original/img/pmd/save.png b/themes/original/img/pmd/save.png
deleted file mode 100644
index 3e65b6ab42..0000000000
Binary files a/themes/original/img/pmd/save.png and /dev/null differ
diff --git a/themes/original/img/pmd/small_tab.png b/themes/original/img/pmd/small_tab.png
deleted file mode 100644
index bfa1b5937c..0000000000
Binary files a/themes/original/img/pmd/small_tab.png and /dev/null differ
diff --git a/themes/original/img/pmd/table.png b/themes/original/img/pmd/table.png
deleted file mode 100644
index caf214d23f..0000000000
Binary files a/themes/original/img/pmd/table.png and /dev/null differ
diff --git a/themes/original/img/pmd/toggle_lines.png b/themes/original/img/pmd/toggle_lines.png
deleted file mode 100644
index 9ab3764a60..0000000000
Binary files a/themes/original/img/pmd/toggle_lines.png and /dev/null differ
diff --git a/themes/original/img/pmd/top_panel.png b/themes/original/img/pmd/top_panel.png
deleted file mode 100644
index 6d8302f977..0000000000
Binary files a/themes/original/img/pmd/top_panel.png and /dev/null differ
diff --git a/themes/original/img/pmd/uparrow2_m.png b/themes/original/img/pmd/uparrow2_m.png
deleted file mode 100644
index 2c3b9352e6..0000000000
Binary files a/themes/original/img/pmd/uparrow2_m.png and /dev/null differ
diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php
index df192ffe5e..30c4736359 100644
--- a/themes/pmahomme/css/pmd.css.php
+++ b/themes/pmahomme/css/pmd.css.php
@@ -44,7 +44,7 @@ canvas.pmd * {
 }
 
 .tab_zag {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     background-repeat: repeat-x;
     text-align: center;
     cursor: move;
@@ -53,7 +53,7 @@ canvas.pmd * {
 }
 
 .tab_zag_2 {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header_Linked.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header_Linked.png'); ?>);
     background-repeat: repeat-x;
     text-align: center;
     cursor: move;
@@ -108,7 +108,7 @@ canvas.pmd * {
     margin-left: 2px;
     text-align: left;
     background-color: #fff;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/left_panel_butt.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/left_panel_butt.png'); ?>);
     border: #ccc solid 1px;
 }
 
@@ -142,7 +142,7 @@ canvas.pmd * {
     cursor: default;
     width: 1px;
     color: #000;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     background-repeat: repeat-x;
 }
 
@@ -150,7 +150,7 @@ canvas.pmd * {
     vertical-align: top;
     background-color: #0064ea;
     color: #fff;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/small_tab.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/small_tab.png'); ?>);
     cursor: default;
     text-align: center;
     font-weight: bold;
@@ -174,7 +174,7 @@ canvas.pmd * {
 }
 
 .small_tab_pref {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     background-repeat: repeat-x;
     text-align: center;
     width: 1px;
@@ -226,35 +226,35 @@ canvas.pmd * {
 }
 
 .frams1 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/1.png) no-repeat right bottom;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/1.png'); ?>) no-repeat right bottom;
 }
 
 .frams2 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/2.png) no-repeat left bottom;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/2.png'); ?>) no-repeat left bottom;
 }
 
 .frams3 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/3.png) no-repeat left top;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/3.png'); ?>) no-repeat left top;
 }
 
 .frams4 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/4.png) no-repeat right top;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/4.png'); ?>) no-repeat right top;
 }
 
 .frams5 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/5.png) repeat-x center bottom;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/5.png'); ?>) repeat-x center bottom;
 }
 
 .frams6 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/6.png) repeat-y left;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/6.png'); ?>) repeat-y left;
 }
 
 .frams7 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/7.png) repeat-x top;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/7.png'); ?>) repeat-x top;
 }
 
 .frams8 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/8.png) repeat-y right;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/8.png'); ?>) repeat-y right;
 }
 
 #osn_tab {
@@ -270,7 +270,7 @@ canvas.pmd * {
     font-weight: bold;
     margin: 0;
     padding: 0;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/top_panel.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/top_panel.png'); ?>);
     background-position: top;
     background-repeat: repeat-x;
     border-right: #999 solid 1px;
@@ -349,7 +349,7 @@ a.M_butt:hover {
 }
 
 #layer_menu_sizer {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/resize.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/resize.png'); ?>);
     cursor: nw-resize;
     width: 16px;
     height: 16px;
@@ -375,7 +375,7 @@ a.trigger {
     top: 60px; right: 0;
     color: #fff;
     padding: 10px 40px 10px 15px;
-    background: #333 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
+    background: #333 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png'); ?>) 85% 55% no-repeat;
     border: 1px solid #444;
     display: block;
 }
@@ -386,18 +386,18 @@ a.trigger:hover {
     top: 60px; right: 0;
     color: #080808;
     padding: 10px 40px 10px 15px;
-    background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
+    background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png'); ?>) 85% 55% no-repeat;
     border: 1px solid #999;
     display: block;
 }
 
 a.active.trigger {
-    background: #222 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
+    background: #222 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png'); ?>) 85% 55% no-repeat;
     z-index: 999;
 }
 
 a.active.trigger:hover {
-    background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
+    background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png'); ?>) 85% 55% no-repeat;
     z-index: 999;
 }
 
@@ -414,7 +414,7 @@ h2.tiger {
 }
 
 h2.tiger a {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     text-align: center;
     text-decoration: none;
     color : #333;
@@ -423,11 +423,11 @@ h2.tiger a {
 
 h2.tiger a:hover {
     color: #000;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header_Linked.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header_Linked.png'); ?>);
 }
 
 h2.active {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     background-repeat: repeat-x;
     padding: 1px;
     background-position: left bottom;