diff --git a/lib/main.dart b/lib/main.dart
index ae81f23..d5df216 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -193,6 +193,10 @@ class _HomeScreenState extends State<HomeScreen> {
     } finally {
       setState(() => _loading = false);
     }
+
+    if (_alarmEnabled) {
+      _scheduleAlarm();
+    }
   }
 
   Timer? _alarmTimer;
@@ -303,6 +307,7 @@ class _HomeScreenState extends State<HomeScreen> {
             title: 'Sunset Alarm',
             body: 'Sun is setting in ${_minutesBefore} minute(s)!',
             stopButton: 'Dismiss',
+            icon: 'ic_notification',
           ),
         );
         await Alarm.set(alarmSettings: settings);
@@ -444,6 +449,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                     _sunsetController.text,
                                   ),
                             );
+                            if (_alarmEnabled) {
+                              _scheduleAlarm();
+                            }
                           }
                         },
                       ),
@@ -476,9 +484,6 @@ class _HomeScreenState extends State<HomeScreen> {
                   onPressed: () {
                     if (!_loading) {
                       _fetchSunset();
-                      if (_alarmEnabled) {
-                        _scheduleAlarm();
-                      }
                     }
                   },
                 ),