diff --git a/data/style/strawberry.css b/data/style/strawberry.css
index 2f39f1531..75c203ff7 100644
--- a/data/style/strawberry.css
+++ b/data/style/strawberry.css
@@ -19,13 +19,25 @@
   background-clip: content;
 }
 
-macos QToolButton {
+#context-layout-container {
+  background-color: %palette-base;
+}
+
+#context-widget-scrollarea {
+  background-color: %palette-base;
+}
+
+#context-layout-scrollarea {
+  background-color: %palette-base;
+}
+
+QToolButton {
   border: 2px solid transparent;
   border-radius: 3px;
   padding: 1px;
 }
 
-macos QToolButton::menu-button {
+QToolButton::menu-button {
   width: 16px;
   border: none;
 }
@@ -35,11 +47,8 @@ QToolButton[popupMode="1"] {
 }
 
 QToolButton:hover {
-  background-color: %palette-highlight-lighter;
-}
-
-macos QToolButton:hover {
   border: 2px solid %palette-highlight;
+  background-color: %palette-highlight-lighter;
 }
 
 QToolButton:hover[popupMode="1"] {
@@ -47,11 +56,8 @@ QToolButton:hover[popupMode="1"] {
 }
 
 QToolButton:pressed {
-  background-color: %palette-highlight-lighter;
-}
-
-macos QToolButton:pressed {
   border: 2px solid %palette-highlight-darker;
+  background-color: %palette-highlight-lighter;
 }
 
 QToolButton:pressed[popupMode="1"] {
@@ -66,14 +72,3 @@ macos QMenu {
   font-size: 13pt;
 }
 
-#context-layout-container {
-  background-color: %palette-base;
-}
-
-#context-widget-scrollarea {
-  background-color: %palette-base;
-}
-
-#context-layout-scrollarea {
-  background-color: %palette-base;
-}
diff --git a/src/collection/collectionfilterwidget.ui b/src/collection/collectionfilterwidget.ui
index 63b9864a3..bc1b099f0 100644
--- a/src/collection/collectionfilterwidget.ui
+++ b/src/collection/collectionfilterwidget.ui
@@ -38,6 +38,11 @@
    </item>
    <item>
     <widget class="QToolButton" name="options">
+     <property name="styleSheet">
+      <string notr="true">QToolButton, QToolButton:hover, QToolButton:pressed {
+  padding-right: 16px;
+}</string>
+     </property>
      <property name="iconSize">
       <size>
        <width>16</width>
@@ -45,7 +50,10 @@
       </size>
      </property>
      <property name="popupMode">
-      <enum>QToolButton::InstantPopup</enum>
+      <enum>QToolButton::MenuButtonPopup</enum>
+     </property>
+     <property name="autoRaise">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
diff --git a/src/core/mainwindow.ui b/src/core/mainwindow.ui
index 37fb9ae5c..b79ce6e6c 100644
--- a/src/core/mainwindow.ui
+++ b/src/core/mainwindow.ui
@@ -151,6 +151,12 @@
                   <property name="enabled">
                    <bool>false</bool>
                   </property>
+                  <property name="styleSheet">
+                   <string notr="true">QToolButton, QToolButton:hover, QToolButton:pressed {
+  padding-right: 16px;
+}
+</string>
+                  </property>
                   <property name="iconSize">
                    <size>
                     <width>32</width>
diff --git a/src/covermanager/albumcovermanager.ui b/src/covermanager/albumcovermanager.ui
index 9d1ae53bb..8d7096480 100644
--- a/src/covermanager/albumcovermanager.ui
+++ b/src/covermanager/albumcovermanager.ui
@@ -87,6 +87,11 @@
           </item>
           <item>
            <widget class="QToolButton" name="view">
+            <property name="styleSheet">
+             <string notr="true">QToolButton, QToolButton:hover, QToolButton:pressed {
+  padding-right: 16px;
+}</string>
+            </property>
             <property name="text">
              <string>View</string>
             </property>
diff --git a/src/internet/internetsearchview.ui b/src/internet/internetsearchview.ui
index bf21b005d..069d39833 100644
--- a/src/internet/internetsearchview.ui
+++ b/src/internet/internetsearchview.ui
@@ -54,6 +54,12 @@
               <height>0</height>
              </size>
             </property>
+            <property name="styleSheet">
+             <string notr="true">QToolButton, QToolButton:hover, QToolButton:pressed {
+  padding-right: 16px;
+}
+</string>
+            </property>
             <property name="iconSize">
              <size>
               <width>16</width>
@@ -61,7 +67,7 @@
              </size>
             </property>
             <property name="popupMode">
-             <enum>QToolButton::InstantPopup</enum>
+             <enum>QToolButton::MenuButtonPopup</enum>
             </property>
             <property name="autoRaise">
              <bool>true</bool>
@@ -231,7 +237,7 @@
             <x>0</x>
             <y>0</y>
             <width>398</width>
-            <height>518</height>
+            <height>520</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_5">