diff --git a/config/lovelace/button_card_templates/progress_button.yaml b/config/lovelace/button_card_templates/progress_button.yaml
index 95411ba..e344c22 100644
--- a/config/lovelace/button_card_templates/progress_button.yaml
+++ b/config/lovelace/button_card_templates/progress_button.yaml
@@ -32,9 +32,11 @@ progress:
       - font-size: 1.9em
     icon:
       - position: absolute
-      - top: 0
-      - right: 0
+      - top: 4px
+      - right: -4px
       - height: 16px
+    img_cell:
+      - position: initial
     card:
       - background: >
           [[[
diff --git a/config/lovelace/decluttering_templates/cards/brita_water_card.yaml b/config/lovelace/decluttering_templates/cards/brita_water_card.yaml
index d5b3500..cb35dc0 100644
--- a/config/lovelace/decluttering_templates/cards/brita_water_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/brita_water_card.yaml
@@ -38,7 +38,7 @@ brita_water_card:
       custom_fields:
         remaining_liters:
           - position: absolute
-          - top: 5px
+          - top: 8px
           - right: 5px
           - font-size: 12px
     variables:
diff --git a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
index e62058f..d1c6f6b 100644
--- a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
+++ b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
@@ -113,11 +113,13 @@
                   - small
                   - progress
                 entity: sensor.bedroom_weather_temperature
+                state_display: "[[[ return Math.round(entity.state) + ' °C' ]]]"
               - type: custom:button-card
                 template:
                   - small
                   - progress
                 entity: sensor.bedroom_weather_humidity
+                state_display: "[[[ return Math.round(entity.state) + ' %' ]]]"
                 variables:
                   min_value: 25
                   max_value: 90
@@ -150,7 +152,7 @@
               - type: custom:button-card
                 template: default
                 entity: binary_sensor.bedroom_right_window_on_off_wrapper
-                name: M. Bedroom
+                name: Window
               - type: custom:button-card
                 template:
                   - default