From e2cf0a7955523aec14749af55c77a7cb9fdfa8ae Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 19 Jun 2020 13:33:20 +0200
Subject: [PATCH] About 30 new svg files

---
 icons/actions_cancelextbolus.svg |  2 --
 icons/actions_refill.svg         | 14 ++++++++++++++
 icons/actions_startextbolus.svg  |  2 --
 icons/actions_temptarget.svg     | 18 ++++++++++++++++++
 icons/add.svg                    |  2 --
 icons/as.svg                     |  2 --
 icons/auto_delta.svg             |  2 --
 icons/bolus.svg                  |  2 --
 icons/calculator.svg             |  2 --
 icons/calibration.svg            |  2 --
 icons/clone.svg                  |  2 --
 icons/cp_aaps_offline.svg        | 23 +++++++++++++++++++++++
 icons/cp_age_batterie.svg        | 13 +++++++++++++
 icons/cp_age_canula.svg          | 14 ++++++++++++++
 icons/cp_age_insulin.svg         | 17 +++++++++++++++++
 icons/cp_age_sensor.svg          | 17 +++++++++++++++++
 icons/cp_announcement.svg        | 31 +++++++++++++++++++++++++++++++
 icons/cp_basal_end.svg           |  2 --
 icons/cp_basal_no_tbr.svg        |  2 --
 icons/cp_basal_tbr_high.svg      |  2 --
 icons/cp_basal_tbr_low.svg       |  2 --
 icons/cp_bgcheck.svg             | 17 +++++++++++++++++
 icons/cp_bgcheck2.svg            | 12 ++++++++++++
 icons/cp_bolus_carbs.svg         |  2 --
 icons/cp_bolus_combo.svg         |  9 +++++++++
 icons/cp_bolus_correction.svg    |  2 --
 icons/cp_bolus_meal.svg          | 19 +++++++++++++++++++
 icons/cp_bolus_snack.svg         | 18 ++++++++++++++++++
 icons/cp_cgm_insert.svg          | 20 ++++++++++++++++++++
 icons/cp_cgm_profile.svg         | 15 +++++++++++++++
 icons/cp_cgm_start.svg           | 24 ++++++++++++++++++++++++
 icons/cp_cgm_target.svg          | 19 +++++++++++++++++++
 icons/cp_exercise.svg            | 23 +++++++++++++++++++++++
 icons/cp_note.svg                | 17 +++++++++++++++++
 icons/cp_pump_battery.svg        | 13 +++++++++++++
 icons/cp_pump_canula.svg         | 14 ++++++++++++++
 icons/cp_pump_cartridge.svg      | 17 +++++++++++++++++
 icons/cp_question.svg            | 12 ++++++++++++
 icons/danar_useropt.svg          | 27 +++++++++++++++++++++++++++
 icons/danarhistory.svg           | 14 ++++++++++++++
 icons/danarprofile.svg           | 15 +++++++++++++++
 icons/danarstat.svg              | 10 ++++++++++
 icons/local_activate.svg         | 15 +++++++++++++++
 icons/local_reset.svg            | 13 +++++++++++++
 icons/local_save.svg             | 12 ++++++++++++
 icons/loop_closed.svg            |  2 --
 icons/loop_disabled.svg          |  2 --
 icons/loop_disconnected.svg      |  2 --
 icons/loop_lgs.svg               |  2 --
 icons/loop_open.svg              |  2 --
 icons/loop_paused.svg            |  2 --
 icons/loop_superbolus.svg        |  2 --
 icons/quickwizard.svg            |  2 --
 icons/remove.svg                 |  2 --
 icons/visibility.svg             | 10 ++++++++++
 icons/x_swap_vert.svg            |  2 --
 icons/xdrip.svg                  |  2 --
 57 files changed, 512 insertions(+), 52 deletions(-)
 create mode 100644 icons/actions_refill.svg
 create mode 100644 icons/actions_temptarget.svg
 create mode 100644 icons/cp_aaps_offline.svg
 create mode 100644 icons/cp_age_batterie.svg
 create mode 100644 icons/cp_age_canula.svg
 create mode 100644 icons/cp_age_insulin.svg
 create mode 100644 icons/cp_age_sensor.svg
 create mode 100644 icons/cp_announcement.svg
 create mode 100644 icons/cp_bgcheck.svg
 create mode 100644 icons/cp_bgcheck2.svg
 create mode 100644 icons/cp_bolus_combo.svg
 create mode 100644 icons/cp_bolus_meal.svg
 create mode 100644 icons/cp_bolus_snack.svg
 create mode 100644 icons/cp_cgm_insert.svg
 create mode 100644 icons/cp_cgm_profile.svg
 create mode 100644 icons/cp_cgm_start.svg
 create mode 100644 icons/cp_cgm_target.svg
 create mode 100644 icons/cp_exercise.svg
 create mode 100644 icons/cp_note.svg
 create mode 100644 icons/cp_pump_battery.svg
 create mode 100644 icons/cp_pump_canula.svg
 create mode 100644 icons/cp_pump_cartridge.svg
 create mode 100644 icons/cp_question.svg
 create mode 100644 icons/danar_useropt.svg
 create mode 100644 icons/danarhistory.svg
 create mode 100644 icons/danarprofile.svg
 create mode 100644 icons/danarstat.svg
 create mode 100644 icons/local_activate.svg
 create mode 100644 icons/local_reset.svg
 create mode 100644 icons/local_save.svg
 create mode 100644 icons/visibility.svg

diff --git a/icons/actions_cancelextbolus.svg b/icons/actions_cancelextbolus.svg
index 98c7fa503b..7deda488e6 100644
--- a/icons/actions_cancelextbolus.svg
+++ b/icons/actions_cancelextbolus.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="actions_x5F_cancelextbolus">
diff --git a/icons/actions_refill.svg b/icons/actions_refill.svg
new file mode 100644
index 0000000000..4514fd0788
--- /dev/null
+++ b/icons/actions_refill.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="actions_x5F_refill">
+    <path fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" d="M18.693,9.268
+            c-1.078-2.638-3.669-4.497-6.695-4.497c-3.993,0-7.229,3.237-7.229,7.229"/>
+    <line fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" x1="18.693" y1="9.268" x2="18.937" y2="4.778"/>
+    <line fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" x1="18.693" y1="9.268" x2="14.54" y2="7.538"/>
+    <path fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" d="M5.307,14.733
+            c1.078,2.638,3.669,4.497,6.695,4.497c3.993,0,7.229-3.237,7.229-7.229"/>
+    <line fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" x1="5.307" y1="14.733" x2="5.063" y2="19.223"/>
+    <line fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" x1="5.307" y1="14.733" x2="9.46" y2="16.463"/>
+</g>
+</svg>
diff --git a/icons/actions_startextbolus.svg b/icons/actions_startextbolus.svg
index 0c5d79384a..de895cc860 100644
--- a/icons/actions_startextbolus.svg
+++ b/icons/actions_startextbolus.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="actions_x5F_startextbolus">
diff --git a/icons/actions_temptarget.svg b/icons/actions_temptarget.svg
new file mode 100644
index 0000000000..7d2304705d
--- /dev/null
+++ b/icons/actions_temptarget.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="actions_x5F_temptarget">
+	<path fill="#36FF00" d="M18.71,11.606h-0.736c-0.198-3.001-2.579-5.382-5.58-5.58V5.29c0-0.218-0.177-0.394-0.394-0.394
+		s-0.394,0.177-0.394,0.394v0.736c-3.001,0.198-5.382,2.579-5.58,5.58H5.29c-0.218,0-0.394,0.177-0.394,0.394
+		s0.177,0.394,0.394,0.394h0.736c0.198,3.001,2.579,5.382,5.58,5.58v0.736c0,0.217,0.177,0.394,0.394,0.394s0.394-0.177,0.394-0.394
+		v-0.736c3.001-0.198,5.382-2.579,5.58-5.58h0.736c0.217,0,0.394-0.177,0.394-0.394S18.927,11.606,18.71,11.606z M17.143,11.606
+		h-1.944c-0.179-1.478-1.331-2.643-2.804-2.841V6.85C14.939,7.044,16.953,9.06,17.143,11.606z M13.542,12.394h0.938
+		c-0.171,1.079-1.01,1.93-2.085,2.115v-0.967c0-0.217-0.177-0.394-0.394-0.394s-0.394,0.177-0.394,0.394v0.975
+		c-1.111-0.156-1.988-1.017-2.163-2.122h1.016c0.218,0,0.394-0.177,0.394-0.394s-0.177-0.394-0.394-0.394H9.442
+		c0.171-1.111,1.049-1.978,2.164-2.134v0.987c0,0.218,0.177,0.394,0.394,0.394s0.394-0.177,0.394-0.394v-0.98
+		c1.079,0.185,1.92,1.041,2.086,2.126h-0.939c-0.217,0-0.394,0.177-0.394,0.394S13.324,12.394,13.542,12.394z M11.606,6.851v1.906
+		C10.095,8.921,8.903,10.1,8.72,11.606H6.864C7.053,9.062,9.064,7.047,11.606,6.851z M6.866,12.394H8.72
+		c0.183,1.505,1.374,2.684,2.885,2.849v1.884C9.071,16.931,7.065,14.928,6.866,12.394z M12.394,17.128v-1.893
+		c1.473-0.197,2.625-1.362,2.804-2.841h1.942C16.941,14.93,14.932,16.935,12.394,17.128z"/>
+</g>
+</svg>
diff --git a/icons/add.svg b/icons/add.svg
index ee6825ecad..3b73b8367e 100644
--- a/icons/add.svg
+++ b/icons/add.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="add">
diff --git a/icons/as.svg b/icons/as.svg
index 0ea0090571..a13e5cfd02 100644
--- a/icons/as.svg
+++ b/icons/as.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="as">
diff --git a/icons/auto_delta.svg b/icons/auto_delta.svg
index ce90280726..8bbdb89cfb 100644
--- a/icons/auto_delta.svg
+++ b/icons/auto_delta.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="auto_x5F_delta">
diff --git a/icons/bolus.svg b/icons/bolus.svg
index 24108f0e2e..b144a70123 100644
--- a/icons/bolus.svg
+++ b/icons/bolus.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="bolus">
diff --git a/icons/calculator.svg b/icons/calculator.svg
index 5a8b336a61..dbb8787c48 100644
--- a/icons/calculator.svg
+++ b/icons/calculator.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="calculator">
diff --git a/icons/calibration.svg b/icons/calibration.svg
index 8db9f88fe9..5ddac27412 100644
--- a/icons/calibration.svg
+++ b/icons/calibration.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="calibration">
diff --git a/icons/clone.svg b/icons/clone.svg
index 16226c69c9..50e25e0af5 100644
--- a/icons/clone.svg
+++ b/icons/clone.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="clone">
diff --git a/icons/cp_aaps_offline.svg b/icons/cp_aaps_offline.svg
new file mode 100644
index 0000000000..7e9adf9a22
--- /dev/null
+++ b/icons/cp_aaps_offline.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="Layer_51">
+	<g>
+		<circle fill="#E93057" cx="12" cy="17.813" r="1.5"/>
+		<path fill="#E93057" d="M19.357,6.125c0.195-0.196,0.195-0.512,0-0.708c-0.195-0.195-0.512-0.195-0.707,0l-2.364,2.364
+			C14.916,7.314,13.477,7.062,12,7.062c-2.902,0-5.674,0.925-8.015,2.675c-0.222,0.166-0.267,0.479-0.102,0.7
+			c0.166,0.222,0.479,0.266,0.7,0.102C6.751,8.919,9.315,8.063,12,8.063c1.198,0,2.369,0.177,3.493,0.512l-1.829,1.829
+			c-0.547-0.093-1.1-0.154-1.663-0.154c-2.212,0-4.325,0.705-6.111,2.039c-0.222,0.166-0.267,0.479-0.102,0.701
+			c0.166,0.221,0.478,0.267,0.7,0.101C8.099,11.887,10.005,11.25,12,11.25c0.26,0,0.516,0.022,0.773,0.044l-2.215,2.215
+			c-1.012,0.201-1.989,0.596-2.839,1.231c-0.222,0.165-0.267,0.479-0.102,0.7c0.166,0.22,0.479,0.268,0.7,0.101
+			c0.192-0.143,0.392-0.271,0.597-0.389l-2.618,2.618c-0.195,0.195-0.195,0.512,0,0.707c0.098,0.098,0.226,0.146,0.354,0.146
+			s0.256-0.049,0.354-0.146L19.357,6.125z"/>
+		<path fill="#E93057" d="M20.016,9.737c-0.562-0.42-1.15-0.789-1.757-1.113L17.513,9.37c0.66,0.331,1.299,0.717,1.903,1.169
+			c0.09,0.067,0.195,0.1,0.3,0.1c0.152,0,0.303-0.069,0.4-0.201C20.282,10.216,20.236,9.902,20.016,9.737z"/>
+		<path fill="#E93057" d="M15.867,11.016l-0.776,0.776c0.856,0.307,1.671,0.739,2.421,1.298c0.09,0.067,0.195,0.1,0.3,0.1
+			c0.152,0,0.303-0.069,0.4-0.2c0.166-0.222,0.12-0.535-0.101-0.701C17.409,11.764,16.656,11.341,15.867,11.016z"/>
+		<path fill="#E93057" d="M13.394,13.489l-0.887,0.887c1.13,0.091,2.24,0.467,3.176,1.166c0.09,0.067,0.195,0.1,0.3,0.1
+			c0.152,0,0.303-0.069,0.4-0.2c0.166-0.222,0.12-0.535-0.101-0.7C15.418,14.095,14.424,13.688,13.394,13.489z"/>
+	</g>
+</g>
+</svg>
diff --git a/icons/cp_age_batterie.svg b/icons/cp_age_batterie.svg
new file mode 100644
index 0000000000..7976c9eb9f
--- /dev/null
+++ b/icons/cp_age_batterie.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_age_x5F_battery">
+    <path opacity="0.5" fill="#FFFFFF" d="M20.234,10.422c-0.362,0-0.656,0.294-0.656,0.656v0.297h-0.469V9.031c0-0.87-0.708-1.578-1.578-1.578
+        H4.188c-0.87,0-1.578,0.708-1.578,1.578v5.938c0,0.87,0.708,1.578,1.578,1.578h13.344c0.72,0,1.323-0.488,1.511-1.149
+        c0.01,0.001,0.018,0.006,0.028,0.006c0.332,0,0.602-0.297,0.602-0.664c0-0.351-0.25-0.632-0.563-0.655v-1.46h0.469v0.297
+        c0,0.362,0.294,0.656,0.656,0.656s0.656-0.294,0.656-0.656v-1.844C20.891,10.716,20.597,10.422,20.234,10.422z M18.109,14.969
+        c0,0.318-0.26,0.578-0.578,0.578H4.188c-0.319,0-0.578-0.26-0.578-0.578V9.031c0-0.319,0.259-0.578,0.578-0.578h13.344
+        c0.318,0,0.578,0.259,0.578,0.578V14.969z"/>
+    <polygon opacity="0.5" fill="#FFFFFF" points="9.703,10.273 5.766,13.195 9.219,11.977 11,13.742 15.438,10.258 11.141,11.945 		"/>
+</g>
+</svg>
diff --git a/icons/cp_age_canula.svg b/icons/cp_age_canula.svg
new file mode 100644
index 0000000000..68aed614a5
--- /dev/null
+++ b/icons/cp_age_canula.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_age_x5F_canula">
+	<path opacity="0.5" fill="#FFFFFF" d="M20.951,10.458h-1.99c-0.054-0.733-0.659-1.313-1.406-1.313h-2.354
+		c-0.747,0-1.352,0.58-1.406,1.313h-1.99c-0.388,0-0.696,0.27-0.771,0.622c-1.32-0.021-2.226-0.555-2.936-0.999
+		c-0.7-0.437-1.304-0.814-2.005-0.434c-1.202,0.654-0.843,2.024-0.554,3.126c0.192,0.731,0.39,1.489,0.098,1.836
+		c-0.603,0.718-2.212,0.276-2.781,0.045c-0.143-0.057-0.31,0.011-0.369,0.156c-0.059,0.146,0.011,0.311,0.156,0.369
+		c0.061,0.024,0.971,0.388,1.893,0.388c0.574,0,1.153-0.142,1.534-0.593c0.482-0.571,0.256-1.433,0.017-2.345
+		c-0.323-1.234-0.479-2.074,0.276-2.485c0.392-0.213,0.762-0.003,1.434,0.417c0.755,0.471,1.766,1.123,3.359,1.096
+		C11.301,11.859,11.531,12,11.806,12h4.406v5.771l0.333-0.854V12h4.406c0.443,0,0.802-0.345,0.802-0.771
+		S21.394,10.458,20.951,10.458z"/>
+</g>
+</svg>
diff --git a/icons/cp_age_insulin.svg b/icons/cp_age_insulin.svg
new file mode 100644
index 0000000000..f296ea8bed
--- /dev/null
+++ b/icons/cp_age_insulin.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_age_x5F_insulin">
+	<path opacity="0.5" fill="#FFFFFF" d="M19.455,9.988l-0.947-1.652c-0.144-0.252-0.482-0.329-0.753-0.174
+		c-0.171,0.098-0.266,0.267-0.283,0.44l-1.149-0.585c-0.093-0.042-0.202-0.037-0.292,0.015l-9.796,5.614l-0.156-0.271
+		c-0.187-0.326-0.61-0.434-0.945-0.242c-0.336,0.192-0.456,0.612-0.269,0.938l2.747,4.79c0.187,0.326,0.61,0.434,0.945,0.242
+		c0.336-0.192,0.456-0.612,0.269-0.938L8.67,17.896l9.796-5.614c0.09-0.052,0.15-0.143,0.16-0.244l0.076-1.289
+		c0.158,0.072,0.351,0.076,0.522-0.022C19.496,10.57,19.599,10.239,19.455,9.988z M17.407,12.176l-1.127-1.769
+		c-0.055-0.086-0.172-0.11-0.261-0.054c-0.086,0.055-0.115,0.165-0.066,0.251c0.001,0.002,0.003,0.005,0.004,0.007l1.118,1.755
+		l-0.752,0.431l-1.127-1.769c-0.055-0.086-0.172-0.111-0.261-0.054c-0.086,0.054-0.115,0.165-0.066,0.251
+		c0.001,0.002,0.003,0.005,0.004,0.007l1.118,1.755l-0.752,0.431l-1.127-1.769c-0.055-0.086-0.172-0.111-0.261-0.054
+		c-0.087,0.055-0.115,0.165-0.066,0.251c0.001,0.002,0.003,0.005,0.004,0.007l1.118,1.755l-0.655,0.375l-1.552-2.482
+		c-0.053-0.084-0.165-0.111-0.254-0.06L6.82,14.666l-0.277-0.483l9.652-5.532l1.685,0.87l0.236,0.412l-0.101,1.894L17.407,12.176z"
+		/>
+</g>
+</svg>
diff --git a/icons/cp_age_sensor.svg b/icons/cp_age_sensor.svg
new file mode 100644
index 0000000000..2249a405c7
--- /dev/null
+++ b/icons/cp_age_sensor.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_age_x5F_sensor">
+		<path opacity="0.5" fill="#FFFFFF" d="M13.568,13.328c0.673,0,1.219-0.546,1.219-1.219s-0.546-1.219-1.219-1.219
+			c-0.493,0-0.913,0.296-1.105,0.718h-1.603L9.464,8.126c-0.078-0.195-0.246-0.309-0.48-0.314c-0.21,0.006-0.394,0.144-0.459,0.343
+			l-2.16,6.53l-1.131-2.751c-0.077-0.188-0.26-0.31-0.463-0.31h-2c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5h1.665l1.518,3.69
+			c0.078,0.188,0.261,0.31,0.463,0.31c0.006,0,0.012,0,0.018,0c0.209-0.008,0.392-0.145,0.458-0.343L9.045,9.77l1.012,2.525
+			c0.076,0.19,0.26,0.314,0.464,0.314h1.941C12.654,13.031,13.074,13.328,13.568,13.328z"/>
+		<path opacity="0.5" fill="#FFFFFF" d="M13.567,15.055c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5
+			c2.176,0,3.945-1.77,3.945-3.945s-1.77-3.946-3.945-3.946c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5
+			c1.624,0,2.945,1.321,2.945,2.945S15.191,15.055,13.567,15.055z"/>
+		<path opacity="0.5" fill="#FFFFFF" d="M13.567,5.14c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5
+			c3.291,0,5.969,2.677,5.969,5.968s-2.678,5.969-5.969,5.969c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5
+			c3.843,0,6.969-3.126,6.969-6.969S17.41,5.14,13.567,5.14z"/>
+</g>
+</svg>
diff --git a/icons/cp_announcement.svg b/icons/cp_announcement.svg
new file mode 100644
index 0000000000..7cbeeaa2ec
--- /dev/null
+++ b/icons/cp_announcement.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_announcement">
+    <path fill="#CF8BFE" d="M11.206,16.276c0.251,0.308,0.504,0.635,0.459,1.095c-0.02,0.201,0.178,0.295,0.327,0.395
+        c0.265,0.178,0.542,0.34,0.793,0.536c0.408,0.32,0.385,0.624-0.047,0.896c-0.017,0.011-0.037,0.016-0.054,0.026
+        c-1.333,0.78-1.335,0.782-2.448-0.311c-0.215-0.211-0.453-0.389-0.696-0.565c-0.365-0.264-0.719-0.395-1.143-0.101
+        c-0.277,0.192-0.624,0.169-0.934,0.111c-1.354-0.252-2.631-1.535-2.535-3.042c0.019-0.294,0.105-0.547,0.297-0.763
+        c0.331-0.373,0.657-0.751,1.001-1.112c0.736-0.77,1.133-1.67,1.129-2.747C7.352,9.78,7.347,8.864,7.824,8.024
+        C8.29,7.202,8.837,6.939,9.766,7.135c1.042,0.219,1.921,0.766,2.751,1.396c1.204,0.914,2.211,2.014,2.978,3.322
+        c0.396,0.675,0.718,1.372,0.734,2.185c0.011,0.586-0.253,1.005-0.706,1.303c-0.505,0.331-1.057,0.532-1.687,0.526
+        c-0.775-0.007-1.55,0.059-2.314,0.208C11.404,16.097,11.284,16.119,11.206,16.276z M14.578,14.418
+        c0.569,0.014,0.801-0.217,0.737-0.695c-0.053-0.395-0.183-0.77-0.384-1.124c-0.907-1.598-2.196-2.833-3.677-3.881
+        c-0.47-0.333-0.977-0.61-1.569-0.705C9.095,7.917,8.867,8.093,8.882,8.694C8.892,9.151,9.077,9.55,9.303,9.927
+        c0.927,1.55,2.165,2.807,3.667,3.802C13.487,14.072,14.032,14.361,14.578,14.418z M13.257,14.946
+        c-2.056-1.171-3.673-2.769-4.904-4.794c-0.061,0.218-0.053,0.408-0.063,0.597c-0.032,0.619-0.081,1.262-0.399,1.789
+        c-0.344,0.571-0.24,1.045,0.049,1.556c0.411,0.726,0.998,1.233,1.805,1.473c0.216,0.064,0.444,0.108,0.642-0.002
+        C11.274,15.069,12.238,14.986,13.257,14.946z"/>
+    <path fill="#CF8BFE" d="M16.92,11.417c-0.248,0-0.368,0.005-0.487-0.001c-0.156-0.008-0.262-0.092-0.297-0.245
+        c-0.037-0.161,0.051-0.281,0.186-0.335c0.294-0.118,0.596-0.219,0.898-0.317c0.245-0.079,0.496-0.141,0.743-0.212
+        c0.48-0.137,0.537-0.086,0.689,0.353c0.159,0.461-0.153,0.519-0.447,0.573C17.737,11.318,17.264,11.369,16.92,11.417z"/>
+    <path fill="#CF8BFE" d="M11.785,6.597c0.078-0.501,0.158-1.052,0.25-1.6c0.063-0.378,0.362-0.329,0.61-0.283
+        c0.282,0.052,0.473,0.195,0.346,0.547c-0.182,0.506-0.335,1.022-0.505,1.531c-0.072,0.216-0.175,0.437-0.45,0.385
+        C11.746,7.123,11.777,6.868,11.785,6.597z"/>
+    <path fill="#CF8BFE" d="M14.693,8.893c-0.307-0.002-0.468-0.26-0.292-0.486c0.388-0.501,0.798-0.987,1.226-1.453
+        c0.207-0.225,0.452-0.092,0.631,0.079c0.161,0.154,0.301,0.364,0.087,0.569c-0.472,0.453-0.968,0.879-1.508,1.251
+        C14.792,8.884,14.725,8.885,14.693,8.893z"/>
+    <path fill="#CF8BFE" d="M12.97,11.989c0,0.14,0.021,0.283-0.004,0.419c-0.061,0.328-0.321,0.463-0.563,0.249
+        c-0.644-0.568-1.271-1.159-1.812-1.829c-0.18-0.223-0.127-0.384,0.163-0.488C11.871,9.941,12.986,10.76,12.97,11.989z"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_end.svg b/icons/cp_basal_end.svg
index f510137ad0..3fe2865820 100644
--- a/icons/cp_basal_end.svg
+++ b/icons/cp_basal_end.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_end">
diff --git a/icons/cp_basal_no_tbr.svg b/icons/cp_basal_no_tbr.svg
index 198afcf383..4c08c1afa6 100644
--- a/icons/cp_basal_no_tbr.svg
+++ b/icons/cp_basal_no_tbr.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_no_x5F_tbr">
diff --git a/icons/cp_basal_tbr_high.svg b/icons/cp_basal_tbr_high.svg
index eaa4f986ff..276b614826 100644
--- a/icons/cp_basal_tbr_high.svg
+++ b/icons/cp_basal_tbr_high.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_tbr_x5F_high">
diff --git a/icons/cp_basal_tbr_low.svg b/icons/cp_basal_tbr_low.svg
index d591a1941f..c5cd270693 100644
--- a/icons/cp_basal_tbr_low.svg
+++ b/icons/cp_basal_tbr_low.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_tbr_x5F_low">
diff --git a/icons/cp_bgcheck.svg b/icons/cp_bgcheck.svg
new file mode 100644
index 0000000000..f0215a16d0
--- /dev/null
+++ b/icons/cp_bgcheck.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bgcheck">
+    <path fill="#E9375C" d="M6.384,15.052c-0.018-0.323,0.025-0.625,0.418-0.671c0.36-0.042,0.49,0.218,0.531,0.516
+        c0.155,1.131,0.771,1.799,1.92,1.948c0.336,0.043,0.592,0.192,0.528,0.573c-0.059,0.351-0.373,0.388-0.654,0.387
+        C7.775,17.801,6.4,16.415,6.384,15.052z"/>
+    <path fill="#E83258" d="M18.817,9.875c-0.377-1.485-1.932-3.719-2.256-3.719c-0.325,0-1.884,2.238-2.26,3.721
+        c-0.251,0.991,0.067,1.842,0.943,2.421c0.855,0.565,1.778,0.556,2.632-0.008C18.755,11.712,19.071,10.874,18.817,9.875z
+         M17.437,11.623c-0.297,0.196-0.595,0.295-0.886,0.295c-0.286,0-0.577-0.097-0.866-0.287c-0.586-0.387-0.779-0.882-0.608-1.558
+        c0.236-0.933,0.997-2.169,1.484-2.813c0.486,0.644,1.244,1.878,1.481,2.812C18.213,10.745,18.021,11.237,17.437,11.623z"/>
+    <path fill="#E83258" d="M13.737,13.869c-0.726-2.859-3.893-7.275-4.343-7.275c-0.45,0-3.627,4.425-4.349,7.278
+        c-0.483,1.908,0.128,3.546,1.816,4.66c1.646,1.087,3.422,1.07,5.067-0.015C13.617,17.403,14.225,15.791,13.737,13.869z
+         M11.487,17.85c-0.694,0.457-1.405,0.689-2.112,0.689c-0.698,0-1.396-0.227-2.074-0.675c-1.389-0.916-1.887-2.193-1.481-3.796
+        c0.563-2.22,3.332-6.141,3.574-6.141s3.003,3.917,3.568,6.138C13.368,15.663,12.871,16.937,11.487,17.85z"/>
+</g>
+</svg>
diff --git a/icons/cp_bgcheck2.svg b/icons/cp_bgcheck2.svg
new file mode 100644
index 0000000000..e44b4a49a9
--- /dev/null
+++ b/icons/cp_bgcheck2.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bgcheck2">
+		<path fill="#E83258" d="M9.576,6.295c1.872,3.062,4.551,5.654,4.114,9.509c-0.269,2.368-2.657,3.819-5.025,3.361
+			c-2.253-0.436-3.809-2.675-3.331-4.967C5.954,11.218,7.718,8.829,9.576,6.295z M7.238,12.157c-0.223,0.67-0.514,1.326-0.652,2.013
+			c-0.215,1.068-0.069,2.095,0.803,2.87c0.312,0.277,0.714,0.372,1.091,0.08c0.254-0.197,0.283-0.484,0.101-0.727
+			C7.646,15.142,7.188,13.762,7.238,12.157z"/>
+		<path fill="#E83258" d="M16.521,5.632c0.995,1.348,1.923,2.631,2.308,4.206c0.26,1.06-0.064,1.948-0.962,2.562
+			c-0.874,0.598-1.818,0.607-2.693,0.008c-0.897-0.614-1.222-1.517-0.965-2.568C14.593,8.267,15.516,6.979,16.521,5.632z"/>
+</g>
+</svg>
diff --git a/icons/cp_bolus_carbs.svg b/icons/cp_bolus_carbs.svg
index b62b07c538..9e797f244f 100644
--- a/icons/cp_bolus_carbs.svg
+++ b/icons/cp_bolus_carbs.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_bolus_x5F_carbs">
diff --git a/icons/cp_bolus_combo.svg b/icons/cp_bolus_combo.svg
new file mode 100644
index 0000000000..5e4b9ea0ce
--- /dev/null
+++ b/icons/cp_bolus_combo.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bolus_x5F_combo">
+	<polygon fill="#67DFE8" points="20.104,17.021 20.104,5.958 14.25,5.958 14.25,9.729 9.479,9.729 9.479,17.021 1.609,17.021
+		1.609,18.021 10.479,18.021 10.479,10.729 14.25,10.729 14.25,18.021 15.25,18.021 15.25,6.959 19.104,6.959 19.104,18.021
+		21.708,18.021 21.708,17.021 	"/>
+</g>
+</svg>
diff --git a/icons/cp_bolus_correction.svg b/icons/cp_bolus_correction.svg
index 1ccec87132..f19840b68f 100644
--- a/icons/cp_bolus_correction.svg
+++ b/icons/cp_bolus_correction.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_bolus_x5F_correction">
diff --git a/icons/cp_bolus_meal.svg b/icons/cp_bolus_meal.svg
new file mode 100644
index 0000000000..e9d041c1c0
--- /dev/null
+++ b/icons/cp_bolus_meal.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bolus_x5F_meal">
+    <path fill="#FEAF05" d="M20.528,15.994h-0.547c-0.244-3.433-2.748-6.265-6.013-7.017c-0.095-0.871-0.825-1.553-1.721-1.553
+        c-0.895,0-1.627,0.683-1.721,1.553c-3.264,0.752-5.768,3.584-6.013,7.017H3.966c-0.235,0-0.425,0.19-0.425,0.425
+        s0.19,0.425,0.425,0.425h16.562c0.234,0,0.425-0.19,0.425-0.425S20.763,15.994,20.528,15.994z M12.248,8.076
+        c0.489,0,0.888,0.33,1.024,0.776c-0.336-0.045-0.677-0.077-1.024-0.077c-0.348,0-0.688,0.032-1.025,0.077
+        C11.359,8.407,11.758,8.076,12.248,8.076z M12.248,9.625c3.603,0,6.599,2.82,6.883,6.369H5.365
+        C5.649,12.445,8.645,9.625,12.248,9.625z"/>
+    <path fill="#FEAF05" d="M14.495,10.781c-0.625-0.288-1.503-0.485-2.409-0.541c-0.234-0.014-0.436,0.164-0.45,0.399
+        c-0.014,0.234,0.164,0.436,0.399,0.45c0.792,0.048,1.579,0.222,2.104,0.464c0.049,0.023,0.101,0.035,0.152,0.038
+        c0.17,0.01,0.337-0.083,0.412-0.246C14.801,11.133,14.708,10.88,14.495,10.781z"/>
+    <path fill="#FEAF05" d="M6.657,15.362c-0.031,0.001-0.065-0.003-0.101-0.012c-0.2-0.05-0.323-0.254-0.273-0.454
+        c0.457-1.834,1.769-3.395,3.51-4.178c0.045-0.02,0.094-0.031,0.144-0.033c0.152-0.004,0.29,0.083,0.352,0.221
+        c0.041,0.092,0.045,0.194,0.009,0.287c-0.036,0.094-0.106,0.168-0.197,0.208c-1.534,0.69-2.689,2.063-3.09,3.674
+        C6.971,15.241,6.825,15.358,6.657,15.362z"/>
+</g>
+</svg>
diff --git a/icons/cp_bolus_snack.svg b/icons/cp_bolus_snack.svg
new file mode 100644
index 0000000000..61abed4a14
--- /dev/null
+++ b/icons/cp_bolus_snack.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bolus_x5F_snack">
+	<path display="inline" fill="#6EE870" d="M17.44,12.691c0.014,1.998-0.63,3.425-1.684,4.674c-0.756,0.896-1.908,1.144-3.027,0.72
+		c-0.27-0.103-0.531-0.139-0.812-0.054c-1.598,0.482-2.731,0.144-3.638-1.256c-1.076-1.661-1.531-3.49-0.981-5.454
+		c0.555-1.984,2.385-2.847,4.309-2.074c0.339,0.136,0.662,0.212,1.037,0.098C15.682,8.411,17.449,9.77,17.44,12.691z M7.763,12.765
+		c-0.006,1.123,0.402,2.593,0.959,3.451c0.831,1.281,1.572,1.552,2.999,1.081c0.395-0.13,0.796-0.165,1.16,0.026
+		c1.13,0.59,1.993,0.123,2.64-0.754c1.042-1.413,1.47-3.04,1.154-4.781c-0.33-1.819-1.703-2.542-3.398-1.858
+		c-0.705,0.284-1.379,0.274-2.075-0.025c-0.302-0.13-0.639-0.24-0.963-0.25C8.675,9.61,7.774,10.759,7.763,12.765z"/>
+	<path display="inline" fill="#6EE870" d="M11.034,8.824C9.913,8.797,8.47,7.663,8.178,6.641c-0.096-0.336,0.125-0.317,0.31-0.346
+		c1.093-0.175,2.761,0.947,3.053,2.037C11.689,8.884,11.28,8.779,11.034,8.824z M9.202,7.065c0.365,0.575,0.753,0.928,1.424,0.999
+		C10.312,7.475,9.882,7.186,9.202,7.065z"/>
+	<path display="inline" fill="#6EE870" d="M12.186,6.575c0.592-0.057,0.772,0.169,0.702,0.626c-0.08,0.527-0.166,1.054-0.23,1.583
+		c-0.029,0.236-0.132,0.363-0.368,0.378c-0.256,0.016-0.417-0.091-0.451-0.358c-0.077-0.607-0.184-1.212-0.225-1.821
+		C11.582,6.479,12.031,6.635,12.186,6.575z"/>
+</g>
+</svg>
diff --git a/icons/cp_cgm_insert.svg b/icons/cp_cgm_insert.svg
new file mode 100644
index 0000000000..975cce05b5
--- /dev/null
+++ b/icons/cp_cgm_insert.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_cgm_x5F_insert">
+	<path display="inline" fill="#67DFE8" d="M22.44,7.685l-1.772-1.804L7.299,6.383C5.777,6.404,4.707,7.29,4.373,8.099
+		c-1.247,0.944-2.605,2.549-2.668,3.198c-0.035,0.357,0.038,0.638,0.216,0.834c0.104,0.115,0.292,0.251,0.599,0.251h18.345
+		c0.719,0,1.282-0.721,1.282-1.642c0-0.065-0.011-0.137-0.028-0.213c0.221-0.181,0.402-0.429,0.53-0.737
+		C22.965,9.026,22.875,8.119,22.44,7.685z M5.398,8.111C5.56,7.917,6.176,7.283,7.322,7.267l12.99-0.488l1.501,1.528
+		c0.139,0.139,0.217,0.666,0.019,1.144c-0.146,0.352-0.375,0.531-0.682,0.531h-2.753l-2.385-0.57H13.83
+		c-0.459,0-0.699-0.151-0.713-0.449l-0.021-0.421l-7.942,0C5.177,8.45,5.246,8.294,5.398,8.111z M20.865,11.498l-18.284,0
+		c-0.002-0.025-0.002-0.059,0.002-0.103c0.061-0.277,0.881-1.363,1.879-2.229C4.61,9.327,4.83,9.423,5.1,9.427h7.216
+		c0.201,0.546,0.748,0.87,1.514,0.87h2.078l2.385,0.57h2.857c0.036,0,0.07-0.002,0.105-0.004
+		C21.219,11.258,21.016,11.498,20.865,11.498z"/>
+	<path display="inline" fill="#67DFE8" d="M15.313,15.801c-0.167-0.195-0.463-0.218-0.659-0.052l-2.228,1.903v-4.09
+		c0-0.259-0.209-0.468-0.468-0.468s-0.468,0.209-0.468,0.468v4.09l-2.229-1.904c-0.196-0.167-0.492-0.145-0.659,0.052
+		c-0.168,0.196-0.145,0.491,0.052,0.659l3,2.563c0.023,0.02,0.05,0.03,0.076,0.044c0.018,0.01,0.033,0.023,0.052,0.03
+		c0.057,0.023,0.116,0.038,0.176,0.038s0.12-0.015,0.176-0.038c0.019-0.008,0.034-0.02,0.052-0.03
+		c0.025-0.015,0.053-0.025,0.076-0.044l3-2.563C15.458,16.292,15.481,15.997,15.313,15.801z"/>
+</g>
+</svg>
diff --git a/icons/cp_cgm_profile.svg b/icons/cp_cgm_profile.svg
new file mode 100644
index 0000000000..ac80ef0916
--- /dev/null
+++ b/icons/cp_cgm_profile.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_cgm_x5F_profile">
+	<path display="inline" fill="#FFFFFF" d="M19.744,9.7c-0.135-0.417-0.494-0.72-0.928-0.783l-3.997-0.581L13.03,4.714
+		c-0.387-0.786-1.675-0.786-2.061,0L9.181,8.336L5.183,8.918C4.751,8.98,4.39,9.284,4.255,9.7c-0.135,0.416-0.023,0.873,0.291,1.178
+		l2.894,2.819L6.757,17.68c-0.074,0.432,0.103,0.868,0.457,1.125c0.2,0.146,0.437,0.22,0.676,0.22c0.183,0,0.367-0.044,0.535-0.133
+		L12,17.013l3.576,1.879c0.39,0.203,0.855,0.173,1.212-0.087c0.353-0.257,0.531-0.694,0.456-1.125l-0.683-3.983l2.893-2.819
+		C19.766,10.573,19.881,10.116,19.744,9.7z M18.689,10.261l-3.16,3.081l0.746,4.35c0.014,0.087-0.021,0.174-0.092,0.225
+		c-0.04,0.03-0.087,0.044-0.135,0.044c-0.036,0-0.073-0.008-0.108-0.027l-3.907-2.053l-3.907,2.053
+		c-0.075,0.044-0.17,0.036-0.242-0.017c-0.07-0.051-0.106-0.138-0.091-0.225l0.746-4.35l-3.162-3.081
+		c-0.063-0.061-0.085-0.153-0.058-0.236c0.027-0.083,0.099-0.143,0.185-0.156l4.369-0.634l1.954-3.959
+		c0.078-0.158,0.334-0.158,0.412,0l1.953,3.959l4.369,0.634c0.087,0.013,0.158,0.073,0.185,0.156S18.753,10.2,18.689,10.261z"/>
+</g>
+</svg>
diff --git a/icons/cp_cgm_start.svg b/icons/cp_cgm_start.svg
new file mode 100644
index 0000000000..81211f451f
--- /dev/null
+++ b/icons/cp_cgm_start.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_cgm_x5F_start">
+	<path display="inline" fill="#36FF00" d="M9.955,11.969c-0.154,0-0.306-0.071-0.404-0.205c-0.164-0.223-0.115-0.536,0.107-0.699
+		c1.828-1.34,4.354-1.34,6.184-0.001c0.223,0.164,0.271,0.477,0.107,0.699c-0.162,0.224-0.475,0.271-0.699,0.108
+		c-1.482-1.086-3.518-1.086-5,0C10.161,11.938,10.057,11.969,9.955,11.969z"/>
+	<path display="inline" fill="#36FF00" d="M16.804,10.249c-0.103,0-0.207-0.032-0.296-0.097c-2.205-1.616-5.311-1.616-7.516,0
+		c-0.225,0.163-0.536,0.115-0.7-0.108C8.129,9.821,8.177,9.508,8.4,9.344c2.551-1.868,6.149-1.868,8.7,0
+		c0.223,0.164,0.271,0.477,0.107,0.7C17.109,10.178,16.957,10.249,16.804,10.249z"/>
+	<path display="inline" fill="#36FF00" d="M18.155,8.4c-0.103,0-0.206-0.032-0.296-0.097c-2.998-2.196-7.221-2.196-10.219,0
+		C7.417,8.466,7.105,8.418,6.941,8.195C6.778,7.973,6.826,7.66,7.049,7.496c1.671-1.224,3.643-1.872,5.701-1.872
+		c2.058,0,4.029,0.647,5.701,1.872c0.223,0.164,0.271,0.477,0.107,0.699C18.461,8.329,18.309,8.4,18.155,8.4z"/>
+	<path display="inline" fill="#36FF00" d="M22.44,14.727l-1.772-1.804l-13.37,0.502c-1.522,0.021-2.591,0.907-2.926,1.717
+		c-1.247,0.944-2.605,2.549-2.668,3.198c-0.035,0.357,0.038,0.638,0.216,0.834c0.104,0.115,0.292,0.251,0.599,0.251h18.345
+		c0.719,0,1.282-0.721,1.282-1.642c0-0.065-0.011-0.137-0.028-0.213c0.221-0.181,0.402-0.429,0.53-0.737
+		C22.965,16.067,22.875,15.161,22.44,14.727z M5.398,15.153c0.162-0.194,0.778-0.829,1.923-0.844l12.99-0.488l1.501,1.528
+		c0.139,0.139,0.217,0.666,0.019,1.144c-0.146,0.352-0.375,0.531-0.682,0.531h-2.753l-2.385-0.57H13.83
+		c-0.459,0-0.699-0.151-0.713-0.449l-0.021-0.421l-7.942,0C5.177,15.492,5.246,15.336,5.398,15.153z M20.865,18.539l-18.284,0
+		c-0.002-0.025-0.002-0.059,0.002-0.103c0.061-0.277,0.881-1.363,1.879-2.229C4.61,16.369,4.83,16.465,5.1,16.469h7.216
+		c0.201,0.546,0.748,0.87,1.514,0.87h2.078l2.385,0.57h2.857c0.036,0,0.07-0.002,0.105-0.004
+		C21.219,18.3,21.016,18.539,20.865,18.539z"/>
+</g>
+</svg>
diff --git a/icons/cp_cgm_target.svg b/icons/cp_cgm_target.svg
new file mode 100644
index 0000000000..6be0fbc378
--- /dev/null
+++ b/icons/cp_cgm_target.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_cgm_x5F_target">
+	<path fill="#36FF00" d="M18.031,11.646H17.37c-0.178-2.697-2.318-4.837-5.015-5.015V5.969c0-0.196-0.159-0.354-0.354-0.354
+		s-0.354,0.159-0.354,0.354V6.63C8.948,6.808,6.808,8.948,6.63,11.646H5.969c-0.196,0-0.354,0.159-0.354,0.354
+		s0.159,0.354,0.354,0.354H6.63c0.178,2.697,2.318,4.837,5.015,5.015v0.662c0,0.195,0.159,0.354,0.354,0.354
+		s0.354-0.159,0.354-0.354V17.37c2.697-0.178,4.837-2.318,5.015-5.015h0.662c0.195,0,0.354-0.159,0.354-0.354
+		S18.227,11.646,18.031,11.646z M16.622,11.646h-1.748c-0.161-1.329-1.197-2.376-2.52-2.553V7.371
+		C14.642,7.545,16.452,9.357,16.622,11.646z M13.386,12.354h0.843c-0.154,0.97-0.908,1.735-1.874,1.901v-0.869
+		c0-0.195-0.159-0.354-0.354-0.354s-0.354,0.159-0.354,0.354v0.876c-0.999-0.14-1.787-0.914-1.944-1.908h0.913
+		c0.196,0,0.354-0.159,0.354-0.354s-0.159-0.354-0.354-0.354H9.701c0.153-0.998,0.943-1.778,1.945-1.918v0.888
+		c0,0.196,0.159,0.354,0.354,0.354s0.354-0.159,0.354-0.354v-0.88c0.97,0.166,1.725,0.936,1.875,1.911h-0.844
+		c-0.195,0-0.354,0.159-0.354,0.354S13.19,12.354,13.386,12.354z M11.646,7.372v1.713c-1.358,0.148-2.429,1.208-2.593,2.561H7.383
+		C7.554,9.359,9.361,7.548,11.646,7.372z M7.385,12.354h1.667c0.164,1.353,1.235,2.413,2.593,2.561v1.693
+		C9.367,16.432,7.565,14.632,7.385,12.354z M12.354,16.609v-1.701c1.324-0.177,2.359-1.224,2.52-2.553h1.746
+		C16.441,14.633,14.635,16.435,12.354,16.609z"/>
+</g>
+</svg>
diff --git a/icons/cp_exercise.svg b/icons/cp_exercise.svg
new file mode 100644
index 0000000000..7552611fcc
--- /dev/null
+++ b/icons/cp_exercise.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_exercise">
+    <path fill="#67DFE8" d="M19.75,12.706c1.526,0,2.769-1.242,2.769-2.769s-1.242-2.769-2.769-2.769s-2.769,1.242-2.769,2.769
+        S18.224,12.706,19.75,12.706z M19.75,8.019c1.058,0,1.919,0.86,1.919,1.918s-0.861,1.918-1.919,1.918s-1.919-0.86-1.919-1.918
+        S18.692,8.019,19.75,8.019z"/>
+    <path fill="#67DFE8" d="M23.841,15.936c-0.039-0.052-0.956-1.265-2.311-1.265c-1.007,0-1.661,0.626-2.239,1.18
+        c-0.512,0.489-0.954,0.913-1.572,0.913h-0.001c-0.504,0-0.916-0.294-1.326-0.655l2.136-1.613l-5.841-7.737l-5.636,4.256
+        c-0.332,0.294-0.804,1.059-0.211,1.845c0.274,0.363,0.594,0.472,0.814,0.499c0.524,0.064,0.946-0.265,0.981-0.292l3.539-2.671
+        l0.867,1.148l-5.085,3.838c-0.476-0.427-1.015-0.776-1.674-0.776c0,0-0.001,0-0.001,0c-1.011,0-1.87,0.779-2.627,1.467
+        c-0.452,0.41-0.965,0.876-1.248,0.876c-0.549,0-1.259-0.787-1.465-1.063c-0.14-0.188-0.405-0.227-0.595-0.087
+        c-0.188,0.14-0.228,0.405-0.088,0.594c0.106,0.145,1.074,1.406,2.147,1.406c0.611,0,1.171-0.508,1.819-1.096
+        c0.644-0.584,1.374-1.247,2.056-1.247h0c0.601,0,1.127,0.548,1.684,1.128c0.619,0.645,1.259,1.311,2.128,1.311
+        c0.83,0,1.531-0.574,2.209-1.131c0.634-0.52,1.289-1.057,1.979-1.057c0.411,0.001,0.798,0.356,1.244,0.768
+        c0.581,0.534,1.238,1.14,2.193,1.14h0.001c0.96,0,1.598-0.61,2.16-1.148c0.529-0.507,0.986-0.944,1.651-0.944
+        c0.923,0,1.621,0.914,1.628,0.924c0.142,0.188,0.407,0.224,0.595,0.085C23.94,16.389,23.98,16.124,23.841,15.936z M11.763,16.105
+        c-0.588,0.482-1.144,0.938-1.669,0.938c-0.507-0.001-0.997-0.511-1.515-1.05c-0.003-0.003-0.006-0.006-0.009-0.009l5.663-4.275
+        L12.34,9.204l-4.229,3.193c-0.028,0.023-0.207,0.146-0.354,0.117c-0.031-0.004-0.124-0.015-0.238-0.166
+        c-0.25-0.332,0.013-0.619,0.071-0.675l4.932-3.722l4.815,6.38l-1.591,1.201c-0.426-0.366-0.885-0.674-1.466-0.674
+        C13.286,14.856,12.477,15.52,11.763,16.105z"/>
+</g>
+</svg>
diff --git a/icons/cp_note.svg b/icons/cp_note.svg
new file mode 100644
index 0000000000..52c783a3c6
--- /dev/null
+++ b/icons/cp_note.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_note">
+	<path display="inline" fill="#FEAF05" d="M13.909,5.715l-7.634,7.634c-0.061,0.061-0.102,0.139-0.118,0.224l-0.911,4.941
+		c-0.025,0.138,0.019,0.279,0.118,0.378c0.099,0.099,0.24,0.143,0.378,0.118l4.941-0.911c0.085-0.016,0.163-0.057,0.224-0.118
+		l7.634-7.634c0.445-0.445,0.444-1.17-0.003-1.617l-3.012-3.012C15.079,5.271,14.354,5.27,13.909,5.715z M9.891,16.927
+		c0.097,0.097,0.132,0.24,0.091,0.371c-0.018,0.058-0.05,0.109-0.091,0.15c-0.053,0.053-0.121,0.089-0.197,0.102l-2.462,0.435
+		c-0.244-0.008-0.486-0.103-0.673-0.29c-0.187-0.187-0.282-0.429-0.29-0.673l0.435-2.463c0.024-0.135,0.121-0.246,0.252-0.287
+		c0.131-0.041,0.274-0.006,0.371,0.091L9.891,16.927z M17.903,9.269c0.141,0.141,0.141,0.369,0,0.509l-6.746,6.746
+		c-0.141,0.141-0.369,0.141-0.509,0l-0.265-0.265c-0.141-0.141-0.141-0.369,0-0.509l6.746-6.746c0.141-0.141,0.369-0.141,0.509,0
+		L17.903,9.269z M16.588,7.933c0.141,0.141,0.141,0.369,0,0.509l-6.746,6.746c-0.141,0.141-0.369,0.141-0.509,0l-0.265-0.265
+		c-0.141-0.141-0.141-0.369,0-0.509l6.746-6.746c0.141-0.141,0.369-0.141,0.509,0L16.588,7.933z M15.273,6.596
+		c0.141,0.141,0.141,0.369,0,0.509l-6.746,6.746c-0.141,0.141-0.369,0.141-0.509,0l-0.265-0.265c-0.141-0.141-0.141-0.369,0-0.509
+		l6.746-6.746c0.141-0.141,0.369-0.141,0.509,0L15.273,6.596z"/>
+</g>
+</svg>
diff --git a/icons/cp_pump_battery.svg b/icons/cp_pump_battery.svg
new file mode 100644
index 0000000000..6c3c3f605c
--- /dev/null
+++ b/icons/cp_pump_battery.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_pump_x5F_battery">
+    <path fill="#36FF00" d="M20.234,10.422c-0.362,0-0.656,0.294-0.656,0.656v0.297h-0.469V9.031c0-0.87-0.708-1.578-1.578-1.578
+        H4.188c-0.87,0-1.578,0.708-1.578,1.578v5.938c0,0.87,0.708,1.578,1.578,1.578h13.344c0.72,0,1.323-0.488,1.511-1.149
+        c0.01,0.001,0.018,0.006,0.028,0.006c0.332,0,0.602-0.297,0.602-0.664c0-0.351-0.25-0.632-0.563-0.655v-1.46h0.469v0.297
+        c0,0.362,0.294,0.656,0.656,0.656s0.656-0.294,0.656-0.656v-1.844C20.891,10.716,20.597,10.422,20.234,10.422z M18.109,14.969
+        c0,0.318-0.26,0.578-0.578,0.578H4.188c-0.319,0-0.578-0.26-0.578-0.578V9.031c0-0.319,0.259-0.578,0.578-0.578h13.344
+        c0.318,0,0.578,0.259,0.578,0.578V14.969z"/>
+    <polygon fill="#36FF00" points="9.703,10.273 5.766,13.195 9.219,11.977 11,13.742 15.438,10.258 11.141,11.945 		"/>
+</g>
+</svg>
diff --git a/icons/cp_pump_canula.svg b/icons/cp_pump_canula.svg
new file mode 100644
index 0000000000..ac0c9f8304
--- /dev/null
+++ b/icons/cp_pump_canula.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_pump_x5F_canula">
+	<path fill="#67DFE8" d="M23.706,7.373c-0.149-0.541-0.728-0.854-1.294-0.699L19.87,7.373c-0.325-0.913-1.301-1.438-2.255-1.175
+		l-3.008,0.826c-0.954,0.262-1.525,1.212-1.338,2.163l-2.542,0.698c-0.499,0.137-0.799,0.593-0.767,1.07
+		c-1.696,0.439-3.037,0.067-4.101-0.248c-1.047-0.309-1.951-0.578-2.713,0.152c-1.307,1.253-0.369,2.87,0.384,4.17
+		c0.501,0.863,1.019,1.757,0.766,2.3c-0.519,1.124-2.729,1.128-3.537,1.033c-0.203-0.022-0.392,0.122-0.417,0.328
+		c-0.024,0.206,0.123,0.391,0.329,0.414c0.086,0.01,1.376,0.152,2.554-0.172c0.734-0.202,1.424-0.585,1.753-1.292
+		c0.416-0.896-0.173-1.912-0.797-2.987c-0.844-1.456-1.336-2.47-0.515-3.257c0.426-0.409,0.972-0.272,1.977,0.026
+		c1.128,0.334,2.648,0.808,4.674,0.215c0.255,0.206,0.598,0.304,0.949,0.207l5.63-1.547l2.016,7.338l0.127-1.203l-1.718-6.252
+		l5.63-1.547C23.517,8.479,23.855,7.914,23.706,7.373z"/>
+</g>
+</svg>
diff --git a/icons/cp_pump_cartridge.svg b/icons/cp_pump_cartridge.svg
new file mode 100644
index 0000000000..4871ca4a33
--- /dev/null
+++ b/icons/cp_pump_cartridge.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_pump_x5F_cartridge">
+		<path fill="#FEAF05" d="M21.266,9.094c-0.356,0.204-0.798,0.102-0.987-0.227l-1.241-2.164c-0.189-0.33-0.054-0.762,0.302-0.967
+			l0,0c0.356-0.204,0.798-0.102,0.987,0.227l1.241,2.164C21.758,8.457,21.622,8.89,21.266,9.094L21.266,9.094z"/>
+		<path fill="#FEAF05" d="M7.644,18.842L7.44,18.488l12.834-7.356c0.118-0.068,0.196-0.187,0.21-0.32l0.188-3.195l-0.355-0.619
+			l-2.852-1.452c-0.122-0.055-0.264-0.048-0.382,0.02L4.249,12.921l-0.204-0.354C3.8,12.14,3.246,11.998,2.807,12.25
+			c-0.44,0.252-0.597,0.802-0.353,1.229l3.599,6.276c0.245,0.427,0.799,0.569,1.238,0.317C7.73,19.819,7.888,19.269,7.644,18.842z
+			 M18.885,10.994l-1.476-2.318c-0.072-0.113-0.225-0.145-0.342-0.07c-0.113,0.071-0.151,0.216-0.086,0.329
+			c0.002,0.003,0.004,0.007,0.006,0.01l1.465,2.299l-0.986,0.565L15.988,9.49c-0.072-0.113-0.225-0.145-0.342-0.07
+			c-0.113,0.071-0.151,0.216-0.086,0.329c0.002,0.003,0.004,0.007,0.006,0.01l1.465,2.299l-0.986,0.565l-1.477-2.318
+			c-0.072-0.113-0.225-0.145-0.342-0.07c-0.113,0.071-0.151,0.216-0.086,0.329c0.002,0.003,0.004,0.007,0.006,0.01l1.465,2.299
+			l-0.858,0.492l-2.033-3.252C12.65,10,12.503,9.965,12.386,10.032l-7.372,4.225l-0.363-0.633l12.645-7.247l2.537,1.309
+			l-0.152,2.852L18.885,10.994z"/>
+</g>
+</svg>
diff --git a/icons/cp_question.svg b/icons/cp_question.svg
new file mode 100644
index 0000000000..512bc763bc
--- /dev/null
+++ b/icons/cp_question.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_question">
+	<circle fill="#FEAF05" cx="12.042" cy="18.479" r="0.979"/>
+	<path fill="#FEAF05" d="M12,16.126c-0.392,0-0.708-0.317-0.708-0.709c0-2.548,1.188-3.437,2.142-4.151
+		c0.8-0.599,1.378-1.032,1.378-2.432c0-1.931-1.854-2.531-2.53-2.531c-1.456,0-2.631,0.873-3.225,2.393
+		C8.914,9.06,8.501,9.241,8.138,9.098C7.773,8.955,7.594,8.544,7.736,8.18c0.806-2.063,2.505-3.294,4.545-3.294
+		c1.592,0,3.948,1.255,3.948,3.948c0,2.11-1.079,2.917-1.946,3.566c-0.88,0.659-1.574,1.178-1.574,3.017
+		C12.709,15.809,12.392,16.126,12,16.126z"/>
+</g>
+</svg>
diff --git a/icons/danar_useropt.svg b/icons/danar_useropt.svg
new file mode 100644
index 0000000000..e8d8e76097
--- /dev/null
+++ b/icons/danar_useropt.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="danar_x5F_useropt">
+    <path fill="#6AE86D" d="M13.351,12.926c-0.137-0.003-0.283,0.012-0.337-0.17c-0.046-0.155,0.002-0.266,0.122-0.366
+        c0.628-0.523,0.741-1.232,0.711-2.042c0-0.148,0.013-0.348-0.002-0.546c-0.071-0.91-0.785-1.606-1.718-1.686
+        c-0.845-0.073-1.71,0.485-1.862,1.344c-0.184,1.039-0.278,2.111,0.636,2.933c0.115,0.104,0.172,0.206,0.12,0.363
+        c-0.059,0.177-0.201,0.171-0.34,0.169c-0.347-0.005-0.668,0.083-0.97,0.249c-0.973,0.535-1.043,1.404-0.165,2.061
+        c1.299,0.974,3.949,0.841,5.144-0.257c0.471-0.433,0.508-0.927,0.084-1.408C14.4,13.146,13.918,12.937,13.351,12.926z
+         M13.572,14.889c-1.202,0.486-2.407,0.499-3.555-0.158c-0.579-0.331-0.548-0.663,0.046-0.976c0.248-0.131,0.517-0.214,0.801-0.195
+        c0.348,0.024,0.636-0.047,0.765-0.414c0.14-0.399,0.306-0.823-0.105-1.149c-0.661-0.524-0.705-1.225-0.666-1.98
+        c0.039-0.729,0.51-1.259,1.159-1.248c0.662,0.011,1.13,0.529,1.146,1.269c0.003,0.119,0,0.239,0,0.456
+        c0.097,0.503-0.086,0.988-0.564,1.377c-0.395,0.321-0.385,0.738-0.235,1.187c0.15,0.448,0.477,0.542,0.89,0.506
+        c0.039-0.003,0.08,0.004,0.118,0.014c0.389,0.093,0.879,0.167,0.948,0.599C14.392,14.615,13.901,14.756,13.572,14.889z"/>
+    <path fill="#6AE86D" d="M19.107,10.662H17.78c-0.15-0.648-0.406-1.253-0.749-1.801l0.941-0.941c0.239-0.239,0.239-0.626,0-0.864
+        l-1.027-1.027c-0.239-0.239-0.626-0.239-0.864,0l-0.941,0.941c-0.548-0.343-1.154-0.599-1.801-0.749V4.893
+        c0-0.338-0.274-0.611-0.611-0.611h-1.453c-0.338,0-0.611,0.274-0.611,0.611V6.22c-0.648,0.15-1.253,0.406-1.801,0.749L7.92,6.028
+        c-0.239-0.239-0.626-0.239-0.864,0L6.028,7.056c-0.239,0.239-0.239,0.626,0,0.864l0.941,0.941
+        C6.626,9.409,6.37,10.015,6.22,10.662H4.893c-0.338,0-0.611,0.274-0.611,0.611v1.453c0,0.338,0.274,0.611,0.611,0.611H6.22
+        c0.15,0.648,0.406,1.253,0.749,1.801L6.028,16.08c-0.239,0.239-0.239,0.626,0,0.864l1.027,1.027c0.239,0.239,0.626,0.239,0.864,0
+        l0.941-0.941c0.548,0.343,1.154,0.599,1.801,0.749v1.328c0,0.338,0.274,0.611,0.611,0.611h1.453c0.338,0,0.611-0.274,0.611-0.611
+        V17.78c0.648-0.15,1.254-0.406,1.801-0.749l0.941,0.941c0.239,0.239,0.626,0.239,0.864,0l1.027-1.027
+        c0.239-0.239,0.239-0.626,0-0.864l-0.941-0.941c0.343-0.548,0.599-1.154,0.749-1.801h1.328c0.338,0,0.611-0.274,0.611-0.611
+        v-1.453C19.719,10.936,19.445,10.662,19.107,10.662z M12,16.938c-2.723,0-4.938-2.215-4.938-4.938S9.277,7.063,12,7.063
+        S16.938,9.277,16.938,12S14.723,16.938,12,16.938z"/>
+</g>
+</svg>
diff --git a/icons/danarhistory.svg b/icons/danarhistory.svg
new file mode 100644
index 0000000000..e7e972b989
--- /dev/null
+++ b/icons/danarhistory.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="danarhistory">
+		<path fill="#67DFE8" d="M12.069,3.578c-4.48,0-8.144,3.518-8.398,7.936L2.71,10.552c-0.268-0.267-0.699-0.267-0.966,0
+			c-0.267,0.267-0.267,0.699,0,0.966l2.103,2.102c0.133,0.133,0.308,0.2,0.483,0.2c0.175,0,0.35-0.067,0.483-0.2l2.102-2.102
+			c0.267-0.267,0.267-0.699,0-0.966c-0.267-0.267-0.699-0.267-0.966,0L5.04,11.461c0.277-3.64,3.32-6.518,7.03-6.518
+			c3.891,0,7.057,3.166,7.057,7.057c0,3.891-3.166,7.057-7.057,7.057c-1.921,0-3.719-0.762-5.062-2.148
+			c-0.263-0.27-0.695-0.276-0.966-0.015c-0.271,0.262-0.278,0.695-0.015,0.966c1.603,1.652,3.749,2.562,6.043,2.562
+			c4.644,0,8.423-3.779,8.423-8.423S16.714,3.578,12.069,3.578z"/>
+		<path fill="#67DFE8" d="M12.069,12.683h3.814c0.377,0,0.683-0.306,0.683-0.683s-0.305-0.683-0.683-0.683h-3.131V6.915
+			c0-0.377-0.306-0.683-0.683-0.683s-0.683,0.306-0.683,0.683V12C11.387,12.377,11.692,12.683,12.069,12.683z"/>
+</g>
+</svg>
diff --git a/icons/danarprofile.svg b/icons/danarprofile.svg
new file mode 100644
index 0000000000..0a71fe319e
--- /dev/null
+++ b/icons/danarprofile.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="danarprofile">
+	<path fill="#FFFFFF" d="M21.089,9.375c-0.158-0.489-0.58-0.845-1.089-0.918l-4.691-0.682l-2.099-4.251
+		c-0.454-0.922-1.965-0.922-2.419,0L8.691,7.774L4,8.457C3.492,8.53,3.069,8.886,2.911,9.375c-0.159,0.488-0.027,1.024,0.341,1.382
+		l3.396,3.308L5.847,18.74c-0.087,0.508,0.121,1.019,0.536,1.32c0.235,0.171,0.513,0.258,0.793,0.258
+		c0.215,0,0.43-0.052,0.627-0.156L12,17.957l4.197,2.205c0.457,0.238,1.004,0.203,1.422-0.102c0.415-0.301,0.623-0.814,0.535-1.32
+		l-0.801-4.674l3.395-3.308C21.115,10.399,21.248,9.863,21.089,9.375z M19.85,10.033l-3.709,3.616l0.876,5.105
+		c0.017,0.102-0.024,0.205-0.108,0.264c-0.046,0.035-0.102,0.052-0.158,0.052c-0.043,0-0.086-0.009-0.126-0.032l-4.585-2.41
+		l-4.586,2.41c-0.088,0.052-0.199,0.043-0.284-0.02c-0.083-0.059-0.125-0.162-0.107-0.264l0.876-5.105l-3.711-3.616
+		C4.154,9.962,4.128,9.854,4.16,9.756s0.116-0.168,0.218-0.183l5.128-0.745l2.293-4.646c0.091-0.186,0.392-0.186,0.483,0
+		l2.292,4.646l5.128,0.745c0.102,0.015,0.186,0.086,0.218,0.183S19.925,9.962,19.85,10.033z"/>
+</g>
+</svg>
diff --git a/icons/danarstat.svg b/icons/danarstat.svg
new file mode 100644
index 0000000000..fa6a91e9ec
--- /dev/null
+++ b/icons/danarstat.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="danarstats">
+			<line fill="none" stroke="#FEAF05" stroke-width="2.2677" stroke-linecap="round" stroke-miterlimit="10" x1="5.719" y1="19.125" x2="5.719" y2="11.828"/>
+			<line fill="none" stroke="#FEAF05" stroke-width="2.2677" stroke-linecap="round" stroke-miterlimit="10" x1="9.792" y1="19.125" x2="9.792" y2="8.01"/>
+			<line fill="none" stroke="#FEAF05" stroke-width="2.2677" stroke-linecap="round" stroke-miterlimit="10" x1="13.865" y1="19.125" x2="13.865" y2="9.51"/>
+			<line fill="none" stroke="#FEAF05" stroke-width="2.2677" stroke-linecap="round" stroke-miterlimit="10" x1="17.938" y1="19.125" x2="17.938" y2="4.594"/>
+</g>
+</svg>
diff --git a/icons/local_activate.svg b/icons/local_activate.svg
new file mode 100644
index 0000000000..26b70b1406
--- /dev/null
+++ b/icons/local_activate.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="local_x5F_activate">
+	<g>
+		<path fill="#67DFE8" d="M12.069,20.423c-4.644,0-8.422-3.779-8.422-8.423s3.778-8.422,8.422-8.422S20.492,7.355,20.492,12
+			S16.713,20.423,12.069,20.423z M12.069,4.943c-3.891,0-7.057,3.166-7.057,7.057c0,3.891,3.166,7.057,7.057,7.057
+			c3.891,0,7.057-3.166,7.057-7.057C19.126,8.109,15.961,4.943,12.069,4.943z"/>
+		<path fill="#67DFE8" d="M9.945,16.362c-0.113,0-0.227-0.028-0.33-0.085c-0.217-0.12-0.353-0.349-0.353-0.598V8.32
+			c0-0.249,0.135-0.478,0.353-0.598c0.218-0.12,0.485-0.112,0.694,0.021l5.827,3.679c0.198,0.125,0.318,0.343,0.318,0.577
+			s-0.12,0.452-0.318,0.577l-5.827,3.679C10.198,16.326,10.072,16.362,9.945,16.362z M10.627,9.559v4.881L14.493,12L10.627,9.559z"
+			/>
+	</g>
+</g>
+</svg>
diff --git a/icons/local_reset.svg b/icons/local_reset.svg
new file mode 100644
index 0000000000..7fa5e1e983
--- /dev/null
+++ b/icons/local_reset.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="local_x5F_reset">
+	<path fill="#E93057" d="M13.787,4.15c-4.338,0-7.867,3.529-7.867,7.867v5.193l-2.486-2.485c-0.25-0.248-0.653-0.248-0.902,0
+		c-0.249,0.249-0.249,0.653,0,0.902l3.575,3.574c0.008,0.008,0.019,0.011,0.028,0.018c0.054,0.048,0.112,0.091,0.18,0.119
+		c0.078,0.032,0.161,0.049,0.244,0.049s0.166-0.017,0.244-0.049c0.068-0.028,0.126-0.071,0.18-0.119
+		c0.008-0.008,0.019-0.01,0.028-0.018l3.575-3.574c0.249-0.249,0.249-0.653,0-0.902c-0.249-0.248-0.653-0.248-0.902,0l-2.486,2.485
+		v-5.193c0-3.635,2.957-6.592,6.591-6.592c3.635,0,6.592,2.957,6.592,6.592c0,1.761-0.686,3.415-1.931,4.66
+		c-0.249,0.249-0.249,0.653,0,0.902c0.25,0.248,0.652,0.248,0.902,0c1.485-1.486,2.304-3.461,2.304-5.563
+		C21.654,7.68,18.125,4.15,13.787,4.15z"/>
+</g>
+</svg>
diff --git a/icons/local_save.svg b/icons/local_save.svg
new file mode 100644
index 0000000000..b587d78d2a
--- /dev/null
+++ b/icons/local_save.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="local_x5F_save">
+		<path fill="#67E86A" d="M16.763,17.562c0,0.424-0.341,0.769-0.761,0.769H6.883c-0.42,0-0.762-0.345-0.762-0.769V8.397
+			c0-0.424,0.342-0.769,0.762-0.769h7.342l0.959-1.417H6.883c-1.202,0-2.179,0.98-2.179,2.186v9.165
+			c0,1.205,0.977,2.187,2.179,2.187h9.119c1.201,0,2.179-0.981,2.179-2.187V9.266l-1.418,2.096V17.562z"/>
+		<path fill="#67E86A" d="M18.824,4.573c-0.326-0.221-0.766-0.135-0.984,0.19l-5.944,8.787l-2.518-2.53
+			c-0.277-0.277-0.726-0.279-1.002-0.002c-0.277,0.276-0.278,0.725-0.002,1.002l3.125,3.141c0.134,0.134,0.315,0.209,0.502,0.209
+			c0.022,0,0.044-0.001,0.066-0.004c0.211-0.02,0.402-0.133,0.521-0.308l6.427-9.501C19.233,5.232,19.148,4.792,18.824,4.573z"/>
+</g>
+</svg>
diff --git a/icons/loop_closed.svg b/icons/loop_closed.svg
index 2621c3348b..7db354f7b2 100644
--- a/icons/loop_closed.svg
+++ b/icons/loop_closed.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_closed">
diff --git a/icons/loop_disabled.svg b/icons/loop_disabled.svg
index d5b8858159..16bd184bc9 100644
--- a/icons/loop_disabled.svg
+++ b/icons/loop_disabled.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_disabled">
diff --git a/icons/loop_disconnected.svg b/icons/loop_disconnected.svg
index 27f651704e..cfa6c01d3b 100644
--- a/icons/loop_disconnected.svg
+++ b/icons/loop_disconnected.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_disconnected">
diff --git a/icons/loop_lgs.svg b/icons/loop_lgs.svg
index 6e0754a490..70becf7df9 100644
--- a/icons/loop_lgs.svg
+++ b/icons/loop_lgs.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_lgs">
diff --git a/icons/loop_open.svg b/icons/loop_open.svg
index 73aeaff092..37439be7fe 100644
--- a/icons/loop_open.svg
+++ b/icons/loop_open.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_open">
diff --git a/icons/loop_paused.svg b/icons/loop_paused.svg
index 8056c4e66b..9e299b0045 100644
--- a/icons/loop_paused.svg
+++ b/icons/loop_paused.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_paused">
diff --git a/icons/loop_superbolus.svg b/icons/loop_superbolus.svg
index 99baf408a4..2a538bd1ff 100644
--- a/icons/loop_superbolus.svg
+++ b/icons/loop_superbolus.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_superbolus">
diff --git a/icons/quickwizard.svg b/icons/quickwizard.svg
index bdfab6bdd9..29f32b5279 100644
--- a/icons/quickwizard.svg
+++ b/icons/quickwizard.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="quickwizard">
diff --git a/icons/remove.svg b/icons/remove.svg
index cf47d09ad1..22df13d50a 100644
--- a/icons/remove.svg
+++ b/icons/remove.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="remove">
diff --git a/icons/visibility.svg b/icons/visibility.svg
new file mode 100644
index 0000000000..06375f5914
--- /dev/null
+++ b/icons/visibility.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="visibility">
+    <path fill="#FFFFFF" d="M12,4.531c-4.971,0-9.209,3.1-10.912,7.469C2.791,16.368,7.029,19.469,12,19.469s9.209-3.1,10.912-7.469
+        C21.209,7.632,16.971,4.531,12,4.531z M12,17.063c-2.796,0-5.063-2.267-5.063-5.063S9.204,6.938,12,6.938S17.063,9.204,17.063,12
+        S14.796,17.063,12,17.063z"/>
+    <circle fill="#FFFFFF" cx="12" cy="12" r="2.938"/>
+</g>
+</svg>
diff --git a/icons/x_swap_vert.svg b/icons/x_swap_vert.svg
index 6af56d0df4..f7c1aaa09e 100644
--- a/icons/x_swap_vert.svg
+++ b/icons/x_swap_vert.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="x_x5F_swap_x5F_vert">
diff --git a/icons/xdrip.svg b/icons/xdrip.svg
index 6d9cdefd0d..8f141d3c04 100644
--- a/icons/xdrip.svg
+++ b/icons/xdrip.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="xdrip">