diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml
index f5c8fe30f..0fc4dd349 100644
--- a/app/src/main/res/layout/device_itemv2.xml
+++ b/app/src/main/res/layout/device_itemv2.xml
@@ -111,18 +111,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/device_image"
-                android:layout_marginBottom="4dp"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="0dp"
-                android:layout_marginTop="4dp"
-                android:padding="4dp"
-                android:minWidth="48dp"
+                android:layout_alignParentStart="true"
+                android:layout_margin="4dp"
                 android:orientation="vertical">
 
                 <ImageView
                     android:id="@+id/device_battery_status"
-                    android:layout_width="48dp"
+                    android:layout_width="40dp"
                     android:layout_height="40dp"
+                    android:padding="4dp"
+                    android:scaleType="fitXY"
                     android:tint="@color/secondarytext"
                     card_view:srcCompat="@drawable/level_list_battery" />
 
@@ -144,7 +142,6 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/device_image"
                 android:layout_margin="4dp"
-                android:padding="4dp"
                 android:layout_toEndOf="@id/device_battery_status_box"
                 android:gravity="center_vertical"
                 android:minWidth="36dp"
@@ -154,10 +151,12 @@
                     android:id="@+id/device_action_fetch_activity"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
+                    android:padding="4dp"
+                    android:background="?android:attr/selectableItemBackground"
                     android:clickable="true"
                     android:contentDescription="@string/controlcenter_fetch_activity_data"
+                    android:scaleType="fitXY"
                     android:tint="@color/secondarytext"
-                    android:background="?android:attr/selectableItemBackground"
                     card_view:srcCompat="@drawable/ic_action_fetch_activity_data" />
 
                 <ProgressBar
@@ -177,12 +176,13 @@
                 android:layout_height="40dp"
                 android:layout_below="@id/device_image"
                 android:layout_margin="4dp"
-                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_fetch_activity_box"
+                android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:contentDescription="@string/controlcenter_take_screenshot"
+                android:padding="4dp"
+                android:scaleType="fitXY"
                 android:tint="@color/secondarytext"
-                android:background="?android:attr/selectableItemBackground"
                 card_view:srcCompat="@drawable/ic_screenshot" />
 
             <ImageView
@@ -191,12 +191,13 @@
                 android:layout_height="40dp"
                 android:layout_below="@id/device_image"
                 android:layout_margin="4dp"
-                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_take_screenshot"
+                android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:contentDescription="@string/title_activity_appmanager"
+                android:padding="4dp"
+                android:scaleType="fitXY"
                 android:tint="@color/secondarytext"
-                android:background="?android:attr/selectableItemBackground"
                 card_view:srcCompat="@drawable/ic_action_manage_apps" />
 
             <ImageView
@@ -205,12 +206,13 @@
                 android:layout_height="40dp"
                 android:layout_below="@id/device_image"
                 android:layout_margin="4dp"
-                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_manage_apps"
+                android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:contentDescription="@string/controlcenter_start_configure_alarms"
+                android:padding="4dp"
+                android:scaleType="fitXY"
                 android:tint="@color/secondarytext"
-                android:background="?android:attr/selectableItemBackground"
                 card_view:srcCompat="@drawable/ic_device_set_alarms" />
 
             <ImageView
@@ -219,13 +221,14 @@
                 android:layout_height="40dp"
                 android:layout_below="@id/device_image"
                 android:layout_margin="4dp"
-                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_set_alarms"
-                android:clickable="true"
-                android:tint="@color/secondarytext"
-                card_view:srcCompat="@drawable/ic_activity_graphs"
                 android:background="?android:attr/selectableItemBackground"
-                android:contentDescription="@string/controlcenter_start_activitymonitor" />
+                android:clickable="true"
+                android:contentDescription="@string/controlcenter_start_activitymonitor"
+                android:padding="4dp"
+                android:scaleType="fitXY"
+                android:tint="@color/secondarytext"
+                card_view:srcCompat="@drawable/ic_activity_graphs" />
 
             <ImageView
                 android:id="@+id/device_action_find"
@@ -233,10 +236,11 @@
                 android:layout_height="40dp"
                 android:layout_below="@id/device_image"
                 android:layout_margin="4dp"
-                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_show_activity_graphs"
                 android:clickable="true"
                 android:contentDescription="@string/controlcenter_find_device"
+                android:padding="4dp"
+                android:scaleType="fitXY"
                 android:tint="@color/secondarytext"
                 card_view:srcCompat="@drawable/ic_action_find_lost_device" />