diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt
index 48797e6876..a13e1ebad2 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt
@@ -25,8 +25,8 @@ import com.bitwarden.ui.platform.theme.color.darkBitwardenColorScheme
 import com.bitwarden.ui.platform.theme.color.dynamicBitwardenColorScheme
 import com.bitwarden.ui.platform.theme.color.lightBitwardenColorScheme
 import com.bitwarden.ui.platform.theme.color.toMaterialColorScheme
-import com.x8bit.bitwarden.ui.platform.theme.shape.BitwardenShapes
-import com.x8bit.bitwarden.ui.platform.theme.shape.bitwardenShapes
+import com.bitwarden.ui.platform.theme.shape.BitwardenShapes
+import com.bitwarden.ui.platform.theme.shape.bitwardenShapes
 import com.x8bit.bitwarden.ui.platform.theme.type.BitwardenTypography
 import com.x8bit.bitwarden.ui.platform.theme.type.bitwardenTypography
 import com.x8bit.bitwarden.ui.platform.theme.type.toMaterialTypography
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt b/ui/src/main/java/com/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt
similarity index 93%
rename from app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt
rename to ui/src/main/java/com/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt
index 671b8a51c2..82ff63d4bb 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt
+++ b/ui/src/main/java/com/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt
@@ -1,4 +1,4 @@
-package com.x8bit.bitwarden.ui.platform.theme.shape
+package com.bitwarden.ui.platform.theme.shape
 
 import androidx.compose.foundation.shape.CornerBasedShape
 import androidx.compose.runtime.Immutable
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt b/ui/src/main/java/com/bitwarden/ui/platform/theme/shape/Shapes.kt
similarity index 94%
rename from app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt
rename to ui/src/main/java/com/bitwarden/ui/platform/theme/shape/Shapes.kt
index 55689d1d6b..296279f9ca 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt
+++ b/ui/src/main/java/com/bitwarden/ui/platform/theme/shape/Shapes.kt
@@ -1,4 +1,4 @@
-package com.x8bit.bitwarden.ui.platform.theme.shape
+package com.bitwarden.ui.platform.theme.shape
 
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape