diff --git a/www/common/common-icons.js b/www/common/common-icons.js
index 764a7e7c6..b3a9eeaba 100644
--- a/www/common/common-icons.js
+++ b/www/common/common-icons.js
@@ -7,7 +7,7 @@ define([
         // Drive
         "homepage": "house",
         "drive": "hard-drive",
-        "drive-search": "search",
+        "search": "search",
         "drive-shared-folder": "folder-users",
         "drive-upload-file": "file-up",
         "drive-upload-folder": "folder-up",
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index f76fa4c3b..e33ea39c6 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -131,7 +131,7 @@ define([
     var $sortAscIcon = $(Icons.get('sort-asc', {'class': 'sortasc'}));
     var $sortDescIcon = $(Icons.get('sort-desc', {'class': 'sortdesc'}));
     var $closeIcon = $(Icons.get('close'));
-    var $searchIcon = $($(Icons.get('drive-search', {'class': 'cp-app-drive-tree-search-icon'})));
+    var $searchIcon = $($(Icons.get('search', {'class': 'cp-app-drive-tree-search-icon'})));
     var $addIcon = $(Icons.get('add'));
     var $renamedIcon = $(Icons.get('renamed'));
     var $readonlyIcon = $(Icons.get(readOnly));
diff --git a/www/moderation/inner.js b/www/moderation/inner.js
index dc6158d58..dc0dee198 100644
--- a/www/moderation/inner.js
+++ b/www/moderation/inner.js
@@ -362,7 +362,7 @@ define([
                 ]
             },
             'search': { // Msg.support_cat_search
-                icon: 'drive-search',
+                icon: 'search',
                 content: [
                     'filter',
                     'search'
@@ -459,7 +459,7 @@ define([
         sidebar.addItem('search', cb => {
 
             let inputSearch = blocks.input({type:'text', class: 'cp-support-search-input'});
-            let button = blocks.button('primary', 'drive-search');
+            let button = blocks.button('primary', 'search');
             let inputBlock = blocks.inputButton(inputSearch, button, { onEnterDelegate: true });
             let searchBlock = blocks.labelledInput(Messages.support_searchLabel,
                                                     inputSearch, inputBlock);