diff --git a/feature/settings/import/build.gradle.kts b/feature/settings/import/build.gradle.kts
index 5b005178d53..4655c297101 100644
--- a/feature/settings/import/build.gradle.kts
+++ b/feature/settings/import/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
     implementation(libs.appauth)
 
     implementation(libs.androidx.fragment.compose)
+    implementation(libs.androidx.fragment.ktx)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.fastadapter)
 
diff --git a/feature/widget/message-list/build.gradle.kts b/feature/widget/message-list/build.gradle.kts
index 249a35a9157..1e5bf2f0910 100644
--- a/feature/widget/message-list/build.gradle.kts
+++ b/feature/widget/message-list/build.gradle.kts
@@ -3,9 +3,13 @@ plugins {
 }
 
 dependencies {
+    api(projects.app.core)
+
     implementation(projects.app.ui.legacy)
-    implementation(projects.app.core)
+    implementation(projects.core.ui.legacy.designsystem)
+    implementation(projects.mail.common)
 
+    implementation(libs.androidx.appcompat)
     implementation(libs.timber)
 }
 
diff --git a/feature/widget/shortcut/build.gradle.kts b/feature/widget/shortcut/build.gradle.kts
index a3026b07b61..ef3ef031108 100644
--- a/feature/widget/shortcut/build.gradle.kts
+++ b/feature/widget/shortcut/build.gradle.kts
@@ -3,8 +3,13 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.app.ui.legacy)
+    api(projects.app.ui.legacy)
+
     implementation(projects.app.core)
+    implementation(projects.core.ui.legacy.theme2.common)
+
+    implementation(libs.androidx.annotation)
+    implementation(libs.androidx.lifecycle.viewmodel)
 }
 
 android {
diff --git a/feature/widget/unread/build.gradle.kts b/feature/widget/unread/build.gradle.kts
index eade08e2d67..904474fb2e8 100644
--- a/feature/widget/unread/build.gradle.kts
+++ b/feature/widget/unread/build.gradle.kts
@@ -3,13 +3,22 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.app.ui.legacy)
-    implementation(projects.app.core)
+    api(projects.app.core)
+    api(projects.app.ui.base)
+    api(projects.app.ui.legacy)
+    api(projects.mail.common)
 
-    implementation(libs.preferencex)
+    api(libs.preferencex)
+
+    implementation(projects.core.ui.legacy.designsystem)
+
+    implementation(libs.androidx.fragment)
+    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(libs.androidx.preference)
     implementation(libs.timber)
 
     testImplementation(libs.robolectric)
+    testImplementation(libs.robolectric.shadows)
 }
 
 android {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 56926656a8f..71a18fd052b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -136,6 +136,7 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidxCoreSplashscreen" }
 androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidxFragment" }
 androidx-fragment-compose = { module = "androidx.fragment:fragment-compose", version.ref = "androidxFragment" }
+androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidxFragment" }
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidxLifecycle" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycle" }
 androidx-lifecycle-runtime-testing = { module = "androidx.lifecycle:lifecycle-runtime-testing", version.ref = "androidxLifecycle" }
@@ -221,6 +222,7 @@ preferencex = { module = "com.takisoft.preferencex:preferencex", version.ref = "
 preferencex-colorpicker = { module = "com.takisoft.preferencex:preferencex-colorpicker", version.ref = "preferencesFix" }
 preferencex-datetimepicker = { module = "com.takisoft.preferencex:preferencex-datetimepicker", version.ref = "preferencesFix" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+robolectric-shadows = { module = "org.robolectric:shadows-framework", version.ref = "robolectric" }
 safeContentResolver = { module = "de.cketti.safecontentresolver:safe-content-resolver-v21", version.ref = "safeContentResolver" }
 searchPreference = { module = "com.github.ByteHamster:SearchPreference", version.ref = "searchPreference" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
diff --git a/ui-utils/ToolbarBottomSheet/build.gradle.kts b/ui-utils/ToolbarBottomSheet/build.gradle.kts
index 391f029f0aa..5a3ccfa645f 100644
--- a/ui-utils/ToolbarBottomSheet/build.gradle.kts
+++ b/ui-utils/ToolbarBottomSheet/build.gradle.kts
@@ -8,7 +8,6 @@ dependencies {
     api(libs.androidx.coordinatorlayout)
 
     implementation(libs.androidx.annotation)
-    implementation(libs.androidx.fragment)
     implementation(libs.androidx.lifecycle.viewmodel)
 }