From ad1f450820b39f52a437b89a091b1b8baf9d4d2c Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Fri, 19 Feb 2021 00:26:05 +0100
Subject: [PATCH] Move a bunch of resources from omnipod-eros to omnipod-common

---
 ...ic_omnipod_overview_acknowledge_alerts.xml |  0
 .../ic_omnipod_overview_pod_management.xml    |  0
 ...ic_omnipod_overview_refresh_pod_status.xml |  0
 .../ic_omnipod_overview_resume_delivery.xml   |  0
 .../drawable/ic_omnipod_overview_set_time.xml |  0
 .../ic_omnipod_overview_suspend_delivery.xml  |  0
 .../drawable/ic_omnipod_wizard_success.xml    |  0
 .../src/main/res/drawable/ic_pod.xml          |  0
 .../src/main/res/drawable/ic_pod_128.xml      |  0
 .../ic_pod_management_activate_pod.xml        |  0
 .../ic_pod_management_deactivate_pod.xml      |  0
 .../ic_pod_management_discard_pod.xml         |  0
 .../ic_pod_management_play_test_beep.xml      |  0
 .../ic_pod_management_pod_history.xml         |  0
 .../drawable/ic_pod_management_pulse_log.xml  |  0
 ...omnipod_pod_activation_wizard_activity.xml |  0
 ...nipod_pod_deactivation_wizard_activity.xml |  0
 .../omnipod_wizard_action_page_fragment.xml   |  6 +--
 .../layout/omnipod_wizard_base_fragment.xml   |  0
 .../omnipod_wizard_info_page_fragment.xml     |  0
 .../res/layout/omnipod_wizard_nav_buttons.xml |  4 +-
 .../omnipod_wizard_progress_indication.xml    |  0
 ...pod_activation_wizard_navigation_graph.xml |  0
 ...d_deactivation_wizard_navigation_graph.xml |  0
 omnipod-common/src/main/res/values/colors.xml | 39 +++++++++++++++++++
 .../src/main/res/values/dimens.xml            |  0
 .../src/main/res/values/strings.xml           | 12 ++++++
 .../src/main/res/values/styles.xml            |  0
 .../activity/OmnipodWizardActivityBase.kt     |  4 +-
 .../common/fragment/WizardFragmentBase.kt     |  2 +-
 .../src/main/res/values-bg-rBG/strings.xml    | 16 ++++----
 .../src/main/res/values-cs-rCZ/strings.xml    | 16 ++++----
 .../src/main/res/values-de-rDE/strings.xml    | 16 ++++----
 .../src/main/res/values-es-rES/strings.xml    | 16 ++++----
 .../src/main/res/values-fr-rFR/strings.xml    | 16 ++++----
 .../src/main/res/values-ga-rIE/strings.xml    |  4 +-
 .../src/main/res/values-it-rIT/strings.xml    | 16 ++++----
 .../src/main/res/values-iw-rIL/strings.xml    | 16 ++++----
 .../src/main/res/values-lt-rLT/strings.xml    | 16 ++++----
 .../src/main/res/values-nl-rNL/strings.xml    | 16 ++++----
 .../src/main/res/values-no-rNO/strings.xml    | 16 ++++----
 .../src/main/res/values-pl-rPL/strings.xml    | 16 ++++----
 .../src/main/res/values-pt-rPT/strings.xml    | 16 ++++----
 .../src/main/res/values-ro-rRO/strings.xml    | 16 ++++----
 .../src/main/res/values-ru-rRU/strings.xml    | 16 ++++----
 .../src/main/res/values-sk-rSK/strings.xml    | 16 ++++----
 .../src/main/res/values-sv-rSE/strings.xml    | 16 ++++----
 omnipod-eros/src/main/res/values/colors.xml   | 34 ----------------
 omnipod-eros/src/main/res/values/strings.xml  | 10 -----
 49 files changed, 189 insertions(+), 182 deletions(-)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_omnipod_overview_pod_management.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_omnipod_overview_set_time.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_omnipod_wizard_success.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_pod.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_pod_128.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_pod_management_activate_pod.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_pod_management_deactivate_pod.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_pod_management_discard_pod.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_pod_management_play_test_beep.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_pod_management_pod_history.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/drawable/ic_pod_management_pulse_log.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/layout/omnipod_wizard_action_page_fragment.xml (93%)
 rename {omnipod-eros => omnipod-common}/src/main/res/layout/omnipod_wizard_base_fragment.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/layout/omnipod_wizard_info_page_fragment.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/layout/omnipod_wizard_nav_buttons.xml (80%)
 rename {omnipod-eros => omnipod-common}/src/main/res/layout/omnipod_wizard_progress_indication.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml (100%)
 rename {omnipod-eros => omnipod-common}/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml (100%)
 create mode 100644 omnipod-common/src/main/res/values/colors.xml
 rename {omnipod-eros => omnipod-common}/src/main/res/values/dimens.xml (100%)
 create mode 100644 omnipod-common/src/main/res/values/strings.xml
 rename {omnipod-eros => omnipod-common}/src/main/res/values/styles.xml (100%)

diff --git a/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml b/omnipod-common/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml
rename to omnipod-common/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_pod_management.xml b/omnipod-common/src/main/res/drawable/ic_omnipod_overview_pod_management.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_omnipod_overview_pod_management.xml
rename to omnipod-common/src/main/res/drawable/ic_omnipod_overview_pod_management.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml b/omnipod-common/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml
rename to omnipod-common/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml b/omnipod-common/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml
rename to omnipod-common/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_set_time.xml b/omnipod-common/src/main/res/drawable/ic_omnipod_overview_set_time.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_omnipod_overview_set_time.xml
rename to omnipod-common/src/main/res/drawable/ic_omnipod_overview_set_time.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml b/omnipod-common/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml
rename to omnipod-common/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_omnipod_wizard_success.xml b/omnipod-common/src/main/res/drawable/ic_omnipod_wizard_success.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_omnipod_wizard_success.xml
rename to omnipod-common/src/main/res/drawable/ic_omnipod_wizard_success.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_pod.xml b/omnipod-common/src/main/res/drawable/ic_pod.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_pod.xml
rename to omnipod-common/src/main/res/drawable/ic_pod.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_pod_128.xml b/omnipod-common/src/main/res/drawable/ic_pod_128.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_pod_128.xml
rename to omnipod-common/src/main/res/drawable/ic_pod_128.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_pod_management_activate_pod.xml b/omnipod-common/src/main/res/drawable/ic_pod_management_activate_pod.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_pod_management_activate_pod.xml
rename to omnipod-common/src/main/res/drawable/ic_pod_management_activate_pod.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_pod_management_deactivate_pod.xml b/omnipod-common/src/main/res/drawable/ic_pod_management_deactivate_pod.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_pod_management_deactivate_pod.xml
rename to omnipod-common/src/main/res/drawable/ic_pod_management_deactivate_pod.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_pod_management_discard_pod.xml b/omnipod-common/src/main/res/drawable/ic_pod_management_discard_pod.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_pod_management_discard_pod.xml
rename to omnipod-common/src/main/res/drawable/ic_pod_management_discard_pod.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_pod_management_play_test_beep.xml b/omnipod-common/src/main/res/drawable/ic_pod_management_play_test_beep.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_pod_management_play_test_beep.xml
rename to omnipod-common/src/main/res/drawable/ic_pod_management_play_test_beep.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_pod_management_pod_history.xml b/omnipod-common/src/main/res/drawable/ic_pod_management_pod_history.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_pod_management_pod_history.xml
rename to omnipod-common/src/main/res/drawable/ic_pod_management_pod_history.xml
diff --git a/omnipod-eros/src/main/res/drawable/ic_pod_management_pulse_log.xml b/omnipod-common/src/main/res/drawable/ic_pod_management_pulse_log.xml
similarity index 100%
rename from omnipod-eros/src/main/res/drawable/ic_pod_management_pulse_log.xml
rename to omnipod-common/src/main/res/drawable/ic_pod_management_pulse_log.xml
diff --git a/omnipod-eros/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml b/omnipod-common/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml
similarity index 100%
rename from omnipod-eros/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml
rename to omnipod-common/src/main/res/layout/omnipod_pod_activation_wizard_activity.xml
diff --git a/omnipod-eros/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml b/omnipod-common/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml
similarity index 100%
rename from omnipod-eros/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml
rename to omnipod-common/src/main/res/layout/omnipod_pod_deactivation_wizard_activity.xml
diff --git a/omnipod-eros/src/main/res/layout/omnipod_wizard_action_page_fragment.xml b/omnipod-common/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
similarity index 93%
rename from omnipod-eros/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
rename to omnipod-common/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
index 54061c7d07..4d0ef0a2ed 100644
--- a/omnipod-eros/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
+++ b/omnipod-common/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
@@ -56,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:text="@string/omnipod_wizard_button_deactivate_pod"
+            android:text="@string/omnipod_common_wizard_button_deactivate_pod"
             android:visibility="gone" />
 
         <Button
@@ -64,7 +64,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:text="@string/omnipod_wizard_button_discard_pod"
+            android:text="@string/omnipod_common_wizard_button_discard_pod"
             android:visibility="gone" />
 
         <Button
@@ -72,7 +72,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:text="@string/omnipod_wizard_button_retry"
+            android:text="@string/omnipod_common_wizard_button_retry"
             android:visibility="gone" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/omnipod-eros/src/main/res/layout/omnipod_wizard_base_fragment.xml b/omnipod-common/src/main/res/layout/omnipod_wizard_base_fragment.xml
similarity index 100%
rename from omnipod-eros/src/main/res/layout/omnipod_wizard_base_fragment.xml
rename to omnipod-common/src/main/res/layout/omnipod_wizard_base_fragment.xml
diff --git a/omnipod-eros/src/main/res/layout/omnipod_wizard_info_page_fragment.xml b/omnipod-common/src/main/res/layout/omnipod_wizard_info_page_fragment.xml
similarity index 100%
rename from omnipod-eros/src/main/res/layout/omnipod_wizard_info_page_fragment.xml
rename to omnipod-common/src/main/res/layout/omnipod_wizard_info_page_fragment.xml
diff --git a/omnipod-eros/src/main/res/layout/omnipod_wizard_nav_buttons.xml b/omnipod-common/src/main/res/layout/omnipod_wizard_nav_buttons.xml
similarity index 80%
rename from omnipod-eros/src/main/res/layout/omnipod_wizard_nav_buttons.xml
rename to omnipod-common/src/main/res/layout/omnipod_wizard_nav_buttons.xml
index 2619538417..90b932e53d 100644
--- a/omnipod-eros/src/main/res/layout/omnipod_wizard_nav_buttons.xml
+++ b/omnipod-common/src/main/res/layout/omnipod_wizard_nav_buttons.xml
@@ -9,12 +9,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:text="@string/omnipod_wizard_button_cancel" />
+        android:text="@string/omnipod_common_wizard_button_cancel" />
 
     <Button
         android:id="@+id/button_next"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:text="@string/omnipod_wizard_button_next" />
+        android:text="@string/omnipod_common_wizard_button_next" />
 </LinearLayout>
\ No newline at end of file
diff --git a/omnipod-eros/src/main/res/layout/omnipod_wizard_progress_indication.xml b/omnipod-common/src/main/res/layout/omnipod_wizard_progress_indication.xml
similarity index 100%
rename from omnipod-eros/src/main/res/layout/omnipod_wizard_progress_indication.xml
rename to omnipod-common/src/main/res/layout/omnipod_wizard_progress_indication.xml
diff --git a/omnipod-eros/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml b/omnipod-common/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml
similarity index 100%
rename from omnipod-eros/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml
rename to omnipod-common/src/main/res/navigation/omnipod_pod_activation_wizard_navigation_graph.xml
diff --git a/omnipod-eros/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml b/omnipod-common/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml
similarity index 100%
rename from omnipod-eros/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml
rename to omnipod-common/src/main/res/navigation/omnipod_pod_deactivation_wizard_navigation_graph.xml
diff --git a/omnipod-common/src/main/res/values/colors.xml b/omnipod-common/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..906786a2c3
--- /dev/null
+++ b/omnipod-common/src/main/res/values/colors.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Button icons - general -->
+    <color name="pod_icon_outline">#9E9E9E</color>
+
+    <!-- Omnipod Wizard -->
+    <color name="omnipod_wizard_progress_bar">#0099CC</color>
+    <color name="omnipod_wizard_finish_button">#ff669900</color>
+    <color name="icon_omnipod_wizard_success">#77DD77</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>
+</resources>
\ No newline at end of file
diff --git a/omnipod-eros/src/main/res/values/dimens.xml b/omnipod-common/src/main/res/values/dimens.xml
similarity index 100%
rename from omnipod-eros/src/main/res/values/dimens.xml
rename to omnipod-common/src/main/res/values/dimens.xml
diff --git a/omnipod-common/src/main/res/values/strings.xml b/omnipod-common/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..3d779856b0
--- /dev/null
+++ b/omnipod-common/src/main/res/values/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_common_wizard_button_cancel">Cancel</string>
+    <string name="omnipod_common_wizard_button_finish">Finish</string>
+    <string name="omnipod_common_wizard_button_next">Next</string>
+    <string name="omnipod_common_wizard_button_retry">Retry</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Deactivate Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Discard Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">You haven\'t completed all steps yet. Are you sure you want to exit?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Exit</string>
+</resources>
\ No newline at end of file
diff --git a/omnipod-eros/src/main/res/values/styles.xml b/omnipod-common/src/main/res/values/styles.xml
similarity index 100%
rename from omnipod-eros/src/main/res/values/styles.xml
rename to omnipod-common/src/main/res/values/styles.xml
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/activity/OmnipodWizardActivityBase.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/activity/OmnipodWizardActivityBase.kt
index 31ecd34464..ec00555995 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/activity/OmnipodWizardActivityBase.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/activity/OmnipodWizardActivityBase.kt
@@ -18,8 +18,8 @@ abstract class OmnipodWizardActivityBase : NoSplashAppCompatActivity() {
         } else {
             AlertDialog.Builder(this)
                 .setIcon(android.R.drawable.ic_dialog_alert)
-                .setTitle(getString(R.string.omnipod_wizard_exit_confirmation_title))
-                .setMessage(getString(R.string.omnipod_wizard_exit_confirmation_text))
+                .setTitle(getString(R.string.omnipod_common_wizard_exit_confirmation_title))
+                .setMessage(getString(R.string.omnipod_common_wizard_exit_confirmation_text))
                 .setPositiveButton(getString(R.string.omnipod_yes)) { _, _ -> finish() }
                 .setNegativeButton(getString(R.string.omnipod_no), null)
                 .show()
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/WizardFragmentBase.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/WizardFragmentBase.kt
index 50b3519179..f687bb9b04 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/WizardFragmentBase.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/common/fragment/WizardFragmentBase.kt
@@ -41,7 +41,7 @@ abstract class WizardFragmentBase : DaggerFragment() {
         val nextPage = getNextPageActionId()
 
         if (nextPage == null) {
-            binding.navButtonsLayout.buttonNext.text = getString(R.string.omnipod_wizard_button_finish)
+            binding.navButtonsLayout.buttonNext.text = getString(R.string.omnipod_common_wizard_button_finish)
             binding.navButtonsLayout.buttonNext.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.omnipod_wizard_finish_button, context?.theme))
         }
 
diff --git a/omnipod-eros/src/main/res/values-bg-rBG/strings.xml b/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
index 002602b94d..1c0eb528a6 100644
--- a/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Възпроизвеждане на тестов звук</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Пускам тестов звук…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Откажи</string>
-    <string name="omnipod_wizard_button_finish">Край</string>
-    <string name="omnipod_wizard_button_next">Следващ</string>
-    <string name="omnipod_wizard_button_retry">Повтори</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Деактивирай Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Премахни Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Все още не сте изпълнили всички стъпки. Сигурни ли сте, че искате да излезете?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Изход</string>
+    <string name="omnipod_common_wizard_button_cancel">Откажи</string>
+    <string name="omnipod_common_wizard_button_finish">Край</string>
+    <string name="omnipod_common_wizard_button_next">Следващ</string>
+    <string name="omnipod_common_wizard_button_retry">Повтори</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Деактивирай Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Премахни Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Все още не сте изпълнили всички стъпки. Сигурни ли сте, че искате да излезете?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Изход</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Напълнете Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">\nНапълнете с достатъчно инсулин за 3 дни.\n\nИзчакайте два сигнала от Pod по време на процеса на зареждане. Те показват, че е вмъкнат минималният размер от 85U. Уверете се, че сте изпразнил напълно спринцовката, дори след като сте чули двата сигнала.\n\nСлед пълнене на Pod, моля натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> не вадете капачката на капсулата на Podв този момент.</string>
diff --git a/omnipod-eros/src/main/res/values-cs-rCZ/strings.xml b/omnipod-eros/src/main/res/values-cs-rCZ/strings.xml
index cf2336f274..f27f28a94d 100644
--- a/omnipod-eros/src/main/res/values-cs-rCZ/strings.xml
+++ b/omnipod-eros/src/main/res/values-cs-rCZ/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Přehrát testovací pípnutí</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Přehrávání testovacího pípnutí…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Zrušit</string>
-    <string name="omnipod_wizard_button_finish">Konec</string>
-    <string name="omnipod_wizard_button_next">Další</string>
-    <string name="omnipod_wizard_button_retry">Opakovat</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Deaktivovat Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Vyřadit Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Dosud jste nedokončili všechny kroky. Jste si jisti, že chcete ukončit práci?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Konec</string>
+    <string name="omnipod_common_wizard_button_cancel">Zrušit</string>
+    <string name="omnipod_common_wizard_button_finish">Konec</string>
+    <string name="omnipod_common_wizard_button_next">Další</string>
+    <string name="omnipod_common_wizard_button_retry">Opakovat</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Deaktivovat Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Vyřadit Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Dosud jste nedokončili všechny kroky. Jste si jisti, že chcete ukončit práci?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Konec</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Naplnit Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Naplňte nový Pod dostatkem inzulínu na 3 dny.\n\nSledujte dvě pípnutí z Podu během procesu plnění. Tyto ukazují, že minimální množství 85U bylo naplněno. Ujistěte se, že stříkačka je zcela vyprázdněná a to i po vyslechnutí dvou pípnutí.\n\nPo naplnění Podu, prosím, stiskněte <b>Další</b>.\n\n<b>Poznámka:</b> prozatím nesundavejte kryt jehly.\n<b>Poznámka:</b>prosím umístěte RileyLink ve svislé pozici blízko Podu.</string>
diff --git a/omnipod-eros/src/main/res/values-de-rDE/strings.xml b/omnipod-eros/src/main/res/values-de-rDE/strings.xml
index 4d0be853d4..7908f55798 100644
--- a/omnipod-eros/src/main/res/values-de-rDE/strings.xml
+++ b/omnipod-eros/src/main/res/values-de-rDE/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Testton abspielen</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Spiele Testton ab....</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Abbrechen</string>
-    <string name="omnipod_wizard_button_finish">Beenden</string>
-    <string name="omnipod_wizard_button_next">Weiter</string>
-    <string name="omnipod_wizard_button_retry">Erneut versuchen</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Pod deaktivieren</string>
-    <string name="omnipod_wizard_button_discard_pod">Pod verwerfen</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Du hast noch nicht alle Schritte abgeschlossen. Willst Du wirklich beenden?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Beenden</string>
+    <string name="omnipod_common_wizard_button_cancel">Abbrechen</string>
+    <string name="omnipod_common_wizard_button_finish">Beenden</string>
+    <string name="omnipod_common_wizard_button_next">Weiter</string>
+    <string name="omnipod_common_wizard_button_retry">Erneut versuchen</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Pod deaktivieren</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Pod verwerfen</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Du hast noch nicht alle Schritte abgeschlossen. Willst Du wirklich beenden?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Beenden</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Pod füllen</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Befülle den neuen Pod mit ausreichend Insulin für 3 Tage.\n\nAchte auch zwei Pieptöne vom Pod während des Füllens. Diese zeigen an, dass der Pod mit der Mindestmenge von 85 IE befüllt wurde. Leere die Spritze komplett, auch wenn Du die beiden Pieptöne gehört hast.\n\nKlicke <b>Weiter</b> nachdem Du den Pod befüllt hast.\n\n<b>Hinweis:</b> Entferne den Nadelschutz des Pods noch nicht.\n<b>Hinweis:</b> Bringe den RileyLink in eine aufrechte Position und platziere den Pod einige Zentimeter entfernt davon.</string>
diff --git a/omnipod-eros/src/main/res/values-es-rES/strings.xml b/omnipod-eros/src/main/res/values-es-rES/strings.xml
index 9f613f8fa8..094aaba733 100644
--- a/omnipod-eros/src/main/res/values-es-rES/strings.xml
+++ b/omnipod-eros/src/main/res/values-es-rES/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Reproducir pitido de prueba</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Reproduciendo pitido de prueba…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Cancelar</string>
-    <string name="omnipod_wizard_button_finish">Terminar</string>
-    <string name="omnipod_wizard_button_next">Siguiente</string>
-    <string name="omnipod_wizard_button_retry">Reintentar</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Desactivar Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Descartar Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Todavía no has completado todos los pasos. ¿Está seguro de que desea salir?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Salir</string>
+    <string name="omnipod_common_wizard_button_cancel">Cancelar</string>
+    <string name="omnipod_common_wizard_button_finish">Terminar</string>
+    <string name="omnipod_common_wizard_button_next">Siguiente</string>
+    <string name="omnipod_common_wizard_button_retry">Reintentar</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Desactivar Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Descartar Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Todavía no has completado todos los pasos. ¿Está seguro de que desea salir?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Salir</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Llenar Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">\nLlenar el nuevo Pod con suficiente insulina para 3 días.\n\nEscucha dos pitidos del Pod durante el proceso de llenado. Esto indica que se ha insertado la cantidad mínima de 85U. Asegúrese de vaciar completamente la jeringa, incluso después de escuchar los dos pitidos.\n\nDespués de llenar el Pod, por favor pulse <b>siguiente</b>.\n\n<b>Nota:</b> no retire el capuchón de la aguja del Pod en este momento.\n<b>Nota:</b> por favor coloque el RileyLink cerca del Pod y en posición vertical.</string>
diff --git a/omnipod-eros/src/main/res/values-fr-rFR/strings.xml b/omnipod-eros/src/main/res/values-fr-rFR/strings.xml
index 264fbd0a53..5d25741d2e 100644
--- a/omnipod-eros/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod-eros/src/main/res/values-fr-rFR/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Tester bips</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Test des bips…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Annuler</string>
-    <string name="omnipod_wizard_button_finish">Terminer</string>
-    <string name="omnipod_wizard_button_next">Suivant</string>
-    <string name="omnipod_wizard_button_retry">Réessayer</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Désactiver Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Supprimer Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Vous n\'avez pas encore terminé toutes les étapes. Êtes-vous sûr de vouloir quitter ?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Quitter</string>
+    <string name="omnipod_common_wizard_button_cancel">Annuler</string>
+    <string name="omnipod_common_wizard_button_finish">Terminer</string>
+    <string name="omnipod_common_wizard_button_next">Suivant</string>
+    <string name="omnipod_common_wizard_button_retry">Réessayer</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Désactiver Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Supprimer Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Vous n\'avez pas encore terminé toutes les étapes. Êtes-vous sûr de vouloir quitter ?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Quitter</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Remplir Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Remplir le nouveau Pod avec suffisamment d\'insuline pendant 3 jours.\n\nÉcoutez les deux bips du Pod pendant le processus de remplissage. Ils indiquent que la quantité minimale de 85U a été ajouté. Assurez-vous de vider complètement la seringue de remplissage, même après avoir entendu les deux bips.\n\nAprès avoir rempli le Pod, veuillez appuyer sur <b>Suivant</b>.\n\n<b>Remarque :</b> Ne retirez pas la protection de l\'aiguille du Pod pour le moment.\n<b>Remarque :</b>Veuillez placer le RileyLink en position verticale et placez le Pod quelques centimètres à côté.</string>
diff --git a/omnipod-eros/src/main/res/values-ga-rIE/strings.xml b/omnipod-eros/src/main/res/values-ga-rIE/strings.xml
index 0f7e450883..19e1a1adbb 100644
--- a/omnipod-eros/src/main/res/values-ga-rIE/strings.xml
+++ b/omnipod-eros/src/main/res/values-ga-rIE/strings.xml
@@ -22,8 +22,8 @@
     <!-- Omnipod - Pod Management -->
     <string name="omnipod_pod_management_heading_actions">Gníomhartha</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_next">Ar Aghaidh</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Scoir</string>
+    <string name="omnipod_common_wizard_button_next">Ar Aghaidh</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Scoir</string>
     <!-- Omnipod - Pod activation Wizard -->
     <!-- Omnipod - Pod deactivation Wizard -->
     <!-- Omnipod - Overview -->
diff --git a/omnipod-eros/src/main/res/values-it-rIT/strings.xml b/omnipod-eros/src/main/res/values-it-rIT/strings.xml
index b47ea74c5a..29d99bdd98 100644
--- a/omnipod-eros/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod-eros/src/main/res/values-it-rIT/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Esegui BIP di prova</string>
     <string name="omnipod_pod_management_button_playing_test_beep">BIP di prova in esecuzione…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Annulla</string>
-    <string name="omnipod_wizard_button_finish">Fine</string>
-    <string name="omnipod_wizard_button_next">Avanti</string>
-    <string name="omnipod_wizard_button_retry">Riprova</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Disattiva pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Scarta pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Non hai ancora completato tutti i passaggi. Sei sicuro di voler uscire?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Esci</string>
+    <string name="omnipod_common_wizard_button_cancel">Annulla</string>
+    <string name="omnipod_common_wizard_button_finish">Fine</string>
+    <string name="omnipod_common_wizard_button_next">Avanti</string>
+    <string name="omnipod_common_wizard_button_retry">Riprova</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Disattiva pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Scarta pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Non hai ancora completato tutti i passaggi. Sei sicuro di voler uscire?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Esci</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Riempi pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Riempi un nuovo pod con abbastanza insulina per 3 giorni.\n\nResta in ascolto di due bip dal pod durante il processo di riempimento. Questi indicano che è stata inserita la quantità minima di 85U. Assicurati di svuotare completamente la siringa di riempimento, anche dopo aver sentito i due segnali acustici.\n\nDopo il riempimento del pod, premi <b>Avanti</b>.\n\n<b>Nota:</b> non rimuovere la protezione dell\'ago del pod in questo momento.\n<b>Nota:</b> colloca il RileyLink in posizione verticale e il pod a pochi centimetri di distanza.</string>
diff --git a/omnipod-eros/src/main/res/values-iw-rIL/strings.xml b/omnipod-eros/src/main/res/values-iw-rIL/strings.xml
index a82a562ca1..9c72fef157 100644
--- a/omnipod-eros/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod-eros/src/main/res/values-iw-rIL/strings.xml
@@ -165,14 +165,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">השמע צפצוף ניסיון</string>
     <string name="omnipod_pod_management_button_playing_test_beep">משמיע צפצוף ניסיון…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">ביטול</string>
-    <string name="omnipod_wizard_button_finish">סיום</string>
-    <string name="omnipod_wizard_button_next">הבא</string>
-    <string name="omnipod_wizard_button_retry">נסה שנית</string>
-    <string name="omnipod_wizard_button_deactivate_pod">השבת פוד</string>
-    <string name="omnipod_wizard_button_discard_pod">השלכת הפוד</string>
-    <string name="omnipod_wizard_exit_confirmation_text">עוד לא סיימתם את כל הצעדים. אתם בטוחים שברצונכם לצאת?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">יציאה</string>
+    <string name="omnipod_common_wizard_button_cancel">ביטול</string>
+    <string name="omnipod_common_wizard_button_finish">סיום</string>
+    <string name="omnipod_common_wizard_button_next">הבא</string>
+    <string name="omnipod_common_wizard_button_retry">נסה שנית</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">השבת פוד</string>
+    <string name="omnipod_common_wizard_button_discard_pod">השלכת הפוד</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">עוד לא סיימתם את כל הצעדים. אתם בטוחים שברצונכם לצאת?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">יציאה</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">מילוי פוד</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">מלאו פוד חדש עם מספיק אינסולין לשלושה ימים.\n\nהקשיבו לשני צפצופים מהפוד במהלך המילוי. הם מציינים שהכמות המינימלית של 85 יח\' הוכנסה. הקפידו לרוקן לחלוטין את מזרק המילוי, גם לאחר שמיעת שני הצפצופים.\n\nלאחר מילוי הפוד, יש ללחוץ <b>הבא</b>.\n\n<b>הערה:</b> עוד לא להסיר את מכסה המחט.\n<b> הערה:</b> נא למקם את הריילילינק במצב עומד ובמרחק סנטימטרים בודדים מהפוד.</string>
diff --git a/omnipod-eros/src/main/res/values-lt-rLT/strings.xml b/omnipod-eros/src/main/res/values-lt-rLT/strings.xml
index b30900f094..989d69f254 100644
--- a/omnipod-eros/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod-eros/src/main/res/values-lt-rLT/strings.xml
@@ -162,14 +162,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Paleisti bandomąjį signalą</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Bandomasis signalas paleistas…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Atšaukti</string>
-    <string name="omnipod_wizard_button_finish">Užbaigti</string>
-    <string name="omnipod_wizard_button_next">Kitas</string>
-    <string name="omnipod_wizard_button_retry">Bandyti dar kartą</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Išjungti Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Išmesti Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Jūs dar nebaigėte visų veiksmų. Ar tikrai norite išeiti?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Išeiti</string>
+    <string name="omnipod_common_wizard_button_cancel">Atšaukti</string>
+    <string name="omnipod_common_wizard_button_finish">Užbaigti</string>
+    <string name="omnipod_common_wizard_button_next">Kitas</string>
+    <string name="omnipod_common_wizard_button_retry">Bandyti dar kartą</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Išjungti Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Išmesti Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Jūs dar nebaigėte visų veiksmų. Ar tikrai norite išeiti?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Išeiti</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Užpildyti Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Užpildykite naują Pod insulinu, kurio pakaktų 3 dienoms.\n\nTaip pat atkreipkite dėmesį į du pyptelėjimus iš Pod, kai pildote. Tai rodo, kad rezervuaras buvo užpildytas mažiausiai 85vv. Visiškai ištuštinkite švirkštą, net jei girdėjote du pyptelėjimus.\n\nUžpildę Pod, spustelėkite <b>Kitas</b>.\n\n<b>Pastaba:</b> vykdant šiuos veiksmus, nenuimkite Pod adatos apsauginio dangtelio.\n<b>Pastaba:</b> padėkite RileyLink vertikalioje pozicijoje ir Pod kelių colių atstumu vienas nuo kito.</string>
diff --git a/omnipod-eros/src/main/res/values-nl-rNL/strings.xml b/omnipod-eros/src/main/res/values-nl-rNL/strings.xml
index 22c3878f85..f1d7b30c99 100644
--- a/omnipod-eros/src/main/res/values-nl-rNL/strings.xml
+++ b/omnipod-eros/src/main/res/values-nl-rNL/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Testpieptoon afspelen</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Test pieptoon wordt afgespeeld…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Annuleren</string>
-    <string name="omnipod_wizard_button_finish">Voltooien</string>
-    <string name="omnipod_wizard_button_next">Volgende</string>
-    <string name="omnipod_wizard_button_retry">Opnieuw proberen</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Deactiveer Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Pod verwerpen</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Je hebt nog niet alle stappen voltooid. Weet je zeker dat je wilt afsluiten?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Afsluiten</string>
+    <string name="omnipod_common_wizard_button_cancel">Annuleren</string>
+    <string name="omnipod_common_wizard_button_finish">Voltooien</string>
+    <string name="omnipod_common_wizard_button_next">Volgende</string>
+    <string name="omnipod_common_wizard_button_retry">Opnieuw proberen</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Deactiveer Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Pod verwerpen</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Je hebt nog niet alle stappen voltooid. Weet je zeker dat je wilt afsluiten?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Afsluiten</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Pod vullen</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">\nVul de nieuwe Pod met voldoende insuline voor 3 dagen.\n\nLuister of je twee piepjes hoort tijdens het vullen. Deze geven aan dat de minimum hoeveelheid van 85 eenheden is bereikt. Ook als je de twee piepjes hebt gehoord ga je verder met vullen totdat de vulspuit volledig leeg is.\n\nNa het vullen van de Pod druk je op <b>Volgende</b>.\n\n<b>Opmerking:</b> verwijder de beschermkap van de naald nog niet!\n<b>Opmerking:</b> zet de RileyLink rechtop en leg de Pod er ongeveer 10 centimeter vandaan.</string>
diff --git a/omnipod-eros/src/main/res/values-no-rNO/strings.xml b/omnipod-eros/src/main/res/values-no-rNO/strings.xml
index fb819a0c2c..4a61008507 100644
--- a/omnipod-eros/src/main/res/values-no-rNO/strings.xml
+++ b/omnipod-eros/src/main/res/values-no-rNO/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Avspill test pip</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Avspiller test lyd…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Avbryt</string>
-    <string name="omnipod_wizard_button_finish">Fullfør</string>
-    <string name="omnipod_wizard_button_next">Neste</string>
-    <string name="omnipod_wizard_button_retry">Prøv igjen</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Deaktiver Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Forkast Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Du har ikke fullført alle trinn ennå. Er du sikker på at du vil avslutte?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Avslutt</string>
+    <string name="omnipod_common_wizard_button_cancel">Avbryt</string>
+    <string name="omnipod_common_wizard_button_finish">Fullfør</string>
+    <string name="omnipod_common_wizard_button_next">Neste</string>
+    <string name="omnipod_common_wizard_button_retry">Prøv igjen</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Deaktiver Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Forkast Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Du har ikke fullført alle trinn ennå. Er du sikker på at du vil avslutte?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Avslutt</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Fyll Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Fyll en ny Pod med nok insulin for 3 dager.\n\nLytt etter to lydsignaler fra Pod under fyllingen. Disse indikerer at minimums volum på 85E er fylt opp. Vær nøye med å tømme fyllingssprøyten helt, selv etter at du har hørt de to lydsignalene.\n\nEtter fylling av Pod, vennligst trykk <b>Neste</b>.\n\n<b>Merk:</b> vent med å fjern kanylebeskyttelsen til Pod. \n<b>Merk:</b> plasser RileyLink i en stående posisjon og legg Pod kun noen cm unna denne.</string>
diff --git a/omnipod-eros/src/main/res/values-pl-rPL/strings.xml b/omnipod-eros/src/main/res/values-pl-rPL/strings.xml
index 230f248f1b..b66e51e904 100644
--- a/omnipod-eros/src/main/res/values-pl-rPL/strings.xml
+++ b/omnipod-eros/src/main/res/values-pl-rPL/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Odtwarzaj test dźwięku</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Odtwarzam test dźwięku…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Anuluj</string>
-    <string name="omnipod_wizard_button_finish">Zakończ</string>
-    <string name="omnipod_wizard_button_next">Dalej</string>
-    <string name="omnipod_wizard_button_retry">Ponów</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Odłącz Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Odwołaj Poda</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Nie ukończyłeś jeszcze wszystkich kroków. Czy na pewno chcesz zakończyć?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Wyjście</string>
+    <string name="omnipod_common_wizard_button_cancel">Anuluj</string>
+    <string name="omnipod_common_wizard_button_finish">Zakończ</string>
+    <string name="omnipod_common_wizard_button_next">Dalej</string>
+    <string name="omnipod_common_wizard_button_retry">Ponów</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Odłącz Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Odwołaj Poda</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Nie ukończyłeś jeszcze wszystkich kroków. Czy na pewno chcesz zakończyć?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Wyjście</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Wypełnij Poda</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Napełnij nowy Pat odpowiednią ilością insuliny przez 3 dni.\n\nNasłuchuj na dwa sygnały dźwiękowe od Poda podczas procesu napełniania. Wskazują one, że minimalna kwota 85U została wstawiona. Należy upewnić się, że ampułkostrzykawka jest całkowicie pusta, nawet po odsłuchu dwóch sygnałów dźwiękowych.\n\nPo napełnieniu Poda, należy nacisnąć <b>Następna</b>.\n\n<b>Uwaga:</b> nie zdejmij w tym czasie osłonki igły.\n<b>Uwaga:</b> należy umieścić RileyLink w pozycji pionowej i umieścić Pod kilka centymetrów od niego.</string>
diff --git a/omnipod-eros/src/main/res/values-pt-rPT/strings.xml b/omnipod-eros/src/main/res/values-pt-rPT/strings.xml
index fe7b6df437..ef22f92c99 100644
--- a/omnipod-eros/src/main/res/values-pt-rPT/strings.xml
+++ b/omnipod-eros/src/main/res/values-pt-rPT/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Reproduzir Teste do Beep</string>
     <string name="omnipod_pod_management_button_playing_test_beep">A reproduzir Beep de Teste…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Cancelar</string>
-    <string name="omnipod_wizard_button_finish">Terminar</string>
-    <string name="omnipod_wizard_button_next">Seguinte</string>
-    <string name="omnipod_wizard_button_retry">Tentar Novamente</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Desactivar Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Descartar Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Ainda não completou todas as etapas. Tem certeza que quer sair?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Sair</string>
+    <string name="omnipod_common_wizard_button_cancel">Cancelar</string>
+    <string name="omnipod_common_wizard_button_finish">Terminar</string>
+    <string name="omnipod_common_wizard_button_next">Seguinte</string>
+    <string name="omnipod_common_wizard_button_retry">Tentar Novamente</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Desactivar Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Descartar Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Ainda não completou todas as etapas. Tem certeza que quer sair?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Sair</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Preencher Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Preencha um novo Pod com insulina suficiente para 3 dias.\n\nEscute dois beeps do Pod durante o processo de enchimento. Estes indiquem que a quantidade mínima de 85U foi inserida. Certifique-se de esvaziar completamente a seringa de preenchimento, mesmo depois de ouvir os dois beeps.\n\nDepois de preencher o Pod, por favor, pressione <b>Seguinte</b>\n\n<b>Nota:</b> não remove a tampa da agulha do Pod neste momento.\n<b>Nota:</b> por favor, coloque o RileyLink em posição vertical e coloque o Pod a alguns centímetros dele.</string>
diff --git a/omnipod-eros/src/main/res/values-ro-rRO/strings.xml b/omnipod-eros/src/main/res/values-ro-rRO/strings.xml
index b1a0b4566c..b37c058c2a 100644
--- a/omnipod-eros/src/main/res/values-ro-rRO/strings.xml
+++ b/omnipod-eros/src/main/res/values-ro-rRO/strings.xml
@@ -162,14 +162,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Redă beep-uri de test</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Se redă beep-ul de test…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Anulează</string>
-    <string name="omnipod_wizard_button_finish">Finalizare</string>
-    <string name="omnipod_wizard_button_next">Următor</string>
-    <string name="omnipod_wizard_button_retry">Încearcă din nou</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Dezactivează Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Renunţă la Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Nu aţi finalizat încă toţi paşii. Sunteţi sigur că doriţi să ieşiţi?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Ieșire</string>
+    <string name="omnipod_common_wizard_button_cancel">Anulează</string>
+    <string name="omnipod_common_wizard_button_finish">Finalizare</string>
+    <string name="omnipod_common_wizard_button_next">Următor</string>
+    <string name="omnipod_common_wizard_button_retry">Încearcă din nou</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Dezactivează Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Renunţă la Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Nu aţi finalizat încă toţi paşii. Sunteţi sigur că doriţi să ieşiţi?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Ieșire</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Umplere Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">\nUmpleți noul Pod cu suficientă insulină pentru 3 zile.\n\nAr trebui sa auziți două beep-uri de la Pod în timpul procesului de umplere. Acestea indică faptul că, cantitatea minimă de 85U a fost introdusă. Asigurați-vă ca ați golit complet seringa de umplere, chiar și după ce ați auzit două beep-uri.\n\nDupă umplerea Pod-ului, vă rugăm să apăsați <b>Următorul</b>.\n\n<b>Notă:</b> Nu scoateți capacul transparent al acului in acest moment.\n<b>Nota:</b>va rugam sa puneți RileyLink in poziție verticala si sa plasați Pod-ul la o distantă de câțiva centimetri de acesta.</string>
diff --git a/omnipod-eros/src/main/res/values-ru-rRU/strings.xml b/omnipod-eros/src/main/res/values-ru-rRU/strings.xml
index 84941b6766..fb1699d809 100644
--- a/omnipod-eros/src/main/res/values-ru-rRU/strings.xml
+++ b/omnipod-eros/src/main/res/values-ru-rRU/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Воспроизвести тестовый звуковой сигнал</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Воспроизведение тестового звукового сигнала…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Отменить</string>
-    <string name="omnipod_wizard_button_finish">Завершить</string>
-    <string name="omnipod_wizard_button_next">Далее</string>
-    <string name="omnipod_wizard_button_retry">Повторить</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Деактивировать Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Утилизировать Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Вы еще не выполнили все шаги. Действительно хотите выйти?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Выход</string>
+    <string name="omnipod_common_wizard_button_cancel">Отменить</string>
+    <string name="omnipod_common_wizard_button_finish">Завершить</string>
+    <string name="omnipod_common_wizard_button_next">Далее</string>
+    <string name="omnipod_common_wizard_button_retry">Повторить</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Деактивировать Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Утилизировать Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Вы еще не выполнили все шаги. Действительно хотите выйти?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Выход</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Заполнить Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Заполните новый Pod инсулином на 3 дня.\n\nПоступят два звуковых сигнала от помпы во время заправки. Это означает, что минимальное количество 85U заправлено. Не забудьте опустошить заправочный шприц даже после того, как услышите два звуковых сигнала.\n\nПосле заполнения Pod нажмите <b>Next</b>.\n\n<b>Примечание:</b> Пока не снимайте с помпы колпачок с иглой.\n<b>Примечание:</b>поставьте RileyLink вертикально рядом с Pod.</string>
diff --git a/omnipod-eros/src/main/res/values-sk-rSK/strings.xml b/omnipod-eros/src/main/res/values-sk-rSK/strings.xml
index 5190ba2969..afbea054a4 100644
--- a/omnipod-eros/src/main/res/values-sk-rSK/strings.xml
+++ b/omnipod-eros/src/main/res/values-sk-rSK/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Prehrať testovacie pípnutie</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Prehrávanie testovacieho pípnutia…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Zrušiť</string>
-    <string name="omnipod_wizard_button_finish">Dokončiť</string>
-    <string name="omnipod_wizard_button_next">Ďalšia</string>
-    <string name="omnipod_wizard_button_retry">Opakovať</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Deaktivovať Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Vyradiť Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Doposiaľ ste nedokončili všetky kroky. Ste si istý, že chcete ukončiť prácu?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Koniec</string>
+    <string name="omnipod_common_wizard_button_cancel">Zrušiť</string>
+    <string name="omnipod_common_wizard_button_finish">Dokončiť</string>
+    <string name="omnipod_common_wizard_button_next">Ďalšia</string>
+    <string name="omnipod_common_wizard_button_retry">Opakovať</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Deaktivovať Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Vyradiť Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Doposiaľ ste nedokončili všetky kroky. Ste si istý, že chcete ukončiť prácu?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Koniec</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Naplniť Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Naplňte nový Pod dostatkom inzulínu na 3 dni.\n\nSledujte dve pípnutia z Podu v priebehu procesu plnenia. Tieto ukazujú, že minimálne množstvo 85U bolo naplnené. Uistite sa, že striekačka je úplne vyprázdnená a to aj po vypočutí dvoch pípnutí.\n\nPo naplnení Podu, prosím, stlačte <b>Ďalšia</b>.\n\n<b>Poznámka:</b> zatiaľ nesnímajte kryt z ihly.\n<b>Poznámka:</b>prosím umiestnite RileyLink vo zvislej polohe blízko Podu.</string>
diff --git a/omnipod-eros/src/main/res/values-sv-rSE/strings.xml b/omnipod-eros/src/main/res/values-sv-rSE/strings.xml
index 29ecd0215a..2a00969701 100644
--- a/omnipod-eros/src/main/res/values-sv-rSE/strings.xml
+++ b/omnipod-eros/src/main/res/values-sv-rSE/strings.xml
@@ -164,14 +164,14 @@
     <string name="omnipod_pod_management_button_play_test_beep">Spela upp testljud</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Spelar testpip…</string>
     <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Avbryt</string>
-    <string name="omnipod_wizard_button_finish">Slutför</string>
-    <string name="omnipod_wizard_button_next">Nästa</string>
-    <string name="omnipod_wizard_button_retry">Försök igen</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Inaktivera pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Ta bort Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">Du har inte gjort alla steg än. Är du säker på att du vill avsluta?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Avsluta</string>
+    <string name="omnipod_common_wizard_button_cancel">Avbryt</string>
+    <string name="omnipod_common_wizard_button_finish">Slutför</string>
+    <string name="omnipod_common_wizard_button_next">Nästa</string>
+    <string name="omnipod_common_wizard_button_retry">Försök igen</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Inaktivera pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Ta bort Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Du har inte gjort alla steg än. Är du säker på att du vill avsluta?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Avsluta</string>
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Fyll Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Fyll en ny Pod med tillräckligt med insulin i 3 dagar.\n\nLyssna på två pip från Pod under fyllningsprocessen. Dessa tyder på att den minsta mängden (85U) har nåtts. Var noga med att helt tömma fyllnadssprutan, även efter att ha hört de två pipen.\n\nEfter fyllning av Pod, tryck <b>Nästa</b>.\n\n<b>Obs:</b> Ta inte bort Pods nålskydd ännu.\n<b>Obs:</b> Placera Riley Link i ett upprätt läge och placera Pod några centimeter därifrån.</string>
diff --git a/omnipod-eros/src/main/res/values/colors.xml b/omnipod-eros/src/main/res/values/colors.xml
index 8df323920f..62d3e623c9 100644
--- a/omnipod-eros/src/main/res/values/colors.xml
+++ b/omnipod-eros/src/main/res/values/colors.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod Wizard -->
-    <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>
@@ -15,35 +9,7 @@
     <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>
\ No newline at end of file
diff --git a/omnipod-eros/src/main/res/values/strings.xml b/omnipod-eros/src/main/res/values/strings.xml
index bdbdf60e24..bac4ee85e6 100644
--- a/omnipod-eros/src/main/res/values/strings.xml
+++ b/omnipod-eros/src/main/res/values/strings.xml
@@ -206,16 +206,6 @@
     <string name="omnipod_pod_management_button_play_test_beep">Play Test Beep</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Playing Test Beep…</string>
 
-    <!-- Omnipod - Wizard common -->
-    <string name="omnipod_wizard_button_cancel">Cancel</string>
-    <string name="omnipod_wizard_button_finish">Finish</string>
-    <string name="omnipod_wizard_button_next">Next</string>
-    <string name="omnipod_wizard_button_retry">Retry</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Deactivate Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Discard Pod</string>
-    <string name="omnipod_wizard_exit_confirmation_text">You haven\'t completed all steps yet. Are you sure you want to exit?</string>
-    <string name="omnipod_wizard_exit_confirmation_title">Exit</string>
-
     <!-- Omnipod - Pod activation Wizard -->
     <string name="omnipod_pod_activation_wizard_fill_pod_title">Fill Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Fill a new Pod with enough insulin for 3 days.\n\nListen for two beeps from the Pod during the filling process. These indicate that the minimum amount of 85U has been inserted. Be sure to completely empty the fill syringe, even after hearing the two beeps.\n\nAfter filling the Pod, please press <b>Next</b>.\n\n<b>Note:</b> do not remove the Pod\'s needle cap at this time.\n<b>Note:</b> please place the RileyLink in an upright position and place the Pod a few inches away from it.</string>