diff --git a/app/src/main/res/layout-land/activity_edit_timer.xml b/app/src/main/res/layout-land/activity_edit_timer.xml
index 46f1b55..a1aece4 100644
--- a/app/src/main/res/layout-land/activity_edit_timer.xml
+++ b/app/src/main/res/layout-land/activity_edit_timer.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
         android:theme="@style/AppTheme.AppBarOverlay"
-        app:popupTheme="@style/AppTheme.PopupOverlay"
+        app:popupTheme="?themedPopupOverlay"
         app:contentInsetStart="72dp">
 
         <!--Unfortunately, we can't use a style that extends from BaseLabel
diff --git a/app/src/main/res/layout/activity_edit_timer.xml b/app/src/main/res/layout/activity_edit_timer.xml
index a0738e9..0d47f3d 100644
--- a/app/src/main/res/layout/activity_edit_timer.xml
+++ b/app/src/main/res/layout/activity_edit_timer.xml
@@ -20,7 +20,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:popupTheme="@style/AppTheme.PopupOverlay"
+            app:popupTheme="?themedPopupOverlay"
             app:contentInsetStart="72dp"
             android:layout_alignParentTop="true">
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index c10ba13..c4a0cb8 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -11,7 +11,7 @@
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
         android:theme="@style/AppTheme.AppBarOverlay"
-        app:popupTheme="@style/AppTheme.PopupOverlay"/>
+        app:popupTheme="?themedPopupOverlay"/>
 
     <include layout="@layout/content_settings"/>