diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt b/app-common/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt
index 74276382..4e9bb87f 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt
@@ -1,5 +1,8 @@
 package eu.darken.capod.pods.core
 
+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+
 interface DualPodDevice : PodDevice {
 
     enum class Pod {
@@ -10,4 +13,12 @@ interface DualPodDevice : PodDevice {
     val batteryLeftPodPercent: Float?
 
     val batteryRightPodPercent: Float?
+
+    @get:DrawableRes
+    val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_gen1_left
+
+    @get:DrawableRes
+    val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_gen1_right
 }
\ No newline at end of file
diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/HasCase.kt b/app-common/src/main/java/eu/darken/capod/pods/core/HasCase.kt
index afdfa009..7efcdb55 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/HasCase.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/HasCase.kt
@@ -1,9 +1,15 @@
 package eu.darken.capod.pods.core
 
+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+
 interface HasCase {
 
     val batteryCasePercent: Float?
 
     val isCaseCharging: Boolean
 
+    @get:DrawableRes
+    val caseIcon: Int
+        get() = R.drawable.devic_airpods_gen1_case
 }
\ No newline at end of file
diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt b/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
index 5272ede2..333f30aa 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt
@@ -60,31 +60,31 @@ interface PodDevice {
     @JsonClass(generateAdapter = false)
     enum class Model(
         val label: String,
-        @DrawableRes val iconRes: Int = R.drawable.ic_device_generic_earbuds,
+        @DrawableRes val iconRes: Int = R.drawable.devic_earbuds_generic_both,
     ) {
         @Json(name = "airpods.gen1") AIRPODS_GEN1(
             label = "AirPods (Gen 1)",
-            iconRes = R.drawable.ic_device_airpods_gen1,
+            iconRes = R.drawable.devic_airpods_gen1_both,
         ),
         @Json(name = "airpods.gen2") AIRPODS_GEN2(
             "AirPods (Gen 2)",
-            R.drawable.ic_device_airpods_gen2,
+            R.drawable.devic_airpods_gen2_both,
         ),
         @Json(name = "airpods.gen3") AIRPODS_GEN3(
             "AirPods (Gen 3)",
-            R.drawable.ic_device_airpods_gen2,
+            R.drawable.devic_airpods_gen2_both,
         ),
         @Json(name = "airpods.pro") AIRPODS_PRO(
             "AirPods Pro",
-            R.drawable.ic_device_airpods_gen2
+            R.drawable.devic_airpods_pro2_both
         ),
         @Json(name = "airpods.pro2") AIRPODS_PRO2(
             "AirPods Pro 2",
-            R.drawable.ic_device_airpods_gen2
+            R.drawable.devic_airpods_pro2_both
         ),
         @Json(name = "airpods.max") AIRPODS_MAX(
             "AirPods Max",
-            R.drawable.ic_device_generic_headphones
+            R.drawable.devic_headphones_generic
         ),
         @Json(name = "beats.flex") BEATS_FLEX(
             "Beats Flex"
@@ -105,13 +105,16 @@ interface PodDevice {
             "Power Beats Pro"
         ),
         @Json(name = "fakes.tws.i99999") FAKE_AIRPODS_GEN1(
-            "AirPods (Gen 1)? \uD83C\uDFAD"
+            "AirPods (Gen 1)? \uD83C\uDFAD",
+            R.drawable.devic_airpods_gen1_both,
         ),
         @Json(name = "fakes.varunr.airpodspro") FAKE_AIRPODS_PRO(
-            "AirPods Pro? \uD83C\uDFAD"
+            "AirPods Pro? \uD83C\uDFAD",
+            R.drawable.devic_airpods_pro2_both,
         ),
         @Json(name = "fakes.generic.airpods.gen3") FAKE_AIRPODS_GEN3(
-            "AirPods (Gen 3)? \uD83C\uDFAD"
+            "AirPods (Gen 3)? \uD83C\uDFAD",
+            R.drawable.devic_airpods_gen2_both,
         ),
         @Json(name = "unknown") UNKNOWN(
             "Unknown"
diff --git a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt b/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt
index 8e5706dc..29163a2b 100644
--- a/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt
+++ b/app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt
@@ -1,5 +1,7 @@
 package eu.darken.capod.pods.core.apple.airpods
 
+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
@@ -26,6 +28,22 @@ data class AirPodsPro(
 
     override val model: PodDevice.Model = PodDevice.Model.AIRPODS_PRO
 
+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
     override val batteryCasePercent: Float?
         get() = super.batteryCasePercent ?: cachedBatteryPercentage
 
diff --git a/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png b/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png
new file mode 100644
index 00000000..d20bd1b9
Binary files /dev/null and b/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png differ
diff --git a/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png b/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png
new file mode 100644
index 00000000..e84afd33
Binary files /dev/null and b/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png differ
diff --git a/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png b/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png
new file mode 100644
index 00000000..0efc1a8e
Binary files /dev/null and b/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png differ
diff --git a/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png b/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png
new file mode 100644
index 00000000..9c7fd5f4
Binary files /dev/null and b/app-common/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png differ
diff --git a/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png b/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png
new file mode 100644
index 00000000..7362e5cb
Binary files /dev/null and b/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png differ
diff --git a/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png b/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png
new file mode 100644
index 00000000..9b7f57ed
Binary files /dev/null and b/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png differ
diff --git a/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png b/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png
new file mode 100644
index 00000000..c7b32789
Binary files /dev/null and b/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png differ
diff --git a/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png b/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png
new file mode 100644
index 00000000..71cb1e21
Binary files /dev/null and b/app-common/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png differ
diff --git a/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png b/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png
new file mode 100644
index 00000000..69396fba
Binary files /dev/null and b/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png differ
diff --git a/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png b/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png
new file mode 100644
index 00000000..43e04e56
Binary files /dev/null and b/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png differ
diff --git a/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png b/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png
new file mode 100644
index 00000000..f94f971b
Binary files /dev/null and b/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png differ
diff --git a/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png b/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png
new file mode 100644
index 00000000..a5de7551
Binary files /dev/null and b/app-common/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png differ
diff --git a/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png b/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png
new file mode 100644
index 00000000..c1108f0c
Binary files /dev/null and b/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png differ
diff --git a/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png b/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png
new file mode 100644
index 00000000..f30e7ee0
Binary files /dev/null and b/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png differ
diff --git a/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png b/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png
new file mode 100644
index 00000000..9b4c013e
Binary files /dev/null and b/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png differ
diff --git a/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png b/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png
new file mode 100644
index 00000000..92155130
Binary files /dev/null and b/app-common/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png differ
diff --git a/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png b/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png
new file mode 100644
index 00000000..aa886eb1
Binary files /dev/null and b/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png differ
diff --git a/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png b/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png
new file mode 100644
index 00000000..2f0c197d
Binary files /dev/null and b/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png differ
diff --git a/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png b/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png
new file mode 100644
index 00000000..d2684eca
Binary files /dev/null and b/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png differ
diff --git a/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png b/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png
new file mode 100644
index 00000000..e0e56830
Binary files /dev/null and b/app-common/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png differ
diff --git a/app-common/src/main/res/drawable/ic_airpod_both_24.xml b/app-common/src/main/res/drawable/devic_airpods_gen1_both.xml
similarity index 100%
rename from app-common/src/main/res/drawable/ic_airpod_both_24.xml
rename to app-common/src/main/res/drawable/devic_airpods_gen1_both.xml
diff --git a/app-common/src/main/res/drawable/ic_airpod_case_24.xml b/app-common/src/main/res/drawable/devic_airpods_gen1_case.xml
similarity index 100%
rename from app-common/src/main/res/drawable/ic_airpod_case_24.xml
rename to app-common/src/main/res/drawable/devic_airpods_gen1_case.xml
diff --git a/app-common/src/main/res/drawable/ic_airpod_left_24.xml b/app-common/src/main/res/drawable/devic_airpods_gen1_left.xml
similarity index 100%
rename from app-common/src/main/res/drawable/ic_airpod_left_24.xml
rename to app-common/src/main/res/drawable/devic_airpods_gen1_left.xml
diff --git a/app-common/src/main/res/drawable/ic_airpod_right_24.xml b/app-common/src/main/res/drawable/devic_airpods_gen1_right.xml
similarity index 100%
rename from app-common/src/main/res/drawable/ic_airpod_right_24.xml
rename to app-common/src/main/res/drawable/devic_airpods_gen1_right.xml
diff --git a/app-common/src/main/res/drawable/ic_device_airpods_gen2.xml b/app-common/src/main/res/drawable/devic_airpods_gen2_both.xml
similarity index 100%
rename from app-common/src/main/res/drawable/ic_device_airpods_gen2.xml
rename to app-common/src/main/res/drawable/devic_airpods_gen2_both.xml
diff --git a/app-common/src/main/res/drawable/ic_device_generic_earbuds.xml b/app-common/src/main/res/drawable/devic_earbuds_generic_both.xml
similarity index 100%
rename from app-common/src/main/res/drawable/ic_device_generic_earbuds.xml
rename to app-common/src/main/res/drawable/devic_earbuds_generic_both.xml
diff --git a/app-common/src/main/res/drawable/ic_device_generic_headphones.xml b/app-common/src/main/res/drawable/devic_headphones_generic.xml
similarity index 100%
rename from app-common/src/main/res/drawable/ic_device_generic_headphones.xml
rename to app-common/src/main/res/drawable/devic_headphones_generic.xml
diff --git a/app-common/src/main/res/drawable/ic_device_airpods_gen1.xml b/app-common/src/main/res/drawable/ic_device_airpods_gen1.xml
deleted file mode 100644
index 2f765df4..00000000
--- a/app-common/src/main/res/drawable/ic_device_airpods_gen1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="m6,11c-1.9954,0 -3,-2.0093 -3,-4s1.0046,-4 3,-4c3.1837,0 5,3.4637 5,6.4886v10.0114c0,0.8284 -0.6716,1.5 -1.5,1.5 -0.8284,0 -1.5,-0.6716 -1.5,-1.5v-8.0113c0,-0.381 -0.1426,-0.7378 -0.3906,-1.0098 -0.4267,0.3435 -0.9676,0.5211 -1.6094,0.5211zM9,11.4887v8.0113c0,0.2761 0.2239,0.5 0.5,0.5s0.5,-0.2239 0.5,-0.5v-10.0114c0,-2.5454 -1.5434,-5.4886 -4,-5.4886 -1.2546,0 -2,1.4907 -2,3s0.7454,3 2,3c0.7809,0 1.2592,-0.3588 1.5257,-1.1581 0.2094,-0.6282 1.1516,-0.3212 0.9508,0.3097l-0.1878,0.5902c0.4499,0.4603 0.7114,1.0823 0.7114,1.7468zM6,8c-0.5523,0 -1,-0.4477 -1,-1s0.4477,-1 1,-1 1,0.4477 1,1 -0.4477,1 -1,1zM16,11.4887v8.0113c0,0.8284 -0.6716,1.5 -1.5,1.5s-1.5,-0.6716 -1.5,-1.5v-10.0114c0,-3.0249 1.8163,-6.4886 5,-6.4886 1.9954,0 3,2.0093 3,4s-1.0046,4 -3,4c-0.6418,0 -1.1826,-0.1777 -1.6094,-0.5211 -0.248,0.2721 -0.3906,0.6288 -0.3906,1.0098zM15.5235,9.1516c-0.2008,-0.631 0.7414,-0.9379 0.9508,-0.3097 0.2665,0.7994 0.7448,1.1581 1.5257,1.1581 1.2546,0 2,-1.4907 2,-3s-0.7454,-3 -2,-3c-2.4566,0 -4,2.9433 -4,5.4886v10.0114c0,0.2761 0.2239,0.5 0.5,0.5s0.5,-0.2239 0.5,-0.5v-8.0113c0,-0.6645 0.2615,-1.2865 0.7114,-1.7468zM18,8c-0.5523,0 -1,-0.4477 -1,-1s0.4477,-1 1,-1 1,0.4477 1,1 -0.4477,1 -1,1z" />
-</vector>
diff --git a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/pods/DualPodsCardVH.kt b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/pods/DualPodsCardVH.kt
index 1cfea457..09b1d87c 100644
--- a/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/pods/DualPodsCardVH.kt
+++ b/app-wear/src/main/java/eu/darken/capod/wear/ui/overview/cards/pods/DualPodsCardVH.kt
@@ -37,6 +37,8 @@ class DualPodsCardVH(parent: ViewGroup) :
             }
         }
         deviceIcon.setImageResource(device.iconRes)
+        podLeftIcon.setImageResource(device.leftPodIcon)
+        podRightIcon.setImageResource(device.rightPodIcon)
 
         lastSeen.text = device.lastSeenFormatted(item.now)
 
@@ -91,6 +93,7 @@ class DualPodsCardVH(parent: ViewGroup) :
         // Case charge state
         device.apply {
             if (this is HasCase) {
+                podCaseIcon.setImageResource(caseIcon)
                 podCaseBatteryIcon.isGone = false
                 podCaseBatteryIcon.setImageResource(getBatteryDrawable(batteryCasePercent))
                 podCaseBatteryLabel.text = getBatteryLevelCase(context)
diff --git a/app-wear/src/main/res/layout/overview_pods_dual_item.xml b/app-wear/src/main/res/layout/overview_pods_dual_item.xml
index 7b46c384..b5e2f0dd 100644
--- a/app-wear/src/main/res/layout/overview_pods_dual_item.xml
+++ b/app-wear/src/main/res/layout/overview_pods_dual_item.xml
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginBottom="2dp"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_airpod_both_24" />
+        app:srcCompat="@drawable/devic_airpods_gen1_both" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/name"
@@ -71,7 +71,7 @@
             style="@style/PodInfoItemIcon"
             android:layout_marginHorizontal="2dp"
             android:contentDescription="@string/pods_dual_left_label"
-            android:src="@drawable/ic_airpod_left_24"
+            android:src="@drawable/devic_airpods_gen1_left"
             app:layout_constraintEnd_toStartOf="@+id/pod_left_wear_icon"
             app:layout_constraintHorizontal_chainStyle="spread"
             app:layout_constraintStart_toStartOf="parent"
@@ -145,7 +145,7 @@
         <ImageView
             android:id="@+id/pod_case_icon"
             style="@style/PodInfoItemIcon"
-            android:src="@drawable/ic_airpod_case_24"
+            android:src="@drawable/devic_airpods_gen1_case"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -198,7 +198,7 @@
             style="@style/PodInfoItemIcon"
             android:layout_marginHorizontal="2dp"
             android:contentDescription="@string/pods_dual_right_label"
-            android:src="@drawable/ic_airpod_right_24"
+            android:src="@drawable/devic_airpods_gen1_right"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintStart_toEndOf="@+id/pod_right_wear_icon"
diff --git a/app-wear/src/main/res/layout/overview_pods_single_item.xml b/app-wear/src/main/res/layout/overview_pods_single_item.xml
index 14fc0c97..7bd3091c 100644
--- a/app-wear/src/main/res/layout/overview_pods_single_item.xml
+++ b/app-wear/src/main/res/layout/overview_pods_single_item.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_device_generic_headphones" />
+        app:srcCompat="@drawable/devic_headphones_generic" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/name"
diff --git a/app-wear/src/main/res/values/styles.xml b/app-wear/src/main/res/values/styles.xml
index f99ab4ff..68b8e098 100644
--- a/app-wear/src/main/res/values/styles.xml
+++ b/app-wear/src/main/res/values/styles.xml
@@ -4,6 +4,10 @@
     <style name="PodInfoItemIcon" parent="TextAppearance.Material3.BodySmall">
         <item name="android:layout_height">16dp</item>
         <item name="android:layout_width">16dp</item>
+        <item name="android:tintMode">multiply</item>
+        <item name="android:tint">?android:attr/colorAccent</item>
+        <item name="tint">?android:attr/colorAccent</item>
+
     </style>
 
     <style name="PodInfoItemText" parent="TextAppearance.Material3.BodyMedium">
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 f60105b0..a14dece9 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
@@ -39,6 +39,8 @@ class DualPodsCardVH(parent: ViewGroup) :
             }
         }
         deviceIcon.setImageResource(device.iconRes)
+        podLeftIcon.setImageResource(device.leftPodIcon)
+        podRightIcon.setImageResource(device.rightPodIcon)
 
         lastSeen.text = context.getString(R.string.last_seen_x, device.lastSeenFormatted(item.now))
         firstSeen.text = context.getString(R.string.first_seen_x, device.firstSeenFormatted(item.now))
@@ -109,6 +111,7 @@ class DualPodsCardVH(parent: ViewGroup) :
         // Case charge state
         device.apply {
             if (this is HasCase) {
+                podCaseIcon.setImageResource(caseIcon)
                 podCaseBatteryIcon.isGone = false
                 podCaseBatteryIcon.setImageResource(getBatteryDrawable(batteryCasePercent))
                 podCaseBatteryLabel.text = getBatteryLevelCase(context)
diff --git a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt
index 12b3003f..cd30f8b8 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt
@@ -172,6 +172,7 @@ class WidgetProvider : AppWidgetProvider() {
         setTextViewText(R.id.headphones_label, podDevice.getLabel(context))
 
         // Left
+        setImageViewResource(R.id.pod_left_icon, podDevice.leftPodIcon)
         setTextViewText(R.id.pod_left_label, podDevice.getBatteryLevelLeftPod(context))
         setViewVisibility(
             R.id.pod_left_charging,
@@ -183,6 +184,7 @@ class WidgetProvider : AppWidgetProvider() {
         )
 
         // Case
+        (podDevice as? HasCase)?.let { setImageViewResource(R.id.pod_case_icon, it.caseIcon) }
         setTextViewText(R.id.pod_case_label, (podDevice as? HasCase)?.getBatteryLevelCase(context))
         setViewVisibility(
             R.id.pod_case_charging,
@@ -190,6 +192,7 @@ class WidgetProvider : AppWidgetProvider() {
         )
 
         // Right
+        setImageViewResource(R.id.pod_right_icon, podDevice.rightPodIcon)
         setTextViewText(R.id.pod_right_label, podDevice.getBatteryLevelRightPod(context))
         setViewVisibility(
             R.id.pod_right_charging,
@@ -216,6 +219,7 @@ class WidgetProvider : AppWidgetProvider() {
         setOnClickPendingIntent(R.id.widget_root, pendingIntent)
 
         setTextViewText(R.id.headphones_label, podDevice.getLabel(context))
+        setImageViewResource(R.id.headphones_icon, podDevice.iconRes)
         setImageViewResource(R.id.headphones_battery_icon, getBatteryDrawable(podDevice.batteryHeadsetPercent))
         setTextViewText(R.id.headphones_battery_label, podDevice.getBatteryLevelHeadset(context))
 
diff --git a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt
index 6848e134..d1289df5 100644
--- a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt
+++ b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotificationViewFactory.kt
@@ -27,15 +27,18 @@ class MonitorNotificationViewFactory @Inject constructor(
     ).apply {
         device.apply {
             // Left
+            setImageViewResource(R.id.pod_left_icon, device.leftPodIcon)
             setTextViewText(R.id.pod_left_label, getBatteryLevelLeftPod(context))
             setViewVisibility(R.id.pod_left_charging, if (isLeftPodCharging) View.VISIBLE else View.GONE)
             setViewVisibility(R.id.pod_left_ear, if (isLeftPodInEar) View.VISIBLE else View.GONE)
 
             // Case
+            setImageViewResource(R.id.pod_case_icon, device.caseIcon)
             setTextViewText(R.id.pod_case_label, getBatteryLevelCase(context))
             setViewVisibility(R.id.pod_case_charging, if (isCaseCharging) View.VISIBLE else View.GONE)
 
             // Right
+            setImageViewResource(R.id.pod_right_icon, device.rightPodIcon)
             setTextViewText(R.id.pod_right_label, getBatteryLevelRightPod(context))
             setViewVisibility(R.id.pod_right_charging, if (isRightPodCharging) View.VISIBLE else View.GONE)
             setViewVisibility(R.id.pod_right_ear, if (isRightPodInEar) View.VISIBLE else View.GONE)
@@ -48,6 +51,7 @@ class MonitorNotificationViewFactory @Inject constructor(
     ).apply {
         device.apply {
             setTextViewText(R.id.headphones_label, getLabel(context))
+            setImageViewResource(R.id.headphones_icon, device.iconRes)
             setImageViewResource(R.id.headphones_battery_icon, getBatteryDrawable(batteryHeadsetPercent))
             setTextViewText(R.id.headphones_battery_label, getBatteryLevelHeadset(context))
             if (this is HasEarDetection) {
diff --git a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt
index 460460f8..40e10a18 100644
--- a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt
+++ b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt
@@ -50,7 +50,7 @@ class MonitorNotifications @Inject constructor(
             setChannelId(NOTIFICATION_CHANNEL_ID)
             setContentIntent(openPi)
             priority = NotificationCompat.PRIORITY_LOW
-            setSmallIcon(R.drawable.ic_device_generic_earbuds)
+            setSmallIcon(R.drawable.devic_earbuds_generic_both)
             setOngoing(true)
             setContentTitle(context.getString(R.string.app_name))
         }
@@ -63,7 +63,7 @@ class MonitorNotifications @Inject constructor(
                 setStyle(NotificationCompat.BigTextStyle())
                 setContentTitle(context.getString(R.string.pods_none_label_short))
                 setSubText(context.getString(R.string.app_name))
-                setSmallIcon(R.drawable.ic_device_generic_earbuds)
+                setSmallIcon(R.drawable.devic_earbuds_generic_both)
             }
         }
 
diff --git a/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpPodViewFactory.kt b/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpPodViewFactory.kt
index 7c08b522..cfdd0946 100644
--- a/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpPodViewFactory.kt
+++ b/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpPodViewFactory.kt
@@ -41,14 +41,17 @@ class PopUpPodViewFactory @Inject constructor(
                 signal.isInvisible = debugSettings.isDebugModeEnabled.value
 
                 // Left
+                podLeftIcon.setImageResource(device.leftPodIcon)
                 podLeftBatteryIcon.setImageResource(getBatteryDrawable(batteryLeftPodPercent))
                 podLeftBatteryLabel.text = getBatteryLevelLeftPod(context)
 
                 // Case
+                podCaseIcon.setImageResource(device.caseIcon)
                 podCaseBatteryIcon.setImageResource(getBatteryDrawable(batteryCasePercent))
                 podCaseBatteryLabel.text = getBatteryLevelCase(context)
 
                 // Right
+                podRightIcon.setImageResource(device.rightPodIcon)
                 podRightBatteryIcon.setImageResource(getBatteryDrawable(batteryRightPodPercent))
                 podRightBatteryLabel.text = getBatteryLevelRightPod(context)
             }
diff --git a/app/src/main/res/layout/monitor_notification_dual_pods_small.xml b/app/src/main/res/layout/monitor_notification_dual_pods_small.xml
index 3424f53e..218fd529 100644
--- a/app/src/main/res/layout/monitor_notification_dual_pods_small.xml
+++ b/app/src/main/res/layout/monitor_notification_dual_pods_small.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Notification.Container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    style="@style/Notification.Container"
     android:layout_marginHorizontal="8dp"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingVertical="8dp">
 
     <FrameLayout
         android:layout_width="0dp"
@@ -15,12 +16,13 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/pod_left_icon"
             style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_left_24" />
+            android:src="@drawable/devic_airpods_gen1_left" />
 
         <TextView
             android:id="@+id/pod_left_label"
@@ -28,16 +30,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:paddingHorizontal="2dp"
             tools:text="100%" />
 
         <ImageView
             android:id="@+id/pod_left_charging"
             style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
             android:id="@+id/pod_left_ear"
             style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:src="@drawable/ic_baseline_hearing_24" />
     </LinearLayout>
 
@@ -49,12 +56,13 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/pod_case_icon"
             style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_case_24" />
+            android:src="@drawable/devic_airpods_gen1_case" />
 
         <TextView
             android:id="@+id/pod_case_label"
@@ -62,11 +70,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:paddingHorizontal="4dp"
             tools:text="100%" />
 
         <ImageView
             android:id="@+id/pod_case_charging"
             style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:src="@drawable/ic_baseline_power_24" />
     </LinearLayout>
 
@@ -78,12 +89,13 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/pod_right_icon"
             style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_right_24" />
+            android:src="@drawable/devic_airpods_gen1_right" />
 
         <TextView
             android:id="@+id/pod_right_label"
@@ -91,16 +103,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:paddingHorizontal="2dp"
             tools:text="100%" />
 
         <ImageView
             android:id="@+id/pod_right_charging"
             style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
             android:id="@+id/pod_right_ear"
             style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:src="@drawable/ic_baseline_hearing_24" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/monitor_notification_single_pods_small.xml b/app/src/main/res/layout/monitor_notification_single_pods_small.xml
index 8d9d7520..70e959aa 100644
--- a/app/src/main/res/layout/monitor_notification_single_pods_small.xml
+++ b/app/src/main/res/layout/monitor_notification_single_pods_small.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     style="@style/Notification.Container"
     android:layout_height="wrap_content"
+    android:paddingVertical="8dp"
     android:gravity="center_horizontal">
 
     <TextView
@@ -17,6 +18,7 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:layout_marginHorizontal="8dp"
         android:orientation="horizontal">
 
@@ -37,11 +39,15 @@
         <ImageView
             android:id="@+id/headphones_charging"
             style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
             android:id="@+id/headphones_worn"
             style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:src="@drawable/ic_baseline_hearing_24" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/monitor_notification_unknown_device_small.xml b/app/src/main/res/layout/monitor_notification_unknown_device_small.xml
index 8ac90963..4b544ce9 100644
--- a/app/src/main/res/layout/monitor_notification_unknown_device_small.xml
+++ b/app/src/main/res/layout/monitor_notification_unknown_device_small.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/Notification.Container"
     android:layout_width="match_parent"
+    android:paddingVertical="8dp"
     android:layout_height="wrap_content">
 
     <TextView
@@ -11,8 +13,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
-        android:drawableStart="@drawable/ic_baseline_question_mark_24"
         android:gravity="center"
-        tools:text="100%" />
+        tools:text="100%"
+        app:drawableStartCompat="@drawable/ic_baseline_question_mark_24" />
 
 </LinearLayout>
\ No newline at end of file
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 2478ef89..1bf24e85 100644
--- a/app/src/main/res/layout/overview_pods_dual_item.xml
+++ b/app/src/main/res/layout/overview_pods_dual_item.xml
@@ -20,10 +20,11 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
+            style="@style/PodInfoItemIcon"
             app:layout_constraintBottom_toBottomOf="@id/name"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/name"
-            app:srcCompat="@drawable/ic_airpod_both_24" />
+            app:srcCompat="@drawable/devic_airpods_gen1_both" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/name"
@@ -118,7 +119,7 @@
                 android:id="@+id/pod_left_icon"
                 style="@style/PodInfoItemIcon"
                 android:contentDescription="@string/pods_dual_left_label"
-                android:src="@drawable/ic_airpod_left_24"
+                android:src="@drawable/devic_airpods_gen1_left"
                 app:layout_constraintBottom_toBottomOf="@id/pod_left_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/pod_left_label" />
@@ -230,7 +231,7 @@
             <ImageView
                 android:id="@+id/pod_case_icon"
                 style="@style/PodInfoItemIcon"
-                android:src="@drawable/ic_airpod_case_24"
+                android:src="@drawable/devic_airpods_gen1_case"
                 app:layout_constraintBottom_toBottomOf="@id/pod_case_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/pod_case_label" />
@@ -324,7 +325,7 @@
                 android:id="@+id/pod_right_icon"
                 style="@style/PodInfoItemIcon"
                 android:contentDescription="@string/pods_dual_right_label"
-                android:src="@drawable/ic_airpod_right_24"
+                android:src="@drawable/devic_airpods_gen1_right"
                 app:layout_constraintBottom_toBottomOf="@id/pod_right_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/pod_right_label" />
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 85647a3a..b4a93c29 100644
--- a/app/src/main/res/layout/overview_pods_single_item.xml
+++ b/app/src/main/res/layout/overview_pods_single_item.xml
@@ -19,11 +19,12 @@
             android:id="@+id/device_icon"
             android:layout_width="24dp"
             android:layout_height="24dp"
+            style="@style/PodInfoItemIcon"
             android:layout_marginStart="16dp"
             app:layout_constraintBottom_toBottomOf="@id/name"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/name"
-            app:srcCompat="@drawable/ic_device_generic_headphones" />
+            app:srcCompat="@drawable/devic_headphones_generic" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/name"
diff --git a/app/src/main/res/layout/popup_notification_dual_pods.xml b/app/src/main/res/layout/popup_notification_dual_pods.xml
index a301f8be..74278e62 100644
--- a/app/src/main/res/layout/popup_notification_dual_pods.xml
+++ b/app/src/main/res/layout/popup_notification_dual_pods.xml
@@ -7,9 +7,10 @@
 
     <ImageView
         android:id="@+id/pod_icon"
+        style="@style/PodInfoItemIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_device_generic_earbuds"
+        android:src="@drawable/devic_earbuds_generic_both"
         app:layout_constraintBottom_toBottomOf="@id/pod_label"
         app:layout_constraintEnd_toStartOf="@id/pod_label"
         app:layout_constraintHorizontal_bias="0.0"
@@ -54,10 +55,11 @@
 
         <ImageView
             android:id="@+id/pod_left_icon"
+            style="@style/PodInfoItemIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:src="@drawable/ic_airpod_left_24"
+            android:src="@drawable/devic_airpods_gen1_left"
             app:layout_constraintBottom_toBottomOf="@id/pod_left_battery_label"
             app:layout_constraintEnd_toStartOf="@id/pod_left_battery_icon"
             app:layout_constraintStart_toStartOf="parent"
@@ -65,6 +67,7 @@
 
         <ImageView
             android:id="@id/pod_left_battery_icon"
+            style="@style/PodInfoItemIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_baseline_battery_unknown_24"
@@ -100,10 +103,11 @@
 
         <ImageView
             android:id="@+id/pod_case_icon"
+            style="@style/PodInfoItemIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:src="@drawable/ic_airpod_case_24"
+            android:src="@drawable/devic_airpods_gen1_case"
             app:layout_constraintBottom_toBottomOf="@id/pod_case_battery_label"
             app:layout_constraintEnd_toStartOf="@id/pod_case_battery_icon"
             app:layout_constraintStart_toStartOf="parent"
@@ -111,6 +115,7 @@
 
         <ImageView
             android:id="@id/pod_case_battery_icon"
+            style="@style/PodInfoItemIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_baseline_battery_unknown_24"
@@ -145,10 +150,11 @@
 
         <ImageView
             android:id="@+id/pod_right_icon"
+            style="@style/PodInfoItemIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:src="@drawable/ic_airpod_right_24"
+            android:src="@drawable/devic_airpods_gen1_right"
             app:layout_constraintBottom_toBottomOf="@id/pod_right_battery_label"
             app:layout_constraintEnd_toStartOf="@id/pod_right_battery_icon"
             app:layout_constraintStart_toStartOf="parent"
@@ -156,6 +162,7 @@
 
         <ImageView
             android:id="@id/pod_right_battery_icon"
+            style="@style/PodInfoItemIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_baseline_battery_unknown_24"
diff --git a/app/src/main/res/layout/popup_notification_single_pods.xml b/app/src/main/res/layout/popup_notification_single_pods.xml
index fa54becb..91391945 100644
--- a/app/src/main/res/layout/popup_notification_single_pods.xml
+++ b/app/src/main/res/layout/popup_notification_single_pods.xml
@@ -8,8 +8,9 @@
     <ImageView
         android:id="@+id/headphones_icon"
         android:layout_width="wrap_content"
+        style="@style/PodInfoItemIcon"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_device_generic_earbuds"
+        android:src="@drawable/devic_earbuds_generic_both"
         app:layout_constraintBottom_toBottomOf="@id/headphones_label"
         app:layout_constraintEnd_toStartOf="@id/headphones_label"
         app:layout_constraintHorizontal_bias="0.0"
@@ -56,6 +57,7 @@
         <ImageView
             android:id="@id/headphones_battery_icon"
             android:layout_width="wrap_content"
+            style="@style/PodInfoItemIcon"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_baseline_battery_unknown_24"
             app:layout_constraintBottom_toBottomOf="@id/headphones_battery_label"
diff --git a/app/src/main/res/layout/widget_pod_dual_layout.xml b/app/src/main/res/layout/widget_pod_dual_layout.xml
index adf90920..68d5fb1b 100644
--- a/app/src/main/res/layout/widget_pod_dual_layout.xml
+++ b/app/src/main/res/layout/widget_pod_dual_layout.xml
@@ -11,6 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginBottom="2dp"
+        android:textStyle="bold"
         android:textSize="12sp"
         tools:text="AirPods Max" />
 
@@ -23,7 +24,7 @@
         <ImageView
             android:id="@+id/pod_left_icon"
             style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_left_24"
+            android:src="@drawable/devic_airpods_gen1_left"
             tools:ignore="ContentDescription" />
 
         <TextView
@@ -57,7 +58,7 @@
         <ImageView
             android:id="@+id/pod_right_icon"
             style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_right_24"
+            android:src="@drawable/devic_airpods_gen1_right"
             tools:ignore="ContentDescription" />
 
         <TextView
@@ -91,7 +92,7 @@
         <ImageView
             android:id="@+id/pod_case_icon"
             style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_case_24"
+            android:src="@drawable/devic_airpods_gen1_case"
             tools:ignore="ContentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/widget_pod_single_layout.xml b/app/src/main/res/layout/widget_pod_single_layout.xml
index 12d7eec2..1e94bac5 100644
--- a/app/src/main/res/layout/widget_pod_single_layout.xml
+++ b/app/src/main/res/layout/widget_pod_single_layout.xml
@@ -8,6 +8,7 @@
         android:id="@+id/headphones_label"
         style="@style/PodWidget.TextPrimary"
         android:layout_width="wrap_content"
+        android:textStyle="bold"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         tools:text="AirPods Max" />
diff --git a/app/src/main/res/layout/widget_preview_layout.xml b/app/src/main/res/layout/widget_preview_layout.xml
index f24b5219..17b6b4b3 100644
--- a/app/src/main/res/layout/widget_preview_layout.xml
+++ b/app/src/main/res/layout/widget_preview_layout.xml
@@ -13,7 +13,7 @@
         <ImageView
             android:id="@+id/pod_left_icon"
             style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_left_24"
+            android:src="@drawable/devic_airpods_gen1_left"
             tools:ignore="ContentDescription" />
 
         <TextView
@@ -47,7 +47,7 @@
         <ImageView
             android:id="@+id/pod_right_icon"
             style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_right_24"
+            android:src="@drawable/devic_airpods_gen1_right"
             tools:ignore="ContentDescription" />
 
         <TextView
@@ -81,7 +81,7 @@
         <ImageView
             android:id="@+id/pod_case_icon"
             style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_case_24"
+            android:src="@drawable/devic_airpods_gen1_case"
             tools:ignore="ContentDescription" />
 
         <TextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5d863d15..f5a8cd1f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,6 +19,7 @@
     <style name="PodInfoItemIcon.Notification" parent="TextAppearance.Compat.Notification.Title">
         <item name="android:layout_height">20dp</item>
         <item name="android:layout_width">20dp</item>
+        <item name="android:tintMode">multiply</item>
         <item name="android:tint">?android:attr/colorAccent</item>
         <item name="tint">?android:attr/colorAccent</item>
     </style>
@@ -32,6 +33,9 @@
     <style name="PodInfoItemIcon" parent="TextAppearance.MaterialComponents.Body2">
         <item name="android:layout_height">20dp</item>
         <item name="android:layout_width">20dp</item>
+        <item name="android:tintMode">multiply</item>
+        <item name="android:tint">?android:attr/colorControlNormal</item>
+        <item name="tint">?android:attr/colorControlNormal</item>
     </style>
 
     <style name="PodInfoItemText" parent="TextAppearance.MaterialComponents.Body2">
diff --git a/app/src/main/res/xml/preferences_general.xml b/app/src/main/res/xml/preferences_general.xml
index 20162add..019a1e68 100644
--- a/app/src/main/res/xml/preferences_general.xml
+++ b/app/src/main/res/xml/preferences_general.xml
@@ -43,7 +43,7 @@
             android:title="@string/settings_maindevice_address_label" />
 
         <Preference
-            android:icon="@drawable/ic_device_generic_headphones"
+            android:icon="@drawable/devic_headphones_generic"
             android:key="core.maindevice.model"
             android:summary="@string/settings_maindevice_model_description"
             android:title="@string/settings_maindevice_model_label" />