diff --git a/icons/action_add.svg b/icons/action_add.svg
new file mode 100644
index 0000000000..929dd4f7d9
--- /dev/null
+++ b/icons/action_add.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/icons/action_minus.svg b/icons/action_minus.svg
new file mode 100644
index 0000000000..c7ef549809
--- /dev/null
+++ b/icons/action_minus.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/icons/cancel.svg b/icons/cancel.svg
new file mode 100644
index 0000000000..070444ebd3
--- /dev/null
+++ b/icons/cancel.svg
@@ -0,0 +1,13 @@
+
+
diff --git a/icons/confirm.svg b/icons/confirm.svg
new file mode 100644
index 0000000000..0e93b2634e
--- /dev/null
+++ b/icons/confirm.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/icons/icon_snooze.svg b/icons/icon_snooze.svg
new file mode 100644
index 0000000000..c2190ac542
--- /dev/null
+++ b/icons/icon_snooze.svg
@@ -0,0 +1,59 @@
+
+
diff --git a/icons/loop.svg b/icons/loop.svg
new file mode 100644
index 0000000000..b9e96b325d
--- /dev/null
+++ b/icons/loop.svg
@@ -0,0 +1,10 @@
+
diff --git a/icons/setting_off.svg b/icons/setting_off.svg
new file mode 100644
index 0000000000..ae79852ac7
--- /dev/null
+++ b/icons/setting_off.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/icons/setting_on.svg b/icons/setting_on.svg
new file mode 100644
index 0000000000..72d9d52c8b
--- /dev/null
+++ b/icons/setting_on.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/wear/src/main/res/drawable-hdpi/ic_cancel.png b/wear/src/main/res/drawable-hdpi/ic_cancel.png
deleted file mode 100644
index f3f1437a88..0000000000
Binary files a/wear/src/main/res/drawable-hdpi/ic_cancel.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-hdpi/ic_confirm.png b/wear/src/main/res/drawable-hdpi/ic_confirm.png
deleted file mode 100644
index 757596cba2..0000000000
Binary files a/wear/src/main/res/drawable-hdpi/ic_confirm.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-hdpi/settings_off.png b/wear/src/main/res/drawable-hdpi/settings_off.png
deleted file mode 100644
index ab7e4249a7..0000000000
Binary files a/wear/src/main/res/drawable-hdpi/settings_off.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-hdpi/settings_on.png b/wear/src/main/res/drawable-hdpi/settings_on.png
deleted file mode 100644
index d22797b946..0000000000
Binary files a/wear/src/main/res/drawable-hdpi/settings_on.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-mdpi/ic_cancel.png b/wear/src/main/res/drawable-mdpi/ic_cancel.png
deleted file mode 100644
index a564bff322..0000000000
Binary files a/wear/src/main/res/drawable-mdpi/ic_cancel.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-mdpi/ic_confirm.png b/wear/src/main/res/drawable-mdpi/ic_confirm.png
deleted file mode 100644
index b7887421b6..0000000000
Binary files a/wear/src/main/res/drawable-mdpi/ic_confirm.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-mdpi/settings_off.png b/wear/src/main/res/drawable-mdpi/settings_off.png
deleted file mode 100644
index 8ead2a2c50..0000000000
Binary files a/wear/src/main/res/drawable-mdpi/settings_off.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-mdpi/settings_on.png b/wear/src/main/res/drawable-mdpi/settings_on.png
deleted file mode 100644
index b113766ec4..0000000000
Binary files a/wear/src/main/res/drawable-mdpi/settings_on.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-xhdpi/ic_cancel.png b/wear/src/main/res/drawable-xhdpi/ic_cancel.png
deleted file mode 100644
index 1e20754390..0000000000
Binary files a/wear/src/main/res/drawable-xhdpi/ic_cancel.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-xhdpi/ic_confirm.png b/wear/src/main/res/drawable-xhdpi/ic_confirm.png
deleted file mode 100644
index 4609b2d620..0000000000
Binary files a/wear/src/main/res/drawable-xhdpi/ic_confirm.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-xhdpi/settings_off.png b/wear/src/main/res/drawable-xhdpi/settings_off.png
deleted file mode 100644
index 271ac298d7..0000000000
Binary files a/wear/src/main/res/drawable-xhdpi/settings_off.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-xhdpi/settings_on.png b/wear/src/main/res/drawable-xhdpi/settings_on.png
deleted file mode 100644
index db90aa602c..0000000000
Binary files a/wear/src/main/res/drawable-xhdpi/settings_on.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-xxhdpi/ic_cancel.png b/wear/src/main/res/drawable-xxhdpi/ic_cancel.png
deleted file mode 100644
index 89e1bd0695..0000000000
Binary files a/wear/src/main/res/drawable-xxhdpi/ic_cancel.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-xxhdpi/ic_confirm.png b/wear/src/main/res/drawable-xxhdpi/ic_confirm.png
deleted file mode 100644
index 0696468e1a..0000000000
Binary files a/wear/src/main/res/drawable-xxhdpi/ic_confirm.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-xxhdpi/settings_off.png b/wear/src/main/res/drawable-xxhdpi/settings_off.png
deleted file mode 100644
index 7776112fef..0000000000
Binary files a/wear/src/main/res/drawable-xxhdpi/settings_off.png and /dev/null differ
diff --git a/wear/src/main/res/drawable-xxhdpi/settings_on.png b/wear/src/main/res/drawable-xxhdpi/settings_on.png
deleted file mode 100644
index 6088091eae..0000000000
Binary files a/wear/src/main/res/drawable-xxhdpi/settings_on.png and /dev/null differ
diff --git a/wear/src/main/res/drawable/ic_action_add.png b/wear/src/main/res/drawable/ic_action_add.png
deleted file mode 100644
index ca13239a7d..0000000000
Binary files a/wear/src/main/res/drawable/ic_action_add.png and /dev/null differ
diff --git a/wear/src/main/res/drawable/ic_action_add.xml b/wear/src/main/res/drawable/ic_action_add.xml
new file mode 100644
index 0000000000..a910bfb5bc
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_action_add.xml
@@ -0,0 +1,9 @@
+
+
+
+
diff --git a/wear/src/main/res/drawable/ic_action_minus.png b/wear/src/main/res/drawable/ic_action_minus.png
deleted file mode 100644
index e68aed5a2f..0000000000
Binary files a/wear/src/main/res/drawable/ic_action_minus.png and /dev/null differ
diff --git a/wear/src/main/res/drawable/ic_action_minus.xml b/wear/src/main/res/drawable/ic_action_minus.xml
new file mode 100644
index 0000000000..40b17dc531
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_action_minus.xml
@@ -0,0 +1,8 @@
+
+
+
diff --git a/wear/src/main/res/drawable/ic_cancel.xml b/wear/src/main/res/drawable/ic_cancel.xml
new file mode 100644
index 0000000000..a922f972ec
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_cancel.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/wear/src/main/res/drawable/ic_confirm.xml b/wear/src/main/res/drawable/ic_confirm.xml
new file mode 100644
index 0000000000..de281376b2
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_confirm.xml
@@ -0,0 +1,8 @@
+
+
+
diff --git a/wear/src/main/res/drawable/ic_icon.png b/wear/src/main/res/drawable/ic_icon.png
deleted file mode 100644
index 584d65de70..0000000000
Binary files a/wear/src/main/res/drawable/ic_icon.png and /dev/null differ
diff --git a/wear/src/main/res/drawable/ic_icon.xml b/wear/src/main/res/drawable/ic_icon.xml
new file mode 100644
index 0000000000..ae7fa78499
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_icon.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/wear/src/main/res/drawable/ic_icon_snooze.png b/wear/src/main/res/drawable/ic_icon_snooze.png
deleted file mode 100644
index 31b80685be..0000000000
Binary files a/wear/src/main/res/drawable/ic_icon_snooze.png and /dev/null differ
diff --git a/wear/src/main/res/drawable/ic_icon_snooze.xml b/wear/src/main/res/drawable/ic_icon_snooze.xml
new file mode 100644
index 0000000000..15e6a5c105
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_icon_snooze.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wear/src/main/res/drawable/loop_green_25.png b/wear/src/main/res/drawable/loop_green_25.png
deleted file mode 100644
index 37076d5577..0000000000
Binary files a/wear/src/main/res/drawable/loop_green_25.png and /dev/null differ
diff --git a/wear/src/main/res/drawable/loop_green_25.xml b/wear/src/main/res/drawable/loop_green_25.xml
new file mode 100644
index 0000000000..8ee928194d
--- /dev/null
+++ b/wear/src/main/res/drawable/loop_green_25.xml
@@ -0,0 +1,9 @@
+
+
+
+
diff --git a/wear/src/main/res/drawable/loop_grey_25.png b/wear/src/main/res/drawable/loop_grey_25.png
deleted file mode 100644
index 781f68d17d..0000000000
Binary files a/wear/src/main/res/drawable/loop_grey_25.png and /dev/null differ
diff --git a/wear/src/main/res/drawable/loop_grey_25.xml b/wear/src/main/res/drawable/loop_grey_25.xml
new file mode 100644
index 0000000000..34a7a80b72
--- /dev/null
+++ b/wear/src/main/res/drawable/loop_grey_25.xml
@@ -0,0 +1,9 @@
+
+
+
+
diff --git a/wear/src/main/res/drawable/loop_red_25.png b/wear/src/main/res/drawable/loop_red_25.png
deleted file mode 100644
index e9dcdb0da3..0000000000
Binary files a/wear/src/main/res/drawable/loop_red_25.png and /dev/null differ
diff --git a/wear/src/main/res/drawable/loop_red_25.xml b/wear/src/main/res/drawable/loop_red_25.xml
new file mode 100644
index 0000000000..688ff02e24
--- /dev/null
+++ b/wear/src/main/res/drawable/loop_red_25.xml
@@ -0,0 +1,9 @@
+
+
+
+
diff --git a/wear/src/main/res/drawable/settings_off.xml b/wear/src/main/res/drawable/settings_off.xml
new file mode 100644
index 0000000000..bbe06c1740
--- /dev/null
+++ b/wear/src/main/res/drawable/settings_off.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/wear/src/main/res/drawable/settings_on.xml b/wear/src/main/res/drawable/settings_on.xml
new file mode 100644
index 0000000000..b63a5fba59
--- /dev/null
+++ b/wear/src/main/res/drawable/settings_on.xml
@@ -0,0 +1,10 @@
+
+
+