diff --git a/db_details.php b/db_details.php
index e54b655ac..b37a34e77 100644
--- a/db_details.php
+++ b/db_details.php
@@ -97,7 +97,7 @@ if (!empty($query_to_display)) {
 // loic1: displays import dump feature only if file upload available
 if ($is_upload) {
 ?>
-<tr><td colspan="2"><img src="images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr>
+<tr><td colspan="2"><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td></tr>
 <tr>
     <td colspan="2" class="tblHeaders">
     <?php
@@ -175,7 +175,7 @@ if (!empty($cfg['UploadDir'])) {
         @closedir($handle);
     }
     else {
-        $upload_dir_error = '<tr><td colspan="2"><img src="./images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr>' . "\n"
+        $upload_dir_error = '<tr><td colspan="2"><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png'  . '" width="1" height="1" border="0" alt="" /></td></tr>' . "\n"
                           . '<tr><th colspan="2" class="tblHeadError"><div class="errorhead">' . $strError . '</div></th></tr>' . "\n"
                           . '<tr><td colspan="2" class="tblError">' . $strWebServerUploadDirectoryError
                           . '</td></tr>' . "\n";
@@ -211,7 +211,7 @@ if ($is_upload || $is_upload_dir) {
 // Bookmark Support
 if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) {
     if (($bookmark_list = PMA_listBookmarks($db, $cfg['Bookmark'])) && count($bookmark_list) > 0) {
-        echo '    <tr><td colspan="2"><img src="./images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr>' . "\n";
+        echo '    <tr><td colspan="2"><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png'  . '" width="1" height="1" border="0" alt="" /></td></tr>' . "\n";
         echo '    <tr><td colspan="2" class="tblHeaders">&nbsp;<i>' . $strOr . '</i></td></tr>' . "\n";
         echo '    <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td colspan="2">' . "\n";
         echo '        <b>' . $strBookmarkQuery . ':</b>&nbsp;' . "\n";
diff --git a/db_details_links.php b/db_details_links.php
index f3d163255..285be433b 100644
--- a/db_details_links.php
+++ b/db_details_links.php
@@ -67,8 +67,8 @@ if ($cfg['LightTabs']) {
        . '    <tr>' . "\n"
        . '        <td class="nav" align="left" nowrap="nowrap" valign="bottom">'
        . '            <table border="0" cellpadding="0" cellspacing="0"><tr>'
-       . '                <td nowrap="nowrap"><img src="./images/spacer.gif" width="2" height="1" border="0" alt="" /></td>'
-       . '                <td class="navSpacer"><img src="./images/spacer.gif" width="1" height="1" border="0" alt="" /></td>';
+       . '                <td nowrap="nowrap"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="2" height="1" border="0" alt="" /></td>'
+       . '                <td class="navSpacer"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="1" height="1" border="0" alt="" /></td>';
 }
 
 echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_props.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="'.$strStructure.'" />' : '') . $strStructure, 'db_details_structure.php', $url_query);
@@ -84,7 +84,7 @@ if ($lnk5) {
 echo "\n";
 
 if (!$cfg['LightTabs']) {
-    echo '                <td nowrap="nowrap"><img src="./images/spacer.gif" width="2" height="1" border="0" alt="" /></td>'
+    echo '                <td nowrap="nowrap"><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png'  . '" width="2" height="1" border="0" alt="" /></td>'
        . '            </tr></table>' . "\n"
        . '        </td>' . "\n"
        . '    </tr>' . "\n"
diff --git a/db_details_structure.php b/db_details_structure.php
index 1ec5a2bff..93b3e3c03 100644
--- a/db_details_structure.php
+++ b/db_details_structure.php
@@ -307,7 +307,7 @@ else {
             </tr>
         </table>
     </td>
-    <td><img src="./images/spacer.gif" border="0" width="10" height="1" alt="" /></td>
+    <td><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" border="0" width="10" height="1" alt="" /></td>
     <td valign="top">
         <?php
             pma_TableHeader();
@@ -575,7 +575,7 @@ else {
                         <?php echo $strCheckOverhead; ?></a>
                     <?php } ?>
                     &nbsp;&nbsp;&nbsp;
-                    <img src="./images/spacer.gif" border="0" width="38" height="1" alt="" />
+                    <img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" border="0" width="38" height="1" alt="" />
                     <select name="submit_mult" dir="ltr" onchange="this.form.submit();">
     <?php
     echo "\n";
@@ -652,7 +652,7 @@ if ($num_tables > 0) {
       }
       echo $strDataDict . '</a>';
 ?></td></tr>
-<tr><td colspan="3"><img src="images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr></table>
+<tr><td colspan="3"><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td></tr></table>
     <?php
 } // end if
 ?>
@@ -694,7 +694,7 @@ echo '             ' . '&nbsp;<input type="submit" value="' . $strGo . '" />' .
 if ($cfgRelation['commwork']) {
 ?>
     <!-- Alter/Enter db-comment -->
-        <tr><td colspan="3"><img src="images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr>
+        <tr><td colspan="3"><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td></tr>
 
         <tr>
         <td colspan="3" class="tblHeaders"><?php
@@ -716,7 +716,7 @@ if ($cfgRelation['commwork']) {
 }
 ?>
     <!-- Rename database -->
-        <tr><td colspan="3"><img src="images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr>
+        <tr><td colspan="3"><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td></tr>
         <tr><td colspan="3" class="tblHeaders"><?php
           if ($cfg['PropertiesIconic']) {
               echo '<img src="' . $pmaThemeImage . 'b_edit.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
@@ -738,7 +738,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) {
     // MySQL supports setting default charsets / collations for databases since
     // version 4.1.1.
     echo '    <!-- Change database charset -->' . "\n"
-       . '    <tr><td colspan="3"><img src="images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr>' . "\n"
+       . '    <tr><td colspan="3"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="1" height="1" border="0" alt="" /></td></tr>' . "\n"
        . '    <tr><td colspan="3" class="tblHeaders">';
     if ($cfg['PropertiesIconic']) {
         echo '<img src="' . $pmaThemeImage . 's_asci.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
@@ -758,7 +758,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) {
 
 if ($num_tables > 0
     && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == FALSE) {
-    echo '<tr><td colspan="3"><img src="images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr>'
+    echo '<tr><td colspan="3"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" width="1" height="1" border="0" alt="" /></td></tr>'
         . '<tr><th colspan="3" class="tblHeadError"><div class="errorhead">' . $strError . '</div></th></tr>'
         . '<tr><td colspan="3" class="tblError">'
         . sprintf(wordwrap($strRelationNotWorking,65,'<br />'), '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">',  '</a>')
@@ -872,7 +872,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
                                                   <td width="20">&nbsp;</td><td colspan="3" align="right">
                 &nbsp;&nbsp;<input type="submit" value="<?php echo $strGo; ?>" /></td>
             </form></tr>
-            <tr><td colspan="3"><img src="images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr>
+            <tr><td colspan="3"><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td></tr>
         <?php
     }   // end if
 ?>