From b3f0a0f4bc394bc71ef93bc9701f51f5224270e8 Mon Sep 17 00:00:00 2001
From: TeleRiddler <teleriddler@users.noreply.github.com>
Date: Thu, 3 Dec 2020 12:01:30 +0100
Subject: [PATCH 1/4] Updated Pod Management Layout and cleaned up XML to make
 layout items match parent elements. Added a few dynamic text elements for Pod
 Management interface to strings.xml

---
 ...on_omnipod_overview_refresh_pod_status.xml |   2 +-
 .../icon_pod_management_activate_pod.xml      |   2 +-
 .../icon_pod_management_pod_history.xml       |   2 +-
 .../src/main/res/layout/omnipod_overview.xml  |  12 -
 .../res/layout/omnipod_pod_management.xml     | 239 +++++++++++-------
 omnipod/src/main/res/values/colors.xml        |   2 +-
 omnipod/src/main/res/values/strings.xml       |   2 +
 7 files changed, 153 insertions(+), 108 deletions(-)

diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml
index bd3703e076..ae004ae4fe 100644
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml
+++ b/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml
@@ -1,6 +1,6 @@
 <vector android:height="52dp" android:viewportHeight="571.0818"
     android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
+    <path android:fillColor="@color/icon_omnipod_overview_refresh_pod_status_outline" android:fillType="nonZero"
         android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.706 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
         android:strokeColor="#00000000" android:strokeLineCap="butt"
         android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml b/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
index 214384f5b6..8694bbf7e2 100644
--- a/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
+++ b/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
@@ -1,6 +1,6 @@
 <vector android:height="52dp" android:viewportHeight="571.0818"
     android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
+    <path android:fillColor="@color/icon_pod_management_activate_pod_outline" android:fillType="nonZero"
         android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
         android:strokeColor="#00000000" android:strokeLineCap="butt"
         android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml b/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml
index 6ba8ddf5bb..abf666839c 100644
--- a/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml
+++ b/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml
@@ -1,6 +1,6 @@
 <vector android:height="52dp" android:viewportHeight="571.0818"
     android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/cob" android:pathData="m405.434,247.342l0,199.773c0,16.318 -13.278,29.596 -29.597,29.596l-135.031,0c-16.319,0 -29.596,-13.278 -29.596,-29.596L211.21,317.219c4.222,0.702 8.528,1.158 12.948,1.158 3.134,0 6.211,-0.233 9.249,-0.592l0,129.331c0,4.079 3.318,7.398 7.399,7.398l135.031,0c4.079,0 7.399,-3.32 7.399,-7.398L383.236,247.342c0,-4.081 -3.32,-7.399 -7.399,-7.399L302.592,239.943c0,-7.717 -1.159,-15.154 -3.238,-22.197l76.483,0c16.319,-0.001 29.597,13.276 29.597,29.595zM222.922,308.638C184.431,308.638 153.119,277.326 153.119,238.837 153.12,200.347 184.431,169.034 222.922,169.034c38.489,0 69.803,31.312 69.803,69.803 0,38.489 -31.314,69.801 -69.803,69.801zM222.922,293.84c30.328,0 55.003,-24.671 55.003,-55.003 0,-30.333 -24.672,-55.005 -55.003,-55.005 -30.333,0 -55.005,24.671 -55.005,55.005 0,30.331 24.676,55.003 55.005,55.003zM264.785,246.237c4.084,0 7.399,-3.315 7.399,-7.399 0,-4.084 -3.315,-7.399 -7.399,-7.399l-34.464,0l0,-29.045c0,-4.084 -3.315,-7.399 -7.399,-7.399 -4.084,0 -7.399,3.315 -7.399,7.399l0,36.444c0,4.084 3.315,7.399 7.399,7.399zM350.183,306.227l-80.156,0c-4.084,0 -7.399,3.315 -7.399,7.399 0,4.085 3.315,7.399 7.399,7.399l80.156,0c4.086,0 7.399,-3.315 7.399,-7.399 0.001,-4.084 -3.313,-7.399 -7.399,-7.399zM350.313,351.108L270.157,351.108c-4.084,0 -7.399,3.313 -7.399,7.399 0,4.086 3.315,7.399 7.399,7.399l80.156,0c4.086,0 7.398,-3.313 7.398,-7.399 0,-4.086 -3.309,-7.399 -7.398,-7.399zM350.313,397.847L270.157,397.847c-4.084,0 -7.399,3.316 -7.399,7.399 0,4.086 3.315,7.398 7.399,7.398l80.156,0c4.086,0 7.398,-3.313 7.398,-7.398 0.001,-4.083 -3.309,-7.399 -7.398,-7.399z"/>
+    <path android:fillColor="@color/icon_pod_management_pod_history" android:pathData="m405.434,247.342l0,199.773c0,16.318 -13.278,29.596 -29.597,29.596l-135.031,0c-16.319,0 -29.596,-13.278 -29.596,-29.596L211.21,317.219c4.222,0.702 8.528,1.158 12.948,1.158 3.134,0 6.211,-0.233 9.249,-0.592l0,129.331c0,4.079 3.318,7.398 7.399,7.398l135.031,0c4.079,0 7.399,-3.32 7.399,-7.398L383.236,247.342c0,-4.081 -3.32,-7.399 -7.399,-7.399L302.592,239.943c0,-7.717 -1.159,-15.154 -3.238,-22.197l76.483,0c16.319,-0.001 29.597,13.276 29.597,29.595zM222.922,308.638C184.431,308.638 153.119,277.326 153.119,238.837 153.12,200.347 184.431,169.034 222.922,169.034c38.489,0 69.803,31.312 69.803,69.803 0,38.489 -31.314,69.801 -69.803,69.801zM222.922,293.84c30.328,0 55.003,-24.671 55.003,-55.003 0,-30.333 -24.672,-55.005 -55.003,-55.005 -30.333,0 -55.005,24.671 -55.005,55.005 0,30.331 24.676,55.003 55.005,55.003zM264.785,246.237c4.084,0 7.399,-3.315 7.399,-7.399 0,-4.084 -3.315,-7.399 -7.399,-7.399l-34.464,0l0,-29.045c0,-4.084 -3.315,-7.399 -7.399,-7.399 -4.084,0 -7.399,3.315 -7.399,7.399l0,36.444c0,4.084 3.315,7.399 7.399,7.399zM350.183,306.227l-80.156,0c-4.084,0 -7.399,3.315 -7.399,7.399 0,4.085 3.315,7.399 7.399,7.399l80.156,0c4.086,0 7.399,-3.315 7.399,-7.399 0.001,-4.084 -3.313,-7.399 -7.399,-7.399zM350.313,351.108L270.157,351.108c-4.084,0 -7.399,3.313 -7.399,7.399 0,4.086 3.315,7.399 7.399,7.399l80.156,0c4.086,0 7.398,-3.313 7.398,-7.399 0,-4.086 -3.309,-7.399 -7.398,-7.399zM350.313,397.847L270.157,397.847c-4.084,0 -7.399,3.316 -7.399,7.399 0,4.086 3.315,7.398 7.399,7.398l80.156,0c4.086,0 7.398,-3.313 7.398,-7.398 0.001,-4.083 -3.309,-7.399 -7.398,-7.399z"/>
     <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
         android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
         android:strokeColor="#00000000" android:strokeLineCap="butt"
diff --git a/omnipod/src/main/res/layout/omnipod_overview.xml b/omnipod/src/main/res/layout/omnipod_overview.xml
index a873bfe104..fa1195fc02 100644
--- a/omnipod/src/main/res/layout/omnipod_overview.xml
+++ b/omnipod/src/main/res/layout/omnipod_overview.xml
@@ -749,8 +749,6 @@
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_refresh_pod_status"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_refresh" />
 
                 <Button
@@ -761,8 +759,6 @@
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_pod_management"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_pod_management" />
 
                 <Button
@@ -773,8 +769,6 @@
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_acknowledge_alerts"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_acknowledge_active_alerts" />
 
                 <Button
@@ -785,8 +779,6 @@
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_set_time"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_set_time"
                     android:visibility="gone" />
 
@@ -798,8 +790,6 @@
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_resume_delivery"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_resume_delivery"
                     android:visibility="gone" />
 
@@ -811,8 +801,6 @@
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_suspend_delivery"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_suspend_delivery"
                     android:visibility="gone" />
 
diff --git a/omnipod/src/main/res/layout/omnipod_pod_management.xml b/omnipod/src/main/res/layout/omnipod_pod_management.xml
index d9cf031689..a185cf9cfe 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_management.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_management.xml
@@ -1,4 +1,5 @@
 <FrameLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,7 +16,7 @@
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:layout_marginLeft="10dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginRight="10dp"
@@ -53,104 +54,158 @@
                     android:textSize="8pt" />
             </LinearLayout>
 
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/omnipod_pod_management_button_activate_pod"
-                style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
+            <LinearLayout
+                android:id="@+id/action_buttons_layout"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
-                android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_pod_management_activate_pod"
-                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                android:text="@string/omnipod_pod_management_button_activate_pod"
-                android:textAllCaps="false" />
+                android:orientation="vertical">
 
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/omnipod_pod_management_button_deactivate_pod"
-                style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
-                android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_pod_management_deactivate_pod"
-                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                android:text="@string/omnipod_pod_management_button_deactivate_pod"
-                android:textAllCaps="false" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="15dp"
+                    android:paddingStart="15dp"
+                    android:paddingEnd="15dp"
+                    android:text="@string/omnipod_pod_management_heading_actions" />
 
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/omnipod_pod_management_button_discard_pod"
-                style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
-                android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_pod_management_discard_pod"
-                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                android:text="@string/omnipod_pod_management_button_discard_pod"
-                android:textAllCaps="false" />
+                <androidx.gridlayout.widget.GridLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:padding="10dip"
+                    app:columnCount="2">
 
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/omnipod_pod_management_button_play_test_beep"
-                style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
-                android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_pod_management_play_test_beep"
-                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                android:text="@string/omnipod_pod_management_button_play_test_beep"
-                android:textAllCaps="false" />
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
+                        android:id="@+id/omnipod_pod_management_button_activate_pod"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_pod_management_activate_pod"
+                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
+                        android:text="@string/omnipod_pod_management_button_activate_pod"
+                        android:textAllCaps="false"
 
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/omnipod_pod_management_button_pulse_log"
-                style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
-                android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_pod_management_pulse_log"
-                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                android:text="@string/omnipod_pod_management_button_read_pulse_log"
-                android:textAllCaps="false"
-                android:visibility="gone" />
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="0" />
 
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/omnipod_pod_management_button_pod_history"
-                style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
-                android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_pod_management_pod_history"
-                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                android:text="@string/omnipod_pod_management_button_pod_history"
-                android:textAllCaps="false" />
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
+                        android:id="@+id/omnipod_pod_management_button_deactivate_pod"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_pod_management_deactivate_pod"
+                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
+                        android:text="@string/omnipod_pod_management_button_deactivate_pod"
+                        android:textAllCaps="false"
 
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/omnipod_pod_management_button_rileylink_stats"
-                style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
-                android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_pod_management_rl_stats"
-                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                android:text="@string/omnipod_pod_management_button_riley_link_stats"
-                android:textAllCaps="false" />
+                        app:layout_column="1"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="0" />
+
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
+                        android:id="@+id/omnipod_pod_management_button_play_test_beep"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_pod_management_play_test_beep"
+                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
+                        android:text="@string/omnipod_pod_management_button_play_test_beep"
+                        android:textAllCaps="false"
+
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="1" />
+
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
+                        android:id="@+id/omnipod_pod_management_button_discard_pod"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_pod_management_discard_pod"
+                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
+                        android:text="@string/omnipod_pod_management_button_discard_pod"
+                        android:textAllCaps="false"
+
+                        app:layout_column="1"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="1" />
+
+                </androidx.gridlayout.widget.GridLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="15dp"
+                    android:paddingStart="15dp"
+                    android:paddingEnd="15dp"
+                    android:text="@string/omnipod_pod_management_heading_tools" />
+
+                <androidx.gridlayout.widget.GridLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="10dip"
+                    app:columnCount="2">
+
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
+                        android:id="@+id/omnipod_pod_management_button_pod_history"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_pod_management_pod_history"
+                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
+                        android:text="@string/omnipod_pod_management_button_pod_history"
+                        android:textAllCaps="false"
+
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="2" />
+
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
+                        android:id="@+id/omnipod_pod_management_button_rileylink_stats"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_pod_management_rl_stats"
+                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
+                        android:text="@string/omnipod_pod_management_button_riley_link_stats"
+                        android:textAllCaps="false"
+
+                        app:layout_column="1"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="2" />
+
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
+                        android:id="@+id/omnipod_pod_management_button_pulse_log"
+                        style="@style/ButtonSmallFontStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_pod_management_pulse_log"
+                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
+                        android:text="@string/omnipod_pod_management_button_read_pulse_log"
+                        android:textAllCaps="false"
+                        android:visibility="gone"
+
+                        app:layout_column="0"
+                        app:layout_columnWeight="1"
+                        app:layout_gravity="fill"
+                        app:layout_row="3" />
+
+                </androidx.gridlayout.widget.GridLayout>
+
+            </LinearLayout>
 
         </LinearLayout>
 
diff --git a/omnipod/src/main/res/values/colors.xml b/omnipod/src/main/res/values/colors.xml
index 5931700c66..26d9a49f98 100644
--- a/omnipod/src/main/res/values/colors.xml
+++ b/omnipod/src/main/res/values/colors.xml
@@ -41,7 +41,7 @@
     <color name="icon_pod_management_play_test_beep_outline">@color/pod_icon_outline</color>
     <color name="icon_pod_management_pulse_log">#4DD0E1</color>
     <color name="icon_pod_management_pulse_log_outline">@color/pod_icon_outline</color>
-    <color name="icon_pod_management_pod_history">#9FA8DA</color>
+    <color name="icon_pod_management_pod_history">#FB8C00</color>
     <color name="icon_pod_management_pod_history_outline">@color/pod_icon_outline</color>
     <color name="icon_pod_management_rl_stats">@color/rl_board_shape</color>
     <color name="icon_pod_management_rl_stats_outline">@color/rl_icon_outline</color>
diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
index 417b852805..97b6ea6a9c 100644
--- a/omnipod/src/main/res/values/strings.xml
+++ b/omnipod/src/main/res/values/strings.xml
@@ -177,6 +177,8 @@
 
     <!-- Omnipod - Pod Management -->
     <string name="omnipod_pod_management_title">Pod management</string>
+    <string name="omnipod_pod_management_heading_actions">Actions</string>
+    <string name="omnipod_pod_management_heading_tools">Tools</string>
     <string name="omnipod_pod_management_waiting_for_rileylink_connection">Waiting for RileyLink connection…</string>
     <string name="omnipod_pod_management_button_activate_pod">Activate Pod</string>
     <string name="omnipod_pod_management_button_deactivate_pod">Deactivate Pod</string>

From e02438cc8c5dadf0f199f4cd5b67f188e9b6f48c Mon Sep 17 00:00:00 2001
From: TeleRiddler <teleriddler@users.noreply.github.com>
Date: Thu, 3 Dec 2020 22:42:34 +0100
Subject: [PATCH 2/4] Updated Pod Management Layout and cleaned up XML to make
 layout items match parent elements. Added a few dynamic text elements for Pod
 Management interface to strings.xml

---
 .../src/main/res/layout/omnipod_overview.xml  |  95 +++--
 .../res/layout/omnipod_pod_management.xml     | 352 ++++++++----------
 omnipod/src/main/res/values/strings.xml       |   1 +
 3 files changed, 229 insertions(+), 219 deletions(-)

diff --git a/omnipod/src/main/res/layout/omnipod_overview.xml b/omnipod/src/main/res/layout/omnipod_overview.xml
index fa1195fc02..00e44ba3eb 100644
--- a/omnipod/src/main/res/layout/omnipod_overview.xml
+++ b/omnipod/src/main/res/layout/omnipod_overview.xml
@@ -56,7 +56,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/rileylink_status"
                         android:textSize="14sp" />
 
@@ -76,7 +77,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="{fa-bluetooth-b}"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
@@ -103,7 +105,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_pod_address"
                         android:textSize="14sp" />
 
@@ -123,7 +126,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
                 </LinearLayout>
@@ -139,7 +143,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_lot"
                         android:textSize="14sp" />
 
@@ -159,7 +164,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
                 </LinearLayout>
@@ -175,7 +181,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_tid"
                         android:textSize="14sp" />
 
@@ -195,7 +202,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
                 </LinearLayout>
@@ -211,7 +219,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_firmware_version"
                         android:textSize="14sp" />
 
@@ -231,7 +240,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
                 </LinearLayout>
@@ -247,7 +257,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_time_on_pod"
                         android:textSize="14sp" />
 
@@ -267,7 +278,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -284,7 +296,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_pod_expiry_date"
                         android:textSize="14sp" />
 
@@ -304,7 +317,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -321,7 +335,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_pod_status"
                         android:textSize="14sp" />
 
@@ -375,7 +390,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_last_connection"
                         android:textSize="14sp" />
 
@@ -395,7 +411,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -420,7 +437,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_last_bolus"
                         android:textSize="14sp" />
 
@@ -440,7 +458,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -465,7 +484,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_base_basal_rate"
                         android:textSize="14sp" />
 
@@ -485,7 +505,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -510,7 +531,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_temp_basal_rate"
                         android:textSize="14sp" />
 
@@ -530,7 +552,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -555,7 +578,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_reservoir"
                         android:textSize="14sp" />
 
@@ -575,7 +599,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -600,7 +625,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_total_delivered"
                         android:textSize="14sp" />
 
@@ -620,7 +646,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -645,7 +672,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_errors"
                         android:textSize="14sp" />
 
@@ -665,7 +693,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -690,7 +719,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/omnipod_overview_pod_active_alerts"
                         android:textSize="14sp" />
 
@@ -710,7 +740,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="start"
-                        android:paddingLeft="5dp"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
@@ -802,7 +833,7 @@
                     android:drawableTop="@drawable/icon_omnipod_overview_suspend_delivery"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:text="@string/omnipod_overview_button_suspend_delivery"
-                    android:visibility="gone" />
+                    android:visibility="visible" />
 
             </LinearLayout>
 
diff --git a/omnipod/src/main/res/layout/omnipod_pod_management.xml b/omnipod/src/main/res/layout/omnipod_pod_management.xml
index a185cf9cfe..72e18d2823 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_management.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_management.xml
@@ -1,214 +1,192 @@
-<FrameLayout 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"
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/omnipod_pod_management"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.pump.omnipod.ui.PodManagementActivity">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <ScrollView
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="0dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="10dp"
+        android:layout_weight="0.5"
+        android:gravity="center"
+        android:text="@string/omnipod_pod_management_title"
+        android:textAlignment="center"
+        android:textSize="12pt"
+        android:textStyle="bold" />
 
-        <LinearLayout
+    <LinearLayout
+        android:id="@+id/omnipod_pod_management_waiting_for_rl_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ProgressBar
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="40dp"
+            android:layout_marginLeft="25dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="25dp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="10dp"
-                android:layout_weight="0.5"
-                android:gravity="center"
-                android:text="@string/omnipod_pod_management_title"
-                android:textAlignment="center"
-                android:textSize="12pt"
-                android:textStyle="bold" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_weight="0.5"
+            android:gravity="center"
+            android:text="@string/omnipod_pod_management_waiting_for_rileylink_connection"
+            android:textAlignment="center"
+            android:textSize="8pt" />
+    </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/omnipod_pod_management_waiting_for_rl_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="15dp"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        android:text="@string/omnipod_pod_management_heading_actions" />
 
-                <ProgressBar
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_marginLeft="25dp"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginRight="25dp" />
+    <LinearLayout
+        android:id="@+id/action_buttons_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp">
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_weight="0.5"
-                    android:gravity="center"
-                    android:text="@string/omnipod_pod_management_waiting_for_rileylink_connection"
-                    android:textAlignment="center"
-                    android:textSize="8pt" />
-            </LinearLayout>
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
+            android:id="@+id/omnipod_pod_management_button_activate_pod"
+            style="?android:attr/buttonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_pod_management_activate_pod"
+            android:text="@string/omnipod_pod_management_button_activate_pod"
+            android:textAllCaps="false" />
 
-            <LinearLayout
-                android:id="@+id/action_buttons_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="15dp"
-                    android:paddingStart="15dp"
-                    android:paddingEnd="15dp"
-                    android:text="@string/omnipod_pod_management_heading_actions" />
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
+            android:id="@+id/omnipod_pod_management_button_deactivate_pod"
+            style="?android:attr/buttonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_pod_management_deactivate_pod"
+            android:text="@string/omnipod_pod_management_button_deactivate_pod"
+            android:textAllCaps="false" />
+    </LinearLayout>
 
-                <androidx.gridlayout.widget.GridLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:padding="10dip"
-                    app:columnCount="2">
+    <LinearLayout
 
-                    <info.nightscout.androidaps.utils.ui.SingleClickButton
-                        android:id="@+id/omnipod_pod_management_button_activate_pod"
-                        style="@style/ButtonSmallFontStyle"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:drawableTop="@drawable/icon_pod_management_activate_pod"
-                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                        android:text="@string/omnipod_pod_management_button_activate_pod"
-                        android:textAllCaps="false"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp">
 
-                        app:layout_column="0"
-                        app:layout_columnWeight="1"
-                        app:layout_gravity="fill"
-                        app:layout_row="0" />
+        <Button
+            android:id="@+id/omnipod_pod_management_button_play_test_beep"
+            style="?android:attr/buttonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_pod_management_play_test_beep"
+            android:text="@string/omnipod_pod_management_button_play_test_beep"
+            android:textAllCaps="false" />
 
-                    <info.nightscout.androidaps.utils.ui.SingleClickButton
-                        android:id="@+id/omnipod_pod_management_button_deactivate_pod"
-                        style="@style/ButtonSmallFontStyle"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:drawableTop="@drawable/icon_pod_management_deactivate_pod"
-                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                        android:text="@string/omnipod_pod_management_button_deactivate_pod"
-                        android:textAllCaps="false"
 
-                        app:layout_column="1"
-                        app:layout_columnWeight="1"
-                        app:layout_gravity="fill"
-                        app:layout_row="0" />
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
+            android:id="@+id/omnipod_pod_management_button_discard_pod"
+            style="?android:attr/buttonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_pod_management_discard_pod"
+            android:text="@string/omnipod_pod_management_button_discard_pod"
+            android:textAllCaps="false" />
 
-                    <info.nightscout.androidaps.utils.ui.SingleClickButton
-                        android:id="@+id/omnipod_pod_management_button_play_test_beep"
-                        style="@style/ButtonSmallFontStyle"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:drawableTop="@drawable/icon_pod_management_play_test_beep"
-                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                        android:text="@string/omnipod_pod_management_button_play_test_beep"
-                        android:textAllCaps="false"
+    </LinearLayout>
 
-                        app:layout_column="0"
-                        app:layout_columnWeight="1"
-                        app:layout_gravity="fill"
-                        app:layout_row="1" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="15dp"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        android:text="@string/omnipod_pod_management_heading_tools" />
 
-                    <info.nightscout.androidaps.utils.ui.SingleClickButton
-                        android:id="@+id/omnipod_pod_management_button_discard_pod"
-                        style="@style/ButtonSmallFontStyle"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:drawableTop="@drawable/icon_pod_management_discard_pod"
-                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                        android:text="@string/omnipod_pod_management_button_discard_pod"
-                        android:textAllCaps="false"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp">
 
-                        app:layout_column="1"
-                        app:layout_columnWeight="1"
-                        app:layout_gravity="fill"
-                        app:layout_row="1" />
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
+            android:id="@+id/omnipod_pod_management_button_pod_history"
+            style="?android:attr/buttonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_pod_management_pod_history"
+            android:text="@string/omnipod_pod_management_button_pod_history"
+            android:textAllCaps="false" />
 
-                </androidx.gridlayout.widget.GridLayout>
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
+            android:id="@+id/omnipod"
+            style="?android:attr/buttonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_pod_management_rl_stats"
+            android:text="@string/omnipod_pod_management_button_riley_link_stats"
+            android:textAllCaps="false" />
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="15dp"
-                    android:paddingStart="15dp"
-                    android:paddingEnd="15dp"
-                    android:text="@string/omnipod_pod_management_heading_tools" />
+    </LinearLayout>
 
-                <androidx.gridlayout.widget.GridLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="10dip"
-                    app:columnCount="2">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp">
 
-                    <info.nightscout.androidaps.utils.ui.SingleClickButton
-                        android:id="@+id/omnipod_pod_management_button_pod_history"
-                        style="@style/ButtonSmallFontStyle"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:drawableTop="@drawable/icon_pod_management_pod_history"
-                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                        android:text="@string/omnipod_pod_management_button_pod_history"
-                        android:textAllCaps="false"
+        <Button
+            android:id="@+id/omnipod_pod_management_button_pulse_log"
+            style="?android:attr/buttonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_pod_management_pulse_log"
+            android:text="@string/omnipod_pod_management_button_read_pulse_log"
+            android:textAllCaps="false"
+            android:visibility="gone" />
 
-                        app:layout_column="0"
-                        app:layout_columnWeight="1"
-                        app:layout_gravity="fill"
-                        app:layout_row="2" />
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
+            android:id="@+id/omnipod_pod_management_button_reset_rileylink_config"
+            style="?android:attr/buttonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginEnd="4dp"
+            android:layout_weight="0.5"
+            android:drawableTop="@drawable/icon_pod_activity_reset_rileylink_config"
+            android:text="@string/omnipod_pod_management_button_reset_riley_link_config"
+            android:textAllCaps="false" />
 
-                    <info.nightscout.androidaps.utils.ui.SingleClickButton
-                        android:id="@+id/omnipod_pod_management_button_rileylink_stats"
-                        style="@style/ButtonSmallFontStyle"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:drawableTop="@drawable/icon_pod_management_rl_stats"
-                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                        android:text="@string/omnipod_pod_management_button_riley_link_stats"
-                        android:textAllCaps="false"
+    </LinearLayout>
 
-                        app:layout_column="1"
-                        app:layout_columnWeight="1"
-                        app:layout_gravity="fill"
-                        app:layout_row="2" />
-
-                    <info.nightscout.androidaps.utils.ui.SingleClickButton
-                        android:id="@+id/omnipod_pod_management_button_pulse_log"
-                        style="@style/ButtonSmallFontStyle"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:drawableTop="@drawable/icon_pod_management_pulse_log"
-                        android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                        android:text="@string/omnipod_pod_management_button_read_pulse_log"
-                        android:textAllCaps="false"
-                        android:visibility="gone"
-
-                        app:layout_column="0"
-                        app:layout_columnWeight="1"
-                        app:layout_gravity="fill"
-                        app:layout_row="3" />
-
-                </androidx.gridlayout.widget.GridLayout>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</FrameLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
index 97b6ea6a9c..bc54797e4f 100644
--- a/omnipod/src/main/res/values/strings.xml
+++ b/omnipod/src/main/res/values/strings.xml
@@ -185,6 +185,7 @@
     <string name="omnipod_pod_management_button_discard_pod">Discard Pod</string>
     <string name="omnipod_pod_management_button_pod_history">Pod history</string>
     <string name="omnipod_pod_management_button_riley_link_stats">RileyLink stats</string>
+    <string name="omnipod_pod_management_button_reset_riley_link_config">Reest RileyLink Config</string>
     <string name="omnipod_pod_management_button_read_pulse_log">Read pulse log</string>
     <string name="omnipod_pod_management_button_reading_pulse_log">Reading pulse log…</string>
     <string name="omnipod_pod_management_discard_pod_confirmation">If you discard the Pod, you will not be able to communicate with it anymore. You should only do this when all communication with the Pod persistently fails. If you can still communicate with the Pod, please use the <b>Deactivate Pod</b> option.\n\nIf you wish to proceed, please make sure to remove the Pod from your body!</string>

From c3bf5d66fda63462066aee459ca9f274f68965b4 Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Thu, 3 Dec 2020 23:24:03 +0100
Subject: [PATCH 3/4] Remove Reset RileyLink Config button from actions for
 Omnipod (in favor of Pod Management menu)

---
 .../pump/omnipod/OmnipodPumpPlugin.java       | 21 ++++---------------
 .../definition/OmnipodCustomActionType.java   | 17 ---------------
 .../command/OmnipodCustomCommandType.java     |  3 +--
 .../pump/omnipod/ui/PodManagementActivity.kt  |  8 +++++++
 .../res/layout/omnipod_pod_management.xml     |  2 +-
 omnipod/src/main/res/values/strings.xml       |  3 +--
 .../pump/omnipod/OmnipodPumpPluginTest.java   |  2 +-
 7 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCustomActionType.java

diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index 9462d3ebba..ef13548f97 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -64,13 +64,10 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpInfo;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.data.ActiveBolus;
 import info.nightscout.androidaps.plugins.pump.omnipod.data.RLHistoryItemOmnipod;
 import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodCommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodCustomActionType;
 import info.nightscout.androidaps.plugins.pump.omnipod.definition.OmnipodStorageKeys;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.action.service.ExpirationReminderBuilder;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.communication.message.response.podinfo.PodInfoRecentPulseLog;
@@ -122,7 +119,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
 
     private final PodStateManager podStateManager;
     private final RileyLinkServiceData rileyLinkServiceData;
-    private final ServiceTaskExecutor serviceTaskExecutor;
     private final AapsOmnipodManager aapsOmnipodManager;
     private final AapsOmnipodUtil aapsOmnipodUtil;
     private final RileyLinkUtil rileyLinkUtil;
@@ -140,8 +136,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
     private final ServiceConnection serviceConnection;
     private final PumpType pumpType = PumpType.Insulet_Omnipod;
 
-    private final List<CustomAction> customActions = Collections.singletonList(new CustomAction(
-            R.string.omnipod_custom_action_reset_rileylink, OmnipodCustomActionType.RESET_RILEY_LINK_CONFIGURATION, R.drawable.icon_pod_activity_reset_rileylink_config, true));
     private final CompositeDisposable disposables = new CompositeDisposable();
     private final NSUpload nsUpload;
 
@@ -174,7 +168,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
             CommandQueueProvider commandQueue,
             FabricPrivacy fabricPrivacy,
             RileyLinkServiceData rileyLinkServiceData,
-            ServiceTaskExecutor serviceTaskExecutor,
             DateUtil dateUtil,
             AapsOmnipodUtil aapsOmnipodUtil,
             RileyLinkUtil rileyLinkUtil,
@@ -200,7 +193,6 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
         this.dateUtil = dateUtil;
         this.podStateManager = podStateManager;
         this.rileyLinkServiceData = rileyLinkServiceData;
-        this.serviceTaskExecutor = serviceTaskExecutor;
         this.aapsOmnipodManager = aapsOmnipodManager;
         this.aapsOmnipodUtil = aapsOmnipodUtil;
         this.rileyLinkUtil = rileyLinkUtil;
@@ -482,8 +474,9 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
 
     @Override
     public boolean isHandshakeInProgress() {
-        if (displayConnectionMessages)
+        if (displayConnectionMessages) {
             aapsLogger.debug(LTag.PUMP, "isHandshakeInProgress [OmnipodPumpPlugin] - default (empty) implementation.");
+        }
         return false;
     }
 
@@ -805,18 +798,12 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
 
     @Override
     public List<CustomAction> getCustomActions() {
-        return customActions;
+        return Collections.emptyList();
     }
 
     @Override
     public void executeCustomAction(CustomActionType customActionType) {
-        OmnipodCustomActionType omnipodCustomActionType = (OmnipodCustomActionType) customActionType;
-
-        if (omnipodCustomActionType == OmnipodCustomActionType.RESET_RILEY_LINK_CONFIGURATION) {
-            serviceTaskExecutor.startTask(new ResetRileyLinkConfigurationTask(getInjector()));
-        } else {
-            aapsLogger.warn(LTag.PUMP, "Unknown custom action: " + omnipodCustomActionType);
-        }
+        aapsLogger.warn(LTag.PUMP, "Unknown custom action: " + customActionType);
     }
 
     @Override
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCustomActionType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCustomActionType.java
deleted file mode 100644
index 9d9fbf3f13..0000000000
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCustomActionType.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.definition;
-
-import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
-
-/**
- * Created by andy on 4.8.2019
- */
-
-public enum OmnipodCustomActionType implements CustomActionType {
-    RESET_RILEY_LINK_CONFIGURATION;
-
-    @Override
-    public String getKey() {
-        return this.name();
-    }
-
-}
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java
index f5c787be26..f88777638e 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/queue/command/OmnipodCustomCommandType.java
@@ -9,8 +9,7 @@ public enum OmnipodCustomCommandType {
     DEACTIVATE_POD("DEACTIVATE POD"),
     HANDLE_TIME_CHANGE("HANDLE TIME CHANGE"),
     UPDATE_ALERT_CONFIGURATION("UPDATE ALERT CONFIGURATION"),
-    PLAY_TEST_BEEP("PLAY TEST BEEP")
-    ;
+    PLAY_TEST_BEEP("PLAY TEST BEEP");
 
     private final String description;
 
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt
index 058a033d85..d877481c46 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt
@@ -11,6 +11,8 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor
 import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.omnipod.R
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress
@@ -50,6 +52,7 @@ class PodManagementActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var aapsOmnipodManager: AapsOmnipodManager
     @Inject lateinit var context: Context
     @Inject lateinit var omnipodPumpPlugin: OmnipodPumpPlugin
+    @Inject lateinit var serviceTaskExecutor: ServiceTaskExecutor
 
     private var disposables: CompositeDisposable = CompositeDisposable()
 
@@ -80,6 +83,11 @@ class PodManagementActivity : NoSplashAppCompatActivity() {
             }
         }
 
+        omnipod_pod_management_button_reset_rileylink_config.setOnClickListener {
+            // TODO improvement: properly disable button until task is finished
+            serviceTaskExecutor.startTask(ResetRileyLinkConfigurationTask(injector))
+        }
+
         omnipod_pod_management_button_play_test_beep.setOnClickListener {
             omnipod_pod_management_button_play_test_beep.isEnabled = false
             omnipod_pod_management_button_play_test_beep.setText(R.string.omnipod_pod_management_button_playing_test_beep)
diff --git a/omnipod/src/main/res/layout/omnipod_pod_management.xml b/omnipod/src/main/res/layout/omnipod_pod_management.xml
index 72e18d2823..f7871be3f5 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_management.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_management.xml
@@ -145,7 +145,7 @@
             android:textAllCaps="false" />
 
         <info.nightscout.androidaps.utils.ui.SingleClickButton
-            android:id="@+id/omnipod"
+            android:id="@+id/omnipod_pod_management_button_rileylink_stats"
             style="?android:attr/buttonStyle"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
index bc54797e4f..bc37c569cc 100644
--- a/omnipod/src/main/res/values/strings.xml
+++ b/omnipod/src/main/res/values/strings.xml
@@ -185,7 +185,7 @@
     <string name="omnipod_pod_management_button_discard_pod">Discard Pod</string>
     <string name="omnipod_pod_management_button_pod_history">Pod history</string>
     <string name="omnipod_pod_management_button_riley_link_stats">RileyLink stats</string>
-    <string name="omnipod_pod_management_button_reset_riley_link_config">Reest RileyLink Config</string>
+    <string name="omnipod_pod_management_button_reset_riley_link_config">Reset RileyLink Config</string>
     <string name="omnipod_pod_management_button_read_pulse_log">Read pulse log</string>
     <string name="omnipod_pod_management_button_reading_pulse_log">Reading pulse log…</string>
     <string name="omnipod_pod_management_discard_pod_confirmation">If you discard the Pod, you will not be able to communicate with it anymore. You should only do this when all communication with the Pod persistently fails. If you can still communicate with the Pod, please use the <b>Deactivate Pod</b> option.\n\nIf you wish to proceed, please make sure to remove the Pod from your body!</string>
@@ -254,7 +254,6 @@
 
     <!-- Omnipod - Other -->
     <string name="omnipod_pump_description">Pump integration for Omnipod, requires RileyLink (with at least 2.0 firmware) device.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Reset RileyLink config</string>
     <string name="omnipod_uncertain">uncertain</string>
     <string name="omnipod_pulse_log">Pulse log</string>
     <string name="omnipod_pulse_log_value">Pulse Log (copied to clipboard)</string>
diff --git a/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java
index 79d98aac0c..28af58b0d6 100644
--- a/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java
+++ b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPluginTest.java
@@ -59,7 +59,7 @@ public class OmnipodPumpPluginTest {
         PowerMockito.mockStatic(Looper.class);
         OmnipodPumpPlugin plugin = new OmnipodPumpPlugin(injector, aapsLogger, rxBusWrapper, null,
                 resourceHelper, activePluginProvider, null, null, aapsOmnipodManager, commandQueueProvider,
-                null, null, null, null, null,
+                null, null, null, null,
                 rileyLinkUtil, null, null, null
         );
         when(activePluginProvider.getActiveTreatments().getTempBasalFromHistory(anyLong())).thenReturn(null);

From 1f5a96f4d33535479be235db0e5f1023c793cc93 Mon Sep 17 00:00:00 2001
From: TeleRiddler <teleriddler@users.noreply.github.com>
Date: Sat, 5 Dec 2020 00:08:54 +0100
Subject: [PATCH 4/4] Change all icons to 48px x 48px and re-added as drawable
 vectors with 48dp x48dp Updated colors settings and alignment for icons

---
 ...ic_omnipod_overview_acknowledge_alerts.xml | 20 +++++++
 .../ic_omnipod_overview_pod_management.xml    | 21 +++++++
 ...ic_omnipod_overview_refresh_pod_status.xml | 20 +++++++
 .../ic_omnipod_overview_resume_delivery.xml   | 17 ++++++
 .../drawable/ic_omnipod_overview_set_time.xml | 18 ++++++
 .../ic_omnipod_overview_suspend_delivery.xml  | 17 ++++++
 ...cess.xml => ic_omnipod_wizard_success.xml} |  0
 ...ic_pod_activity_reset_rileylink_config.xml | 41 +++++++++++++
 .../ic_pod_management_activate_pod.xml        | 17 ++++++
 .../ic_pod_management_deactivate_pod.xml      | 17 ++++++
 .../ic_pod_management_discard_pod.xml         | 26 ++++++++
 .../ic_pod_management_play_test_beep.xml      | 23 +++++++
 .../ic_pod_management_pod_history.xml         | 17 ++++++
 .../drawable/ic_pod_management_pulse_log.xml  | 40 +++++++++++++
 .../drawable/ic_pod_management_rl_stats.xml   | 41 +++++++++++++
 ...on_omnipod_overview_acknowledge_alerts.xml | 11 ----
 .../icon_omnipod_overview_pod_management.xml  | 15 -----
 ...on_omnipod_overview_refresh_pod_status.xml |  9 ---
 .../icon_omnipod_overview_resume_delivery.xml |  8 ---
 .../icon_omnipod_overview_set_time.xml        |  9 ---
 ...icon_omnipod_overview_suspend_delivery.xml |  8 ---
 ...on_pod_activity_reset_rileylink_config.xml | 24 --------
 .../icon_pod_management_activate_pod.xml      |  8 ---
 .../icon_pod_management_deactivate_pod.xml    |  8 ---
 .../icon_pod_management_discard_pod.xml       | 13 ----
 .../icon_pod_management_play_test_beep.xml    | 10 ----
 .../icon_pod_management_pod_history.xml       |  8 ---
 .../icon_pod_management_pulse_log.xml         | 17 ------
 .../drawable/icon_pod_management_rl_stats.xml | 24 --------
 .../src/main/res/layout/omnipod_overview.xml  | 14 ++---
 .../res/layout/omnipod_pod_management.xml     | 22 +++----
 .../omnipod_wizard_action_page_fragment.xml   |  2 +-
 omnipod/src/main/res/values/colors.xml        | 60 +++++++++----------
 33 files changed, 385 insertions(+), 220 deletions(-)
 create mode 100644 omnipod/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_omnipod_overview_pod_management.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_omnipod_overview_set_time.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml
 rename omnipod/src/main/res/drawable/{icon_omnipod_wizard_success.xml => ic_omnipod_wizard_success.xml} (100%)
 create mode 100644 omnipod/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_pod_management_activate_pod.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_pod_management_deactivate_pod.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_pod_management_discard_pod.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_pod_management_play_test_beep.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_pod_management_pod_history.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_pod_management_pulse_log.xml
 create mode 100644 omnipod/src/main/res/drawable/ic_pod_management_rl_stats.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_omnipod_overview_acknowledge_alerts.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_omnipod_overview_pod_management.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_omnipod_overview_resume_delivery.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_omnipod_overview_set_time.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_omnipod_overview_suspend_delivery.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_pod_activity_reset_rileylink_config.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_pod_management_deactivate_pod.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_pod_management_discard_pod.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_pod_management_play_test_beep.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_pod_management_pulse_log.xml
 delete mode 100644 omnipod/src/main/res/drawable/icon_pod_management_rl_stats.xml

diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml
new file mode 100644
index 0000000000..2908c8f16b
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m24.1916,22.5877c-0.7118,-0.007 -1.4368,0.1146 -2.1434,0.3771 -3.1037,1.1528 -4.6821,4.588 -3.5277,7.6964l1.092,2.9409 -0.151,2.401c-0.0448,0.7071 0.4924,1.3168 1.1998,1.3615 0.1785,0.0113 0.3575,-0.0147 0.5253,-0.0767l10.8786,-4.0129c0.665,-0.2453 1.0052,-0.9833 0.7599,-1.6483l-0.0527,-0.121c-0.0856,-0.1609 -0.1619,-0.2619 -0.2517,-0.3502l-1.6449,-1.6162 -1.1314,-3.047 -0.0872,-0.221c-0.9548,-2.2778 -3.1405,-3.6624 -5.4657,-3.6838zM28.7356,35.6281 L24.9868,36.9465c0.508,0.76 1.4831,1.1108 2.3853,0.7936 0.9021,-0.3173 1.443,-1.2013 1.3635,-2.1119zM29.7694,17.7822c1.8027,0.9849 3.156,2.2495 4.0464,3.7917 0.8904,1.5423 1.3089,3.3465 1.2605,5.4001 -0.008,0.3579 -0.3054,0.6412 -0.6633,0.6328 -0.3579,-0.008 -0.6412,-0.3054 -0.6328,-0.6633 0.043,-1.8248 -0.3211,-3.3944 -1.0872,-4.7214 -0.7661,-1.327 -1.9434,-2.4271 -3.5452,-3.3022 -0.3142,-0.1717 -0.4297,-0.5655 -0.2581,-0.8796 0.1716,-0.3142 0.5655,-0.4297 0.8796,-0.2581zM29.564,20.8942c0.8358,0.4557 1.5056,1.1189 2.0019,1.9786 0.4963,0.8597 0.7358,1.7714 0.7126,2.723 -0.009,0.3579 -0.3059,0.641 -0.6638,0.6322 -0.3579,-0.009 -0.641,-0.3059 -0.6322,-0.6638 0.0173,-0.7101 -0.1605,-1.3872 -0.5393,-2.0432 -0.3788,-0.6561 -0.8762,-1.1486 -1.4998,-1.4886 -0.3143,-0.1714 -0.4302,-0.5651 -0.2588,-0.8794 0.1714,-0.3143 0.5651,-0.4302 0.8794,-0.2588zM18.2307,17.7822c-1.8027,0.9849 -3.156,2.2495 -4.0464,3.7917 -0.8904,1.5423 -1.3089,3.3465 -1.2605,5.4001 0.008,0.3579 0.3054,0.6412 0.6633,0.6328 0.3579,-0.008 0.6412,-0.3054 0.6328,-0.6633 -0.043,-1.8248 0.3211,-3.3944 1.0872,-4.7214 0.7661,-1.327 1.9434,-2.4271 3.5452,-3.3022 0.3142,-0.1717 0.4297,-0.5655 0.2581,-0.8796 -0.1717,-0.3142 -0.5655,-0.4297 -0.8796,-0.2581zM18.436,20.8942c-0.8358,0.4557 -1.5056,1.1189 -2.0019,1.9786 -0.4963,0.8597 -0.7358,1.7714 -0.7126,2.723 0.009,0.3579 0.3059,0.641 0.6638,0.6322 0.3579,-0.009 0.641,-0.3059 0.6322,-0.6638 -0.0173,-0.7101 0.1605,-1.3872 0.5393,-2.0432 0.3788,-0.6561 0.8762,-1.1486 1.4998,-1.4886 0.3143,-0.1714 0.4302,-0.5651 0.2588,-0.8794 -0.1714,-0.3143 -0.5651,-0.4302 -0.8794,-0.2588z"
+      android:strokeWidth="1.02677727"
+      android:fillColor="@color/ic_omnipod_overview_acknowledge_alerts"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"/>
+  <path
+      android:pathData="m26.0503,0.0007c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1525,0.0374 -0.1031,0.0336 -0.5942,0.1155 -2.3881,0.3984 -4.4585,1.4641 -5.8895,2.378 -1.9139,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1468 -1.7552,7.0686 -1.7552,7.0686 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.7069 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0432 0,2.5501 -0.002,4.2657 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9894 0.5193,1.9759 1.3625,2.87 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9201,0.0609 12.0882,0.094 3.0968,0.0166 6.2604,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6886,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3331,-26.3083 0.031,-1.8127 -0.4748,-4.0265 -1.0874,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6966,-1.6497 -0.1464,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.0971,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2429 -2.1678,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4702,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5435 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5507 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0498 0.069,3.9059 1.8896,5.9333 0,1 3.4505,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4505,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.536,4.8819c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9218,1.4971 1.2823,0.1137 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7917,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0386,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3506 -0.0324,1.8941 -0.0906,17.001 -0.3326,26.2796 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.184,0.5335 -0.2005,0.0209 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.6699,-0.001 -8.7617,-0.0177 -6.1836,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6254 0,-2.5467 0.005,-5.8139 0.0112,-9.0379 0.0119,-6.4479 0.0293,-12.7226 0.0293,-12.7226v-0.009,-0.009c0,0 0.0899,-3.4118 1.2957,-5.3949l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7923,-0.1549 0.8272,-0.1634 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.0845,0.1018 0.0738,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110634"
+      android:fillColor="@color/ic_omnipod_overview_acknowledge_alerts_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_pod_management.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_pod_management.xml
new file mode 100644
index 0000000000..a1d2818dab
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_pod_management.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m26.0527,0.0002c-0.9074,-0.008 -1.8134,0.0785 -2.6944,0.2591 -1.1017,0.2257 -2.2802,0.6223 -3.2064,1.5466 -0.2207,0.0252 -0.4477,0.052 -0.6103,0.071 -0.506,0.0591 -0.7168,0.094 -0.8694,0.1312 -0.1526,0.0374 -0.1033,0.0336 -0.5947,0.1155 -2.3903,0.3984 -4.4625,1.4641 -5.8948,2.3781 -1.9157,1.2225 -3.569,3.3782 -4.5258,4.9719 -1.9128,3.1469 -1.7568,7.0688 -1.7568,7.0688 -0,0.0185 -0.0173,6.2668 -0.0292,12.7072 -0.006,3.2249 -0.0113,6.4933 -0.0113,9.0435 -0.0006,2.5501 -0.001,4.2658 0.0145,4.7736l0.005,0.1722 0.0329,0.1306c0.0964,0.9895 0.5198,1.9759 1.3637,2.8701 0.9203,0.9752 2.4171,1.7154 4.2285,1.6459 0.0485,0.0006 5.9255,0.0609 12.0991,0.094 3.0996,0.0165 6.2661,0.0262 8.7971,0.0177 2.531,-0.008 4.2315,-0.008 5.096,-0.0989 1.5035,-0.1569 2.7158,-0.8702 3.405,-1.8006 0.6892,-0.9305 0.883,-1.9493 0.9043,-2.7673 0.2442,-9.3554 0.3051,-24.6544 0.3334,-26.3089 0.031,-1.8127 -0.4753,-4.0266 -1.0884,-5.5738 -0.3341,-0.843 -0.5506,-1.3392 -0.6972,-1.6498 -0.1467,-0.3106 -0.3251,-0.5865 -0.3251,-0.5865l0.0972,0.1491c0,0 -0.6215,-1.1087 -1.3979,-2.0457 -0.3078,-0.3714 -1.0328,-1.2429 -2.1698,-2.218 -0.7211,-0.6185 -1.5597,-1.2077 -2.4724,-1.6563 -0.1219,-0.145 -0.2512,-0.231 -0.3746,-0.3617 -0.2642,-0.2799 -0.568,-0.5505 -0.9074,-0.8223 -0.6787,-0.5435 -1.4488,-1.0751 -2.3138,-1.413 -1.4099,-0.5507 -2.9257,-0.8294 -4.438,-0.8434zM26.1436,1.3837a3.9094,1.8897 5.925,0 1,1.0507 0.0691,3.9094 1.8897,5.925 0,1 3.4536,2.3639 3.9094,1.8897 5.925,0 1,-4.2883 1.3429,3.9094 1.8897,5.925 0,1 -3.4536,-2.3639 3.9094,1.8897 5.925,0 1,3.2376 -1.4119zM21.5343,4.8815c0.5181,-0.008 0.9264,0.1089 0.9218,0.1062 1.4923,0.8572 2.6418,1.3835 3.9254,1.4972 1.2835,0.1137 2.4325,-0.1772 4.0215,-0.5811 0.8856,-0.2251 2.7943,0.4895 4.0905,1.6012 0.9408,0.8069 1.4877,1.4666 1.7923,1.8341 0.4981,0.6012 1.0907,1.6034 1.0907,1.6034l0.0445,0.0773 0.0257,0.0349c-0.005,-0.003 -0.006,0.003 0.0387,0.0977 0.1031,0.2186 0.2993,0.6627 0.617,1.4644 0.3996,1.0083 0.8831,3.3362 0.8657,4.3507 -0.0324,1.8941 -0.0907,17.0014 -0.3329,26.2803 -0.01,0.3522 -0.1097,0.7291 -0.2822,0.962 -0.1724,0.2328 -0.3889,0.4505 -1.185,0.5336 -0.2007,0.0209 -2.2631,0.0734 -4.7771,0.0817 -2.5141,0.008 -5.675,-0.001 -8.7696,-0.0177 -6.1892,-0.0332 -12.1142,-0.0941 -12.1142,-0.0941l-0.0466,-0.0006 -0.0466,0.002c-0.9796,0.0475 -1.4586,-0.2589 -1.83,-0.6525 -0.3714,-0.3936 -0.5347,-1.0021 -0.5368,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0129,-2.1057 -0.0129,-4.6256 0.0006,-2.5467 0.005,-5.8141 0.0113,-9.0381 0.0112,-6.448 0.0292,-12.723 0.0292,-12.723v-0.01,-0.01c0,0 0.0899,-3.4119 1.2969,-5.3951l0.003,-0.005 0.003,-0.005c0.701,-1.1684 2.4903,-3.2803 3.5147,-3.9341 1.1843,-0.7557 2.9565,-1.6308 4.7098,-1.9231 0.5444,-0.0908 0.7931,-0.1548 0.828,-0.1635 0.0349,-0.008 -0.0002,-0.005 0.4825,-0.0617 0.5098,-0.0596 1.1065,-0.1378 1.6247,-0.1465zM31.4106,5.2672c0.0845,0.1018 0.0739,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="2.6569562"
+      android:fillColor="@color/ic_omnipod_overview_pod_management_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m18.0654,18.0937h-1.4761c-1.2016,0 -2.1702,0.9998 -2.1702,2.2014v15.8343c0,1.2089 0.98,2.1889 2.1889,2.1889h1.4574m0,-10.0812c-2.4827,-0.0209 -1.222,0.0207 -3.7049,0m5.6068,-3.0655h11.9853c0.9021,0 1.6283,0.7262 1.6283,1.6283v2.8159c0,0.9021 -0.7262,1.6283 -1.6283,1.6283h-11.9853c-0.9021,0 -1.6283,-0.7262 -1.6283,-1.6283v-2.8159c0,-0.9021 0.7262,-1.6283 1.6283,-1.6283zM19.9673,15.1901h11.9853c0.9021,0 1.6283,0.7262 1.6283,1.6283v2.8159c0,0.9021 -0.7262,1.6283 -1.6283,1.6283h-11.9853c-0.9021,0 -1.6283,-0.7262 -1.6283,-1.6283v-2.8159c0,-0.9021 0.7262,-1.6283 1.6283,-1.6283zM19.9673,35.1533h11.9853c0.9021,0 1.6283,0.7262 1.6283,1.6283v2.8159c0,0.9021 -0.7262,1.6283 -1.6283,1.6283h-11.9853c-0.9021,0 -1.6283,-0.7262 -1.6283,-1.6283v-2.8159c0,-0.9021 0.7262,-1.6283 1.6283,-1.6283z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.64166832"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/ic_omnipod_overview_pod_management"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml
new file mode 100644
index 0000000000..83f0a2345d
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m26.0503,0.0007c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1524,0.0374 -0.1031,0.0336 -0.5941,0.1155 -2.3881,0.3984 -4.4585,1.4641 -5.8896,2.378 -1.9139,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1468 -1.7552,7.0686 -1.7552,7.0686 0,0.0185 -0.017,6.2667 -0.029,12.7069 -0.01,3.2249 -0.011,6.4932 -0.011,9.0432 0,2.5501 0,4.2657 0.015,4.7735l0.01,0.1722 0.033,0.1306c0.096,0.9894 0.5193,1.9759 1.3625,2.87 0.9194,0.9751 2.4149,1.7154 4.2247,1.6459 0.049,0.0005 5.9201,0.0609 12.0882,0.094 3.0968,0.0166 6.2604,0.0262 8.7891,0.0177 2.5288,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6886,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3332,-26.3083 0.031,-1.8127 -0.4749,-4.0265 -1.0875,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6965,-1.6497 -0.1465,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.097,0.149c0,0 -0.621,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.032,-1.2429 -2.1679,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4701,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9066,-0.8223 -0.678,-0.5435 -1.4475,-1.0751 -2.3116,-1.4129 -1.4087,-0.5507 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0498 0.069,3.9059 1.8896,5.9333 0,1 3.4504,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4504,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.536,4.8819c0.5177,-0.009 0.9256,0.1089 0.921,0.1062 1.491,0.8572 2.6394,1.3835 3.9218,1.4971 1.2823,0.1137 2.4303,-0.1772 4.0179,-0.5811 0.8847,-0.2251 2.7917,0.4895 4.0867,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.044,0.0772 0.026,0.0348c-0.01,-0.003 -0.01,0.003 0.039,0.0976 0.1031,0.2186 0.2991,0.6627 0.6164,1.4643 0.3993,1.0083 0.8823,3.3361 0.8649,4.3506 -0.032,1.8941 -0.091,17.001 -0.3326,26.2796 -0.01,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.184,0.5336 -0.2005,0.0209 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.67,-0.001 -8.7617,-0.0177 -6.1837,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.046,-0.0005 -0.047,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.371,-0.3935 -0.5342,-1.002 -0.5362,-1.081v-0.0618c-0.01,-0.2205 -0.014,-2.1057 -0.013,-4.6254 0,-2.5467 0.01,-5.8139 0.011,-9.0379 0.012,-6.4479 0.029,-12.7226 0.029,-12.7226v-0.009,-0.009c0,0 0.09,-3.4118 1.2957,-5.3949v-0.004,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1831,-0.7557 2.9538,-1.6308 4.7055,-1.923 0.5439,-0.0907 0.7924,-0.1549 0.8272,-0.1634 0.035,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.085,0.1018 0.074,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110634"
+      android:fillColor="@color/ic_omnipod_overview_refresh_pod_status_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m19.0677,32.8883c-0.8028,-0.7235 -1.3819,-1.5909 -1.7613,-2.5223 -1.0064,-2.4703 -0.5352,-5.4083 1.4298,-7.435l1.8132,1.8148c0.0998,0.0999 0.2796,0.028 0.3035,-0.1199l0.9905,-6.4876c0.016,-0.1079 -0.0759,-0.1999 -0.1837,-0.1839l-6.4859,0.9913c-0.1478,0.024 -0.2197,0.2039 -0.1198,0.3038l1.8172,1.8188c-2.9993,3.0699 -3.5105,7.6748 -1.5416,11.2724 0.5911,1.0833 1.4098,2.0746 2.4522,2.906 1.7732,1.411 3.9539,2.0866 6.1185,2.0426l0.4074,-2.6662c-1.8651,0.1599 -3.7821,-0.4157 -5.2399,-1.7348z"
+      android:fillColor="@color/ic_omnipod_overview_refresh_pod_status"/>
+  <path
+      android:pathData="m31.129,34.4913c2.9993,-3.0699 3.5105,-7.6748 1.5416,-11.2724 -0.5911,-1.0833 -1.4098,-2.0746 -2.4522,-2.906 -1.7732,-1.411 -3.9539,-2.0866 -6.1185,-2.0426l-0.4074,2.6662c1.8611,-0.1599 3.7821,0.4157 5.2399,1.7348 0.8028,0.7235 1.3819,1.5909 1.7613,2.5223 1.0064,2.4703 0.5352,5.4083 -1.4298,7.435l-1.8132,-1.8148c-0.0998,-0.0999 -0.2796,-0.028 -0.3035,0.1199l-0.9905,6.4876c-0.016,0.1079 0.0759,0.1999 0.1837,0.1839l6.4859,-0.9913c0.1478,-0.024 0.2157,-0.2039 0.1198,-0.3038z"
+      android:fillColor="@color/ic_omnipod_overview_refresh_pod_status"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml
new file mode 100644
index 0000000000..4e2ae87839
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m24,17.7028c-5.5651,0 -10.077,4.5118 -10.077,10.077 0,5.5654 4.5119,10.077 10.077,10.077 5.5654,0 10.077,-4.5116 10.077,-10.077 0.0001,-5.5651 -4.5116,-10.077 -10.077,-10.077zM23.1066,28.5497 L19.4541,30.6443c-0.6291,0.3604 -1.139,0.0651 -1.139,-0.6609l0,-4.1748c0,-0.7255 0.5101,-1.0214 1.139,-0.66l3.6525,2.0946c0.6291,0.3606 0.6291,0.9454 0,1.3065zM25.7184,29.8873c0,0.7252 -0.3978,1.3134 -0.8895,1.3134 -0.4913,0 -0.8896,-0.5881 -0.8896,-1.3134L23.9393,25.9048c0,-0.7252 0.3983,-1.3136 0.8896,-1.3136 0.4917,0 0.8895,0.5884 0.8895,1.3136zM29.4102,29.8873c0,0.7252 -0.3981,1.3134 -0.8899,1.3134 -0.4916,0 -0.8899,-0.5881 -0.8899,-1.3134L27.6305,25.9048c0,-0.7252 0.3982,-1.3136 0.8899,-1.3136 0.4917,0 0.8899,0.5884 0.8899,1.3136z"
+      android:fillColor="@color/ic_omnipod_overview_resume_delivery"/>
+  <path
+      android:pathData="m26.0503,0.0008c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1524,0.0374 -0.1031,0.0336 -0.5942,0.1155 -2.3881,0.3984 -4.4585,1.4641 -5.8895,2.378 -1.914,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1468 -1.7552,7.0686 -1.7552,7.0686 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.7069 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0432 0,2.5501 -0.002,4.2657 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9894 0.5193,1.9759 1.3625,2.87 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9201,0.0609 12.0882,0.094 3.0968,0.0166 6.2604,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6885,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3331,-26.3083 0.031,-1.8127 -0.4748,-4.0265 -1.0874,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6966,-1.6497 -0.1465,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.0971,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2428 -2.1678,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4701,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5435 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5507 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0497 0.069,3.9059 1.8896,5.9333 0,1 3.4505,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4505,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.536,4.8819c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9218,1.4971 1.2823,0.1137 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7918,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0387,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3506 -0.0324,1.8941 -0.0906,17.001 -0.3326,26.2796 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.1839,0.5336 -0.2005,0.021 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.6699,-0.001 -8.7617,-0.0177 -6.1837,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6254 0,-2.5467 0.005,-5.8139 0.0111,-9.0379 0.0119,-6.4479 0.0293,-12.7226 0.0293,-12.7226v-0.009,-0.009c0,0 0.0899,-3.4118 1.2957,-5.3949l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7923,-0.1549 0.8272,-0.1634 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.0845,0.1018 0.0737,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110634"
+      android:fillColor="@color/ic_omnipod_overview_resume_delivery_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_set_time.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_set_time.xml
new file mode 100644
index 0000000000..d5c6e682c3
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_set_time.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m35.0169,28.183c0,5.6555 -4.6007,10.2575 -10.2575,10.2575 -5.6394,0 -10.2282,-4.5752 -10.2543,-10.209h-1.522l2.2792,-3.4204 2.2792,3.4204h-1.3275c0.0261,4.6908 3.8484,8.4994 8.5448,8.4994 4.7131,0 8.5479,-3.8341 8.5479,-8.5479 0,-4.7137 -3.8347,-8.5479 -8.5479,-8.5479 -0.4727,0 -0.8548,-0.3833 -0.8548,-0.8554 0,-0.4721 0.382,-0.8542 0.8548,-0.8542 5.6568,0.0007 10.2581,4.6019 10.2581,10.2574zM20.0565,32.3433c0.1671,0.1677 0.3858,0.2497 0.6044,0.2497 0.2187,0 0.4373,-0.0839 0.6044,-0.2497l4.0991,-2.6861c0.1609,-0.1603 0.2503,-0.3765 0.2503,-0.6044v-4.8349c0,-0.4727 -0.3827,-0.8554 -0.8548,-0.8554 -0.4727,0 -0.8548,0.3827 -0.8548,0.8554v4.4802l-3.8481,2.4351c-0.3336,0.3342 -0.3336,0.8753 -0.0007,1.2101zM14.9785,21.2503c0,-2.2823 1.85,-4.1311 4.1311,-4.1311 2.2811,0 4.1311,1.8506 4.1311,4.1311 0,2.2805 -1.85,4.1311 -4.1311,4.1311 -2.2811,0 -4.1311,-1.85 -4.1311,-4.1311zM16.2352,21.3087 L18.0795,23.1525c0.1112,0.1118 0.2572,0.1683 0.4026,0.1683 0.146,0 0.292,-0.0559 0.4032,-0.1683l3.0899,-3.0905c0.2224,-0.2224 0.2224,-0.5827 0,-0.8057 -0.2224,-0.223 -0.5833,-0.2224 -0.8057,0l-2.6874,2.6861 -1.4412,-1.44c-0.2224,-0.2218 -0.5839,-0.2218 -0.8057,0 -0.223,0.2236 -0.223,0.5839 0,0.8063z"
+      android:strokeWidth="0.62121171"
+      android:fillColor="@color/ic_omnipod_overview_set_time"/>
+  <path
+      android:pathData="m26.0503,0.0007c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1525,0.0374 -0.1031,0.0336 -0.5942,0.1156 -2.3881,0.3984 -4.4585,1.4641 -5.8895,2.378 -1.9139,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1469 -1.7552,7.0686 -1.7552,7.0686 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.7069 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0432 0,2.5501 -0.002,4.2657 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9895 0.5193,1.9759 1.3625,2.8701 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9201,0.0609 12.0882,0.0939 3.0968,0.0166 6.2604,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6886,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3331,-26.3082 0.031,-1.8127 -0.4748,-4.0265 -1.0874,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6966,-1.6497 -0.1464,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.0971,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2428 -2.1678,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4702,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5435 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5506 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0498 0.069,3.9059 1.8896,5.9333 0,1 3.4505,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4505,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.536,4.8819c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9218,1.4972 1.2823,0.1136 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7917,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0386,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3506 -0.0324,1.8941 -0.0906,17.001 -0.3326,26.2796 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.184,0.5336 -0.2005,0.021 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.6699,-0.001 -8.7617,-0.0178 -6.1836,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6255 0,-2.5467 0.005,-5.8139 0.0112,-9.0379 0.0119,-6.4479 0.0293,-12.7226 0.0293,-12.7226v-0.009,-0.009c0,0 0.0899,-3.4118 1.2957,-5.395l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7923,-0.1549 0.8272,-0.1635 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.0845,0.1018 0.0738,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110634"
+      android:fillColor="@color/ic_omnipod_overview_set_time_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml
new file mode 100644
index 0000000000..033f53217b
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m24,17.7028c-5.5651,0 -10.077,4.5118 -10.077,10.077 0,5.5654 4.5119,10.077 10.077,10.077 5.5654,0 10.077,-4.5116 10.077,-10.077 0.0001,-5.5651 -4.5116,-10.077 -10.077,-10.077zM23.1066,28.5497 L19.4541,30.6443c-0.6291,0.3604 -1.139,0.0651 -1.139,-0.6609l0,-4.1748c0,-0.7255 0.5101,-1.0214 1.139,-0.66l3.6525,2.0946c0.6291,0.3606 0.6291,0.9454 0,1.3065zM25.7184,29.8873c0,0.7252 -0.3978,1.3134 -0.8895,1.3134 -0.4913,0 -0.8896,-0.5881 -0.8896,-1.3134L23.9393,25.9048c0,-0.7252 0.3983,-1.3136 0.8896,-1.3136 0.4917,0 0.8895,0.5884 0.8895,1.3136zM29.4102,29.8873c0,0.7252 -0.3981,1.3134 -0.8899,1.3134 -0.4916,0 -0.8899,-0.5881 -0.8899,-1.3134L27.6305,25.9048c0,-0.7252 0.3982,-1.3136 0.8899,-1.3136 0.4917,0 0.8899,0.5884 0.8899,1.3136z"
+      android:fillColor="@color/ic_omnipod_overview_suspend_delivery"/>
+  <path
+      android:pathData="m26.0503,0.0008c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1524,0.0374 -0.1031,0.0336 -0.5942,0.1155 -2.3881,0.3984 -4.4585,1.4641 -5.8895,2.378 -1.914,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1468 -1.7552,7.0686 -1.7552,7.0686 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.7069 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0432 0,2.5501 -0.002,4.2657 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9894 0.5193,1.9759 1.3625,2.87 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9201,0.0609 12.0882,0.094 3.0968,0.0166 6.2604,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6885,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3331,-26.3083 0.031,-1.8127 -0.4748,-4.0265 -1.0874,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6966,-1.6497 -0.1465,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.0971,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2428 -2.1678,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4701,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5435 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5507 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0497 0.069,3.9059 1.8896,5.9333 0,1 3.4505,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4505,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.536,4.8819c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9218,1.4971 1.2823,0.1137 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7918,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0387,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3506 -0.0324,1.8941 -0.0906,17.001 -0.3326,26.2796 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.1839,0.5336 -0.2005,0.021 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.6699,-0.001 -8.7617,-0.0177 -6.1837,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6254 0,-2.5467 0.005,-5.8139 0.0111,-9.0379 0.0119,-6.4479 0.0293,-12.7226 0.0293,-12.7226v-0.009,-0.009c0,0 0.0899,-3.4118 1.2957,-5.3949l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7923,-0.1549 0.8272,-0.1634 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.0845,0.1018 0.0737,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110634"
+      android:fillColor="@color/ic_omnipod_overview_suspend_delivery_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_wizard_success.xml b/omnipod/src/main/res/drawable/ic_omnipod_wizard_success.xml
similarity index 100%
rename from omnipod/src/main/res/drawable/icon_omnipod_wizard_success.xml
rename to omnipod/src/main/res/drawable/ic_omnipod_wizard_success.xml
diff --git a/omnipod/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml b/omnipod/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml
new file mode 100644
index 0000000000..eee2a2ec84
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m12.5401,16.5773c-0.6536,0 -1.1799,0.5261 -1.1799,1.1798v25.2483c0,0.6537 0.5263,1.1799 1.1799,1.1799h22.9199c0.6537,0 1.1799,-0.5263 1.1799,-1.1799v-25.2483c0,-0.6537 -0.5263,-1.1798 -1.1799,-1.1798zM15.0462,19.7418c0.0232,0.001 0.0494,0.0144 0.0758,0.0407l0.7095,0.7103 0.3634,0.3637c0.0702,0.0703 0.1902,0.077 0.2702,0.0181 0.898,-0.6604 1.9806,-1.0174 3.1175,-1.0174 1.4105,0 2.7347,0.5482 3.7284,1.5433 0.995,0.9954 1.5425,2.3192 1.5418,3.7278 -0.0007,1.4085 -0.5498,2.7318 -1.5458,3.7261l-0.2968,0.2963c-0.0703,0.0702 -0.184,0.0701 -0.2543,-0.0002l-0.2965,-0.2967 -0.8253,-0.8261 -0.2965,-0.297c-0.0702,-0.0703 -0.0701,-0.1841 0.0002,-0.2543l0.2968,-0.2965c0.5487,-0.5481 0.8512,-1.2773 0.8516,-2.053 0.0004,-0.7758 -0.3013,-1.5051 -0.8493,-2.0537 -0.5472,-0.5476 -1.2764,-0.8491 -2.053,-0.8491 -0.5026,0 -0.986,0.1266 -1.4131,0.3644 -0.0868,0.0483 -0.0973,0.1493 -0.0272,0.2196l0.3009,0.3014 0.7252,0.7264c0.0701,0.0703 0.0473,0.1382 -0.0511,0.1517l-1.017,0.1393 -3.0798,0.4219 -0.6176,0.0846c-0.0984,0.0135 -0.166,-0.055 -0.1508,-0.1532l0.0947,-0.6163 0.4669,-3.0385 0.1525,-0.9924c0.009,-0.0614 0.0401,-0.0931 0.0788,-0.0912zM30.8298,21.9857c0.2466,0.001 0.4927,0.0963 0.6806,0.2866l1.1419,1.1558c0.3713,0.3806 0.3714,0.9888 -0.009,1.3648l-1.0584,1.049c0.6684,1.0119 1.1095,2.126 1.3323,3.2725l1.49,0.009c0.5338,0.005 0.9655,0.4409 0.9609,0.9701l-0.009,1.6248c-0.005,0.5338 -0.4363,0.9655 -0.9701,0.9609l-1.49,-0.009c-0.2321,1.1466 -0.6916,2.256 -1.3693,3.2586l1.049,1.0583c0.3713,0.3806 0.3714,0.9888 -0.009,1.3648l-1.1513,1.1419c-0.3806,0.3713 -0.9887,0.3713 -1.3647,-0.009l-1.049,-1.0583c-1.0073,0.6684 -2.1213,1.1093 -3.2725,1.3321l-0.0139,1.49c-0.005,0.5338 -0.4363,0.9655 -0.9701,0.9609l-1.6248,-0.009c-0.5338,-0.005 -0.9654,-0.4363 -0.9607,-0.9701l0.009,-1.49c-1.1465,-0.2321 -2.256,-0.6916 -3.2586,-1.3693l-1.0583,1.049c-0.3806,0.3713 -0.9888,0.3713 -1.3648,-0.009l-1.1419,-1.1558c-0.3713,-0.3806 -0.3713,-0.9887 0.009,-1.3647l1.0583,-1.049c-0.6684,-1.0119 -1.1093,-2.126 -1.3321,-3.2725l-1.49,-0.009c-0.5338,-0.005 -0.9655,-0.4363 -0.9609,-0.9701l0.009,-1.6246c0.005,-0.5338 0.4363,-0.9655 0.9701,-0.9609l1.49,0.009c0.1009,-0.4985 0.2451,-0.99 0.4313,-1.4687a7.5758,7.5758 0,0 0,4.4024 1.84c-0.5449,1.5175 -0.2141,3.2787 0.9966,4.5028 1.6804,1.6989 4.4145,1.7129 6.1135,0.0325 1.6989,-1.6803 1.7127,-4.4144 0.0323,-6.1133 -0.3195,-0.3231 -0.6772,-0.5848 -1.0586,-0.7859a7.5758,7.5758 0,0 0,2.0101 -4.3228c0.3633,0.1798 0.7171,0.3846 1.0584,0.6153l1.0584,-1.049c0.1903,-0.1857 0.4374,-0.2785 0.684,-0.2774z"
+      android:strokeWidth="0.76289874"
+      android:fillColor="@color/rl_board_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m10.3192,1.1851c-1.0046,0 -1.8189,0.771 -1.8189,1.722v4.1902,37.9958c0,0.951 0.8144,1.722 1.8189,1.722h27.3615c1.0079,0 1.8282,-0.7759 1.8189,-1.73l-0.3174,-32.6572c-0.009,-0.9478 -0.8177,-1.7139 -1.8189,-1.7139h-13.7381c-1.0046,0 -1.8405,-0.7712 -1.8189,-1.722l0.1382,-6.0848c0.0216,-0.9508 -0.8144,-1.722 -1.8189,-1.722z"
+      android:strokeWidth="2.37056112"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/rl_icon_outline"/>
+  <path
+      android:pathData="m12.8798,9.6677c0.0314,0 0.0644,0.003 0.0968,0.01l4.9148,0.983c0.2659,0.0531 0.4389,0.3121 0.3858,0.578 -0.0536,0.2659 -0.3097,0.4379 -0.5785,0.3858l-4.9148,-0.983c-0.2659,-0.0536 -0.4389,-0.3126 -0.3858,-0.5785 0.0467,-0.2335 0.2521,-0.3952 0.4817,-0.3952z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m12.8797,11.7186c-0.2295,0 -0.435,0.1617 -0.4817,0.3952 -0.053,0.2659 0.1199,0.525 0.3858,0.5786l0.1725,0.0345 -0.1668,-0.002c-0.0332,-0.0008 -0.0662,0.002 -0.097,0.008 -0.2255,0.0426 -0.3975,0.2394 -0.4001,0.4775 -0.003,0.2711 0.2153,0.4938 0.4866,0.4971l3.0627,0.0334 0.03,2.8365c0.2731,0 0.7217,0.003 0.9829,0.003l0.0256,-2.8277 0.9106,0.01c0.2741,0.003 0.4937,-0.2153 0.497,-0.4866 0,-0.0178 -0.0009,-0.0354 -0.002,-0.0528 0.0149,-0.2414 -0.1503,-0.463 -0.3941,-0.5117l-4.9147,-0.983c-0.0324,-0.007 -0.0654,-0.01 -0.0969,-0.01z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m12.8322,7.4996c0.0314,0 0.0644,0.003 0.0968,0.01l4.9148,0.983c0.2659,0.0531 0.4389,0.3121 0.3858,0.578 -0.0536,0.2659 -0.3097,0.4399 -0.5785,0.3858l-4.9148,-0.983c-0.2659,-0.0536 -0.4389,-0.3126 -0.3858,-0.5785 0.0467,-0.2334 0.2521,-0.3952 0.4817,-0.3952z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m17.7005,7.2981c-0.0315,0 -0.0644,-0.003 -0.0968,-0.01l-4.9148,-0.983c-0.2659,-0.0531 -0.4389,-0.3121 -0.3858,-0.578 0.0536,-0.2659 0.3096,-0.4379 0.5785,-0.3858l4.9148,0.983c0.2659,0.0536 0.4389,0.3126 0.3858,0.5785 -0.0467,0.2335 -0.2521,0.3952 -0.4817,0.3952z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m17.7004,5.2471c0.2295,0 0.435,-0.1617 0.4817,-0.3951 0.053,-0.2659 -0.1199,-0.525 -0.3858,-0.5785l-0.1725,-0.0345 0.1668,0.002c0.0332,0.0008 0.0661,-0.002 0.097,-0.008 0.2255,-0.0426 0.3975,-0.2394 0.4001,-0.4775 0.003,-0.2711 -0.2152,-0.4937 -0.4864,-0.497l-5.0118,-0.0546c-0.2741,-0.003 -0.4936,0.2152 -0.4969,0.4864 -0.0002,0.0178 0.0006,0.0354 0.002,0.0528 -0.0149,0.2414 0.1503,0.4631 0.3941,0.5118l4.9147,0.983c0.0324,0.007 0.0654,0.01 0.0968,0.01z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_activate_pod.xml b/omnipod/src/main/res/drawable/ic_pod_management_activate_pod.xml
new file mode 100644
index 0000000000..04fe453a83
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_activate_pod.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m26.0503,0.0008c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1524,0.0374 -0.1031,0.0336 -0.5942,0.1156 -2.3881,0.3984 -4.4585,1.4641 -5.8895,2.378 -1.9139,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1469 -1.7552,7.0686 -1.7552,7.0686 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.7069 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0432 0,2.5501 -0.002,4.2657 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9895 0.5193,1.9759 1.3625,2.8701 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9201,0.0609 12.0882,0.094 3.0968,0.0166 6.2604,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6886,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3331,-26.3082 0.031,-1.8127 -0.4748,-4.0265 -1.0874,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6966,-1.6497 -0.1465,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.097,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2428 -2.1678,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4701,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5435 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5507 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0497 0.069,3.9059 1.8896,5.9333 0,1 3.4505,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4505,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.5361,4.882c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9218,1.4972 1.2823,0.1136 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7918,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0387,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3506 -0.0324,1.8941 -0.0906,17.001 -0.3326,26.2796 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.184,0.5336 -0.2005,0.021 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.6699,-0.001 -8.7617,-0.0177 -6.1837,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6255 0,-2.5467 0.005,-5.8139 0.0112,-9.0379 0.0119,-6.4479 0.0293,-12.7226 0.0293,-12.7226v-0.009,-0.009c0,0 0.0899,-3.4118 1.2957,-5.395l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7923,-0.1549 0.8272,-0.1634 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.0845,0.1018 0.0738,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110634"
+      android:fillColor="@color/ic_pod_management_activate_pod_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m13.9677,29.8614c-0.329,-3.5412 1.1834,-6.7488 3.692,-8.7867 0.9778,-0.795 2.44,-0.1142 2.44,1.1423l0,0c0,0.4615 -0.2193,0.8864 -0.5757,1.1743 -1.7774,1.4485 -2.8466,3.7331 -2.5862,6.2553 0.3381,3.2853 2.97,5.9446 6.2507,6.3101 4.2814,0.4798 7.9185,-2.8741 7.9185,-7.0595 0,-2.2207 -1.0281,-4.2083 -2.6319,-5.5105 -0.3564,-0.2879 -0.5712,-0.7128 -0.5712,-1.1697l0,0c0,-1.2428 1.4393,-1.9465 2.408,-1.1697 2.2938,1.8505 3.7651,4.6789 3.7651,7.85 0,5.7984 -4.9257,10.4727 -10.8154,10.0478 -4.8708,-0.3427 -8.8415,-4.222 -9.2939,-9.0837zM23.9972,16.5877c-0.8225,0 -1.485,0.6671 -1.485,1.485l0,6.8402c0,0.8225 0.6671,1.485 1.485,1.485 0.8179,0 1.485,-0.6671 1.485,-1.485L25.4822,18.0727c0,-0.8179 -0.6625,-1.485 -1.485,-1.485z"
+      android:fillColor="@color/ic_pod_management_activate_pod"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_deactivate_pod.xml b/omnipod/src/main/res/drawable/ic_pod_management_deactivate_pod.xml
new file mode 100644
index 0000000000..d6b053423e
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_deactivate_pod.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m26.0503,0.0008c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1524,0.0374 -0.1031,0.0336 -0.5942,0.1156 -2.3881,0.3984 -4.4585,1.4641 -5.8895,2.378 -1.9139,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1469 -1.7552,7.0686 -1.7552,7.0686 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.7069 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0432 0,2.5501 -0.002,4.2657 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9895 0.5193,1.9759 1.3625,2.8701 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9201,0.0609 12.0882,0.094 3.0968,0.0166 6.2604,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6886,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3331,-26.3082 0.031,-1.8127 -0.4748,-4.0265 -1.0874,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6966,-1.6497 -0.1465,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.097,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2428 -2.1678,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4701,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5435 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5507 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0497 0.069,3.9059 1.8896,5.9333 0,1 3.4505,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4505,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.5361,4.882c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9218,1.4972 1.2823,0.1136 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7918,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0387,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3506 -0.0324,1.8941 -0.0906,17.001 -0.3326,26.2796 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.184,0.5336 -0.2005,0.021 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.6699,-0.001 -8.7617,-0.0177 -6.1837,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6255 0,-2.5467 0.005,-5.8139 0.0112,-9.0379 0.0119,-6.4479 0.0293,-12.7226 0.0293,-12.7226v-0.009,-0.009c0,0 0.0899,-3.4118 1.2957,-5.395l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7923,-0.1549 0.8272,-0.1634 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.0845,0.1018 0.0738,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110634"
+      android:fillColor="@color/ic_pod_management_deactivate_pod_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m13.9677,29.8614c-0.329,-3.5412 1.1834,-6.7488 3.692,-8.7867 0.9778,-0.795 2.44,-0.1142 2.44,1.1423l0,0c0,0.4615 -0.2193,0.8864 -0.5757,1.1743 -1.7774,1.4485 -2.8466,3.7331 -2.5862,6.2553 0.3381,3.2853 2.97,5.9446 6.2507,6.3101 4.2814,0.4798 7.9185,-2.8741 7.9185,-7.0595 0,-2.2207 -1.0281,-4.2083 -2.6319,-5.5105 -0.3564,-0.2879 -0.5712,-0.7128 -0.5712,-1.1697l0,0c0,-1.2428 1.4393,-1.9465 2.408,-1.1697 2.2938,1.8505 3.7651,4.6789 3.7651,7.85 0,5.7984 -4.9257,10.4727 -10.8154,10.0478 -4.8708,-0.3427 -8.8415,-4.222 -9.2939,-9.0837zM23.9972,16.5877c-0.8225,0 -1.485,0.6671 -1.485,1.485l0,6.8402c0,0.8225 0.6671,1.485 1.485,1.485 0.8179,0 1.485,-0.6671 1.485,-1.485L25.4822,18.0727c0,-0.8179 -0.6625,-1.485 -1.485,-1.485z"
+      android:fillColor="@color/ic_pod_management_deactivate_pod"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_discard_pod.xml b/omnipod/src/main/res/drawable/ic_pod_management_discard_pod.xml
new file mode 100644
index 0000000000..1ba380492b
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_discard_pod.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m26.0503,0.0008c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1525,0.0374 -0.1031,0.0336 -0.5942,0.1156 -2.3881,0.3984 -4.4585,1.4641 -5.8895,2.378 -1.9139,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1469 -1.7552,7.0686 -1.7552,7.0686 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.7069 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0432 0,2.5501 -0.002,4.2657 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9894 0.5193,1.9759 1.3625,2.87 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9201,0.0609 12.0882,0.0939 3.0968,0.0166 6.2604,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6886,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3331,-26.3083 0.031,-1.8127 -0.4748,-4.0265 -1.0874,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6966,-1.6497 -0.1464,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.0971,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2428 -2.1678,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4702,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5434 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5507 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0497 0.069,3.9059 1.8896,5.9333 0,1 3.4505,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4505,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.536,4.8819c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9218,1.4971 1.2823,0.1137 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7917,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0386,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3506 -0.0324,1.894 -0.0906,17.001 -0.3326,26.2796 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.184,0.5336 -0.2005,0.021 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.6699,-0.001 -8.7617,-0.0177 -6.1837,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6254 0,-2.5467 0.005,-5.8139 0.0112,-9.0379 0.0119,-6.4479 0.0293,-12.7226 0.0293,-12.7226v-0.009,-0.009c0,0 0.0899,-3.4118 1.2957,-5.395l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7923,-0.1549 0.8272,-0.1635 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.0845,0.1018 0.0738,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110682"
+      android:fillColor="@color/ic_pod_management_discard_pod_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m24.1841,8.6217c-0.0599,-0.0231 -0.1234,-0.0426 -0.1916,-0.057 -0.2971,-0.0641 -0.6718,-0.0101 -1.0013,0.2353 -0.009,0.006 -1.1151,0.7485 -2.2729,1.5346 -0.5813,0.3947 -1.1743,0.7993 -1.6462,1.1256 -0.4718,0.3264 -0.7892,0.5444 -0.9392,0.6721 -0.2608,0.2222 -0.3959,0.5111 -0.4053,0.7734 -0.009,0.2623 0.085,0.4778 0.1859,0.6334 1.1548,1.7794 3.1064,4.6458 3.3134,4.9586 0.2268,0.3427 0.6054,0.6914 0.9185,0.9018 0.1706,0.1146 0.2746,0.1794 0.3419,0.2186 0.0672,0.0392 0.1362,0.0682 0.1362,0.0682l-0.0373,-0.0155c0,0 0.2585,0.1272 0.5238,0.2026 0.1051,0.0299 0.3526,0.0997 0.6902,0.136 0.2141,0.0231 0.4463,0.0254 0.6744,-0.008 0.0414,0.0113 0.0767,0.0113 0.1165,0.0199 0.0853,0.0184 0.1765,0.0299 0.2748,0.0371 0.1965,0.0145 0.4087,0.015 0.6137,-0.0329 0.3341,-0.078 0.653,-0.2206 0.9373,-0.412 0.1707,-0.1148 0.3288,-0.2472 0.4703,-0.3939 0.1769,-0.1835 0.3461,-0.4091 0.4005,-0.7007 0.038,-0.033 0.0771,-0.067 0.1051,-0.0913 0.0869,-0.076 0.1221,-0.1095 0.1458,-0.1361 0.0237,-0.0266 0.0148,-0.0193 0.0962,-0.0977 0.3955,-0.3811 0.6456,-0.8461 0.796,-1.2007 0.2011,-0.4742 0.2339,-1.0893 0.2081,-1.5099 -0.0464,-0.8335 -0.5789,-1.5462 -0.5789,-1.5462 -0.002,-0.004 -0.8011,-1.1733 -1.6252,-2.3783 -0.4127,-0.6033 -0.8313,-1.2144 -1.1582,-1.6911 -0.3271,-0.4766 -0.5471,-0.7975 -0.6152,-0.8904l-0.023,-0.0313 -0.0228,-0.02c-0.1087,-0.1294 -0.252,-0.235 -0.4315,-0.3044zM26.4879,18.5499a0.4283,0.8861 61.4477,0 1,0.1583 0.1377,0.4283 0.8861,61.4477 0,1 -0.424,0.6794 0.4283,0.8861 61.4477,0 1,-0.2049 0.1219,0.4283 0.8861,61.4477 0,1 -0.9484,0.002 0.4283,0.8861 61.4477,0 1,0.6289 -0.8012,0.4283 0.8861,61.4477 0,1 0.7901,-0.1393z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.71912545"
+      android:fillColor="@color/ic_pod_management_discard_pod"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m15.4171,21.7781c-0.5815,0 -1.1138,0.2302 -1.4994,0.6481 -0.3855,0.4178 -0.5721,0.9672 -0.5255,1.5468l1.3261,16.4769c0.0923,1.147 1.1037,2.0801 2.2542,2.0801h14.0547c1.1507,0 2.1619,-0.9331 2.2541,-2.0801l1.3265,-16.4773c0.0464,-0.5798 -0.14,-1.129 -0.5255,-1.5468 -0.3856,-0.4177 -0.9185,-0.6477 -1.4998,-0.6477zM22.0162,27.4614 L25.6929,27.4982c-0.792,0.1824 -1.2367,0.7491 -1.4716,1.2403l-1.7184,3.0498 -2.6784,-1.4843 0.895,-1.615c0.3189,-0.6091 0.7334,-1.1378 1.2967,-1.2276zM26.1772,27.7372c0.3257,-0.0131 0.6515,0.0893 0.8549,0.4213l0.9138,1.3833 0.9522,-0.4042 -1.3735,2.5284 -2.9783,-0.0335 0.781,-0.499 -1.0196,-1.7989c0.2835,-0.5282 0.6181,-1.0763 1.0163,-1.3282 0.2023,-0.1279 0.5276,-0.2563 0.8533,-0.2693zM20.6435,31.4744 L22.0579,34.0956 21.243,33.6546 20.1637,35.4188c-0.5994,0.008 -1.2409,-0.019 -1.6543,-0.2452 -0.4199,-0.2298 -1.0788,-0.8899 -0.6951,-1.5676l0.7671,-1.4699 -0.8153,-0.6371zM29.2324,31.4744 L30.2107,33.0404c0.3781,0.5742 0.6396,1.1928 0.445,1.729l-1.8148,3.1978c0.2245,-0.7811 -0.0558,-1.4448 -0.3715,-1.8884l-1.8341,-2.9816zM25.7808,34.9599 L25.8388,35.8851 27.9063,35.8655c0.3246,0.504 0.6418,1.062 0.669,1.5325 0.0276,0.4779 -0.1827,1.3867 -0.9607,1.4205l-1.6535,0.1283 -0.1079,1.029 -1.5456,-2.4271zM17.8863,35.0972c0.5435,0.6043 1.2547,0.7184 1.7981,0.6857l3.5006,0.0245v3.0621h-1.8463c-0.6873,0.0163 -1.3504,-0.0895 -1.7021,-0.5386z"
+      android:strokeWidth="0.14279729"
+      android:fillColor="@color/ic_pod_management_discard_pod"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_play_test_beep.xml b/omnipod/src/main/res/drawable/ic_pod_management_play_test_beep.xml
new file mode 100644
index 0000000000..46b82ac9e5
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_play_test_beep.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m16.0401,32.0131l2.2135,0l6.0959,4.0033c0.8467,0.4675 2.1169,-0.9481 2.1169,-2.1171L26.4663,21.7261c0,-1.1693 -1.0583,-2.7875 -2.1169,-2.1172L18.2649,23.9682L16.0401,23.9682C14.8707,23.9683 13.923,24.916 13.923,26.0853l0,3.8107c0,1.1691 0.9477,2.117 2.117,2.117z"
+      android:fillColor="@color/ic_pod_management_play_test_beep"/>
+  <path
+      android:pathData="m28.5186,21.9693c2.3136,0 4.1962,2.6065 4.1962,5.8105 0,3.2042 -1.8826,5.8106 -4.1962,5.8106 -0.3763,0 -0.6812,0.3053 -0.6812,0.6811 0,0.3761 0.3049,0.6812 0.6812,0.6812 3.0652,0 5.5584,-3.2177 5.5584,-7.1729 0,-3.9552 -2.4932,-7.1729 -5.5584,-7.1729 -0.3763,0 -0.6812,0.3052 -0.6812,0.6812 0,0.3761 0.3046,0.6812 0.6812,0.6812z"
+      android:fillColor="@color/ic_pod_management_play_test_beep"/>
+  <path
+      android:pathData="m28.007,30.7075c-0.3757,0 -0.6812,0.3055 -0.6812,0.6812 0,0.3762 0.3055,0.6812 0.6812,0.6812 1.4622,0 2.5645,-1.8444 2.5645,-4.2901 0,-2.4458 -1.1023,-4.2902 -2.5645,-4.2902 -0.3757,0 -0.6812,0.3051 -0.6812,0.6812 0,0.376 0.3055,0.6812 0.6812,0.6812 0.4786,0 1.2021,1.1679 1.2021,2.9278 0,1.7601 -0.7235,2.9277 -1.2021,2.9277z"
+      android:fillColor="@color/ic_pod_management_play_test_beep"/>
+  <path
+      android:pathData="m26.0504,0.0008c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1525,0.0374 -0.1031,0.0336 -0.5942,0.1156 -2.3881,0.3984 -4.4585,1.4641 -5.8895,2.378 -1.9139,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1469 -1.7552,7.0686 -1.7552,7.0686 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.7069 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0432 0,2.5501 -0.002,4.2656 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9894 0.5193,1.9759 1.3625,2.87 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9201,0.0609 12.0882,0.0939 3.0968,0.0166 6.2604,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6886,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3331,-26.3083 0.031,-1.8127 -0.4748,-4.0265 -1.0874,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6966,-1.6497 -0.1465,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.0971,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2428 -2.1678,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4701,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5435 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5506 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0498 0.069,3.9059 1.8896,5.9333 0,1 3.4505,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4505,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.5361,4.8819c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9218,1.4971 1.2823,0.1137 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7918,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0387,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3506 -0.0324,1.894 -0.0906,17.0009 -0.3326,26.2796 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.184,0.5336 -0.2005,0.0209 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.6699,-0.001 -8.7617,-0.0177 -6.1836,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6254 0,-2.5467 0.005,-5.8139 0.0112,-9.0379 0.0119,-6.4479 0.0293,-12.7226 0.0293,-12.7226v-0.009,-0.009c0,0 0.0899,-3.4118 1.2957,-5.3949l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7923,-0.1549 0.8272,-0.1635 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.0845,0.1018 0.0738,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110634"
+      android:fillColor="@color/ic_pod_management_play_test_beep_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_pod_history.xml b/omnipod/src/main/res/drawable/ic_pod_management_pod_history.xml
new file mode 100644
index 0000000000..eb2372c685
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_pod_history.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m34.077,20.7894l0,16.791c0,1.3716 -1.116,2.4876 -2.4876,2.4876l-11.3494,0c-1.3716,0 -2.4876,-1.116 -2.4876,-2.4876L17.7525,26.6626c0.3548,0.059 0.7168,0.0973 1.0883,0.0973 0.2634,0 0.522,-0.0196 0.7774,-0.0498l0,10.8703c0,0.3428 0.2789,0.6218 0.6219,0.6218l11.3494,0c0.3429,0 0.6219,-0.2791 0.6219,-0.6218L32.2113,20.7894c0,-0.343 -0.2791,-0.6219 -0.6219,-0.6219L25.4331,20.1675c0,-0.6486 -0.0975,-1.2737 -0.2721,-1.8656l6.4284,0c1.3716,-0.0001 2.4876,1.1159 2.4876,2.4875zM18.7369,25.9414C15.5017,25.9414 12.8699,23.3096 12.8699,20.0746 12.87,16.8394 15.5017,14.2076 18.7369,14.2076c3.235,0 5.8669,2.6318 5.8669,5.8669 0,3.235 -2.6319,5.8668 -5.8669,5.8668zM18.7369,24.6976c2.549,0 4.623,-2.0736 4.623,-4.623 0,-2.5495 -2.0737,-4.6231 -4.623,-4.6231 -2.5495,0 -4.6231,2.0736 -4.6231,4.6231 0,2.5494 2.074,4.623 4.6231,4.623zM22.2555,20.6965c0.3433,0 0.6219,-0.2786 0.6219,-0.6219 0,-0.3433 -0.2786,-0.6219 -0.6219,-0.6219l-2.8967,0l0,-2.4413c0,-0.3433 -0.2786,-0.6219 -0.6219,-0.6219 -0.3433,0 -0.6219,0.2786 -0.6219,0.6219l0,3.0631c0,0.3433 0.2786,0.6219 0.6219,0.6219zM29.4332,25.7387l-6.7371,0c-0.3433,0 -0.6219,0.2786 -0.6219,0.6219 0,0.3433 0.2786,0.6219 0.6219,0.6219l6.7371,0c0.3434,0 0.6219,-0.2786 0.6219,-0.6219 0.0001,-0.3433 -0.2784,-0.6219 -0.6219,-0.6219zM29.4441,29.511L22.707,29.511c-0.3433,0 -0.6219,0.2784 -0.6219,0.6219 0,0.3434 0.2786,0.6219 0.6219,0.6219l6.7371,0c0.3434,0 0.6218,-0.2784 0.6218,-0.6219 0,-0.3434 -0.2781,-0.6219 -0.6218,-0.6219zM29.4441,33.4394L22.707,33.4394c-0.3433,0 -0.6219,0.2788 -0.6219,0.6219 0,0.3434 0.2786,0.6218 0.6219,0.6218l6.7371,0c0.3434,0 0.6218,-0.2784 0.6218,-0.6218 0.0001,-0.3432 -0.2781,-0.6219 -0.6218,-0.6219z"
+      android:fillColor="@color/ic_pod_management_pod_history"/>
+  <path
+      android:pathData="m26.0504,0.0008c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2035,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1525,0.0374 -0.1031,0.0336 -0.5942,0.1156 -2.3881,0.3984 -4.4585,1.4641 -5.8895,2.378 -1.9139,1.2224 -3.5657,3.3782 -4.5216,4.9718 -1.9111,3.1469 -1.7552,7.0686 -1.7552,7.0686 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.7069 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0432 0,2.5501 -0.002,4.2656 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9894 0.5193,1.9759 1.3625,2.87 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9201,0.0609 12.0882,0.0939 3.0968,0.0166 6.2604,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6886,-0.9305 0.8822,-1.9493 0.9035,-2.7672 0.244,-9.3552 0.3048,-24.6538 0.3331,-26.3083 0.031,-1.8127 -0.4748,-4.0265 -1.0874,-5.5736 -0.3338,-0.843 -0.5501,-1.3391 -0.6966,-1.6497 -0.1465,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.0971,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2428 -2.1678,-2.2179 -0.7205,-0.6185 -1.5583,-1.2076 -2.4701,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5435 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5507 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.3842a3.9059,1.8896 5.9333,0 1,1.0498 0.069,3.9059 1.8896,5.9333 0,1 3.4505,2.3638 3.9059,1.8896 5.9333,0 1,-4.2844 1.3429,3.9059 1.8896,5.9333 0,1 -3.4505,-2.3638 3.9059,1.8896 5.9333,0 1,3.2346 -1.4119zM21.5361,4.8819c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9218,1.4971 1.2823,0.1137 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7918,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0387,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3506 -0.0324,1.894 -0.0906,17.0009 -0.3326,26.2796 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.184,0.5336 -0.2005,0.0209 -2.261,0.0734 -4.7728,0.0817 -2.5118,0.008 -5.6699,-0.001 -8.7617,-0.0177 -6.1836,-0.0332 -12.1033,-0.0941 -12.1033,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6254 0,-2.5467 0.005,-5.8139 0.0112,-9.0379 0.0119,-6.4479 0.0293,-12.7226 0.0293,-12.7226v-0.009,-0.009c0,0 0.0899,-3.4118 1.2957,-5.3949l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2802 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7923,-0.1549 0.8272,-0.1635 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1055,-0.1378 1.6232,-0.1465zM31.4034,5.2676c0.0845,0.1018 0.0738,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17110634"
+      android:fillColor="@color/ic_pod_management_pod_history_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_pulse_log.xml b/omnipod/src/main/res/drawable/ic_pod_management_pulse_log.xml
new file mode 100644
index 0000000000..7b1823e7a1
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_pulse_log.xml
@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m27.9293,18.8698h2.6647c0.155,0 0.2955,-0.1032 0.3549,-0.2623 0.0594,-0.1586 0.0261,-0.3411 -0.0845,-0.4619 -0.9734,-1.0664 -2.782,-3.046 -3.7515,-4.1012 -0.1106,-0.1203 -0.2752,-0.1554 -0.4186,-0.0894 -0.1424,0.0654 -0.2356,0.2198 -0.2356,0.3906v2.9097c0.0005,0.886 0.6663,1.6145 1.4707,1.6145z"
+      android:strokeWidth="0.50688154"
+      android:fillColor="@color/ic_pod_management_pulse_log"/>
+  <path
+      android:pathData="m15.0065,13.3381c-1.2264,0 -2.2242,1.0962 -2.2242,2.4478v19.7208c0,1.3516 0.9979,2.4478 2.2242,2.4478h4.427c-0.0142,-0.2202 -0.0221,-0.4408 -0.0235,-0.6614 0.005,-2.5075 0.8363,-4.9435 2.3651,-6.9311 -0.4728,-0.1803 -0.8139,-0.6748 -0.8139,-1.2565v-1.1393c0,-0.7336 0.5415,-1.3304 1.2071,-1.3304h0.0172c0.6656,0 1.2071,0.5968 1.2071,1.3304 0,0.2138 -0.1572,0.3871 -0.3511,0.3871 -0.194,0 -0.3512,-0.1733 -0.3512,-0.3871 0,-0.3067 -0.2265,-0.5562 -0.5048,-0.5562h-0.0172c-0.2783,0 -0.5046,0.2495 -0.5046,0.5562v1.1393c0,0.3067 0.2264,0.5563 0.5046,0.5563h0.0172c0.0498,0 0.0971,0.0117 0.14,0.0323 0.6624,-0.7439 1.4194,-1.3978 2.2516,-1.945 0.005,-0.006 0.009,-0.0131 0.0141,-0.019 0.6133,-0.3993 0.7512,-0.5262 1.4796,-0.7945 1.4882,-0.6867 3.1069,-1.0447 4.7459,-1.0495 0.252,0.004 0.5037,0.0168 0.7548,0.0378v-4.9702c0,-0.2341 -0.1714,-0.4242 -0.3848,-0.4242h-3.2576c-1.644,0 -2.9761,-1.4628 -2.9761,-3.2742v-3.493c0,-0.2341 -0.1719,-0.4242 -0.3848,-0.4242zM15.9529,17.1856h0.0174c0.6656,0 1.2069,0.5968 1.2069,1.3304v1.1394c0,0.7336 -0.5413,1.3302 -1.2069,1.3302h-0.0174c-0.6656,0 -1.2071,-0.5966 -1.2071,-1.3302v-1.1394c0,-0.7336 0.5415,-1.3304 1.2071,-1.3304zM21.4709,17.1856h0.0174c0.6656,0 1.2071,0.5968 1.2071,1.3304 0,0.2138 -0.1575,0.3871 -0.3515,0.3871 -0.194,0 -0.3511,-0.1733 -0.3511,-0.3871 0,-0.3067 -0.2262,-0.5562 -0.5045,-0.5562h-0.0174c-0.2783,0 -0.5046,0.2495 -0.5046,0.5562v1.1394c0,0.3067 0.2264,0.556 0.5046,0.556h0.0174c0.194,0 0.3511,0.1733 0.3511,0.3871 0,0.2138 -0.1572,0.3871 -0.3511,0.3871h-0.0174c-0.6656,0 -1.2071,-0.5966 -1.2071,-1.3302v-1.1394c0,-0.7336 0.5415,-1.3304 1.2071,-1.3304zM19.1477,17.1861c0.0511,-0.003 0.1032,0.006 0.1523,0.0289 0.1313,0.0599 0.2168,0.2009 0.2168,0.3575v2.0804c0,0.2138 -0.1573,0.3869 -0.3513,0.3869 -0.194,0 -0.3511,-0.1731 -0.3511,-0.3869v-1.1458l-0.2904,0.3201c-0.1371,0.1512 -0.3596,0.1512 -0.4967,0 -0.1372,-0.1511 -0.1372,-0.3963 0,-0.5475l0.8899,-0.9809c0.0628,-0.0692 0.1454,-0.108 0.2305,-0.1128zM15.9529,17.9598c-0.2783,0 -0.5045,0.2495 -0.5045,0.5562v1.1394c0,0.3067 0.2262,0.556 0.5045,0.556h0.0174c0.2783,0 0.5045,-0.2493 0.5045,-0.556v-1.1394c0,-0.3067 -0.2262,-0.5562 -0.5045,-0.5562zM18.6411,21.9106h0.0172c0.6656,0 1.2071,0.5968 1.2071,1.3304 0,0.2138 -0.1572,0.3871 -0.3511,0.3871 -0.194,0 -0.3511,-0.1733 -0.3511,-0.3871 0,-0.3067 -0.2265,-0.556 -0.5048,-0.556h-0.0172c-0.2783,0 -0.5046,0.2493 -0.5046,0.556v1.1394c0,0.3067 0.2264,0.556 0.5046,0.556h0.0172c0.194,0 0.3513,0.1733 0.3513,0.3871 0,0.2138 -0.1573,0.3871 -0.3513,0.3871h-0.0172c-0.6656,0 -1.2071,-0.5966 -1.2071,-1.3302v-1.1394c0,-0.7336 0.5415,-1.3304 1.2071,-1.3304zM24.8563,21.9106h0.0174c0.6656,0 1.2072,0.5968 1.2072,1.3304v1.1394c0,0.7336 -0.5417,1.3302 -1.2072,1.3302h-0.0174c-0.6656,0 -1.2069,-0.5966 -1.2069,-1.3302v-1.1394c0,-0.7336 0.5413,-1.3304 1.2069,-1.3304zM15.9692,21.9111c0.0511,-0.003 0.1032,0.007 0.1523,0.0291 0.1313,0.0599 0.2167,0.2011 0.2167,0.3577v3.0258c0,0.2138 -0.1572,0.3871 -0.3511,0.3871 -0.194,0 -0.3511,-0.1733 -0.3511,-0.3871v-2.0916l-0.2904,0.3201c-0.1371,0.1512 -0.3596,0.1512 -0.4968,0 -0.1372,-0.1511 -0.1372,-0.3961 0,-0.5473l0.8899,-0.9809c0.0628,-0.0692 0.1454,-0.1081 0.2305,-0.1129zM22.1846,21.9111c0.0511,-0.003 0.1032,0.007 0.1523,0.0291 0.1313,0.0599 0.2169,0.2012 0.2169,0.3577v3.0258c0,0.2138 -0.1575,0.3871 -0.3515,0.3871 -0.194,0 -0.3511,-0.1733 -0.3511,-0.3871v-2.0916l-0.2904,0.3201c-0.1371,0.1512 -0.3594,0.1512 -0.4966,0 -0.1372,-0.1511 -0.1372,-0.3961 0,-0.5473l0.8899,-0.9809c0.0628,-0.0692 0.1453,-0.1081 0.2305,-0.1129zM28.3999,21.9111c0.0511,-0.003 0.103,0.007 0.1522,0.0291 0.1313,0.0599 0.2169,0.2011 0.2169,0.3577v3.0258c0,0.2138 -0.1573,0.3871 -0.3513,0.3871 -0.194,0 -0.3511,-0.1733 -0.3511,-0.3871v-2.0916l-0.2904,0.3201c-0.1371,0.1512 -0.3596,0.1512 -0.4968,0 -0.1372,-0.1511 -0.1372,-0.3961 0,-0.5473l0.8901,-0.9809c0.0628,-0.0692 0.1454,-0.1081 0.2305,-0.1129zM24.8563,22.6848c-0.2783,0 -0.5045,0.2495 -0.5045,0.5562v1.1394c0,0.3067 0.2262,0.556 0.5045,0.556h0.0174c0.2783,0 0.5046,-0.2493 0.5046,-0.556v-1.1394c0,-0.3067 -0.2264,-0.5562 -0.5046,-0.5562zM15.9529,26.6359h0.0174c0.6656,0 1.207,0.5968 1.2069,1.3304v1.1393c0,0.7336 -0.5413,1.3305 -1.2069,1.3305h-0.0174c-0.6656,0 -1.2071,-0.597 -1.2071,-1.3305v-1.1393c0,-0.7336 0.5415,-1.3304 1.2071,-1.3304zM19.4964,26.6364c0.0511,-0.003 0.103,0.006 0.1522,0.0289 0.1313,0.0599 0.2169,0.2012 0.2169,0.3577v3.0258c0,0.2138 -0.1572,0.3871 -0.3511,0.3871 -0.194,0 -0.3511,-0.1733 -0.3511,-0.3871v-2.0913l-0.2904,0.3201c-0.1371,0.1512 -0.3596,0.1512 -0.4967,0 -0.1372,-0.1511 -0.1372,-0.3963 0,-0.5475l0.8899,-0.981c0.0628,-0.0692 0.1454,-0.108 0.2305,-0.1128zM15.9531,27.41c-0.2783,0 -0.5046,0.2495 -0.5046,0.5562v1.1393c0,0.3067 0.2264,0.5563 0.5046,0.5563h0.0172c0.2783,0 0.5045,-0.2497 0.5045,-0.5563v-1.1393c0,-0.3067 -0.2262,-0.5562 -0.5045,-0.5562zM18.6411,31.3609h0.0172c0.6656,0 1.2071,0.597 1.2071,1.3305 0,0.2138 -0.1572,0.3869 -0.3511,0.3869 -0.194,0 -0.3511,-0.1732 -0.3511,-0.3869 0,-0.3067 -0.2265,-0.5563 -0.5048,-0.5563h-0.0172c-0.2783,0 -0.5046,0.2497 -0.5046,0.5563v1.1391c0,0.3067 0.2264,0.5563 0.5046,0.5563h0.0172c0.194,0 0.3513,0.1733 0.3513,0.3871 0,0.2138 -0.1573,0.3871 -0.3513,0.3871h-0.0172c-0.6656,0 -1.2071,-0.597 -1.2071,-1.3305v-1.1391c0,-0.7336 0.5415,-1.3305 1.2071,-1.3305zM15.9692,31.3614c0.0511,-0.003 0.1032,0.007 0.1523,0.0291 0.1313,0.0599 0.2167,0.2009 0.2167,0.3575v3.026c0,0.2138 -0.1572,0.3869 -0.3511,0.3869 -0.194,0 -0.3511,-0.1731 -0.3511,-0.3869v-2.0914l-0.2904,0.3201c-0.1371,0.1512 -0.3596,0.1512 -0.4968,0 -0.1372,-0.1511 -0.1372,-0.3963 0,-0.5475l0.8899,-0.9809c0.0628,-0.0692 0.1454,-0.108 0.2305,-0.1128z"
+      android:strokeWidth="0.50688154"
+      android:fillColor="@color/ic_pod_management_pulse_log"/>
+  <path
+      android:pathData="m23.7809,39.9983c-0.4053,0 -0.7338,-0.3285 -0.7338,-0.7338L23.0471,31.9249c0,-0.4053 0.3285,-0.7338 0.7338,-0.7338 0.4053,0 0.7338,0.3285 0.7338,0.7338l0,7.3395c0.0003,0.4053 -0.3285,0.7338 -0.7338,0.7338z"
+      android:fillColor="@color/ic_pod_management_pulse_log"/>
+  <path
+      android:pathData="m25.9215,39.0806c-0.4053,0 -0.7338,-0.3285 -0.7338,-0.7338L25.1877,32.8427c0,-0.4053 0.3285,-0.7338 0.7338,-0.7338 0.4053,0 0.7341,0.3285 0.7341,0.7338l0,5.504c-0.0003,0.4053 -0.3289,0.7338 -0.7341,0.7338z"
+      android:fillColor="@color/ic_pod_management_pulse_log"/>
+  <path
+      android:pathData="m28.0621,40.9158c-0.4053,0 -0.7338,-0.3282 -0.7338,-0.7338L27.3283,31.0078c0,-0.4053 0.3285,-0.7338 0.7338,-0.7338 0.4053,0 0.7338,0.3285 0.7338,0.7338l0,9.1738c0,0.4056 -0.3285,0.7341 -0.7338,0.7341z"
+      android:fillColor="@color/ic_pod_management_pulse_log"/>
+  <path
+      android:pathData="m30.2024,42.7503c-0.405,0 -0.7338,-0.3285 -0.7338,-0.7338L29.4686,29.1729c0,-0.4053 0.3289,-0.7338 0.7338,-0.7338 0.4056,0 0.7338,0.3285 0.7338,0.7338l0,12.8436c0,0.4053 -0.3282,0.7338 -0.7338,0.7338z"
+      android:fillColor="@color/ic_pod_management_pulse_log"/>
+  <path
+      android:pathData="m32.3436,39.9983c-0.4056,0 -0.7338,-0.3285 -0.7338,-0.7338L31.6098,31.9249c0,-0.4053 0.3282,-0.7338 0.7338,-0.7338 0.405,0 0.7338,0.3285 0.7338,0.7338l0,7.3395c0,0.4053 -0.3289,0.7338 -0.7338,0.7338z"
+      android:fillColor="@color/ic_pod_management_pulse_log"/>
+  <path
+      android:pathData="m34.4839,37.246c-0.4053,0 -0.7338,-0.3285 -0.7338,-0.7335l0,-1.8349c0,-0.4053 0.3285,-0.7338 0.7338,-0.7338 0.4053,0 0.7338,0.3285 0.7338,0.7338l0,1.8349c0,0.405 -0.3285,0.7335 -0.7338,0.7335z"
+      android:fillColor="@color/ic_pod_management_pulse_log"/>
+  <path
+      android:pathData="m26.0504,0.0005c-0.9065,-0.008 -1.8118,0.0786 -2.692,0.2591 -1.1007,0.2257 -2.2782,0.6223 -3.2036,1.5466 -0.2205,0.0252 -0.4473,0.052 -0.6097,0.071 -0.5056,0.0591 -0.7161,0.0939 -0.8686,0.1313 -0.1525,0.0374 -0.1031,0.0336 -0.5942,0.1155 -2.3881,0.3984 -4.4585,1.4641 -5.8896,2.3781 -1.914,1.2224 -3.5658,3.3782 -4.5217,4.9718 -1.9111,3.1469 -1.7552,7.0687 -1.7552,7.0687 -0.0001,0.0185 -0.0174,6.2667 -0.0293,12.707 -0.006,3.2249 -0.0108,6.4932 -0.0111,9.0433 0,2.5501 -0.002,4.2657 0.0147,4.7735l0.005,0.1722 0.033,0.1306c0.0963,0.9895 0.5193,1.9759 1.3625,2.8701 0.9195,0.9751 2.4149,1.7154 4.2247,1.6459 0.0485,0.0005 5.9202,0.0609 12.0883,0.094 3.0968,0.0166 6.2605,0.0262 8.7892,0.0177 2.5287,-0.008 4.2277,-0.009 5.0914,-0.099 1.5021,-0.1569 2.7134,-0.8701 3.402,-1.8006 0.6886,-0.9305 0.8822,-1.9493 0.9035,-2.7673 0.244,-9.3553 0.3048,-24.654 0.3331,-26.3085 0.031,-1.8127 -0.4748,-4.0266 -1.0874,-5.5737 -0.3338,-0.843 -0.5501,-1.3392 -0.6966,-1.6497 -0.1465,-0.3106 -0.3248,-0.5865 -0.3248,-0.5865l0.097,0.149c0,0 -0.6209,-1.1087 -1.3966,-2.0456 -0.3075,-0.3714 -1.0319,-1.2429 -2.1678,-2.218 -0.7205,-0.6185 -1.5583,-1.2076 -2.4702,-1.6563 -0.1218,-0.145 -0.251,-0.231 -0.3743,-0.3617 -0.2639,-0.2799 -0.5675,-0.5505 -0.9065,-0.8223 -0.6781,-0.5435 -1.4475,-1.0751 -2.3117,-1.4129 -1.4086,-0.5507 -2.9231,-0.8294 -4.434,-0.8434zM26.1412,1.384a3.906,1.8896 5.9333,0 1,1.0498 0.069,3.906 1.8896,5.9333 0,1 3.4505,2.3638 3.906,1.8896 5.9333,0 1,-4.2844 1.3429,3.906 1.8896,5.9333 0,1 -3.4505,-2.3638 3.906,1.8896 5.9333,0 1,3.2347 -1.4119zM21.536,4.8818c0.5177,-0.009 0.9256,0.1089 0.9209,0.1062 1.491,0.8572 2.6395,1.3835 3.9219,1.4972 1.2823,0.1136 2.4303,-0.1772 4.0179,-0.5811 0.8848,-0.2251 2.7918,0.4895 4.0868,1.6012 0.94,0.8069 1.4864,1.4666 1.7907,1.8341 0.4977,0.6011 1.0898,1.6033 1.0898,1.6033l0.0445,0.0772 0.0256,0.0348c-0.005,-0.003 -0.006,0.003 0.0386,0.0976 0.1031,0.2186 0.299,0.6627 0.6164,1.4643 0.3992,1.0083 0.8822,3.3361 0.8649,4.3507 -0.0324,1.8941 -0.0906,17.0011 -0.3326,26.2799 -0.009,0.3522 -0.1097,0.7291 -0.2819,0.9619 -0.1723,0.2328 -0.3886,0.4505 -1.184,0.5336 -0.2005,0.0209 -2.261,0.0734 -4.7729,0.0817 -2.5118,0.008 -5.67,-0.001 -8.7618,-0.0178 -6.1837,-0.0332 -12.1034,-0.0941 -12.1034,-0.0941l-0.0465,-0.0005 -0.0465,0.002c-0.9787,0.0475 -1.4572,-0.2589 -1.8283,-0.6525 -0.3711,-0.3935 -0.5342,-1.002 -0.5363,-1.081l-0.002,-0.0618c-0.006,-0.2205 -0.0136,-2.1057 -0.013,-4.6255 0,-2.5467 0.005,-5.814 0.0111,-9.0379 0.0119,-6.4479 0.0293,-12.7228 0.0293,-12.7228v-0.009,-0.009c0,0 0.0899,-3.4119 1.2957,-5.395l0.002,-0.004 0.002,-0.004c0.7004,-1.1684 2.488,-3.2803 3.5116,-3.934 1.1832,-0.7557 2.9538,-1.6308 4.7056,-1.923 0.5439,-0.0907 0.7924,-0.1549 0.8272,-0.1635 0.0349,-0.009 0,-0.005 0.4821,-0.0616 0.5093,-0.0596 1.1056,-0.1378 1.6232,-0.1465zM31.4035,5.2675c0.0845,0.1018 0.0738,0.2615 0,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="3.17113423"
+      android:fillColor="@color/ic_pod_management_pulse_log_outline"
+      android:strokeColor="#00000000"
+      android:fillType="nonZero"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_rl_stats.xml b/omnipod/src/main/res/drawable/ic_pod_management_rl_stats.xml
new file mode 100644
index 0000000000..09c8eea8b7
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_rl_stats.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m10.3192,1.1851c-1.0046,0 -1.8189,0.771 -1.8189,1.722v4.1902,37.9958c0,0.951 0.8144,1.722 1.8189,1.722h27.3615c1.0079,0 1.8282,-0.7759 1.8189,-1.73l-0.3174,-32.6572c-0.009,-0.9478 -0.8177,-1.7139 -1.8189,-1.7139h-13.7381c-1.0046,0 -1.8405,-0.7712 -1.8189,-1.722l0.1382,-6.0848c0.0216,-0.9508 -0.8144,-1.722 -1.8189,-1.722z"
+      android:strokeWidth="2.37056112"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/rl_icon_outline"/>
+  <path
+      android:pathData="m12.8798,9.6677c0.0314,0 0.0644,0.003 0.0968,0.01l4.9148,0.983c0.2659,0.0531 0.4389,0.3121 0.3858,0.578 -0.0536,0.2659 -0.3096,0.4379 -0.5785,0.3858l-4.9148,-0.983c-0.2659,-0.0536 -0.4389,-0.3126 -0.3858,-0.5785 0.0467,-0.2335 0.2521,-0.3952 0.4817,-0.3952z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m12.8798,11.7186c-0.2295,0 -0.435,0.1617 -0.4817,0.3952 -0.053,0.2659 0.1199,0.525 0.3858,0.5786l0.1725,0.0345 -0.1668,-0.002c-0.0331,-0.0008 -0.0661,0.002 -0.097,0.008 -0.2255,0.0426 -0.3975,0.2394 -0.4001,0.4775 -0.003,0.2711 0.2153,0.4938 0.4866,0.4971l3.0627,0.0334 0.03,2.8365c0.2731,0 0.7217,0.003 0.9828,0.003l0.0256,-2.8277 0.9106,0.01c0.2741,0.003 0.4937,-0.2153 0.497,-0.4866 0,-0.0179 -0.0009,-0.0354 -0.002,-0.0528 0.0149,-0.2414 -0.1503,-0.463 -0.394,-0.5117l-4.9147,-0.983c-0.0324,-0.007 -0.0654,-0.01 -0.0969,-0.01z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m12.8322,7.4996c0.0315,0 0.0644,0.003 0.0968,0.01l4.9148,0.983c0.2659,0.0531 0.4389,0.3121 0.3858,0.578 -0.0536,0.2659 -0.3096,0.4399 -0.5785,0.3858l-4.9148,-0.983c-0.2659,-0.0536 -0.4389,-0.3126 -0.3858,-0.5785 0.0467,-0.2334 0.2521,-0.3952 0.4817,-0.3952z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m17.7004,7.298c-0.0314,0 -0.0644,-0.003 -0.0968,-0.01l-4.9148,-0.983c-0.2659,-0.0531 -0.4389,-0.3121 -0.3858,-0.578 0.0536,-0.2659 0.3096,-0.4379 0.5785,-0.3858l4.9148,0.983c0.2659,0.0536 0.4389,0.3126 0.3858,0.5785 -0.0467,0.2335 -0.2521,0.3952 -0.4817,0.3952z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m17.7004,5.2471c0.2295,0 0.435,-0.1617 0.4817,-0.3951 0.053,-0.2659 -0.1199,-0.525 -0.3858,-0.5785l-0.1725,-0.0345 0.1668,0.002c0.0331,0.0008 0.0661,-0.002 0.097,-0.008 0.2255,-0.0426 0.3975,-0.2394 0.4001,-0.4775 0.003,-0.2711 -0.2152,-0.4937 -0.4864,-0.497l-5.0118,-0.0546c-0.2741,-0.003 -0.4936,0.2152 -0.4969,0.4864 -0.0002,0.0178 0.0006,0.0354 0.002,0.0528 -0.0149,0.2414 0.1503,0.4631 0.3941,0.5118l4.9147,0.983c0.0324,0.007 0.0654,0.01 0.0968,0.01z"
+      android:strokeWidth="0.05759544"
+      android:fillColor="@color/rl_antenna_shape"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="m12.5401,16.5773c-0.6537,0 -1.1799,0.5261 -1.1799,1.1798v25.2483c0,0.6537 0.5263,1.1799 1.1799,1.1799h22.9199c0.6537,0 1.1799,-0.5263 1.1799,-1.1799v-25.2483c0,-0.6537 -0.5263,-1.1798 -1.1799,-1.1798zM24.192,19.0833 L30.0172,19.0933c0.058,0 0.1113,0.0332 0.1366,0.0858 0.0266,0.0523 0.02,0.1145 -0.0154,0.1609l-3.5454,4.6214c-0.035,0.0453 -0.0941,0.0646 -0.1483,0.0479 -0.0543,-0.0163 -0.0928,-0.0649 -0.0974,-0.1217l-0.1304,-1.9236 -4.2324,2.0827 -2.3163,3.9011c-0.1409,0.2367 -0.3935,0.3717 -0.6545,0.3717 -0.0966,0 -0.1944,-0.0186 -0.2893,-0.0575l-5.1449,-2.1214c-0.3874,-0.1599 -0.5729,-0.6039 -0.4126,-0.9919 0.1602,-0.3877 0.6032,-0.5737 0.9927,-0.4126l4.5364,1.871 2.0968,-3.5305c0.0757,-0.1266 0.1857,-0.2285 0.3185,-0.2938l4.4342,-2.1822 -1.4449,-1.2777c-0.0421,-0.0378 -0.057,-0.0982 -0.037,-0.1512 0.0209,-0.0535 0.0715,-0.0888 0.1285,-0.0885zM30.317,22.3677h2.6891c0.2536,0 0.4599,0.2063 0.4599,0.4604v14.5915c0,0.2541 -0.2063,0.4604 -0.4599,0.4604h-2.6891c-0.2536,0 -0.4599,-0.2063 -0.4599,-0.4604v-14.5915c0,-0.2541 0.2063,-0.4604 0.4599,-0.4604zM25.2098,26.4357h2.6884c0.2537,0 0.4599,0.2063 0.4599,0.4604v10.5235c0,0.2541 -0.2062,0.4604 -0.4599,0.4604h-2.6884c-0.2543,0 -0.4606,-0.2063 -0.4606,-0.4604v-10.5235c0,-0.2541 0.2063,-0.4604 0.4606,-0.4604zM14.995,30.1241h2.6883c0.2543,0 0.4607,0.2063 0.4607,0.4604v6.8352c0,0.2541 -0.2064,0.4604 -0.4607,0.4604h-2.6883c-0.2537,0 -0.4599,-0.2063 -0.4599,-0.4604v-6.8352c0,-0.2541 0.2062,-0.4604 0.4599,-0.4604zM20.1027,32.158h2.6878c0.2544,0 0.4608,0.2061 0.4608,0.4602v4.8014c0,0.2541 -0.2064,0.4604 -0.4608,0.4604h-2.6878c-0.2543,0 -0.4606,-0.2063 -0.4606,-0.4604v-4.8014c0,-0.2542 0.2062,-0.4602 0.4606,-0.4602zM13.8694,39.3997h20.2615c0.6291,0 1.1395,0.5101 1.1395,1.1397 0,0.6295 -0.5105,1.1397 -1.1395,1.1397h-20.2615c-0.6301,0 -1.1397,-0.5102 -1.1397,-1.1397 0,-0.6296 0.5097,-1.1397 1.1397,-1.1397z"
+      android:strokeWidth="0.76289839"
+      android:fillColor="@color/rl_board_shape"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_acknowledge_alerts.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_acknowledge_alerts.xml
deleted file mode 100644
index 35a2f6482d..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_acknowledge_alerts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.9411765" android:fillColor="@color/icon_omnipod_overview_acknowledge_alerts"
-        android:fillType="nonZero"
-        android:pathData="m287.82,268.738c-8.469,-0.078 -17.094,1.363 -25.502,4.486 -36.926,13.715 -55.706,54.586 -41.971,91.568l12.992,34.99 -1.797,28.566c-0.533,8.412 5.859,15.666 14.275,16.199 2.124,0.135 4.253,-0.176 6.25,-0.912l129.43,-47.744c7.912,-2.919 11.96,-11.699 9.041,-19.611l-0.627,-1.439c-1.019,-1.914 -1.926,-3.116 -2.994,-4.166l-19.57,-19.229 -13.461,-36.252 -1.037,-2.629c-11.36,-27.1 -37.364,-43.574 -65.029,-43.828zM341.883,423.889 L297.281,439.574c6.044,9.042 17.646,13.216 28.379,9.441 10.733,-3.775 17.168,-14.292 16.223,-25.127zM354.183,211.565c21.448,11.718 37.549,26.763 48.143,45.113 10.594,18.349 15.573,39.816 14.997,64.249 -0.101,4.258 -3.634,7.629 -7.892,7.528 -4.258,-0.101 -7.629,-3.634 -7.528,-7.892 0.512,-21.711 -3.82,-40.385 -12.935,-56.173 -9.115,-15.788 -23.122,-28.877 -42.18,-39.289 -3.738,-2.042 -5.113,-6.728 -3.07,-10.466 2.042,-3.738 6.728,-5.113 10.466,-3.07zM351.74,248.591c9.944,5.422 17.913,13.313 23.818,23.541 5.905,10.228 8.754,21.075 8.478,32.398 -0.104,4.258 -3.64,7.626 -7.898,7.522 -4.258,-0.104 -7.626,-3.64 -7.522,-7.898 0.206,-8.448 -1.91,-16.504 -6.416,-24.309 -4.507,-7.806 -10.425,-13.666 -17.844,-17.711 -3.74,-2.039 -5.118,-6.724 -3.079,-10.463 2.039,-3.74 6.724,-5.118 10.463,-3.079zM216.899,211.565c-21.448,11.718 -37.549,26.763 -48.143,45.113 -10.594,18.349 -15.573,39.816 -14.997,64.249 0.101,4.258 3.634,7.629 7.892,7.528 4.258,-0.101 7.629,-3.634 7.528,-7.892 -0.512,-21.711 3.82,-40.385 12.935,-56.173 9.115,-15.788 23.122,-28.877 42.18,-39.289 3.738,-2.042 5.113,-6.728 3.07,-10.466 -2.042,-3.738 -6.728,-5.113 -10.466,-3.07zM219.342,248.591c-9.944,5.422 -17.913,13.313 -23.818,23.541 -5.905,10.228 -8.754,21.075 -8.478,32.398 0.104,4.258 3.64,7.626 7.898,7.522 4.258,-0.104 7.626,-3.64 7.522,-7.898 -0.206,-8.448 1.91,-16.504 6.416,-24.309 4.507,-7.806 10.425,-13.666 17.844,-17.711 3.74,-2.039 5.118,-6.724 3.079,-10.463 -2.039,-3.74 -6.724,-5.118 -10.463,-3.079z"
-        android:strokeColor="#00000000" android:strokeWidth="12.21622753"/>
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.706 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_pod_management.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_pod_management.xml
deleted file mode 100644
index dc2d89cb31..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_pod_management.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="570.5794"
-    android:viewportWidth="916.4391" android:width="83.520065dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.9411765" android:fillColor="@color/pod_icon_outline"
-        android:fillType="nonZero"
-        android:pathData="m240.034,0.007c-10.786,-0.1 -21.556,0.934 -32.029,3.08 -13.095,2.683 -27.105,7.397 -38.114,18.384 -2.624,0.3 -5.322,0.618 -7.254,0.844 -6.015,0.703 -8.52,1.116 -10.334,1.561 -1.814,0.444 -1.227,0.4 -7.069,1.374 -28.413,4.736 -53.046,17.404 -70.071,28.268 -22.772,14.531 -42.424,40.157 -53.797,59.1 -22.737,37.407 -20.883,84.026 -20.883,84.026 -0.001,0.22 -0.206,74.493 -0.348,151.049 -0.071,38.335 -0.128,77.185 -0.133,107.498 -0.007,30.313 -0.011,50.707 0.175,56.743l0.064,2.046 0.392,1.553c1.146,11.762 6.179,23.487 16.21,34.117 10.939,11.592 28.732,20.391 50.263,19.565 0.577,0.007 70.436,0.724 143.821,1.117 36.844,0.197 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.575,-1.177 17.871,-1.865 32.283,-10.343 40.475,-21.404 8.192,-11.061 10.496,-23.172 10.75,-32.895 2.903,-111.207 3.626,-293.064 3.964,-312.731 0.369,-21.548 -5.649,-47.864 -12.938,-66.255 -3.971,-10.021 -6.545,-15.919 -8.287,-19.611 -1.742,-3.692 -3.864,-6.971 -3.864,-6.971l1.155,1.772c0,0 -7.388,-13.179 -16.616,-24.317 -3.658,-4.415 -12.277,-14.774 -25.792,-26.365 -8.572,-7.352 -18.54,-14.355 -29.389,-19.688 -1.45,-1.723 -2.986,-2.746 -4.453,-4.3 -3.14,-3.327 -6.752,-6.544 -10.786,-9.774C312.224,20.367 303.069,14.047 292.788,10.032 276.029,3.486 258.01,0.173 240.034,0.007ZM241.115,16.452a46.471,22.463 5.925,0 1,12.49 0.82,46.471 22.463,5.925 0,1 41.052,28.099 46.471,22.463 5.925,0 1,-50.974 15.964,46.471 22.463,5.925 0,1 -41.052,-28.099 46.471,22.463 5.925,0 1,38.484 -16.784zM186.325,58.03c6.159,-0.104 11.012,1.294 10.957,1.262 17.739,10.189 31.403,16.446 46.66,17.797 15.257,1.351 28.915,-2.106 47.803,-6.908 10.527,-2.676 33.215,5.818 48.623,19.033 11.183,9.592 17.684,17.433 21.305,21.802 5.921,7.146 12.965,19.059 12.965,19.059l0.53,0.918 0.305,0.414c-0.062,-0.04 -0.073,0.032 0.46,1.161 1.226,2.598 3.558,7.878 7.334,17.407 4.75,11.986 10.497,39.657 10.29,51.717 -0.386,22.515 -1.078,202.093 -3.958,312.39 -0.109,4.187 -1.305,8.667 -3.354,11.435 -2.05,2.768 -4.623,5.355 -14.086,6.342 -2.386,0.249 -26.9,0.872 -56.785,0.971 -29.885,0.1 -67.458,-0.014 -104.244,-0.211 -73.57,-0.394 -144,-1.119 -144,-1.119l-0.553,-0.007 -0.553,0.026c-11.644,0.565 -17.338,-3.078 -21.753,-7.756 -4.415,-4.678 -6.356,-11.911 -6.38,-12.85l-0.02,-0.735c-0.068,-2.621 -0.161,-25.03 -0.155,-54.983 0.007,-30.273 0.062,-69.111 0.133,-107.435 0.143,-76.647 0.348,-151.236 0.348,-151.236v-0.111,-0.111c0,0 1.07,-40.557 15.416,-64.131l0.03,-0.052 0.03,-0.05c8.333,-13.889 29.601,-38.993 41.779,-46.764 14.077,-8.983 35.143,-19.386 55.985,-22.859 6.471,-1.079 9.427,-1.841 9.842,-1.943 0.415,-0.102 -0.002,-0.062 5.735,-0.733 6.06,-0.708 13.153,-1.638 19.312,-1.742zM303.723,62.614c1.005,1.21 0.877,3.108 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="31.58291054"/>
-    <path android:fillAlpha="0.9411765" android:fillColor="@color/icon_omnipod_overview_pod_management"
-        android:pathData="m90.355,352.272 l17.938,0.112c2.682,13.802 7.991,27.214 16.038,39.396l-12.741,12.629c-4.582,4.526 -4.582,11.847 -0.112,16.429l13.747,13.914c4.526,4.582 11.847,4.582 16.429,0.112l12.741,-12.629c12.07,8.159 25.426,13.691 39.228,16.485l-0.112,17.938c-0.056,6.426 5.141,11.623 11.567,11.679l19.558,0.112c6.426,0.056 11.623,-5.141 11.679,-11.567l0.112,-17.938c13.802,-2.682 27.214,-7.991 39.396,-16.038l12.629,12.741c4.526,4.582 11.847,4.582 16.429,0.112l13.914,-13.747c4.582,-4.526 4.582,-11.847 0.112,-16.429l-12.629,-12.741c8.159,-12.07 13.691,-25.426 16.485,-39.228l17.938,0.112c6.426,0.056 11.623,-5.141 11.679,-11.567l0.112,-19.558c0.056,-6.426 -5.141,-11.623 -11.567,-11.679l-17.938,-0.112c-2.682,-13.802 -7.991,-27.214 -16.038,-39.396l12.741,-12.629c4.582,-4.526 4.582,-11.847 0.112,-16.429l-13.747,-13.914c-4.526,-4.582 -11.847,-4.582 -16.429,-0.112l-12.741,12.629c-12.07,-8.159 -25.426,-13.691 -39.228,-16.485l0.112,-17.938c0.056,-6.426 -5.141,-11.623 -11.567,-11.679l-19.558,-0.112c-6.426,-0.056 -11.623,5.141 -11.679,11.567l-0.168,17.938c-13.858,2.682 -27.27,7.991 -39.396,16.038l-12.629,-12.741c-4.526,-4.582 -11.847,-4.582 -16.429,-0.112L112.484,241.182c-4.582,4.526 -4.582,11.847 -0.112,16.429l12.629,12.741c-8.158,12.07 -13.691,25.426 -16.485,39.228l-17.937,-0.112c-6.426,-0.056 -11.623,5.141 -11.679,11.567l-0.112,19.558c-0.056,6.37 5.141,11.623 11.567,11.679zM178.981,294.547c20.452,-20.229 53.366,-20.061 73.594,0.391 20.229,20.452 20.061,53.366 -0.391,73.594 -20.452,20.229 -53.366,20.061 -73.594,-0.391 -20.229,-20.452 -20.061,-53.366 0.391,-73.594z"
-        android:strokeColor="#00000000" android:strokeWidth="31.58291054"/>
-    <path android:fillColor="#00000000"
-        android:pathData="m579.658,76.78h-30.431c-24.771,0 -44.739,20.612 -44.739,45.383v326.432c0,24.922 20.203,45.125 45.125,45.125h30.045m0,-207.828c-51.182,-0.431 -97.892,0.426 -149.078,0m188.287,-63.196h247.082c18.597,0 33.568,14.971 33.568,33.568v58.05c0,18.597 -14.971,33.568 -33.568,33.568h-247.082c-18.597,0 -33.568,-14.971 -33.568,-33.568v-58.05c0,-18.597 14.971,-33.568 33.568,-33.568zM618.867,16.922h247.082c18.597,0 33.568,14.971 33.568,33.568v58.05c0,18.597 -14.971,33.568 -33.568,33.568h-247.082c-18.597,0 -33.568,-14.971 -33.568,-33.568v-58.05c0,-18.597 14.971,-33.568 33.568,-33.568zM618.867,428.471h247.082c18.597,0 33.568,14.971 33.568,33.568v58.05c0,18.597 -14.971,33.568 -33.568,33.568h-247.082c-18.597,0 -33.568,-14.971 -33.568,-33.568v-58.05c0,-18.597 14.971,-33.568 33.568,-33.568z"
-        android:strokeColor="@color/icon_omnipod_overview_pod_management_graph" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="33.84370804"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml
deleted file mode 100644
index ae004ae4fe..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/icon_omnipod_overview_refresh_pod_status_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.706 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-    <path android:fillColor="@color/icon_omnipod_overview_refresh_pod_status" android:pathData="m226.858,391.291c-9.551,-8.608 -16.441,-18.928 -20.955,-30.009 -11.974,-29.391 -6.367,-64.346 17.011,-88.459l21.573,21.591c1.188,1.189 3.326,0.333 3.611,-1.427l11.784,-77.187c0.19,-1.284 -0.903,-2.378 -2.186,-2.188l-77.167,11.794c-1.758,0.285 -2.613,2.425 -1.426,3.614l21.62,21.639c-35.685,36.525 -41.767,91.312 -18.341,134.115 7.032,12.888 16.773,24.683 29.175,34.575 21.097,16.788 47.042,24.825 72.796,24.302l4.847,-31.721c-22.19,1.902 -44.998,-4.946 -62.342,-20.64z"/>
-    <path android:fillColor="@color/icon_omnipod_overview_refresh_pod_status" android:pathData="m370.358,410.362c35.685,-36.525 41.767,-91.312 18.341,-134.115 -7.032,-12.888 -16.773,-24.683 -29.175,-34.575 -21.097,-16.788 -47.042,-24.825 -72.796,-24.302l-4.847,31.721c22.143,-1.902 44.998,4.946 62.342,20.64 9.551,8.608 16.441,18.928 20.955,30.009 11.974,29.391 6.367,64.346 -17.011,88.459l-21.573,-21.591c-1.188,-1.189 -3.326,-0.333 -3.611,1.427l-11.784,77.187c-0.19,1.284 0.903,2.378 2.186,2.188l77.167,-11.794c1.758,-0.285 2.566,-2.425 1.426,-3.614z"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_resume_delivery.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_resume_delivery.xml
deleted file mode 100644
index b2d89fe2da..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_resume_delivery.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/icon_omnipod_overview_resume_delivery" android:pathData="m285.541,210.619c-66.212,0 -119.893,53.68 -119.893,119.893 0,66.216 53.68,119.893 119.893,119.893 66.215,0 119.893,-53.678 119.893,-119.893 0.001,-66.212 -53.678,-119.893 -119.893,-119.893zM274.911,339.672 L231.455,364.593c-7.484,4.287 -13.552,0.775 -13.552,-7.863l0,-49.67c0,-8.632 6.068,-12.152 13.552,-7.853l43.456,24.921c7.484,4.291 7.484,11.248 0,15.544zM305.986,355.586c0,8.629 -4.733,15.626 -10.583,15.626 -5.846,0 -10.585,-6.997 -10.585,-15.626L284.818,308.203c0,-8.628 4.739,-15.629 10.585,-15.629 5.85,0 10.583,7.001 10.583,15.629zM349.909,355.586c0,8.629 -4.737,15.626 -10.587,15.626 -5.849,0 -10.587,-6.997 -10.587,-15.626L328.735,308.203c0,-8.628 4.738,-15.629 10.587,-15.629 5.85,0 10.587,7.001 10.587,15.629z"/>
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_set_time.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_set_time.xml
deleted file mode 100644
index 191cddf4fb..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_set_time.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/icon_omnipod_overview_set_time"
-        android:pathData="m416.616,335.309c0,67.287 -54.737,122.039 -122.039,122.039 -67.095,0 -121.692,-54.434 -122.002,-121.463h-18.108l27.117,-40.695 27.117,40.695h-15.794c0.31,55.809 45.787,101.123 101.663,101.123 56.075,0 101.7,-45.617 101.7,-101.7 0,-56.083 -45.624,-101.7 -101.7,-101.7 -5.625,0 -10.17,-4.56 -10.17,-10.177 0,-5.617 4.545,-10.163 10.17,-10.163 67.302,0.008 122.047,54.752 122.047,122.039zM238.623,384.806c1.988,1.996 4.59,2.971 7.191,2.971 2.602,0 5.203,-0.998 7.191,-2.971l48.77,-31.958c1.914,-1.907 2.979,-4.479 2.979,-7.191v-57.524c0,-5.625 -4.553,-10.177 -10.17,-10.177 -5.625,0 -10.17,4.553 -10.17,10.177v53.304l-45.784,28.973c-3.969,3.976 -3.969,10.414 -0.008,14.398zM178.206,252.826c0,-27.154 22.01,-49.15 49.15,-49.15 27.14,0 49.15,22.018 49.15,49.15 0,27.132 -22.01,49.15 -49.15,49.15 -27.14,0 -49.15,-22.01 -49.15,-49.15zM193.158,253.52 L215.101,275.457c1.323,1.33 3.06,2.003 4.789,2.003 1.737,0 3.474,-0.665 4.797,-2.003l36.763,-36.77c2.646,-2.646 2.646,-6.933 0,-9.586 -2.646,-2.653 -6.94,-2.646 -9.586,0l-31.973,31.958 -17.147,-17.132c-2.646,-2.639 -6.947,-2.639 -9.586,0 -2.653,2.661 -2.653,6.948 0,9.593z" android:strokeWidth="7.39095402"/>
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_suspend_delivery.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_suspend_delivery.xml
deleted file mode 100644
index 73fa2635e3..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_suspend_delivery.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/icon_omnipod_overview_suspend_delivery" android:pathData="m285.541,210.619c-66.212,0 -119.893,53.68 -119.893,119.893 0,66.216 53.68,119.893 119.893,119.893 66.215,0 119.893,-53.678 119.893,-119.893 0.001,-66.212 -53.678,-119.893 -119.893,-119.893zM274.911,339.672 L231.455,364.593c-7.484,4.287 -13.552,0.775 -13.552,-7.863l0,-49.67c0,-8.632 6.068,-12.152 13.552,-7.853l43.456,24.921c7.484,4.291 7.484,11.248 0,15.544zM305.986,355.586c0,8.629 -4.733,15.626 -10.583,15.626 -5.846,0 -10.585,-6.997 -10.585,-15.626L284.818,308.203c0,-8.628 4.739,-15.629 10.585,-15.629 5.85,0 10.583,7.001 10.583,15.629zM349.909,355.586c0,8.629 -4.737,15.626 -10.587,15.626 -5.849,0 -10.587,-6.997 -10.587,-15.626L328.735,308.203c0,-8.628 4.738,-15.629 10.587,-15.629 5.85,0 10.587,7.001 10.587,15.629z"/>
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_pod_activity_reset_rileylink_config.xml b/omnipod/src/main/res/drawable/icon_pod_activity_reset_rileylink_config.xml
deleted file mode 100644
index 9c3da03055..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_activity_reset_rileylink_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="559.3504"
-    android:viewportWidth="559.3504" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/icon_pod_activity_reset_rileylink_config"
-        android:pathData="M146.133,193.178C138.516,193.178 132.383,199.309 132.383,206.926L132.383,501.145C132.383,508.762 138.516,514.895 146.133,514.895L413.219,514.895C420.836,514.895 426.969,508.762 426.969,501.145L426.969,206.926C426.969,199.309 420.836,193.178 413.219,193.178L146.133,193.178zM175.336,230.055C175.607,230.068 175.912,230.222 176.219,230.529L184.486,238.807L188.721,243.045C189.539,243.864 190.937,243.942 191.869,243.256C202.333,235.56 214.949,231.4 228.197,231.4C244.634,231.4 260.065,237.788 271.645,249.385C283.239,260.984 289.619,276.411 289.611,292.824C289.603,309.238 283.205,324.657 271.598,336.244L268.139,339.697C267.32,340.515 265.994,340.514 265.176,339.695L261.721,336.238L252.104,326.611L248.648,323.15C247.831,322.331 247.832,321.005 248.65,320.188L252.109,316.732C258.503,310.346 262.028,301.848 262.033,292.809C262.038,283.769 258.522,275.27 252.137,268.877C245.76,262.496 237.263,258.982 228.213,258.982C222.356,258.982 216.723,260.458 211.746,263.229C210.735,263.791 210.612,264.968 211.43,265.787L214.936,269.299L223.387,277.764C224.204,278.582 223.938,279.374 222.791,279.531L210.939,281.154L175.051,286.07L167.854,287.057C166.707,287.214 165.92,286.416 166.096,285.271L167.199,278.09L172.641,242.682L174.418,231.117C174.528,230.402 174.885,230.033 175.336,230.055zM359.264,256.203C362.137,256.216 365.005,257.325 367.195,259.543L380.502,273.012C384.829,277.447 384.83,284.535 380.395,288.916L368.061,301.141C375.85,312.933 380.99,325.915 383.586,339.275L400.949,339.383C407.17,339.437 412.2,344.521 412.146,350.688L412.037,369.621C411.983,375.842 406.953,380.872 400.732,380.818L383.369,380.709C380.665,394.07 375.31,406.998 367.412,418.682L379.637,431.014C383.964,435.449 383.965,442.537 379.529,446.918L366.113,460.225C361.678,464.552 354.592,464.551 350.211,460.115L337.986,447.783C326.248,455.572 313.266,460.71 299.852,463.307L299.689,480.67C299.635,486.89 294.605,491.921 288.385,491.867L269.451,491.76C263.231,491.706 258.202,486.676 258.256,480.455L258.363,463.092C245.003,460.387 232.074,455.032 220.391,447.135L208.059,459.359C203.623,463.687 196.536,463.686 192.154,459.25L178.848,445.781C174.52,441.346 174.522,434.26 178.957,429.879L191.289,417.654C183.5,405.862 178.362,392.88 175.766,379.52L158.402,379.41C152.182,379.356 147.151,374.326 147.205,368.105L147.313,349.174C147.367,342.953 152.397,337.922 158.617,337.977L175.98,338.084C177.156,332.275 178.837,326.548 181.006,320.969A88.281,88.281 0,0 0,232.307 342.41C225.957,360.094 229.812,380.617 243.92,394.881C263.501,414.678 295.363,414.841 315.16,395.26C334.958,375.679 335.118,343.819 315.537,324.021C311.814,320.257 307.645,317.207 303.201,314.863A88.281,88.281 0,0 0,326.625 264.49C330.859,266.585 334.982,268.972 338.959,271.66L351.293,259.436C353.511,257.272 356.39,256.19 359.264,256.203z"
-        android:strokeColor="#00000000" android:strokeWidth="8.89007664"/>
-    <path android:fillColor="#00000000"
-        android:pathData="m120.253,13.812c-11.706,0 -21.196,8.984 -21.196,20.066L99.057,82.707 99.057,525.472c-0,11.082 9.49,20.066 21.196,20.066h318.844c11.745,0 21.304,-9.042 21.196,-20.16l-3.699,-380.555c-0.107,-11.045 -9.528,-19.972 -21.196,-19.972h-160.091c-11.706,0 -21.448,-8.987 -21.196,-20.066l1.611,-70.906c0.252,-11.079 -9.49,-20.066 -21.196,-20.066z"
-        android:strokeColor="@color/icon_pod_activity_reset_rileylink_config_outline" android:strokeWidth="27.62420464"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m150.091,112.66c0.366,0 0.75,0.034 1.128,0.115l57.272,11.455c3.099,0.619 5.114,3.637 4.496,6.735 -0.624,3.099 -3.608,5.103 -6.741,4.496l-57.272,-11.455c-3.099,-0.624 -5.114,-3.642 -4.496,-6.741 0.544,-2.721 2.938,-4.605 5.613,-4.605z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m150.091,136.559c-2.675,0 -5.069,1.885 -5.613,4.605 -0.618,3.099 1.397,6.118 4.496,6.742l2.01,0.402 -1.943,-0.022c-0.386,-0.009 -0.771,0.028 -1.131,0.096 -2.628,0.496 -4.632,2.79 -4.662,5.564 -0.033,3.16 2.509,5.754 5.67,5.793l35.689,0.389 0.35,33.053c3.182,0 8.41,0.031 11.453,0.031l0.299,-32.952 10.611,0.115c3.194,0.032 5.753,-2.509 5.791,-5.67 0,-0.208 -0.01,-0.413 -0.027,-0.615 0.174,-2.813 -1.751,-5.396 -4.592,-5.963l-57.272,-11.455c-0.378,-0.08 -0.762,-0.115 -1.129,-0.115z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m149.537,87.396c0.366,0 0.75,0.034 1.128,0.115l57.272,11.455c3.099,0.619 5.114,3.637 4.496,6.735 -0.624,3.099 -3.608,5.126 -6.741,4.496l-57.272,-11.455c-3.099,-0.624 -5.114,-3.642 -4.496,-6.741 0.544,-2.72 2.938,-4.605 5.613,-4.605z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m206.266,85.047c-0.366,0 -0.75,-0.034 -1.128,-0.115L147.866,73.477c-3.099,-0.619 -5.114,-3.637 -4.496,-6.735 0.624,-3.099 3.608,-5.103 6.741,-4.496l57.272,11.455c3.099,0.624 5.114,3.642 4.496,6.741 -0.544,2.721 -2.938,4.605 -5.613,4.605z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m206.266,61.147c2.675,0 5.069,-1.884 5.613,-4.605 0.618,-3.099 -1.397,-6.117 -4.496,-6.742l-2.01,-0.402 1.944,0.021c0.386,0.009 0.77,-0.029 1.13,-0.097 2.628,-0.496 4.632,-2.79 4.662,-5.565 0.033,-3.16 -2.508,-5.753 -5.669,-5.792l-58.403,-0.637c-3.194,-0.032 -5.752,2.508 -5.79,5.669 -0.002,0.208 0.007,0.413 0.027,0.615 -0.174,2.813 1.752,5.396 4.592,5.964l57.271,11.455c0.378,0.081 0.762,0.114 1.128,0.114z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml b/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
deleted file mode 100644
index 8694bbf7e2..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/icon_pod_management_activate_pod_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-    <path android:fillColor="@color/icon_pod_management_activate_pod" android:pathData="m166.18,355.278c-3.914,-42.132 14.08,-80.295 43.926,-104.541 11.634,-9.459 29.03,-1.359 29.03,13.591l0,0c0,5.491 -2.609,10.546 -6.85,13.971 -21.147,17.233 -33.868,44.415 -30.77,74.423 4.023,39.087 35.336,70.727 74.369,75.076 50.938,5.708 94.212,-34.195 94.212,-83.991 0,-26.421 -12.232,-50.069 -31.313,-65.562 -4.24,-3.425 -6.795,-8.481 -6.795,-13.917l0,0c0,-14.787 17.124,-23.159 28.649,-13.917 27.29,22.017 44.795,55.668 44.795,93.396 0,68.987 -58.604,124.601 -128.678,119.545 -57.951,-4.077 -105.193,-50.232 -110.575,-108.074zM285.508,197.352c-9.785,0 -17.668,7.937 -17.668,17.668l0,81.382c0,9.785 7.937,17.668 17.668,17.668 9.731,0 17.668,-7.937 17.668,-17.668L303.176,215.02c0,-9.731 -7.883,-17.668 -17.668,-17.668z"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_deactivate_pod.xml b/omnipod/src/main/res/drawable/icon_pod_management_deactivate_pod.xml
deleted file mode 100644
index 5a9b273b87..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_deactivate_pod.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-    <path android:fillColor="@color/icon_pod_management_deactivate_pod" android:pathData="m166.18,355.278c-3.914,-42.132 14.08,-80.295 43.926,-104.541 11.634,-9.459 29.03,-1.359 29.03,13.591l0,0c0,5.491 -2.609,10.546 -6.85,13.971 -21.147,17.233 -33.868,44.415 -30.77,74.423 4.023,39.087 35.336,70.727 74.369,75.076 50.938,5.708 94.212,-34.195 94.212,-83.991 0,-26.421 -12.232,-50.069 -31.313,-65.562 -4.24,-3.425 -6.795,-8.481 -6.795,-13.917l0,0c0,-14.787 17.124,-23.159 28.649,-13.917 27.29,22.017 44.795,55.668 44.795,93.396 0,68.987 -58.604,124.601 -128.678,119.545 -57.951,-4.077 -105.193,-50.232 -110.575,-108.074zM285.508,197.352c-9.785,0 -17.668,7.937 -17.668,17.668l0,81.382c0,9.785 7.937,17.668 17.668,17.668 9.731,0 17.668,-7.937 17.668,-17.668L303.176,215.02c0,-9.731 -7.883,-17.668 -17.668,-17.668z"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_discard_pod.xml b/omnipod/src/main/res/drawable/icon_pod_management_discard_pod.xml
deleted file mode 100644
index 775704d4da..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_discard_pod.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.485,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-    <path android:fillColor="@color/icon_pod_management_discard_pod" android:fillType="nonZero"
-        android:pathData="m287.731,102.576c-0.712,-0.275 -1.468,-0.506 -2.279,-0.678 -3.535,-0.763 -7.993,-0.12 -11.914,2.8 -0.108,0.074 -13.267,8.906 -27.042,18.258 -6.916,4.696 -13.971,9.51 -19.586,13.392 -5.613,3.883 -9.39,6.477 -11.174,7.997 -3.103,2.644 -4.71,6.081 -4.821,9.202 -0.112,3.121 1.011,5.684 2.212,7.535 13.739,21.171 36.959,55.274 39.422,58.996 2.698,4.077 7.203,8.226 10.928,10.73 2.03,1.364 3.267,2.135 4.067,2.601 0.8,0.467 1.62,0.811 1.62,0.811l-0.443,-0.185c0,0 3.076,1.513 6.232,2.411 1.251,0.356 4.195,1.186 8.212,1.618 2.547,0.274 5.309,0.302 8.023,-0.094 0.493,0.135 0.913,0.135 1.387,0.237 1.015,0.219 2.1,0.356 3.269,0.442 2.338,0.172 4.863,0.178 7.302,-0.391 3.975,-0.928 7.769,-2.624 11.152,-4.902 2.031,-1.366 3.912,-2.941 5.595,-4.687 2.105,-2.184 4.117,-4.867 4.765,-8.336 0.452,-0.393 0.918,-0.797 1.25,-1.086 1.034,-0.904 1.453,-1.303 1.735,-1.62 0.282,-0.316 0.176,-0.23 1.144,-1.163 4.706,-4.535 7.681,-10.067 9.47,-14.286 2.392,-5.642 2.782,-12.96 2.476,-17.964 -0.552,-9.916 -6.887,-18.396 -6.887,-18.396 -0.029,-0.044 -9.531,-13.96 -19.337,-28.296 -4.91,-7.178 -9.89,-14.448 -13.78,-20.12 -3.892,-5.67 -6.51,-9.488 -7.32,-10.593l-0.274,-0.372 -0.271,-0.238c-1.294,-1.539 -2.998,-2.795 -5.134,-3.622zM315.141,220.698a5.096,10.543 61.448,0 1,1.884 1.639,5.096 10.543,61.448 0,1 -5.044,8.083 5.096,10.543 61.448,0 1,-2.438 1.45,5.096 10.543,61.448 0,1 -11.284,0.018 5.096,10.543 61.448,0 1,7.483 -9.533,5.096 10.543,61.448 0,1 9.4,-1.657z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="8.55589581"/>
-    <path android:fillColor="@color/icon_pod_management_discard_pod"
-        android:pathData="m183.425,259.105c-6.918,0 -13.252,2.738 -17.839,7.711 -4.587,4.971 -6.807,11.507 -6.253,18.403l15.778,196.036c1.097,13.646 13.131,24.748 26.819,24.748h167.218c13.69,0 25.722,-11.102 26.819,-24.748l15.783,-196.04c0.552,-6.898 -1.665,-13.432 -6.252,-18.403 -4.587,-4.969 -10.928,-7.706 -17.844,-7.706zM261.938,326.722 L305.682,327.16c-9.423,2.17 -14.714,8.912 -17.508,14.757l-20.445,36.286 -31.866,-17.659 10.648,-19.215c3.795,-7.247 8.726,-13.537 15.427,-14.606zM311.444,330.004c3.875,-0.155 7.752,1.062 10.172,5.013l10.872,16.458 11.329,-4.809 -16.342,30.082 -35.435,-0.399 9.292,-5.937 -12.131,-21.403c3.373,-6.285 7.354,-12.805 12.092,-15.802 2.407,-1.522 6.277,-3.049 10.152,-3.204zM245.606,374.468 L262.434,405.654 252.739,400.408 239.898,421.398c-7.132,0.097 -14.764,-0.226 -19.682,-2.917 -4.996,-2.735 -12.835,-10.587 -8.27,-18.651l9.126,-17.489 -9.7,-7.58zM347.793,374.468 L359.433,393.1c4.499,6.832 7.609,14.192 5.295,20.572l-21.592,38.046c2.67,-9.294 -0.663,-17.19 -4.42,-22.468l-21.821,-35.474zM306.728,415.937 L307.418,426.945 332.016,426.712c3.862,5.996 7.636,12.636 7.959,18.233 0.329,5.686 -2.174,16.498 -11.431,16.901l-19.672,1.527 -1.284,12.243 -18.389,-28.876zM212.801,417.571c6.466,7.189 14.927,8.547 21.393,8.159l41.649,0.292v36.432h-21.967c-8.178,0.194 -16.067,-1.065 -20.251,-6.408z" android:strokeWidth="1.69895077"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_play_test_beep.xml b/omnipod/src/main/res/drawable/icon_pod_management_play_test_beep.xml
deleted file mode 100644
index e80cb36475..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_play_test_beep.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/icon_pod_management_play_test_beep" android:pathData="m190.836,380.877l26.335,0l72.527,47.63c10.073,5.562 25.186,-11.28 25.186,-25.189L314.884,258.487c0,-13.912 -12.592,-33.164 -25.186,-25.19L217.307,285.163L190.836,285.163C176.924,285.163 165.649,296.439 165.649,310.351l0,45.338c0,13.91 11.276,25.188 25.188,25.188z"/>
-    <path android:fillColor="@color/icon_pod_management_play_test_beep" android:pathData="m339.301,261.38c27.526,0 49.925,31.011 49.925,69.131 0,38.122 -22.399,69.132 -49.925,69.132 -4.477,0 -8.105,3.632 -8.105,8.104 0,4.475 3.628,8.105 8.105,8.105 36.468,0 66.132,-38.283 66.132,-85.341 0,-47.058 -29.663,-85.341 -66.132,-85.341 -4.477,0 -8.105,3.631 -8.105,8.105 0,4.474 3.624,8.105 8.105,8.105z"/>
-    <path android:fillColor="@color/icon_pod_management_play_test_beep" android:pathData="m333.214,365.344c-4.47,0 -8.105,3.634 -8.105,8.105 0,4.476 3.634,8.105 8.105,8.105 17.396,0 30.511,-21.943 30.511,-51.042 0,-29.099 -13.115,-51.043 -30.511,-51.043 -4.47,0 -8.105,3.63 -8.105,8.105 0,4.473 3.634,8.105 8.105,8.105 5.695,0 14.302,13.896 14.302,34.834 0,20.941 -8.607,34.833 -14.302,34.833z"/>
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml b/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml
deleted file mode 100644
index abf666839c..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/icon_pod_management_pod_history" android:pathData="m405.434,247.342l0,199.773c0,16.318 -13.278,29.596 -29.597,29.596l-135.031,0c-16.319,0 -29.596,-13.278 -29.596,-29.596L211.21,317.219c4.222,0.702 8.528,1.158 12.948,1.158 3.134,0 6.211,-0.233 9.249,-0.592l0,129.331c0,4.079 3.318,7.398 7.399,7.398l135.031,0c4.079,0 7.399,-3.32 7.399,-7.398L383.236,247.342c0,-4.081 -3.32,-7.399 -7.399,-7.399L302.592,239.943c0,-7.717 -1.159,-15.154 -3.238,-22.197l76.483,0c16.319,-0.001 29.597,13.276 29.597,29.595zM222.922,308.638C184.431,308.638 153.119,277.326 153.119,238.837 153.12,200.347 184.431,169.034 222.922,169.034c38.489,0 69.803,31.312 69.803,69.803 0,38.489 -31.314,69.801 -69.803,69.801zM222.922,293.84c30.328,0 55.003,-24.671 55.003,-55.003 0,-30.333 -24.672,-55.005 -55.003,-55.005 -30.333,0 -55.005,24.671 -55.005,55.005 0,30.331 24.676,55.003 55.005,55.003zM264.785,246.237c4.084,0 7.399,-3.315 7.399,-7.399 0,-4.084 -3.315,-7.399 -7.399,-7.399l-34.464,0l0,-29.045c0,-4.084 -3.315,-7.399 -7.399,-7.399 -4.084,0 -7.399,3.315 -7.399,7.399l0,36.444c0,4.084 3.315,7.399 7.399,7.399zM350.183,306.227l-80.156,0c-4.084,0 -7.399,3.315 -7.399,7.399 0,4.085 3.315,7.399 7.399,7.399l80.156,0c4.086,0 7.399,-3.315 7.399,-7.399 0.001,-4.084 -3.313,-7.399 -7.399,-7.399zM350.313,351.108L270.157,351.108c-4.084,0 -7.399,3.313 -7.399,7.399 0,4.086 3.315,7.399 7.399,7.399l80.156,0c4.086,0 7.398,-3.313 7.398,-7.399 0,-4.086 -3.309,-7.399 -7.398,-7.399zM350.313,397.847L270.157,397.847c-4.084,0 -7.399,3.316 -7.399,7.399 0,4.086 3.315,7.398 7.399,7.398l80.156,0c4.086,0 7.398,-3.313 7.398,-7.398 0.001,-4.083 -3.309,-7.399 -7.398,-7.399z"/>
-    <path android:fillColor="@color/pod_icon_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_pulse_log.xml b/omnipod/src/main/res/drawable/icon_pod_management_pulse_log.xml
deleted file mode 100644
index faaa137526..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_pulse_log.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="571.0818"
-    android:viewportWidth="571.0818" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/icon_pod_management_pulse_log"
-        android:pathData="m332.289,224.504h31.703c1.844,0 3.516,-1.228 4.222,-3.121 0.707,-1.887 0.31,-4.058 -1.005,-5.495 -11.581,-12.688 -33.099,-36.24 -44.634,-48.794 -1.316,-1.431 -3.274,-1.849 -4.98,-1.064 -1.695,0.779 -2.803,2.615 -2.803,4.647v34.619c0.006,10.541 7.927,19.209 17.497,19.209z" android:strokeWidth="6.03064156"/>
-    <path android:fillColor="@color/icon_pod_management_pulse_log"
-        android:pathData="m178.541,158.69c-14.591,0 -26.463,13.042 -26.463,29.123v234.629c0,16.081 11.872,29.123 26.463,29.123h52.67c-0.169,-2.62 -0.262,-5.244 -0.279,-7.869 0.061,-29.833 9.95,-58.815 28.139,-82.463 -5.626,-2.146 -9.684,-8.029 -9.684,-14.949v-13.555c0,-8.728 6.442,-15.828 14.361,-15.828h0.205c7.919,0 14.362,7.1 14.361,15.828 0,2.543 -1.87,4.605 -4.178,4.605 -2.308,0 -4.178,-2.062 -4.178,-4.605 0,-3.649 -2.695,-6.617 -6.006,-6.617h-0.205c-3.311,0 -6.004,2.968 -6.004,6.617v13.555c0,3.649 2.693,6.619 6.004,6.619h0.205c0.593,0 1.155,0.139 1.666,0.385 7.881,-8.85 16.887,-16.63 26.789,-23.141 0.059,-0.074 0.104,-0.156 0.168,-0.227 7.297,-4.75 8.937,-6.261 17.604,-9.453 17.706,-8.17 36.965,-12.429 56.465,-12.486 2.998,0.051 5.993,0.2 8.981,0.449v-59.133c0,-2.786 -2.039,-5.047 -4.578,-5.047h-38.758c-19.56,0 -35.408,-17.404 -35.408,-38.955v-41.559c0,-2.786 -2.045,-5.047 -4.578,-5.047zM189.8,204.466h0.207c7.919,0 14.359,7.1 14.359,15.828v13.557c0,8.728 -6.441,15.826 -14.359,15.826h-0.207c-7.919,0 -14.361,-7.098 -14.361,-15.826v-13.557c0,-8.728 6.442,-15.828 14.361,-15.828zM255.451,204.466h0.207c7.919,0 14.362,7.1 14.361,15.828 0,2.543 -1.874,4.605 -4.182,4.605 -2.308,0 -4.178,-2.062 -4.178,-4.605 0,-3.649 -2.691,-6.617 -6.002,-6.617h-0.207c-3.311,0 -6.004,2.968 -6.004,6.617v13.557c0,3.649 2.693,6.615 6.004,6.615h0.207c2.308,0 4.178,2.062 4.178,4.605 0,2.543 -1.87,4.605 -4.178,4.605h-0.207c-7.919,0 -14.361,-7.098 -14.361,-15.826v-13.557c0,-8.728 6.442,-15.828 14.361,-15.828zM227.81,204.472c0.608,-0.034 1.227,0.077 1.813,0.344 1.562,0.713 2.58,2.391 2.58,4.254v24.752c0,2.543 -1.872,4.604 -4.18,4.604 -2.308,0 -4.178,-2.06 -4.178,-4.604v-13.633l-3.455,3.809c-1.631,1.799 -4.278,1.799 -5.91,0 -1.632,-1.798 -1.632,-4.715 0,-6.514l10.588,-11.67c0.747,-0.823 1.729,-1.285 2.742,-1.342zM189.8,213.677c-3.311,0 -6.002,2.968 -6.002,6.617v13.557c0,3.649 2.691,6.615 6.002,6.615h0.207c3.311,0 6.002,-2.966 6.002,-6.615v-13.557c0,-3.649 -2.691,-6.617 -6.002,-6.617zM221.783,260.683h0.205c7.919,0 14.362,7.1 14.361,15.828 0,2.543 -1.87,4.605 -4.178,4.605 -2.308,0 -4.178,-2.062 -4.178,-4.605 0,-3.649 -2.695,-6.615 -6.006,-6.615h-0.205c-3.311,0 -6.004,2.966 -6.004,6.615v13.557c0,3.649 2.693,6.615 6.004,6.615h0.205c2.308,0 4.18,2.062 4.18,4.605 0,2.543 -1.872,4.605 -4.18,4.605h-0.205c-7.919,0 -14.361,-7.098 -14.361,-15.826v-13.557c0,-8.728 6.442,-15.828 14.361,-15.828zM295.728,260.683h0.207c7.919,0 14.363,7.1 14.363,15.828v13.557c0,8.728 -6.444,15.826 -14.363,15.826h-0.207c-7.919,0 -14.359,-7.098 -14.359,-15.826v-13.557c0,-8.728 6.441,-15.828 14.359,-15.828zM189.994,260.689c0.608,-0.034 1.227,0.079 1.813,0.346 1.562,0.713 2.578,2.393 2.578,4.256v36c0,2.543 -1.87,4.605 -4.178,4.605 -2.308,0 -4.178,-2.062 -4.178,-4.605v-24.885l-3.455,3.809c-1.631,1.799 -4.278,1.799 -5.91,0 -1.632,-1.798 -1.632,-4.713 0,-6.512l10.588,-11.67c0.747,-0.823 1.729,-1.287 2.742,-1.344zM263.941,260.689c0.608,-0.034 1.227,0.079 1.813,0.346 1.562,0.713 2.58,2.393 2.58,4.256v36c-0,2.543 -1.874,4.605 -4.182,4.605 -2.308,0 -4.178,-2.062 -4.178,-4.605v-24.885l-3.455,3.809c-1.631,1.799 -4.276,1.799 -5.908,0 -1.632,-1.798 -1.632,-4.713 0,-6.512l10.588,-11.67c0.747,-0.823 1.729,-1.287 2.742,-1.344zM337.888,260.689c0.608,-0.034 1.225,0.079 1.811,0.346 1.562,0.713 2.58,2.393 2.58,4.256v36c0,2.543 -1.872,4.605 -4.18,4.605 -2.308,0 -4.178,-2.062 -4.178,-4.605v-24.885l-3.455,3.809c-1.631,1.799 -4.278,1.799 -5.91,0 -1.632,-1.798 -1.632,-4.713 0,-6.512l10.59,-11.67c0.747,-0.823 1.729,-1.287 2.742,-1.344zM295.728,269.894c-3.311,0 -6.002,2.968 -6.002,6.617v13.557c0,3.649 2.691,6.615 6.002,6.615h0.207c3.311,0 6.004,-2.966 6.004,-6.615v-13.557c0,-3.649 -2.693,-6.617 -6.004,-6.617zM189.8,316.902h0.207c7.919,0 14.36,7.101 14.359,15.828v13.555c0,8.728 -6.441,15.83 -14.359,15.83h-0.207c-7.919,0 -14.361,-7.102 -14.361,-15.83L175.439,332.73c0,-8.728 6.442,-15.828 14.361,-15.828zM231.959,316.908c0.608,-0.034 1.225,0.077 1.811,0.344 1.562,0.713 2.58,2.393 2.58,4.256v36c0,2.543 -1.87,4.605 -4.178,4.605 -2.308,0 -4.178,-2.062 -4.178,-4.605v-24.881l-3.455,3.809c-1.631,1.799 -4.278,1.799 -5.91,0 -1.632,-1.798 -1.632,-4.715 0,-6.514l10.588,-11.672c0.747,-0.823 1.729,-1.285 2.742,-1.342zM189.802,326.113c-3.311,0 -6.004,2.968 -6.004,6.617v13.555c0,3.649 2.693,6.619 6.004,6.619h0.205c3.311,0 6.002,-2.97 6.002,-6.619L196.009,332.73c0,-3.649 -2.691,-6.617 -6.002,-6.617zM221.783,373.119h0.205c7.919,0 14.362,7.102 14.361,15.83 0,2.543 -1.87,4.604 -4.178,4.604 -2.308,0 -4.178,-2.06 -4.178,-4.604 0,-3.649 -2.695,-6.619 -6.006,-6.619h-0.205c-3.311,0 -6.004,2.97 -6.004,6.619v13.553c0,3.649 2.693,6.619 6.004,6.619h0.205c2.308,0 4.18,2.062 4.18,4.605 0,2.543 -1.872,4.605 -4.18,4.605h-0.205c-7.919,0 -14.361,-7.102 -14.361,-15.83v-13.553c0,-8.728 6.442,-15.83 14.361,-15.83zM189.994,373.125c0.608,-0.034 1.227,0.079 1.813,0.346 1.562,0.713 2.578,2.391 2.578,4.254v36.002c0,2.543 -1.87,4.604 -4.178,4.604 -2.308,0 -4.178,-2.06 -4.178,-4.604v-24.883l-3.455,3.809c-1.631,1.799 -4.278,1.799 -5.91,0 -1.632,-1.798 -1.632,-4.715 0,-6.514l10.588,-11.67c0.747,-0.823 1.729,-1.285 2.742,-1.342z" android:strokeWidth="6.03064156"/>
-    <path android:fillColor="@color/icon_pod_management_pulse_log" android:pathData="m282.934,475.881c-4.822,0 -8.731,-3.909 -8.731,-8.731L274.203,379.828c0,-4.822 3.909,-8.731 8.731,-8.731 4.822,0 8.731,3.909 8.731,8.731l0,87.322c0.004,4.822 -3.909,8.731 -8.731,8.731z"/>
-    <path android:fillColor="@color/icon_pod_management_pulse_log" android:pathData="m308.402,464.962c-4.822,0 -8.731,-3.909 -8.731,-8.731L299.671,390.747c0,-4.822 3.909,-8.731 8.731,-8.731 4.822,0 8.734,3.909 8.734,8.731l0,65.485c-0.004,4.822 -3.913,8.731 -8.734,8.731z"/>
-    <path android:fillColor="@color/icon_pod_management_pulse_log" android:pathData="m333.87,486.796c-4.822,0 -8.731,-3.905 -8.731,-8.731L325.139,368.916c0,-4.822 3.909,-8.731 8.731,-8.731 4.822,0 8.731,3.909 8.731,8.731l0,109.146c0,4.825 -3.909,8.734 -8.731,8.734z"/>
-    <path android:fillColor="@color/icon_pod_management_pulse_log" android:pathData="m359.334,508.623c-4.818,0 -8.731,-3.909 -8.731,-8.731L350.603,347.086c0,-4.822 3.913,-8.731 8.731,-8.731 4.825,0 8.731,3.909 8.731,8.731l0,152.807c0,4.822 -3.905,8.731 -8.731,8.731z"/>
-    <path android:fillColor="@color/icon_pod_management_pulse_log" android:pathData="m384.809,475.881c-4.825,0 -8.731,-3.909 -8.731,-8.731L376.078,379.828c0,-4.822 3.905,-8.731 8.731,-8.731 4.818,0 8.731,3.909 8.731,8.731l0,87.322c0,4.822 -3.913,8.731 -8.731,8.731z"/>
-    <path android:fillColor="@color/icon_pod_management_pulse_log" android:pathData="m410.273,443.135c-4.822,0 -8.731,-3.909 -8.731,-8.727l0,-21.831c0,-4.822 3.909,-8.731 8.731,-8.731 4.822,0 8.731,3.909 8.731,8.731l0,21.831c0,4.818 -3.909,8.727 -8.731,8.727z"/>
-    <path android:fillColor="@color/icon_pod_management_pulse_log_outline" android:fillType="nonZero"
-        android:pathData="m309.935,0.007c-10.786,-0.1 -21.556,0.935 -32.028,3.082 -13.096,2.686 -27.105,7.403 -38.114,18.4 -2.624,0.3 -5.322,0.619 -7.254,0.845 -6.015,0.704 -8.52,1.117 -10.334,1.562 -1.814,0.445 -1.227,0.4 -7.069,1.375 -28.413,4.74 -53.046,17.419 -70.072,28.293 -22.771,14.544 -42.424,40.192 -53.797,59.152 -22.737,37.44 -20.883,84.1 -20.883,84.1 -0.001,0.22 -0.207,74.559 -0.349,151.182 -0.072,38.368 -0.128,77.253 -0.132,107.593 0,30.34 -0.022,50.751 0.175,56.793l0.063,2.048 0.392,1.554c1.146,11.772 6.179,23.508 16.21,34.147 10.939,11.602 28.732,20.409 50.264,19.582 0.577,0.006 70.436,0.724 143.821,1.118 36.845,0.198 74.484,0.311 104.57,0.211 30.086,-0.1 50.299,-0.104 60.576,-1.178 17.871,-1.867 32.283,-10.353 40.475,-21.423 8.192,-11.071 10.496,-23.192 10.75,-32.923 2.903,-111.305 3.626,-293.322 3.964,-313.006 0.369,-21.567 -5.649,-47.906 -12.938,-66.313 -3.971,-10.03 -6.545,-15.933 -8.287,-19.628 -1.742,-3.695 -3.864,-6.978 -3.864,-6.978l1.155,1.773c0,0 -7.388,-13.191 -16.616,-24.338 -3.658,-4.419 -12.277,-14.787 -25.792,-26.388 -8.572,-7.359 -18.54,-14.368 -29.389,-19.705 -1.449,-1.725 -2.987,-2.748 -4.453,-4.304 -3.14,-3.33 -6.752,-6.55 -10.786,-9.783 -8.068,-6.466 -17.222,-12.791 -27.504,-16.81 -16.759,-6.551 -34.778,-9.868 -52.754,-10.034zM311.016,16.466a46.471,22.482 5.933,0 1,12.49 0.821,46.471 22.482,5.933 0,1 41.053,28.124 46.471,22.482 5.933,0 1,-50.974 15.978,46.471 22.482,5.933 0,1 -41.053,-28.124 46.471,22.482 5.933,0 1,38.485 -16.798zM256.225,58.081c6.159,-0.104 11.012,1.295 10.957,1.263 17.739,10.198 31.403,16.461 46.66,17.813 15.257,1.352 28.915,-2.108 47.803,-6.914 10.527,-2.679 33.215,5.823 48.623,19.05 11.184,9.6 17.685,17.449 21.305,21.821 5.922,7.152 12.966,19.076 12.966,19.076l0.529,0.919 0.305,0.414c-0.063,-0.04 -0.074,0.032 0.46,1.162 1.226,2.601 3.558,7.885 7.334,17.422 4.75,11.996 10.497,39.692 10.29,51.762 -0.386,22.535 -1.078,202.271 -3.957,312.665 -0.11,4.191 -1.305,8.675 -3.354,11.445 -2.05,2.77 -4.623,5.36 -14.086,6.348 -2.386,0.249 -26.9,0.873 -56.785,0.972 -29.885,0.1 -67.459,-0.016 -104.244,-0.211 -73.571,-0.395 -144.001,-1.12 -144.001,-1.12l-0.553,-0.006 -0.554,0.026c-11.644,0.565 -17.338,-3.08 -21.752,-7.763 -4.415,-4.682 -6.356,-11.922 -6.38,-12.861l-0.022,-0.735c-0.067,-2.624 -0.162,-25.052 -0.155,-55.032 0,-30.3 0.063,-69.172 0.133,-107.529 0.141,-76.715 0.348,-151.369 0.348,-151.369v-0.112,-0.112c0,0 1.07,-40.593 15.416,-64.187l0.029,-0.052 0.029,-0.05c8.333,-13.901 29.601,-39.027 41.779,-46.805 14.077,-8.991 35.143,-19.403 55.985,-22.879 6.471,-1.08 9.427,-1.843 9.842,-1.945 0.415,-0.102 0,-0.062 5.735,-0.733 6.06,-0.709 13.153,-1.639 19.312,-1.743zM373.624,62.67c1.005,1.211 0.877,3.111 0,0z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="37.72868729"/>
-</vector>
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_rl_stats.xml b/omnipod/src/main/res/drawable/icon_pod_management_rl_stats.xml
deleted file mode 100644
index cde8412e8b..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_rl_stats.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector android:height="52dp" android:viewportHeight="559.3504"
-    android:viewportWidth="559.3504" android:width="52dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
-        android:pathData="m120.253,13.812c-11.706,0 -21.196,8.984 -21.196,20.066L99.057,82.707 99.057,525.472c-0,11.082 9.49,20.066 21.196,20.066h318.844c11.745,0 21.304,-9.042 21.196,-20.16l-3.699,-380.555c-0.107,-11.045 -9.528,-19.972 -21.196,-19.972h-160.091c-11.706,0 -21.448,-8.987 -21.196,-20.066l1.611,-70.906c0.252,-11.079 -9.49,-20.066 -21.196,-20.066z"
-        android:strokeColor="@color/icon_pod_management_rl_stats_outline" android:strokeWidth="27.62420464"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m150.091,112.66c0.366,0 0.75,0.034 1.128,0.115l57.272,11.455c3.099,0.619 5.114,3.637 4.496,6.735 -0.624,3.099 -3.608,5.103 -6.741,4.496l-57.272,-11.455c-3.099,-0.624 -5.114,-3.642 -4.496,-6.741 0.544,-2.721 2.938,-4.605 5.613,-4.605z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m150.091,136.559c-2.675,0 -5.069,1.885 -5.613,4.605 -0.618,3.099 1.397,6.118 4.496,6.742l2.01,0.402 -1.943,-0.022c-0.386,-0.009 -0.771,0.028 -1.131,0.096 -2.628,0.496 -4.632,2.79 -4.662,5.564 -0.033,3.16 2.509,5.754 5.67,5.793l35.689,0.389 0.35,33.053c3.182,0 8.41,0.031 11.453,0.031l0.299,-32.952 10.611,0.115c3.194,0.032 5.753,-2.509 5.791,-5.67 0,-0.208 -0.01,-0.413 -0.027,-0.615 0.174,-2.813 -1.751,-5.396 -4.592,-5.963l-57.272,-11.455c-0.378,-0.08 -0.762,-0.115 -1.129,-0.115z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m149.537,87.396c0.366,0 0.75,0.034 1.128,0.115l57.272,11.455c3.099,0.619 5.114,3.637 4.496,6.735 -0.624,3.099 -3.608,5.126 -6.741,4.496l-57.272,-11.455c-3.099,-0.624 -5.114,-3.642 -4.496,-6.741 0.544,-2.72 2.938,-4.605 5.613,-4.605z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m206.266,85.047c-0.366,0 -0.75,-0.034 -1.128,-0.115L147.866,73.477c-3.099,-0.619 -5.114,-3.637 -4.496,-6.735 0.624,-3.099 3.608,-5.103 6.741,-4.496l57.272,11.455c3.099,0.624 5.114,3.642 4.496,6.741 -0.544,2.721 -2.938,4.605 -5.613,4.605z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-    <path android:fillColor="@color/rl_antenna_shape"
-        android:pathData="m206.266,61.147c2.675,0 5.069,-1.884 5.613,-4.605 0.618,-3.099 -1.397,-6.117 -4.496,-6.742l-2.01,-0.402 1.944,0.021c0.386,0.009 0.77,-0.029 1.13,-0.097 2.628,-0.496 4.632,-2.79 4.662,-5.565 0.033,-3.16 -2.508,-5.753 -5.669,-5.792l-58.403,-0.637c-3.194,-0.032 -5.752,2.508 -5.79,5.669 -0.002,0.208 0.007,0.413 0.027,0.615 -0.174,2.813 1.752,5.396 4.592,5.964l57.271,11.455c0.378,0.081 0.762,0.114 1.128,0.114z"
-        android:strokeColor="#00000000" android:strokeWidth="0.67116106"/>
-    <path android:fillColor="@color/icon_pod_management_rl_stats"
-        android:pathData="m146.132,193.178c-7.617,0 -13.75,6.131 -13.75,13.748v294.219c0,7.617 6.133,13.75 13.75,13.75h267.086c7.617,0 13.75,-6.133 13.75,-13.75L426.968,206.926c0,-7.617 -6.133,-13.748 -13.75,-13.748zM281.912,222.381 L349.792,222.498c0.676,0 1.298,0.387 1.592,1 0.31,0.61 0.233,1.334 -0.18,1.875l-41.314,53.854c-0.407,0.528 -1.097,0.753 -1.729,0.559 -0.633,-0.19 -1.082,-0.757 -1.135,-1.418l-1.52,-22.416 -49.32,24.27 -26.992,45.459c-1.642,2.758 -4.585,4.332 -7.627,4.332 -1.126,0 -2.266,-0.217 -3.371,-0.67l-59.953,-24.721c-4.515,-1.864 -6.676,-7.037 -4.809,-11.559 1.866,-4.517 7.029,-6.685 11.568,-4.809l52.863,21.803 24.434,-41.141c0.882,-1.475 2.164,-2.663 3.711,-3.424l51.672,-25.43 -16.838,-14.889c-0.491,-0.441 -0.664,-1.144 -0.432,-1.762 0.244,-0.623 0.833,-1.035 1.498,-1.031zM353.287,260.654h31.336c2.955,0 5.359,2.404 5.359,5.365v170.035c0,2.961 -2.404,5.365 -5.359,5.365h-31.336c-2.955,0 -5.359,-2.404 -5.359,-5.365L347.927,266.02c0,-2.961 2.404,-5.365 5.359,-5.365zM293.773,308.059h31.328c2.956,0 5.359,2.404 5.359,5.365v122.631c0,2.961 -2.403,5.365 -5.359,5.365h-31.328c-2.964,0 -5.367,-2.404 -5.367,-5.365L288.406,313.424c0,-2.961 2.404,-5.365 5.367,-5.365zM174.74,351.039h31.326c2.964,0 5.369,2.404 5.369,5.365v79.65c0,2.961 -2.405,5.365 -5.369,5.365h-31.326c-2.956,0 -5.359,-2.404 -5.359,-5.365v-79.65c0,-2.961 2.403,-5.365 5.359,-5.365zM234.259,374.74h31.32c2.964,0 5.369,2.402 5.369,5.363v55.951c0,2.961 -2.405,5.365 -5.369,5.365h-31.32c-2.964,0 -5.367,-2.404 -5.367,-5.365v-55.951c0,-2.962 2.403,-5.363 5.367,-5.363zM161.623,459.127h236.107c7.331,0 13.279,5.944 13.279,13.281 0,7.336 -5.948,13.281 -13.279,13.281L161.622,485.689c-7.342,0 -13.281,-5.945 -13.281,-13.281 0,-7.337 5.939,-13.281 13.281,-13.281z"
-        android:strokeColor="#00000000" android:strokeWidth="8.89007282"/>
-</vector>
diff --git a/omnipod/src/main/res/layout/omnipod_overview.xml b/omnipod/src/main/res/layout/omnipod_overview.xml
index 00e44ba3eb..7b21cf1304 100644
--- a/omnipod/src/main/res/layout/omnipod_overview.xml
+++ b/omnipod/src/main/res/layout/omnipod_overview.xml
@@ -778,7 +778,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_omnipod_overview_refresh_pod_status"
+                    android:drawableTop="@drawable/ic_omnipod_overview_refresh_pod_status"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:text="@string/omnipod_overview_button_refresh" />
 
@@ -788,7 +788,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_omnipod_overview_pod_management"
+                    android:drawableTop="@drawable/ic_omnipod_overview_pod_management"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:text="@string/omnipod_overview_button_pod_management" />
 
@@ -798,7 +798,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_omnipod_overview_acknowledge_alerts"
+                    android:drawableTop="@drawable/ic_omnipod_overview_acknowledge_alerts"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:text="@string/omnipod_overview_button_acknowledge_active_alerts" />
 
@@ -808,7 +808,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_omnipod_overview_set_time"
+                    android:drawableTop="@drawable/ic_omnipod_overview_set_time"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:text="@string/omnipod_overview_button_set_time"
                     android:visibility="gone" />
@@ -819,7 +819,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_omnipod_overview_resume_delivery"
+                    android:drawableTop="@drawable/ic_omnipod_overview_resume_delivery"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:text="@string/omnipod_overview_button_resume_delivery"
                     android:visibility="gone" />
@@ -830,10 +830,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_omnipod_overview_suspend_delivery"
+                    android:drawableTop="@drawable/ic_omnipod_overview_suspend_delivery"
                     android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:text="@string/omnipod_overview_button_suspend_delivery"
-                    android:visibility="visible" />
+                    android:visibility="gone" />
 
             </LinearLayout>
 
diff --git a/omnipod/src/main/res/layout/omnipod_pod_management.xml b/omnipod/src/main/res/layout/omnipod_pod_management.xml
index f7871be3f5..5ee71e1da3 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_management.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_management.xml
@@ -68,7 +68,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_pod_management_activate_pod"
+            android:drawableTop="@drawable/ic_pod_management_activate_pod"
             android:text="@string/omnipod_pod_management_button_activate_pod"
             android:textAllCaps="false" />
 
@@ -80,7 +80,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_pod_management_deactivate_pod"
+            android:drawableTop="@drawable/ic_pod_management_deactivate_pod"
             android:text="@string/omnipod_pod_management_button_deactivate_pod"
             android:textAllCaps="false" />
     </LinearLayout>
@@ -100,7 +100,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_pod_management_play_test_beep"
+            android:drawableTop="@drawable/ic_pod_management_play_test_beep"
             android:text="@string/omnipod_pod_management_button_play_test_beep"
             android:textAllCaps="false" />
 
@@ -112,9 +112,10 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_pod_management_discard_pod"
+            android:drawableTop="@drawable/ic_pod_management_discard_pod"
             android:text="@string/omnipod_pod_management_button_discard_pod"
-            android:textAllCaps="false" />
+            android:textAllCaps="false"
+            android:visibility="gone"/>
 
     </LinearLayout>
 
@@ -140,7 +141,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_pod_management_pod_history"
+            android:drawableTop="@drawable/ic_pod_management_pod_history"
             android:text="@string/omnipod_pod_management_button_pod_history"
             android:textAllCaps="false" />
 
@@ -151,9 +152,10 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_pod_management_rl_stats"
+            android:drawableTop="@drawable/ic_pod_management_rl_stats"
             android:text="@string/omnipod_pod_management_button_riley_link_stats"
-            android:textAllCaps="false" />
+            android:textAllCaps="false"
+            android:visibility="gone"/>
 
     </LinearLayout>
 
@@ -171,7 +173,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_pod_management_pulse_log"
+            android:drawableTop="@drawable/ic_pod_management_pulse_log"
             android:text="@string/omnipod_pod_management_button_read_pulse_log"
             android:textAllCaps="false"
             android:visibility="gone" />
@@ -183,7 +185,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_pod_activity_reset_rileylink_config"
+            android:drawableTop="@drawable/ic_pod_activity_reset_rileylink_config"
             android:text="@string/omnipod_pod_management_button_reset_riley_link_config"
             android:textAllCaps="false" />
 
diff --git a/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml b/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
index fca78512a4..54061c7d07 100644
--- a/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
+++ b/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
@@ -29,7 +29,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="@dimen/omnipod_wizard_vertical_spacing"
         android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
-        app:srcCompat="@drawable/icon_omnipod_wizard_success"
+        app:srcCompat="@drawable/ic_omnipod_wizard_success"
         android:visibility="gone" />
 
     <TextView
diff --git a/omnipod/src/main/res/values/colors.xml b/omnipod/src/main/res/values/colors.xml
index 26d9a49f98..8df323920f 100644
--- a/omnipod/src/main/res/values/colors.xml
+++ b/omnipod/src/main/res/values/colors.xml
@@ -6,44 +6,44 @@
     <color name="icon_omnipod_wizard_success">#77DD77</color>
 
     <!-- Button icons - general -->
-    <color name="pod_icon_outline">#90CAF9</color>
+    <color name="pod_icon_outline">#9E9E9E</color>
     <color name="rl_icon_outline">#b9d2d2</color>
     <color name="rl_board_shape">#66BB6A</color>
     <color name="rl_antenna_shape">#FF7043</color>
 
     <!-- Actions tab - Button icons -->
-    <color name="icon_pod_activity_reset_rileylink_config">@color/rl_board_shape</color>
-    <color name="icon_pod_activity_reset_rileylink_config_outline">@color/rl_icon_outline</color>
+    <color name="ic_pod_activity_reset_rileylink_config">@color/rl_board_shape</color>
+    <color name="ic_pod_activity_reset_rileylink_config_outline">@color/rl_icon_outline</color>
 
     <!-- Omnipod tab - Button icons -->
-    <color name="icon_omnipod_overview_acknowledge_alerts">#FF4444</color>
-    <color name="icon_omnipod_overview_acknowledge_alerts_outline">@color/pod_icon_outline</color>
-    <color name="icon_omnipod_overview_pod_management">#4CAF50</color>
-    <color name="icon_omnipod_overview_pod_management_graph">@color/pod_icon_outline</color>
-    <color name="icon_omnipod_overview_pod_management_outline">@color/pod_icon_outline</color>
-    <color name="icon_omnipod_overview_refresh_pod_status">#42A5F5</color>
-    <color name="icon_omnipod_overview_refresh_pod_status_outline">@color/pod_icon_outline</color>
-    <color name="icon_omnipod_overview_resume_delivery">#67E86A</color>
-    <color name="icon_omnipod_overview_resume_delivery_outline">@color/pod_icon_outline</color>
-    <color name="icon_omnipod_overview_set_time">#B39DDB</color>
-    <color name="icon_omnipod_overview_set_time_outline">@color/pod_icon_outline</color>
-    <color name="icon_omnipod_overview_suspend_delivery">#ffbf00</color>
-    <color name="icon_omnipod_overview_suspend_delivery_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_acknowledge_alerts">#FF4444</color>
+    <color name="ic_omnipod_overview_acknowledge_alerts_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_pod_management">#4CAF50</color>
+    <color name="ic_omnipod_overview_pod_management_graph">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_pod_management_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_refresh_pod_status">#42A5F5</color>
+    <color name="ic_omnipod_overview_refresh_pod_status_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_resume_delivery">#67E86A</color>
+    <color name="ic_omnipod_overview_resume_delivery_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_set_time">#B39DDB</color>
+    <color name="ic_omnipod_overview_set_time_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_suspend_delivery">#ffbf00</color>
+    <color name="ic_omnipod_overview_suspend_delivery_outline">@color/pod_icon_outline</color>
 
     <!-- Pod Management - Button icons -->
-    <color name="icon_pod_management_activate_pod">#67E86A</color>
-    <color name="icon_pod_management_activate_pod_outline">@color/pod_icon_outline</color>
-    <color name="icon_pod_management_deactivate_pod">#FF4444</color>
-    <color name="icon_pod_management_deactivate_pod_outline">@color/pod_icon_outline</color>
-    <color name="icon_pod_management_discard_pod">#85F803</color>
-    <color name="icon_pod_management_discard_pod_outline">@color/pod_icon_outline</color>
-    <color name="icon_pod_management_play_test_beep">#ffbf00</color>
-    <color name="icon_pod_management_play_test_beep_outline">@color/pod_icon_outline</color>
-    <color name="icon_pod_management_pulse_log">#4DD0E1</color>
-    <color name="icon_pod_management_pulse_log_outline">@color/pod_icon_outline</color>
-    <color name="icon_pod_management_pod_history">#FB8C00</color>
-    <color name="icon_pod_management_pod_history_outline">@color/pod_icon_outline</color>
-    <color name="icon_pod_management_rl_stats">@color/rl_board_shape</color>
-    <color name="icon_pod_management_rl_stats_outline">@color/rl_icon_outline</color>
+    <color name="ic_pod_management_activate_pod">#67E86A</color>
+    <color name="ic_pod_management_activate_pod_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_deactivate_pod">#FF4444</color>
+    <color name="ic_pod_management_deactivate_pod_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_discard_pod">#85F803</color>
+    <color name="ic_pod_management_discard_pod_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_play_test_beep">#ffbf00</color>
+    <color name="ic_pod_management_play_test_beep_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_pulse_log">#4DD0E1</color>
+    <color name="ic_pod_management_pulse_log_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_pod_history">#FB8C00</color>
+    <color name="ic_pod_management_pod_history_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_rl_stats">@color/rl_board_shape</color>
+    <color name="ic_pod_management_rl_stats_outline">@color/rl_icon_outline</color>
 
 </resources>
\ No newline at end of file