diff --git a/selfdrive/ui/__init__.py b/selfdrive/ui/__init__.py
index e69de29bb2..b07e842f1a 100644
--- a/selfdrive/ui/__init__.py
+++ b/selfdrive/ui/__init__.py
@@ -0,0 +1 @@
+UI_BORDER_SIZE = 30
diff --git a/selfdrive/ui/onroad/augmented_road_view.py b/selfdrive/ui/onroad/augmented_road_view.py
index 259551954d..1f202141c3 100644
--- a/selfdrive/ui/onroad/augmented_road_view.py
+++ b/selfdrive/ui/onroad/augmented_road_view.py
@@ -3,7 +3,8 @@ import numpy as np
 import pyray as rl
 from cereal import log, messaging
 from msgq.visionipc import VisionStreamType
-from openpilot.selfdrive.ui.ui_state import ui_state, UIStatus, UI_BORDER_SIZE
+from openpilot.selfdrive.ui import UI_BORDER_SIZE
+from openpilot.selfdrive.ui.ui_state import ui_state, UIStatus
 from openpilot.selfdrive.ui.onroad.alert_renderer import AlertRenderer
 from openpilot.selfdrive.ui.onroad.driver_state import DriverStateRenderer
 from openpilot.selfdrive.ui.onroad.hud_renderer import HudRenderer
diff --git a/selfdrive/ui/onroad/driver_state.py b/selfdrive/ui/onroad/driver_state.py
index 8aaef1bcfb..7b3181d1ac 100644
--- a/selfdrive/ui/onroad/driver_state.py
+++ b/selfdrive/ui/onroad/driver_state.py
@@ -2,7 +2,8 @@ import numpy as np
 import pyray as rl
 from cereal import log
 from dataclasses import dataclass
-from openpilot.selfdrive.ui.ui_state import ui_state, UI_BORDER_SIZE
+from openpilot.selfdrive.ui import UI_BORDER_SIZE
+from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.system.ui.lib.application import gui_app
 from openpilot.system.ui.widgets import Widget
 
diff --git a/selfdrive/ui/ui_state.py b/selfdrive/ui/ui_state.py
index 5d770fb91d..a947e5406b 100644
--- a/selfdrive/ui/ui_state.py
+++ b/selfdrive/ui/ui_state.py
@@ -12,7 +12,6 @@ from openpilot.selfdrive.ui.lib.prime_state import PrimeState
 from openpilot.system.ui.lib.application import gui_app
 from openpilot.system.hardware import HARDWARE
 
-UI_BORDER_SIZE = 30
 BACKLIGHT_OFFROAD = 50
 
 
diff --git a/selfdrive/ui/widgets/pairing_dialog.py b/selfdrive/ui/widgets/pairing_dialog.py
index 85b42d1a7a..f960cf723e 100644
--- a/selfdrive/ui/widgets/pairing_dialog.py
+++ b/selfdrive/ui/widgets/pairing_dialog.py
@@ -11,21 +11,10 @@ from openpilot.system.ui.lib.application import FontWeight, gui_app
 from openpilot.system.ui.lib.multilang import tr
 from openpilot.system.ui.lib.wrap_text import wrap_text
 from openpilot.system.ui.lib.text_measure import measure_text_cached
+from openpilot.system.ui.widgets.button import IconButton
 from openpilot.selfdrive.ui.ui_state import ui_state
 
 
-class IconButton(Widget):
-  def __init__(self, texture: rl.Texture):
-    super().__init__()
-    self._texture = texture
-
-  def _render(self, rect: rl.Rectangle):
-    color = rl.Color(180, 180, 180, 150) if self.is_pressed else rl.WHITE
-    draw_x = rect.x + (rect.width - self._texture.width) / 2
-    draw_y = rect.y + (rect.height - self._texture.height) / 2
-    rl.draw_texture(self._texture, int(draw_x), int(draw_y), color)
-
-
 class PairingDialog(Widget):
   """Dialog for device pairing with QR code."""
 
diff --git a/selfdrive/ui/widgets/prime.py b/selfdrive/ui/widgets/prime.py
index 49a0e56cdc..e98e4c1e1c 100644
--- a/selfdrive/ui/widgets/prime.py
+++ b/selfdrive/ui/widgets/prime.py
@@ -34,7 +34,7 @@ class PrimeWidget(Widget):
 
     # Description with wrapping
     desc_y = y + 140
-    font = gui_app.font(FontWeight.LIGHT)
+    font = gui_app.font(FontWeight.NORMAL)
     wrapped_text = "\n".join(wrap_text(font, tr("Become a comma prime member at connect.comma.ai"), 56, int(w)))
     text_size = measure_text_cached(font, wrapped_text, 56)
     rl.draw_text_ex(font, wrapped_text, rl.Vector2(x, desc_y), 56, 0, rl.WHITE)
diff --git a/selfdrive/ui/widgets/setup.py b/selfdrive/ui/widgets/setup.py
index fcc5a14103..3c9406688f 100644
--- a/selfdrive/ui/widgets/setup.py
+++ b/selfdrive/ui/widgets/setup.py
@@ -46,7 +46,7 @@ class SetupWidget(Widget):
 
     # Description
     desc = tr("Pair your device with comma connect (connect.comma.ai) and claim your comma prime offer.")
-    light_font = gui_app.font(FontWeight.LIGHT)
+    light_font = gui_app.font(FontWeight.NORMAL)
     wrapped = wrap_text(light_font, desc, 50, int(w))
     for line in wrapped:
       rl.draw_text_ex(light_font, line, rl.Vector2(x, y), 50, 0, rl.WHITE)
diff --git a/system/ui/lib/application.py b/system/ui/lib/application.py
index 39f27ea1a4..8ec417159f 100644
--- a/system/ui/lib/application.py
+++ b/system/ui/lib/application.py
@@ -274,6 +274,8 @@ class GuiApplication:
         rl.image_resize(image, new_width, new_height)
       else:
         rl.image_resize(image, width, height)
+    else:
+      assert keep_aspect_ratio, "Cannot resize without specifying width and height"
     return image
 
   def _load_texture_from_image(self, image: rl.Image) -> rl.Texture:
diff --git a/system/ui/widgets/button.py b/system/ui/widgets/button.py
index 5b9c51886d..df7a52d1c0 100644
--- a/system/ui/widgets/button.py
+++ b/system/ui/widgets/button.py
@@ -169,3 +169,15 @@ class ButtonRadio(Button):
       icon_y = self._rect.y + (self._rect.height - self._icon.height) / 2
       icon_x = self._rect.x + self._rect.width - self._icon.width - self._text_padding - ICON_PADDING
       rl.draw_texture_v(self._icon, rl.Vector2(icon_x, icon_y), rl.WHITE if self.enabled else rl.Color(255, 255, 255, 100))
+
+
+class IconButton(Widget):
+  def __init__(self, texture: rl.Texture):
+    super().__init__()
+    self._texture = texture
+
+  def _render(self, rect: rl.Rectangle):
+    color = rl.Color(180, 180, 180, 150) if self.is_pressed else rl.WHITE
+    draw_x = rect.x + (rect.width - self._texture.width) / 2
+    draw_y = rect.y + (rect.height - self._texture.height) / 2
+    rl.draw_texture(self._texture, int(draw_x), int(draw_y), color)