diff --git a/data/style/strawberry.css b/data/style/strawberry.css
index 75c203ff..ff10f37b 100644
--- a/data/style/strawberry.css
+++ b/data/style/strawberry.css
@@ -37,33 +37,25 @@ QToolButton {
   padding: 1px;
 }
 
-QToolButton::menu-button {
-  width: 16px;
-  border: none;
-}
-
-QToolButton[popupMode="1"] {
-  padding-right: 16px;
-}
-
 QToolButton:hover {
   border: 2px solid %palette-highlight;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton:hover[popupMode="1"] {
-  padding-right: 16px;
-}
-
 QToolButton:pressed {
   border: 2px solid %palette-highlight-darker;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton:pressed[popupMode="1"] {
+QToolButton[popupMode="MenuButtonPopup"], QToolButton:hover[popupMode="MenuButtonPopup"], QToolButton:pressed[popupMode="MenuButtonPopup"] {
   padding-right: 16px;
 }
 
+QToolButton::menu-button {
+  width: 16px;
+  border: none;
+}
+
 macos {
   font-size: 11pt;
 }
@@ -71,4 +63,3 @@ macos {
 macos QMenu {
   font-size: 13pt;
 }
-
diff --git a/src/collection/collectionfilterwidget.ui b/src/collection/collectionfilterwidget.ui
index 567b6000..2228aceb 100644
--- a/src/collection/collectionfilterwidget.ui
+++ b/src/collection/collectionfilterwidget.ui
@@ -38,10 +38,6 @@
    </item>
    <item>
     <widget class="QToolButton" name="options">
-     <property name="styleSheet">
-      <string notr="true">padding-right: 16px;
-</string>
-     </property>
      <property name="iconSize">
       <size>
        <width>16</width>
diff --git a/src/core/mainwindow.ui b/src/core/mainwindow.ui
index 34727685..37fb9ae5 100644
--- a/src/core/mainwindow.ui
+++ b/src/core/mainwindow.ui
@@ -151,9 +151,6 @@
                   <property name="enabled">
                    <bool>false</bool>
                   </property>
-                  <property name="styleSheet">
-                   <string notr="true">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 94cc623d..9d1ae53b 100644
--- a/src/covermanager/albumcovermanager.ui
+++ b/src/covermanager/albumcovermanager.ui
@@ -87,10 +87,6 @@
           </item>
           <item>
            <widget class="QToolButton" name="view">
-            <property name="styleSheet">
-             <string notr="true">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 f58bcb74..4c060bc0 100644
--- a/src/internet/internetsearchview.ui
+++ b/src/internet/internetsearchview.ui
@@ -54,10 +54,6 @@
               <height>0</height>
              </size>
             </property>
-            <property name="styleSheet">
-             <string notr="true">padding-right: 16px;
-</string>
-            </property>
             <property name="iconSize">
              <size>
               <width>16</width>
@@ -235,7 +231,7 @@
             <x>0</x>
             <y>0</y>
             <width>398</width>
-            <height>520</height>
+            <height>518</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_5">