diff --git a/app/src/main/res/drawable/description_bg_expanded.xml b/app/src/main/res/drawable/description_bg_expanded.xml
index db2eebde7..8a45cb7f5 100644
--- a/app/src/main/res/drawable/description_bg_expanded.xml
+++ b/app/src/main/res/drawable/description_bg_expanded.xml
@@ -4,7 +4,7 @@
         android:topLeftRadius="6dp"
         android:topRightRadius="6dp" />
     <stroke
-        android:color="?attr/colorBackgroundAccent"
+        android:color="?attr/colorOutline"
         android:width="1dp" />
-    <solid android:color="#B3000000" />
+    <solid android:color="?attr/colorSurface" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_drag_indicator_horiz_24dp.xml b/app/src/main/res/drawable/ic_drag_indicator_horiz_24dp.xml
index eb6112246..e8be67fe7 100644
--- a/app/src/main/res/drawable/ic_drag_indicator_horiz_24dp.xml
+++ b/app/src/main/res/drawable/ic_drag_indicator_horiz_24dp.xml
@@ -4,6 +4,6 @@
     <size
         android:width="8dp"
         android:height="1dp" />
-    <solid android:color="?attr/colorBackgroundAccent" />
+    <solid android:color="?android:textColorTertiary" />
     <corners android:radius="1dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_view_image.xml b/app/src/main/res/layout/fragment_view_image.xml
index 93cf2defa..e0bc90a86 100644
--- a/app/src/main/res/layout/fragment_view_image.xml
+++ b/app/src/main/res/layout/fragment_view_image.xml
@@ -70,7 +70,7 @@
                     android:paddingRight="8dp"
                     android:paddingBottom="8dp"
                     android:textAlignment="center"
-                    android:textColor="#eee"
+                    android:textColor="?android:textColorPrimary"
                     android:textSize="?attr/status_text_medium"
                     tools:text="Some media description which might get quite long so that it won't easily fit in one line" />
             </androidx.core.widget.NestedScrollView>