diff --git a/config/lovelace/button_card_templates/v3/v3_button_person.yaml b/config/lovelace/button_card_templates/v3/v3_button_person.yaml
new file mode 100644
index 0000000..1a9b95b
--- /dev/null
+++ b/config/lovelace/button_card_templates/v3/v3_button_person.yaml
@@ -0,0 +1,22 @@
+v3_button_person:
+  template: v3_badge
+  show_state: false
+  show_icon: false
+  show_name: false
+  hold_action:
+    action: more-info
+  styles:
+    card:
+      - width: 60px
+      - height: 60px
+      - border-radius: 60px
+      - background-repeat: no-repeat
+      - background-position: center center
+      - background-size: cover
+      - border-color: var(--primary-color)
+  state:
+    - value: 'off'
+      styles:
+        card:
+          - filter: grayscale(100%)
+          - border-color: black
diff --git a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml
index 3c7fa22..2b77373 100644
--- a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml
+++ b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml
@@ -25,6 +25,18 @@ card:
             - title: Sensors
         - type: horizontal-stack
           cards:
+            - type: custom:button-card
+              template: v3_button_person
+              entity: input_boolean.georgi_home
+              styles:
+                card:
+                  - background-image: url("/local/images/people/georgi.jpg")
+            - type: custom:button-card
+              template: v3_button_person
+              entity: input_boolean.player_2_home
+              styles:
+                card:
+                  - background-image: url("/local/images/people/milena.jpg")
             - type: custom:button-card
               template: v3_badge_temp
               entity: sensor.average_temperature
@@ -166,30 +178,7 @@ card:
                   - width: 60px
                   - font-size: 13px
 
-        - type: custom:decluttering-card
-          template: v3_section_title
-          variables:
-            - title: "People"
-        - type: horizontal-stack
-          cards:
-            - type: custom:button-card
-              template: v3_xs_button
-              entity: binary_sensor.georgi_home
-              name: Georgi home?
-              tap_action:
-                action: call-service
-                service: input_boolean.toggle
-                service_data:
-                  entity_id: input_boolean.georgi_home
-            - type: custom:button-card
-              template: v3_xs_button
-              entity: binary_sensor.player_2_home
-              name: Player 2 home?
-              tap_action:
-                action: call-service
-                service: input_boolean.toggle
-                service_data:
-                  entity_id: input_boolean.player_2_home
+
     # Column 2
     - type: vertical-stack
       cards:
diff --git a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml
index 157599b..719f3bc 100644
--- a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml
+++ b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml
@@ -28,6 +28,18 @@ card:
 
         - type: horizontal-stack
           cards:
+            - type: custom:button-card
+              template: v3_button_person
+              entity: input_boolean.georgi_home
+              styles:
+                card:
+                  - background-image: url("/local/images/people/georgi.jpg")
+            - type: custom:button-card
+              template: v3_button_person
+              entity: input_boolean.player_2_home
+              styles:
+                card:
+                  - background-image: url("/local/images/people/milena.jpg")
             - type: custom:button-card
               template: v3_badge_temp
               entity: sensor.average_temperature
@@ -101,7 +113,7 @@ card:
 
             - type: custom:button-card
               template: v3_tablet_button
-              entity: binary_sensor.georgi_home
+              entity: input_boolean.georgi_home
               name: Georgi home?
               tap_action:
                 action: call-service