diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index ecb6bb99..0315e601 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -1324,10 +1324,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .app-menu-icon {
   -st-icon-style: symbolic;
-  height: 0;
-  width: 0;
   margin-left: 0;
   margin-right: 0;
+  icon-size: 16px;
+}
+
+#panel .panel-button .app-menu-icon > StIcon {
+  padding-left: 4px;
+  padding-right: 6px;
 }
 
 #panel .panel-button .popup-menu-arrow {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
index 79efb333..f109517c 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -1324,10 +1324,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .app-menu-icon {
   -st-icon-style: symbolic;
-  height: 0;
-  width: 0;
   margin-left: 0;
   margin-right: 0;
+  icon-size: 16px;
+}
+
+#panel .panel-button .app-menu-icon > StIcon {
+  padding-left: 4px;
+  padding-right: 6px;
 }
 
 #panel .panel-button .popup-menu-arrow {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index 79efb333..f109517c 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -1324,10 +1324,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .app-menu-icon {
   -st-icon-style: symbolic;
-  height: 0;
-  width: 0;
   margin-left: 0;
   margin-right: 0;
+  icon-size: 16px;
+}
+
+#panel .panel-button .app-menu-icon > StIcon {
+  padding-left: 4px;
+  padding-right: 6px;
 }
 
 #panel .panel-button .popup-menu-arrow {
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index ecb6bb99..0315e601 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -1324,10 +1324,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .app-menu-icon {
   -st-icon-style: symbolic;
-  height: 0;
-  width: 0;
   margin-left: 0;
   margin-right: 0;
+  icon-size: 16px;
+}
+
+#panel .panel-button .app-menu-icon > StIcon {
+  padding-left: 4px;
+  padding-right: 6px;
 }
 
 #panel .panel-button .popup-menu-arrow {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index aca1f7b5..049a23ef 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -1324,10 +1324,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .app-menu-icon {
   -st-icon-style: symbolic;
-  height: 0;
-  width: 0;
   margin-left: 0;
   margin-right: 0;
+  icon-size: 16px;
+}
+
+#panel .panel-button .app-menu-icon > StIcon {
+  padding-left: 4px;
+  padding-right: 6px;
 }
 
 #panel .panel-button .popup-menu-arrow {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
index fa702f7e..6ae9c59f 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -1324,10 +1324,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .app-menu-icon {
   -st-icon-style: symbolic;
-  height: 0;
-  width: 0;
   margin-left: 0;
   margin-right: 0;
+  icon-size: 16px;
+}
+
+#panel .panel-button .app-menu-icon > StIcon {
+  padding-left: 4px;
+  padding-right: 6px;
 }
 
 #panel .panel-button .popup-menu-arrow {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index fa702f7e..6ae9c59f 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -1324,10 +1324,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .app-menu-icon {
   -st-icon-style: symbolic;
-  height: 0;
-  width: 0;
   margin-left: 0;
   margin-right: 0;
+  icon-size: 16px;
+}
+
+#panel .panel-button .app-menu-icon > StIcon {
+  padding-left: 4px;
+  padding-right: 6px;
 }
 
 #panel .panel-button .popup-menu-arrow {
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index bcd0032e..f9c91038 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -1324,10 +1324,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .app-menu-icon {
   -st-icon-style: symbolic;
-  height: 0;
-  width: 0;
   margin-left: 0;
   margin-right: 0;
+  icon-size: 16px;
+}
+
+#panel .panel-button .app-menu-icon > StIcon {
+  padding-left: 4px;
+  padding-right: 6px;
 }
 
 #panel .panel-button .popup-menu-arrow {
diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index 25bc059f..3c556fdc 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -1135,11 +1135,15 @@ $panel_asset_shadow: 0 1px 3px 3px rgba(black, 0.15);
 
     .app-menu-icon {
       -st-icon-style: symbolic;
-      height: 0;
-      width: 0;
       margin-left: 0;
       margin-right: 0;
+      icon-size: 16px;
       //dimensions of the icon are hardcoded
+
+      > StIcon {
+        padding-left: 4px;
+        padding-right: 6px;
+      }
     }
 
     .popup-menu-arrow { width: 0; height: 0; } // Remove arrow on panel button