diff --git a/mobile_dashboard.yaml b/mobile_dashboard.yaml
index 95ac4ed..4d97f00 100644
--- a/mobile_dashboard.yaml
+++ b/mobile_dashboard.yaml
@@ -1464,7 +1464,15 @@ views:
                       double_tap_action:
                         action: none
                     modules:
-                      - rotating_icon
+                      - badgy-condition-helper
+                    badgy-condition-helper:
+                      icon_effects:
+                        main_icon:
+                          effect: spin-360
+                          condition:
+                            - condition: state
+                              entity_id: fan.basement_fan
+                              state: 'on'
                   - type: custom:bubble-card
                     card_type: button
                     button_type: switch
@@ -2671,7 +2679,15 @@ views:
                       double_tap_action:
                         action: none
                     modules:
-                      - rotating_icon
+                      - badgy-condition-helper
+                    badgy-condition-helper:
+                      icon_effects:
+                        main_icon:
+                          effect: spin-360
+                          condition:
+                            - condition: state
+                              entity_id: fan.master_bedroom_fan
+                              state: 'on'
                   - type: custom:bubble-card
                     card_type: empty-column
               - type: custom:bubble-card
@@ -2837,7 +2853,15 @@ views:
                       double_tap_action:
                         action: none
                     modules:
-                      - rotating_icon
+                      - badgy-condition-helper
+                    badgy-condition-helper:
+                      icon_effects:
+                        main_icon:
+                          effect: spin-360
+                          condition:
+                            - condition: state
+                              entity_id: fan.kallen_bedroom_fan
+                              state: 'on'
                   - type: custom:bubble-card
                     card_type: button
                     button_type: switch