Merge pull request #96 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge

Latest Omnipod updates

core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java

@@ -15,8 +15,8 @@ import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.Interval;
-import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
@@ -381,6 +381,12 @@ public class TemporaryBasal implements Interval, DbObjectBase {
         return (remainingMin < 0) ? 0 : Math.round(remainingMin);
     }
 
+    public int getPlannedRemainingMinutesRoundedUp() {
+        float remainingMin = (end() - System.currentTimeMillis()) / 1000f / 60;
+        return (remainingMin < 0) ? 0 : (int) Math.ceil(remainingMin);
+    }
+
+
     public double tempBasalConvertedToAbsolute(long time, Profile profile) {
         if (isFakeExtended) {
             return profile.getBasal(time) + netExtendedRate;

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, 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;
@@ -327,7 +319,7 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_expiration_reminder_hours_before_shutdown) ||
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_low_reservoir_alert_enabled) ||
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_low_reservoir_alert_units)) {
-                        if (!verifyPodAlertConfiguration() && !getCommandQueue().statusInQueue()) {
+                        if (!verifyPodAlertConfiguration()) {
                             getCommandQueue().customCommand(new CommandUpdateAlertConfiguration(), null);
                         }
                     }
@@ -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 mcat = (OmnipodCustomActionType) customActionType;
+        aapsLogger.warn(LTag.PUMP, "Unknown custom action: " + customActionType);
-
-        if (mcat == OmnipodCustomActionType.RESET_RILEY_LINK_CONFIGURATION) {
-            serviceTaskExecutor.startTask(new ResetRileyLinkConfigurationTask(getInjector()));
-        } else {
-            aapsLogger.warn(LTag.PUMP, "Unknown custom action: " + mcat);
-        }
     }
 
     @Override

omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodCustomActionType.java

@@ -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();
-    }
-
-}

omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/PodHistoryEntryType.java

@@ -23,6 +23,7 @@ public enum PodHistoryEntryType {
     CANCEL_TEMPORARY_BASAL(12, R.string.omnipod_cmd_cancel_tbr, PumpHistoryEntryGroup.Basal),
     SET_FAKE_SUSPENDED_TEMPORARY_BASAL(13, R.string.omnipod_cmd_set_fake_suspended_tbr, PumpHistoryEntryGroup.Basal),
     CANCEL_FAKE_SUSPENDED_TEMPORARY_BASAL(14, R.string.omnipod_cmd_cancel_fake_suspended_tbr, PumpHistoryEntryGroup.Basal),
+    SPLIT_TEMPORARY_BASAL(15, R.string.omnipod_cmd_split_tbr, PumpHistoryEntryGroup.Basal),
 
     SET_BASAL_SCHEDULE(20, R.string.omnipod_cmd_set_basal_schedule, PumpHistoryEntryGroup.Basal),
 

omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/manager/PodStateManager.java

@@ -428,7 +428,6 @@ public abstract class PodStateManager {
         setAndStore(() -> {
             if (!Objects.equals(podState.isTempBasalCertain(), certain)) {
                 podState.setTempBasalCertain(certain);
-                onTbrChanged();
             }
         });
     }
@@ -570,7 +569,7 @@ public abstract class PodStateManager {
 
             boolean isBasalCertain = podState.isBasalCertain() == null || podState.isBasalCertain();
             boolean isTempBasalCertain = podState.isTempBasalCertain() == null || podState.isTempBasalCertain();
-            if (!status.getDeliveryStatus().isTbrRunning()) {
+            if (!status.getDeliveryStatus().isTbrRunning() && hasTempBasal()) {
                 if (isTempBasalCertain) {
                     clearTempBasal(); // Triggers onTbrChanged when appropriate
                 } else {

omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java

@@ -485,6 +485,8 @@ public class AapsOmnipodManager {
 
             showNotification(getStringResource(R.string.omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled), Notification.URGENT, isNotificationUncertainTbrSoundEnabled() ? R.raw.boluserror : null);
 
+            splitActiveTbr(); // Split any active TBR so when we recover from the uncertain TBR status,we only cancel the part after the cancellation
+
             return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage);
         } catch (Exception ex) {
             String errorMessage = translateException(ex);
@@ -520,8 +522,10 @@ public class AapsOmnipodManager {
         try {
             executeCommand(() -> delegate.cancelTemporaryBasal(isTbrBeepsEnabled()));
         } catch (Exception ex) {
-            if (ex instanceof OmnipodException && !((OmnipodException) ex).isCertainFailure()) {
+            if (OmnipodManager.isCertainFailure(ex)) {
                 showNotification(getStringResource(R.string.omnipod_error_cancel_temp_basal_failed_uncertain), Notification.URGENT, isNotificationUncertainTbrSoundEnabled() ? R.raw.boluserror : null);
+            } else {
+                splitActiveTbr(); // Split any active TBR so when we recover from the uncertain TBR status,we only cancel the part after the cancellation
             }
             String errorMessage = translateException(ex);
             addFailureToHistory(PodHistoryEntryType.CANCEL_TEMPORARY_BASAL, errorMessage);
@@ -730,23 +734,55 @@ public class AapsOmnipodManager {
     }
 
     public void reportCancelledTbr() {
+        reportCancelledTbr(System.currentTimeMillis());
+    }
+
+    public void reportCancelledTbr(long time) {
         aapsLogger.debug(LTag.PUMP, "Reporting cancelled TBR to AAPS");
 
         long pumpId = addSuccessToHistory(PodHistoryEntryType.CANCEL_TEMPORARY_BASAL_BY_DRIVER, null);
 
         TemporaryBasal temporaryBasal = new TemporaryBasal(injector) //
-                .date(System.currentTimeMillis()) //
+                .date(time) //
                 .duration(0) //
                 .source(Source.PUMP) //
                 .pumpId(pumpId);
 
         activePlugin.getActiveTreatments().addToHistoryTempBasal(temporaryBasal);
+
+        sendEvent(new EventRefreshOverview("AapsOmnipodManager.reportCancelledTbr()", false));
     }
 
     public long addTbrSuccessToHistory(long requestTime, TempBasalPair tempBasalPair) {
         return addSuccessToHistory(requestTime, PodHistoryEntryType.SET_TEMPORARY_BASAL, tempBasalPair);
     }
 
+    // Cancels current TBR and adds a new TBR for the remaining duration
+    private void splitActiveTbr() {
+        TemporaryBasal previouslyRunningTempBasal = activePlugin.getActiveTreatments().getTempBasalFromHistory(System.currentTimeMillis());
+        if (previouslyRunningTempBasal != null) {
+            // Cancel the previously running TBR and start a NEW TBR here for the remaining duration,
+            // so that we only cancel the remaining part when recovering from an uncertain failure in the cancellation
+            int minutesRemaining = previouslyRunningTempBasal.getPlannedRemainingMinutesRoundedUp();
+
+            if (minutesRemaining > 0) {
+                reportCancelledTbr(System.currentTimeMillis() - 1000);
+
+                TempBasalPair newTempBasalPair = new TempBasalPair(previouslyRunningTempBasal.absoluteRate, false, minutesRemaining);
+                long pumpId = addSuccessToHistory(PodHistoryEntryType.SPLIT_TEMPORARY_BASAL, newTempBasalPair);
+
+                TemporaryBasal tempBasal = new TemporaryBasal(injector) //
+                        .date(System.currentTimeMillis()) //
+                        .absolute(previouslyRunningTempBasal.absoluteRate)
+                        .duration(minutesRemaining) //
+                        .pumpId(pumpId) //
+                        .source(Source.PUMP);
+
+                activePlugin.getActiveTreatments().addToHistoryTempBasal(tempBasal);
+            }
+        }
+    }
+
     private void addTempBasalTreatment(long time, long pumpId, TempBasalPair tempBasalPair) {
         TemporaryBasal tempStart = new TemporaryBasal(injector) //
                 .date(time) //

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;
 

omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodHistoryActivity.java

@@ -35,7 +35,6 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.definition.PodHistoryEntryType;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
@@ -249,7 +248,8 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
                 PodHistoryEntryType entryType = PodHistoryEntryType.getByCode(historyEntry.getPodEntryTypeCode());
                 switch (entryType) {
 
-                    case SET_TEMPORARY_BASAL: {
+                    case SET_TEMPORARY_BASAL:
+                    case SPLIT_TEMPORARY_BASAL: {
                         TempBasalPair tempBasalPair = aapsOmnipodUtil.getGsonInstance().fromJson(historyEntry.getData(), TempBasalPair.class);
                         valueView.setText(resourceHelper.gs(R.string.omnipod_history_tbr_value, tempBasalPair.getInsulinRate(), tempBasalPair.getDurationMinutes()));
                     }

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)

omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt

@@ -43,7 +43,7 @@ abstract class WizardFragmentBase : DaggerFragment() {
 
         if (nextPage == null) {
             omnipod_wizard_button_next.text = getString(R.string.omnipod_wizard_button_finish)
-            omnipod_wizard_button_next.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.review_green, context?.theme))
+            omnipod_wizard_button_next.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.omnipod_wizard_finish_button, context?.theme))
         }
 
         updateProgressIndication()

omnipod/src/main/res/drawable/ic_acknowledge_alerts.xml

@@ -1,9 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="75"
-    android:viewportWidth="75" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#AF2E9A"
-        android:pathData="m39,14 l-17,15H6V48H22l17,15z"
-        android:strokeColor="#AF2E9A" android:strokeLineJoin="round" android:strokeWidth="5"/>
-    <path android:fillColor="#00000000"
-        android:pathData="m49,26 l20,24m0,-24 l-20,24"
-        android:strokeColor="#AF2E9A" android:strokeLineCap="round" android:strokeWidth="5"/>
-</vector>

omnipod/src/main/res/drawable/ic_activate_pod.xml

@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="310"
-    android:viewportWidth="310" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#169100" android:pathData="M221.742,46.906c-7.28,-3.954 -16.387,-1.259 -20.341,6.021c-3.955,7.279 -1.259,16.386 6.02,20.341C242.937,92.561 265,129.626 265,170c0,60.654 -49.346,110 -110,110S45,230.654 45,170c0,-40.198 21.921,-77.186 57.208,-96.531c7.265,-3.982 9.925,-13.1 5.943,-20.364c-3.983,-7.264 -13.101,-9.925 -20.364,-5.943C42.891,71.775 15,118.844 15,170c0,77.196 62.804,140 140,140s140,-62.804 140,-140C295,118.62 266.929,71.453 221.742,46.906z"/>
-    <path android:fillColor="#169100" android:pathData="M155,130c8.284,0 15,-6.716 15,-15V15c0,-8.284 -6.716,-15 -15,-15c-8.284,0 -15,6.716 -15,15v100C140,123.284 146.716,130 155,130z"/>
-</vector>

omnipod/src/main/res/drawable/ic_deactivate_pod.xml

@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="310"
-    android:viewportWidth="310" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#BA4242" android:pathData="M221.742,46.906c-7.28,-3.954 -16.387,-1.259 -20.341,6.021c-3.955,7.279 -1.259,16.386 6.02,20.341C242.937,92.561 265,129.626 265,170c0,60.654 -49.346,110 -110,110S45,230.654 45,170c0,-40.198 21.921,-77.186 57.208,-96.531c7.265,-3.982 9.925,-13.1 5.943,-20.364c-3.983,-7.264 -13.101,-9.925 -20.364,-5.943C42.891,71.775 15,118.844 15,170c0,77.196 62.804,140 140,140s140,-62.804 140,-140C295,118.62 266.929,71.453 221.742,46.906z"/>
-    <path android:fillColor="#BA4242" android:pathData="M155,130c8.284,0 15,-6.716 15,-15V15c0,-8.284 -6.716,-15 -15,-15c-8.284,0 -15,6.716 -15,15v100C140,123.284 146.716,130 155,130z"/>
-</vector>

omnipod/src/main/res/drawable/ic_discard_pod.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#007BB3"
-        android:pathData="M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8.46,11.88L9.87,10.47L12,12.59L14.12,10.47L15.53,11.88L13.41,14L15.53,16.12L14.12,17.53L12,15.41L9.88,17.53L8.47,16.12L10.59,14L8.46,11.88M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z" />
-</vector>

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>

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>

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>

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>

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>

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>

omnipod/src/main/res/drawable/ic_omnipod_wizard_success.xml

@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="72dp"
     android:height="72dp"
-    android:tint="@color/toastOk"
+    android:tint="@color/icon_omnipod_wizard_success"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

omnipod/src/main/res/drawable/ic_play_test_beep.xml

@@ -1,14 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
-    android:viewportHeight="75"
-    android:viewportWidth="75"
-    android:width="48dp"
-    >
-    <path android:fillColor="#D36200"
-        android:pathData="M39.389,13.769L22.235,28.606L6,28.606L6,47.699L21.989,47.699L39.389,62.75L39.389,13.769z"
-        android:strokeColor="#D36200" android:strokeLineJoin="round" android:strokeWidth="5"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M48,27.6a19.5,19.5 0,0 1,0 21.4M55.1,20.5a30,30 0,0 1,0 35.6M61.6,14a38.8,38.8 0,0 1,0 48.6"
-        android:strokeColor="#D36200" android:strokeLineCap="round" android:strokeWidth="5"/>
-</vector>

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>

omnipod/src/main/res/drawable/ic_pod_history.xml

@@ -1,7 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="484"
-    android:viewportWidth="484" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#D36200" android:pathData="M410.413,70.88C364.706,25.172 303.934,0 239.293,0c-47.493,0 -93.076,13.591 -132.383,39.378l-2.909,-2.985C93.086,25.194 77.521,20.808 62.366,24.662c-15.155,3.854 -26.735,15.14 -30.975,30.192L4.369,150.781c-4.239,15.05 -0.255,30.72 10.658,41.917c8.308,8.524 19.31,13.101 30.775,13.101c3.595,0 7.236,-0.45 10.854,-1.37l96.591,-24.548c15.156,-3.852 26.736,-15.137 30.978,-30.189c3.54,-12.562 1.331,-25.547 -5.836,-36.012C197.287,104.713 218.107,100 239.293,100c78.299,0 142,63.701 142,142s-63.701,142 -142,142c-40.717,0 -79.54,-17.527 -106.514,-48.087c-18.243,-20.667 -49.903,-22.642 -70.573,-4.399c-10.013,8.838 -15.985,21.046 -16.816,34.376c-0.831,13.329 3.579,26.185 12.417,36.198C103.753,454.144 169.903,484 239.293,484c64.641,0 125.414,-25.172 171.121,-70.88c45.708,-45.708 70.88,-106.479 70.88,-171.12S456.121,116.588 410.413,70.88zM164.975,144.269c-2.28,8.092 -8.506,14.159 -16.654,16.23L51.73,185.046c-8.146,2.072 -16.513,-0.287 -22.38,-6.307c-5.867,-6.02 -8.009,-14.444 -5.73,-22.536l27.023,-95.928c2.279,-8.092 8.504,-14.16 16.652,-16.231c8.15,-2.071 16.516,0.286 22.383,6.307l33.072,33.933l32.604,33.454c0.003,0.003 0.006,0.005 0.009,0.008l3.883,3.984C165.113,127.751 167.255,136.177 164.975,144.269zM396.271,398.978C354.341,440.908 298.592,464 239.293,464c-63.656,0 -124.34,-27.39 -166.492,-75.147c-5.303,-6.008 -7.948,-13.722 -7.45,-21.719s4.082,-15.323 10.089,-20.625c5.695,-5.026 12.777,-7.494 19.835,-7.494c8.313,0 16.589,3.427 22.51,10.133C148.553,384.007 192.841,404 239.293,404c89.328,0 162,-72.673 162,-162s-72.673,-162 -162,-162c-26.21,0 -51.956,6.312 -74.942,18.314l-11.509,-11.809l-31.691,-32.517C156.439,31.715 197.037,20 239.293,20c59.299,0 115.048,23.092 156.978,65.022c41.931,41.93 65.022,97.679 65.022,156.978S438.201,357.047 396.271,398.978z"/>
-    <path android:fillColor="#FFFFBC4F" android:pathData="M420.202,336.007c-1.397,0 -2.817,-0.294 -4.17,-0.916c-5.019,-2.306 -7.217,-8.244 -4.911,-13.262c11.395,-24.793 17.172,-51.315 17.172,-78.829c0,-35.76 -10.031,-70.57 -29.01,-100.666c-2.945,-4.672 -1.547,-10.847 3.125,-13.792c4.672,-2.948 10.846,-1.547 13.793,3.125c20.994,33.294 32.092,71.793 32.092,111.334c0,30.417 -6.392,59.749 -18.999,87.18C427.611,333.846 423.987,336.007 420.202,336.007z"/>
-    <path android:fillColor="#FFFFBC4F" android:pathData="M375.291,107.724c-2.45,0 -4.904,-0.895 -6.834,-2.701c-13.866,-12.987 -29.525,-23.772 -46.542,-32.057c-4.966,-2.418 -7.031,-8.403 -4.614,-13.369c2.417,-4.965 8.403,-7.031 13.368,-4.614c18.817,9.162 36.131,21.086 51.46,35.442c4.031,3.775 4.238,10.104 0.463,14.135C380.623,106.662 377.96,107.724 375.291,107.724z"/>
-    <path android:fillColor="#D36200" android:pathData="M284.002,329c-8.014,0 -15.548,-3.121 -21.214,-8.787l-44.499,-44.5c-5.675,-5.675 -8.784,-13.202 -8.776,-21.228c-0.007,-0.161 -0.011,-0.322 -0.011,-0.485V151c0,-16.542 13.458,-30 30,-30s30,13.458 30,30v91.073l35.714,35.713v0c11.695,11.697 11.695,30.729 0,42.426C299.55,325.879 292.016,329 284.002,329zM229.502,253.729c0.006,0.132 0.01,0.263 0.012,0.396c0.001,0.083 0,0.165 0,0.248c-0.035,2.726 1.001,5.283 2.918,7.199l44.499,44.5c1.889,1.889 4.4,2.929 7.071,2.929s5.183,-1.04 7.071,-2.929c3.898,-3.898 3.898,-10.243 0,-14.142l-38.643,-38.642c-1.875,-1.875 -2.929,-4.419 -2.929,-7.071V151c0,-5.514 -4.486,-10 -10,-10c-5.514,0 -10,4.486 -10,10V253.729z"/>
-</vector>

omnipod/src/main/res/drawable/ic_pod_management.xml

@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="490"
-    android:viewportWidth="490" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#4D71F1" android:pathData="M490,305V185h-69.964c-2.498,-7.291 -5.453,-14.42 -8.844,-21.34l49.475,-49.475l-84.853,-84.853L326.34,78.807c-6.919,-3.39 -14.051,-6.345 -21.34,-8.843V0H185v69.964c-7.29,2.498 -14.42,5.453 -21.34,8.843l-49.475,-49.475l-84.853,84.853l49.475,49.475c-3.391,6.92 -6.345,14.05 -8.843,21.34H0v120h69.964c2.498,7.291 5.453,14.42 8.843,21.34l-49.475,49.475l84.853,84.853l49.475,-49.475c6.92,3.391 14.05,6.345 21.34,8.843V490h120v-69.964c7.29,-2.498 14.42,-5.453 21.34,-8.843l49.475,49.475l84.853,-84.853l-49.475,-49.475c3.391,-6.919 6.346,-14.05 8.844,-21.34H490zM418.241,375.815l-42.427,42.426l-44.187,-44.186l-9.944,5.673c-11.206,6.394 -23.199,11.364 -35.646,14.772L275,397.523V460h-60v-62.477l-11.039,-3.022c-12.445,-3.408 -24.438,-8.378 -35.646,-14.772l-9.944,-5.673l-44.186,44.186l-42.426,-42.426l44.186,-44.186l-5.673,-9.944c-6.394,-11.206 -11.364,-23.199 -14.772,-35.646L92.478,275H30v-60h62.478l3.022,-11.039c3.408,-12.445 8.377,-24.438 14.771,-35.645l5.674,-9.944l-44.187,-44.187l42.426,-42.426l44.187,44.187l9.944,-5.674c11.207,-6.394 23.2,-11.364 35.645,-14.771L215,92.478V30h60v62.478l11.039,3.022c12.446,3.408 24.438,8.378 35.645,14.771l9.944,5.674l44.187,-44.187l42.427,42.426l-44.187,44.187l5.674,9.944c6.393,11.205 11.363,23.198 14.772,35.646L397.523,215H460v60h-62.477l-3.022,11.038c-3.409,12.447 -8.38,24.44 -14.772,35.646l-5.674,9.944L418.241,375.815z"/>
-    <path android:fillColor="#4D71F1" android:pathData="M245,150c-52.383,0 -95,42.617 -95,95s42.617,95 95,95s95,-42.617 95,-95S297.383,150 245,150zM245,310c-35.841,0 -65,-29.159 -65,-65s29.159,-65 65,-65s65,29.159 65,65S280.841,310 245,310z"/>
-</vector>

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>

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>

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>

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>

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>

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>

omnipod/src/main/res/drawable/ic_pulse_log.xml

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
-        android:fillColor="#A14FFF" />
-    <path
-        android:pathData="M2.852,13.946c-0.248,0 -0.498,-0.123 -0.74,-0.366c-0.49,-0.49 -0.492,-0.986 -0.004,-1.474l3.125,-3.125C5.106,8.737 5.048,8.435 5.048,8.136c0,-1.336 1.172,-2.508 2.508,-2.508c0.282,0 0.572,0.055 0.864,0.163c0.186,0.069 0.347,0.148 0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046,-1.116l0.374,-0.374c0.171,0.154 0.25,0.315 0.319,0.501c0.108,0.292 0.163,0.583 0.163,0.864c0,0.67 -0.261,1.3 -0.734,1.773c-0.473,0.474 -1.103,0.734 -1.773,0.735c-0.298,0 -0.6,-0.058 -0.898,-0.173l-3.072,3.113C3.346,13.824 3.099,13.946 2.852,13.946zM7.556,6.237c-0.507,0 -0.984,0.198 -1.342,0.556C5.855,7.152 5.657,7.629 5.657,8.136c0,0.153 0.024,0.313 0.076,0.5c0.046,0.168 0.114,0.326 0.2,0.47l0.022,0.037c0,0 -0.139,0.115 -0.168,0.146l-3.249,3.248c-0.26,0.26 -0.227,0.381 0.004,0.612c0.134,0.134 0.219,0.186 0.304,0.186c0.085,0 0.184,-0.058 0.308,-0.182l3.249,-3.249c0.03,-0.03 0.104,-0.12 0.104,-0.12l0.078,-0.026c0.146,0.087 0.304,0.155 0.471,0.2c0.186,0.052 0.344,0.076 0.499,0.076c1.009,0 1.896,-0.887 1.898,-1.898c0,-0.134 -0.018,-0.274 -0.054,-0.43L8.342,8.872C8.284,8.929 8.208,8.961 8.126,8.961c-0.081,0 -0.158,-0.032 -0.215,-0.089L6.82,7.78c-0.119,-0.119 -0.119,-0.313 0,-0.431l1.143,-1.142C7.886,6.235 7.807,6.241 7.729,6.241C7.67,6.241 7.556,6.237 7.556,6.237z"
-        android:fillColor="#FFBC4F" />
-</vector>

omnipod/src/main/res/drawable/ic_refresh_pod_status.xml

@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="492.883"
-    android:viewportWidth="492.883" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00838F" android:pathData="M122.941,374.241c-20.1,-18.1 -34.6,-39.8 -44.1,-63.1c-25.2,-61.8 -13.4,-135.3 35.8,-186l45.4,45.4c2.5,2.5 7,0.7 7.6,-3l24.8,-162.3c0.4,-2.7 -1.9,-5 -4.6,-4.6l-162.4,24.8c-3.7,0.6 -5.5,5.1 -3,7.6l45.5,45.5c-75.1,76.8 -87.9,192 -38.6,282c14.8,27.1 35.3,51.9 61.4,72.7c44.4,35.3 99,52.2 153.2,51.1l10.2,-66.7C207.441,421.641 159.441,407.241 122.941,374.241z"/>
-    <path android:fillColor="#00838F" android:pathData="M424.941,414.341c75.1,-76.8 87.9,-192 38.6,-282c-14.8,-27.1 -35.3,-51.9 -61.4,-72.7c-44.4,-35.3 -99,-52.2 -153.2,-51.1l-10.2,66.7c46.6,-4 94.7,10.4 131.2,43.4c20.1,18.1 34.6,39.8 44.1,63.1c25.2,61.8 13.4,135.3 -35.8,186l-45.4,-45.4c-2.5,-2.5 -7,-0.7 -7.6,3l-24.8,162.3c-0.4,2.7 1.9,5 4.6,4.6l162.4,-24.8c3.7,-0.6 5.4,-5.1 3,-7.6L424.941,414.341z"/>
-</vector>

omnipod/src/main/res/drawable/ic_resume_delivery.xml

@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="330"
-    android:viewportWidth="330" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#169100" android:pathData="M236.95,152.281l-108,-67.501c-4.624,-2.89 -10.453,-3.044 -15.222,-0.4C108.959,87.024 106,92.047 106,97.5v135c0,5.453 2.959,10.476 7.728,13.12c2.266,1.256 4.77,1.88 7.271,1.88c2.763,0 5.523,-0.763 7.95,-2.28l108,-67.499c4.386,-2.741 7.05,-7.548 7.05,-12.72C244,159.829 241.336,155.022 236.95,152.281z"/>
-    <path android:fillColor="#169100" android:pathData="M165,0C74.019,0 0,74.019 0,165s74.019,165 165,165s165,-74.019 165,-165S255.981,0 165,0zM165,300c-74.44,0 -135,-60.561 -135,-135S90.56,30 165,30s135,60.561 135,135S239.439,300 165,300z"/>
-</vector>

omnipod/src/main/res/drawable/ic_rl_stats.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M5.719,19.125L5.719,11.828"
-      android:strokeWidth="2.2677"
-      android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M9.792,19.125L9.792,8.01"
-      android:strokeWidth="2.2677"
-      android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M13.865,19.125L13.865,9.51"
-      android:strokeWidth="2.2677"
-      android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M17.938,19.125L17.938,4.594"
-      android:strokeWidth="2.2677"
-      android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
-      android:strokeLineCap="round"/>
-</vector>

omnipod/src/main/res/drawable/ic_set_time.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#007BB3"
-        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
-</vector>

omnipod/src/main/res/drawable/ic_suspend_delivery.xml

@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="30.05"
-    android:viewportWidth="30.05" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#BA4242" android:pathData="M18.993,10.688h-7.936c-0.19,0 -0.346,0.149 -0.346,0.342v8.022c0,0.189 0.155,0.344 0.346,0.344h7.936c0.19,0 0.344,-0.154 0.344,-0.344V11.03C19.336,10.838 19.183,10.688 18.993,10.688z"/>
-    <path android:fillColor="#BA4242" android:pathData="M15.026,0C6.729,0 0.001,6.726 0.001,15.025S6.729,30.05 15.026,30.05c8.298,0 15.023,-6.726 15.023,-15.025S23.324,0 15.026,0zM15.026,27.54c-6.912,0 -12.516,-5.604 -12.516,-12.515c0,-6.914 5.604,-12.517 12.516,-12.517c6.913,0 12.514,5.603 12.514,12.517C27.54,21.936 21.939,27.54 15.026,27.54z"/>
-</vector>

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" />
 
@@ -747,9 +778,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_refresh_pod_status"
+                    android:drawableTop="@drawable/ic_omnipod_overview_refresh_pod_status"
-                    android:paddingLeft="0dp"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_refresh" />
 
                 <Button
@@ -758,9 +788,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_pod_management"
+                    android:drawableTop="@drawable/ic_omnipod_overview_pod_management"
-                    android:paddingLeft="0dp"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_pod_management" />
 
                 <Button
@@ -769,9 +798,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_acknowledge_alerts"
+                    android:drawableTop="@drawable/ic_omnipod_overview_acknowledge_alerts"
-                    android:paddingLeft="0dp"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_acknowledge_active_alerts" />
 
                 <Button
@@ -780,9 +808,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_set_time"
+                    android:drawableTop="@drawable/ic_omnipod_overview_set_time"
-                    android:paddingLeft="0dp"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_set_time"
                     android:visibility="gone" />
 
@@ -792,9 +819,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_resume_delivery"
+                    android:drawableTop="@drawable/ic_omnipod_overview_resume_delivery"
-                    android:paddingLeft="0dp"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_resume_delivery"
                     android:visibility="gone" />
 
@@ -804,9 +830,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_suspend_delivery"
+                    android:drawableTop="@drawable/ic_omnipod_overview_suspend_delivery"
-                    android:paddingLeft="0dp"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
-                    android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_suspend_delivery"
                     android:visibility="gone" />
 

omnipod/src/main/res/layout/omnipod_pod_management.xml

@@ -1,21 +1,13 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:id="@+id/omnipod_pod_management"
-    android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.pump.omnipod.ui.PodManagementActivity">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <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,100 +45,150 @@
             android:textSize="8pt" />
     </LinearLayout>
 
+    <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" />
+
+    <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">
+
         <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/omnipod_pod_management_button_activate_pod"
             style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
+            android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
-                android:layout_marginLeft="40dp"
+            android:layout_marginEnd="4dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
             android:layout_weight="0.5"
-                android:drawableTop="@drawable/ic_activate_pod"
+            android:drawableTop="@drawable/ic_pod_management_activate_pod"
             android:text="@string/omnipod_pod_management_button_activate_pod"
             android:textAllCaps="false" />
 
+
         <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_width="match_parent"
-                android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
-                android:layout_marginLeft="40dp"
+            android:layout_marginEnd="4dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
             android:layout_weight="0.5"
-                android:drawableTop="@drawable/ic_deactivate_pod"
+            android:drawableTop="@drawable/ic_pod_management_deactivate_pod"
             android:text="@string/omnipod_pod_management_button_deactivate_pod"
             android:textAllCaps="false" />
+    </LinearLayout>
+
+    <LinearLayout
+
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp">
+
+        <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/ic_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_discard_pod"
             style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
+            android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
-                android:layout_marginLeft="40dp"
+            android:layout_marginEnd="4dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
             android:layout_weight="0.5"
-                android:drawableTop="@drawable/ic_discard_pod"
+            android:drawableTop="@drawable/ic_pod_management_discard_pod"
             android:text="@string/omnipod_pod_management_button_discard_pod"
-                android:textAllCaps="false" />
-
-            <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/ic_play_test_beep"
-                android:text="@string/omnipod_pod_management_button_play_test_beep"
-                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/ic_pulse_log"
-                android:text="@string/omnipod_pod_management_button_read_pulse_log"
             android:textAllCaps="false"
-                android:visibility="gone" />
+            android:visibility="gone"/>
+
+    </LinearLayout>
+
+    <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
+        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="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
+            android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
-                android:layout_marginLeft="40dp"
+            android:layout_marginEnd="4dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
             android:layout_weight="0.5"
-                android:drawableTop="@drawable/ic_pod_history"
+            android:drawableTop="@drawable/ic_pod_management_pod_history"
             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_rileylink_stats"
             style="?android:attr/buttonStyle"
-                android:layout_width="fill_parent"
+            android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
-                android:layout_marginLeft="40dp"
+            android:layout_marginEnd="4dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="40dp"
             android:layout_weight="0.5"
-                android:drawableTop="@drawable/ic_rl_stats"
+            android:drawableTop="@drawable/ic_pod_management_rl_stats"
             android:text="@string/omnipod_pod_management_button_riley_link_stats"
+            android:textAllCaps="false"
+            android:visibility="gone"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp">
+
+        <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/ic_pod_management_pulse_log"
+            android:text="@string/omnipod_pod_management_button_read_pulse_log"
+            android:textAllCaps="false"
+            android:visibility="gone" />
+
+        <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/ic_pod_activity_reset_rileylink_config"
+            android:text="@string/omnipod_pod_management_button_reset_riley_link_config"
             android:textAllCaps="false" />
 
     </LinearLayout>
 
-    </ScrollView>
+</LinearLayout>
-
-</FrameLayout>

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/ic_success"
+        app:srcCompat="@drawable/ic_omnipod_wizard_success"
         android:visibility="gone" />
 
     <TextView

omnipod/src/main/res/layout/omnipod_wizard_progress_indication.xml

@@ -11,6 +11,6 @@
         android:layout_height="wrap_content"
         android:indeterminate="false"
         android:progress="0"
-        android:progressTint="@color/omnipodWizardProgressBar"
+        android:progressTint="@color/omnipod_wizard_progress_bar"
         android:scaleY=".5" />
 </LinearLayout>

omnipod/src/main/res/values/colors.xml

@@ -1,5 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="omnipodWizardProgressBar">#0099CC</color>
+    <!-- Omnipod Wizard -->
-    <color name="review_green">#ff669900</color>
+    <color name="omnipod_wizard_progress_bar">#0099CC</color>
+    <color name="omnipod_wizard_finish_button">#ff669900</color>
+    <color name="icon_omnipod_wizard_success">#77DD77</color>
+
+    <!-- Button icons - general -->
+    <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="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="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="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>

omnipod/src/main/res/values/dimens.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="omnipod_wizard_vertical_spacing">10dp</dimen>
+    <dimen name="omnipod_icon_button_drawable_padding">4dp</dimen>
 </resources>

omnipod/src/main/res/values/strings.xml

@@ -172,17 +172,21 @@
     <string name="omnipod_cmd_read_pulse_log">Read pulse log</string>
     <string name="omnipod_cmd_set_fake_suspended_tbr">Set fake temporary basal because the Pod is suspended</string>
     <string name="omnipod_cmd_cancel_fake_suspended_tbr">Cancel fake temporary basal that was created because the Pod was suspended</string>
+    <string name="omnipod_cmd_split_tbr">Split temporary basal because of uncertain failure in cancellation</string>
     <string name="omnipod_cmd_beep_config">Beep config</string>
     <string name="omnipod_cmd_play_test_beep">Play test beep</string>
 
     <!-- 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>
     <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">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>
@@ -251,7 +255,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>

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);