diff --git a/apps/macos/Sources/Clawdis/AppMain.swift b/apps/macos/Sources/Clawdis/AppMain.swift
index bfd3590f7..eb1475a5f 100644
--- a/apps/macos/Sources/Clawdis/AppMain.swift
+++ b/apps/macos/Sources/Clawdis/AppMain.swift
@@ -429,50 +429,43 @@ private struct CritterStatusLabel: View {
     private let ticker = Timer.publish(every: 0.35, on: .main, in: .common).autoconnect()
 
     var body: some View {
-        Image(nsImage: CritterIconRenderer.makeIcon(
-            blink: blinkAmount,
-            legWiggle: legWiggle,
-            earWiggle: earWiggle
-        ))
-            .frame(width: 18, height: 16)
-            .rotationEffect(.degrees(wiggleAngle), anchor: .center)
-            .offset(x: wiggleOffset)
-            .onReceive(ticker) { now in
-                guard !isPaused else {
-                    resetMotion()
-                    return
-                }
+        Group {
+            if isPaused {
+                Image(nsImage: CritterIconRenderer.makeIcon(blink: 0))
+                    .frame(width: 18, height: 16)
+            } else {
+                Image(nsImage: CritterIconRenderer.makeIcon(
+                    blink: blinkAmount,
+                    legWiggle: legWiggle,
+                    earWiggle: earWiggle
+                ))
+                    .frame(width: 18, height: 16)
+                    .rotationEffect(.degrees(wiggleAngle), anchor: .center)
+                    .offset(x: wiggleOffset)
+                    .onReceive(ticker) { now in
+                        if now >= nextBlink {
+                            blink()
+                            nextBlink = now.addingTimeInterval(Double.random(in: 3.5 ... 8.5))
+                        }
 
-                if now >= nextBlink {
-                    blink()
-                    nextBlink = now.addingTimeInterval(Double.random(in: 3.5 ... 8.5))
-                }
+                        if now >= nextWiggle {
+                            wiggle()
+                            nextWiggle = now.addingTimeInterval(Double.random(in: 6.5 ... 14))
+                        }
 
-                if now >= nextWiggle {
-                    wiggle()
-                    nextWiggle = now.addingTimeInterval(Double.random(in: 6.5 ... 14))
-                }
+                        if now >= nextLegWiggle {
+                            wiggleLegs()
+                            nextLegWiggle = now.addingTimeInterval(Double.random(in: 5.0 ... 11.0))
+                        }
 
-                if now >= nextLegWiggle {
-                    wiggleLegs()
-                    nextLegWiggle = now.addingTimeInterval(Double.random(in: 5.0 ... 11.0))
-                }
-
-                if now >= nextEarWiggle {
-                    wiggleEars()
-                    nextEarWiggle = now.addingTimeInterval(Double.random(in: 7.0 ... 14.0))
-                }
-            }
-            .onChange(of: isPaused) { _, paused in
-                if paused {
-                    resetMotion()
-                } else {
-                    nextBlink = Date().addingTimeInterval(Double.random(in: 1.5 ... 3.5))
-                    nextWiggle = Date().addingTimeInterval(Double.random(in: 4.5 ... 9.5))
-                    nextLegWiggle = Date().addingTimeInterval(Double.random(in: 4.0 ... 8.0))
-                    nextEarWiggle = Date().addingTimeInterval(Double.random(in: 5.5 ... 10.5))
-                }
+                        if now >= nextEarWiggle {
+                            wiggleEars()
+                            nextEarWiggle = now.addingTimeInterval(Double.random(in: 7.0 ... 14.0))
+                        }
+                    }
+                    .onChange(of: isPaused) { _, _ in resetMotion() }
             }
+        }
     }
 
     private func resetMotion() {
diff --git a/scripts/restart-mac.sh b/scripts/restart-mac.sh
index 70727e546..1521fd8bb 100755
--- a/scripts/restart-mac.sh
+++ b/scripts/restart-mac.sh
@@ -44,7 +44,7 @@ log "==> Killing existing Clawdis instances"
 kill_all_clawdis
 
 # 2) Rebuild into the same path the packager consumes (.build).
-run_step "clean build cache" bash -lc "rm -rf '${ROOT_DIR}/apps/macos/.build'"
+run_step "clean build cache" bash -lc "cd '${ROOT_DIR}/apps/macos' && rm -rf .build .build-swift .swiftpm"
 run_step "swift build" bash -lc "cd '${ROOT_DIR}/apps/macos' && swift build -q --product Clawdis"
 
 # 3) Package + relaunch the app (script also stops any stragglers).