diff --git a/legacy/ui/account/build.gradle.kts b/core/ui/account/build.gradle.kts
similarity index 77%
rename from legacy/ui/account/build.gradle.kts
rename to core/ui/account/build.gradle.kts
index 8f79a4ad046..c5bd05d5dd6 100644
--- a/legacy/ui/account/build.gradle.kts
+++ b/core/ui/account/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "app.k9mail.legacy.ui.account"
+    namespace = "net.thunderbird.core.ui.account"
 }
 
 dependencies {
diff --git a/legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/AccountFallbackImageProvider.kt b/core/ui/account/src/main/java/net/thunderbird/core/ui/account/AccountFallbackImageProvider.kt
similarity index 96%
rename from legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/AccountFallbackImageProvider.kt
rename to core/ui/account/src/main/java/net/thunderbird/core/ui/account/AccountFallbackImageProvider.kt
index 676939c50b6..0001b6fbdbf 100644
--- a/legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/AccountFallbackImageProvider.kt
+++ b/core/ui/account/src/main/java/net/thunderbird/core/ui/account/AccountFallbackImageProvider.kt
@@ -1,4 +1,4 @@
-package app.k9mail.legacy.ui.account
+package net.thunderbird.core.ui.account
 
 import android.content.Context
 import android.graphics.drawable.ColorDrawable
diff --git a/legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/AccountImage.kt b/core/ui/account/src/main/java/net/thunderbird/core/ui/account/AccountImage.kt
similarity index 87%
rename from legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/AccountImage.kt
rename to core/ui/account/src/main/java/net/thunderbird/core/ui/account/AccountImage.kt
index ebf2add527d..39c6d7e15db 100644
--- a/legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/AccountImage.kt
+++ b/core/ui/account/src/main/java/net/thunderbird/core/ui/account/AccountImage.kt
@@ -1,4 +1,4 @@
-package app.k9mail.legacy.ui.account
+package net.thunderbird.core.ui.account
 
 import com.bumptech.glide.load.Key
 import java.security.MessageDigest
diff --git a/legacy/ui/legacy/build.gradle.kts b/legacy/ui/legacy/build.gradle.kts
index b7a9f777e71..3221e6d9777 100644
--- a/legacy/ui/legacy/build.gradle.kts
+++ b/legacy/ui/legacy/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(projects.legacy.ui.base)
-    api(projects.legacy.ui.account)
+    api(projects.core.ui.account)
     api(projects.legacy.ui.folder)
     api(projects.core.ui.legacy.designsystem)
 
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java
index 52e0ce1fe2e..2dedf8de5b2 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java
+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureGlideModule.java
@@ -8,8 +8,8 @@
 import com.bumptech.glide.annotation.GlideModule;
 import com.bumptech.glide.module.LibraryGlideModule;
 import app.k9mail.legacy.di.DI;
-import app.k9mail.legacy.ui.account.AccountImage;
 import com.fsck.k9.ui.account.AccountImageModelLoaderFactory;
+import net.thunderbird.core.ui.account.AccountImage;
 import org.jetbrains.annotations.NotNull;
 
 @GlideModule
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
index bd17f47aba7..5c93538a0f5 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
@@ -2,8 +2,6 @@ package com.fsck.k9.ui.account
 
 import android.graphics.Bitmap
 import androidx.core.graphics.drawable.toBitmap
-import app.k9mail.legacy.ui.account.AccountFallbackImageProvider
-import app.k9mail.legacy.ui.account.AccountImage
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.Options
@@ -12,6 +10,8 @@ import com.bumptech.glide.load.model.ModelLoader
 import com.bumptech.glide.load.model.ModelLoaderFactory
 import com.bumptech.glide.load.model.MultiModelLoaderFactory
 import com.fsck.k9.contacts.ContactPhotoLoader
+import net.thunderbird.core.ui.account.AccountFallbackImageProvider
+import net.thunderbird.core.ui.account.AccountImage
 
 /**
  * A custom [ModelLoader] so we can use [AccountImageDataFetcher] to load the account image.
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt
index 5e8bb83cd91..a9691387164 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt
+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt
@@ -1,6 +1,6 @@
 package com.fsck.k9.ui.account
 
-import app.k9mail.legacy.ui.account.AccountFallbackImageProvider
+import net.thunderbird.core.ui.account.AccountFallbackImageProvider
 import org.koin.dsl.module
 
 val accountUiModule = module {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 84657d87cd0..480cd64532d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -168,7 +168,6 @@ include(
     ":legacy:storage",
     ":legacy:testing",
     ":legacy:ui:base",
-    ":legacy:ui:account",
     ":legacy:ui:folder",
     ":legacy:ui:legacy",
 )
@@ -226,3 +225,4 @@ include(":core:preferences")
 include(":core:mail:mailserver")
 include(":feature:notification")
 include(":core:ui:theme:manager")
+include(":core:ui:account")