diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index 9bdf58287f..fc3b910602 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -65,14 +65,14 @@ class TempTargetDialog : DialogFragmentWithDate() {
         val units = profileFunction.getUnits()
         overview_temptarget_units.text = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl)
         // temp target
+        val reasonList: List<String> = Lists.newArrayList(
+            resourceHelper.gs(R.string.manual),
+            resourceHelper.gs(R.string.cancel),
+            resourceHelper.gs(R.string.eatingsoon),
+            resourceHelper.gs(R.string.activity),
+            resourceHelper.gs(R.string.hypo)
+        )
         context?.let { context ->
-            val reasonList: List<String> = Lists.newArrayList(
-                resourceHelper.gs(R.string.manual),
-                resourceHelper.gs(R.string.cancel),
-                resourceHelper.gs(R.string.eatingsoon),
-                resourceHelper.gs(R.string.activity),
-                resourceHelper.gs(R.string.hypo)
-            )
             val adapterReason = ArrayAdapter(context, R.layout.spinner_centered, reasonList)
             overview_temptarget_reason.adapter = adapterReason
             overview_temptarget_reason.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -101,8 +101,8 @@ class TempTargetDialog : DialogFragmentWithDate() {
                         }
 
                         else                                   -> {
-                            defaultDuration = overview_temptarget_duration.value
-                            defaultTarget = overview_temptarget_temptarget.value
+                            defaultDuration = savedInstanceState?.getDouble("overview_temptarget_duration")  ?: 0.0
+                            defaultTarget = savedInstanceState?.getDouble("overview_temptarget_temptarget") ?: if (profileFunction.getUnits() == Constants.MMOL) Constants.MIN_TT_MMOL else Constants.MIN_TT_MGDL
                         }
                     }
                     overview_temptarget_temptarget.value = defaultTarget
@@ -112,6 +112,32 @@ class TempTargetDialog : DialogFragmentWithDate() {
                 override fun onNothingSelected(parent: AdapterView<*>?) {}
             }
         }
+
+        overview_temptarget_custom?.setOnClickListener {
+            overview_temptarget_temptarget.value = savedInstanceState?.getDouble("overview_temptarget_temptarget") ?: if (profileFunction.getUnits() == Constants.MMOL) Constants.MIN_TT_MMOL else Constants.MIN_TT_MGDL
+            overview_temptarget_duration.value = savedInstanceState?.getDouble("overview_temptarget_duration")  ?: 0.0
+            overview_temptarget_reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.manual)));
+        }
+        overview_temptarget_cancel?.setOnClickListener {
+            overview_temptarget_temptarget.value = 0.0
+            overview_temptarget_duration.value = 0.0
+            overview_temptarget_reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.cancel)));
+        }
+        overview_temptarget_eating_soon?.setOnClickListener {
+            overview_temptarget_temptarget.value = defaultValueHelper.determineEatingSoonTT()
+            overview_temptarget_duration.value = defaultValueHelper.determineEatingSoonTTDuration().toDouble()
+            overview_temptarget_reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.eatingsoon)));
+        }
+        overview_temptarget_activity?.setOnClickListener {
+            overview_temptarget_temptarget.value = defaultValueHelper.determineActivityTT()
+            overview_temptarget_duration.value = defaultValueHelper.determineActivityTTDuration().toDouble()
+            overview_temptarget_reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.activity)));
+        }
+        overview_temptarget_hypo?.setOnClickListener {
+            overview_temptarget_temptarget.value = defaultValueHelper.determineHypoTT()
+            overview_temptarget_duration.value = defaultValueHelper.determineHypoTTDuration().toDouble()
+            overview_temptarget_reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.hypo)));
+        }
     }
 
     override fun submit(): Boolean {
diff --git a/app/src/main/res/drawable/ic_target_activity.xml b/app/src/main/res/drawable/ic_target_activity.xml
new file mode 100644
index 0000000000..4439597b75
--- /dev/null
+++ b/app/src/main/res/drawable/ic_target_activity.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.253,15.869c1.19,0 2.158,-1.02 2.158,-2.274c0,-1.254 -0.968,-2.275 -2.158,-2.275c-1.19,0 -2.158,1.02 -2.158,2.275C16.095,14.849 17.063,15.869 18.253,15.869zM18.253,12.018c0.824,0 1.496,0.707 1.496,1.576c0,0.869 -0.671,1.576 -1.496,1.576s-1.496,-0.707 -1.496,-1.576C16.757,12.725 17.429,12.018 18.253,12.018z"
+      android:fillColor="@color/exercise"/>
+  <path
+      android:pathData="M21.442,18.522c-0.03,-0.043 -0.745,-1.039 -1.801,-1.039c-0.785,0 -1.295,0.514 -1.746,0.969c-0.399,0.402 -0.744,0.75 -1.226,0.75h-0.001c-0.393,0 -0.714,-0.242 -1.034,-0.538l1.665,-1.325l-4.553,-6.356l-4.394,3.496c-0.259,0.242 -0.627,0.87 -0.164,1.515c0.214,0.298 0.463,0.387 0.635,0.41c0.409,0.053 0.738,-0.217 0.765,-0.24l2.759,-2.195l0.676,0.943l-3.964,3.153c-0.371,-0.351 -0.791,-0.637 -1.305,-0.637H7.753c-0.788,0 -1.457,0.64 -2.048,1.205c-0.352,0.337 -0.752,0.72 -0.973,0.72c-0.428,0 -0.982,-0.647 -1.142,-0.874c-0.109,-0.154 -0.316,-0.186 -0.464,-0.071c-0.147,0.115 -0.178,0.333 -0.069,0.488c0.083,0.119 0.837,1.155 1.674,1.155c0.477,0 0.913,-0.417 1.418,-0.9c0.502,-0.48 1.071,-1.024 1.603,-1.024h0c0.469,0 0.879,0.45 1.313,0.927c0.482,0.529 0.981,1.077 1.659,1.077c0.647,0 1.193,-0.472 1.722,-0.929c0.494,-0.427 1.005,-0.868 1.542,-0.868c0.321,0.001 0.622,0.293 0.97,0.631c0.453,0.439 0.965,0.936 1.71,0.936h0.001c0.748,0 1.245,-0.501 1.684,-0.943c0.413,-0.416 0.769,-0.776 1.287,-0.776c0.719,0 1.264,0.751 1.269,0.759c0.11,0.155 0.317,0.184 0.464,0.07C21.52,18.894 21.551,18.677 21.442,18.522zM12.027,18.661c-0.459,0.396 -0.892,0.771 -1.301,0.771c-0.395,-0.001 -0.777,-0.42 -1.181,-0.862c-0.002,-0.003 -0.005,-0.005 -0.007,-0.008l4.415,-3.512l-1.475,-2.059L9.18,15.614c-0.022,0.019 -0.161,0.12 -0.276,0.096c-0.024,-0.003 -0.097,-0.012 -0.186,-0.136c-0.195,-0.273 0.01,-0.509 0.055,-0.555l3.844,-3.058l3.754,5.241l-1.24,0.986c-0.332,-0.301 -0.69,-0.554 -1.143,-0.554C13.214,17.635 12.584,18.18 12.027,18.661z"
+      android:fillColor="@color/exercise"/>
+  <path
+      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+      android:fillColor="@color/inrange"/>
+  <path
+      android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+      android:fillColor="@color/tempTargetConfirmation"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_target_cancel.xml b/app/src/main/res/drawable/ic_target_cancel.xml
new file mode 100644
index 0000000000..50d7304662
--- /dev/null
+++ b/app/src/main/res/drawable/ic_target_cancel.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.954,15.325l3.851,-3.85c0.314,-0.314 0.314,-0.821 0.001,-1.134c-0.315,-0.315 -0.82,-0.314 -1.134,-0.001l-3.851,3.851l-3.851,-3.851c-0.315,-0.313 -0.821,-0.314 -1.134,0.001c-0.313,0.313 -0.313,0.82 0.001,1.134l3.851,3.85l-3.851,3.851c-0.314,0.313 -0.314,0.82 -0.001,1.133c0.157,0.156 0.362,0.235 0.567,0.235s0.41,-0.078 0.567,-0.235l3.851,-3.85l3.851,3.85c0.157,0.156 0.362,0.235 0.567,0.235c0.205,0 0.411,-0.078 0.567,-0.235c0.313,-0.313 0.313,-0.82 -0.001,-1.133L16.954,15.325z"
+      android:fillColor="@color/tempTargetConfirmation"/>
+  <path
+      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+      android:fillColor="@color/inrange"/>
+  <path
+      android:pathData="M13.949,6.338H2.595c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h11.354c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+      android:fillColor="@color/tempTargetConfirmation"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_target_eatingsoon.xml b/app/src/main/res/drawable/ic_target_eatingsoon.xml
new file mode 100644
index 0000000000..54b6162546
--- /dev/null
+++ b/app/src/main/res/drawable/ic_target_eatingsoon.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.107,18.396h-0.515c-0.23,-3.231 -2.587,-5.897 -5.66,-6.605c-0.089,-0.819 -0.777,-1.462 -1.62,-1.462c-0.843,0 -1.531,0.642 -1.62,1.462c-3.073,0.708 -5.429,3.374 -5.66,6.605H5.518c-0.221,0 -0.4,0.179 -0.4,0.4c0,0.221 0.179,0.4 0.4,0.4h15.59c0.221,0 0.4,-0.179 0.4,-0.4C21.507,18.575 21.328,18.396 21.107,18.396zM13.313,10.943c0.461,0 0.836,0.311 0.964,0.73c-0.317,-0.043 -0.637,-0.072 -0.964,-0.072c-0.327,0 -0.648,0.03 -0.965,0.072C12.477,11.254 12.852,10.943 13.313,10.943zM13.313,12.401c3.391,0 6.212,2.654 6.479,5.995H6.834C7.101,15.056 9.922,12.401 13.313,12.401z"
+      android:fillColor="@color/carbs"/>
+  <path
+      android:pathData="M15.428,13.489c-0.588,-0.271 -1.415,-0.457 -2.268,-0.509c-0.221,-0.014 -0.411,0.154 -0.424,0.375c-0.014,0.221 0.154,0.411 0.375,0.424c0.746,0.046 1.487,0.209 1.981,0.437c0.047,0.021 0.095,0.033 0.143,0.036c0.16,0.01 0.317,-0.078 0.388,-0.232C15.717,13.82 15.629,13.582 15.428,13.489z"
+      android:fillColor="@color/carbs"/>
+  <path
+      android:pathData="M8.051,17.801c-0.029,0.001 -0.061,-0.003 -0.095,-0.011c-0.188,-0.047 -0.304,-0.239 -0.257,-0.427c0.43,-1.726 1.665,-3.196 3.304,-3.933c0.043,-0.019 0.088,-0.029 0.135,-0.031c0.143,-0.004 0.273,0.078 0.331,0.208c0.039,0.086 0.042,0.182 0.008,0.271c-0.034,0.088 -0.099,0.158 -0.185,0.196c-1.444,0.649 -2.531,1.942 -2.909,3.458C8.346,17.687 8.209,17.797 8.051,17.801z"
+      android:fillColor="@color/carbs"/>
+  <path
+      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+      android:fillColor="@color/inrange"/>
+  <path
+      android:pathData="M11.122,8.486H5.436c-0.232,0 -0.42,-0.193 -0.42,-0.431l0,-1.717h-2.42c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.84c0.232,0 0.42,0.193 0.42,0.431l0,1.717h4.845V5.907c0,-0.238 0.188,-0.431 0.421,-0.431h2.827c0.232,0 0.421,0.193 0.421,0.431c0,0.238 -0.188,0.431 -0.421,0.431h-2.407v1.717C11.542,8.293 11.354,8.486 11.122,8.486z"
+      android:fillColor="@color/tempTargetConfirmation"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_target_hypo.xml b/app/src/main/res/drawable/ic_target_hypo.xml
new file mode 100644
index 0000000000..30721cbf14
--- /dev/null
+++ b/app/src/main/res/drawable/ic_target_hypo.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.822,17.137c-0.016,-0.28 0.022,-0.543 0.363,-0.583c0.313,-0.037 0.426,0.189 0.462,0.448c0.135,0.983 0.67,1.563 1.668,1.692c0.292,0.038 0.514,0.167 0.459,0.498c-0.051,0.305 -0.324,0.337 -0.568,0.336C10.03,19.526 8.835,18.321 8.822,17.137z"
+      android:fillColor="@color/low"/>
+  <path
+      android:pathData="M15.21,16.109c-0.631,-2.484 -3.383,-6.32 -3.773,-6.32s-3.151,3.845 -3.779,6.324c-0.42,1.658 0.111,3.081 1.577,4.049c1.43,0.944 2.973,0.929 4.402,-0.013C15.106,19.18 15.634,17.779 15.21,16.109zM13.255,19.568c-0.603,0.397 -1.221,0.599 -1.835,0.599c-0.607,0 -1.213,-0.197 -1.802,-0.586c-1.206,-0.796 -1.639,-1.906 -1.287,-3.298c0.489,-1.929 2.895,-5.336 3.105,-5.336s2.609,3.403 3.1,5.333C14.889,17.668 14.458,18.774 13.255,19.568z"
+      android:fillColor="@color/low"/>
+  <path
+      android:pathData="M19.522,16.771v-6.712h-1.423v6.712h-2.135l2.846,3.82l2.846,-3.82H19.522z"
+      android:fillColor="@color/low"/>
+  <path
+      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+      android:fillColor="@color/inrange"/>
+  <path
+      android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+      android:fillColor="@color/tempTargetConfirmation"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_target_manual.xml b/app/src/main/res/drawable/ic_target_manual.xml
new file mode 100644
index 0000000000..fc41c52757
--- /dev/null
+++ b/app/src/main/res/drawable/ic_target_manual.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.438,8.901L9.729,15.61c-0.054,0.054 -0.09,0.122 -0.103,0.196L8.825,20.15c-0.022,0.121 0.016,0.245 0.103,0.332s0.211,0.126 0.332,0.103l4.343,-0.801c0.074,-0.014 0.143,-0.05 0.196,-0.103l6.709,-6.709c0.391,-0.391 0.39,-1.029 -0.002,-1.421l-2.648,-2.648C17.467,8.511 16.829,8.51 16.438,8.901zM12.907,18.755c0.085,0.085 0.116,0.211 0.08,0.326c-0.016,0.051 -0.044,0.096 -0.08,0.132c-0.046,0.046 -0.106,0.078 -0.173,0.09l-2.164,0.382c-0.215,-0.007 -0.428,-0.091 -0.592,-0.255c-0.164,-0.164 -0.248,-0.377 -0.255,-0.591l0.382,-2.164c0.021,-0.119 0.107,-0.216 0.222,-0.253c0.115,-0.036 0.241,-0.005 0.326,0.08L12.907,18.755zM19.949,12.025c0.124,0.124 0.124,0.324 0,0.447l-5.929,5.929c-0.124,0.124 -0.324,0.124 -0.447,0l-0.233,-0.233c-0.124,-0.124 -0.124,-0.324 0,-0.447l5.929,-5.929c0.124,-0.124 0.324,-0.124 0.447,0L19.949,12.025zM18.793,10.85c0.124,0.124 0.124,0.324 0,0.447l-5.929,5.929c-0.124,0.124 -0.324,0.124 -0.447,0l-0.233,-0.233c-0.124,-0.124 -0.124,-0.324 0,-0.447l5.929,-5.929c0.124,-0.124 0.324,-0.124 0.447,0L18.793,10.85zM17.637,9.675c0.124,0.124 0.124,0.324 0,0.447l-5.929,5.929c-0.124,0.124 -0.324,0.124 -0.447,0l-0.233,-0.233c-0.124,-0.124 -0.124,-0.324 0,-0.447l5.929,-5.929c0.124,-0.124 0.324,-0.124 0.447,0L17.637,9.675z"
+      android:fillColor="@color/tempTargetConfirmation"/>
+  <path
+      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+      android:fillColor="@color/inrange"/>
+  <path
+      android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+      android:fillColor="@color/tempTargetConfirmation"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index f770f8ba98..9db270caad 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -71,6 +71,48 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/overview_temptarget_custom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:src="@drawable/ic_target_manual" />
+
+            <ImageButton
+                android:id="@+id/overview_temptarget_cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:src="@drawable/ic_target_cancel"/>
+
+            <ImageButton
+                android:id="@+id/overview_temptarget_eating_soon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:src="@drawable/ic_target_eatingsoon" />
+
+            <ImageButton
+                android:id="@+id/overview_temptarget_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:src="@drawable/ic_target_activity"/>
+
+            <ImageButton
+                android:id="@+id/overview_temptarget_hypo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:src="@drawable/ic_target_hypo" />
+
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 36b0fb5df8..7d9ae84bf1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -25,6 +25,7 @@
 
     <color name="tempTargetBackground">#77dd77</color>
     <color name="tempTargetConfirmation">#77dd77</color>
+    <color name="exercise">#67DFE8</color>
 
 
     <color name="cardObjectiveText">#779ECB</color>
diff --git a/icons/target_activity.svg b/icons/target_activity.svg
new file mode 100644
index 0000000000..2fb2409888
--- /dev/null
+++ b/icons/target_activity.svg
@@ -0,0 +1,43 @@
+<?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="temptargetactivity">
+    <path fill="#67DFE8" d="M18.253,15.869c1.19,0,2.158-1.02,2.158-2.274c0-1.254-0.968-2.275-2.158-2.275
+        c-1.19,0-2.158,1.02-2.158,2.275C16.095,14.849,17.063,15.869,18.253,15.869z M18.253,12.018c0.824,0,1.496,0.707,1.496,1.576
+        c0,0.869-0.671,1.576-1.496,1.576s-1.496-0.707-1.496-1.576C16.757,12.725,17.429,12.018,18.253,12.018z"/>
+    <path fill="#67DFE8" d="M21.442,18.522c-0.03-0.043-0.745-1.039-1.801-1.039c-0.785,0-1.295,0.514-1.746,0.969
+        c-0.399,0.402-0.744,0.75-1.226,0.75h-0.001c-0.393,0-0.714-0.242-1.034-0.538l1.665-1.325l-4.553-6.356l-4.394,3.496
+        c-0.259,0.242-0.627,0.87-0.164,1.515c0.214,0.298,0.463,0.387,0.635,0.41c0.409,0.053,0.738-0.217,0.765-0.24l2.759-2.195
+        l0.676,0.943l-3.964,3.153c-0.371-0.351-0.791-0.637-1.305-0.637H7.753c-0.788,0-1.457,0.64-2.048,1.205
+        c-0.352,0.337-0.752,0.72-0.973,0.72c-0.428,0-0.982-0.647-1.142-0.874c-0.109-0.154-0.316-0.186-0.464-0.071
+        c-0.147,0.115-0.178,0.333-0.069,0.488c0.083,0.119,0.837,1.155,1.674,1.155c0.477,0,0.913-0.417,1.418-0.9
+        c0.502-0.48,1.071-1.024,1.603-1.024h0c0.469,0,0.879,0.45,1.313,0.927c0.482,0.529,0.981,1.077,1.659,1.077
+        c0.647,0,1.193-0.472,1.722-0.929c0.494-0.427,1.005-0.868,1.542-0.868c0.321,0.001,0.622,0.293,0.97,0.631
+        c0.453,0.439,0.965,0.936,1.71,0.936h0.001c0.748,0,1.245-0.501,1.684-0.943c0.413-0.416,0.769-0.776,1.287-0.776
+        c0.719,0,1.264,0.751,1.269,0.759c0.11,0.155,0.317,0.184,0.464,0.07C21.52,18.894,21.551,18.677,21.442,18.522z M12.027,18.661
+        c-0.459,0.396-0.892,0.771-1.301,0.771c-0.395-0.001-0.777-0.42-1.181-0.862c-0.002-0.003-0.005-0.005-0.007-0.008l4.415-3.512
+        l-1.475-2.059L9.18,15.614c-0.022,0.019-0.161,0.12-0.276,0.096c-0.024-0.003-0.097-0.012-0.186-0.136
+        c-0.195-0.273,0.01-0.509,0.055-0.555l3.844-3.058l3.754,5.241l-1.24,0.986c-0.332-0.301-0.69-0.554-1.143-0.554
+        C13.214,17.635,12.584,18.18,12.027,18.661z"/>
+    <path fill="#67E86A" d="M5.453,9.325c-0.003,0-0.006,0-0.01,0C5.031,9.317,4.661,8.827,4.43,7.979
+		C4.261,7.361,4.108,6.716,3.96,6.092C3.867,5.701,3.774,5.31,3.677,4.924l-0.064-0.26C3.394,3.77,3.168,2.847,2.577,2.743
+		C2.509,2.731,2.463,2.665,2.475,2.595c0.012-0.07,0.077-0.114,0.146-0.104c0.752,0.133,0.999,1.138,1.237,2.11l0.064,0.259
+		c0.097,0.388,0.19,0.78,0.283,1.172c0.147,0.622,0.3,1.264,0.468,1.878C4.864,8.61,5.168,9.064,5.448,9.069
+		c0.001,0,0.003,0,0.005,0c0.263,0,0.537-0.394,0.753-1.083C6.317,7.63,6.413,7.247,6.505,6.877l0.074-0.293
+		C6.66,6.262,6.737,5.935,6.815,5.609C6.973,4.94,7.137,4.248,7.336,3.608c0.221-0.71,0.551-1.103,0.928-1.106
+		c0.002,0,0.003,0,0.005,0c0.379,0,0.717,0.39,0.951,1.1c0.165,0.5,0.305,1.039,0.439,1.56l0.105,0.403
+		c0.087,0.332,0.171,0.668,0.255,1.004c0.143,0.574,0.29,1.169,0.456,1.729c0.136,0.462,0.367,0.757,0.603,0.769
+		c0.211,0.026,0.432-0.218,0.6-0.625c0.161-0.391,0.309-0.847,0.451-1.393c0.198-0.76,0.385-1.53,0.572-2.3
+		c0.086-0.355,0.173-0.711,0.26-1.065c0.167-0.676,0.481-1.066,0.961-1.191c0.066-0.017,0.136,0.024,0.154,0.092
+		c0.017,0.068-0.023,0.138-0.091,0.156c-0.387,0.101-0.634,0.421-0.779,1.005c-0.087,0.354-0.174,0.709-0.26,1.064
+		c-0.188,0.771-0.375,1.543-0.573,2.304c-0.145,0.557-0.297,1.024-0.462,1.426c-0.289,0.703-0.651,0.793-0.846,0.782
+		c-0.35-0.018-0.661-0.374-0.832-0.951c-0.167-0.565-0.315-1.163-0.459-1.74c-0.083-0.335-0.166-0.67-0.253-1.001L9.415,5.226
+		C9.282,4.709,9.143,4.174,8.981,3.682c-0.192-0.58-0.458-0.926-0.712-0.926c-0.001,0-0.001,0-0.002,0
+		c-0.252,0.002-0.51,0.349-0.69,0.928C7.38,4.316,7.217,5.004,7.06,5.668C6.982,5.996,6.905,6.324,6.823,6.647L6.75,6.939
+		C6.656,7.314,6.56,7.701,6.446,8.063C6.121,9.103,5.728,9.325,5.453,9.325z"/>
+    <path fill="#67E86A" d="M13.949,6.338h-2.831c-0.232,0-0.421-0.193-0.421-0.431V4.19H5.856l0,1.717
+        c0,0.238-0.188,0.431-0.42,0.431h-2.84c-0.232,0-0.42-0.193-0.42-0.431c0-0.238,0.188-0.431,0.42-0.431h2.42l0-1.717
+        c0-0.238,0.188-0.431,0.42-0.431h5.682c0.232,0,0.421,0.193,0.421,0.431v1.717h2.411c0.232,0,0.421,0.193,0.421,0.431
+        C14.37,6.145,14.181,6.338,13.949,6.338z"/>
+</g>
+</svg>
diff --git a/icons/target_cancel.svg b/icons/target_cancel.svg
new file mode 100644
index 0000000000..894110a14c
--- /dev/null
+++ b/icons/target_cancel.svg
@@ -0,0 +1,28 @@
+<?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="target_cancel">
+	<path fill="#67E86A" d="M16.954,15.325l3.851-3.85c0.314-0.314,0.314-0.821,0.001-1.134c-0.315-0.315-0.82-0.314-1.134-0.001
+		l-3.851,3.851l-3.851-3.851c-0.315-0.313-0.821-0.314-1.134,0.001c-0.313,0.313-0.313,0.82,0.001,1.134l3.851,3.85l-3.851,3.851
+		c-0.314,0.313-0.314,0.82-0.001,1.133c0.157,0.156,0.362,0.235,0.567,0.235s0.41-0.078,0.567-0.235l3.851-3.85l3.851,3.85
+		c0.157,0.156,0.362,0.235,0.567,0.235c0.205,0,0.411-0.078,0.567-0.235c0.313-0.313,0.313-0.82-0.001-1.133L16.954,15.325z"/>
+    <path fill="#67E86A" d="M5.453,9.325c-0.003,0-0.006,0-0.01,0C5.031,9.317,4.661,8.827,4.43,7.979
+		C4.261,7.361,4.108,6.716,3.96,6.092C3.867,5.701,3.774,5.31,3.677,4.924l-0.064-0.26C3.394,3.77,3.168,2.847,2.577,2.743
+		C2.509,2.731,2.463,2.665,2.475,2.595c0.012-0.07,0.077-0.114,0.146-0.104c0.752,0.133,0.999,1.138,1.237,2.11l0.064,0.259
+		c0.097,0.388,0.19,0.78,0.283,1.172c0.147,0.622,0.3,1.264,0.468,1.878C4.864,8.61,5.168,9.064,5.448,9.069
+		c0.001,0,0.003,0,0.005,0c0.263,0,0.537-0.394,0.753-1.083C6.317,7.63,6.413,7.247,6.505,6.877l0.074-0.293
+		C6.66,6.262,6.737,5.935,6.815,5.609C6.973,4.94,7.137,4.248,7.336,3.608c0.221-0.71,0.551-1.103,0.928-1.106
+		c0.002,0,0.003,0,0.005,0c0.379,0,0.717,0.39,0.951,1.1c0.165,0.5,0.305,1.039,0.439,1.56l0.105,0.403
+		c0.087,0.332,0.171,0.668,0.255,1.004c0.143,0.574,0.29,1.169,0.456,1.729c0.136,0.462,0.367,0.757,0.603,0.769
+		c0.211,0.026,0.432-0.218,0.6-0.625c0.161-0.391,0.309-0.847,0.451-1.393c0.198-0.76,0.385-1.53,0.572-2.3
+		c0.086-0.355,0.173-0.711,0.26-1.065c0.167-0.676,0.481-1.066,0.961-1.191c0.066-0.017,0.136,0.024,0.154,0.092
+		c0.017,0.068-0.023,0.138-0.091,0.156c-0.387,0.101-0.634,0.421-0.779,1.005c-0.087,0.354-0.174,0.709-0.26,1.064
+		c-0.188,0.771-0.375,1.543-0.573,2.304c-0.145,0.557-0.297,1.024-0.462,1.426c-0.289,0.703-0.651,0.793-0.846,0.782
+		c-0.35-0.018-0.661-0.374-0.832-0.951c-0.167-0.565-0.315-1.163-0.459-1.74c-0.083-0.335-0.166-0.67-0.253-1.001L9.415,5.226
+		C9.282,4.709,9.143,4.174,8.981,3.682c-0.192-0.58-0.458-0.926-0.712-0.926c-0.001,0-0.001,0-0.002,0
+		c-0.252,0.002-0.51,0.349-0.69,0.928C7.38,4.316,7.217,5.004,7.06,5.668C6.982,5.996,6.905,6.324,6.823,6.647L6.75,6.939
+		C6.656,7.314,6.56,7.701,6.446,8.063C6.121,9.103,5.728,9.325,5.453,9.325z"/>
+    <path fill="#67E86A" d="M13.949,6.338H2.595c-0.232,0-0.42-0.193-0.42-0.431c0-0.238,0.188-0.431,0.42-0.431h11.354
+        c0.232,0,0.421,0.193,0.421,0.431C14.37,6.145,14.181,6.338,13.949,6.338z"/>
+</g>
+</svg>
diff --git a/icons/target_eatingsoon.svg b/icons/target_eatingsoon.svg
new file mode 100644
index 0000000000..3ef25775bf
--- /dev/null
+++ b/icons/target_eatingsoon.svg
@@ -0,0 +1,38 @@
+<?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="temptargeteatingsoon">
+    <path fill="#FEAF05" d="M21.107,18.396h-0.515c-0.23-3.231-2.587-5.897-5.66-6.605c-0.089-0.819-0.777-1.462-1.62-1.462
+        c-0.843,0-1.531,0.642-1.62,1.462c-3.073,0.708-5.429,3.374-5.66,6.605H5.518c-0.221,0-0.4,0.179-0.4,0.4
+        c0,0.221,0.179,0.4,0.4,0.4h15.59c0.221,0,0.4-0.179,0.4-0.4C21.507,18.575,21.328,18.396,21.107,18.396z M13.313,10.943
+        c0.461,0,0.836,0.311,0.964,0.73c-0.317-0.043-0.637-0.072-0.964-0.072c-0.327,0-0.648,0.03-0.965,0.072
+        C12.477,11.254,12.852,10.943,13.313,10.943z M13.313,12.401c3.391,0,6.212,2.654,6.479,5.995H6.834
+        C7.101,15.056,9.922,12.401,13.313,12.401z"/>
+    <path fill="#FEAF05" d="M15.428,13.489c-0.588-0.271-1.415-0.457-2.268-0.509c-0.221-0.014-0.411,0.154-0.424,0.375
+        c-0.014,0.221,0.154,0.411,0.375,0.424c0.746,0.046,1.487,0.209,1.981,0.437c0.047,0.021,0.095,0.033,0.143,0.036
+        c0.16,0.01,0.317-0.078,0.388-0.232C15.717,13.82,15.629,13.582,15.428,13.489z"/>
+    <path fill="#FEAF05" d="M8.051,17.801c-0.029,0.001-0.061-0.003-0.095-0.011c-0.188-0.047-0.304-0.239-0.257-0.427
+        c0.43-1.726,1.665-3.196,3.304-3.933c0.043-0.019,0.088-0.029,0.135-0.031c0.143-0.004,0.273,0.078,0.331,0.208
+        c0.039,0.086,0.042,0.182,0.008,0.271c-0.034,0.088-0.099,0.158-0.185,0.196c-1.444,0.649-2.531,1.942-2.909,3.458
+        C8.346,17.687,8.209,17.797,8.051,17.801z"/>
+    <path fill="#67E86A" d="M5.453,9.325c-0.003,0-0.006,0-0.01,0C5.031,9.317,4.661,8.827,4.43,7.979
+		C4.261,7.361,4.108,6.716,3.96,6.092C3.867,5.701,3.774,5.31,3.677,4.924l-0.064-0.26C3.394,3.77,3.168,2.847,2.577,2.743
+		C2.509,2.731,2.463,2.665,2.475,2.595c0.012-0.07,0.077-0.114,0.146-0.104c0.752,0.133,0.999,1.138,1.237,2.11l0.064,0.259
+		c0.097,0.388,0.19,0.78,0.283,1.172c0.147,0.622,0.3,1.264,0.468,1.878C4.864,8.61,5.168,9.064,5.448,9.069
+		c0.001,0,0.003,0,0.005,0c0.263,0,0.537-0.394,0.753-1.083C6.317,7.63,6.413,7.247,6.505,6.877l0.074-0.293
+		C6.66,6.262,6.737,5.935,6.815,5.609C6.973,4.94,7.137,4.248,7.336,3.608c0.221-0.71,0.551-1.103,0.928-1.106
+		c0.002,0,0.003,0,0.005,0c0.379,0,0.717,0.39,0.951,1.1c0.165,0.5,0.305,1.039,0.439,1.56l0.105,0.403
+		c0.087,0.332,0.171,0.668,0.255,1.004c0.143,0.574,0.29,1.169,0.456,1.729c0.136,0.462,0.367,0.757,0.603,0.769
+		c0.211,0.026,0.432-0.218,0.6-0.625c0.161-0.391,0.309-0.847,0.451-1.393c0.198-0.76,0.385-1.53,0.572-2.3
+		c0.086-0.355,0.173-0.711,0.26-1.065c0.167-0.676,0.481-1.066,0.961-1.191c0.066-0.017,0.136,0.024,0.154,0.092
+		c0.017,0.068-0.023,0.138-0.091,0.156c-0.387,0.101-0.634,0.421-0.779,1.005c-0.087,0.354-0.174,0.709-0.26,1.064
+		c-0.188,0.771-0.375,1.543-0.573,2.304c-0.145,0.557-0.297,1.024-0.462,1.426c-0.289,0.703-0.651,0.793-0.846,0.782
+		c-0.35-0.018-0.661-0.374-0.832-0.951c-0.167-0.565-0.315-1.163-0.459-1.74c-0.083-0.335-0.166-0.67-0.253-1.001L9.415,5.226
+		C9.282,4.709,9.143,4.174,8.981,3.682c-0.192-0.58-0.458-0.926-0.712-0.926c-0.001,0-0.001,0-0.002,0
+		c-0.252,0.002-0.51,0.349-0.69,0.928C7.38,4.316,7.217,5.004,7.06,5.668C6.982,5.996,6.905,6.324,6.823,6.647L6.75,6.939
+		C6.656,7.314,6.56,7.701,6.446,8.063C6.121,9.103,5.728,9.325,5.453,9.325z"/>
+        <path fill="#67E86A" d="M11.122,8.486H5.436c-0.232,0-0.42-0.193-0.42-0.431l0-1.717h-2.42c-0.232,0-0.42-0.193-0.42-0.431
+        c0-0.238,0.188-0.431,0.42-0.431h2.84c0.232,0,0.42,0.193,0.42,0.431l0,1.717h4.845V5.907c0-0.238,0.188-0.431,0.421-0.431h2.827
+        c0.232,0,0.421,0.193,0.421,0.431c0,0.238-0.188,0.431-0.421,0.431h-2.407v1.717C11.542,8.293,11.354,8.486,11.122,8.486z"/>
+</g>
+</svg>
diff --git a/icons/target_hypo.svg b/icons/target_hypo.svg
new file mode 100644
index 0000000000..cc9585c5ba
--- /dev/null
+++ b/icons/target_hypo.svg
@@ -0,0 +1,34 @@
+<?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="temptargethypo">
+    <path fill="#FF1313" d="M8.822,17.137c-0.016-0.28,0.022-0.543,0.363-0.583c0.313-0.037,0.426,0.189,0.462,0.448
+        c0.135,0.983,0.67,1.563,1.668,1.692c0.292,0.038,0.514,0.167,0.459,0.498c-0.051,0.305-0.324,0.337-0.568,0.336
+        C10.03,19.526,8.835,18.321,8.822,17.137z"/>
+    <path fill="#FF1313" d="M15.21,16.109c-0.631-2.484-3.383-6.32-3.773-6.32s-3.151,3.845-3.779,6.324
+        c-0.42,1.658,0.111,3.081,1.577,4.049c1.43,0.944,2.973,0.929,4.402-0.013C15.106,19.18,15.634,17.779,15.21,16.109z
+         M13.255,19.568c-0.603,0.397-1.221,0.599-1.835,0.599c-0.607,0-1.213-0.197-1.802-0.586c-1.206-0.796-1.639-1.906-1.287-3.298
+        c0.489-1.929,2.895-5.336,3.105-5.336s2.609,3.403,3.1,5.333C14.889,17.668,14.458,18.774,13.255,19.568z"/>
+    <path fill="#FF1313" d="M19.522,16.771v-6.712h-1.423v6.712h-2.135l2.846,3.82l2.846-3.82H19.522z"/>
+    <path fill="#67E86A" d="M5.453,9.325c-0.003,0-0.006,0-0.01,0C5.031,9.317,4.661,8.827,4.43,7.979
+		C4.261,7.361,4.108,6.716,3.96,6.092C3.867,5.701,3.774,5.31,3.677,4.924l-0.064-0.26C3.394,3.77,3.168,2.847,2.577,2.743
+		C2.509,2.731,2.463,2.665,2.475,2.595c0.012-0.07,0.077-0.114,0.146-0.104c0.752,0.133,0.999,1.138,1.237,2.11l0.064,0.259
+		c0.097,0.388,0.19,0.78,0.283,1.172c0.147,0.622,0.3,1.264,0.468,1.878C4.864,8.61,5.168,9.064,5.448,9.069
+		c0.001,0,0.003,0,0.005,0c0.263,0,0.537-0.394,0.753-1.083C6.317,7.63,6.413,7.247,6.505,6.877l0.074-0.293
+		C6.66,6.262,6.737,5.935,6.815,5.609C6.973,4.94,7.137,4.248,7.336,3.608c0.221-0.71,0.551-1.103,0.928-1.106
+		c0.002,0,0.003,0,0.005,0c0.379,0,0.717,0.39,0.951,1.1c0.165,0.5,0.305,1.039,0.439,1.56l0.105,0.403
+		c0.087,0.332,0.171,0.668,0.255,1.004c0.143,0.574,0.29,1.169,0.456,1.729c0.136,0.462,0.367,0.757,0.603,0.769
+		c0.211,0.026,0.432-0.218,0.6-0.625c0.161-0.391,0.309-0.847,0.451-1.393c0.198-0.76,0.385-1.53,0.572-2.3
+		c0.086-0.355,0.173-0.711,0.26-1.065c0.167-0.676,0.481-1.066,0.961-1.191c0.066-0.017,0.136,0.024,0.154,0.092
+		c0.017,0.068-0.023,0.138-0.091,0.156c-0.387,0.101-0.634,0.421-0.779,1.005c-0.087,0.354-0.174,0.709-0.26,1.064
+		c-0.188,0.771-0.375,1.543-0.573,2.304c-0.145,0.557-0.297,1.024-0.462,1.426c-0.289,0.703-0.651,0.793-0.846,0.782
+		c-0.35-0.018-0.661-0.374-0.832-0.951c-0.167-0.565-0.315-1.163-0.459-1.74c-0.083-0.335-0.166-0.67-0.253-1.001L9.415,5.226
+		C9.282,4.709,9.143,4.174,8.981,3.682c-0.192-0.58-0.458-0.926-0.712-0.926c-0.001,0-0.001,0-0.002,0
+		c-0.252,0.002-0.51,0.349-0.69,0.928C7.38,4.316,7.217,5.004,7.06,5.668C6.982,5.996,6.905,6.324,6.823,6.647L6.75,6.939
+		C6.656,7.314,6.56,7.701,6.446,8.063C6.121,9.103,5.728,9.325,5.453,9.325z"/>
+    <path fill="#67E86A" d="M13.949,6.338h-2.831c-0.232,0-0.421-0.193-0.421-0.431V4.19H5.856l0,1.717
+        c0,0.238-0.188,0.431-0.42,0.431h-2.84c-0.232,0-0.42-0.193-0.42-0.431c0-0.238,0.188-0.431,0.42-0.431h2.42l0-1.717
+        c0-0.238,0.188-0.431,0.42-0.431h5.682c0.232,0,0.421,0.193,0.421,0.431v1.717h2.411c0.232,0,0.421,0.193,0.421,0.431
+        C14.37,6.145,14.181,6.338,13.949,6.338z"/>
+</g>
+</svg>
diff --git a/icons/target_manual.svg b/icons/target_manual.svg
new file mode 100644
index 0000000000..08b51538b3
--- /dev/null
+++ b/icons/target_manual.svg
@@ -0,0 +1,37 @@
+<?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="target_manual">
+	<path fill="#67E86A" d="M16.438,8.901L9.729,15.61c-0.054,0.054-0.09,0.122-0.103,0.196L8.825,20.15
+		c-0.022,0.121,0.016,0.245,0.103,0.332s0.211,0.126,0.332,0.103l4.343-0.801c0.074-0.014,0.143-0.05,0.196-0.103l6.709-6.709
+		c0.391-0.391,0.39-1.029-0.002-1.421l-2.648-2.648C17.467,8.511,16.829,8.51,16.438,8.901z M12.907,18.755
+		c0.085,0.085,0.116,0.211,0.08,0.326c-0.016,0.051-0.044,0.096-0.08,0.132c-0.046,0.046-0.106,0.078-0.173,0.09l-2.164,0.382
+		c-0.215-0.007-0.428-0.091-0.592-0.255c-0.164-0.164-0.248-0.377-0.255-0.591l0.382-2.164c0.021-0.119,0.107-0.216,0.222-0.253
+		c0.115-0.036,0.241-0.005,0.326,0.08L12.907,18.755z M19.949,12.025c0.124,0.124,0.124,0.324,0,0.447l-5.929,5.929
+		c-0.124,0.124-0.324,0.124-0.447,0l-0.233-0.233c-0.124-0.124-0.124-0.324,0-0.447l5.929-5.929c0.124-0.124,0.324-0.124,0.447,0
+		L19.949,12.025z M18.793,10.85c0.124,0.124,0.124,0.324,0,0.447l-5.929,5.929c-0.124,0.124-0.324,0.124-0.447,0l-0.233-0.233
+		c-0.124-0.124-0.124-0.324,0-0.447l5.929-5.929c0.124-0.124,0.324-0.124,0.447,0L18.793,10.85z M17.637,9.675
+		c0.124,0.124,0.124,0.324,0,0.447l-5.929,5.929c-0.124,0.124-0.324,0.124-0.447,0l-0.233-0.233c-0.124-0.124-0.124-0.324,0-0.447
+		l5.929-5.929c0.124-0.124,0.324-0.124,0.447,0L17.637,9.675z"/>
+    <path fill="#67E86A" d="M5.453,9.325c-0.003,0-0.006,0-0.01,0C5.031,9.317,4.661,8.827,4.43,7.979
+		C4.261,7.361,4.108,6.716,3.96,6.092C3.867,5.701,3.774,5.31,3.677,4.924l-0.064-0.26C3.394,3.77,3.168,2.847,2.577,2.743
+		C2.509,2.731,2.463,2.665,2.475,2.595c0.012-0.07,0.077-0.114,0.146-0.104c0.752,0.133,0.999,1.138,1.237,2.11l0.064,0.259
+		c0.097,0.388,0.19,0.78,0.283,1.172c0.147,0.622,0.3,1.264,0.468,1.878C4.864,8.61,5.168,9.064,5.448,9.069
+		c0.001,0,0.003,0,0.005,0c0.263,0,0.537-0.394,0.753-1.083C6.317,7.63,6.413,7.247,6.505,6.877l0.074-0.293
+		C6.66,6.262,6.737,5.935,6.815,5.609C6.973,4.94,7.137,4.248,7.336,3.608c0.221-0.71,0.551-1.103,0.928-1.106
+		c0.002,0,0.003,0,0.005,0c0.379,0,0.717,0.39,0.951,1.1c0.165,0.5,0.305,1.039,0.439,1.56l0.105,0.403
+		c0.087,0.332,0.171,0.668,0.255,1.004c0.143,0.574,0.29,1.169,0.456,1.729c0.136,0.462,0.367,0.757,0.603,0.769
+		c0.211,0.026,0.432-0.218,0.6-0.625c0.161-0.391,0.309-0.847,0.451-1.393c0.198-0.76,0.385-1.53,0.572-2.3
+		c0.086-0.355,0.173-0.711,0.26-1.065c0.167-0.676,0.481-1.066,0.961-1.191c0.066-0.017,0.136,0.024,0.154,0.092
+		c0.017,0.068-0.023,0.138-0.091,0.156c-0.387,0.101-0.634,0.421-0.779,1.005c-0.087,0.354-0.174,0.709-0.26,1.064
+		c-0.188,0.771-0.375,1.543-0.573,2.304c-0.145,0.557-0.297,1.024-0.462,1.426c-0.289,0.703-0.651,0.793-0.846,0.782
+		c-0.35-0.018-0.661-0.374-0.832-0.951c-0.167-0.565-0.315-1.163-0.459-1.74c-0.083-0.335-0.166-0.67-0.253-1.001L9.415,5.226
+		C9.282,4.709,9.143,4.174,8.981,3.682c-0.192-0.58-0.458-0.926-0.712-0.926c-0.001,0-0.001,0-0.002,0
+		c-0.252,0.002-0.51,0.349-0.69,0.928C7.38,4.316,7.217,5.004,7.06,5.668C6.982,5.996,6.905,6.324,6.823,6.647L6.75,6.939
+		C6.656,7.314,6.56,7.701,6.446,8.063C6.121,9.103,5.728,9.325,5.453,9.325z"/>
+    <path fill="#67E86A" d="M13.949,6.338h-2.831c-0.232,0-0.421-0.193-0.421-0.431V4.19H5.856l0,1.717
+        c0,0.238-0.188,0.431-0.42,0.431h-2.84c-0.232,0-0.42-0.193-0.42-0.431c0-0.238,0.188-0.431,0.42-0.431h2.42l0-1.717
+        c0-0.238,0.188-0.431,0.42-0.431h5.682c0.232,0,0.421,0.193,0.421,0.431v1.717h2.411c0.232,0,0.421,0.193,0.421,0.431
+        C14.37,6.145,14.181,6.338,13.949,6.338z"/>
+</g>
+</svg>