diff --git a/app/src/main/res/layout/item_gallery_tag.xml b/app/src/main/res/layout/item_gallery_tag.xml
index 13eb72742..f77b91793 100644
--- a/app/src/main/res/layout/item_gallery_tag.xml
+++ b/app/src/main/res/layout/item_gallery_tag.xml
@@ -23,5 +23,4 @@
     android:paddingLeft="12dp"
     android:paddingTop="4dp"
     android:paddingRight="12dp"
-    android:paddingBottom="4dp"
-    android:textColor="@android:color/white" />
+    android:paddingBottom="4dp" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 52d21415e..1fe10a89d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -24,8 +24,8 @@
         <item name="dividerColor">@color/divider</item>
         <item name="drawableColorSecondary">?attr/colorOnSurface</item>
         <item name="drawableColorThemePrimary">?attr/colorPrimary</item>
-        <item name="tagGroupBackgroundColor">?attr/colorSecondary</item>
-        <item name="tagBackgroundColor">?attr/colorTertiary</item>
+        <item name="tagGroupBackgroundColor">?attr/colorSecondaryContainer</item>
+        <item name="tagBackgroundColor">?attr/colorTertiaryContainer</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>