diff --git a/app/src/main/res/drawable/ic_wind.xml b/app/src/main/res/drawable/ic_wind.xml
deleted file mode 100644
index f3ec8d4a..00000000
--- a/app/src/main/res/drawable/ic_wind.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt b/applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt
index 2c6a8f5d..35c91a57 100644
--- a/applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt
+++ b/applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt
@@ -33,7 +33,7 @@ class AppInstallation(
override fun getPlaceholderIcon(context: Context): LauncherIcon {
return LauncherIcon(
- foreground = ContextCompat.getDrawable(context, R.drawable.ic_app_placeholder)!!,
+ foreground = ContextCompat.getDrawable(context, R.drawable.ic_file_android)!!,
background = ColorDrawable(ContextCompat.getColor(context, R.color.grey)),
foregroundScale = 0.5f)
}
diff --git a/applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt b/applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt
index de98e1d2..ea91daab 100644
--- a/applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt
+++ b/applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt
@@ -74,7 +74,7 @@ class AppShortcut(
override fun getPlaceholderIcon(context: Context): LauncherIcon {
return LauncherIcon(
- foreground = ContextCompat.getDrawable(context, R.drawable.ic_app_placeholder)!!,
+ foreground = ContextCompat.getDrawable(context, R.drawable.ic_file_android)!!,
background = ColorDrawable(ContextCompat.getColor(context, R.color.green)),
foregroundScale = 0.5f)
}
diff --git a/applications/src/main/java/de/mm20/launcher2/search/data/Application.kt b/applications/src/main/java/de/mm20/launcher2/search/data/Application.kt
index 8cddd3fe..6ab77ed9 100644
--- a/applications/src/main/java/de/mm20/launcher2/search/data/Application.kt
+++ b/applications/src/main/java/de/mm20/launcher2/search/data/Application.kt
@@ -39,7 +39,7 @@ abstract class Application(
override fun getPlaceholderIcon(context: Context): LauncherIcon {
return LauncherIcon(
- foreground = ContextCompat.getDrawable(context, R.drawable.ic_app_placeholder)!!,
+ foreground = ContextCompat.getDrawable(context, R.drawable.ic_file_android)!!,
background = ColorDrawable(ContextCompat.getColor(context, R.color.lightgreen)),
foregroundScale = 0.5f
)
diff --git a/applications/src/main/res/drawable/ic_app_placeholder.xml b/applications/src/main/res/drawable/ic_app_placeholder.xml
deleted file mode 100644
index 8d3fd387..00000000
--- a/applications/src/main/res/drawable/ic_app_placeholder.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/anim/ic_skip_next_arrow1.xml b/base/src/main/res/anim/ic_skip_next_arrow1.xml
similarity index 100%
rename from app/src/main/res/anim/ic_skip_next_arrow1.xml
rename to base/src/main/res/anim/ic_skip_next_arrow1.xml
diff --git a/app/src/main/res/anim/ic_skip_next_arrow2.xml b/base/src/main/res/anim/ic_skip_next_arrow2.xml
similarity index 100%
rename from app/src/main/res/anim/ic_skip_next_arrow2.xml
rename to base/src/main/res/anim/ic_skip_next_arrow2.xml
diff --git a/app/src/main/res/anim/ic_skip_prev_arrow1.xml b/base/src/main/res/anim/ic_skip_prev_arrow1.xml
similarity index 100%
rename from app/src/main/res/anim/ic_skip_prev_arrow1.xml
rename to base/src/main/res/anim/ic_skip_prev_arrow1.xml
diff --git a/app/src/main/res/anim/ic_skip_prev_arrow2.xml b/base/src/main/res/anim/ic_skip_prev_arrow2.xml
similarity index 100%
rename from app/src/main/res/anim/ic_skip_prev_arrow2.xml
rename to base/src/main/res/anim/ic_skip_prev_arrow2.xml
diff --git a/ui/src/main/res/drawable/anim_ic_edit_add.xml b/base/src/main/res/drawable/anim_ic_edit_add.xml
similarity index 100%
rename from ui/src/main/res/drawable/anim_ic_edit_add.xml
rename to base/src/main/res/drawable/anim_ic_edit_add.xml
diff --git a/ui/src/main/res/drawable/anim_ic_menu_clear.xml b/base/src/main/res/drawable/anim_ic_menu_clear.xml
similarity index 100%
rename from ui/src/main/res/drawable/anim_ic_menu_clear.xml
rename to base/src/main/res/drawable/anim_ic_menu_clear.xml
diff --git a/ui/src/main/res/drawable/anim_ic_play_pause.xml b/base/src/main/res/drawable/anim_ic_play_pause.xml
similarity index 100%
rename from ui/src/main/res/drawable/anim_ic_play_pause.xml
rename to base/src/main/res/drawable/anim_ic_play_pause.xml
diff --git a/ui/src/main/res/drawable/anim_weather_sun_moon.xml b/base/src/main/res/drawable/anim_weather_sun_moon.xml
similarity index 100%
rename from ui/src/main/res/drawable/anim_weather_sun_moon.xml
rename to base/src/main/res/drawable/anim_weather_sun_moon.xml
diff --git a/app/src/main/res/drawable/ic_about_fdroid.xml b/base/src/main/res/drawable/ic_about_fdroid.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_about_fdroid.xml
rename to base/src/main/res/drawable/ic_about_fdroid.xml
diff --git a/app/src/main/res/drawable/ic_about_github.xml b/base/src/main/res/drawable/ic_about_github.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_about_github.xml
rename to base/src/main/res/drawable/ic_about_github.xml
diff --git a/app/src/main/res/drawable/ic_about_telegram.xml b/base/src/main/res/drawable/ic_about_telegram.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_about_telegram.xml
rename to base/src/main/res/drawable/ic_about_telegram.xml
diff --git a/app/src/main/res/drawable/ic_about_xda.xml b/base/src/main/res/drawable/ic_about_xda.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_about_xda.xml
rename to base/src/main/res/drawable/ic_about_xda.xml
diff --git a/app/src/main/res/drawable/ic_account_google.xml b/base/src/main/res/drawable/ic_account_google.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_account_google.xml
rename to base/src/main/res/drawable/ic_account_google.xml
diff --git a/app/src/main/res/drawable/ic_account_microsoft.xml b/base/src/main/res/drawable/ic_account_microsoft.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_account_microsoft.xml
rename to base/src/main/res/drawable/ic_account_microsoft.xml
diff --git a/app/src/main/res/drawable/ic_account_nextcloud.xml b/base/src/main/res/drawable/ic_account_nextcloud.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_account_nextcloud.xml
rename to base/src/main/res/drawable/ic_account_nextcloud.xml
diff --git a/app/src/main/res/drawable/ic_account_owncloud.xml b/base/src/main/res/drawable/ic_account_owncloud.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_account_owncloud.xml
rename to base/src/main/res/drawable/ic_account_owncloud.xml
diff --git a/ui/src/main/res/drawable/ic_add.xml b/base/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_add.xml
rename to base/src/main/res/drawable/ic_add.xml
diff --git a/ui/src/main/res/drawable/ic_arrow_back.xml b/base/src/main/res/drawable/ic_arrow_back.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_arrow_back.xml
rename to base/src/main/res/drawable/ic_arrow_back.xml
diff --git a/app/src/main/res/drawable/ic_arrow_drop_down.xml b/base/src/main/res/drawable/ic_arrow_drop_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_drop_down.xml
rename to base/src/main/res/drawable/ic_arrow_drop_down.xml
diff --git a/ui/src/main/res/drawable/ic_arrow_left.xml b/base/src/main/res/drawable/ic_arrow_left.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_arrow_left.xml
rename to base/src/main/res/drawable/ic_arrow_left.xml
diff --git a/ui/src/main/res/drawable/ic_arrow_right.xml b/base/src/main/res/drawable/ic_arrow_right.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_arrow_right.xml
rename to base/src/main/res/drawable/ic_arrow_right.xml
diff --git a/ui/src/main/res/drawable/ic_arrow_up.xml b/base/src/main/res/drawable/ic_arrow_up.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_arrow_up.xml
rename to base/src/main/res/drawable/ic_arrow_up.xml
diff --git a/ui/src/main/res/drawable/ic_attendees.xml b/base/src/main/res/drawable/ic_attendees.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_attendees.xml
rename to base/src/main/res/drawable/ic_attendees.xml
diff --git a/badges/src/main/res/drawable/ic_badge_nextcloud.xml b/base/src/main/res/drawable/ic_badge_nextcloud.xml
similarity index 100%
rename from badges/src/main/res/drawable/ic_badge_nextcloud.xml
rename to base/src/main/res/drawable/ic_badge_nextcloud.xml
diff --git a/badges/src/main/res/drawable/ic_badge_onedrive.xml b/base/src/main/res/drawable/ic_badge_onedrive.xml
similarity index 100%
rename from badges/src/main/res/drawable/ic_badge_onedrive.xml
rename to base/src/main/res/drawable/ic_badge_onedrive.xml
diff --git a/badges/src/main/res/drawable/ic_badge_owncloud.xml b/base/src/main/res/drawable/ic_badge_owncloud.xml
similarity index 100%
rename from badges/src/main/res/drawable/ic_badge_owncloud.xml
rename to base/src/main/res/drawable/ic_badge_owncloud.xml
diff --git a/badges/src/main/res/drawable/ic_badge_suspended.xml b/base/src/main/res/drawable/ic_badge_suspended.xml
similarity index 100%
rename from badges/src/main/res/drawable/ic_badge_suspended.xml
rename to base/src/main/res/drawable/ic_badge_suspended.xml
diff --git a/badges/src/main/res/drawable/ic_badge_workprofile.xml b/base/src/main/res/drawable/ic_badge_workprofile.xml
similarity index 100%
rename from badges/src/main/res/drawable/ic_badge_workprofile.xml
rename to base/src/main/res/drawable/ic_badge_workprofile.xml
diff --git a/ui/src/main/res/drawable/ic_call.xml b/base/src/main/res/drawable/ic_call.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_call.xml
rename to base/src/main/res/drawable/ic_call.xml
diff --git a/app/src/main/res/drawable/ic_cancel.xml b/base/src/main/res/drawable/ic_cancel.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cancel.xml
rename to base/src/main/res/drawable/ic_cancel.xml
diff --git a/app/src/main/res/drawable/ic_clear.xml b/base/src/main/res/drawable/ic_clear.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_clear.xml
rename to base/src/main/res/drawable/ic_clear.xml
diff --git a/ui/src/main/res/drawable/ic_delete.xml b/base/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_delete.xml
rename to base/src/main/res/drawable/ic_delete.xml
diff --git a/app/src/main/res/drawable/ic_description.xml b/base/src/main/res/drawable/ic_description.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_description.xml
rename to base/src/main/res/drawable/ic_description.xml
diff --git a/ui/src/main/res/drawable/ic_done.xml b/base/src/main/res/drawable/ic_done.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_done.xml
rename to base/src/main/res/drawable/ic_done.xml
diff --git a/app/src/main/res/drawable/ic_drag_handle.xml b/base/src/main/res/drawable/ic_drag_handle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_drag_handle.xml
rename to base/src/main/res/drawable/ic_drag_handle.xml
diff --git a/ui/src/main/res/drawable/ic_edit.xml b/base/src/main/res/drawable/ic_edit.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_edit.xml
rename to base/src/main/res/drawable/ic_edit.xml
diff --git a/app/src/main/res/drawable/ic_expand_more.xml b/base/src/main/res/drawable/ic_expand_more.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_more.xml
rename to base/src/main/res/drawable/ic_expand_more.xml
diff --git a/app/src/main/res/drawable/ic_file_android.xml b/base/src/main/res/drawable/ic_file_android.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_android.xml
rename to base/src/main/res/drawable/ic_file_android.xml
diff --git a/app/src/main/res/drawable/ic_file_archive.xml b/base/src/main/res/drawable/ic_file_archive.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_archive.xml
rename to base/src/main/res/drawable/ic_file_archive.xml
diff --git a/app/src/main/res/drawable/ic_file_code.xml b/base/src/main/res/drawable/ic_file_code.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_code.xml
rename to base/src/main/res/drawable/ic_file_code.xml
diff --git a/app/src/main/res/drawable/ic_file_document.xml b/base/src/main/res/drawable/ic_file_document.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_document.xml
rename to base/src/main/res/drawable/ic_file_document.xml
diff --git a/app/src/main/res/drawable/ic_file_folder.xml b/base/src/main/res/drawable/ic_file_folder.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_folder.xml
rename to base/src/main/res/drawable/ic_file_folder.xml
diff --git a/app/src/main/res/drawable/ic_file_form.xml b/base/src/main/res/drawable/ic_file_form.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_form.xml
rename to base/src/main/res/drawable/ic_file_form.xml
diff --git a/app/src/main/res/drawable/ic_file_generic.xml b/base/src/main/res/drawable/ic_file_generic.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_generic.xml
rename to base/src/main/res/drawable/ic_file_generic.xml
diff --git a/app/src/main/res/drawable/ic_file_markup.xml b/base/src/main/res/drawable/ic_file_markup.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_markup.xml
rename to base/src/main/res/drawable/ic_file_markup.xml
diff --git a/app/src/main/res/drawable/ic_file_music.xml b/base/src/main/res/drawable/ic_file_music.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_music.xml
rename to base/src/main/res/drawable/ic_file_music.xml
diff --git a/app/src/main/res/drawable/ic_file_pdf.xml b/base/src/main/res/drawable/ic_file_pdf.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_pdf.xml
rename to base/src/main/res/drawable/ic_file_pdf.xml
diff --git a/app/src/main/res/drawable/ic_file_picture.xml b/base/src/main/res/drawable/ic_file_picture.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_picture.xml
rename to base/src/main/res/drawable/ic_file_picture.xml
diff --git a/app/src/main/res/drawable/ic_file_presentation.xml b/base/src/main/res/drawable/ic_file_presentation.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_presentation.xml
rename to base/src/main/res/drawable/ic_file_presentation.xml
diff --git a/app/src/main/res/drawable/ic_file_spreadsheet.xml b/base/src/main/res/drawable/ic_file_spreadsheet.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_spreadsheet.xml
rename to base/src/main/res/drawable/ic_file_spreadsheet.xml
diff --git a/app/src/main/res/drawable/ic_file_video.xml b/base/src/main/res/drawable/ic_file_video.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_video.xml
rename to base/src/main/res/drawable/ic_file_video.xml
diff --git a/ui/src/main/res/drawable/ic_info_outline.xml b/base/src/main/res/drawable/ic_info_outline.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_info_outline.xml
rename to base/src/main/res/drawable/ic_info_outline.xml
diff --git a/app/src/main/res/drawable/ic_location.xml b/base/src/main/res/drawable/ic_location.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_location.xml
rename to base/src/main/res/drawable/ic_location.xml
diff --git a/ui/src/main/res/drawable/ic_mail.xml b/base/src/main/res/drawable/ic_mail.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_mail.xml
rename to base/src/main/res/drawable/ic_mail.xml
diff --git a/ui/src/main/res/drawable/ic_message.xml b/base/src/main/res/drawable/ic_message.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_message.xml
rename to base/src/main/res/drawable/ic_message.xml
diff --git a/app/src/main/res/drawable/ic_more_horiz.xml b/base/src/main/res/drawable/ic_more_horiz.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_more_horiz.xml
rename to base/src/main/res/drawable/ic_more_horiz.xml
diff --git a/ui/src/main/res/drawable/ic_more_vert.xml b/base/src/main/res/drawable/ic_more_vert.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_more_vert.xml
rename to base/src/main/res/drawable/ic_more_vert.xml
diff --git a/app/src/main/res/drawable/ic_open_external.xml b/base/src/main/res/drawable/ic_open_external.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_open_external.xml
rename to base/src/main/res/drawable/ic_open_external.xml
diff --git a/app/src/main/res/drawable/ic_open_in_browser.xml b/base/src/main/res/drawable/ic_open_in_browser.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_open_in_browser.xml
rename to base/src/main/res/drawable/ic_open_in_browser.xml
diff --git a/ui/src/main/res/drawable/ic_pause.xml b/base/src/main/res/drawable/ic_pause.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_pause.xml
rename to base/src/main/res/drawable/ic_pause.xml
diff --git a/ui/src/main/res/drawable/ic_pause_to_play.xml b/base/src/main/res/drawable/ic_pause_to_play.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_pause_to_play.xml
rename to base/src/main/res/drawable/ic_pause_to_play.xml
diff --git a/app/src/main/res/drawable/ic_permission_calendar.xml b/base/src/main/res/drawable/ic_permission_calendar.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_permission_calendar.xml
rename to base/src/main/res/drawable/ic_permission_calendar.xml
diff --git a/ui/src/main/res/drawable/ic_play.xml b/base/src/main/res/drawable/ic_play.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_play.xml
rename to base/src/main/res/drawable/ic_play.xml
diff --git a/ui/src/main/res/drawable/ic_play_to_pause.xml b/base/src/main/res/drawable/ic_play_to_pause.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_play_to_pause.xml
rename to base/src/main/res/drawable/ic_play_to_pause.xml
diff --git a/app/src/main/res/drawable/ic_precipitation_none.xml b/base/src/main/res/drawable/ic_precipitation_none.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_precipitation_none.xml
rename to base/src/main/res/drawable/ic_precipitation_none.xml
diff --git a/app/src/main/res/drawable/ic_precipitation_rain.xml b/base/src/main/res/drawable/ic_precipitation_rain.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_precipitation_rain.xml
rename to base/src/main/res/drawable/ic_precipitation_rain.xml
diff --git a/app/src/main/res/drawable/ic_precipitation_rain_snow.xml b/base/src/main/res/drawable/ic_precipitation_rain_snow.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_precipitation_rain_snow.xml
rename to base/src/main/res/drawable/ic_precipitation_rain_snow.xml
diff --git a/app/src/main/res/drawable/ic_precipitation_snow.xml b/base/src/main/res/drawable/ic_precipitation_snow.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_precipitation_snow.xml
rename to base/src/main/res/drawable/ic_precipitation_snow.xml
diff --git a/app/src/main/res/drawable/ic_pref_about.xml b/base/src/main/res/drawable/ic_pref_about.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pref_about.xml
rename to base/src/main/res/drawable/ic_pref_about.xml
diff --git a/app/src/main/res/drawable/ic_pref_account.xml b/base/src/main/res/drawable/ic_pref_account.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pref_account.xml
rename to base/src/main/res/drawable/ic_pref_account.xml
diff --git a/app/src/main/res/drawable/ic_pref_appearance.xml b/base/src/main/res/drawable/ic_pref_appearance.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pref_appearance.xml
rename to base/src/main/res/drawable/ic_pref_appearance.xml
diff --git a/app/src/main/res/drawable/ic_pref_badge.xml b/base/src/main/res/drawable/ic_pref_badge.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pref_badge.xml
rename to base/src/main/res/drawable/ic_pref_badge.xml
diff --git a/app/src/main/res/drawable/ic_pref_calendar.xml b/base/src/main/res/drawable/ic_pref_calendar.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pref_calendar.xml
rename to base/src/main/res/drawable/ic_pref_calendar.xml
diff --git a/app/src/main/res/drawable/ic_pref_plugins.xml b/base/src/main/res/drawable/ic_pref_plugins.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pref_plugins.xml
rename to base/src/main/res/drawable/ic_pref_plugins.xml
diff --git a/app/src/main/res/drawable/ic_pref_search.xml b/base/src/main/res/drawable/ic_pref_search.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pref_search.xml
rename to base/src/main/res/drawable/ic_pref_search.xml
diff --git a/app/src/main/res/drawable/ic_pref_weather.xml b/base/src/main/res/drawable/ic_pref_weather.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pref_weather.xml
rename to base/src/main/res/drawable/ic_pref_weather.xml
diff --git a/app/src/main/res/drawable/ic_preference_websearch_new.xml b/base/src/main/res/drawable/ic_preference_websearch_new.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_preference_websearch_new.xml
rename to base/src/main/res/drawable/ic_preference_websearch_new.xml
diff --git a/app/src/main/res/drawable/ic_resize_drag_handle.xml b/base/src/main/res/drawable/ic_resize_drag_handle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_resize_drag_handle.xml
rename to base/src/main/res/drawable/ic_resize_drag_handle.xml
diff --git a/ui/src/main/res/drawable/ic_search.xml b/base/src/main/res/drawable/ic_search.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_search.xml
rename to base/src/main/res/drawable/ic_search.xml
diff --git a/app/src/main/res/drawable/ic_settings.xml b/base/src/main/res/drawable/ic_settings.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings.xml
rename to base/src/main/res/drawable/ic_settings.xml
diff --git a/ui/src/main/res/drawable/ic_share.xml b/base/src/main/res/drawable/ic_share.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_share.xml
rename to base/src/main/res/drawable/ic_share.xml
diff --git a/app/src/main/res/drawable/ic_skip_next.xml b/base/src/main/res/drawable/ic_skip_next.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_skip_next.xml
rename to base/src/main/res/drawable/ic_skip_next.xml
diff --git a/app/src/main/res/drawable/ic_skip_next_anim.xml b/base/src/main/res/drawable/ic_skip_next_anim.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_skip_next_anim.xml
rename to base/src/main/res/drawable/ic_skip_next_anim.xml
diff --git a/app/src/main/res/drawable/ic_skip_prev.xml b/base/src/main/res/drawable/ic_skip_prev.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_skip_prev.xml
rename to base/src/main/res/drawable/ic_skip_prev.xml
diff --git a/app/src/main/res/drawable/ic_skip_prev_anim.xml b/base/src/main/res/drawable/ic_skip_prev_anim.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_skip_prev_anim.xml
rename to base/src/main/res/drawable/ic_skip_prev_anim.xml
diff --git a/ui/src/main/res/drawable/ic_star_outline.xml b/base/src/main/res/drawable/ic_star_outline.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_star_outline.xml
rename to base/src/main/res/drawable/ic_star_outline.xml
diff --git a/ui/src/main/res/drawable/ic_star_solid.xml b/base/src/main/res/drawable/ic_star_solid.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_star_solid.xml
rename to base/src/main/res/drawable/ic_star_solid.xml
diff --git a/ui/src/main/res/drawable/ic_telegram.xml b/base/src/main/res/drawable/ic_telegram.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_telegram.xml
rename to base/src/main/res/drawable/ic_telegram.xml
diff --git a/ui/src/main/res/drawable/ic_time.xml b/base/src/main/res/drawable/ic_time.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_time.xml
rename to base/src/main/res/drawable/ic_time.xml
diff --git a/app/src/main/res/drawable/ic_today.xml b/base/src/main/res/drawable/ic_today.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_today.xml
rename to base/src/main/res/drawable/ic_today.xml
diff --git a/ui/src/main/res/drawable/ic_visibility.xml b/base/src/main/res/drawable/ic_visibility.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_visibility.xml
rename to base/src/main/res/drawable/ic_visibility.xml
diff --git a/ui/src/main/res/drawable/ic_visibility_off.xml b/base/src/main/res/drawable/ic_visibility_off.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_visibility_off.xml
rename to base/src/main/res/drawable/ic_visibility_off.xml
diff --git a/base/src/main/res/drawable/ic_weather_broken_clouds.xml b/base/src/main/res/drawable/ic_weather_broken_clouds.xml
deleted file mode 100644
index 21ca06e7..00000000
--- a/base/src/main/res/drawable/ic_weather_broken_clouds.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_broken_clouds_night.xml b/base/src/main/res/drawable/ic_weather_broken_clouds_night.xml
deleted file mode 100644
index b6cfbc4a..00000000
--- a/base/src/main/res/drawable/ic_weather_broken_clouds_night.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_clear.xml b/base/src/main/res/drawable/ic_weather_clear.xml
deleted file mode 100644
index 85150fc5..00000000
--- a/base/src/main/res/drawable/ic_weather_clear.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_clear_night.xml b/base/src/main/res/drawable/ic_weather_clear_night.xml
deleted file mode 100644
index 71d0d8cf..00000000
--- a/base/src/main/res/drawable/ic_weather_clear_night.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_cloudy.xml b/base/src/main/res/drawable/ic_weather_cloudy.xml
deleted file mode 100644
index e2c2780f..00000000
--- a/base/src/main/res/drawable/ic_weather_cloudy.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_cold.xml b/base/src/main/res/drawable/ic_weather_cold.xml
deleted file mode 100644
index 04ecb5d7..00000000
--- a/base/src/main/res/drawable/ic_weather_cold.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_drizzle.xml b/base/src/main/res/drawable/ic_weather_drizzle.xml
deleted file mode 100644
index d0708689..00000000
--- a/base/src/main/res/drawable/ic_weather_drizzle.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_fog.xml b/base/src/main/res/drawable/ic_weather_fog.xml
deleted file mode 100644
index bde36fcc..00000000
--- a/base/src/main/res/drawable/ic_weather_fog.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_hail.xml b/base/src/main/res/drawable/ic_weather_hail.xml
deleted file mode 100644
index 4bef7193..00000000
--- a/base/src/main/res/drawable/ic_weather_hail.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_haze.xml b/base/src/main/res/drawable/ic_weather_haze.xml
deleted file mode 100644
index b262217a..00000000
--- a/base/src/main/res/drawable/ic_weather_haze.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_haze_night.xml b/base/src/main/res/drawable/ic_weather_haze_night.xml
deleted file mode 100644
index 675f8513..00000000
--- a/base/src/main/res/drawable/ic_weather_haze_night.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_hot.xml b/base/src/main/res/drawable/ic_weather_hot.xml
deleted file mode 100644
index 82a7a06f..00000000
--- a/base/src/main/res/drawable/ic_weather_hot.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_mostly_cloudy.xml b/base/src/main/res/drawable/ic_weather_mostly_cloudy.xml
deleted file mode 100644
index 14dff0bf..00000000
--- a/base/src/main/res/drawable/ic_weather_mostly_cloudy.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_mostly_cloudy_night.xml b/base/src/main/res/drawable/ic_weather_mostly_cloudy_night.xml
deleted file mode 100644
index b1556640..00000000
--- a/base/src/main/res/drawable/ic_weather_mostly_cloudy_night.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_partly_cloudy.xml b/base/src/main/res/drawable/ic_weather_partly_cloudy.xml
deleted file mode 100644
index 906ad6ff..00000000
--- a/base/src/main/res/drawable/ic_weather_partly_cloudy.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_partly_cloudy_night.xml b/base/src/main/res/drawable/ic_weather_partly_cloudy_night.xml
deleted file mode 100644
index c625e856..00000000
--- a/base/src/main/res/drawable/ic_weather_partly_cloudy_night.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_showers.xml b/base/src/main/res/drawable/ic_weather_showers.xml
deleted file mode 100644
index 7b41f324..00000000
--- a/base/src/main/res/drawable/ic_weather_showers.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_sleet.xml b/base/src/main/res/drawable/ic_weather_sleet.xml
deleted file mode 100644
index 3eff5116..00000000
--- a/base/src/main/res/drawable/ic_weather_sleet.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_snow.xml b/base/src/main/res/drawable/ic_weather_snow.xml
deleted file mode 100644
index f2304db1..00000000
--- a/base/src/main/res/drawable/ic_weather_snow.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_thunderstorm.xml b/base/src/main/res/drawable/ic_weather_thunderstorm.xml
deleted file mode 100644
index ea8a9c8e..00000000
--- a/base/src/main/res/drawable/ic_weather_thunderstorm.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_thunderstorm_with_rain.xml b/base/src/main/res/drawable/ic_weather_thunderstorm_with_rain.xml
deleted file mode 100644
index 0c140809..00000000
--- a/base/src/main/res/drawable/ic_weather_thunderstorm_with_rain.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
diff --git a/base/src/main/res/drawable/ic_weather_wind.xml b/base/src/main/res/drawable/ic_weather_wind.xml
deleted file mode 100644
index 5aaa0792..00000000
--- a/base/src/main/res/drawable/ic_weather_wind.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_website.xml b/base/src/main/res/drawable/ic_website.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_website.xml
rename to base/src/main/res/drawable/ic_website.xml
diff --git a/ui/src/main/res/drawable/ic_whatsapp.xml b/base/src/main/res/drawable/ic_whatsapp.xml
similarity index 100%
rename from ui/src/main/res/drawable/ic_whatsapp.xml
rename to base/src/main/res/drawable/ic_whatsapp.xml
diff --git a/app/src/main/res/drawable/ic_widget_resize.xml b/base/src/main/res/drawable/ic_widget_resize.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_widget_resize.xml
rename to base/src/main/res/drawable/ic_widget_resize.xml
diff --git a/calendar/src/main/res/drawable-hdpi/ic_calendar.webp b/calendar/src/main/res/drawable-hdpi/ic_calendar.webp
deleted file mode 100644
index ca9bb8a8..00000000
Binary files a/calendar/src/main/res/drawable-hdpi/ic_calendar.webp and /dev/null differ
diff --git a/calendar/src/main/res/drawable-mdpi/ic_calendar.webp b/calendar/src/main/res/drawable-mdpi/ic_calendar.webp
deleted file mode 100644
index ada1d797..00000000
Binary files a/calendar/src/main/res/drawable-mdpi/ic_calendar.webp and /dev/null differ
diff --git a/calendar/src/main/res/drawable-xhdpi/ic_calendar.webp b/calendar/src/main/res/drawable-xhdpi/ic_calendar.webp
deleted file mode 100644
index ed69d698..00000000
Binary files a/calendar/src/main/res/drawable-xhdpi/ic_calendar.webp and /dev/null differ
diff --git a/calendar/src/main/res/drawable-xxhdpi/ic_calendar.webp b/calendar/src/main/res/drawable-xxhdpi/ic_calendar.webp
deleted file mode 100644
index b3602c94..00000000
Binary files a/calendar/src/main/res/drawable-xxhdpi/ic_calendar.webp and /dev/null differ
diff --git a/calendar/src/main/res/drawable-xxxhdpi/ic_calendar.webp b/calendar/src/main/res/drawable-xxxhdpi/ic_calendar.webp
deleted file mode 100644
index 2d0bf6ab..00000000
Binary files a/calendar/src/main/res/drawable-xxxhdpi/ic_calendar.webp and /dev/null differ
diff --git a/files/src/main/res/drawable/ic_file_android.xml b/files/src/main/res/drawable/ic_file_android.xml
deleted file mode 100644
index 8d3fd387..00000000
--- a/files/src/main/res/drawable/ic_file_android.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_archive.xml b/files/src/main/res/drawable/ic_file_archive.xml
deleted file mode 100644
index f38c06fe..00000000
--- a/files/src/main/res/drawable/ic_file_archive.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_code.xml b/files/src/main/res/drawable/ic_file_code.xml
deleted file mode 100644
index f7cc253e..00000000
--- a/files/src/main/res/drawable/ic_file_code.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_document.xml b/files/src/main/res/drawable/ic_file_document.xml
deleted file mode 100644
index f55b73f2..00000000
--- a/files/src/main/res/drawable/ic_file_document.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_folder.xml b/files/src/main/res/drawable/ic_file_folder.xml
deleted file mode 100644
index 82347288..00000000
--- a/files/src/main/res/drawable/ic_file_folder.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_form.xml b/files/src/main/res/drawable/ic_file_form.xml
deleted file mode 100644
index 84cf107e..00000000
--- a/files/src/main/res/drawable/ic_file_form.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/files/src/main/res/drawable/ic_file_generic.xml b/files/src/main/res/drawable/ic_file_generic.xml
deleted file mode 100644
index a431a5e9..00000000
--- a/files/src/main/res/drawable/ic_file_generic.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_markup.xml b/files/src/main/res/drawable/ic_file_markup.xml
deleted file mode 100644
index 6720df48..00000000
--- a/files/src/main/res/drawable/ic_file_markup.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_music.xml b/files/src/main/res/drawable/ic_file_music.xml
deleted file mode 100644
index 69f0a3a4..00000000
--- a/files/src/main/res/drawable/ic_file_music.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_pdf.xml b/files/src/main/res/drawable/ic_file_pdf.xml
deleted file mode 100644
index a73638b0..00000000
--- a/files/src/main/res/drawable/ic_file_pdf.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_picture.xml b/files/src/main/res/drawable/ic_file_picture.xml
deleted file mode 100644
index 0d8d5030..00000000
--- a/files/src/main/res/drawable/ic_file_picture.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_presentation.xml b/files/src/main/res/drawable/ic_file_presentation.xml
deleted file mode 100644
index 4d799702..00000000
--- a/files/src/main/res/drawable/ic_file_presentation.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_spreadsheet.xml b/files/src/main/res/drawable/ic_file_spreadsheet.xml
deleted file mode 100644
index da1dbcc4..00000000
--- a/files/src/main/res/drawable/ic_file_spreadsheet.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/files/src/main/res/drawable/ic_file_video.xml b/files/src/main/res/drawable/ic_file_video.xml
deleted file mode 100644
index 349fbf31..00000000
--- a/files/src/main/res/drawable/ic_file_video.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/ui/src/main/res/drawable/ic_description.xml b/ui/src/main/res/drawable/ic_description.xml
deleted file mode 100644
index 9d58e6d9..00000000
--- a/ui/src/main/res/drawable/ic_description.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
diff --git a/ui/src/main/res/drawable/ic_location.xml b/ui/src/main/res/drawable/ic_location.xml
deleted file mode 100644
index bcab9491..00000000
--- a/ui/src/main/res/drawable/ic_location.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/ui/src/main/res/drawable/ic_open_external.xml b/ui/src/main/res/drawable/ic_open_external.xml
deleted file mode 100644
index cb047ff2..00000000
--- a/ui/src/main/res/drawable/ic_open_external.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-