diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 77bfd0b42305..49d22bfe2f23 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -266,11 +266,10 @@
         <activity
             android:name=".ui.activity.SettingsActivity"
             android:exported="false"
-            android:theme="@style/PreferenceTheme" />
+            android:theme="@style/Theme.ownCloud" />
         <activity
             android:name=".ui.preview.PreviewImageActivity"
-            android:exported="false"
-            android:theme="@style/Theme.ownCloud.Overlay" />
+            android:exported="false" />
         <activity
             android:name=".ui.preview.PreviewMediaActivity"
             android:configChanges="orientation|screenLayout|screenSize|keyboardHidden"
diff --git a/app/src/main/java/com/nmc/android/utils/DrawableThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/DrawableThemeUtils.kt
new file mode 100644
index 000000000000..90d87bc6dcd6
--- /dev/null
+++ b/app/src/main/java/com/nmc/android/utils/DrawableThemeUtils.kt
@@ -0,0 +1,18 @@
+package com.nmc.android.utils
+
+import android.graphics.drawable.Drawable
+import androidx.annotation.ColorInt
+import androidx.core.graphics.BlendModeColorFilterCompat
+import androidx.core.graphics.BlendModeCompat
+import androidx.core.graphics.drawable.DrawableCompat
+
+object DrawableThemeUtils {
+    @JvmStatic
+    fun tintDrawable(drawable: Drawable, @ColorInt color: Int): Drawable {
+        val wrap: Drawable = DrawableCompat.wrap(drawable)
+        wrap.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+            color, BlendModeCompat.SRC_ATOP
+        )
+        return wrap
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nmc/android/utils/ToolbarThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/ToolbarThemeUtils.kt
new file mode 100644
index 000000000000..de28f3a33952
--- /dev/null
+++ b/app/src/main/java/com/nmc/android/utils/ToolbarThemeUtils.kt
@@ -0,0 +1,27 @@
+package com.nmc.android.utils
+
+import android.content.Context
+import android.graphics.Typeface
+import android.text.Spannable
+import android.text.style.StyleSpan
+import androidx.appcompat.app.ActionBar
+import com.owncloud.android.R
+import com.owncloud.android.utils.StringUtils
+
+object ToolbarThemeUtils {
+    @JvmStatic
+    fun setColoredTitle(context: Context, actionBar: ActionBar?, title: String) {
+        if (actionBar != null) {
+            val text: Spannable = StringUtils.getColorSpan(title, context.resources.getColor(R.color.fontAppbar, null))
+
+            //bold the magenta from MagentaCLOUD title
+            if (title.contains(context.resources.getString(R.string.app_name))) {
+                val textToBold = context.resources.getString(R.string.splashScreenBold)
+                val indexStart = title.indexOf(textToBold)
+                val indexEnd = indexStart + textToBold.length
+                text.setSpan(StyleSpan(Typeface.BOLD), indexStart, indexEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            }
+            actionBar.title = text
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index cbfd8f7f774d..fe405e2dd0da 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -59,6 +59,7 @@
 import com.nextcloud.ui.ChooseAccountDialogFragment;
 import com.nextcloud.ui.composeActivity.ComposeActivity;
 import com.nextcloud.ui.composeActivity.ComposeDestination;
+import com.nmc.android.utils.DrawableThemeUtils;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.PassCodeManager;
@@ -271,8 +272,11 @@ public void onDrawerOpened(View drawerView) {
         Drawable backArrow = ResourcesCompat.getDrawable(getResources(),
                                                          R.drawable.ic_arrow_back,
                                                          null);
-
-        viewThemeUtils.platform.tintToolbarArrowDrawable(this, mDrawerToggle, backArrow);
+        // custom color for back arrow required for NMC
+        if (backArrow != null) {
+            mDrawerToggle.setHomeAsUpIndicator(DrawableThemeUtils.tintDrawable(backArrow, getResources().getColor(R.color.fontAppbar, null)));
+            mDrawerToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.fontAppbar, null));
+        }
     }
 
     /**
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt
index fe79e7aaa17c..be9af7ed0d03 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt
@@ -18,6 +18,7 @@ import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.R
 import com.owncloud.android.lib.common.utils.Log_OC
+import com.owncloud.android.utils.theme.ViewThemeUtils
 import java.io.File
 import javax.inject.Inject
 import kotlin.system.exitProcess
@@ -30,13 +31,17 @@ class ManageSpaceActivity : AppCompatActivity(), Injectable {
     @Inject
     lateinit var userAccountManager: UserAccountManager
 
+    @Inject
+    lateinit var viewThemeUtils: ViewThemeUtils
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_manage_space)
         val actionBar = supportActionBar
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true)
-            actionBar.setTitle(R.string.manage_space_title)
+            //NMC Customisation
+            viewThemeUtils.files.themeActionBar(this, actionBar, R.string.manage_space_title)
         }
         val descriptionTextView = findViewById<TextView>(R.id.general_description)
         descriptionTextView.text = getString(R.string.manage_space_description, getString(R.string.app_name))
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
index a5272adc86a1..2947319f2e33 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
@@ -21,6 +21,7 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.ListPreference;
@@ -863,12 +864,10 @@ private void setupActionBar() {
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowTitleEnabled(true);
             if (this.getResources() != null) {
-                viewThemeUtils.androidx.themeActionBar(this,
-                                                       actionBar,
-                                                       getString(R.string.actionbar_settings),
-                                                       ResourcesCompat.getDrawable(this.getResources(),
-                                                                                   R.drawable.ic_arrow_back,
-                                                                                   null));
+                //custom color for back arrow for NMC
+                viewThemeUtils.files.themeActionBar(this, actionBar, getResources().getString(R.string.actionbar_settings));
+                //required for NMC
+                actionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.bg_default, null)));
             }
         }
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
index e51fd0869b4e..a8ecc29af92a 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
@@ -92,8 +92,6 @@ protected void onCreate(Bundle savedInstanceState) {
         // Name
         binding.shareFileName.setText(getResources().getString(R.string.share_file, file.getFileName()));
 
-        viewThemeUtils.platform.colorViewBackground(binding.shareHeaderDivider);
-
         // Size
         binding.shareFileSize.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
 
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java
index 14f8ba64a26c..56cb92af46b7 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java
@@ -17,6 +17,7 @@
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -31,9 +32,11 @@
 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.textview.MaterialTextView;
 import com.nextcloud.client.di.Injectable;
+import com.nmc.android.utils.ToolbarThemeUtils;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.utils.StringUtils;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.ThemeUtils;
 import com.owncloud.android.utils.theme.ViewThemeUtils;
@@ -62,6 +65,7 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable
     private LinearLayout mInfoBox;
     private TextView mInfoBoxMessage;
     protected AppCompatSpinner mToolbarSpinner;
+    private View mDefaultToolbarDivider;
     private boolean isHomeSearchToolbarShow = false;
 
     @Inject public ThemeColorUtils themeColorUtils;
@@ -82,6 +86,7 @@ private void setupToolbar(boolean isHomeSearchToolbarShow, boolean showSortListB
         mMenuButton = findViewById(R.id.menu_button);
         mSearchText = findViewById(R.id.search_text);
         mSwitchAccountButton = findViewById(R.id.switch_account_button);
+        mDefaultToolbarDivider = findViewById(R.id.default_toolbar_divider);
 
         if (showSortListButtonGroup) {
             findViewById(R.id.sort_list_button_group).setVisibility(View.VISIBLE);
@@ -98,8 +103,10 @@ private void setupToolbar(boolean isHomeSearchToolbarShow, boolean showSortListB
 
         mToolbarSpinner = findViewById(R.id.toolbar_spinner);
 
-        viewThemeUtils.material.themeToolbar(mToolbar);
-        viewThemeUtils.material.colorToolbarOverflowIcon(mToolbar);
+        // custom color for overflow icon required for NMC
+        if (mToolbar.getOverflowIcon() != null) {
+            mToolbar.getOverflowIcon().setColorFilter(getResources().getColor(R.color.fontAppbar, null), PorterDuff.Mode.SRC_ATOP);
+        }
         viewThemeUtils.platform.themeStatusBar(this);
         viewThemeUtils.material.colorMaterialTextButton(mSwitchAccountButton);
     }
@@ -162,22 +169,11 @@ private void showHomeSearchToolbar(String title, boolean isRoot) {
 
     @SuppressLint("PrivateResource")
     private void showHomeSearchToolbar(boolean isShow) {
-        viewThemeUtils.material.themeToolbar(mToolbar);
-        if (isShow) {
-            viewThemeUtils.platform.resetStatusBar(this);
-            mAppBar.setStateListAnimator(AnimatorInflater.loadStateListAnimator(mAppBar.getContext(),
-                                                                                R.animator.appbar_elevation_off));
-            mDefaultToolbar.setVisibility(View.GONE);
-            mHomeSearchToolbar.setVisibility(View.VISIBLE);
-            viewThemeUtils.material.themeCardView(mHomeSearchToolbar);
-            viewThemeUtils.material.themeSearchBarText(mSearchText);
-        } else {
-            mAppBar.setStateListAnimator(AnimatorInflater.loadStateListAnimator(mAppBar.getContext(),
-                                                                                R.animator.appbar_elevation_on));
-            viewThemeUtils.platform.themeStatusBar(this);
-            mDefaultToolbar.setVisibility(View.VISIBLE);
-            mHomeSearchToolbar.setVisibility(View.GONE);
-        }
+        mAppBar.setStateListAnimator(AnimatorInflater.loadStateListAnimator(mAppBar.getContext(),
+                                                                            R.animator.appbar_elevation_on));
+        viewThemeUtils.platform.themeStatusBar(this);
+        mDefaultToolbar.setVisibility(View.VISIBLE);
+        mHomeSearchToolbar.setVisibility(View.GONE);
     }
 
     /**
@@ -190,7 +186,8 @@ public void updateActionBarTitleAndHomeButtonByString(String title) {
         // set home button properties
         if (actionBar != null) {
             if (title != null) {
-                actionBar.setTitle(title);
+                //custom styling for action bar title required for NMC
+                ToolbarThemeUtils.setColoredTitle(this, actionBar, title);
                 actionBar.setDisplayShowTitleEnabled(true);
             } else {
                 actionBar.setDisplayShowTitleEnabled(false);
@@ -287,8 +284,8 @@ public FrameLayout getPreviewImageContainer() {
     public void updateToolbarSubtitle(@NonNull String subtitle) {
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setSubtitle(subtitle);
-            viewThemeUtils.androidx.themeActionBarSubtitle(this, actionBar);
+            //required for NMC
+            actionBar.setSubtitle(StringUtils.getColorSpan(subtitle, getResources().getColor(R.color.fontAppbar, null)));
         }
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
index 7ebd4af61d3c..1003d9f49e3b 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
@@ -10,12 +10,8 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.os.Build
 import android.os.Bundle
 import android.view.MenuItem
-import android.view.View
-import android.view.WindowInsets
-import android.view.WindowInsetsController
 import androidx.appcompat.app.ActionBar
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
@@ -68,7 +64,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
     private var savedPosition = 0
     private var hasSavedPosition = false
     private var downloadFinishReceiver: DownloadFinishReceiver? = null
-    private var fullScreenAnchorView: View? = null
 
     private var isDownloadWorkStarted = false
     private var screenState = PreviewImageActivityState.Idle
@@ -95,6 +90,7 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
         }
 
         setContentView(R.layout.preview_image_activity)
+        setupToolbar()
 
         livePhotoFile = intent.getParcelableArgument(EXTRA_LIVE_PHOTO_FILE, OCFile::class.java)
 
@@ -108,7 +104,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
             actionBar?.setDisplayHomeAsUpEnabled(true)
         }
 
-        fullScreenAnchorView = window.decorView
         // to keep our UI controls visibility in line with system bars visibility
         setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
 
@@ -227,7 +222,8 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
             if (file != null) {
                 // / Refresh the activity according to the Account and OCFile set
                 setFile(file) // reset after getting it fresh from storageManager
-                updateActionBarTitle(getFile().fileName)
+                // NMC Customization
+                updateActionBarTitleAndHomeButton(getFile())
                 // if (!stateWasRecovered) {
                 initViewPager(optionalUser.get())
 
@@ -400,15 +396,12 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
         }
 
         if (currentFile != null) {
-            updateActionBarTitle(currentFile.fileName)
+            // NMC Customization
+            updateActionBarTitleAndHomeButton(currentFile)
             setDrawerIndicatorEnabled(false)
         }
     }
 
-    private fun updateActionBarTitle(title: String?) {
-        supportActionBar?.title = title
-    }
-
     /**
      * Class waiting for broadcast events from the [FileDownloadWorker] service.
      *
@@ -471,17 +464,7 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
         get() = supportActionBar == null || supportActionBar?.isShowing == true
 
     fun toggleFullScreen() {
-        if (fullScreenAnchorView == null) return
-        val visible = (
-            fullScreenAnchorView!!.systemUiVisibility
-                and View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-            ) == 0
-
-        if (visible) {
-            hideSystemUI(fullScreenAnchorView!!)
-        } else {
-            showSystemUI(fullScreenAnchorView!!)
-        }
+        // do nothing for NMC
     }
 
     fun startImageEditor(file: OCFile) {
@@ -519,44 +502,6 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
         // TODO Auto-generated method stub
     }
 
-    private fun hideSystemUI(anchorView: View) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.insetsController?.let { controller ->
-                controller.hide(WindowInsets.Type.systemBars())
-                controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            }
-        } else {
-            @Suppress("DEPRECATION")
-            anchorView.systemUiVisibility = (
-                View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hides NAVIGATION BAR; Android >= 4.0
-                    or View.SYSTEM_UI_FLAG_FULLSCREEN // hides STATUS BAR;     Android >= 4.1
-                    or View.SYSTEM_UI_FLAG_IMMERSIVE // stays interactive;    Android >= 4.4
-                    or View.SYSTEM_UI_FLAG_LAYOUT_STABLE // draw full window;     Android >= 4.1
-                    or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN // draw full window;     Android >= 4.1
-                    or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                )
-        }
-    }
-
-    private fun showSystemUI(anchorView: View) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.insetsController?.let { controller ->
-                controller.show(WindowInsets.Type.systemBars())
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_DEFAULT
-                }
-            }
-        } else {
-            @Suppress("DEPRECATION")
-            anchorView.systemUiVisibility = (
-                View.SYSTEM_UI_FLAG_LAYOUT_STABLE // draw full window;     Android >= 4.1
-                    or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN // draw full window;     Android >= 4.1
-                    or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                )
-        }
-    }
-
     companion object {
         val TAG: String = PreviewImageActivity::class.java.simpleName
         const val EXTRA_VIRTUAL_TYPE: String = "EXTRA_VIRTUAL_TYPE"
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
index 19dead13fa8c..203e775e9226 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
@@ -36,6 +36,7 @@ import android.widget.FrameLayout
 import androidx.annotation.OptIn
 import androidx.annotation.StringRes
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
@@ -144,7 +145,8 @@ class PreviewMediaActivity :
         binding = ActivityPreviewMediaBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        setSupportActionBar(binding.materialToolbar)
+        // NMC Customization: Customize toolbar
+        setupToolbar()
         WindowCompat.setDecorFitsSystemWindows(window, false)
         applyWindowInsets()
         initArguments(savedInstanceState)
@@ -239,10 +241,6 @@ class PreviewMediaActivity :
             it.setDisplayHomeAsUpEnabled(true)
             viewThemeUtils.files.themeActionBar(this, it)
         }
-
-        viewThemeUtils.platform.themeStatusBar(
-            this
-        )
     }
 
     private fun showProgressLayout() {
@@ -443,7 +441,7 @@ class PreviewMediaActivity :
                     .displayCutout()
             )
 
-            binding.materialToolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+            binding.mediaToolbar.appbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 topMargin = insets.top
             }
             exoControls.updateLayoutParams<ViewGroup.MarginLayoutParams> {
@@ -454,7 +452,7 @@ class PreviewMediaActivity :
             }
             exoControls.updatePadding(left = insets.left, right = insets.right)
             exoProgress.updatePadding(left = insets.left, right = insets.right)
-            binding.materialToolbar.updatePadding(left = insets.left, right = insets.right)
+            binding.mediaToolbar.appbar.updatePadding(left = insets.left, right = insets.right)
             WindowInsetsCompat.CONSUMED
         }
     }
@@ -487,6 +485,15 @@ class PreviewMediaActivity :
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.custom_menu_placeholder, menu)
+        // NMC customization
+        menu?.findItem(R.id.custom_menu_placeholder_item)?.apply {
+            icon = icon?.let {
+                viewThemeUtils.platform.colorDrawable(
+                    it,
+                    ContextCompat.getColor(this@PreviewMediaActivity, R.color.fontAppbar)
+                )
+            }
+        }
         return true
     }
 
diff --git a/app/src/main/java/com/owncloud/android/utils/StringUtils.java b/app/src/main/java/com/owncloud/android/utils/StringUtils.java
index d4339f0003eb..3f67854ef0dd 100644
--- a/app/src/main/java/com/owncloud/android/utils/StringUtils.java
+++ b/app/src/main/java/com/owncloud/android/utils/StringUtils.java
@@ -7,6 +7,11 @@
  */
 package com.owncloud.android.utils;
 
+
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
+
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -55,6 +60,15 @@ String searchAndColor(@Nullable String text, @Nullable String searchText,
         }
     }
 
+    public static Spannable getColorSpan(@NonNull String title, @ColorInt int color) {
+        Spannable text = new SpannableString(title);
+        text.setSpan(new ForegroundColorSpan(color),
+                     0,
+                     text.length(),
+                     Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        return text;
+    }
+
     public static
     @NonNull
     String removePrefix(@NonNull String s, @NonNull String prefix) {
diff --git a/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt b/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt
index 41f13b37156f..d075e145d14c 100644
--- a/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt
+++ b/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt
@@ -28,7 +28,9 @@ import com.nextcloud.android.common.ui.theme.MaterialSchemes
 import com.nextcloud.android.common.ui.theme.ViewThemeUtilsBase
 import com.nextcloud.android.common.ui.theme.utils.AndroidViewThemeUtils
 import com.nextcloud.android.common.ui.theme.utils.AndroidXViewThemeUtils
+import com.nmc.android.utils.ToolbarThemeUtils
 import com.nextcloud.utils.view.FastScrollPopupBackground
+import com.nmc.android.utils.DrawableThemeUtils
 import com.owncloud.android.R
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.ShareType
@@ -133,18 +135,11 @@ class FilesSpecificViewThemeUtils @Inject constructor(
     // TODO move back arrow resource to lib and use lib method directly?
     @JvmOverloads
     fun themeActionBar(context: Context, actionBar: ActionBar, title: String, isMenu: Boolean = false) {
-        val icon = getHomeAsUpIcon(isMenu)
-        val backArrow = ResourcesCompat.getDrawable(
-            context.resources,
-            icon,
-            null
-        )!!
-        androidXViewThemeUtils.themeActionBar(
-            context,
-            actionBar,
-            title,
-            backArrow
-        )
+        //custom styling for action bar title required for NMC
+        ToolbarThemeUtils.setColoredTitle(context, actionBar, title)
+
+        //custom color for back arrow for NMC
+        themeActionBar(context, actionBar, isMenu)
     }
 
     /**
@@ -171,7 +166,13 @@ class FilesSpecificViewThemeUtils @Inject constructor(
             getHomeAsUpIcon(isMenu),
             null
         )!!
-        androidXViewThemeUtils.themeActionBar(context, actionBar, backArrow)
+        //custom color for back arrow for NMC
+        actionBar.setHomeAsUpIndicator(
+            DrawableThemeUtils.tintDrawable(
+                backArrow,
+                context.resources.getColor(R.color.fontAppbar, null)
+            )
+        )
     }
 
     fun themeTemplateCardView(cardView: MaterialCardView) {
diff --git a/app/src/main/res/layout/action_mode_close_layout.xml b/app/src/main/res/layout/action_mode_close_layout.xml
new file mode 100644
index 000000000000..36e355cb18c3
--- /dev/null
+++ b/app/src/main/res/layout/action_mode_close_layout.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/action_mode_close_button"
+    style="?attr/actionModeCloseButtonStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:tint="@color/fontAppbar"
+    android:layout_marginEnd="@dimen/standard_margin"
+    android:clickable="true"
+    android:contentDescription="@string/abc_action_mode_done"
+    android:focusable="true"
+    android:paddingStart="@dimen/standard_half_padding"
+    app:srcCompat="@drawable/ic_arrow_back" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_preview_media.xml b/app/src/main/res/layout/activity_preview_media.xml
index b61873086fc3..0f6087540344 100644
--- a/app/src/main/res/layout/activity_preview_media.xml
+++ b/app/src/main/res/layout/activity_preview_media.xml
@@ -15,15 +15,6 @@
     android:gravity="center"
     tools:context=".ui.preview.PreviewMediaActivity">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/material_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:elevation="@dimen/standard_quarter_margin"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true" />
-
     <ImageView
         android:id="@+id/image_preview"
         android:layout_width="match_parent"
@@ -49,6 +40,13 @@
         android:layout_margin="@dimen/standard_margin"
         android:visibility="gone" />
 
+    <!-- NMC Customization: Use common toolbar -->
+    <!-- It should be placed below player so that it will overlay on
+    player instead of player overlaying toolbar -->
+    <include
+        android:id="@+id/media_toolbar"
+        layout="@layout/toolbar_standard" />
+
     <FrameLayout
         android:id="@+id/progress"
         android:background="@color/color_dark_transparent"
diff --git a/app/src/main/res/layout/file_details_fragment.xml b/app/src/main/res/layout/file_details_fragment.xml
index c00d53999a43..f5dd7eaa7ae9 100644
--- a/app/src/main/res/layout/file_details_fragment.xml
+++ b/app/src/main/res/layout/file_details_fragment.xml
@@ -173,7 +173,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/list_divider_background" />
+        android:background="@color/divider_color" />
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
diff --git a/app/src/main/res/layout/preview_image_activity.xml b/app/src/main/res/layout/preview_image_activity.xml
index 35746487f5f1..f53792ba5b84 100644
--- a/app/src/main/res/layout/preview_image_activity.xml
+++ b/app/src/main/res/layout/preview_image_activity.xml
@@ -10,17 +10,28 @@
   ~ SPDX-FileCopyrightText: 2013 David A. Velasco <dvelasco@solidgear.es>
   ~ SPDX-License-Identifier: GPL-2.0-only AND (AGPL-3.0-or-later OR GPL-2.0-only)
 -->
-<androidx.drawerlayout.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/fragmentPager"
-        android:orientation="horizontal"
-		android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/toolbar_standard" />
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/fragmentPager"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/appbar" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
         layout="@layout/drawer"
diff --git a/app/src/main/res/layout/share_activity.xml b/app/src/main/res/layout/share_activity.xml
index 94ec5f013606..8a524ae30193 100644
--- a/app/src/main/res/layout/share_activity.xml
+++ b/app/src/main/res/layout/share_activity.xml
@@ -59,8 +59,8 @@
     <View
         android:id="@+id/share_header_divider"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/standard_eighth_margin"
-        android:background="@color/primary" />
+        android:layout_height="1dp"
+        android:background="@color/divider_color" />
 
     <FrameLayout
         android:id="@+id/share_fragment_container"
diff --git a/app/src/main/res/layout/toolbar_standard.xml b/app/src/main/res/layout/toolbar_standard.xml
index cc434e6124dc..668f5a6677b2 100644
--- a/app/src/main/res/layout/toolbar_standard.xml
+++ b/app/src/main/res/layout/toolbar_standard.xml
@@ -66,6 +66,22 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/toolbarBarrier"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="switch_grid_view_button,sort_button" />
+
+            <View
+                android:id="@+id/toolbar_divider"
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:background="@color/divider_color"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/toolbarBarrier" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <!-- default toolbar -->
@@ -86,6 +102,7 @@
                     android:id="@+id/preview_image"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/nav_drawer_header_height"
+                    android:background="@color/bg_default"
                     android:contentDescription="@string/preview_image_description"
                     android:scaleType="centerCrop" />
 
@@ -99,7 +116,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="@color/appbar"
+                android:background="@color/bg_default"
                 android:theme="@style/Theme.ToolbarTheme"
                 tools:visibility="gone">
 
@@ -112,6 +129,14 @@
                     app:popupTheme="@style/Theme.AppCompat.DayNight.NoActionBar" />
             </com.google.android.material.appbar.MaterialToolbar>
 
+            <View
+                android:id="@+id/default_toolbar_divider"
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:visibility="gone"
+                android:layout_below="@+id/toolbar"
+                android:background="@color/toolbar_divider_color" />
+
         </RelativeLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 1ce3f0da4f73..2f79b79712ed 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -36,4 +36,68 @@
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
     <color name="fontAppbar">@android:color/white</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>
+
+    <!-- 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-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 19b3ce692520..ef13919a9f09 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -22,6 +22,11 @@
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
         <item name="popupMenuStyle">@style/Nextcloud.Widget.PopupMenu</item>
         <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
+        <!-- ActionBar Menu Item Text Color Style -->
+        <item name="android:actionMenuTextColor">@color/primary</item>
+        <!-- styling action bar back button -->
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="actionModeStyle">@style/App.ActionMode</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 22f2cbfe648f..80d94557e005 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -35,7 +35,7 @@
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
-    <style name="Theme.ownCloud.Media" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.ownCloud.Media" parent="Theme.ownCloud.Toolbar">
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 89ed00a08bf2..46992e0a67c6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -75,4 +75,93 @@
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
     <color name="fontSecondaryAppbar">#A5A5A5</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>
+
+    <!--  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/styles.xml b/app/src/main/res/values/styles.xml
index 4c1563085156..93dde85ef1b5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,6 +31,11 @@
         <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
         <item name="android:navigationBarColor">@color/bg_default</item>
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
+        <!-- ActionBar Menu Item Text Color Style -->
+        <item name="android:actionMenuTextColor">@color/primary</item>
+        <!-- styling action bar back button -->
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="dialogCornerRadius">@dimen/dialogBorderRadius</item>
     </style>
 
@@ -49,6 +54,11 @@
         <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
         <item name="android:navigationBarColor">@color/bg_default</item>
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
+        <!-- ActionBar Menu Item Text Color Style -->
+        <item name="android:actionMenuTextColor">@color/primary</item>
+        <!-- styling action bar back button -->
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="dialogCornerRadius">@dimen/dialogBorderRadius</item>
     </style>
 
@@ -448,10 +458,11 @@
     <style name="App.ActionMode" parent="@style/Widget.Material3.ActionMode">
         <item name="background">@color/action_mode_background</item>
         <item name="titleTextStyle">@style/App.ActionModeTitleText</item>
+        <item name="closeItemLayout">@layout/action_mode_close_layout</item>
     </style>
 
     <style name="App.ActionModeTitleText" parent="TextAppearance.Material3.ActionBar.Title">
-        <item name="android:textColor">@color/white</item>
+        <item name="android:textColor">@color/fontAppbar</item>
     </style>
 
     <!-- Splash screen style attributes: https://developer.android.com/develop/ui/views/launch/splash-screen#set-theme -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cefa8e7856d8..ebc41ddb9a42 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -23,6 +23,11 @@
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
         <item name="popupMenuStyle">@style/Nextcloud.Widget.PopupMenu</item>
         <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
+        <!-- ActionBar Menu Item Text Color Style -->
+        <item name="android:actionMenuTextColor">@color/primary</item>
+        <!-- styling action bar back button -->
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="actionModeStyle">@style/App.ActionMode</item>
     </style>