diff --git a/res/drawable-xxhdpi/rounded_mask.9.png b/res/drawable-xxhdpi/rounded_mask.9.png
index d2f27a0d72eb29de556603f22173b11c220f62c0..0016086111043dae7cb0d23dc6674de43e17a626 100644
Binary files a/res/drawable-xxhdpi/rounded_mask.9.png and b/res/drawable-xxhdpi/rounded_mask.9.png differ
diff --git a/res/layout/details.xml b/res/layout/details.xml
index 0c3622bcf5b3e6424079cac098d69bf72aaa24f0..b9e9d554ff381b416730d3b39f6a14cefe4260b0 100644
--- a/res/layout/details.xml
+++ b/res/layout/details.xml
@@ -19,6 +19,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:textSize="16sp"
-    android:textColor="@color/albumset_label_background"
+    android:textColor="@color/color_default_primary_text"
     android:gravity="start"
 />
diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml
index 1a688d589c5dc770582f65b39dcc287295978146..d8708a9bcceb31de513638e554cb4f18cf6b48a6 100644
--- a/res/layout/filtershow_export_dialog.xml
+++ b/res/layout/filtershow_export_dialog.xml
@@ -28,7 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal|center_vertical"
             android:text="@string/select_output_settings"
-            android:textColor="@color/albumset_label_background"
+            android:textColor="@color/color_default_primary_text"
             android:textSize="16sp" />
 
         <GridLayout
diff --git a/res/values/styles.xml b/res/values/styles.xml
index febc66d2235b00cf199b57fc2849d886d51b3236..1bf5dc6186c1bfdfdce5f0b011910451166f2dbe 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,9 +30,9 @@
     </style>
 
     <style name="CustomPopupMenuStyle" parent="@android:style/Widget.PopupMenu">
-        <item name="android:popupBackground">@color/color_default_background</item>
+        <item name="android:popupBackground">@color/color_default_foreground</item>
         <item name="android:textColor">@color/color_default_primary_text</item>
-        <item name="android:itemBackground">@color/color_default_background</item>
+        <item name="android:itemBackground">@color/color_default_foreground</item>
     </style>
 
     <style name="Theme.GalleryBase" parent="@style/Theme.GalleryMotherBase">
@@ -67,7 +67,7 @@
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorPrimaryDark">@color/primaryDark</item>
         <item name="android:colorAccent">@color/accent</item>
-        <item name="android:background">@color/color_default_background</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
     </style>