diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 2a462fb44a..35ff3d201a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -671,7 +671,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
         overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) }
             ?: resourceHelper.gc(R.color.defaulttextcolor))
-        overview_basebasal_icon.setImageResource(if (activeTemp != null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end)
+
+        if (activeTemp != null)
+            overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low)
+        else
+            overview_basebasal_icon.setImageResource( R.drawable.icon_cp_basal_no_tbr )
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000..b94fac2986
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000..a213f1955f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000..23aeee14d4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000..a9d84303f6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000..ece4bd4cc0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000..0479c1a3af
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000..c448cadbdb
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000..b89fd99246
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000..5bb1a0b982
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000..0c7597c5ea
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000..fa25d872c7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000..b7df0c266a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000..a6750042e8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000..1aaf00fd61
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000..67c74252c2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png differ
diff --git a/app/src/main/res/drawable/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000..a9d84303f6
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp_basal_no_tbr.png differ
diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000..ece4bd4cc0
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp_basal_tbr_high.png differ
diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000..0479c1a3af
Binary files /dev/null and b/app/src/main/res/drawable/icon_cp_basal_tbr_low.png differ
diff --git a/icons/temp-basal/icon_cp_basal_100px.psd b/icons/temp-basal/icon_cp_basal_100px.psd
new file mode 100644
index 0000000000..9eee5dbcd2
Binary files /dev/null and b/icons/temp-basal/icon_cp_basal_100px.psd differ
diff --git a/icons/temp-basal/icon_cp_basal_150px.psd b/icons/temp-basal/icon_cp_basal_150px.psd
new file mode 100644
index 0000000000..fd66def325
Binary files /dev/null and b/icons/temp-basal/icon_cp_basal_150px.psd differ
diff --git a/icons/temp-basal/icon_cp_basal_200px.psd b/icons/temp-basal/icon_cp_basal_200px.psd
new file mode 100644
index 0000000000..df4edab59d
Binary files /dev/null and b/icons/temp-basal/icon_cp_basal_200px.psd differ
diff --git a/icons/temp-basal/icon_cp_basal_50px.psd b/icons/temp-basal/icon_cp_basal_50px.psd
new file mode 100644
index 0000000000..9db88a0ffa
Binary files /dev/null and b/icons/temp-basal/icon_cp_basal_50px.psd differ
diff --git a/icons/temp-basal/icon_cp_basal_75px.psd b/icons/temp-basal/icon_cp_basal_75px.psd
new file mode 100644
index 0000000000..585554299b
Binary files /dev/null and b/icons/temp-basal/icon_cp_basal_75px.psd differ