Simplify dashboard. Use with_state_indicator for brita. Add brita popup card

config/lovelace/home_dashboard/main_dashboard.yaml

@@ -117,13 +117,11 @@
                     entity: binary_sensor.pi_hole_enabled
                     name: Pi-Hole
                     icon: mdi:pi-hole
-
-          - type: horizontal-stack
-            title: Brita
-            cards:
                   - type: custom:button-card
-                template: default
+                    template:
-                name: Pour water
+                      - default
+                      - with_state_indicator
+                    name: Brita water
                     entity: script.brita_pour_water
                     custom_fields:
                       remaining_liters: "[[[ return states['input_number.brita_remaining_liters'].state ]]]"
@@ -146,16 +144,10 @@
                           - top: 5px
                           - right: 5px
                           - font-size: 12px
-              - type: custom:button-card
+                    variables:
-                template: default
+                      state_indicator_id: binary_sensor.brita_should_change_filter
-                name: New filter
+                      state_indicator_off_color: white
-                entity: script.brita_new_filter
+                      state_indicator_on_color: red
-                tap_action:
-                  action: toggle
-              - type: custom:button-card
-                template: default
-                name: Filter
-                entity: binary_sensor.brita_should_change_filter
 
       # Column 2
       - type: vertical-stack
@@ -227,6 +219,8 @@
 
           - type: vertical-stack
             title: Sensors
+            cards:
+              - type: vertical-stack
                 cards:
                   - type: horizontal-stack
                     cards:
@@ -261,7 +255,6 @@
                           state_indicator_id: automation.lighting_kitchen_day_mode_motion_turn_lights_on_after_sunset
 
               - type: vertical-stack
-            title: Presence
                 cards:
                   - type: horizontal-stack
                     cards:

config/lovelace/popup_cards.yaml

@@ -252,3 +252,27 @@ input_boolean.alarm_enabled:
     entities:
       - input_boolean.alarm_enabled
       - input_datetime.alarm_time
+
+script.brita_pour_water:
+  title: Brita
+  style: *popup_style
+  card:
+    type: vertical-stack
+    cards:
+      - type: entities
+        entities:
+          - input_number.brita_remaining_liters
+          - input_datetime.brita_next_change
+
+      - type: horizontal-stack
+        cards:
+          - type: custom:button-card
+            template: default
+            name: New filter
+            entity: script.brita_new_filter
+            tap_action:
+              action: toggle
+          - type: custom:button-card
+            template: default
+            name: Filter
+            entity: binary_sensor.brita_should_change_filter