diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml
index 75ffd9652..0dfac2c0b 100644
--- a/app/src/main/res/layout/device_itemv2.xml
+++ b/app/src/main/res/layout/device_itemv2.xml
@@ -12,8 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:foreground="?android:attr/selectableItemBackground"
-        card_view:cardCornerRadius="4dp"
-        card_view:cardElevation="4dp"
+        card_view:cardCornerRadius="3dp"
+        card_view:cardElevation="3dp"
         card_view:contentPadding="8dp">
 
         <RelativeLayout
@@ -137,14 +137,14 @@
                     android:layout_height="wrap_content"
 
                     android:layout_alignParentStart="true"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:orientation="vertical">
 
                     <ImageView
                         android:id="@+id/device_battery_status"
                         android:layout_width="40dp"
                         android:layout_height="40dp"
-                        android:padding="4dp"
+                        android:padding="3dp"
                         android:scaleType="fitXY"
                         card_view:srcCompat="@drawable/level_list_battery"
                         card_view:tint="@color/secondarytext" />
@@ -166,15 +166,15 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/device_image"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginEnd="4dp"
-                    android:layout_marginBottom="4dp"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
+                    android:layout_marginBottom="3dp"
                     android:layout_toEndOf="@id/device_battery_status_box"
                     android:background="?android:attr/selectableItemBackground"
                     android:clickable="true"
                     android:focusable="true"
-                    android:padding="4dp"
+                    android:padding="3dp"
                     android:scaleType="fitXY"
                     card_view:srcCompat="@drawable/ic_settings"
                     card_view:tint="@color/secondarytext" />
@@ -185,7 +185,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_specific_settings"
                     android:orientation="vertical">
 
@@ -193,7 +193,7 @@
                         android:id="@+id/device_fm_frequency"
                         android:layout_width="40dp"
                         android:layout_height="40dp"
-                        android:padding="4dp"
+                        android:padding="3dp"
                         android:scaleType="fitXY"
                         card_view:srcCompat="@drawable/ic_radio"
                         card_view:tint="@color/secondarytext" />
@@ -215,12 +215,12 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_fm_frequency_box"
                     android:background="?android:attr/selectableItemBackground"
                     android:clickable="true"
                     android:focusable="true"
-                    android:padding="4dp"
+                    android:padding="3dp"
                     android:scaleType="fitXY"
                     card_view:srcCompat="@drawable/ic_led_color" />
 
@@ -229,7 +229,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_led_color"
                     android:gravity="center_vertical"
                     android:minWidth="36dp"
@@ -243,7 +243,7 @@
                         android:clickable="true"
                         android:contentDescription="@string/controlcenter_fetch_activity_data"
                         android:focusable="true"
-                        android:padding="4dp"
+                        android:padding="3dp"
                         android:scaleType="fitXY"
                         card_view:srcCompat="@drawable/ic_refresh"
                         card_view:tint="@color/secondarytext" />
@@ -252,7 +252,7 @@
                         android:id="@+id/device_busy_indicator"
                         style="@android:style/Widget.ProgressBar.Horizontal"
                         android:layout_width="match_parent"
-                        android:layout_height="4dp"
+                        android:layout_height="3dp"
                         android:indeterminate="true"
                         android:visibility="visible"
                         tools:visibility="visible" />
@@ -264,13 +264,13 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_action_fetch_activity_box"
                     android:background="?android:attr/selectableItemBackground"
                     android:clickable="true"
                     android:contentDescription="@string/controlcenter_take_screenshot"
                     android:focusable="true"
-                    android:padding="4dp"
+                    android:padding="3dp"
                     android:scaleType="fitXY"
                     card_view:srcCompat="@drawable/ic_screenshot"
                     card_view:tint="@color/secondarytext" />
@@ -280,13 +280,13 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_action_take_screenshot"
                     android:background="?android:attr/selectableItemBackground"
                     android:clickable="true"
                     android:contentDescription="@string/title_activity_appmanager"
                     android:focusable="true"
-                    android:padding="4dp"
+                    android:padding="3dp"
                     android:scaleType="fitXY"
                     card_view:srcCompat="@drawable/ic_action_manage_apps"
                     card_view:tint="@color/secondarytext" />
@@ -296,13 +296,13 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_action_manage_apps"
                     android:background="?android:attr/selectableItemBackground"
                     android:clickable="true"
                     android:contentDescription="@string/controlcenter_start_configure_alarms"
                     android:focusable="true"
-                    android:padding="4dp"
+                    android:padding="3dp"
                     android:scaleType="fitXY"
                     card_view:srcCompat="@drawable/ic_access_alarms"
                     card_view:tint="@color/secondarytext" />
@@ -312,13 +312,13 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_action_set_alarms"
                     android:background="?android:attr/selectableItemBackground"
                     android:clickable="true"
                     android:contentDescription="@string/controlcenter_start_activitymonitor"
                     android:focusable="true"
-                    android:padding="4dp"
+                    android:padding="3dp"
                     android:scaleType="fitXY"
                     card_view:srcCompat="@drawable/ic_activity_graphs"
                     card_view:tint="@color/secondarytext" />
@@ -328,13 +328,13 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_action_show_activity_graphs"
                     android:background="?android:attr/selectableItemBackground"
                     android:clickable="true"
                     android:contentDescription="@string/controlcenter_start_activity_tracks"
                     android:focusable="true"
-                    android:padding="4dp"
+                    android:padding="3dp"
                     android:scaleType="fitXY"
                     card_view:srcCompat="@drawable/ic_activity_tracks"
                     card_view:tint="@color/secondarytext" />
@@ -344,12 +344,12 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_action_show_activity_tracks"
                     android:clickable="true"
                     android:contentDescription="@string/controlcenter_find_device"
                     android:focusable="true"
-                    android:padding="4dp"
+                    android:padding="3dp"
                     android:scaleType="fitXY"
                     card_view:srcCompat="@drawable/ic_action_find_lost_device"
                     card_view:tint="@color/secondarytext" />
@@ -359,12 +359,12 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/device_image"
-                    android:layout_margin="4dp"
+                    android:layout_margin="3dp"
                     android:layout_toEndOf="@id/device_action_find"
                     android:clickable="true"
                     android:contentDescription="@string/controlcenter_calibrate_device"
                     android:focusable="true"
-                    android:padding="4dp"
+                    android:padding="3dp"
                     android:scaleType="fitXY"
                     card_view:srcCompat="@drawable/ic_activity_unknown"
                     card_view:tint="@color/secondarytext" />