diff --git a/js/functions.js b/js/functions.js
index 4df61c3c46..b02abdea92 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -4927,3 +4927,92 @@ AJAX.registerOnload('functions.js', function () {
         $(this).find('.soimg').toggle();
     });
 });
+
+/**
+ * Returns an HTML IMG tag for a particular image from a theme,
+ * which may be an actual file or an icon from a sprite
+ *
+ * @param string image      The name of the file to get
+ * @param string alternate  Used to set 'alt' and 'title' attributes of the image
+ * @param object attributes An associative array of other attributes
+ *
+ * @return Object The requested image, this object has two methods:
+ *                  .toString()        - Returns the IMG tag for the requested image
+ *                  .attr(name)        - Returns a particular attribute of the IMG
+ *                                       tag given it's name
+ *                  .attr(name, value) - Sets a particular attribute of the IMG
+ *                                       tag to the given value
+ */
+function PMA_getImage(image, alternate, attributes) {
+    var in_array = function (needle, haystack) {
+        for (var i in haystack) {
+            if (haystack[i] == needle) {
+                return true;
+            }
+        }
+        return false;
+    };
+    // custom image object, it will eventually be returned by this functions
+    var retval = {
+        data: {
+            // this is private
+            alt: '',
+            title: '',
+            src: '',
+        },
+        attr: function (name, value) {
+            if (value == undefined) {
+                if (this.data[name] == undefined) {
+                    return '';
+                } else {
+                    return this.data[name];
+                }
+            } else {
+                this.data[name] = value;
+            }
+        },
+        toString: function () {
+            var retval = '<' + 'img';
+            for (var i in this.data) {
+                retval += ' ' + i + '="' + this.data[i] + '"';
+            }
+            retval += ' /' + '>';
+            return retval;
+        }
+    };
+    // initialise missing parameters
+    if (attributes == undefined) {
+        attributes = {};
+    }
+    if (alternate == undefined) {
+        alternate = '';
+    }
+    // set alt
+    if (attributes.alt != undefined) {
+        retval.attr('alt', escapeHtml(attributes.alt));
+    } else {
+        retval.attr('alt', escapeHtml(alternate));
+    }
+    // set title
+    if (attributes.title != undefined) {
+        retval.attr('title', escapeHtml(attributes.title));
+    } else {
+        retval.attr('title', escapeHtml(alternate));
+    }
+    // it's an image file
+    retval.attr(
+        'src',
+        pmaThemeImage + image
+    );
+    // set all other attrubutes
+    for (var i in attributes) {
+        if (i == 'src') {
+            // do not allow to override the 'src' attribute
+            continue;
+        }
+
+        retval.attr(i, attributes[i]);
+    }
+
+    return retval;
+}
diff --git a/js/get_image.js.php b/js/get_image.js.php
deleted file mode 100644
index 31f8ba6668..0000000000
--- a/js/get_image.js.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Provides the functionality for retreiving images
- * which may be actual images or an icon from a sprite
- *
- * @package PhpMyAdmin
- */
-
-if (!defined('TESTSUITE')) {
-    chdir('..');
-
-    // Send correct type:
-    header('Content-Type: text/javascript; charset=UTF-8');
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
-
-    // Avoid loading the full common.inc.php because this would add many
-    // non-js-compatible stuff like DOCTYPE
-    define('PMA_MINIMUM_COMMON', true);
-    define('PMA_PATH_TO_BASEDIR', '../');
-    require_once './libraries/common.inc.php';
-}
-
-$buffer = PhpMyAdmin\OutputBuffering::getInstance();
-$buffer->start();
-if (!defined('TESTSUITE')) {
-    register_shutdown_function(
-        function () {
-            echo PhpMyAdmin\OutputBuffering::getInstance()->getContents();
-        }
-    );
-}
-
-// Get the data for the sprites, if it's available
-$sprites = $GLOBALS['PMA_Theme']->getSpriteData();
-
-// We only need the keys from the array of sprites data,
-// since they contain the (partial) class names
-$keys = array();
-foreach ($sprites as $key => $value) {
-    $keys[] = "'$key'";
-}
-
-?>
-/**
- * Returns an HTML IMG tag for a particular image from a theme,
- * which may be an actual file or an icon from a sprite
- *
- * @param string image      The name of the file to get
- * @param string alternate  Used to set 'alt' and 'title' attributes of the image
- * @param object attributes An associative array of other attributes
- *
- * @return Object The requested image, this object has two methods:
- *                  .toString()        - Returns the IMG tag for the requested image
- *                  .attr(name)        - Returns a particular attribute of the IMG
- *                                       tag given it's name
- *                  .attr(name, value) - Sets a particular attribute of the IMG
- *                                       tag to the given value
- *                And one property:
- *                  .isSprite          - Whether the image is a sprite or not
- */
-function PMA_getImage(image, alternate, attributes) {
-    var in_array = function (needle, haystack) {
-        for (var i in haystack) {
-            if (haystack[i] == needle) {
-                return true;
-            }
-        }
-        return false;
-    };
-    var sprites = [
-        <?php echo implode($keys, ",\n        ") , "\n"; ?>
-    ];
-    // custom image object, it will eventually be returned by this functions
-    var retval = {
-        data: {
-            // this is private
-            alt: '',
-            title: '',
-            src: 'themes/dot.gif'
-        },
-        isSprite: true,
-        attr: function (name, value) {
-            if (value == undefined) {
-                if (this.data[name] == undefined) {
-                    return '';
-                } else {
-                    return this.data[name];
-                }
-            } else {
-                this.data[name] = value;
-            }
-        },
-        toString: function () {
-            var retval = '<' + 'img';
-            for (var i in this.data) {
-                retval += ' ' + i + '="' + this.data[i] + '"';
-            }
-            retval += ' /' + '>';
-            return retval;
-        }
-    };
-    // initialise missing parameters
-    if (attributes == undefined) {
-        attributes = {};
-    }
-    if (alternate == undefined) {
-        alternate = '';
-    }
-    // set alt
-    if (attributes.alt != undefined) {
-        retval.attr('alt', escapeHtml(attributes.alt));
-    } else {
-        retval.attr('alt', escapeHtml(alternate));
-    }
-    // set title
-    if (attributes.title != undefined) {
-        retval.attr('title', escapeHtml(attributes.title));
-    } else {
-        retval.attr('title', escapeHtml(alternate));
-    }
-    // set src
-    var klass = image.replace('.gif', '').replace('.png', '');
-    if (in_array(klass, sprites)) {
-        // it's an icon from a sprite
-        retval.attr('class', 'icon ic_' + klass);
-    } else {
-        // it's an image file
-        retval.isSprite = false;
-        retval.attr(
-            'src',
-            "<?php echo $GLOBALS['PMA_Theme']->getImgPath(); ?>" + image
-        );
-    }
-    // set all other attrubutes
-    for (var i in attributes) {
-        if (i == 'src') {
-            // do not allow to override the 'src' attribute
-            continue;
-        }
-
-        if (i == 'class') {
-            retval.attr(i, retval.attr('class') + ' ' + attributes[i]);
-        } else {
-            retval.attr(i, attributes[i]);
-        }
-    }
-
-    return retval;
-}
-//
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index 2c3f418a1b..94e6d8c35f 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -193,7 +193,6 @@ class Header
         } else {
             $theme_id = 'default';
         }
-        $this->_scripts->addFile('get_image.js.php', false, array('theme' => $theme_id));
         $this->_scripts->addFile('config.js');
         $this->_scripts->addFile('doclinks.js');
         $this->_scripts->addFile('functions.js');
diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php
index d87a981b4f..30f5ddb83d 100644
--- a/libraries/classes/Scripts.php
+++ b/libraries/classes/Scripts.php
@@ -154,7 +154,6 @@ class Scripts
             || strpos($filename, 'codemirror') !== false
             || strpos($filename, 'messages.php') !== false
             || strpos($filename, 'ajax.js') !== false
-            || strpos($filename, 'get_image.js.php') !== false
             || strpos($filename, 'cross_framing_protection.js') !== false
         ) {
             return 0;
diff --git a/libraries/classes/Theme.php b/libraries/classes/Theme.php
index 86d44bc299..965d507114 100644
--- a/libraries/classes/Theme.php
+++ b/libraries/classes/Theme.php
@@ -81,11 +81,6 @@ class Theme
         'resizable-menu'
     );
 
-    /**
-     * Sprite data
-     */
-    private $sprites;
-
     /**
      * Loads theme information
      *
@@ -391,78 +386,9 @@ class Theme
                 $success = false;
             }
         }
-
-        $sprites = $this->getSpriteData();
-        /* Check if there is a valid data file for sprites */
-        if (count($sprites) > 0) {
-
-            $bg = $this->getImgPath() . 'sprites.png?v=' . urlencode(PMA_VERSION);
-            ?>
-            /* Icon sprites */
-            .icon {
-            margin: 0;
-            margin-<?php echo $left; ?>: .3em;
-            padding: 0 !important;
-            width: 16px;
-            height: 16px;
-            background-image: url('<?php echo $bg; ?>') !important;
-            background-repeat: no-repeat !important;
-            background-position: top left !important;
-            }
-            <?php
-
-            $template = ".ic_%s { background-position: 0 -%upx !important;%s%s }\n";
-            foreach ($sprites as $name => $data) {
-                // generate the CSS code for each icon
-                $width = '';
-                $height = '';
-                // if either the height or width of an icon is 16px,
-                // then it's pointless to set this as a parameter,
-                //since it will be inherited from the "icon" class
-                if ($data['width'] != 16) {
-                    $width = " width: " . $data['width'] . "px;";
-                }
-                if ($data['height'] != 16) {
-                    $height = " height: " . $data['height'] . "px;";
-                }
-                printf(
-                    $template,
-                    $name,
-                    ($data['position'] * 16),
-                    $width,
-                    $height
-                );
-            }
-        }
-
         return $success;
     }
 
-    /**
-     * Loads sprites data
-     *
-     * @return array with sprites
-     */
-    public function getSpriteData()
-    {
-        if (is_null($this->sprites)) {
-            $sprites = array();
-            $filename = $this->getPath() . '/sprites.lib.php';
-            if (is_readable($filename)) {
-
-                // This defines sprites array
-                include $filename;
-
-                // Backwards compatibility for themes from 4.6 and older
-                if (function_exists('PMA_sprites')) {
-                    $sprites = PMA_sprites();
-                }
-            }
-            $this->sprites = $sprites;
-        }
-        return $this->sprites;
-    }
-
     /**
      * Renders the preview for this theme
      *
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 0bf76dcb3e..7ef486b85a 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -113,36 +113,15 @@ class Util
      */
     public static function getImage($image, $alternate = '', array $attributes = array())
     {
-        $is_sprite = false;
         $alternate = htmlspecialchars($alternate);
 
-        $sprites = array();
-        // Try to load the list of sprites
-        if (isset($GLOBALS['PMA_Theme'])) {
-            $sprites = $GLOBALS['PMA_Theme']->getSpriteData();
-        }
-
-        // Check if we have the requested image as a sprite
-        //  and set $url accordingly
-        $class = str_replace(array('.gif','.png'), '', $image);
-        if (array_key_exists($class, $sprites)) {
-            $is_sprite = true;
-            $url = 'themes/dot.gif';
-        } elseif (isset($GLOBALS['pmaThemeImage'])) {
+        // Set $url accordingly
+        if (isset($GLOBALS['pmaThemeImage'])) {
             $url = $GLOBALS['pmaThemeImage'] . $image;
         } else {
             $url = './themes/pmahomme/' . $image;
         }
 
-        // set class attribute
-        if ($is_sprite) {
-            if (isset($attributes['class'])) {
-                $attributes['class'] = "icon ic_$class " . $attributes['class'];
-            } else {
-                $attributes['class'] = "icon ic_$class";
-            }
-        }
-
         // set all other attributes
         $attr_str = '';
         foreach ($attributes as $key => $value) {
diff --git a/scripts/generate-sprites b/scripts/generate-sprites
deleted file mode 100755
index 3f4c9c2013..0000000000
--- a/scripts/generate-sprites
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/sh
-# vim: expandtab sw=4 ts=4 sts=4:
-
-# Do not run as CGI
-if [ -n "$GATEWAY_INTERFACE" ] ; then
-    echo 'Can not invoke as CGI!'
-    exit 1
-fi
-
-# Check for proper number of command line args.
-if [ $# -ne 1 ]; then
-  echo "Usage: `basename $0` {path_to_pma_root_folder}"
-  exit 65
-fi
-
-# Check if we have ImageMagick
-hash identify 2>&- ||  {
-  echo "ERROR: ImageMagick not found on the system!"
-  echo "Quitting..."
-  exit 1
-}
-
-# Compress image, if possible
-HAVE_PNGCRUSH=1
-hash pngcrush 2>&- || {
-  HAVE_PNGCRUSH=0
-  echo "WARNING: 'pngcrush' not found, will not be able to compress the sprites"
-}
-
-# Icons that should not be included in the sprite
-BLACKLIST="vertical_line.png spacer.png"
-
-# Output filename for the sprite image
-OUTPUT="sprites.png"
-
-# Library file that will contain the information about
-# individual images that are part of the sprite
-LIBRARY="../sprites.lib.php"
-
-if [ -d $1/themes ]; then
-  cd $1/themes
-
-  # For each theme
-  for d in $(ls -d */); do
-    # Go to folder that contains the images
-    cd "$d"img
-    echo "Processing folder: $PWD"
-    FILES=''
-    for f in $(ls *.png| LC_ALL=C sort); do
-      VALID=true
-      # Do not include blacklisted icons
-      for b in $BLACKLIST; do
-        if [ "$b" = "$f" ]; then
-          VALID=false
-        fi
-      done
-      if [ $VALID = false ]; then
-        continue
-      fi
-      DATA=$(identify -ping $f || echo "NULL")
-      if [ "$DATA" != "NULL" ]; then
-        SIZE=$(echo $DATA | cut -d ' '  -f 3 | sed 's/x/ /')
-        # Do not include icons that are larger than 16x16
-        for s in $SIZE; do
-          if [ $s -gt 16 ]; then
-            VALID=false
-          fi
-        done
-        if [ $VALID = true ]; then
-          # Build the list of valid icons
-          FILES="$FILES $f"
-        fi
-      fi
-    done
-
-    # Create an empty sprite of the correct size
-    NUM_FILES=''
-    for f in $FILES; do
-      NUM_FILES=$(($NUM_FILES+1))
-    done
-    convert -size 16x$(($NUM_FILES*16+16)) xc:none temp.png
-
-    # Add each icon to the sprite
-    CURRENT=1
-    for f in $FILES; do
-      convert temp.png $f -geometry +0+$(($CURRENT*16)) -composite temp.png
-      CURRENT=$(($CURRENT+1))
-    done
-
-    # Compress image, if possible
-    if [ $HAVE_PNGCRUSH -eq 1 ]; then
-      echo "Compressing file: $PWD/$OUTPUT"
-      pngcrush -brute temp.png $OUTPUT > /dev/null
-      rm -f temp.png
-    else
-      mv temp.png $OUTPUT
-    fi
-
-    # Generate the library file that contains the information
-    # about individual images that are part of the sprite
-    echo '<?php' > $LIBRARY
-    echo '/**' >> $LIBRARY
-    echo ' * AUTOGENERATED CONTENT - DO NOT EDIT!' >> $LIBRARY
-    echo ' * ALL CHANGES WILL BE UNDONE!' >> $LIBRARY
-    echo ' * RUN `./scripts/generate-sprites` TO UPDATE THIS FILE' >> $LIBRARY
-    echo ' *'  >> $LIBRARY
-    echo ' * @package PhpMyAdmin-theme' >> $LIBRARY
-    echo ' */'  >> $LIBRARY
-    echo '' >> $LIBRARY
-    echo '/**' >> $LIBRARY
-    echo ' * Map of sprites inside sprite.png'  >> $LIBRARY
-    echo ' */'  >> $LIBRARY
-    echo "\$sprites = array(" >> $LIBRARY
-    CURRENT=1
-    for f in $FILES; do
-      # Add a CSS rule for each icon in the sprite
-      NAME=$(echo "'$f'" | sed 's/\.png//')
-
-      DATA=$(identify -ping $f || echo "NULL")
-      if [ "$DATA" != "NULL" ]; then
-        SIZE=$(echo $DATA | cut -d ' '  -f 3 | sed 's/x/ /')
-        WIDTH=0
-        HEIGHT=0
-        for s in $SIZE; do
-          if [ $WIDTH = 0 ]; then
-            WIDTH=$s
-          else
-            HEIGHT=$s
-          fi
-        done
-      fi
-      echo "    $NAME => array("               >> $LIBRARY
-      echo "        'position' => '$CURRENT'," >> $LIBRARY
-      echo "        'width'    => '$WIDTH',"   >> $LIBRARY
-      echo "        'height'   => '$HEIGHT'"   >> $LIBRARY
-      echo "    ),"                            >> $LIBRARY
-      CURRENT=$(($CURRENT+1))
-    done
-    echo ");" >> $LIBRARY
-
-    # Back to the parent folder
-    cd ../..
-  done
-  exit 0
-else
-  echo "ERROR: could not find the 'themes' folder in '`readlink -f $1`'"
-  exit 1
-fi
diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php
index 74e61fbeca..e536601290 100644
--- a/test/classes/Config/FormDisplayTemplateTest.php
+++ b/test/classes/Config/FormDisplayTemplateTest.php
@@ -177,8 +177,8 @@ class FormDisplayTemplateTest extends TestCase
         );
 
         $this->assertContains(
-            '<img src="themes/dot.gif" title="Documentation" ' .
-            'alt="Documentation" class="icon ic_b_help" /',
+            '<img src="./themes/pmahomme/b_help.png" title="Documentation" ' .
+            'alt="Documentation" /',
             $result
         );
 
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index cc98b84427..cd74a670d2 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -182,9 +182,9 @@ class FooterTest extends PmaTestCase
             '<div id="selflink" class="print_ignore"><a href="index.php?db=&amp;'
             . 'table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection='
             . 'utf8_general_ci" title="Open new phpMyAdmin window" '
-            . 'target="_blank" rel="noopener noreferrer"><img src="themes/dot.gif" title="Open new '
+            . 'target="_blank" rel="noopener noreferrer"><img src="./themes/pmahomme/window-new.png" title="Open new '
             . 'phpMyAdmin window" alt="Open new phpMyAdmin window" '
-            . 'class="icon ic_window-new" /></a></div>',
+            . '/></a></div>',
             $this->_callPrivateFunction(
                 '_getSelfLink',
                 array(
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 75e4f2adf3..911ae1520c 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -1413,8 +1413,8 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
         $GLOBALS['cfg']['LinkLengthLimit'] = 2;
         $this->assertContains(
-            '<a href="#" target="_blank"><span class="nowrap"><img src="themes/dot.'
-            . 'gif" title="Edit/Insert" alt="Edit/Insert" class="icon ic_b_edit" />'
+            '<a href="#" target="_blank"><span class="nowrap"><img src="./themes/pmahomme/b_edit.png"'
+            . ' title="Edit/Insert" alt="Edit/Insert" />'
             . '</span></a>',
             InsertEdit::getHtmlForGisDataTypes()
         );
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index 95a1ab3d96..885aab9bf7 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -542,7 +542,7 @@ class MessageTest extends PmaTestCase
         $this->object->setMessage('Test Message');
 
         $this->expectOutputString(
-            '<div class="notice"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_notice" /> '
+            '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" /> '
             . 'Test Message</div>'
         );
         $this->object->display();
@@ -559,7 +559,7 @@ class MessageTest extends PmaTestCase
     {
         $this->object->setMessage('Test Message');
         $this->assertEquals(
-            '<div class="notice"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_notice" /> '
+            '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" /> '
             . 'Test Message</div>',
             $this->object->getDisplay()
         );
@@ -587,18 +587,18 @@ class MessageTest extends PmaTestCase
         return array(
             array(
                 1,
-                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
-                . 'class="icon ic_s_notice" />  1 row affected.</div>'
+                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" '
+                . '/>  1 row affected.</div>'
             ),
             array(
                 2,
-                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
-                . 'class="icon ic_s_notice" />  2 rows affected.</div>'
+                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" '
+                . '/>  2 rows affected.</div>'
             ),
             array(
                 10000,
-                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
-                . 'class="icon ic_s_notice" />  10000 rows affected.</div>'
+                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" '
+                . '/>  10000 rows affected.</div>'
             )
         );
     }
@@ -632,18 +632,18 @@ class MessageTest extends PmaTestCase
         return array(
             array(
                 1,
-                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
-                . 'class="icon ic_s_notice" />  1 row inserted.</div>'
+                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
+                . '  1 row inserted.</div>'
             ),
             array(
                 2,
-                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
-                . 'class="icon ic_s_notice" />  2 rows inserted.</div>'
+                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
+                . '  2 rows inserted.</div>'
             ),
             array(
                 100000,
-                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
-                . 'class="icon ic_s_notice" />  100000 rows inserted.</div>'
+                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
+                . '  100000 rows inserted.</div>'
             )
         );
     }
@@ -677,18 +677,18 @@ class MessageTest extends PmaTestCase
         return array(
             array(
                 1,
-                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
-                . 'class="icon ic_s_notice" />  1 row deleted.</div>'
+                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
+                . '  1 row deleted.</div>'
             ),
             array(
                 2,
-                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
-                . 'class="icon ic_s_notice" />  2 rows deleted.</div>'
+                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
+                . '  2 rows deleted.</div>'
             ),
             array(
                 500000,
-                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
-                . 'class="icon ic_s_notice" />  500000 rows deleted.</div>'
+                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
+                . '  500000 rows deleted.</div>'
             )
         );
     }
diff --git a/test/classes/Plugins/Auth/AuthenticationConfigTest.php b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
index 3fe0f16e7d..3e67b001bf 100644
--- a/test/classes/Plugins/Auth/AuthenticationConfigTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
@@ -117,9 +117,7 @@ class AuthenticationConfigTest extends PmaTestCase
         $this->assertContains(
             '<strong>MySQL said: </strong><a href="./url.php?url=https%3A%2F%2F' .
             'dev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Ferror-messages-server.html"' .
-            ' target="mysql_doc">' .
-            '<img src="themes/dot.gif" title="Documentation" alt="Documentation" ' .
-            'class="icon ic_b_help" /></a>',
+            ' target="mysql_doc">',
             $html
         );
 
diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php
index da3a275435..7210d47dba 100644
--- a/test/classes/ThemeTest.php
+++ b/test/classes/ThemeTest.php
@@ -148,7 +148,6 @@ class ThemeTest extends PmaTestCase
         ob_end_clean();
         $this->assertTrue($ret);
         $this->assertContains('FILE: navigation.css.php', $out);
-        $this->assertContains('.ic_b_bookmark', $out);
     }
 
     /**
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index 57d26ade27..20415daa1d 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -1408,7 +1408,7 @@ class UtilTest extends PmaTestCase
         $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
 
         $this->assertEquals(
-            '<span class="nowrap"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" /></span>',
+            '<span class="nowrap"><img src="./themes/pmahomme/b_comment.png" title="" alt="" /></span>',
             Util::getIcon('b_comment.png')
         );
     }
@@ -1426,9 +1426,9 @@ class UtilTest extends PmaTestCase
         $alternate_text = 'alt_str';
 
         $this->assertEquals(
-            '<span class="nowrap"><img src="themes/dot.gif" title="'
+            '<span class="nowrap"><img src="./themes/pmahomme/b_comment.png" title="'
             . $alternate_text . '" alt="' . $alternate_text
-            . '" class="icon ic_b_comment" /></span>',
+            . '" /></span>',
             Util::getIcon('b_comment.png', $alternate_text)
         );
     }
@@ -1448,9 +1448,9 @@ class UtilTest extends PmaTestCase
         // Here we are checking for an icon embedded inside a span (i.e not a menu
         // bar icon
         $this->assertEquals(
-            '<span class="nowrap"><img src="themes/dot.gif" title="'
+            '<span class="nowrap"><img src="./themes/pmahomme/b_comment.png" title="'
             . $alternate_text . '" alt="' . $alternate_text
-            . '" class="icon ic_b_comment" />&nbsp;' . $alternate_text . '</span>',
+            . '" />&nbsp;' . $alternate_text . '</span>',
             Util::getIcon('b_comment.png', $alternate_text, true, false)
         );
     }
@@ -2065,7 +2065,7 @@ class UtilTest extends PmaTestCase
         $GLOBALS['cfg']['ServerDefault'] = 1;
 
         $this->assertEquals(
-            '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fpage.html%23anchor" target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help" /></a>',
+            '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fpage.html%23anchor" target="documentation"><img src="./themes/pmahomme/b_help.png" title="Documentation" alt="Documentation" /></a>',
             Util::showDocu('page', 'anchor')
         );
     }
@@ -2086,8 +2086,8 @@ class UtilTest extends PmaTestCase
         $lang = _pgettext('PHP documentation language', 'en');
         $expected = '<a href="./url.php?url=https%3A%2F%2Fsecure.php.net%2Fmanual%2F' . $lang
             . '%2F' . $target . '" target="documentation">'
-            . '<img src="themes/dot.gif" title="' . __('Documentation') . '" alt="'
-            . __('Documentation') . '" class="icon ic_b_help" /></a>';
+            . '<img src="./themes/pmahomme/b_help.png" title="Documentation" alt="Documentation" />'
+            . '</a>';
 
         $this->assertEquals(
             $expected, Util::showPHPDocu($target)
diff --git a/test/libraries/Files_test.php b/test/libraries/Files_test.php
index 347e45edbb..546e20108e 100644
--- a/test/libraries/Files_test.php
+++ b/test/libraries/Files_test.php
@@ -68,7 +68,6 @@ class FilesTest extends TestCase
         return array(
             array('js/whitelist.php', 'var PMA_gotoWhitelist'),
             array('js/messages.php', 'var PMA_messages = new Array();'),
-            array('js/get_image.js.php', 'function PMA_getImage'),
             array('js/get_scripts.js.php', 'var AJAX'),
         );
     }
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index 18321fe53e..36391f415f 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -376,7 +376,7 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
     public function logOutIfLoggedIn()
     {
         if ($this->isLoggedIn()) {
-            $this->byCssSelector("img.icon.ic_s_loggoff")->click();
+            $this->byCssSelector("a.logout")->click();
         }
     }
 
diff --git a/themes/original/img/sprites.png b/themes/original/img/sprites.png
deleted file mode 100644
index 5143556b15..0000000000
Binary files a/themes/original/img/sprites.png and /dev/null differ
diff --git a/themes/original/sprites.lib.php b/themes/original/sprites.lib.php
deleted file mode 100644
index 0602d3b04e..0000000000
--- a/themes/original/sprites.lib.php
+++ /dev/null
@@ -1,759 +0,0 @@
-<?php
-/**
- * AUTOGENERATED CONTENT - DO NOT EDIT!
- * ALL CHANGES WILL BE UNDONE!
- * RUN `./scripts/generate-sprites` TO UPDATE THIS FILE
- *
- * @package PhpMyAdmin-theme
- */
-
-/**
- * Map of sprites inside sprite.png
- */
-$sprites = array(
-    'b_bookmark' => array(
-        'position' => '1',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_browse' => array(
-        'position' => '2',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_calendar' => array(
-        'position' => '3',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_chart' => array(
-        'position' => '4',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_close' => array(
-        'position' => '5',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_column_add' => array(
-        'position' => '6',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_comment' => array(
-        'position' => '7',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_dbstatistics' => array(
-        'position' => '8',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_deltbl' => array(
-        'position' => '9',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_docs' => array(
-        'position' => '10',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_drop' => array(
-        'position' => '11',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_edit' => array(
-        'position' => '12',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_empty' => array(
-        'position' => '13',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_engine' => array(
-        'position' => '14',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_event_add' => array(
-        'position' => '15',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_events' => array(
-        'position' => '16',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_export' => array(
-        'position' => '17',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_favorite' => array(
-        'position' => '18',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_find_replace' => array(
-        'position' => '19',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_ftext' => array(
-        'position' => '20',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_group' => array(
-        'position' => '21',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_help' => array(
-        'position' => '22',
-        'width'    => '11',
-        'height'   => '11'
-    ),
-    'b_home' => array(
-        'position' => '23',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_import' => array(
-        'position' => '24',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_index' => array(
-        'position' => '25',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_index_add' => array(
-        'position' => '26',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_info' => array(
-        'position' => '27',
-        'width'    => '11',
-        'height'   => '11'
-    ),
-    'b_inline_edit' => array(
-        'position' => '28',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_insrow' => array(
-        'position' => '29',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_key' => array(
-        'position' => '30',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_left' => array(
-        'position' => '31',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_minus' => array(
-        'position' => '32',
-        'width'    => '9',
-        'height'   => '9'
-    ),
-    'b_more' => array(
-        'position' => '33',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_move' => array(
-        'position' => '34',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_newdb' => array(
-        'position' => '35',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_newtbl' => array(
-        'position' => '36',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_nextpage' => array(
-        'position' => '37',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_no_favorite' => array(
-        'position' => '38',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_plugin' => array(
-        'position' => '39',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_plus' => array(
-        'position' => '40',
-        'width'    => '9',
-        'height'   => '9'
-    ),
-    'b_primary' => array(
-        'position' => '41',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_print' => array(
-        'position' => '42',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_props' => array(
-        'position' => '43',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_relations' => array(
-        'position' => '44',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_report' => array(
-        'position' => '45',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_right' => array(
-        'position' => '46',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_routine_add' => array(
-        'position' => '47',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_routines' => array(
-        'position' => '48',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_save' => array(
-        'position' => '49',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_saveimage' => array(
-        'position' => '50',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_sbrowse' => array(
-        'position' => '51',
-        'width'    => '10',
-        'height'   => '10'
-    ),
-    'b_search' => array(
-        'position' => '52',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_select' => array(
-        'position' => '53',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_snewtbl' => array(
-        'position' => '54',
-        'width'    => '10',
-        'height'   => '10'
-    ),
-    'b_spatial' => array(
-        'position' => '55',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_sql' => array(
-        'position' => '56',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_sqlhelp' => array(
-        'position' => '57',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_table_add' => array(
-        'position' => '58',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tblanalyse' => array(
-        'position' => '59',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tblexport' => array(
-        'position' => '60',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tblimport' => array(
-        'position' => '61',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tblops' => array(
-        'position' => '62',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tbloptimize' => array(
-        'position' => '63',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tipp' => array(
-        'position' => '64',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_trigger_add' => array(
-        'position' => '65',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_triggers' => array(
-        'position' => '66',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_undo' => array(
-        'position' => '67',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_unique' => array(
-        'position' => '68',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usradd' => array(
-        'position' => '69',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usrcheck' => array(
-        'position' => '70',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usrdrop' => array(
-        'position' => '71',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usredit' => array(
-        'position' => '72',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usrlist' => array(
-        'position' => '73',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_versions' => array(
-        'position' => '74',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_view' => array(
-        'position' => '75',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_view_add' => array(
-        'position' => '76',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_views' => array(
-        'position' => '77',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_browse' => array(
-        'position' => '78',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_deltbl' => array(
-        'position' => '79',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_drop' => array(
-        'position' => '80',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_edit' => array(
-        'position' => '81',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_empty' => array(
-        'position' => '82',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_export' => array(
-        'position' => '83',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_ftext' => array(
-        'position' => '84',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_index' => array(
-        'position' => '85',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_insrow' => array(
-        'position' => '86',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_nextpage' => array(
-        'position' => '87',
-        'width'    => '8',
-        'height'   => '13'
-    ),
-    'bd_primary' => array(
-        'position' => '88',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_routine_add' => array(
-        'position' => '89',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_sbrowse' => array(
-        'position' => '90',
-        'width'    => '10',
-        'height'   => '10'
-    ),
-    'bd_select' => array(
-        'position' => '91',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_spatial' => array(
-        'position' => '92',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_unique' => array(
-        'position' => '93',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'centralColumns' => array(
-        'position' => '94',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'centralColumns_add' => array(
-        'position' => '95',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'centralColumns_delete' => array(
-        'position' => '96',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'col_drop' => array(
-        'position' => '97',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'console' => array(
-        'position' => '98',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'eye' => array(
-        'position' => '99',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'eye_grey' => array(
-        'position' => '100',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'hide' => array(
-        'position' => '101',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'lightbulb' => array(
-        'position' => '102',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'lightbulb_off' => array(
-        'position' => '103',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'more' => array(
-        'position' => '104',
-        'width'    => '13',
-        'height'   => '16'
-    ),
-    'new_data' => array(
-        'position' => '105',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_data_hovered' => array(
-        'position' => '106',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_data_selected' => array(
-        'position' => '107',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_data_selected_hovered' => array(
-        'position' => '108',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_struct' => array(
-        'position' => '109',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_struct_hovered' => array(
-        'position' => '110',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_struct_selected' => array(
-        'position' => '111',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_struct_selected_hovered' => array(
-        'position' => '112',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'normalize' => array(
-        'position' => '113',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'pause' => array(
-        'position' => '114',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'play' => array(
-        'position' => '115',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_asc' => array(
-        'position' => '116',
-        'width'    => '11',
-        'height'   => '9'
-    ),
-    's_asci' => array(
-        'position' => '117',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_attention' => array(
-        'position' => '118',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_cancel' => array(
-        'position' => '119',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_cog' => array(
-        'position' => '120',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_db' => array(
-        'position' => '121',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_desc' => array(
-        'position' => '122',
-        'width'    => '11',
-        'height'   => '9'
-    ),
-    's_error' => array(
-        'position' => '123',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_error2' => array(
-        'position' => '124',
-        'width'    => '11',
-        'height'   => '11'
-    ),
-    's_host' => array(
-        'position' => '125',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_info' => array(
-        'position' => '126',
-        'width'    => '11',
-        'height'   => '11'
-    ),
-    's_lang' => array(
-        'position' => '127',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_link' => array(
-        'position' => '128',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_lock' => array(
-        'position' => '129',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_loggoff' => array(
-        'position' => '130',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_notice' => array(
-        'position' => '131',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_okay' => array(
-        'position' => '132',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_passwd' => array(
-        'position' => '133',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_really' => array(
-        'position' => '134',
-        'width'    => '11',
-        'height'   => '11'
-    ),
-    's_reload' => array(
-        'position' => '135',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_replication' => array(
-        'position' => '136',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_rights' => array(
-        'position' => '137',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_sortable' => array(
-        'position' => '138',
-        'width'    => '11',
-        'height'   => '15'
-    ),
-    's_status' => array(
-        'position' => '139',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_success' => array(
-        'position' => '140',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_sync' => array(
-        'position' => '141',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_tbl' => array(
-        'position' => '142',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_theme' => array(
-        'position' => '143',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_top' => array(
-        'position' => '144',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_unlink' => array(
-        'position' => '145',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_vars' => array(
-        'position' => '146',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_views' => array(
-        'position' => '147',
-        'width'    => '10',
-        'height'   => '10'
-    ),
-    'show' => array(
-        'position' => '148',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'window-new' => array(
-        'position' => '149',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-);
diff --git a/themes/pmahomme/img/sprites.png b/themes/pmahomme/img/sprites.png
deleted file mode 100644
index a5646a9405..0000000000
Binary files a/themes/pmahomme/img/sprites.png and /dev/null differ
diff --git a/themes/pmahomme/sprites.lib.php b/themes/pmahomme/sprites.lib.php
deleted file mode 100644
index 902a954318..0000000000
--- a/themes/pmahomme/sprites.lib.php
+++ /dev/null
@@ -1,839 +0,0 @@
-<?php
-/**
- * AUTOGENERATED CONTENT - DO NOT EDIT!
- * ALL CHANGES WILL BE UNDONE!
- * RUN `./scripts/generate-sprites` TO UPDATE THIS FILE
- *
- * @package PhpMyAdmin-theme
- */
-
-/**
- * Map of sprites inside sprite.png
- */
-$sprites = array(
-    'asc_order' => array(
-        'position' => '1',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_bookmark' => array(
-        'position' => '2',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_browse' => array(
-        'position' => '3',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_calendar' => array(
-        'position' => '4',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_chart' => array(
-        'position' => '5',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_close' => array(
-        'position' => '6',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_column_add' => array(
-        'position' => '7',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_comment' => array(
-        'position' => '8',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_dbstatistics' => array(
-        'position' => '9',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_deltbl' => array(
-        'position' => '10',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_docs' => array(
-        'position' => '11',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_docsql' => array(
-        'position' => '12',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_drop' => array(
-        'position' => '13',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_edit' => array(
-        'position' => '14',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_empty' => array(
-        'position' => '15',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_engine' => array(
-        'position' => '16',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_event_add' => array(
-        'position' => '17',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_events' => array(
-        'position' => '18',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_export' => array(
-        'position' => '19',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_favorite' => array(
-        'position' => '20',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_find_replace' => array(
-        'position' => '21',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_firstpage' => array(
-        'position' => '22',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_ftext' => array(
-        'position' => '23',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_group' => array(
-        'position' => '24',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_help' => array(
-        'position' => '25',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_home' => array(
-        'position' => '26',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_import' => array(
-        'position' => '27',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_index' => array(
-        'position' => '28',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_index_add' => array(
-        'position' => '29',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_info' => array(
-        'position' => '30',
-        'width'    => '11',
-        'height'   => '11'
-    ),
-    'b_inline_edit' => array(
-        'position' => '31',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_insrow' => array(
-        'position' => '32',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_key' => array(
-        'position' => '33',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_lastpage' => array(
-        'position' => '34',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_left' => array(
-        'position' => '35',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_minus' => array(
-        'position' => '36',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_more' => array(
-        'position' => '37',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_move' => array(
-        'position' => '38',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_newdb' => array(
-        'position' => '39',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_newtbl' => array(
-        'position' => '40',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_nextpage' => array(
-        'position' => '41',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_no_favorite' => array(
-        'position' => '42',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_pdfdoc' => array(
-        'position' => '43',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_plugin' => array(
-        'position' => '44',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_plus' => array(
-        'position' => '45',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_prevpage' => array(
-        'position' => '46',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_primary' => array(
-        'position' => '47',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_print' => array(
-        'position' => '48',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_props' => array(
-        'position' => '49',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_relations' => array(
-        'position' => '50',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_report' => array(
-        'position' => '51',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_right' => array(
-        'position' => '52',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_routine_add' => array(
-        'position' => '53',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_routines' => array(
-        'position' => '54',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_save' => array(
-        'position' => '55',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_saveimage' => array(
-        'position' => '56',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_sbrowse' => array(
-        'position' => '57',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_sdb' => array(
-        'position' => '58',
-        'width'    => '10',
-        'height'   => '10'
-    ),
-    'b_search' => array(
-        'position' => '59',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_select' => array(
-        'position' => '60',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_snewtbl' => array(
-        'position' => '61',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_spatial' => array(
-        'position' => '62',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_sql' => array(
-        'position' => '63',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_sqldoc' => array(
-        'position' => '64',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_sqlhelp' => array(
-        'position' => '65',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_table_add' => array(
-        'position' => '66',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tblanalyse' => array(
-        'position' => '67',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tblexport' => array(
-        'position' => '68',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tblimport' => array(
-        'position' => '69',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tblops' => array(
-        'position' => '70',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tbloptimize' => array(
-        'position' => '71',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_tipp' => array(
-        'position' => '72',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_trigger_add' => array(
-        'position' => '73',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_triggers' => array(
-        'position' => '74',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_undo' => array(
-        'position' => '75',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_unique' => array(
-        'position' => '76',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usradd' => array(
-        'position' => '77',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usrcheck' => array(
-        'position' => '78',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usrdrop' => array(
-        'position' => '79',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usredit' => array(
-        'position' => '80',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_usrlist' => array(
-        'position' => '81',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_versions' => array(
-        'position' => '82',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_view' => array(
-        'position' => '83',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_view_add' => array(
-        'position' => '84',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'b_views' => array(
-        'position' => '85',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_browse' => array(
-        'position' => '86',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_deltbl' => array(
-        'position' => '87',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_drop' => array(
-        'position' => '88',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_edit' => array(
-        'position' => '89',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_empty' => array(
-        'position' => '90',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_export' => array(
-        'position' => '91',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_firstpage' => array(
-        'position' => '92',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_ftext' => array(
-        'position' => '93',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_index' => array(
-        'position' => '94',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_insrow' => array(
-        'position' => '95',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_lastpage' => array(
-        'position' => '96',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_nextpage' => array(
-        'position' => '97',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_prevpage' => array(
-        'position' => '98',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_primary' => array(
-        'position' => '99',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_routine_add' => array(
-        'position' => '100',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_sbrowse' => array(
-        'position' => '101',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_select' => array(
-        'position' => '102',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_spatial' => array(
-        'position' => '103',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'bd_unique' => array(
-        'position' => '104',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'centralColumns' => array(
-        'position' => '105',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'centralColumns_add' => array(
-        'position' => '106',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'centralColumns_delete' => array(
-        'position' => '107',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'col_drop' => array(
-        'position' => '108',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'console' => array(
-        'position' => '109',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'database' => array(
-        'position' => '110',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'eye' => array(
-        'position' => '111',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'eye_grey' => array(
-        'position' => '112',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'hide' => array(
-        'position' => '113',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'item' => array(
-        'position' => '114',
-        'width'    => '9',
-        'height'   => '9'
-    ),
-    'lightbulb' => array(
-        'position' => '115',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'lightbulb_off' => array(
-        'position' => '116',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'more' => array(
-        'position' => '117',
-        'width'    => '13',
-        'height'   => '16'
-    ),
-    'new_data' => array(
-        'position' => '118',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_data_hovered' => array(
-        'position' => '119',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_data_selected' => array(
-        'position' => '120',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_data_selected_hovered' => array(
-        'position' => '121',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_struct' => array(
-        'position' => '122',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_struct_hovered' => array(
-        'position' => '123',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_struct_selected' => array(
-        'position' => '124',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'new_struct_selected_hovered' => array(
-        'position' => '125',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'normalize' => array(
-        'position' => '126',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'pause' => array(
-        'position' => '127',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'php_sym' => array(
-        'position' => '128',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'play' => array(
-        'position' => '129',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_asc' => array(
-        'position' => '130',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_asci' => array(
-        'position' => '131',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_attention' => array(
-        'position' => '132',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_cancel' => array(
-        'position' => '133',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_cancel2' => array(
-        'position' => '134',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_cog' => array(
-        'position' => '135',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_db' => array(
-        'position' => '136',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_desc' => array(
-        'position' => '137',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_error' => array(
-        'position' => '138',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_error2' => array(
-        'position' => '139',
-        'width'    => '11',
-        'height'   => '11'
-    ),
-    's_host' => array(
-        'position' => '140',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_info' => array(
-        'position' => '141',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_lang' => array(
-        'position' => '142',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_link' => array(
-        'position' => '143',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_lock' => array(
-        'position' => '144',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_loggoff' => array(
-        'position' => '145',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_notice' => array(
-        'position' => '146',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_okay' => array(
-        'position' => '147',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_passwd' => array(
-        'position' => '148',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_process' => array(
-        'position' => '149',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_really' => array(
-        'position' => '150',
-        'width'    => '11',
-        'height'   => '11'
-    ),
-    's_reload' => array(
-        'position' => '151',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_replication' => array(
-        'position' => '152',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_rights' => array(
-        'position' => '153',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_sortable' => array(
-        'position' => '154',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_status' => array(
-        'position' => '155',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_success' => array(
-        'position' => '156',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_sync' => array(
-        'position' => '157',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_tbl' => array(
-        'position' => '158',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_theme' => array(
-        'position' => '159',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_top' => array(
-        'position' => '160',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_unlink' => array(
-        'position' => '161',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_vars' => array(
-        'position' => '162',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    's_views' => array(
-        'position' => '163',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'show' => array(
-        'position' => '164',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-    'window-new' => array(
-        'position' => '165',
-        'width'    => '16',
-        'height'   => '16'
-    ),
-);