diff --git a/suite/themes/classic/communicator/mac/button.css b/suite/themes/classic/communicator/mac/button.css
index 426f71f0d2f..9d2e99efe8c 100644
--- a/suite/themes/classic/communicator/mac/button.css
+++ b/suite/themes/classic/communicator/mac/button.css
@@ -61,12 +61,12 @@
 }
 
 toolbar[mode="icons"] .toolbarbutton-1,
-toolbar[mode="icons"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+toolbar[mode="icons"] .toolbarbutton-menubutton-button {
   min-width: 0px;
 }
 
-toolbar[mode="icons"] .toolbarbutton-1 .toolbarbutton-text,
-toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-icon {
+toolbar[mode="icons"] .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-icon {
   display: none;
 }
 
diff --git a/suite/themes/classic/communicator/win/button.css b/suite/themes/classic/communicator/win/button.css
index 0545fcd6ed1..82fd9a8cbd5 100644
--- a/suite/themes/classic/communicator/win/button.css
+++ b/suite/themes/classic/communicator/win/button.css
@@ -78,12 +78,12 @@
 }
 
 toolbar[mode="icons"] .toolbarbutton-1,
-toolbar[mode="icons"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+toolbar[mode="icons"] .toolbarbutton-menubutton-button {
   min-width: 0px;
 }
 
-toolbar[mode="icons"] .toolbarbutton-1 .toolbarbutton-text,
-toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-icon {
+toolbar[mode="icons"] .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-icon {
   display: none;
 }
 
diff --git a/suite/themes/classic/navigator/navigator.css b/suite/themes/classic/navigator/navigator.css
index 3e59ba8b404..c798da78f86 100644
--- a/suite/themes/classic/navigator/navigator.css
+++ b/suite/themes/classic/navigator/navigator.css
@@ -158,7 +158,7 @@
   display: none;
 }
 
-toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-text {
+toolbar[mode="text"] .toolbarbutton-text {
   padding: 4px 0;
 }
 
diff --git a/suite/themes/modern/communicator/button.css b/suite/themes/modern/communicator/button.css
index 343a587b75e..719b1e4b4e6 100644
--- a/suite/themes/modern/communicator/button.css
+++ b/suite/themes/modern/communicator/button.css
@@ -86,18 +86,16 @@ toolbar[mode="text"] .toolbarbutton-1 {
   min-width: 46px;
 }
 
-toolbar[mode="icons"] .toolbarbutton-1 .toolbarbutton-text,
-toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-icon {
+toolbar[mode="icons"] .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-icon {
   display: none;
 }
 
-toolbar[mode="icons"] .toolbarbutton-1 > .toolbarbutton-menubutton-stack
-  > .toolbarbutton-menubutton-dropmarker {
+toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker {
   margin: 20px 0px 0px 40px;
 }
 
-toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-stack
-  > .toolbarbutton-menubutton-dropmarker {
+toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker {
   margin: 8px 0px 0px 40px;
 }
 
@@ -107,5 +105,3 @@ toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-stack
   -moz-user-focus: ignore !important;
   margin: 0px;
 }
-
-