diff --git a/data/style/strawberry.css b/data/style/strawberry.css
index 199b5480..5574cea8 100644
--- a/data/style/strawberry.css
+++ b/data/style/strawberry.css
@@ -35,32 +35,32 @@
   background-color: %palette-base;
 }
 
-QToolButton {
+QToolButton[accessibleName="MenuPopupToolButton"] {
   border: 2px solid transparent;
   border-radius: 3px;
   padding: 1px;
 }
 
-QToolButton:hover {
+QToolButton:hover[accessibleName="MenuPopupToolButton"] {
   border: 2px solid %palette-highlight;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton:pressed {
+QToolButton:pressed[accessibleName="MenuPopupToolButton"] {
   border: 2px solid %palette-highlight-darker;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton[popupMode="MenuButtonPopup"], QToolButton:hover[popupMode="MenuButtonPopup"], QToolButton:pressed[popupMode="MenuButtonPopup"] {
+QToolButton[popupMode="MenuButtonPopup"][accessibleName="MenuPopupToolButton"], QToolButton:hover[popupMode="MenuButtonPopup"][accessibleName="MenuPopupToolButton"], QToolButton:pressed[popupMode="MenuButtonPopup"][accessibleName="MenuPopupToolButton"] {
   padding-right: 16px;
 }
 
 /* For backwards compatibility with Qt 5 as it does not support property name */
-QToolButton[popupMode="1"], QToolButton:hover[popupMode="1"], QToolButton:pressed[popupMode="1"] {
+QToolButton[popupMode="1"][accessibleName="MenuPopupToolButton"], QToolButton:hover[popupMode="1"][accessibleName="MenuPopupToolButton"], QToolButton:pressed[popupMode="1"][accessibleName="MenuPopupToolButton"] {
   padding-right: 16px;
 }
 
-QToolButton::menu-button {
+QToolButton::menu-button[accessibleName="MenuPopupToolButton"] {
   width: 16px;
   border: none;
 }
diff --git a/src/collection/collectionfilterwidget.ui b/src/collection/collectionfilterwidget.ui
index 2228aceb..c9c437fd 100644
--- a/src/collection/collectionfilterwidget.ui
+++ b/src/collection/collectionfilterwidget.ui
@@ -38,6 +38,9 @@
    </item>
    <item>
     <widget class="QToolButton" name="options">
+     <property name="accessibleName">
+      <string>MenuPopupToolButton</string>
+     </property>
      <property name="iconSize">
       <size>
        <width>16</width>
diff --git a/src/core/mainwindow.ui b/src/core/mainwindow.ui
index a82c33dc..826fdbe2 100644
--- a/src/core/mainwindow.ui
+++ b/src/core/mainwindow.ui
@@ -122,6 +122,9 @@
                 </property>
                 <item>
                  <widget class="QToolButton" name="back_button">
+                  <property name="accessibleName">
+                   <string>MenuPopupToolButton</string>
+                  </property>
                   <property name="iconSize">
                    <size>
                     <width>32</width>
@@ -135,6 +138,9 @@
                 </item>
                 <item>
                  <widget class="QToolButton" name="pause_play_button">
+                  <property name="accessibleName">
+                   <string>MenuPopupToolButton</string>
+                  </property>
                   <property name="iconSize">
                    <size>
                     <width>32</width>
@@ -151,6 +157,9 @@
                   <property name="enabled">
                    <bool>false</bool>
                   </property>
+                  <property name="accessibleName">
+                   <string>MenuPopupToolButton</string>
+                  </property>
                   <property name="iconSize">
                    <size>
                     <width>32</width>
@@ -167,6 +176,9 @@
                 </item>
                 <item>
                  <widget class="QToolButton" name="forward_button">
+                  <property name="accessibleName">
+                   <string>MenuPopupToolButton</string>
+                  </property>
                   <property name="iconSize">
                    <size>
                     <width>32</width>
@@ -205,6 +217,9 @@
                    </item>
                    <item>
                     <widget class="QToolButton" name="button_love">
+                     <property name="accessibleName">
+                      <string>MenuPopupToolButton</string>
+                     </property>
                      <property name="iconSize">
                       <size>
                        <width>32</width>
diff --git a/src/covermanager/albumcovermanager.ui b/src/covermanager/albumcovermanager.ui
index 9d1ae53b..7f22d4de 100644
--- a/src/covermanager/albumcovermanager.ui
+++ b/src/covermanager/albumcovermanager.ui
@@ -87,6 +87,9 @@
           </item>
           <item>
            <widget class="QToolButton" name="view">
+            <property name="accessibleName">
+             <string>MenuPopupToolButton</string>
+            </property>
             <property name="text">
              <string>View</string>
             </property>
diff --git a/src/dialogs/edittagdialog.ui b/src/dialogs/edittagdialog.ui
index 21a55440..eaf5283c 100644
--- a/src/dialogs/edittagdialog.ui
+++ b/src/dialogs/edittagdialog.ui
@@ -635,6 +635,9 @@
                 </item>
                 <item>
                  <widget class="QPushButton" name="tags_art_button">
+                  <property name="accessibleName">
+                   <string>MenuPopupToolButton</string>
+                  </property>
                   <property name="text">
                    <string>Change art</string>
                   </property>
diff --git a/src/internet/internetsearchview.ui b/src/internet/internetsearchview.ui
index 4c060bc0..38269fce 100644
--- a/src/internet/internetsearchview.ui
+++ b/src/internet/internetsearchview.ui
@@ -54,6 +54,9 @@
               <height>0</height>
              </size>
             </property>
+            <property name="accessibleName">
+             <string>MenuPopupToolButton</string>
+            </property>
             <property name="iconSize">
              <size>
               <width>16</width>
diff --git a/src/settings/contextsettingspage.ui b/src/settings/contextsettingspage.ui
index a7cb590b..85ba6fb9 100644
--- a/src/settings/contextsettingspage.ui
+++ b/src/settings/contextsettingspage.ui
@@ -74,6 +74,9 @@
          </item>
          <item row="0" column="2">
           <widget class="QToolButton" name="context_exp_chooser1">
+           <property name="accessibleName">
+            <string>MenuPopupToolButton</string>
+           </property>
            <property name="text">
             <string/>
            </property>
@@ -102,6 +105,9 @@
          </item>
          <item row="1" column="2">
           <widget class="QToolButton" name="context_exp_chooser2">
+           <property name="accessibleName">
+            <string>MenuPopupToolButton</string>
+           </property>
            <property name="text">
             <string/>
            </property>
diff --git a/src/settings/notificationssettingspage.ui b/src/settings/notificationssettingspage.ui
index b649585c..6d9b0f9c 100644
--- a/src/settings/notificationssettingspage.ui
+++ b/src/settings/notificationssettingspage.ui
@@ -236,6 +236,9 @@
            <property name="enabled">
             <bool>false</bool>
            </property>
+           <property name="accessibleName">
+            <string>MenuPopupToolButton</string>
+           </property>
            <property name="text">
             <string/>
            </property>
@@ -267,6 +270,9 @@
            <property name="enabled">
             <bool>false</bool>
            </property>
+           <property name="accessibleName">
+            <string>MenuPopupToolButton</string>
+           </property>
            <property name="text">
             <string/>
            </property>