diff --git a/templates/badges/ClimateControl.njk b/templates/badges/ClimateControl.njk
index 6b48dd1..ebdd8d1 100755
--- a/templates/badges/ClimateControl.njk
+++ b/templates/badges/ClimateControl.njk
@@ -5,6 +5,9 @@
 
     {% if climateControlService.state.operationMode == "AUTOMATIC" %}
       {% set icon = '<i class="far fa-clock"></i>' %}
+      {% set operationText %}
+          {{ "OP_MODE_AUTO" | translate | safe }}
+        {% endset %}
       {% if climateControlService.state.setpointTemperature == climateControlService.state.setpointTemperatureForLevelComfort %}
         {% set operationMode = "bsh-comfort" %}
       {% elif climateControlService.state.setpointTemperature == climateControlService.state.setpointTemperatureForLevelEco %}
@@ -13,17 +16,35 @@
         {% set operationMode = "bsh-manual" %}
       {% endif %}
     {% else %}
-      {% set icon = '<i class="fas fa-user-cog"></i>' %}
-      {% set operationMode = "bsh-manual" %}
+      {% if climateControlService.state.low %}
+        {% set icon = '<i class="fas fa-arrow-down"></i>' %}
+        {% set operationMode = "bsh-eco" %}
+        {% set operationText %}
+          {{ "OP_MODE_LOW" | translate | safe }}
+        {% endset %}
+      {% elif climateControlService.state.summermode %}
+        {% set icon = '<i class="fas fa-user-cog"></i>' %}
+        {% set operationMode = "bsh-manual" %}
+        {% set operationText %}
+          {{ "OP_MODE_SUMMER" | translate | safe }}
+        {% endset %}
+      {% elif climateControlService.state.boostmode %}
+        {% set icon = '<i class="fas fa-arrow-down"></i>' %}
+        {% set operationMode = "bsh-comfort" %}
+        {% set operationText %}
+          {{ "OP_MODE_BOOST" | translate | safe }}
+        {% endset %}
+      {% else %}
+        {% set icon = '<i class="fas fa-user-cog"></i>' %}
+        {% set operationMode = "bsh-manual" %}
+        {% set operationText %}
+          {{ "OP_MODE_MANUAL" | translate | safe }}
+        {% endset %}
+      {% endif %}
     {% endif %}
 
     <span class="bsh-badge climate-control {{ operationMode }}">
-    {{ icon | safe }}
-    {% if climateControlService.state.operationMode == "AUTOMATIC" %}
-      AUTO
-    {% else %}
-      MANUAL
-    {% endif %}
+    {{ icon | safe }} {{ operationText }}
     </span>
   {% endif %}
 {% endmacro %}
diff --git a/translations/de.json b/translations/de.json
index e665e26..0df33f1 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -1,4 +1,9 @@
 {
   "TEMPERATURE_IS": "IST",
-  "TEMPERATURE_TARGET": "SOLL"
+  "TEMPERATURE_TARGET": "SOLL",
+  "OP_MODE_AUTO": "Auto",
+  "OP_MODE_MANUAL": "Manuell",
+  "OP_MODE_BOOST": "Boost",
+  "OP_MODE_SUMMER": "Aus",
+  "OP_MODE_LOW": "Low"
 }
diff --git a/translations/en.json b/translations/en.json
index 588c281..6791650 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -1,4 +1,9 @@
 {
   "TEMPERATURE_IS": "Is",
-  "TEMPERATURE_TARGET": "Target"
+  "TEMPERATURE_TARGET": "Target",
+  "OP_MODE_AUTO": "Auto",
+  "OP_MODE_MANUAL": "Manual",
+  "OP_MODE_BOOST": "Boost",
+  "OP_MODE_SUMMER": "Off",
+  "OP_MODE_LOW": "Low"
 }