diff --git a/js/functions.js b/js/functions.js
index ed7613415a..a6c131a394 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -4928,7 +4928,7 @@ function PMA_getImage(image, alternate, attributes) {
             // this is private
             alt: '',
             title: '',
-            src: '',
+            src: 'themes/dot.gif',
         },
         attr: function (name, value) {
             if (value == undefined) {
@@ -4969,11 +4969,9 @@ function PMA_getImage(image, alternate, attributes) {
     } else {
         retval.attr('title', escapeHtml(alternate));
     }
-    // it's an image file
-    retval.attr(
-        'src',
-        pmaThemeImage + image
-    );
+    // set css classes
+    var klass = image.replace('.gif', '').replace('.png', '');
+    retval.attr('class', 'icon ic_' + klass);
     // set all other attrubutes
     for (var i in attributes) {
         if (i == 'src') {
diff --git a/libraries/classes/Theme.php b/libraries/classes/Theme.php
index 965d507114..acb1cd6d9a 100644
--- a/libraries/classes/Theme.php
+++ b/libraries/classes/Theme.php
@@ -78,7 +78,8 @@ class Theme
         'rte',
         'codemirror',
         'jqplot',
-        'resizable-menu'
+        'resizable-menu',
+        'icons',
     );
 
     /**
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 2f538dc863..5ca4136711 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -122,6 +122,13 @@ class Util
             $url = './themes/pmahomme/' . $image;
         }
 
+        $class = str_replace(array('.gif','.png'), '', $image);
+        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) {
@@ -145,8 +152,8 @@ class Util
         }
 
         // generate the IMG tag
-        $template = '<img src="%s" title="%s" alt="%s"%s />';
-        $retval = sprintf($template, $url, $title, $alt, $attr_str);
+        $template = '<img src="themes/dot.gif" title="%s" alt="%s"%s />';
+        $retval = sprintf($template, $title, $alt, $attr_str);
 
         return $retval;
     }
diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php
index e536601290..74e61fbeca 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/pmahomme/b_help.png" title="Documentation" ' .
-            'alt="Documentation" /',
+            '<img src="themes/dot.gif" title="Documentation" ' .
+            'alt="Documentation" class="icon ic_b_help" /',
             $result
         );
 
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index cd74a670d2..cc98b84427 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/pmahomme/window-new.png" title="Open new '
+            . 'target="_blank" rel="noopener noreferrer"><img src="themes/dot.gif" title="Open new '
             . 'phpMyAdmin window" alt="Open new phpMyAdmin window" '
-            . '/></a></div>',
+            . 'class="icon ic_window-new" /></a></div>',
             $this->_callPrivateFunction(
                 '_getSelfLink',
                 array(
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 911ae1520c..75e4f2adf3 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/pmahomme/b_edit.png"'
-            . ' title="Edit/Insert" alt="Edit/Insert" />'
+            '<a href="#" target="_blank"><span class="nowrap"><img src="themes/dot.'
+            . 'gif" title="Edit/Insert" alt="Edit/Insert" class="icon ic_b_edit" />'
             . '</span></a>',
             InsertEdit::getHtmlForGisDataTypes()
         );
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index 885aab9bf7..95a1ab3d96 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/pmahomme/s_notice.png" title="" alt="" /> '
+            '<div class="notice"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_notice" /> '
             . '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/pmahomme/s_notice.png" title="" alt="" /> '
+            '<div class="notice"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_notice" /> '
             . 'Test Message</div>',
             $this->object->getDisplay()
         );
@@ -587,18 +587,18 @@ class MessageTest extends PmaTestCase
         return array(
             array(
                 1,
-                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" '
-                . '/>  1 row affected.</div>'
+                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
+                . 'class="icon ic_s_notice" />  1 row affected.</div>'
             ),
             array(
                 2,
-                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" '
-                . '/>  2 rows affected.</div>'
+                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
+                . 'class="icon ic_s_notice" />  2 rows affected.</div>'
             ),
             array(
                 10000,
-                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" '
-                . '/>  10000 rows affected.</div>'
+                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
+                . 'class="icon ic_s_notice" />  10000 rows affected.</div>'
             )
         );
     }
@@ -632,18 +632,18 @@ class MessageTest extends PmaTestCase
         return array(
             array(
                 1,
-                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
-                . '  1 row inserted.</div>'
+                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
+                . 'class="icon ic_s_notice" />  1 row inserted.</div>'
             ),
             array(
                 2,
-                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
-                . '  2 rows inserted.</div>'
+                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
+                . 'class="icon ic_s_notice" />  2 rows inserted.</div>'
             ),
             array(
                 100000,
-                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
-                . '  100000 rows inserted.</div>'
+                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
+                . 'class="icon ic_s_notice" />  100000 rows inserted.</div>'
             )
         );
     }
@@ -677,18 +677,18 @@ class MessageTest extends PmaTestCase
         return array(
             array(
                 1,
-                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
-                . '  1 row deleted.</div>'
+                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
+                . 'class="icon ic_s_notice" />  1 row deleted.</div>'
             ),
             array(
                 2,
-                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
-                . '  2 rows deleted.</div>'
+                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
+                . 'class="icon ic_s_notice" />  2 rows deleted.</div>'
             ),
             array(
                 500000,
-                '<div class="notice"><img src="./themes/pmahomme/s_notice.png" title="" alt="" />'
-                . '  500000 rows deleted.</div>'
+                '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
+                . 'class="icon ic_s_notice" />  500000 rows deleted.</div>'
             )
         );
     }
diff --git a/test/classes/Plugins/Auth/AuthenticationConfigTest.php b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
index 3e67b001bf..3fe0f16e7d 100644
--- a/test/classes/Plugins/Auth/AuthenticationConfigTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
@@ -117,7 +117,9 @@ 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">',
+            ' target="mysql_doc">' .
+            '<img src="themes/dot.gif" title="Documentation" alt="Documentation" ' .
+            'class="icon ic_b_help" /></a>',
             $html
         );
 
diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php
index 7210d47dba..da3a275435 100644
--- a/test/classes/ThemeTest.php
+++ b/test/classes/ThemeTest.php
@@ -148,6 +148,7 @@ 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 5837511f9f..f429cb69de 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/pmahomme/b_comment.png" title="" alt="" /></span>',
+            '<span class="nowrap"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" /></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/pmahomme/b_comment.png" title="'
+            '<span class="nowrap"><img src="themes/dot.gif" title="'
             . $alternate_text . '" alt="' . $alternate_text
-            . '" /></span>',
+            . '" class="icon ic_b_comment" /></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/pmahomme/b_comment.png" title="'
+            '<span class="nowrap"><img src="themes/dot.gif" title="'
             . $alternate_text . '" alt="' . $alternate_text
-            . '" />&nbsp;' . $alternate_text . '</span>',
+            . '" class="icon ic_b_comment" />&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/pmahomme/b_help.png" title="Documentation" alt="Documentation" /></a>',
+            '<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>',
             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/pmahomme/b_help.png" title="Documentation" alt="Documentation" />'
-            . '</a>';
+            . '<img src="themes/dot.gif" title="' . __('Documentation') . '" alt="'
+            . __('Documentation') . '" class="icon ic_b_help" /></a>';
 
         $this->assertEquals(
             $expected, Util::showPHPDocu($target)
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index 36391f415f..18321fe53e 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("a.logout")->click();
+            $this->byCssSelector("img.icon.ic_s_loggoff")->click();
         }
     }