diff --git a/system/athena/registration.py b/system/athena/registration.py
index 964fbff51e..e48ae64aea 100755
--- a/system/athena/registration.py
+++ b/system/athena/registration.py
@@ -7,10 +7,10 @@ from pathlib import Path
 from datetime import datetime, timedelta, UTC
 from openpilot.common.api import api_get
 from openpilot.common.params import Params
-from openpilot.common.spinner import Spinner
 from openpilot.selfdrive.selfdrived.alertmanager import set_offroad_alert
 from openpilot.system.hardware import HARDWARE, PC
 from openpilot.system.hardware.hw import Paths
+from openpilot.system.ui.spinner import Spinner
 from openpilot.common.swaglog import cloudlog
 
 
diff --git a/system/manager/build.py b/system/manager/build.py
index 93c0546c85..d4d50afb06 100755
--- a/system/manager/build.py
+++ b/system/manager/build.py
@@ -5,9 +5,9 @@ from pathlib import Path
 
 # NOTE: Do NOT import anything here that needs be built (e.g. params)
 from openpilot.common.basedir import BASEDIR
-from openpilot.common.spinner import Spinner
-from openpilot.common.text_window import TextWindow
 from openpilot.system.hardware import HARDWARE, AGNOS
+from openpilot.system.ui.spinner import Spinner
+from openpilot.system.ui.text_window import TextWindow
 from openpilot.common.swaglog import cloudlog, add_file_handler
 from openpilot.system.version import get_build_metadata