diff --git a/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt
index b4105def4e..33ce75461c 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/AppModule.kt
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvid
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
-import info.nightscout.androidaps.utils.resources.IconsProviderImplementation
+import info.nightscout.implementation.resources.IconsProviderImplementation
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.AndroidPermissionImpl
@@ -63,6 +63,7 @@ import info.nightscout.interfaces.ui.IconsProvider
 import info.nightscout.interfaces.utils.HardLimits
 import info.nightscout.interfaces.utils.TrendCalculator
 import info.nightscout.plugins.aps.loop.LoopPlugin
+import info.nightscout.plugins.general.autotune.AutotunePlugin
 import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.plugins.sync.nsclient.DataSyncSelectorImplementation
 import info.nightscout.plugins.sync.nsclient.data.ProcessedDeviceStatusData
@@ -139,7 +140,7 @@ open class AppModule {
         @Binds fun bindImportExportPrefsInterface(importExportPrefs: ImportExportPrefsImpl): ImportExportPrefs
         @Binds fun bindIconsProviderInterface(iconsProvider: IconsProviderImplementation): IconsProvider
         @Binds fun bindLoopInterface(loopPlugin: LoopPlugin): Loop
-        @Binds fun bindAutotuneInterface(autotunePlugin: info.nightscout.plugins.general.autotune.AutotunePlugin): Autotune
+        @Binds fun bindAutotuneInterface(autotunePlugin: AutotunePlugin): Autotune
         @Binds fun bindIobCobCalculatorInterface(iobCobCalculatorPlugin: IobCobCalculatorPlugin): IobCobCalculator
         @Binds fun bindSmsCommunicatorInterface(smsCommunicatorPlugin: SmsCommunicatorPlugin): SmsCommunicator
         @Binds fun bindDataSyncSelectorInterface(dataSyncSelectorImplementation: DataSyncSelectorImplementation): DataSyncSelector
diff --git a/implementation/build.gradle b/implementation/build.gradle
index a9cd6b3462..cd610c49e8 100644
--- a/implementation/build.gradle
+++ b/implementation/build.gradle
@@ -25,4 +25,5 @@ dependencies {
     implementation project(':core:core-main')
     implementation project(':core:fabric')
     implementation project(':core:ui')
+    implementation project(':ui')
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProviderImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProviderImplementation.kt
rename to implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt
index 43686c1945..eeec845d6b 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProviderImplementation.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.utils.resources
+package info.nightscout.implementation.resources
 
-import info.nightscout.androidaps.R
+import info.nightscout.implementation.R
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.ui.IconsProvider
 import javax.inject.Inject
diff --git a/app/src/main/res/drawable/ic_notif_nsclient.xml b/implementation/src/main/res/drawable/ic_notif_nsclient.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_notif_nsclient.xml
rename to implementation/src/main/res/drawable/ic_notif_nsclient.xml
diff --git a/app/src/main/res/drawable/ic_notif_pumpcontrol.xml b/implementation/src/main/res/drawable/ic_notif_pumpcontrol.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_notif_pumpcontrol.xml
rename to implementation/src/main/res/drawable/ic_notif_pumpcontrol.xml
diff --git a/ui/build.gradle b/ui/build.gradle
index 0ae18c9b7e..f7123159ce 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -25,5 +25,5 @@ dependencies {
     implementation project(':core:core-main')
     implementation project(':core:fabric')
     implementation project(':interfaces')
-    implementation project(path: ':core:ui')
+    implementation project(':core:ui')
 }
\ No newline at end of file