diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 15bf59e427..1d13b91fbe 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -3418,8 +3418,9 @@ class PMA_Util
         $titles['NoExport']   = self::getIcon('bd_export.png', __('Export'));
         $titles['Execute']    = self::getIcon('b_nextpage.png', __('Execute'));
         $titles['NoExecute']  = self::getIcon('bd_nextpage.png', __('Execute'));
-        $titles['Favorite']  = self::getIcon('b_favorite.png', __('Remove from Favorites'));
-        $titles['NoFavorite']= self::getIcon('b_no_favorite.png', __('Add to Favorites'));
+        // For Favorite/NoFavorite, we need icon only.
+        $titles['Favorite']  = self::getIcon('b_favorite.png', '');
+        $titles['NoFavorite']= self::getIcon('b_no_favorite.png', '');
 
         return $titles;
     }
diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php
index 764ae93272..3b19c4cad8 100644
--- a/test/libraries/common/PMA_buildActionTitles_test.php
+++ b/test/libraries/common/PMA_buildActionTitles_test.php
@@ -59,8 +59,8 @@ class PMA_BuildActionTitles_Test extends PHPUnit_Framework_TestCase
         $titles['NoExport']   = PMA_Util::getIcon('bd_export.png', __('Export'));
         $titles['Execute']    = PMA_Util::getIcon('b_nextpage.png', __('Execute'));
         $titles['NoExecute']  = PMA_Util::getIcon('bd_nextpage.png', __('Execute'));
-        $titles['Favorite']   = PMA_Util::getIcon('b_favorite.png', __('Remove from Favorites'));
-        $titles['NoFavorite'] = PMA_Util::getIcon('b_no_favorite.png', __('Add to Favorites'));
+        $titles['Favorite']   = PMA_Util::getIcon('b_favorite.png', '');
+        $titles['NoFavorite'] = PMA_Util::getIcon('b_no_favorite.png', '');
 
         $this->assertEquals($titles, PMA_Util::buildActionTitles());