diff --git a/app/src/mobile/res/drawable/ic_cast_mobile.xml b/app/src/mobile/res/drawable/ic_cast_mobile.xml
index 4c7690700..2f9f9429e 100644
--- a/app/src/mobile/res/drawable/ic_cast_mobile.xml
+++ b/app/src/mobile/res/drawable/ic_cast_mobile.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
diff --git a/app/src/mobile/res/drawable/ic_cast_tv.xml b/app/src/mobile/res/drawable/ic_cast_tv.xml
index 38214101e..5e58f3be5 100644
--- a/app/src/mobile/res/drawable/ic_cast_tv.xml
+++ b/app/src/mobile/res/drawable/ic_cast_tv.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
diff --git a/app/src/mobile/res/layout/adapter_device.xml b/app/src/mobile/res/layout/adapter_device.xml
index 1e9b94772..6a9a8757b 100644
--- a/app/src/mobile/res/layout/adapter_device.xml
+++ b/app/src/mobile/res/layout/adapter_device.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
-    android:background="@drawable/shape_text"
+    android:background="@drawable/shape_accent_normal"
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
@@ -12,7 +12,7 @@
         android:id="@+id/type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:src="@drawable/ic_cast_mobile" />
+        tools:src="@drawable/ic_cast_tv" />
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -25,7 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="@color/white"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="14sp"
             tools:text="Google Chrome Cast" />
 
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:singleLine="true"
-            android:textColor="@color/white"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="12sp"
             tools:text="127.0.0.1" />
 
diff --git a/app/src/mobile/res/layout/dialog_control.xml b/app/src/mobile/res/layout/dialog_control.xml
index 189026db7..9582241c2 100644
--- a/app/src/mobile/res/layout/dialog_control.xml
+++ b/app/src/mobile/res/layout/dialog_control.xml
@@ -47,8 +47,8 @@
         android:orientation="horizontal"
         android:visibility="gone"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:itemCount="1"
-        tools:listitem="@layout/adapter_parse_dark"
+        tools:itemCount="5"
+        tools:listitem="@layout/adapter_parse_light"
         tools:visibility="visible" />
 
     <TextView