diff --git a/config/lovelace/00_home.yaml b/config/lovelace/00_home.yaml
index 8e62125..056b448 100644
--- a/config/lovelace/00_home.yaml
+++ b/config/lovelace/00_home.yaml
@@ -12,36 +12,36 @@ cards:
           - type: horizontal-stack
             cards:
               - type: custom:button-card
-                template: light
+                template: small
                 entity: light.all_lights
                 name: All
               - type: custom:button-card
-                template: light
+                template: small
                 entity: light.living_room_main_lights
                 name: Living room
               - type: custom:button-card
-                template: light
+                template: small
                 entity: light.master_bedroom_main_lights
                 name: Bedroom
               - type: custom:button-card
-                template: light
+                template: small
                 entity: light.hallway_main_lights
                 name: Hallway
           - type: horizontal-stack
             cards:
               - type: custom:button-card
-                template: light
+                template: small
                 entity: light.kitchen_main_lights
                 name: Kitchen
               - type: custom:button-card
-                template: light
+                template: small
                 entity: light.pc
               - type: custom:button-card
-                template: light
+                template: small
                 entity: light.bedside_light
                 name: Bedside
               - type: custom:button-card
-                template: light
+                template: small
                 entity: light.hallway_entrance_lights
                 name: Entrance
 
@@ -82,13 +82,18 @@ cards:
   # Column 2: Sensors
   - type: vertical-stack
     cards:
-      - type: entities
+      - type: horizontal-stack
         title: Sensors
-        show_header_toggle: false
-        entities:
-          - binary_sensor.front_door_on_off_wrapper
-          - binary_sensor.living_room_right_window_on_off_wrapper
-          - binary_sensor.bedroom_right_window_on_off_wrapper
+        cards:
+          - type: custom:button-card
+            template: small
+            entity: binary_sensor.front_door_on_off_wrapper
+          - type: custom:button-card
+            template: small
+            entity: binary_sensor.living_room_right_window_on_off_wrapper
+          - type: custom:button-card
+            template: small
+            entity: binary_sensor.bedroom_right_window_on_off_wrapper
 
       - type: entities
         title: Presence
diff --git a/config/ui-lovelace.yaml b/config/ui-lovelace.yaml
index 58e0279..6c6e3ad 100644
--- a/config/ui-lovelace.yaml
+++ b/config/ui-lovelace.yaml
@@ -8,7 +8,7 @@ custom_header:
 decluttering_templates: !include_dir_merge_named lovelace/templates
 
 button_card_templates:
-  light:
+  small:
     size: 30px
     hold_action:
       action: more-info