diff --git a/src/menu.rs b/src/menu.rs
index eb429c6..83660e0 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -17,7 +17,6 @@ impl Plugin for MenuPlugin {
                     handle_menu_button,
                     handle_menu_quit,
                     bevy::window::close_on_esc,
-                    interactive_button,
                 )
                     .run_if(in_state(GameState::Menu)),
             )
@@ -157,30 +156,6 @@ fn handle_menu_quit(
         .for_each(|_| writer.send(AppExit));
 }
 
-fn interactive_button(
-    mut events: Query<(&mut BackgroundColor, &Interaction), (With<Button>, Changed<Interaction>)>,
-    mut window: Query<&mut Window, With<PrimaryWindow>>,
-    mut writer: EventWriter<audio::AudioEvent>,
-) {
-    events
-        .iter_mut()
-        .for_each(|(mut bg_color, interaction)| match interaction {
-            Interaction::None => {
-                window.single_mut().cursor.icon = CursorIcon::Arrow;
-                bg_color.0.set_a(0.5);
-            }
-            Interaction::Hovered => {
-                window.single_mut().cursor.icon = CursorIcon::Hand;
-                bg_color.0.set_a(0.75);
-            }
-            Interaction::Pressed => {
-                window.single_mut().cursor.icon = CursorIcon::Grab;
-                bg_color.0.set_a(1.0);
-                writer.send(audio::AudioEvent::MenuSelect)
-            }
-        });
-}
-
 /// Used to return to the menu
 pub(crate) fn exit_to_menu(
     mut events: EventReader<KeyboardInput>,
diff --git a/src/ui.rs b/src/ui.rs
index b337e8a..6558d67 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,3 +1,5 @@
+use bevy::window::PrimaryWindow;
+
 use crate::prelude::*;
 
 pub(crate) struct UiPlugin;
@@ -16,6 +18,8 @@ impl Plugin for UiPlugin {
                 sync_display_mode
                     .run_if(state_changed::<DisplayState>())
                     .run_if(in_state(GameState::Play)),
+                manage_cursor.run_if(any_component_changed::<Interaction>),
+                interactive_button.run_if(any_component_changed::<Interaction>),
             ),
         );
     }
@@ -96,3 +100,45 @@ fn sync_display_mode(
         .iter_mut()
         .for_each(|mut visibility| *visibility = Visibility::Visible);
 }
+
+fn manage_cursor(
+    mut window: Query<&mut Window, With<PrimaryWindow>>,
+    state: Res<State<GameState>>,
+    buttons: Query<&Interaction, With<Button>>,
+) {
+    window.single_mut().cursor.icon = {
+        // In Loading state, icon is Progess/Wait
+        if *state == GameState::Loading {
+            CursorIcon::Wait
+        // If a button is hovered, icon is hand
+        } else if buttons.iter().any(|i| *i == Interaction::Pressed) {
+            CursorIcon::Grabbing
+        // If a button is clicked, icon is grab
+        } else if buttons.iter().any(|i| *i == Interaction::Hovered) {
+            CursorIcon::Hand
+        // Default icon is Crosshair
+        } else {
+            CursorIcon::Crosshair
+        }
+    };
+}
+
+fn interactive_button(
+    mut events: Query<(&mut BackgroundColor, &Interaction), (With<Button>, Changed<Interaction>)>,
+    mut writer: EventWriter<audio::AudioEvent>,
+) {
+    events
+        .iter_mut()
+        .for_each(|(mut bg_color, interaction)| match interaction {
+            Interaction::None => {
+                bg_color.0.set_a(0.5);
+            }
+            Interaction::Hovered => {
+                bg_color.0.set_a(0.75);
+            }
+            Interaction::Pressed => {
+                bg_color.0.set_a(1.0);
+                writer.send(audio::AudioEvent::MenuSelect)
+            }
+        });
+}