diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml
new file mode 100644
index 0000000000..2908c8f16b
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_acknowledge_alerts.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_pod_management.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_pod_management.xml
new file mode 100644
index 0000000000..a1d2818dab
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_pod_management.xml
@@ -0,0 +1,21 @@
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml
new file mode 100644
index 0000000000..83f0a2345d
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_refresh_pod_status.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml
new file mode 100644
index 0000000000..4e2ae87839
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_resume_delivery.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_set_time.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_set_time.xml
new file mode 100644
index 0000000000..d5c6e682c3
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_set_time.xml
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml b/omnipod/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml
new file mode 100644
index 0000000000..033f53217b
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_omnipod_overview_suspend_delivery.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_wizard_success.xml b/omnipod/src/main/res/drawable/ic_omnipod_wizard_success.xml
similarity index 100%
rename from omnipod/src/main/res/drawable/icon_omnipod_wizard_success.xml
rename to omnipod/src/main/res/drawable/ic_omnipod_wizard_success.xml
diff --git a/omnipod/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml b/omnipod/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml
new file mode 100644
index 0000000000..eee2a2ec84
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_activity_reset_rileylink_config.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_activate_pod.xml b/omnipod/src/main/res/drawable/ic_pod_management_activate_pod.xml
new file mode 100644
index 0000000000..04fe453a83
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_activate_pod.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_deactivate_pod.xml b/omnipod/src/main/res/drawable/ic_pod_management_deactivate_pod.xml
new file mode 100644
index 0000000000..d6b053423e
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_deactivate_pod.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_discard_pod.xml b/omnipod/src/main/res/drawable/ic_pod_management_discard_pod.xml
new file mode 100644
index 0000000000..1ba380492b
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_discard_pod.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_play_test_beep.xml b/omnipod/src/main/res/drawable/ic_pod_management_play_test_beep.xml
new file mode 100644
index 0000000000..46b82ac9e5
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_play_test_beep.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_pod_history.xml b/omnipod/src/main/res/drawable/ic_pod_management_pod_history.xml
new file mode 100644
index 0000000000..eb2372c685
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_pod_history.xml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_pulse_log.xml b/omnipod/src/main/res/drawable/ic_pod_management_pulse_log.xml
new file mode 100644
index 0000000000..7b1823e7a1
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_pulse_log.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/ic_pod_management_rl_stats.xml b/omnipod/src/main/res/drawable/ic_pod_management_rl_stats.xml
new file mode 100644
index 0000000000..09c8eea8b7
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_pod_management_rl_stats.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_acknowledge_alerts.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_acknowledge_alerts.xml
deleted file mode 100644
index 35a2f6482d..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_acknowledge_alerts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_pod_management.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_pod_management.xml
deleted file mode 100644
index dc2d89cb31..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_pod_management.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml
deleted file mode 100644
index ae004ae4fe..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_refresh_pod_status.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_resume_delivery.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_resume_delivery.xml
deleted file mode 100644
index b2d89fe2da..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_resume_delivery.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_set_time.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_set_time.xml
deleted file mode 100644
index 191cddf4fb..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_set_time.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_omnipod_overview_suspend_delivery.xml b/omnipod/src/main/res/drawable/icon_omnipod_overview_suspend_delivery.xml
deleted file mode 100644
index 73fa2635e3..0000000000
--- a/omnipod/src/main/res/drawable/icon_omnipod_overview_suspend_delivery.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_pod_activity_reset_rileylink_config.xml b/omnipod/src/main/res/drawable/icon_pod_activity_reset_rileylink_config.xml
deleted file mode 100644
index 9c3da03055..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_activity_reset_rileylink_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml b/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
deleted file mode 100644
index 8694bbf7e2..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_deactivate_pod.xml b/omnipod/src/main/res/drawable/icon_pod_management_deactivate_pod.xml
deleted file mode 100644
index 5a9b273b87..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_deactivate_pod.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_discard_pod.xml b/omnipod/src/main/res/drawable/icon_pod_management_discard_pod.xml
deleted file mode 100644
index 775704d4da..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_discard_pod.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_play_test_beep.xml b/omnipod/src/main/res/drawable/icon_pod_management_play_test_beep.xml
deleted file mode 100644
index e80cb36475..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_play_test_beep.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml b/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml
deleted file mode 100644
index abf666839c..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_pod_history.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_pulse_log.xml b/omnipod/src/main/res/drawable/icon_pod_management_pulse_log.xml
deleted file mode 100644
index faaa137526..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_pulse_log.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/omnipod/src/main/res/drawable/icon_pod_management_rl_stats.xml b/omnipod/src/main/res/drawable/icon_pod_management_rl_stats.xml
deleted file mode 100644
index cde8412e8b..0000000000
--- a/omnipod/src/main/res/drawable/icon_pod_management_rl_stats.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/omnipod/src/main/res/layout/omnipod_overview.xml b/omnipod/src/main/res/layout/omnipod_overview.xml
index 00e44ba3eb..7b21cf1304 100644
--- a/omnipod/src/main/res/layout/omnipod_overview.xml
+++ b/omnipod/src/main/res/layout/omnipod_overview.xml
@@ -778,7 +778,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:drawableTop="@drawable/icon_omnipod_overview_refresh_pod_status"
+ android:drawableTop="@drawable/ic_omnipod_overview_refresh_pod_status"
android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
android:text="@string/omnipod_overview_button_refresh" />
@@ -788,7 +788,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:drawableTop="@drawable/icon_omnipod_overview_pod_management"
+ android:drawableTop="@drawable/ic_omnipod_overview_pod_management"
android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
android:text="@string/omnipod_overview_button_pod_management" />
@@ -798,7 +798,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:drawableTop="@drawable/icon_omnipod_overview_acknowledge_alerts"
+ android:drawableTop="@drawable/ic_omnipod_overview_acknowledge_alerts"
android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
android:text="@string/omnipod_overview_button_acknowledge_active_alerts" />
@@ -808,7 +808,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:drawableTop="@drawable/icon_omnipod_overview_set_time"
+ android:drawableTop="@drawable/ic_omnipod_overview_set_time"
android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
android:text="@string/omnipod_overview_button_set_time"
android:visibility="gone" />
@@ -819,7 +819,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:drawableTop="@drawable/icon_omnipod_overview_resume_delivery"
+ android:drawableTop="@drawable/ic_omnipod_overview_resume_delivery"
android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
android:text="@string/omnipod_overview_button_resume_delivery"
android:visibility="gone" />
@@ -830,10 +830,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:drawableTop="@drawable/icon_omnipod_overview_suspend_delivery"
+ android:drawableTop="@drawable/ic_omnipod_overview_suspend_delivery"
android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
android:text="@string/omnipod_overview_button_suspend_delivery"
- android:visibility="visible" />
+ android:visibility="gone" />
diff --git a/omnipod/src/main/res/layout/omnipod_pod_management.xml b/omnipod/src/main/res/layout/omnipod_pod_management.xml
index f7871be3f5..5ee71e1da3 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_management.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_management.xml
@@ -68,7 +68,7 @@
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
- android:drawableTop="@drawable/icon_pod_management_activate_pod"
+ android:drawableTop="@drawable/ic_pod_management_activate_pod"
android:text="@string/omnipod_pod_management_button_activate_pod"
android:textAllCaps="false" />
@@ -80,7 +80,7 @@
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
- android:drawableTop="@drawable/icon_pod_management_deactivate_pod"
+ android:drawableTop="@drawable/ic_pod_management_deactivate_pod"
android:text="@string/omnipod_pod_management_button_deactivate_pod"
android:textAllCaps="false" />
@@ -100,7 +100,7 @@
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
- android:drawableTop="@drawable/icon_pod_management_play_test_beep"
+ android:drawableTop="@drawable/ic_pod_management_play_test_beep"
android:text="@string/omnipod_pod_management_button_play_test_beep"
android:textAllCaps="false" />
@@ -112,9 +112,10 @@
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
- android:drawableTop="@drawable/icon_pod_management_discard_pod"
+ android:drawableTop="@drawable/ic_pod_management_discard_pod"
android:text="@string/omnipod_pod_management_button_discard_pod"
- android:textAllCaps="false" />
+ android:textAllCaps="false"
+ android:visibility="gone"/>
@@ -140,7 +141,7 @@
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
- android:drawableTop="@drawable/icon_pod_management_pod_history"
+ android:drawableTop="@drawable/ic_pod_management_pod_history"
android:text="@string/omnipod_pod_management_button_pod_history"
android:textAllCaps="false" />
@@ -151,9 +152,10 @@
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
- android:drawableTop="@drawable/icon_pod_management_rl_stats"
+ android:drawableTop="@drawable/ic_pod_management_rl_stats"
android:text="@string/omnipod_pod_management_button_riley_link_stats"
- android:textAllCaps="false" />
+ android:textAllCaps="false"
+ android:visibility="gone"/>
@@ -171,7 +173,7 @@
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
- android:drawableTop="@drawable/icon_pod_management_pulse_log"
+ android:drawableTop="@drawable/ic_pod_management_pulse_log"
android:text="@string/omnipod_pod_management_button_read_pulse_log"
android:textAllCaps="false"
android:visibility="gone" />
@@ -183,7 +185,7 @@
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
- android:drawableTop="@drawable/icon_pod_activity_reset_rileylink_config"
+ android:drawableTop="@drawable/ic_pod_activity_reset_rileylink_config"
android:text="@string/omnipod_pod_management_button_reset_riley_link_config"
android:textAllCaps="false" />
diff --git a/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml b/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
index fca78512a4..54061c7d07 100644
--- a/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
+++ b/omnipod/src/main/res/layout/omnipod_wizard_action_page_fragment.xml
@@ -29,7 +29,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/omnipod_wizard_vertical_spacing"
android:layout_marginBottom="@dimen/omnipod_wizard_vertical_spacing"
- app:srcCompat="@drawable/icon_omnipod_wizard_success"
+ app:srcCompat="@drawable/ic_omnipod_wizard_success"
android:visibility="gone" />
#77DD77
- #90CAF9
+ #9E9E9E
#b9d2d2
#66BB6A
#FF7043
- @color/rl_board_shape
- @color/rl_icon_outline
+ @color/rl_board_shape
+ @color/rl_icon_outline
- #FF4444
- @color/pod_icon_outline
- #4CAF50
- @color/pod_icon_outline
- @color/pod_icon_outline
- #42A5F5
- @color/pod_icon_outline
- #67E86A
- @color/pod_icon_outline
- #B39DDB
- @color/pod_icon_outline
- #ffbf00
- @color/pod_icon_outline
+ #FF4444
+ @color/pod_icon_outline
+ #4CAF50
+ @color/pod_icon_outline
+ @color/pod_icon_outline
+ #42A5F5
+ @color/pod_icon_outline
+ #67E86A
+ @color/pod_icon_outline
+ #B39DDB
+ @color/pod_icon_outline
+ #ffbf00
+ @color/pod_icon_outline
- #67E86A
- @color/pod_icon_outline
- #FF4444
- @color/pod_icon_outline
- #85F803
- @color/pod_icon_outline
- #ffbf00
- @color/pod_icon_outline
- #4DD0E1
- @color/pod_icon_outline
- #FB8C00
- @color/pod_icon_outline
- @color/rl_board_shape
- @color/rl_icon_outline
+ #67E86A
+ @color/pod_icon_outline
+ #FF4444
+ @color/pod_icon_outline
+ #85F803
+ @color/pod_icon_outline
+ #ffbf00
+ @color/pod_icon_outline
+ #4DD0E1
+ @color/pod_icon_outline
+ #FB8C00
+ @color/pod_icon_outline
+ @color/rl_board_shape
+ @color/rl_icon_outline
\ No newline at end of file