diff --git a/config/lovelace/home_dashboard/main_dashboard.yaml b/config/lovelace/home_dashboard/main_dashboard.yaml
index 97749d6..6fbf5ce 100644
--- a/config/lovelace/home_dashboard/main_dashboard.yaml
+++ b/config/lovelace/home_dashboard/main_dashboard.yaml
@@ -165,6 +165,17 @@
             cards:
               - type: horizontal-stack
                 cards:
+                  - type: custom:button-card
+                    template: default
+                    entity: input_boolean.alarm_enabled
+                    state_display: "[[[return states['input_datetime.alarm_time'].state.split(':').slice(0, -1).join(':'); ]]]"
+                    show_state: true
+                    show_name: false
+                    styles:
+                      icon:
+                        - transform: translateY(-10px)
+                      state:
+                        - transform: translateY(-15px)
                   - type: custom:button-card
                     template: default
                     entity: input_boolean.speech_notifications
@@ -178,19 +189,6 @@
                     tap_action:
                       action: call-service
                       service: script.house_mode_next
-              - type: horizontal-stack
-                cards:
-                  - type: custom:button-card
-                    template: default
-                    entity: input_boolean.alarm_enabled
-                    name: Alarm
-                    styles:
-                      card:
-                        - width: 150px
-                  - type: entities
-                    entities:
-                      - entity: input_datetime.alarm_time
-                        name: Time
 
           - type: horizontal-stack
             title: Climate
diff --git a/config/lovelace/popup_cards.yaml b/config/lovelace/popup_cards.yaml
index c7dcfac..d0c1159 100644
--- a/config/lovelace/popup_cards.yaml
+++ b/config/lovelace/popup_cards.yaml
@@ -243,3 +243,12 @@ binary_sensor.pi_hole_enabled:
   card:
     type: custom:decluttering-card
     template: pi_hole_card
+
+input_boolean.alarm_enabled:
+  title: Alarm
+  style: *popup_style
+  card:
+    type: entities
+    entities:
+      - input_boolean.alarm_enabled
+      - input_datetime.alarm_time