diff --git a/app/src/androidTest/java/com/nmc/android/ui/EmptyStateViewIT.kt b/app/src/androidTest/java/com/nmc/android/ui/EmptyStateViewIT.kt
new file mode 100644
index 000000000000..889e87eec421
--- /dev/null
+++ b/app/src/androidTest/java/com/nmc/android/ui/EmptyStateViewIT.kt
@@ -0,0 +1,186 @@
+package com.nmc.android.ui
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import com.nextcloud.test.TestActivity
+import com.owncloud.android.AbstractIT
+import com.owncloud.android.R
+import com.owncloud.android.lib.resources.notifications.models.Notification
+import com.owncloud.android.ui.activity.FolderPickerActivity
+import com.owncloud.android.ui.activity.NotificationsActivity
+import com.owncloud.android.ui.activity.ReceiveExternalFilesActivity
+import com.owncloud.android.ui.activity.UploadListActivity
+import com.owncloud.android.ui.fragment.GalleryFragment
+import com.owncloud.android.ui.fragment.OCFileListFragment
+import com.owncloud.android.ui.fragment.SearchType
+import com.owncloud.android.ui.trashbin.TrashbinActivity
+import org.junit.Rule
+import org.junit.Test
+
+/**
+ * test to validate empty state on different screens
+ */
+class EmptyStateViewIT : AbstractIT() {
+
+    @get:Rule
+    val testActivityRule = ActivityScenarioRule(TestActivity::class.java)
+
+    @Test
+    fun validate_emptyState_NoSearch() {
+        loadOCFileListFragmentWithSearchType(SearchType.NO_SEARCH)
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("No files here")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("Upload some content or sync with your devices.")))
+    }
+
+    @Test
+    fun validate_emptyState_FileSearch() {
+        loadOCFileListFragmentWithSearchType(SearchType.FILE_SEARCH)
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("No results")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("Search for a file (at least 2 characters)")))
+    }
+
+    @Test
+    fun validate_emptyState_FavoriteSearch() {
+        loadOCFileListFragmentWithSearchType(SearchType.FAVORITE_SEARCH)
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("Nothing favorited yet")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("Files and folders you mark as favorites will show up here.")))
+    }
+
+    @Test
+    fun validate_emptyState_RecentSearch() {
+        loadOCFileListFragmentWithSearchType(SearchType.RECENTLY_MODIFIED_SEARCH)
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("No results")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("Found no files modified within the last 7 days")))
+    }
+
+    @Test
+    fun validate_emptyState_SharedSearch() {
+        loadOCFileListFragmentWithSearchType(SearchType.SHARED_FILTER)
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("Nothing shared yet")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("Files and folders you share will show up here.")))
+    }
+
+    @Test
+    fun validate_emptyState_GallerySearch() {
+        loadGalleryFragment()
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("No files here")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("No photos or videos uploaded yet")))
+    }
+
+    @Test
+    fun validate_emptyState_Notification() {
+        val activityScenario = ActivityScenario.launch(NotificationsActivity::class.java)
+        waitForIdleSync()
+        activityScenario.onActivity {
+            it.runOnUiThread { it.populateList(ArrayList<Notification>()) }
+        }
+
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("No notifications")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("Please check back later.")))
+    }
+
+    @Test
+    fun validate_errorState_Trashbin() {
+        ActivityScenario.launch(TrashbinActivity::class.java)
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("Error")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("Loading trash bin failed!")))
+    }
+
+    @Test
+    fun validate_emptyState_Trashbin() {
+        val activityScenario = ActivityScenario.launch(TrashbinActivity::class.java)
+        activityScenario.onActivity {
+            it.showTrashbinFolder(emptyList())
+        }
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("No deleted files")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("You will be able to recover deleted files from here.")))
+    }
+
+    @Test
+    fun validate_emptyState_FolderPicker() {
+        ActivityScenario.launch(FolderPickerActivity::class.java)
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("No files here")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("Upload some content or sync with your devices.")))
+    }
+
+    @Test
+    fun validate_emptyState_ReceivedExternalFiles() {
+        ActivityScenario.launch(ReceiveExternalFilesActivity::class.java)
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("No files here")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("")))
+    }
+
+    @Test
+    fun validate_emptyState_UploadList() {
+        ActivityScenario.launch(UploadListActivity::class.java)
+        onView(withId(R.id.empty_list_icon)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_headline)).check(matches(withText("No uploads available")))
+        onView(withId(R.id.empty_list_view_text)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.empty_list_view_text)).check(matches(withText("Upload some content or activate auto upload.")))
+    }
+
+    private fun loadOCFileListFragmentWithSearchType(searchType: SearchType) {
+        testActivityRule.scenario.onActivity {
+            it.addFragment(OCFileListFragment())
+        }
+
+        waitForIdleSync()
+
+        testActivityRule.scenario.onActivity {
+            val fragment = (it.fragment as OCFileListFragment)
+            fragment.setEmptyListMessage(searchType)
+        }
+    }
+
+    private fun loadGalleryFragment() {
+        testActivityRule.scenario.onActivity {
+            it.addFragment(GalleryFragment())
+        }
+
+        waitForIdleSync()
+
+        testActivityRule.scenario.onActivity {
+            val fragment = (it.fragment as GalleryFragment)
+            fragment.setEmptyListMessage(SearchType.GALLERY_SEARCH)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
index ed9574f1fb1d..e60b2d85a6fd 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
@@ -217,7 +217,7 @@ open class FolderPickerActivity :
                 it.setMessageForEmptyList(
                     R.string.folder_list_empty_headline,
                     R.string.file_list_empty_moving,
-                    R.drawable.ic_list_empty_create_folder,
+                    R.drawable.ic_list_empty_folder,
                     true
                 )
             } else {
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt
index 671efe8492b0..732bca511728 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt
@@ -183,7 +183,7 @@ class NotificationsActivity : DrawerActivity(), NotificationsContract.View {
      * sets up the UI elements and loads all notification items.
      */
     private fun setupContent() {
-        binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_notification)
+        binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_list_empty_notification)
         setLoadingMessageEmpty()
         val layoutManager = LinearLayoutManager(this)
         binding.list.layoutManager = layoutManager
@@ -298,7 +298,7 @@ class NotificationsActivity : DrawerActivity(), NotificationsContract.View {
         binding.emptyList.emptyListView.visibility = View.VISIBLE
         binding.emptyList.emptyListViewHeadline.text = headline
         binding.emptyList.emptyListViewText.text = message
-        binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_notification)
+        binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_list_empty_notification)
         binding.emptyList.emptyListViewText.visibility = View.VISIBLE
         binding.emptyList.emptyListIcon.visibility = View.VISIBLE
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 60d8c944a7bd..9dd9c8c4cabb 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -744,7 +744,7 @@ private void populateDirectoryList() {
 
             if (files.isEmpty()) {
                 setMessageForEmptyList(R.string.file_list_empty_headline, R.string.empty,
-                                       R.drawable.uploads);
+                                       R.drawable.ic_list_empty_uploads);
                 mEmptyListContainer.setVisibility(View.VISIBLE);
                 binding.list.setVisibility(View.GONE);
             } else {
@@ -799,7 +799,7 @@ public void setMessageForEmptyList(@StringRes final int headline, @StringRes fin
             if (mEmptyListContainer != null && mEmptyListMessage != null) {
                 mEmptyListHeadline.setText(headline);
                 mEmptyListMessage.setText(message);
-                mEmptyListIcon.setImageDrawable(viewThemeUtils.platform.tintPrimaryDrawable(this, icon));
+                mEmptyListIcon.setImageResource(icon);
                 mEmptyListIcon.setVisibility(View.VISIBLE);
                 mEmptyListMessage.setVisibility(View.VISIBLE);
             }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
index 23486394a2ca..be8089e2c101 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
@@ -256,6 +256,8 @@ class SyncedFoldersActivity :
         binding.list.layoutManager = lm
         binding.list.adapter = adapter
         load(getItemsDisplayedPerFolder(), false)
+        //NMC customization
+        binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_list_empty_synced_folders)
     }
 
     private fun showHiddenItems() {
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
index 7543267ad3ed..4126e0faa945 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -154,9 +154,7 @@ private void handleUploadWorkerState() {
     private void setupContent() {
         binding.list.setEmptyView(binding.emptyList.getRoot());
         binding.emptyList.getRoot().setVisibility(View.GONE);
-        binding.emptyList.emptyListIcon.setImageResource(R.drawable.uploads);
-        binding.emptyList.emptyListIcon.getDrawable().mutate();
-        binding.emptyList.emptyListIcon.setAlpha(0.5f);
+        binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_list_empty_uploads);
         binding.emptyList.emptyListIcon.setVisibility(View.VISIBLE);
         binding.emptyList.emptyListViewHeadline.setText(getString(R.string.upload_list_empty_headline));
         binding.emptyList.emptyListViewText.setText(getString(R.string.upload_list_empty_text_auto_upload));
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index 90d5ff624628..8248aadfbf7c 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@ -585,16 +585,8 @@ public void run() {
                 if (mEmptyListContainer != null && mEmptyListMessage != null) {
                     mEmptyListHeadline.setText(headline);
                     mEmptyListMessage.setText(message);
-
-                    if (tintIcon) {
-                        if (getContext() != null) {
-                            mEmptyListIcon.setImageDrawable(
-                                viewThemeUtils.platform.tintPrimaryDrawable(getContext(), icon));
-                        }
-                    } else {
-                        mEmptyListIcon.setImageResource(icon);
-                    }
-
+                    //tinting is not required in NMC
+                    mEmptyListIcon.setImageResource(icon);
                     mEmptyListIcon.setVisibility(View.VISIBLE);
                     mEmptyListMessage.setVisibility(View.VISIBLE);
                 }
@@ -614,8 +606,8 @@ public void run() {
                                            true);
                 } else if (searchType == SearchType.FILE_SEARCH) {
                     setMessageForEmptyList(R.string.file_list_empty_headline_server_search,
-                                           R.string.file_list_empty,
-                                           R.drawable.ic_search_light_grey);
+                                           R.string.search_result_empty,
+                                           R.drawable.ic_search_empty);
                 } else if (searchType == SearchType.FAVORITE_SEARCH) {
                     setMessageForEmptyList(R.string.file_list_empty_favorite_headline,
                                            R.string.file_list_empty_favorites_filter_list,
@@ -627,15 +619,15 @@ public void run() {
                 } else if (searchType == SearchType.REGULAR_FILTER) {
                     setMessageForEmptyList(R.string.file_list_empty_headline_search,
                                            R.string.file_list_empty_search,
-                                           R.drawable.ic_search_light_grey);
+                                           R.drawable.ic_search_empty);
                 } else if (searchType == SearchType.SHARED_FILTER) {
                     setMessageForEmptyList(R.string.file_list_empty_shared_headline,
                                            R.string.file_list_empty_shared,
                                            R.drawable.ic_list_empty_shared);
                 } else if (searchType == SearchType.GALLERY_SEARCH) {
-                    setMessageForEmptyList(R.string.file_list_empty_headline_server_search,
-                                           R.string.file_list_empty_gallery,
-                                           R.drawable.file_image);
+                    setMessageForEmptyList(R.string.file_list_empty_headline,
+                                           R.string.gallery_list_empty,
+                                           R.drawable.ic_list_empty_media);
                 } else if (searchType == SearchType.LOCAL_SEARCH) {
                     setMessageForEmptyList(R.string.file_list_empty_headline_server_search,
                                            R.string.file_list_empty_local_search,
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt
index a158c8052948..23d2b9de9885 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt
@@ -208,9 +208,8 @@ class UnifiedSearchFragment :
                         requireContext().getString(R.string.file_list_empty_headline_server_search)
                     binding.emptyList.emptyListViewText.text =
                         requireContext().getString(R.string.file_list_empty_unified_search_no_results)
-                    binding.emptyList.emptyListIcon.setImageDrawable(
-                        viewThemeUtils.platform.tintDrawable(requireContext(), R.drawable.ic_search_grey)
-                    )
+                    //NMC Customization
+                    binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_search_empty)
                 }
             }
         }
diff --git a/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt b/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt
index 9097b149611d..e84d1dd6b399 100644
--- a/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt
@@ -130,7 +130,7 @@ class TrashbinActivity :
         recyclerView.setEmptyView(binding.emptyList.emptyListView)
 
         binding.emptyList.emptyListView.visibility = View.GONE
-        binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_delete)
+        binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_list_empty_trashbin)
         binding.emptyList.emptyListIcon.visibility = View.VISIBLE
         binding.emptyList.emptyListViewHeadline.text = getString(R.string.trashbin_empty_headline)
         binding.emptyList.emptyListViewText.text = getString(R.string.trashbin_empty_message)
@@ -258,7 +258,7 @@ class TrashbinActivity :
             trashbinListAdapter?.setTrashbinFiles(trashbinFiles, true)
             binding.swipeContainingList.isRefreshing = false
             binding.loadingContent.visibility = View.GONE
-            binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_delete)
+            binding.emptyList.emptyListIcon.setImageResource(R.drawable.ic_list_empty_trashbin)
             binding.emptyList.emptyListViewHeadline.text = getString(R.string.trashbin_empty_headline)
             binding.emptyList.emptyListViewText.text = getString(R.string.trashbin_empty_message)
             binding.list.visibility = View.VISIBLE
diff --git a/app/src/main/res/drawable-night/ic_list_empty_error.xml b/app/src/main/res/drawable-night/ic_list_empty_error.xml
new file mode 100644
index 000000000000..eded06495c3c
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_list_empty_error.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23C18.0751,23 23,18.0751 23,12C23,9.0826 21.8411,6.2847 19.7782,4.2218C17.7153,2.1589 14.9174,1 12,1ZM11,6.75L13,6.75L13,13.25L11,13.25L11,6.75ZM12,17.25C11.3096,17.25 10.75,16.6904 10.75,16C10.75,15.3096 11.3096,14.75 12,14.75C12.6904,14.75 13.25,15.3096 13.25,16C13.25,16.6904 12.6904,17.25 12,17.25L12,17.25Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_list_empty_media.xml b/app/src/main/res/drawable-night/ic_list_empty_media.xml
new file mode 100644
index 000000000000..b07dafe6cc6a
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_list_empty_media.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#191919"
+        android:fillType="evenOdd"
+        android:pathData="M5.355,11.5C5.61,12.03 5.915,12.535 6.265,13L6.265,13L2,13L2,19.145C2,19.34 2.16,19.5 2.355,19.5L2.355,19.5L10.17,19.5L12,21.33L12,16.4C12.41,16.46 12.825,16.5 13.255,16.505C13.34,16.505 13.42,16.49 13.505,16.49L13.505,16.49L13.505,22.34C13.505,22.995 12.97,23.425 12.415,23.425C12.145,23.425 11.875,23.325 11.655,23.105L11.655,23.105L9.55,21L2.355,21C1.33,21 0.5,20.17 0.5,19.145L0.5,19.145L0.5,11.5ZM19.5,10.06L23.5,12.405L23.5,14.235L20.99,13.6L20.99,13.6L20.99,19.855C20.99,21.955 19.4,22.275 18.53,22.205C17.185,22.095 16.105,21.15 16.12,20.05C16.14,18.95 17.24,18.13 18.59,18.22C18.91,18.245 19.22,18.32 19.5,18.43L19.5,18.43L19.5,10.06ZM13.25,0.5C17.255,0.5 20.5,3.745 20.5,7.75C20.5,8.125 20.46,8.495 20.405,8.855L20.405,8.855L18.985,8.02C18.99,7.93 19,7.84 19,7.75C19,4.58 16.42,2 13.25,2C10.08,2 7.5,4.58 7.5,7.75C7.5,10.92 10.08,13.5 13.25,13.5C15.22,13.5 16.965,12.5 18,10.985L18,10.985L18,13.22C16.725,14.325 15.07,15 13.25,15C9.245,15 6,11.755 6,7.75C6,3.745 9.245,0.5 13.25,0.5ZM11.5,5.17L16.115,7.835L11.5,10.5L11.5,5.17Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_list_empty_notification.xml b/app/src/main/res/drawable-night/ic_list_empty_notification.xml
new file mode 100644
index 000000000000..a717b084b187
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_list_empty_notification.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:pathData="M22,16.95C19.65,14.6 19.3,12.3 19.2,11.15L19,9.4C18.75,6.25 16.45,3.8 13.5,3.15C13.5,3.1 13.5,3.05 13.5,3C13.5,2.15 12.85,1.5 12,1.5C11.15,1.5 10.5,2.15 10.5,3C10.5,3.05 10.5,3.1 10.5,3.15C7.55,3.8 5.25,6.25 5,9.4L4.85,11.15C4.7,12.25 4.35,14.55 2,16.95L2,20.5L9.05,20.5C9.3,21.9 10.5,23 12,23C13.5,23 14.7,21.9 14.95,20.5L22,20.5L22,16.95ZM20.5,19L3.5,19L3.5,17.55C5.1,15.85 6.1,13.65 6.3,11.3L6.45,9.55C6.75,6.65 9.1,4.5 12,4.5C14.9,4.5 17.25,6.65 17.5,9.55L17.65,11.3C17.85,13.65 18.85,15.85 20.45,17.55L20.45,19L20.5,19Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_list_empty_recent.xml b/app/src/main/res/drawable-night/ic_list_empty_recent.xml
new file mode 100644
index 000000000000..0925b24f92f2
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_list_empty_recent.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1C18.1,1 23,5.9 23,12C23,18.1 18.1,23 12,23C5.9,23 1,18.1 1,12C1,5.9 5.95,1 12,1ZM12,2.5C6.75,2.5 2.5,6.75 2.5,12C2.5,17.25 6.75,21.5 12,21.5C17.25,21.5 21.5,17.25 21.5,12C21.5,6.75 17.25,2.5 12,2.5ZM12,4C12.4,4 12.75,4.3 12.75,4.75L12.75,4.75L12.75,11.55L17.15,13.95C17.55,14.15 17.65,14.65 17.45,15C17.3,15.25 17.05,15.4 16.8,15.4C16.7,15.4 16.55,15.35 16.45,15.3L16.45,15.3L11.25,12.45L11.25,4.75C11.25,4.35 11.6,4 12,4Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_list_empty_shared.xml b/app/src/main/res/drawable-night/ic_list_empty_shared.xml
new file mode 100644
index 000000000000..18b84486de2d
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_list_empty_shared.xml
@@ -0,0 +1,34 @@
+<!--
+  Nextcloud Android client application
+
+  Copyright (C) 2020 Nextcloud.
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+  You should have received a copy of the GNU Affero General Public
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  Icon provided by Android Material Library in Apache License 2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12.25,16.5L15.1,19.25L17.85,16.5L19.45,16.5C21.4,16.5 23.1,17.9 23.4,19.85L23.4,19.85L23.5,20.5L6.6,20.5L6.7,19.85C7,17.9 8.7,16.5 10.65,16.5L10.65,16.5L12.25,16.5ZM6.85,16.5C6.4,16.95 6.05,17.45 5.75,18L5.75,18L4.5,18C3.55,18 2.75,18.65 2.6,19.6L2.6,19.6L2.45,20.5L0.95,20.5L1.15,19.35C1.4,17.7 2.85,16.5 4.5,16.5L4.5,16.5ZM15.05,4.75C18,4.75 20.1,6.9 20.1,9.8C20.1,12.6 18.05,15.65 15.05,15.65C12,15.65 10,12.6 10,9.8C10,6.85 12.1,4.75 15.05,4.75ZM8.05,5.9C8.6,5.9 9.1,6 9.55,6.15C9.3,6.55 9.05,7 8.9,7.5C8.65,7.45 8.35,7.4 8.05,7.4C6.35,7.4 5.2,8.6 5.2,10.25C5.2,11.95 6.35,13.75 8.05,13.75C8.55,13.75 8.95,13.6 9.35,13.35C9.6,13.8 9.85,14.2 10.15,14.6C9.55,15 8.85,15.25 8.05,15.25C5.45,15.25 3.7,12.65 3.7,10.25C3.7,7.75 5.6,5.9 8.05,5.9ZM15.05,6.25C12.95,6.25 11.5,7.7 11.5,9.8C11.5,11.9 12.95,14.15 15.05,14.15C17.2,14.15 18.6,11.9 18.6,9.8C18.6,7.7 17.15,6.25 15.05,6.25Z"
+        android:strokeWidth="1"
+        android:fillColor="#191919"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+</vector>
+
diff --git a/app/src/main/res/drawable-night/ic_list_empty_synced_folders.xml b/app/src/main/res/drawable-night/ic_list_empty_synced_folders.xml
new file mode 100644
index 000000000000..437f67b0965b
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_list_empty_synced_folders.xml
@@ -0,0 +1,33 @@
+<!--
+  Nextcloud Android client application
+
+  Copyright (C) 2020 Nextcloud.
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+  You should have received a copy of the GNU Affero General Public
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  Icon provided by Android Material Library in Apache License 2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M20.7,8.75C20.25,7.45 19.45,6.35 18.45,5.5C17.1,4.35 15.4,3.7 13.5,3.7C11.75,3.7 10.05,4.3 8.7,5.4C8.35,5.3 7.95,5.25 7.6,5.25C5.2,5.25 3.2,7.05 2.95,9.4C1.3,10.3 0.25,12 0.25,13.9C0.25,15.6 1.05,17.05 2.3,18C3.3,18.75 4.5,19.1 5.65,19C7.25,20.3 9.25,21 11.3,21C13.2,21 14.95,20.45 16.5,19.35C17,19.5 17.5,19.55 18,19.55C21.15,19.55 23.75,16.95 23.75,13.8C23.75,11.7 22.55,9.7 20.7,8.75ZM18,18.05C17.1,18.05 16.45,17.75 16.2,17.65C15.9,17.85 14.9,18.9 12.75,19.35L12.75,15L16.05,15L12,10L7.95,15L11.25,15L11.25,19.5C10.4,19.5 9.6,19.35 8.8,19.05C7.25,18.5 6.25,17.5 6.15,17.4C5.55,17.45 4.2,17.7 2.9,16.5C2.2,15.85 1.7,14.9 1.7,13.85C1.7,11.1 4.3,10.35 4.35,10.3C4.4,10.1 4.15,8.65 5.45,7.5C6.4,6.7 7.7,6.45 9,7C10.55,5.45 12.35,5.1 13.45,5.1C14.95,5.1 16.3,5.6 17.4,6.5C18.9,7.75 19.3,9.35 19.4,9.7C19.4,9.7 22.2,10.7 22.2,13.7C22.25,16.15 20.35,18.05 18,18.05Z"
+        android:strokeWidth="1"
+        android:fillColor="#191919"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/ic_list_empty_trashbin.xml b/app/src/main/res/drawable-night/ic_list_empty_trashbin.xml
new file mode 100644
index 000000000000..632dd30404e1
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_list_empty_trashbin.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:tint="@color/empty_list_icon_color_dark"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,0.5L16,3.5L21.5,3.5C21.9,3.5 22.25,3.85 22.25,4.25C22.25,4.65 21.9,5 21.5,5L21.5,5L20.45,5L19.65,20.65C19.55,22.25 18.25,23.5 16.65,23.5L16.65,23.5L7.4,23.5C5.8,23.5 4.5,22.25 4.4,20.65L4.4,20.65L3.55,5L2.5,5C2.1,5 1.75,4.65 1.75,4.25C1.75,3.85 2.1,3.5 2.5,3.5L2.5,3.5L8,3.5L8,0.5L16,0.5ZM18.95,5L5.05,5L5.9,20.6C5.95,21.4 6.6,22 7.4,22L7.4,22L16.6,22C17.4,22 18.05,21.4 18.1,20.6L18.1,20.6L18.95,5ZM12,7.75C12.4,7.75 12.75,8.1 12.75,8.5L12.75,8.5L12.75,18.5C12.75,18.9 12.4,19.25 12,19.25C11.6,19.25 11.25,18.9 11.25,18.5L11.25,18.5L11.25,8.5C11.25,8.1 11.6,7.75 12,7.75ZM15.5,7.75C15.9,7.75 16.25,8.1 16.25,8.5L16.25,8.5L16.25,18.5C16.25,18.9 15.9,19.25 15.5,19.25C15.1,19.25 14.75,18.9 14.75,18.5L14.75,18.5L14.75,8.5C14.75,8.1 15.1,7.75 15.5,7.75ZM8.5,7.75C8.9,7.75 9.25,8.1 9.25,8.5L9.25,8.5L9.25,18.5C9.25,18.9 8.9,19.25 8.5,19.25C8.1,19.25 7.75,18.9 7.75,18.5L7.75,18.5L7.75,8.5C7.75,8.1 8.1,7.75 8.5,7.75ZM14.5,2L9.5,2L9.5,3.5L14.5,3.5L14.5,2Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_list_empty_uploads.xml b/app/src/main/res/drawable-night/ic_list_empty_uploads.xml
new file mode 100644
index 000000000000..8cf18315df8c
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_list_empty_uploads.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.25,20.185C21.8382,20.185 22.315,20.6618 22.315,21.25C22.315,21.8382 21.8382,22.315 21.25,22.315L21.25,22.315L2.75,22.315C2.1618,22.315 1.685,21.8382 1.685,21.25C1.685,20.6618 2.1618,20.185 2.75,20.185L2.75,20.185ZM12,2L16.58,9L13.25,9L13.25,15.75C13.25,16.4404 12.6904,17 12,17C11.3096,17 10.75,16.4404 10.75,15.75L10.75,15.75L10.75,9L7.42,9L12,2Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_search_empty.xml b/app/src/main/res/drawable-night/ic_search_empty.xml
new file mode 100644
index 000000000000..c3df1449fec5
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_search_empty.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#191919"
+        android:fillType="evenOdd"
+        android:pathData="M21.4,19.6L16.5,14.7C17.45,13.4 18.05,11.75 18.05,10C18.05,5.6 14.45,2 10.05,2C5.65,2 2,5.6 2,10C2,14.4 5.6,18 10,18C11.75,18 13.4,17.45 14.7,16.45L19.6,21.35C20.1,21.85 20.9,21.85 21.35,21.35C21.85,20.9 21.85,20.1 21.4,19.6ZM3.5,10C3.5,6.4 6.4,3.5 10,3.5C13.6,3.5 16.5,6.4 16.5,10C16.5,13.6 13.6,16.5 10,16.5C6.4,16.5 3.5,13.6 3.5,10Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_list_empty_error.xml b/app/src/main/res/drawable/ic_list_empty_error.xml
index e68fc6c7775f..9d36ccc164e3 100644
--- a/app/src/main/res/drawable/ic_list_empty_error.xml
+++ b/app/src/main/res/drawable/ic_list_empty_error.xml
@@ -7,10 +7,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FF969696"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:tint="@color/empty_list_icon_color"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680ZM440,520L520,520L520,280L440,280L440,520ZM330,840L120,630L120,330L330,120L630,120L840,330L840,630L630,840L330,840Z" />
+        android:pathData="M12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23C18.0751,23 23,18.0751 23,12C23,9.0826 21.8411,6.2847 19.7782,4.2218C17.7153,2.1589 14.9174,1 12,1ZM11,6.75L13,6.75L13,13.25L11,13.25L11,6.75ZM12,17.25C11.3096,17.25 10.75,16.6904 10.75,16C10.75,15.3096 11.3096,14.75 12,14.75C12.6904,14.75 13.25,15.3096 13.25,16C13.25,16.6904 12.6904,17.25 12,17.25L12,17.25Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_list_empty_folder.xml b/app/src/main/res/drawable/ic_list_empty_folder.xml
index 6de49dae0fc1..483eeebbbda0 100644
--- a/app/src/main/res/drawable/ic_list_empty_folder.xml
+++ b/app/src/main/res/drawable/ic_list_empty_folder.xml
@@ -4,8 +4,32 @@
   ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector android:height="72dp" android:tint="#17597D"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:pathData="M22,9H6a2,2 0,0 0,-2 2v5H29Z"
+        android:fillColor="#53baf2"/>
+    <path
+        android:pathData="M22,9H6a2,2 0,0 0,-2 2v5H29Z"
+        android:strokeAlpha="0.25"
+        android:fillColor="#317cb3"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M58,16H4V53a2,2 0,0 0,2 2H58a2,2 0,0 0,2 -2V18A2,2 0,0 0,58 16Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startY="54.840004"
+                android:startX="31.999996"
+                android:endY="15.930003"
+                android:endX="31.999996"
+                android:type="linear">
+                <item android:offset="0" android:color="#FF53BAF2"/>
+                <item android:offset="1" android:color="#FF7ECBF5"/>
+            </gradient>
+        </aapt:attr>
+    </path>
 </vector>
diff --git a/app/src/main/res/drawable/ic_list_empty_media.xml b/app/src/main/res/drawable/ic_list_empty_media.xml
new file mode 100644
index 000000000000..af5065cf6ef1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list_empty_media.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#191919"
+        android:fillType="evenOdd"
+        android:pathData="M5.355,11.5C5.61,12.03 5.915,12.535 6.265,13L6.265,13L2,13L2,19.145C2,19.34 2.16,19.5 2.355,19.5L2.355,19.5L10.17,19.5L12,21.33L12,16.4C12.41,16.46 12.825,16.5 13.255,16.505C13.34,16.505 13.42,16.49 13.505,16.49L13.505,16.49L13.505,22.34C13.505,22.995 12.97,23.425 12.415,23.425C12.145,23.425 11.875,23.325 11.655,23.105L11.655,23.105L9.55,21L2.355,21C1.33,21 0.5,20.17 0.5,19.145L0.5,19.145L0.5,11.5ZM19.5,10.06L23.5,12.405L23.5,14.235L20.99,13.6L20.99,13.6L20.99,19.855C20.99,21.955 19.4,22.275 18.53,22.205C17.185,22.095 16.105,21.15 16.12,20.05C16.14,18.95 17.24,18.13 18.59,18.22C18.91,18.245 19.22,18.32 19.5,18.43L19.5,18.43L19.5,10.06ZM13.25,0.5C17.255,0.5 20.5,3.745 20.5,7.75C20.5,8.125 20.46,8.495 20.405,8.855L20.405,8.855L18.985,8.02C18.99,7.93 19,7.84 19,7.75C19,4.58 16.42,2 13.25,2C10.08,2 7.5,4.58 7.5,7.75C7.5,10.92 10.08,13.5 13.25,13.5C15.22,13.5 16.965,12.5 18,10.985L18,10.985L18,13.22C16.725,14.325 15.07,15 13.25,15C9.245,15 6,11.755 6,7.75C6,3.745 9.245,0.5 13.25,0.5ZM11.5,5.17L16.115,7.835L11.5,10.5L11.5,5.17Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_list_empty_notification.xml b/app/src/main/res/drawable/ic_list_empty_notification.xml
new file mode 100644
index 000000000000..ab174047cc2b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list_empty_notification.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:pathData="M22,16.95C19.65,14.6 19.3,12.3 19.2,11.15L19,9.4C18.75,6.25 16.45,3.8 13.5,3.15C13.5,3.1 13.5,3.05 13.5,3C13.5,2.15 12.85,1.5 12,1.5C11.15,1.5 10.5,2.15 10.5,3C10.5,3.05 10.5,3.1 10.5,3.15C7.55,3.8 5.25,6.25 5,9.4L4.85,11.15C4.7,12.25 4.35,14.55 2,16.95L2,20.5L9.05,20.5C9.3,21.9 10.5,23 12,23C13.5,23 14.7,21.9 14.95,20.5L22,20.5L22,16.95ZM20.5,19L3.5,19L3.5,17.55C5.1,15.85 6.1,13.65 6.3,11.3L6.45,9.55C6.75,6.65 9.1,4.5 12,4.5C14.9,4.5 17.25,6.65 17.5,9.55L17.65,11.3C17.85,13.65 18.85,15.85 20.45,17.55L20.45,19L20.5,19Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_list_empty_recent.xml b/app/src/main/res/drawable/ic_list_empty_recent.xml
index 3cc1fd17bac2..bc6cf4e57fc1 100644
--- a/app/src/main/res/drawable/ic_list_empty_recent.xml
+++ b/app/src/main/res/drawable/ic_list_empty_recent.xml
@@ -4,8 +4,16 @@
   ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector android:height="72dp" android:tint="#626364"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,1C18.1,1 23,5.9 23,12C23,18.1 18.1,23 12,23C5.9,23 1,18.1 1,12C1,5.9 5.95,1 12,1ZM12,2.5C6.75,2.5 2.5,6.75 2.5,12C2.5,17.25 6.75,21.5 12,21.5C17.25,21.5 21.5,17.25 21.5,12C21.5,6.75 17.25,2.5 12,2.5ZM12,4C12.4,4 12.75,4.3 12.75,4.75L12.75,4.75L12.75,11.55L17.15,13.95C17.55,14.15 17.65,14.65 17.45,15C17.3,15.25 17.05,15.4 16.8,15.4C16.7,15.4 16.55,15.35 16.45,15.3L16.45,15.3L11.25,12.45L11.25,4.75C11.25,4.35 11.6,4 12,4Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_list_empty_shared.xml b/app/src/main/res/drawable/ic_list_empty_shared.xml
index 8c3ee9f4664f..1133dfb844ea 100644
--- a/app/src/main/res/drawable/ic_list_empty_shared.xml
+++ b/app/src/main/res/drawable/ic_list_empty_shared.xml
@@ -4,8 +4,17 @@
   ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector android:height="72dp" android:tint="#626364"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12.25,16.5L15.1,19.25L17.85,16.5L19.45,16.5C21.4,16.5 23.1,17.9 23.4,19.85L23.4,19.85L23.5,20.5L6.6,20.5L6.7,19.85C7,17.9 8.7,16.5 10.65,16.5L10.65,16.5L12.25,16.5ZM6.85,16.5C6.4,16.95 6.05,17.45 5.75,18L5.75,18L4.5,18C3.55,18 2.75,18.65 2.6,19.6L2.6,19.6L2.45,20.5L0.95,20.5L1.15,19.35C1.4,17.7 2.85,16.5 4.5,16.5L4.5,16.5ZM15.05,4.75C18,4.75 20.1,6.9 20.1,9.8C20.1,12.6 18.05,15.65 15.05,15.65C12,15.65 10,12.6 10,9.8C10,6.85 12.1,4.75 15.05,4.75ZM8.05,5.9C8.6,5.9 9.1,6 9.55,6.15C9.3,6.55 9.05,7 8.9,7.5C8.65,7.45 8.35,7.4 8.05,7.4C6.35,7.4 5.2,8.6 5.2,10.25C5.2,11.95 6.35,13.75 8.05,13.75C8.55,13.75 8.95,13.6 9.35,13.35C9.6,13.8 9.85,14.2 10.15,14.6C9.55,15 8.85,15.25 8.05,15.25C5.45,15.25 3.7,12.65 3.7,10.25C3.7,7.75 5.6,5.9 8.05,5.9ZM15.05,6.25C12.95,6.25 11.5,7.7 11.5,9.8C11.5,11.9 12.95,14.15 15.05,14.15C17.2,14.15 18.6,11.9 18.6,9.8C18.6,7.7 17.15,6.25 15.05,6.25Z"
+        android:strokeWidth="1"
+        android:fillColor="#191919"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
+
diff --git a/app/src/main/res/drawable/ic_list_empty_synced_folders.xml b/app/src/main/res/drawable/ic_list_empty_synced_folders.xml
new file mode 100644
index 000000000000..51304a3c274c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list_empty_synced_folders.xml
@@ -0,0 +1,33 @@
+<!--
+  Nextcloud Android client application
+
+  Copyright (C) 2020 Nextcloud.
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+  You should have received a copy of the GNU Affero General Public
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  Icon provided by Android Material Library in Apache License 2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M20.7,8.75C20.25,7.45 19.45,6.35 18.45,5.5C17.1,4.35 15.4,3.7 13.5,3.7C11.75,3.7 10.05,4.3 8.7,5.4C8.35,5.3 7.95,5.25 7.6,5.25C5.2,5.25 3.2,7.05 2.95,9.4C1.3,10.3 0.25,12 0.25,13.9C0.25,15.6 1.05,17.05 2.3,18C3.3,18.75 4.5,19.1 5.65,19C7.25,20.3 9.25,21 11.3,21C13.2,21 14.95,20.45 16.5,19.35C17,19.5 17.5,19.55 18,19.55C21.15,19.55 23.75,16.95 23.75,13.8C23.75,11.7 22.55,9.7 20.7,8.75ZM18,18.05C17.1,18.05 16.45,17.75 16.2,17.65C15.9,17.85 14.9,18.9 12.75,19.35L12.75,15L16.05,15L12,10L7.95,15L11.25,15L11.25,19.5C10.4,19.5 9.6,19.35 8.8,19.05C7.25,18.5 6.25,17.5 6.15,17.4C5.55,17.45 4.2,17.7 2.9,16.5C2.2,15.85 1.7,14.9 1.7,13.85C1.7,11.1 4.3,10.35 4.35,10.3C4.4,10.1 4.15,8.65 5.45,7.5C6.4,6.7 7.7,6.45 9,7C10.55,5.45 12.35,5.1 13.45,5.1C14.95,5.1 16.3,5.6 17.4,6.5C18.9,7.75 19.3,9.35 19.4,9.7C19.4,9.7 22.2,10.7 22.2,13.7C22.25,16.15 20.35,18.05 18,18.05Z"
+        android:strokeWidth="1"
+        android:fillColor="#191919"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_list_empty_trashbin.xml b/app/src/main/res/drawable/ic_list_empty_trashbin.xml
new file mode 100644
index 000000000000..d6028c1d7fc3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list_empty_trashbin.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:tint="@color/empty_list_icon_color"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,0.5L16,3.5L21.5,3.5C21.9,3.5 22.25,3.85 22.25,4.25C22.25,4.65 21.9,5 21.5,5L21.5,5L20.45,5L19.65,20.65C19.55,22.25 18.25,23.5 16.65,23.5L16.65,23.5L7.4,23.5C5.8,23.5 4.5,22.25 4.4,20.65L4.4,20.65L3.55,5L2.5,5C2.1,5 1.75,4.65 1.75,4.25C1.75,3.85 2.1,3.5 2.5,3.5L2.5,3.5L8,3.5L8,0.5L16,0.5ZM18.95,5L5.05,5L5.9,20.6C5.95,21.4 6.6,22 7.4,22L7.4,22L16.6,22C17.4,22 18.05,21.4 18.1,20.6L18.1,20.6L18.95,5ZM12,7.75C12.4,7.75 12.75,8.1 12.75,8.5L12.75,8.5L12.75,18.5C12.75,18.9 12.4,19.25 12,19.25C11.6,19.25 11.25,18.9 11.25,18.5L11.25,18.5L11.25,8.5C11.25,8.1 11.6,7.75 12,7.75ZM15.5,7.75C15.9,7.75 16.25,8.1 16.25,8.5L16.25,8.5L16.25,18.5C16.25,18.9 15.9,19.25 15.5,19.25C15.1,19.25 14.75,18.9 14.75,18.5L14.75,18.5L14.75,8.5C14.75,8.1 15.1,7.75 15.5,7.75ZM8.5,7.75C8.9,7.75 9.25,8.1 9.25,8.5L9.25,8.5L9.25,18.5C9.25,18.9 8.9,19.25 8.5,19.25C8.1,19.25 7.75,18.9 7.75,18.5L7.75,18.5L7.75,8.5C7.75,8.1 8.1,7.75 8.5,7.75ZM14.5,2L9.5,2L9.5,3.5L14.5,3.5L14.5,2Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_list_empty_uploads.xml b/app/src/main/res/drawable/ic_list_empty_uploads.xml
new file mode 100644
index 000000000000..7d3dd0f9b05a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list_empty_uploads.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.25,20.185C21.8382,20.185 22.315,20.6618 22.315,21.25C22.315,21.8382 21.8382,22.315 21.25,22.315L21.25,22.315L2.75,22.315C2.1618,22.315 1.685,21.8382 1.685,21.25C1.685,20.6618 2.1618,20.185 2.75,20.185L2.75,20.185ZM12,2L16.58,9L13.25,9L13.25,15.75C13.25,16.4404 12.6904,17 12,17C11.3096,17 10.75,16.4404 10.75,15.75L10.75,15.75L10.75,9L7.42,9L12,2Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search_empty.xml b/app/src/main/res/drawable/ic_search_empty.xml
new file mode 100644
index 000000000000..f9c81602dba3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_empty.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/empty_list_icon_color"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#191919"
+        android:fillType="evenOdd"
+        android:pathData="M21.4,19.6L16.5,14.7C17.45,13.4 18.05,11.75 18.05,10C18.05,5.6 14.45,2 10.05,2C5.65,2 2,5.6 2,10C2,14.4 5.6,18 10,18C11.75,18 13.4,17.45 14.7,16.45L19.6,21.35C20.1,21.85 20.9,21.85 21.35,21.35C21.85,20.9 21.85,20.1 21.4,19.6ZM3.5,10C3.5,6.4 6.4,3.5 10,3.5C13.6,3.5 16.5,6.4 16.5,10C16.5,13.6 13.6,16.5 10,16.5C6.4,16.5 3.5,13.6 3.5,10Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_star_light_yellow.xml b/app/src/main/res/drawable/ic_star_light_yellow.xml
index e051e51a7ebc..59d917b9e8fc 100644
--- a/app/src/main/res/drawable/ic_star_light_yellow.xml
+++ b/app/src/main/res/drawable/ic_star_light_yellow.xml
@@ -10,11 +10,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
     <path
-        android:fillAlpha="0.5"
-        android:fillColor="#ffcc00"
-        android:pathData="M12,17.27L18.18,21L16.54,13.97L22,9.24L14.81,8.62L12,2L9.19,8.62L2,9.24L7.45,13.97L5.82,21L12,17.27Z"
+        android:pathData="M13,2.41L15.45,8.41L21.95,8.885C22.3763,8.9312 22.7328,9.2296 22.8532,9.6412C22.9736,10.0528 22.8342,10.4963 22.5,10.765L17.54,14.955L19.09,21.265C19.1889,21.683 19.027,22.1194 18.6795,22.3719C18.332,22.6243 17.8669,22.6433 17.5,22.42L12,19L6.5,22.42C6.1331,22.6433 5.668,22.6243 5.3205,22.3719C4.973,22.1194 4.8111,21.683 4.91,21.265L6.46,14.955L1.5,10.765C1.1683,10.487 1.039,10.0353 1.1732,9.6239C1.3074,9.2125 1.6782,8.924 2.11,8.895L8.61,8.42L11.06,2.42C11.2306,2.0384 11.6087,1.7918 12.0268,1.7897C12.4448,1.7875 12.8255,2.0301 13,2.41Z"
         android:strokeWidth="1"
-        android:strokeAlpha="0.5" />
+        android:fillColor="#FECB00"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/layout/empty_list.xml b/app/src/main/res/layout/empty_list.xml
index 5f1aea457a05..fe07e9fec626 100644
--- a/app/src/main/res/layout/empty_list.xml
+++ b/app/src/main/res/layout/empty_list.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/empty_list_icon"
-            android:layout_width="@dimen/empty_list_icon_layout_width"
-            android:layout_height="@dimen/empty_list_icon_layout_height"
+            android:layout_width="@dimen/empty_list_icon_size"
+            android:layout_height="@dimen/empty_list_icon_size"
             android:contentDescription="@string/file_list_folder"
             android:src="@drawable/ic_list_empty_folder"
             android:visibility="gone"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9147d3a1b8ee..5f1b7477ef33 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -361,17 +361,19 @@
     <string name="file_details_no_content">Fehler beim Laden der Details</string>
     <string name="file_icon">Datei</string>
     <string name="file_keep">Behalten</string>
-    <string name="file_list_empty">Laden Sie Inhalt hoch oder synchronisieren Sie mit Ihren Geräten.</string>
+    <string name="file_list_empty">Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten.</string>
     <string name="file_list_empty_favorite_headline">Noch keine Favoriten vorhanden</string>
     <string name="file_list_empty_favorites_filter_list">Dateien und Ordner, die als Favoriten markiert werden, erscheinen hier.</string>
     <string name="file_list_empty_gallery">Keine Bilder oder Videos gefunden</string>
-    <string name="file_list_empty_headline"> Keine Dateien vorhanden </string>
+    <string name="file_list_empty_headline">Keine Dateien vorhanden </string>
     <string name="file_list_empty_headline_search">Keine Ergebnisse in diesem Ordner</string>
     <string name="file_list_empty_headline_server_search">Keine Ergebnisse</string>
     <string name="file_list_empty_moving">Noch nichts vorhanden. Sie können einen Ordner hinzufügen.</string>
     <string name="file_list_empty_on_device">Heruntergeladene Dateien und Ordner werden hier angezeigt werden.</string>
     <string name="file_list_empty_recently_modified">Keine, innerhalb der letzten 7 Tage, geänderten Dateien gefunden</string>
     <string name="file_list_empty_search">Vielleicht befindet es sich in einem anderen Ordner?</string>
+    <string name="search_result_empty">Eine Datei suchen (mindestens 2 Zeichen)</string>
+    <string name="gallery_list_empty">Noch keine hochgeladene Fotos oder Videos vorhanden</string>
     <string name="file_list_empty_shared">Von Ihnen geteilte Dateien und Ordner werden hier angezeigt.</string>
     <string name="file_list_empty_shared_headline">Noch nichts geteilt</string>
     <string name="file_list_empty_unified_search_no_results">Keine Ergebnisse für Ihre Suche gefunden</string>
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index 1f6a3f88885b..b594a886f16f 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -155,5 +155,6 @@
     <!--Adaptive Icon size specified here:  https://developer.android.com/develop/ui/views/launch/icon_design_adaptive -->
     <dimen name="adaptive_icon_size">108dp</dimen>
     <dimen name="adaptive_icon_padding">18dp</dimen>
+    <dimen name="empty_list_icon_size">120dp</dimen>
     <dimen name="tag_height">18dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 046976793481..bf373b19affb 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -64,6 +64,10 @@
     <color name="login_text_color">#ffffff</color>
     <color name="login_text_hint_color">#7fC0E3</color>
 
+    <!-- empty list icon colors -->
+    <color name="empty_list_icon_color">#191919</color>
+    <color name="empty_list_icon_color_dark">#CCCCCC</color>
+
     <!-- Multiaccount support -->
     <bool name="multiaccount_support">true</bool>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5c06a52d4527..5e917e8b6603 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1096,6 +1096,8 @@
     <string name="share_send_new_email">Send new email</string>
     <string name="link_name">Link Name</string>
     <string name="delete_link">Delete Link</string>
+    <string name="search_result_empty">Search for a file (at least 2 characters)</string>
+    <string name="gallery_list_empty">No photos or videos uploaded yet</string>
     <string name="share_settings">Settings</string>
     <string name="common_confirm">Confirm</string>
     <string name="strict_mode">Strict mode: no HTTP connection allowed!</string>