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>