diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 472cd6bc4..475a4bf9c 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -967,6 +967,9 @@
             }
         }
     }
+    .cp-toolbar-dropdown-nowrap {
+        white-space: nowrap;
+    }
     .cp-toolbar-bottom {
         color: @cp_toolbar-bottom-fg;
         display: inline-flex;
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 6727bff6c..e4c9dfa51 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3029,9 +3029,10 @@ define([
             });
             var dropdownConfig = {
                 buttonContent: [
-                    h('span.fa.fa-plus'),
-                    h('span', Messages.fm_newButton),
+                    h('i.fa.fa-plus'),
+                    h('span.cp-button-name', Messages.fm_newButton),
                 ],
+                buttonCls: 'cp-toolbar-dropdown-nowrap',
                 options: options,
                 feedback: 'DRIVE_NEWPAD_LOCALFOLDER',
                 common: common
@@ -3103,9 +3104,10 @@ define([
             }
             var dropdownConfig = {
                 buttonContent: [
-                    h('span.fa.fa-filter'),
-                    h('span', Messages.fm_filterBy),
+                    h('i.fa.fa-filter'),
+                    h('span.cp-button-name', Messages.fm_filterBy),
                 ],
+                buttonCls: 'cp-toolbar-dropdown-nowrap',
                 options: options,
                 feedback: 'DRIVE_FILTERBY',
                 common: common