diff --git a/pmd_general.php b/pmd_general.php
index 7423d541ea..73c65439df 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -62,56 +62,56 @@ echo $script_tabs . $script_contr . $script_display_field;
         <a href="javascript:Show_left_menu(document.getElementById('key_Show_left_menu'));"
             onmousedown="return false;" class="M_butt first" target="_self">
             <img id='key_Show_left_menu' title="<?php echo __('Show/Hide left menu'); ?>"
-                alt="v" src="pmd/images/downarrow2_m.png" /></a>
+                alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2_m.png" /></a>
         <a href="javascript:Save2();" onmousedown="return false;"
             class="M_butt" target="_self"
-        ><img title="<?php echo __('Save position') ?>" src="pmd/images/save.png" alt=""
+        ><img title="<?php echo __('Save position') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/save.png" alt=""
         /></a><a href="javascript:Start_table_new();" onmousedown="return false;"
             class="M_butt" target="_self"
-        ><img title="<?php echo __('Create table')?>" src="pmd/images/table.png" alt=""
+        ><img title="<?php echo __('Create table')?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/table.png" alt=""
         /></a><a href="javascript:Start_relation();" onmousedown="return false;"
             class="M_butt" id="rel_button" target="_self"
-        ><img title="<?php echo __('Create relation') ?>" src="pmd/images/relation.png" alt=""
+        ><img title="<?php echo __('Create relation') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/relation.png" alt=""
         /></a><a href="javascript:Start_display_field();" onmousedown="return false;"
             class="M_butt" id="display_field_button" target="_self"
-        ><img title="<?php echo __('Choose column to display') ?>" src="pmd/images/display_field.png" alt=""
+        ><img title="<?php echo __('Choose column to display') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/display_field.png" alt=""
         /></a><a href="javascript:location.reload();" onmousedown="return false;"
             class="M_butt" target="_self"
-        ><img title="<?php echo __('Reload'); ?>" src="pmd/images/reload.png" alt=""
+        ><img title="<?php echo __('Reload'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/reload.png" alt=""
         /></a><a href="Documentation.html#faq6_31" target="documentation"
             class="M_butt" target="_self"
-        ><img title="<?php echo __('Help'); ?>" src="pmd/images/help.png" alt=""
-        /></a><img class="M_bord" src="pmd/images/bord.png" alt=""
+        ><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=""
         /><a href="javascript:Angular_direct();" onmousedown="return false;"
             class="M_butt" id="angular_direct_button" target="_self"
         ><img title="<?php echo __('Angular links') . ' / ' . __('Direct links'); ?>"
-                src="pmd/images/ang_direct.png" alt=""
+                src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/ang_direct.png" alt=""
         /></a><a href="javascript:Grid();" onmousedown="return false;"
             class="M_butt" id="grid_button" target="_self"
-        ><img title="<?php echo __('Snap to grid') ?>" src="pmd/images/grid.png" alt=""
-        /></a><img class="M_bord" src="pmd/images/bord.png" alt=""
+        ><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=""
         /><a href="javascript:Small_tab_all(document.getElementById('key_SB_all'));"
             onmousedown="return false;" class="M_butt" target="_self"
         ><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v"
-                src="pmd/images/downarrow1.png"
+                src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png"
         /></a><a href="javascript:Small_tab_invert();" onmousedown="return false;"
             class="M_butt" target="_self"
-        ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="pmd/images/bottom.png"
-        /></a><img class="M_bord" src="pmd/images/bord.png" alt=""
+        ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png"
+        /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt=""
         /><a href="javascript:PDF_save();" onmousedown="return false;"
             class="M_butt" target="_self"
-        ><img src="pmd/images/pdf.png" alt="key" width="20" height="20"
+        ><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>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="pmd/images/query_builder.png" alt="key" width="20" height="20" title="';
+            echo '<img src="'. $GLOBALS['pmaThemeImage'] . 'pmd/query_builder.png" alt="key" width="20" height="20" title="';
             echo __('Build Query');
             echo '"/></a>'; }?>
          <a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));"
             onmousedown="return false;" class="M_butt last" target="_self">
-            <img src="pmd/images/2rightarrow_m.png" id="key_Left_Right" alt=">"
+            <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2rightarrow_m.png" id="key_Left_Right" alt=">"
                 title="<?php echo __('Move Menu'); ?>" /></a>
 </div>
 
@@ -124,11 +124,11 @@ echo $script_tabs . $script_contr . $script_display_field;
     <a href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));"
         onmousedown="return false;" class="M_butt" target="_self">
     <img title="<?php echo __('Hide/Show all'); ?>" alt="v"
-        src="pmd/images/downarrow1.png" id='key_HS_all' /></a>
+        src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" id='key_HS_all' /></a>
     <a href="javascript:No_have_constr(document.getElementById('key_HS'));"
         onmousedown="return false;" class="M_butt" target="_self">
     <img title="<?php echo __('Hide/Show Tables with no relation'); ?>" alt="v"
-        src="pmd/images/downarrow2.png" id='key_HS' /></a>
+        src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2.png" id='key_HS' /></a>
 </div>
 
 <div id="id_scroll_tab" class="scroll_tab">
@@ -141,7 +141,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="pmd/images/exec.png" alt="" /></td>
+                src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec.png" alt="" /></td>
         <td width="1px">
             <input onclick="VisibleTab(this,'<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>')"
                 title="<?php echo __('Hide'); ?>"
@@ -217,7 +217,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
     <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="pmd/images/exec_small.png" alt="" /></td>
+        <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec_small.png" alt="" /></td>
     <td nowrap="nowrap" id="id_zag_<?php echo $t_n_url ?>" class="tab_zag"
         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 )?> )"
@@ -314,7 +314,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
        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="pmd/images/exec_small.png" title="options" alt="" /></td> ';
+       echo  '<img src="' . $GLOBALS['pmaThemeImage'] . 'pmd/exec_small.png" title="options" alt="" /></td> ';
     } ?>
 </tr>
         <?php
@@ -817,9 +817,9 @@ if ($_REQUEST['query']) {
 
 
 <!-- cache images -->
-<img src="pmd/images/2leftarrow_m.png" width="0" height="0" alt="" />
-<img src="pmd/images/rightarrow1.png" width="0" height="0" alt="" />
-<img src="pmd/images/rightarrow2.png" width="0" height="0" alt="" />
-<img src="pmd/images/uparrow2_m.png" width="0" height="0" alt="" />
+<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="" />
 </body>
 </html>