diff --git a/app/src/main/res/drawable-hdpi/ic_select_off.png b/app/src/main/res/drawable-hdpi/ic_select_off.png
deleted file mode 100644
index 644c55711f..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_select_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_select_on.png b/app/src/main/res/drawable-hdpi/ic_select_on.png
deleted file mode 100644
index a1357ccc9c..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_select_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_select_off.png b/app/src/main/res/drawable-mdpi/ic_select_off.png
deleted file mode 100644
index fcb3c6a4ed..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_select_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_select_on.png b/app/src/main/res/drawable-mdpi/ic_select_on.png
deleted file mode 100644
index b46179a7ee..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_select_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_select_off.png b/app/src/main/res/drawable-xhdpi/ic_select_off.png
deleted file mode 100644
index 2368c9e3d6..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_select_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_select_on.png b/app/src/main/res/drawable-xhdpi/ic_select_on.png
deleted file mode 100644
index cb9c641416..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_select_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_select_off.png b/app/src/main/res/drawable-xxhdpi/ic_select_off.png
deleted file mode 100644
index a4bf4e53d9..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_select_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_select_on.png b/app/src/main/res/drawable-xxhdpi/ic_select_on.png
deleted file mode 100644
index d8161d0a2d..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_select_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_select_off.png b/app/src/main/res/drawable-xxxhdpi/ic_select_off.png
deleted file mode 100644
index da08bfe9a9..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_select_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_select_on.png b/app/src/main/res/drawable-xxxhdpi/ic_select_on.png
deleted file mode 100644
index 4d8d48fbed..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_select_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable/media_selected_indicator_off.xml b/app/src/main/res/drawable/media_selected_indicator_off.xml
new file mode 100644
index 0000000000..3bb5a47aa1
--- /dev/null
+++ b/app/src/main/res/drawable/media_selected_indicator_off.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <stroke android:width="1dp" android:color="?android:textColorPrimary"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/media_selected_indicator_on.xml b/app/src/main/res/drawable/media_selected_indicator_on.xml
new file mode 100644
index 0000000000..002385210b
--- /dev/null
+++ b/app/src/main/res/drawable/media_selected_indicator_on.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?accentColor" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mediapicker_media_item.xml b/app/src/main/res/layout/mediapicker_media_item.xml
index 14463ebbc7..42ef099b62 100644
--- a/app/src/main/res/layout/mediapicker_media_item.xml
+++ b/app/src/main/res/layout/mediapicker_media_item.xml
@@ -49,6 +49,20 @@
         android:layout_height="match_parent"
         android:background="@color/transparent_black_90" />
 
+    <FrameLayout
+        android:id="@+id/mediapicker_select_off"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|right|end"
+        android:padding="6dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+        <ImageView
+            android:layout_width="@dimen/small_radial_size"
+            android:layout_height="@dimen/small_radial_size"
+            android:src="@drawable/media_selected_indicator_off" />
+    </FrameLayout>
+
     <FrameLayout
         android:id="@+id/mediapicker_select_on"
         android:layout_width="wrap_content"
@@ -59,29 +73,20 @@
         tools:visibility="visible">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_select_on" />
+            android:layout_width="@dimen/small_radial_size"
+            android:layout_height="@dimen/small_radial_size"
+            android:src="@drawable/media_selected_indicator_on" />
 
         <TextView
             android:id="@+id/mediapicker_select_order"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textColor="@color/core_white"
+            android:textColor="?colorPrimary"
             android:textSize="14dp"
             android:gravity="center"
             tools:text="3"/>
 
     </FrameLayout>
 
-    <ImageView
-        android:id="@+id/mediapicker_select_off"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|right|end"
-        android:padding="6dp"
-        android:src="@drawable/ic_select_off"
-        android:visibility="gone" />
-
 </FrameLayout>
\ No newline at end of file