diff --git a/software/android/app/src/main/res/layout/activity_device_list.xml b/software/android/app/src/main/res/layout/activity_device_list.xml
index eb35006..7391b53 100644
--- a/software/android/app/src/main/res/layout/activity_device_list.xml
+++ b/software/android/app/src/main/res/layout/activity_device_list.xml
@@ -13,18 +13,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
+    android:background="@color/black"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/title_paired_devices"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/black"
         android:padding="24dp"
-        android:textAppearance="?attr/textAppearanceHeadline6"
         android:text="Select a Device"
-        android:visibility="visible"
-        />
+        android:textAppearance="?attr/textAppearanceHeadline6"
+        android:textColor="@color/white"
+        android:visibility="visible" />
 
     <View
         android:id="@+id/divider"
@@ -36,8 +37,9 @@
         android:id="@+id/paired_devices"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:stackFromBottom="false"
-        />
+        android:background="@color/black"
+        android:listSelector="@color/grey_800"
+        android:stackFromBottom="false" />
 
     <View
         android:id="@+id/divider1"
@@ -49,14 +51,13 @@
         android:id="@+id/cancel_picker"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="24dp"
-        android:textAppearance="?attr/textAppearanceButton"
-        android:gravity="center_horizontal"
+        android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:background="?attr/selectableItemBackground"
+        android:gravity="center_horizontal"
+        android:padding="24dp"
         android:text="Cancel"
-        android:visibility="visible"
-        />
+        android:textAppearance="?attr/textAppearanceButton"
+        android:visibility="visible" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/software/android/app/src/main/res/layout/selected_device.xml b/software/android/app/src/main/res/layout/selected_device.xml
index 0c6d658..9129059 100644
--- a/software/android/app/src/main/res/layout/selected_device.xml
+++ b/software/android/app/src/main/res/layout/selected_device.xml
@@ -7,6 +7,7 @@
     android:background="@color/grey_500"
     android:clickable="true"
     android:focusable="true"
+    android:forceDarkAllowed="false"
     android:paddingTop="16dp"
     android:paddingBottom="16dp">