diff --git a/app-nia-catalog/README.md b/app-nia-catalog/README.md
index 8fd8dcb8d9..716b163b2b 100644
--- a/app-nia-catalog/README.md
+++ b/app-nia-catalog/README.md
@@ -23,7 +23,7 @@ graph TB
   :app-nia-catalog -.-> :core:designsystem
   :app-nia-catalog -.-> :core:ui
   :core:ui --> :core:analytics
-  :core:ui --> :core:designsystem
+  :core:ui -.-> :core:designsystem
   :core:ui --> :core:model
 
 classDef android-application fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
diff --git a/app/README.md b/app/README.md
index cbcdc35be8..3c1ebb8906 100644
--- a/app/README.md
+++ b/app/README.md
@@ -87,7 +87,6 @@ graph TB
   :app -.-> :sync:work
   :benchmarks -.->|testedApks| :app
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
@@ -103,7 +102,7 @@ graph TB
   :core:notifications -.-> :core:common
   :core:notifications --> :core:model
   :core:ui --> :core:analytics
-  :core:ui --> :core:designsystem
+  :core:ui -.-> :core:designsystem
   :core:ui --> :core:model
   :feature:bookmarks:api --> :core:navigation
   :feature:bookmarks:impl -.-> :core:data
diff --git a/benchmarks/README.md b/benchmarks/README.md
index c2bbf2a2ab..694e9d696e 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -87,7 +87,6 @@ graph TB
   :app -.-> :sync:work
   :benchmarks -.->|testedApks| :app
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
@@ -103,7 +102,7 @@ graph TB
   :core:notifications -.-> :core:common
   :core:notifications --> :core:model
   :core:ui --> :core:analytics
-  :core:ui --> :core:designsystem
+  :core:ui -.-> :core:designsystem
   :core:ui --> :core:model
   :feature:bookmarks:api --> :core:navigation
   :feature:bookmarks:impl -.-> :core:data
diff --git a/core/data-test/README.md b/core/data-test/README.md
index b36f5b66d6..cccddf2501 100644
--- a/core/data-test/README.md
+++ b/core/data-test/README.md
@@ -26,7 +26,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
diff --git a/core/data/README.md b/core/data/README.md
index 0b84940d28..f09b53070d 100644
--- a/core/data/README.md
+++ b/core/data/README.md
@@ -25,7 +25,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
index c47d4ee587..a06a784090 100644
--- a/core/data/build.gradle.kts
+++ b/core/data/build.gradle.kts
@@ -26,7 +26,6 @@ android {
 }
 
 dependencies {
-    api(projects.core.common)
     api(projects.core.database)
     api(projects.core.datastore)
     api(projects.core.network)
diff --git a/core/domain/README.md b/core/domain/README.md
index b238773372..35590106b8 100644
--- a/core/domain/README.md
+++ b/core/domain/README.md
@@ -26,7 +26,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
diff --git a/core/testing/README.md b/core/testing/README.md
index d5925b1a5b..a26a0db0de 100644
--- a/core/testing/README.md
+++ b/core/testing/README.md
@@ -26,7 +26,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
diff --git a/core/ui/README.md b/core/ui/README.md
index c6b365553f..ea22882327 100644
--- a/core/ui/README.md
+++ b/core/ui/README.md
@@ -20,7 +20,7 @@ graph TB
   end
 
   :core:ui --> :core:analytics
-  :core:ui --> :core:designsystem
+  :core:ui -.-> :core:designsystem
   :core:ui --> :core:model
 
 classDef android-application fill:#CAFFBF,stroke:#000,stroke-width:2px,color:#000;
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index 5606cb5d16..6bed7f0d5e 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -25,10 +25,12 @@ android {
 
 dependencies {
     api(libs.androidx.metrics)
+
     api(projects.core.analytics)
-    api(projects.core.designsystem)
     api(projects.core.model)
 
+    implementation(projects.core.designsystem)
+
     implementation(libs.androidx.browser)
     implementation(libs.coil.kt)
     implementation(libs.coil.kt.compose)
diff --git a/feature/bookmarks/impl/README.md b/feature/bookmarks/impl/README.md
index 123a842f6c..b9be27e84d 100644
--- a/feature/bookmarks/impl/README.md
+++ b/feature/bookmarks/impl/README.md
@@ -40,7 +40,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
@@ -54,7 +53,7 @@ graph TB
   :core:notifications -.-> :core:common
   :core:notifications --> :core:model
   :core:ui --> :core:analytics
-  :core:ui --> :core:designsystem
+  :core:ui -.-> :core:designsystem
   :core:ui --> :core:model
   :feature:bookmarks:api --> :core:navigation
   :feature:bookmarks:impl -.-> :core:data
diff --git a/feature/foryou/impl/README.md b/feature/foryou/impl/README.md
index 8c12460f48..a146e37d67 100644
--- a/feature/foryou/impl/README.md
+++ b/feature/foryou/impl/README.md
@@ -41,7 +41,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
@@ -57,7 +56,7 @@ graph TB
   :core:notifications -.-> :core:common
   :core:notifications --> :core:model
   :core:ui --> :core:analytics
-  :core:ui --> :core:designsystem
+  :core:ui -.-> :core:designsystem
   :core:ui --> :core:model
   :feature:foryou:api --> :core:navigation
   :feature:foryou:impl -.-> :core:designsystem
diff --git a/feature/search/api/README.md b/feature/search/api/README.md
index a468f649d8..c4dc7c4dd7 100644
--- a/feature/search/api/README.md
+++ b/feature/search/api/README.md
@@ -34,7 +34,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
diff --git a/feature/search/impl/README.md b/feature/search/impl/README.md
index 04800005c5..898e1ff0e3 100644
--- a/feature/search/impl/README.md
+++ b/feature/search/impl/README.md
@@ -45,7 +45,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
@@ -61,7 +60,7 @@ graph TB
   :core:notifications -.-> :core:common
   :core:notifications --> :core:model
   :core:ui --> :core:analytics
-  :core:ui --> :core:designsystem
+  :core:ui -.-> :core:designsystem
   :core:ui --> :core:model
   :feature:interests:api --> :core:navigation
   :feature:search:api -.-> :core:domain
diff --git a/feature/settings/impl/README.md b/feature/settings/impl/README.md
index 88aadd9602..1ceda44323 100644
--- a/feature/settings/impl/README.md
+++ b/feature/settings/impl/README.md
@@ -34,7 +34,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
@@ -48,7 +47,7 @@ graph TB
   :core:notifications -.-> :core:common
   :core:notifications --> :core:model
   :core:ui --> :core:analytics
-  :core:ui --> :core:designsystem
+  :core:ui -.-> :core:designsystem
   :core:ui --> :core:model
   :feature:settings:impl -.-> :core:data
   :feature:settings:impl -.-> :core:designsystem
diff --git a/sync/sync-test/README.md b/sync/sync-test/README.md
index 601724ef76..a566222ea0 100644
--- a/sync/sync-test/README.md
+++ b/sync/sync-test/README.md
@@ -30,7 +30,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network
diff --git a/sync/work/README.md b/sync/work/README.md
index fab74f33c8..d08c77af33 100644
--- a/sync/work/README.md
+++ b/sync/work/README.md
@@ -29,7 +29,6 @@ graph TB
   end
 
   :core:data -.-> :core:analytics
-  :core:data --> :core:common
   :core:data --> :core:database
   :core:data --> :core:datastore
   :core:data --> :core:network