diff --git a/app/src/main/assets/nothing_ear_l.svg b/app/src/main/assets/nothing_ear_l.svg
index 1cf5387a3..f80a3c8f0 100644
--- a/app/src/main/assets/nothing_ear_l.svg
+++ b/app/src/main/assets/nothing_ear_l.svg
@@ -2,19 +2,19 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   width="23.17325mm"
-   height="24mm"
-   viewBox="0 0 23.17325 24"
+   width="45pt"
+   height="45pt"
+   viewBox="0 0 25 25"
    version="1.1"
-   id="svg1232"
+   id="svg1584"
+   sodipodi:docname="tws_bud_l.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   sodipodi:docname="nothing_ear_l.svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
-     id="namedview1234"
+     id="namedview1586"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
@@ -23,42 +23,51 @@
      inkscape:pagecheckerboard="0"
      inkscape:document-units="mm"
      showgrid="false"
-     fit-margin-top="3"
-     fit-margin-left="6"
-     fit-margin-right="6"
-     fit-margin-bottom="3"
-     inkscape:zoom="5.0814254"
-     inkscape:cx="83.933143"
-     inkscape:cy="62.088878"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="5"
+     fit-margin-left="5"
+     fit-margin-right="5"
+     fit-margin-bottom="5"
+     inkscape:zoom="7.2407734"
+     inkscape:cx="32.93847"
+     inkscape:cy="47.094417"
      inkscape:window-width="1920"
-     inkscape:window-height="1035"
+     inkscape:window-height="1043"
      inkscape:window-x="0"
-     inkscape:window-y="45"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     inkscape:current-layer="layer1"
+     inkscape:snap-nodes="false"
+     units="pt">
+    <sodipodi:guide
+       position="60.230277,-77.001526"
+       orientation="0,-1"
+       id="guide12345" />
+    <sodipodi:guide
+       position="48.368846,-82.602765"
+       orientation="1,0"
+       id="guide12613" />
+    <sodipodi:guide
+       position="66.270257,-85.540793"
+       orientation="1,0"
+       id="guide12653" />
+    <sodipodi:guide
+       position="59.029537,-82.554635"
+       orientation="0,-1"
+       id="guide13329" />
+  </sodipodi:namedview>
   <defs
-     id="defs1229" />
+     id="defs1581" />
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(16,5.0000005)">
-    <g
-       id="g1083"
-       style="fill:#010000;fill-opacity:1;stroke-width:0.209403"
-       transform="matrix(-1.2635098,0,0,1.2635098,20.971815,-14.752565)">
-      <path
-         d="m 18.3225,24.339 a 2.6708,2.6529 90 0 1 -2.653,-2.6708 V 14.546 a 4.4513,4.4216 89.9998 0 1 4.227,-4.4513 h 0.1945 a 5.6977,5.6596 90.0002 0 1 4.1916,1.7182 0.8903,0.8843 89.9998 0 1 0.2299,0.6054 v 3.3652 a 0.8903,0.8843 89.9998 0 1 -0.2299,0.6054 5.5464,5.5093 89.9997 0 1 -3.3073,1.6559 v 3.6234 a 2.6708,2.6529 90 0 1 -2.6529,2.6708 z m 1.7686,-12.4638 h -0.1415 a 2.6708,2.6529 90 0 0 -2.5114,2.6708 v 7.1222 a 0.8903,0.8843 90.0003 0 0 1.7686,0 v -4.4513 a 0.8903,0.8843 89.9998 0 1 0.8843,-0.8903 4.113,4.0855 90.0003 0 0 2.6529,-0.8903 v -2.6708 a 4.113,4.0855 90.0003 0 0 -2.6529,-0.8903 z"
-         fill="#ffffff"
-         stroke-width="0.185801"
-         id="path10"
-         style="fill:#010000;fill-opacity:1" />
-      <path
-         d="m 20.9754,14.1009 m -0.8843,0 a 0.8903,0.8843 90.0003 1 1 1.7686,0 0.8903,0.8843 90.0003 1 1 -1.7686,0"
-         fill="#ffffff"
-         stroke-width="0.185801"
-         id="path14"
-         style="fill:#010000;fill-opacity:1" />
-    </g>
+     transform="translate(-54.112633,-52.186932)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 66.205353,71.516731 c -0.241039,3.18099 4.357921,3.724035 4.261474,-0.840271 l -0.05402,-11.075736 c -0.0096,-1.958838 -0.926881,-4.724551 -4.068115,-4.689489 -2.488808,0.02778 -5.036384,0.642953 -5.046106,1.875752 l -0.03294,4.176733 c -0.01523,1.930747 3.744189,3.676223 4.867724,2.994344 1.009905,-0.612914 0.05948,7.676196 0.05948,7.676196"
+       id="path1690"
+       sodipodi:nodetypes="ccsssssc" />
   </g>
 </svg>
diff --git a/app/src/main/assets/nothing_ear_r.svg b/app/src/main/assets/nothing_ear_r.svg
index 00e3c2f5e..35c9c165c 100644
--- a/app/src/main/assets/nothing_ear_r.svg
+++ b/app/src/main/assets/nothing_ear_r.svg
@@ -2,19 +2,19 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   width="23.17325mm"
-   height="24mm"
-   viewBox="0 0 23.17325 24"
+   width="45pt"
+   height="45pt"
+   viewBox="0 0 25 25"
    version="1.1"
-   id="svg1232"
+   id="svg1584"
+   sodipodi:docname="tws_bud_r.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   sodipodi:docname="nothing_ear_r.svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
-     id="namedview1234"
+     id="namedview1586"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
@@ -23,42 +23,51 @@
      inkscape:pagecheckerboard="0"
      inkscape:document-units="mm"
      showgrid="false"
-     fit-margin-top="3"
-     fit-margin-left="6"
-     fit-margin-right="6"
-     fit-margin-bottom="3"
-     inkscape:zoom="5.0814254"
-     inkscape:cx="83.933143"
-     inkscape:cy="62.088878"
-     inkscape:window-width="1920"
-     inkscape:window-height="1035"
-     inkscape:window-x="0"
-     inkscape:window-y="45"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="5"
+     fit-margin-left="5"
+     fit-margin-right="5"
+     fit-margin-bottom="5"
+     inkscape:zoom="7.2407734"
+     inkscape:cx="1.4501213"
+     inkscape:cy="47.16347"
+     inkscape:window-width="1890"
+     inkscape:window-height="1038"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     inkscape:snap-nodes="false"
+     units="pt">
+    <sodipodi:guide
+       position="60.230277,-77.001526"
+       orientation="0,-1"
+       id="guide12345" />
+    <sodipodi:guide
+       position="48.368846,-82.602765"
+       orientation="1,0"
+       id="guide12613" />
+    <sodipodi:guide
+       position="66.270257,-85.540793"
+       orientation="1,0"
+       id="guide12653" />
+    <sodipodi:guide
+       position="59.029537,-82.554635"
+       orientation="0,-1"
+       id="guide13329" />
+  </sodipodi:namedview>
   <defs
-     id="defs1229" />
+     id="defs1581" />
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(16,5.0000005)">
-    <g
-       id="g1083"
-       style="fill:#010000;fill-opacity:1;stroke-width:0.209403"
-       transform="matrix(1.2635098,0,0,1.2635098,-29.798564,-14.752565)">
-      <path
-         d="m 18.3225,24.339 a 2.6708,2.6529 90 0 1 -2.653,-2.6708 V 14.546 a 4.4513,4.4216 89.9998 0 1 4.227,-4.4513 h 0.1945 a 5.6977,5.6596 90.0002 0 1 4.1916,1.7182 0.8903,0.8843 89.9998 0 1 0.2299,0.6054 v 3.3652 a 0.8903,0.8843 89.9998 0 1 -0.2299,0.6054 5.5464,5.5093 89.9997 0 1 -3.3073,1.6559 v 3.6234 a 2.6708,2.6529 90 0 1 -2.6529,2.6708 z m 1.7686,-12.4638 h -0.1415 a 2.6708,2.6529 90 0 0 -2.5114,2.6708 v 7.1222 a 0.8903,0.8843 90.0003 0 0 1.7686,0 v -4.4513 a 0.8903,0.8843 89.9998 0 1 0.8843,-0.8903 4.113,4.0855 90.0003 0 0 2.6529,-0.8903 v -2.6708 a 4.113,4.0855 90.0003 0 0 -2.6529,-0.8903 z"
-         fill="#ffffff"
-         stroke-width="0.185801"
-         id="path10"
-         style="fill:#010000;fill-opacity:1" />
-      <path
-         d="m 20.9754,14.1009 m -0.8843,0 a 0.8903,0.8843 90.0003 1 1 1.7686,0 0.8903,0.8843 90.0003 1 1 -1.7686,0"
-         fill="#ffffff"
-         stroke-width="0.185801"
-         id="path14"
-         style="fill:#010000;fill-opacity:1" />
-    </g>
+     transform="translate(-54.112633,-52.186932)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 65.874055,71.516708 c 0.241037,3.181086 -4.357905,3.724148 -4.261458,-0.840294 l 0.05402,-11.076068 c 0.0096,-1.958896 0.926875,-4.724692 4.0681,-4.689628 2.488799,0.02778 5.036366,0.642972 5.046088,1.875807 l 0.03293,4.176859 c 0.01522,1.930805 -3.744175,3.676332 -4.867707,2.994433 -1.009902,-0.612932 -0.05948,7.676426 -0.05948,7.676426"
+       id="path1690"
+       sodipodi:nodetypes="ccsssssc" />
   </g>
 </svg>
diff --git a/app/src/main/assets/tws_case.svg b/app/src/main/assets/tws_case.svg
index 2fdfd94fb..dffa09826 100644
--- a/app/src/main/assets/tws_case.svg
+++ b/app/src/main/assets/tws_case.svg
@@ -2,9 +2,9 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   width="32.062386mm"
-   height="31mm"
-   viewBox="0 0 32.062385 31"
+   width="45"
+   height="45"
+   viewBox="0 0 25 25"
    version="1.1"
    id="svg5"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
@@ -24,18 +24,20 @@
      inkscape:document-units="mm"
      showgrid="false"
      inkscape:zoom="2.5407127"
-     inkscape:cx="6.4942408"
+     inkscape:cx="-124.17776"
      inkscape:cy="59.235348"
-     inkscape:window-width="1920"
-     inkscape:window-height="1035"
-     inkscape:window-x="0"
-     inkscape:window-y="45"
-     inkscape:window-maximized="1"
+     inkscape:window-width="1890"
+     inkscape:window-height="1038"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
      inkscape:current-layer="layer1"
      fit-margin-top="5"
      fit-margin-left="5"
      fit-margin-right="5"
-     fit-margin-bottom="5" />
+     fit-margin-bottom="5"
+     units="px"
+     viewbox-height="25" />
   <defs
      id="defs2" />
   <g
@@ -44,16 +46,16 @@
      id="layer1"
      transform="translate(-35.169857,-38.996456)">
     <rect
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+       style="fill:none;stroke:#000000;stroke-width:2.66666667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
        id="rect846"
        width="20.062387"
        height="19"
-       x="41.169857"
-       y="44.996456"
+       x="37.638664"
+       y="41.996456"
        ry="5.7287159" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 41.119145,50.610107 H 61.291496"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.66666667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 37.583681,47.610107 H 57.756032"
        id="path1465" />
   </g>
 </svg>
diff --git a/app/src/main/res/drawable/ic_cases.xml b/app/src/main/res/drawable/ic_cases.xml
deleted file mode 100644
index 1f973ff21..000000000
--- a/app/src/main/res/drawable/ic_cases.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,9H1v11c0,1.11 0.89,2 2,2h17v-2H3V9z"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18,5V3c0,-1.1 -0.9,-2 -2,-2h-4c-1.1,0 -2,0.9 -2,2v2H5v11c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5H18zM12,3h4v2h-4V3zM21,16H7V7h14V16z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_nothing_ear_l.xml b/app/src/main/res/drawable/ic_nothing_ear_l.xml
index 413f33f26..39a94ad75 100644
--- a/app/src/main/res/drawable/ic_nothing_ear_l.xml
+++ b/app/src/main/res/drawable/ic_nothing_ear_l.xml
@@ -1,15 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="23.17325dp"
-    android:height="24dp"
-    android:tint="#7E7E7E"
-    android:viewportWidth="23.17325"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#010000"
-        android:pathData="M13.821 21a3.375 3.352 63.38 0 0 3.352-3.375V8.626a5.624 5.587 63.391 0 0-5.34-5.624h-0.247A7.2 7.151 63.369 0 0 6.29 5.173 1.125 1.117 63.391 0 0 6 5.938v4.252a1.125 1.117 63.391 0 0 0.29 0.765 7.008 6.961 63.397 0 0 4.18 2.092v4.578A3.375 3.352 63.38 0 0 13.82 21zM11.586 5.252h0.18a3.375 3.352 63.38 0 1 3.172 3.374v9a1.125 1.117 63.363 0 1-2.234 0V12a1.125 1.117 63.391 0 0-1.117-1.125A5.197 5.162 63.363 0 1 8.235 9.75V6.377a5.197 5.162 63.363 0 1 3.352-1.125z"
-        android:strokeWidth="0.23476137" />
-    <path
-        android:fillColor="#010000"
-        android:pathData="M11.587 8.064a1.125 1.117 63.363 1 0-2.235 0 1.125 1.117 63.363 1 0 2.235 0"
-        android:strokeWidth="0.23476137" />
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="m12.0927,19.3298c-0.241,3.181 4.3579,3.724 4.2615,-0.8403l-0.054,-11.0757c-0.0096,-1.9588 -0.9269,-4.7246 -4.0681,-4.6895 -2.4888,0.0278 -5.0364,0.643 -5.0461,1.8758l-0.0329,4.1767c-0.0152,1.9307 3.7442,3.6762 4.8677,2.9943 1.0099,-0.6129 0.0595,7.6762 0.0595,7.6762"
+      android:strokeWidth="2"
+      android:strokeColor="#000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_nothing_ear_r.xml b/app/src/main/res/drawable/ic_nothing_ear_r.xml
index 4d497b64c..26fa0a991 100644
--- a/app/src/main/res/drawable/ic_nothing_ear_r.xml
+++ b/app/src/main/res/drawable/ic_nothing_ear_r.xml
@@ -1,15 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="23.17325dp"
-    android:height="24dp"
-    android:tint="#7E7E7E"
-    android:viewportWidth="23.17325"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#010000"
-        android:pathData="M9.352 21A3.375 3.352 116.62 0 1 6 17.625V8.626a5.624 5.587 116.609 0 1 5.34-5.624h0.247a7.2 7.151 116.631 0 1 5.296 2.171 1.125 1.117 116.609 0 1 0.29 0.765v4.252a1.125 1.117 116.609 0 1-0.29 0.765 7.008 6.961 116.603 0 1-4.179 2.092v4.578A3.375 3.352 116.62 0 1 9.352 21zm2.235-15.748h-0.18a3.375 3.352 116.62 0 0-3.172 3.374v9a1.125 1.117 116.637 0 0 2.234 0V12a1.125 1.117 116.609 0 1 1.118-1.125 5.197 5.162 116.637 0 0 3.352-1.125V6.377a5.197 5.162 116.637 0 0-3.352-1.125z"
-        android:strokeWidth="0.23476137" />
-    <path
-        android:fillColor="#010000"
-        android:pathData="M11.587 8.064a1.125 1.117 116.637 1 1 2.234 0 1.125 1.117 116.637 1 1-2.234 0"
-        android:strokeWidth="0.23476137" />
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="m11.7614,19.3298c0.241,3.1811 -4.3579,3.7241 -4.2615,-0.8403l0.054,-11.0761c0.0096,-1.9589 0.9269,-4.7247 4.0681,-4.6896 2.4888,0.0278 5.0364,0.643 5.0461,1.8758l0.0329,4.1769c0.0152,1.9308 -3.7442,3.6763 -4.8677,2.9944 -1.0099,-0.6129 -0.0595,7.6764 -0.0595,7.6764"
+      android:strokeWidth="2"
+      android:strokeColor="#000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_tws_case.xml b/app/src/main/res/drawable/ic_tws_case.xml
index 1ac498673..2a7a08df9 100644
--- a/app/src/main/res/drawable/ic_tws_case.xml
+++ b/app/src/main/res/drawable/ic_tws_case.xml
@@ -1,18 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32.062386dp"
-    android:height="31dp"
-    android:viewportWidth="32.062386"
-    android:viewportHeight="31"
-    android:tint="#7E7E7E">
-    <path
-        android:pathData="M11.729 6h8.605a5.729 5.729 0 0 1 5.728 5.729v7.542A5.729 5.729 0 0 1 20.334 25h-8.605A5.729 5.729 0 0 1 6 19.271V11.73A5.729 5.729 0 0 1 11.729 6z"
-        android:strokeWidth="3"
-        android:strokeColor="#000000"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M5.95 11.614h20.172"
-        android:strokeWidth="3"
-        android:strokeColor="#000000" />
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M8.1975,3L16.8025,3A5.7287,5.7287 0,0 1,22.5312 8.7287L22.5312,16.2713A5.7287,5.7287 0,0 1,16.8025 22L8.1975,22A5.7287,5.7287 0,0 1,2.4688 16.2713L2.4688,8.7287A5.7287,5.7287 0,0 1,8.1975 3z"
+      android:strokeWidth="2"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M2.4138,8.6137L22.5862,8.6137"
+      android:strokeWidth="2"
+      android:strokeColor="#000000"/>
 </vector>