diff --git a/app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt b/app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt
index c1115de62e35..401ebad3dea8 100644
--- a/app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt
+++ b/app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt
@@ -98,7 +98,8 @@ class GeneratePdfFromImagesWork(
             .setContentText(message)
             .setAutoCancel(true)
 
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(appContext, notificationBuilder)
+        // NMC Customization
+        notificationBuilder.color = appContext.resources.getColor(R.color.primary, null)
 
         notificationManager.notify(notificationId, notificationBuilder.build())
 
diff --git a/app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt b/app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt
index de69651c67e0..47b2fd3dec1a 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt
@@ -161,7 +161,8 @@ class FilesExportWork(
             .setContentTitle(message)
             .setAutoCancel(true)
             .addAction(NotificationCompat.Action(null, context.getString(R.string.locate_folder), pendingIntent))
-            .also { viewThemeUtils.androidx.themeNotificationCompatBuilder(context, it) }
+            // NMC Customization
+            .also { it.setColor(context.resources.getColor(R.color.primary, null)) }
             .build()
 
         notificationManager.notify(NOTIFICATION_ID, notification)
diff --git a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
index 198d37f18f12..2a044c35ea76 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
@@ -224,7 +224,8 @@ class MediaFoldersDetectionWork(
             .setSilent(true)
             .setContentIntent(pendingIntent)
 
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, notificationBuilder)
+        // NMC Customization
+        notificationBuilder.color = context.resources.getColor(R.color.primary, null)
 
         val disableDetection = Intent(context, NotificationReceiver::class.java).apply {
             putExtra(NOTIFICATION_ID, notificationId)
diff --git a/app/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt b/app/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt
index b852fea8176e..0ca2c987df75 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt
@@ -166,7 +166,8 @@ class NotificationWork constructor(
             .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
             .setContentIntent(pendingIntent)
 
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, notificationBuilder)
+        // NMC Customization
+        notificationBuilder.color = context.resources.getColor(R.color.primary, null)
 
         // Remove
         if (notification.getActions().isEmpty()) {
@@ -222,9 +223,8 @@ class NotificationWork constructor(
                 .setAutoCancel(true)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setContentIntent(pendingIntent)
-                .also {
-                    viewThemeUtils.androidx.themeNotificationCompatBuilder(context, it)
-                }
+                // NMC Customization
+                .setColor(context.resources.getColor(R.color.primary, null))
                 .build()
         )
 
diff --git a/app/src/main/java/com/nextcloud/client/jobs/notification/WorkerNotificationManager.kt b/app/src/main/java/com/nextcloud/client/jobs/notification/WorkerNotificationManager.kt
index 195a11b72a34..cc7ac7b056ed 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/notification/WorkerNotificationManager.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/notification/WorkerNotificationManager.kt
@@ -42,7 +42,8 @@ open class WorkerNotificationManager(
             setVibrate(null)
             setOnlyAlertOnce(true)
             setSilent(true)
-            viewThemeUtils.androidx.themeNotificationCompatBuilder(context, this)
+            // NMC Customization
+            setColor(context.resources.getColor(R.color.primary, null))
         }
 
     fun showNotification() {
diff --git a/app/src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt b/app/src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt
index 9055ee527f5e..0b15212c0ef0 100644
--- a/app/src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt
+++ b/app/src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt
@@ -119,6 +119,9 @@ class LogsEmailSender(private val context: Context, private val clock: Clock, pr
             .setContentTitle(message)
             .setAutoCancel(true)
 
+        // NMC Customization
+        notificationBuilder.color = context.resources.getColor(R.color.primary, null)
+
         val actionIntent = Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).apply {
             flags = FLAG_ACTIVITY_NEW_TASK
         }
diff --git a/app/src/main/java/com/nextcloud/client/media/PlayerService.kt b/app/src/main/java/com/nextcloud/client/media/PlayerService.kt
index 15e6398351c0..897ce956fc22 100644
--- a/app/src/main/java/com/nextcloud/client/media/PlayerService.kt
+++ b/app/src/main/java/com/nextcloud/client/media/PlayerService.kt
@@ -108,7 +108,8 @@ class PlayerService : Service() {
         AndroidInjection.inject(this)
         player = Player(applicationContext, clientFactory, playerListener, audioManager)
         notificationBuilder = NotificationCompat.Builder(this)
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(this, notificationBuilder)
+        // NMC Customization
+        notificationBuilder.color = resources.getColor(R.color.primary, null)
 
         val stop = Intent(this, PlayerService::class.java).apply {
             action = ACTION_STOP
diff --git a/app/src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt b/app/src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt
index 2aed1d21e740..996f92ab3398 100644
--- a/app/src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt
+++ b/app/src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt
@@ -39,7 +39,8 @@ class AppNotificationManagerImpl @Inject constructor(
     private fun builder(channelId: String): NotificationCompat.Builder {
         val builder =
             NotificationCompat.Builder(context, channelId)
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, builder)
+        // NMC Customization
+        builder.color = context.resources.getColor(R.color.primary, null)
         return builder
     }
 
diff --git a/app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 5a8b609465d4..d1e35fbe1003 100644
--- a/app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -510,7 +510,8 @@ private void notifyForgottenLocalFiles() {
     private NotificationCompat.Builder createNotificationBuilder() {
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getContext());
         notificationBuilder.setSmallIcon(R.drawable.notification_icon).setAutoCancel(true);
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(getContext(), notificationBuilder);
+        // NMC Customization
+        notificationBuilder.setColor(getContext().getResources().getColor(R.color.primary, null));
         return notificationBuilder;
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.kt
index 00677da4fa82..b7ed41649bbf 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.kt
@@ -180,7 +180,20 @@ class NotificationListAdapter(
                 buildButton(transparent = true, label = fragment.getString(R.string.more), params = params) {
                     showOverflowMenu(it, overflowActions, holder, notification)
                 }
-            viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(moreButton)
+            // NMC Customization
+            moreButton.setBackgroundColor(
+                ResourcesCompat.getColor(
+                    fragment.resources,
+                    android.R.color.transparent,
+                    null
+                )
+            )
+            moreButton.setTextColor(
+                ResourcesCompat.getColor(
+                    fragment.resources,
+                    R.color.shared_with_me_color, null
+                )
+            )
             holder.binding.buttons.addView(moreButton)
         } else {
             for (action in actions) {
@@ -188,9 +201,34 @@ class NotificationListAdapter(
                     onActionClicked(holder, action, notification)
                 }
                 if (action.primary) {
-                    viewThemeUtils.material.colorMaterialButtonPrimaryFilled(button)
+                    // NMC Customization
+                    button.setBackgroundColor(
+                        ResourcesCompat.getColor(
+                            fragment.resources,
+                            R.color.shared_with_me_color, null
+                        )
+                    )
+                    button.setTextColor(
+                        ResourcesCompat.getColor(
+                            fragment.resources,
+                            R.color.white, null
+                        )
+                    )
                 } else {
-                    viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(button)
+                    // NMC Customization
+                    button.setBackgroundColor(
+                        ResourcesCompat.getColor(
+                            fragment.resources,
+                            android.R.color.transparent,
+                            null
+                        )
+                    )
+                    button.setTextColor(
+                        ResourcesCompat.getColor(
+                            fragment.resources,
+                            R.color.shared_with_me_color, null
+                        )
+                    )
                 }
                 holder.binding.buttons.addView(button)
             }
@@ -206,7 +244,19 @@ class NotificationListAdapter(
         val button = buildButton(transparent = false, label = action.label, params = params) {
             onActionClicked(holder, action, notification)
         }
-        viewThemeUtils.material.colorMaterialButtonPrimaryFilled(button)
+        // NMC Customization
+        button.setBackgroundColor(
+            ResourcesCompat.getColor(
+                fragment.resources,
+                R.color.shared_with_me_color, null
+            )
+        )
+        button.setTextColor(
+            ResourcesCompat.getColor(
+                fragment.resources,
+                R.color.white, null
+            )
+        )
         holder.binding.buttons.addView(button)
     }
 
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
index 7243af32a3e3..f4b9ebe8859e 100644
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -7,10 +7,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#333333"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:tint="@color/notification_icon_color"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M160,760L160,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L800,680L800,760L160,760ZM480,460L480,460L480,460L480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM320,680L640,680L640,400Q640,334 593,287Q546,240 480,240Q414,240 367,287Q320,334 320,400L320,680Z" />
+        android:pathData="M21.25,17.25C19.6384,15.6405 18.6407,13.5179 18.43,11.25L18.27,9.5C18.0256,6.7093 15.9678,4.4152 13.22,3.87C13.665,3.2479 13.5706,2.3905 13.0009,1.8801C12.4313,1.3697 11.5687,1.3697 10.9991,1.8801C10.4294,2.3905 10.335,3.2479 10.78,3.87C8.0322,4.4152 5.9744,6.7093 5.73,9.5L5.57,11.255C5.3593,13.5229 4.3616,15.6455 2.75,17.255L2.75,17.255L2.75,19.755L8.25,19.755C8.245,19.8383 8.245,19.9217 8.25,20.005C8.25,22.0761 9.9289,23.755 12,23.755C14.0711,23.755 15.75,22.0761 15.75,20.005C15.755,19.9217 15.755,19.8383 15.75,19.755L21.25,19.755L21.25,17.25ZM14.25,20C14.25,21.2426 13.2426,22.25 12,22.25C10.7574,22.25 9.75,21.2426 9.75,20C9.7534,19.9162 9.7617,19.8328 9.775,19.75L14.225,19.75C14.2383,19.8328 14.2466,19.9162 14.25,20Z"
+        android:strokeWidth="1"
+        android:fillColor="#191919"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/layout/notification_list_item.xml b/app/src/main/res/layout/notification_list_item.xml
index 1419aafd5b92..cb709e668295 100644
--- a/app/src/main/res/layout/notification_list_item.xml
+++ b/app/src/main/res/layout/notification_list_item.xml
@@ -61,6 +61,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"
+            android:paddingBottom="@dimen/standard_quarter_padding"
             android:textColor="@color/secondary_text_color"
             android:textSize="@dimen/text_size_13sp"
             tools:text="@string/placeholder_sentence" />
@@ -69,7 +70,7 @@
             android:id="@+id/buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/standard_quarter_margin"
+            android:layout_marginTop="@dimen/alternate_half_margin"
             android:layout_marginEnd="@dimen/notification_list_item_grid_layout_left_start_margin"
             android:columnCount="3"
             android:gravity="start"
diff --git a/app/src/main/res/layout/toolbar_back_button.xml b/app/src/main/res/layout/toolbar_back_button.xml
index aa89fae12bc7..9fd6b16a1796 100644
--- a/app/src/main/res/layout/toolbar_back_button.xml
+++ b/app/src/main/res/layout/toolbar_back_button.xml
@@ -5,10 +5,26 @@
   ~ SPDX-FileCopyrightText: 2024 Alper Ozturk <alper.ozturk@nextcloud.com>
   ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
-<androidx.appcompat.widget.Toolbar
+<!-- NMC Customization: added divider below toolbar -->
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/toolbar_back_button"
+    android:id="@+id/toolbar_layout"
     android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    app:popupTheme="@style/Theme.AppCompat.DayNight.NoActionBar" />
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar_back_button"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/bg_default"
+        android:theme="@style/Theme.ToolbarTheme"
+        app:popupTheme="@style/Theme.AppCompat.DayNight.NoActionBar" />
+
+    <View
+        android:id="@+id/default_toolbar_divider"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/toolbar_divider_color"/>
+</LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 72908c65f15b..e52a44292d0c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -23,6 +23,9 @@
     <color name="icon_on_nc_grey">#ffffff</color>
     <color name="foreground_highlight">#EAE0E5</color>
 
+    <!-- Notification Colors -->
+    <color name="notification_icon_color">@color/grey_30</color>
+
     <!-- Multiselect backgrounds -->
     <color name="action_mode_background">@color/appbar</color>
     <color name="selected_item_background">#373535</color>
@@ -39,4 +42,69 @@
     <color name="fontAppbar">@android:color/white</color>
 
     <color name="bg_message_bubble">#2A2A2A</color>
+
+    <!-- NMC Colors -->
+    <color name="icon_color">#FFFFFF</color>
+    <color name="sort_text_color">@color/grey_30</color>
+    <color name="list_icon_color">@color/grey_30</color>
+    <color name="warning_icon_color">#CCCCCC</color>
+    <color name="divider_color">@color/grey_70</color>
+    <color name="spinner_bg_color">@color/grey_80</color>
+    <color name="refresh_layout_bg_color">#2D2D2D</color>
+    <color name="primary_button_disabled_color">@color/grey_70</color>
+    <color name="toolbar_divider_color">@color/grey_70</color>
+
+    <!-- Snackbar Colors -->
+    <color name="snackbar_bg_color">@color/grey_80</color>
+    <color name="snackbar_txt_color">@color/grey_0</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">@color/grey_80</color>
+    <color name="alert_txt_color">@color/grey_0</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_60</color>
+    <color name="nav_txt_unselected_color">@color/grey_0</color>
+    <color name="nav_txt_selected_color">@color/grey_0</color>
+    <color name="nav_icon_unselected_color">@color/grey_30</color>
+    <color name="nav_icon_selected_color">#FFFFFF</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/grey_80</color>
+    <color name="drawer_quota_txt_color">#FFFFFF</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">@color/grey_80</color>
+    <color name="bottom_sheet_icon_color">@color/grey_30</color>
+    <color name="bottom_sheet_txt_color">@color/grey_0</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">@color/grey_80</color>
+    <color name="popup_menu_txt_color">@color/grey_0</color>
+    <color name="overflow_bg_color">@color/grey_80</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_disabled">@color/grey_70</color>
+    <color name="switch_track_disabled">@color/grey_60</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_disabled">@color/grey_70</color>
+    <color name="checkbox_unchecked_disabled">@color/grey_70</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#FFFFFF</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">@color/grey_0</color>
+    <color name="share_search_border_color">@color/grey_0</color>
+    <color name="share_btn_txt_color">@color/grey_0</color>
+    <color name="share_list_item_txt_color">@color/grey_0</color>
+    <color name="share_disabled_txt_color">@color/grey_60</color>
+    <color name="share_txt_color">@color/grey_0</color>
+    <color name="share_et_divider">#FFFFFF</color>
+    <color name="share_blue_color">#7d94f9</color>
+
+    <!-- Scan Colors -->
+    <color name="scan_doc_bg_color">#121212</color>
+    <color name="scan_text_color">@color/grey_0</color>
+    <color name="scan_edit_bottom_color">@color/grey_80</color>
+    <color name="scan_count_bg_color">@color/grey_80</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aded2c0b3577..29ca8e5fb11c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -35,6 +35,9 @@
     <color name="grey_600">#666666</color>
     <color name="grey_800_transparent">#CC000000</color>
 
+    <!-- Notification Colors -->
+    <color name="notification_icon_color">#191919</color>
+
     <!-- level colors for info notifications/visualisations -->
     <color name="infolevel_warning">#e9322d</color>
 
@@ -88,4 +91,94 @@
     <color name="fontSecondaryAppbar">#A5A5A5</color>
 
     <color name="bg_message_bubble">#EFEFEF</color>
+
+    <!--  NMC Colors  -->
+    <color name="icon_color">#191919</color>
+    <color name="sort_text_color">@color/primary</color>
+    <color name="list_icon_color">#191919</color>
+    <color name="warning_icon_color">#191919</color>
+    <color name="divider_color">@color/grey_30</color>
+    <color name="spinner_bg_color">@android:color/white</color>
+    <color name="refresh_layout_bg_color">#FFFFFF</color>
+    <color name="primary_button_disabled_color">@color/grey_0</color>
+    <color name="toolbar_divider_color">#CCCCCC</color>
+    <color name="et_highlight_color">#77c4ff</color>
+    <color name="white_trans_70">#B3FFFFFF</color>
+    <color name="progress_bar_background">@color/grey_10</color>
+
+    <!-- Grey Colors -->
+    <color name="dark_grey">#101010</color>
+    <color name="grey_0">#F2F2F2</color>
+    <color name="grey_10">#E5E5E5</color>
+    <color name="grey_30">#B2B2B2</color>
+    <color name="grey_60">#666666</color>
+    <color name="grey_70">#4C4C4C</color>
+    <color name="grey_80">#333333</color>
+
+    <!-- Snackbar Colors  -->
+    <color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
+    <color name="snackbar_txt_color">@color/white</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">#FFFFFF</color>
+    <color name="alert_txt_color">#191919</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_0</color>
+    <color name="nav_txt_unselected_color">#191919</color>
+    <color name="nav_txt_selected_color">@color/primary</color>
+    <color name="nav_icon_unselected_color">#191919</color>
+    <color name="nav_icon_selected_color">@color/primary</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/white</color>
+    <color name="drawer_quota_txt_color">#191919</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">#FFFFFF</color>
+    <color name="bottom_sheet_icon_color">#191919</color>
+    <color name="bottom_sheet_txt_color">#191919</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">#FFFFFF</color>
+    <color name="popup_menu_txt_color">#191919</color>
+    <color name="overflow_bg_color">#FFFFFF</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_checked_enabled">@color/primary</color>
+    <color name="switch_track_checked_enabled">#F399C7</color>
+    <color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
+    <color name="switch_track_unchecked_enabled">@color/grey_30</color>
+    <color name="switch_thumb_disabled">@color/grey_10</color>
+    <color name="switch_track_disabled">@color/grey_0</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_enabled">@color/primary</color>
+    <color name="checkbox_unchecked_enabled">@color/grey_30</color>
+    <color name="checkbox_checked_disabled">@color/grey_30</color>
+    <color name="checkbox_unchecked_disabled">#CCCCCC</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#191919</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">#191919</color>
+    <color name="share_search_border_color">#191919</color>
+    <color name="share_btn_txt_color">#191919</color>
+    <color name="share_list_item_txt_color">#191919</color>
+    <color name="share_disabled_txt_color">@color/grey_30</color>
+    <color name="share_txt_color">#191919</color>
+    <color name="share_et_divider">#000000</color>
+    <color name="share_warning_txt_color">#191919</color>
+    <color name="sharing_warning_bg_color">#F6E5EB</color>
+    <color name="sharing_warning_border_color">#C16F81</color>
+    <color name="share_color">#0D39DF</color>
+    <color name="shared_with_me_color">#0099ff</color>
+    <color name="share_blue_color">#2238df</color>
+
+    <!--  Scan Colors  -->
+    <color name="scan_doc_bg_color">@color/grey_0</color>
+    <color name="scan_text_color">#191919</color>
+    <color name="scan_edit_bottom_color">@color/grey_0</color>
+    <color name="scan_count_bg_color">@color/grey_30</color>
+    <color name="neptune">#77b6bb</color>
+    <color name="neptune_50">#5077b6bb</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000000..cc9e25255a10
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="grid_recyclerview_padding">4dp</dimen>
+    <dimen name="list_item_icons_size">16dp</dimen>
+    <dimen name="grid_item_icons_size">24dp</dimen>
+    <dimen name="media_grid_item_rv_spacing">6dp</dimen>
+    <dimen name="txt_size_18sp">18sp</dimen>
+    <dimen name="txt_size_15sp">15sp</dimen>
+    <dimen name="crop_corner_size">15dp</dimen>
+    <dimen name="edit_scan_bottom_bar_height">56dp</dimen>
+    <dimen name="standard_folders_grid_item_size">86dp</dimen>
+    <dimen name="standard_files_grid_item_size">80dp</dimen>
+    <dimen name="txt_size_11sp">11sp</dimen>
+    <dimen name="share_row_icon_size">30dp</dimen>
+    <dimen name="create_link_button_height">55dp</dimen>
+    <dimen name="note_et_height">258dp</dimen>
+    <dimen name="txt_size_17sp">17sp</dimen>
+    <dimen name="share_exp_date_divider_margin">20dp</dimen>
+    <dimen name="privacy_btn_width">160dp</dimen>
+    <dimen name="privacy_icon_size">50dp</dimen>
+    <dimen name="login_btn_width">150dp</dimen>
+    <dimen name="login_btn_height">55dp</dimen>
+    <dimen name="login_btn_bottom_margin">48dp</dimen>
+    <dimen name="login_btn_bottom_margin_land">48dp</dimen>
+    <dimen name="login_btn_bottom_margin_small_screen">24dp</dimen>
+    <dimen name="shared_with_me_icon_size">26dp</dimen>
+    <dimen name="txt_size_20sp">20sp</dimen>
+    <dimen name="notification_row_item_height">145dp</dimen>
+    <dimen name="button_stroke_width">1dp</dimen>
+    <dimen name="txt_size_13sp">13sp</dimen>
+</resources>
\ No newline at end of file