diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
index c76491e6..ecbdbced 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
@@ -153,6 +153,7 @@ class DualPodsCardVH(parent: ViewGroup) :
                 sb.append("\n").append(rawDataHex)
             }
             status.text = sb
+            status.isGone = sb.isEmpty()
         }
     }
 
diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
index 26837e2c..36d2876d 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
@@ -41,26 +41,24 @@ class SinglePodsCardVH(parent: ViewGroup) :
 
         // Charge state
         device.apply {
-            if (this !is HasChargeDetection) {
-                chargingIcon.isInvisible = true
-                chargingLabel.isInvisible = true
-                return@apply
+            if (this is HasChargeDetection) {
+                chargingIcon.isInvisible = isHeadsetBeingCharged
+                chargingLabel.isInvisible = isHeadsetBeingCharged
+            } else {
+                chargingIcon.isGone = true
+                chargingLabel.isGone = true
             }
-
-            chargingIcon.isInvisible = isHeadsetBeingCharged
-            chargingLabel.isInvisible = isHeadsetBeingCharged
         }
 
         // Has ear detection
         device.apply {
-            if (this !is HasEarDetection) {
-                wearIcon.isInvisible = true
-                wearLabel.isInvisible = true
-                return@apply
+            if (this is HasEarDetection) {
+                wearIcon.isInvisible = isBeingWorn
+                wearLabel.isInvisible = isBeingWorn
+            } else {
+                wearIcon.isGone = true
+                wearLabel.isGone = true
             }
-
-            wearIcon.isInvisible = isBeingWorn
-            wearLabel.isInvisible = isBeingWorn
         }
 
         status.apply {
diff --git a/app/src/main/res/layout/overview_pods_dual_item.xml b/app/src/main/res/layout/overview_pods_dual_item.xml
index 69181d2d..2478ef89 100644
--- a/app/src/main/res/layout/overview_pods_dual_item.xml
+++ b/app/src/main/res/layout/overview_pods_dual_item.xml
@@ -12,7 +12,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/card_content"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp">
 
         <ImageView
             android:id="@+id/device_icon"
@@ -107,7 +108,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="4dp"
-            android:minHeight="108dp"
             app:layout_constraintBottom_toTopOf="@id/barrier_bottom"
             app:layout_constraintEnd_toStartOf="@id/pod_case_container"
             app:layout_constraintStart_toStartOf="parent"
@@ -117,8 +117,8 @@
             <ImageView
                 android:id="@+id/pod_left_icon"
                 style="@style/PodInfoItemIcon"
-                android:src="@drawable/ic_airpod_left_24"
                 android:contentDescription="@string/pods_dual_left_label"
+                android:src="@drawable/ic_airpod_left_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_left_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/pod_left_label" />
@@ -436,7 +436,6 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="16dp"
             android:gravity="center_vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/overview_pods_single_item.xml b/app/src/main/res/layout/overview_pods_single_item.xml
index c5c8e988..85647a3a 100644
--- a/app/src/main/res/layout/overview_pods_single_item.xml
+++ b/app/src/main/res/layout/overview_pods_single_item.xml
@@ -12,7 +12,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/card_content"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp">
 
         <ImageView
             android:id="@+id/device_icon"
@@ -96,13 +97,11 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="8dp"
-            android:minHeight="64dp"
             app:layout_constraintBottom_toTopOf="@id/barrier_bottom"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/barrier_top"
-            app:layout_constraintVertical_bias="0.0"
-            app:layout_goneMarginBottom="16dp">
+            app:layout_constraintVertical_bias="0.0">
 
             <ImageView
                 android:id="@+id/battery_icon"
@@ -180,7 +179,6 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="16dp"
             android:gravity="center_vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"