diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt
index b2a002470e..086273a938 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/wizard/common/fragment/WizardFragmentBase.kt
+++ b/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()
diff --git a/omnipod/src/main/res/drawable/ic_acknowledge_alerts.xml b/omnipod/src/main/res/drawable/ic_acknowledge_alerts.xml
index b2091c4c7d..10028a7bcf 100644
--- a/omnipod/src/main/res/drawable/ic_acknowledge_alerts.xml
+++ b/omnipod/src/main/res/drawable/ic_acknowledge_alerts.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_acknowledge_alerts"
     android:viewportWidth="75"
     android:viewportHeight="75">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_activate_pod.xml b/omnipod/src/main/res/drawable/ic_activate_pod.xml
index 3a9571a74b..5fdee70d77 100644
--- a/omnipod/src/main/res/drawable/ic_activate_pod.xml
+++ b/omnipod/src/main/res/drawable/ic_activate_pod.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_activate_pod"
     android:viewportWidth="310"
     android:viewportHeight="310">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_deactivate_pod.xml b/omnipod/src/main/res/drawable/ic_deactivate_pod.xml
index 3a9571a74b..756057295a 100644
--- a/omnipod/src/main/res/drawable/ic_deactivate_pod.xml
+++ b/omnipod/src/main/res/drawable/ic_deactivate_pod.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_deactivate_pod"
     android:viewportWidth="310"
     android:viewportHeight="310">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_discard_pod.xml b/omnipod/src/main/res/drawable/ic_discard_pod.xml
index 8c0d79dd00..1a0f6f1238 100644
--- a/omnipod/src/main/res/drawable/ic_discard_pod.xml
+++ b/omnipod/src/main/res/drawable/ic_discard_pod.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_discard_pod"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_play_test_beep.xml b/omnipod/src/main/res/drawable/ic_play_test_beep.xml
index c144806d99..dc527d8ea7 100644
--- a/omnipod/src/main/res/drawable/ic_play_test_beep.xml
+++ b/omnipod/src/main/res/drawable/ic_play_test_beep.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_play_test_beep"
     android:viewportWidth="75"
     android:viewportHeight="75">
 
diff --git a/omnipod/src/main/res/drawable/ic_pod_history.xml b/omnipod/src/main/res/drawable/ic_pod_history.xml
index 49f9747b63..6f48e0e2d0 100644
--- a/omnipod/src/main/res/drawable/ic_pod_history.xml
+++ b/omnipod/src/main/res/drawable/ic_pod_history.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_pod_history"
     android:viewportWidth="484"
     android:viewportHeight="484">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_pod_management.xml b/omnipod/src/main/res/drawable/ic_pod_management.xml
index 0e5f5456d4..da16e83195 100644
--- a/omnipod/src/main/res/drawable/ic_pod_management.xml
+++ b/omnipod/src/main/res/drawable/ic_pod_management.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_pod_management"
     android:viewportWidth="490"
     android:viewportHeight="490">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_pulse_log.xml b/omnipod/src/main/res/drawable/ic_pulse_log.xml
index af1cbdec75..c3770b6262 100644
--- a/omnipod/src/main/res/drawable/ic_pulse_log.xml
+++ b/omnipod/src/main/res/drawable/ic_pulse_log.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_pulse_log"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_refresh_pod_status.xml b/omnipod/src/main/res/drawable/ic_refresh_pod_status.xml
index 176ebf4447..b706972932 100644
--- a/omnipod/src/main/res/drawable/ic_refresh_pod_status.xml
+++ b/omnipod/src/main/res/drawable/ic_refresh_pod_status.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_refresh_pod_status"
     android:viewportWidth="492.883"
     android:viewportHeight="492.883">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_resume_delivery.xml b/omnipod/src/main/res/drawable/ic_resume_delivery.xml
index ef735358cb..c8cbdaaf93 100644
--- a/omnipod/src/main/res/drawable/ic_resume_delivery.xml
+++ b/omnipod/src/main/res/drawable/ic_resume_delivery.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_resume_delivery"
     android:viewportWidth="330"
     android:viewportHeight="330">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_rl_stats.xml b/omnipod/src/main/res/drawable/ic_rl_stats.xml
index eceaf2382b..42bdd39d80 100644
--- a/omnipod/src/main/res/drawable/ic_rl_stats.xml
+++ b/omnipod/src/main/res/drawable/ic_rl_stats.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_rl_stats"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_set_time.xml b/omnipod/src/main/res/drawable/ic_set_time.xml
index 9c2222dab9..2e60ad270c 100644
--- a/omnipod/src/main/res/drawable/ic_set_time.xml
+++ b/omnipod/src/main/res/drawable/ic_set_time.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_set_time"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_success.xml b/omnipod/src/main/res/drawable/ic_success.xml
index 01efa0f6e3..8969b36756 100644
--- a/omnipod/src/main/res/drawable/ic_success.xml
+++ b/omnipod/src/main/res/drawable/ic_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/ic_success"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/omnipod/src/main/res/drawable/ic_suspend_delivery.xml b/omnipod/src/main/res/drawable/ic_suspend_delivery.xml
index 1d1054e675..eb40885f87 100644
--- a/omnipod/src/main/res/drawable/ic_suspend_delivery.xml
+++ b/omnipod/src/main/res/drawable/ic_suspend_delivery.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFFFF"
+    android:tint="@color/ic_suspend_delivery"
     android:viewportWidth="30.05"
     android:viewportHeight="30.05">
     <path
diff --git a/omnipod/src/main/res/layout/omnipod_wizard_progress_indication.xml b/omnipod/src/main/res/layout/omnipod_wizard_progress_indication.xml
index 983a0bb4ea..cb718d1ceb 100644
--- a/omnipod/src/main/res/layout/omnipod_wizard_progress_indication.xml
+++ b/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>
\ No newline at end of file
diff --git a/omnipod/src/main/res/values/colors.xml b/omnipod/src/main/res/values/colors.xml
index 078411269a..3493225e80 100644
--- a/omnipod/src/main/res/values/colors.xml
+++ b/omnipod/src/main/res/values/colors.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="omnipodWizardProgressBar">#0099CC</color>
-    <color name="review_green">#ff669900</color>
+    <!-- Omnipod Wizard -->
+    <color name="omnipod_wizard_progress_bar">#0099CC</color>
+    <color name="omnipod_wizard_finish_button">#ff669900</color>
+    <color name="ic_success">#77DD77</color>
+
+    <!-- Omnipod tab - Button icons -->
+    <color name="ic_refresh_pod_status">#FFFFFFFF</color>
+    <color name="ic_pod_management">#FFFFFFFF</color>
+    <color name="ic_acknowledge_alerts">#FFFFFFFF</color>
+    <color name="ic_set_time">#FFFFFFFF</color>
+    <color name="ic_resume_delivery">#FFFFFFFF</color>
+    <color name="ic_suspend_delivery">#FFFFFFFF</color>
+
+    <!-- Pod Management - Button icons -->
+    <color name="ic_activate_pod">#FFFFFFFF</color>
+    <color name="ic_deactivate_pod">#FFFFFFFF</color>
+    <color name="ic_discard_pod">#FFFFFFFF</color>
+    <color name="ic_play_test_beep">#FFFFFFFF</color>
+    <color name="ic_pulse_log">#FFFFFFFF</color>
+    <color name="ic_pod_history">#FFFFFFFF</color>
+    <color name="ic_rl_stats">#FFFFFFFF</color>
+
 </resources>
\ No newline at end of file