diff --git a/app/src/main/res/drawable/media_camera_button_background.xml b/app/src/main/res/drawable/media_camera_button_background.xml
index e129933aea..d0c63b6d00 100644
--- a/app/src/main/res/drawable/media_camera_button_background.xml
+++ b/app/src/main/res/drawable/media_camera_button_background.xml
@@ -10,7 +10,7 @@
     </item>
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/core_white" />
+            <solid android:color="?backgroundSecondary" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/media_count_button_background.xml b/app/src/main/res/drawable/media_count_button_background.xml
index a5fdc45a06..6445a54934 100644
--- a/app/src/main/res/drawable/media_count_button_background.xml
+++ b/app/src/main/res/drawable/media_count_button_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="@color/transparent_white_40">
     <item android:id="@+id/mask">
         <shape>
@@ -8,5 +7,10 @@
             <solid android:color="@color/white" />
         </shape>
     </item>
-    <item android:drawable="@drawable/pill" />
+    <item>
+        <shape>
+            <corners android:radius="1000dp" />
+            <solid android:color="?backgroundSecondary" />
+        </shape>
+    </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/media_count_number_background.xml b/app/src/main/res/drawable/media_count_number_background.xml
index 1ffe671559..5eba0a6df3 100644
--- a/app/src/main/res/drawable/media_count_number_background.xml
+++ b/app/src/main/res/drawable/media_count_number_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="1000dp" />
-    <solid android:color="@color/core_white" />
+    <solid android:color="?colorAccent" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pill.xml b/app/src/main/res/drawable/pill.xml
deleted file mode 100644
index f279f0f921..0000000000
--- a/app/src/main/res/drawable/pill.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="1000dp" />
-    <solid android:color="?colorAccent" />
-</shape>
diff --git a/app/src/main/res/layout/mediasend_activity.xml b/app/src/main/res/layout/mediasend_activity.xml
index cc02afd1f3..7ad470ee8f 100644
--- a/app/src/main/res/layout/mediasend_activity.xml
+++ b/app/src/main/res/layout/mediasend_activity.xml
@@ -37,7 +37,7 @@
             android:paddingBottom="2dp"
             android:gravity="center"
             android:background="@drawable/media_count_number_background"
-            android:textColor="?colorAccent"
+            android:textColor="?colorPrimary"
             android:textSize="18sp"
             tools:text="3" />
 
@@ -60,7 +60,7 @@
         android:layout_gravity="bottom|start"
         android:padding="12dp"
         android:src="@drawable/ic_camera_filled_24"
-        app:tint="@color/core_grey_60"
+        app:tint="?android:textColorPrimary"
         android:background="@drawable/media_camera_button_background"
         android:elevation="4dp"
         android:visibility="gone"