diff --git a/vector/src/main/res/layout/activity.xml b/vector/src/main/res/layout/activity.xml
index f403fcff82..19b058a7aa 100644
--- a/vector/src/main/res/layout/activity.xml
+++ b/vector/src/main/res/layout/activity.xml
@@ -13,7 +13,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="4dp"
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.fragment.app.FragmentContainerView
diff --git a/vector/src/main/res/layout/activity_big_image_viewer.xml b/vector/src/main/res/layout/activity_big_image_viewer.xml
index 124b76f64e..daec097bc1 100644
--- a/vector/src/main/res/layout/activity_big_image_viewer.xml
+++ b/vector/src/main/res/layout/activity_big_image_viewer.xml
@@ -8,7 +8,6 @@
         android:id="@+id/bigImageViewerToolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:elevation="4dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 69d4d11862..241577265e 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -9,8 +9,7 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/bugReportToolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="4dp" />
+        android:layout_height="wrap_content" />
 
     <LinearLayout
         android:id="@+id/bug_report_body_view"
diff --git a/vector/src/main/res/layout/activity_call_transfer.xml b/vector/src/main/res/layout/activity_call_transfer.xml
index 2196fc5faa..77f7bd2fd3 100644
--- a/vector/src/main/res/layout/activity_call_transfer.xml
+++ b/vector/src/main/res/layout/activity_call_transfer.xml
@@ -13,7 +13,6 @@
             android:id="@+id/callTransferToolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="4dp"
             app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.tabs.TabLayout
diff --git a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
index 1273a0f550..f6cc6e4c9a 100644
--- a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
+++ b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
@@ -33,6 +33,7 @@
             android:id="@+id/emojiPickerToolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:elevation="0dp"
             android:minHeight="0dp"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways"
             tools:title="@string/reactions" />
diff --git a/vector/src/main/res/layout/activity_filtered_rooms.xml b/vector/src/main/res/layout/activity_filtered_rooms.xml
index 310ad2bfa4..7c99a2992d 100644
--- a/vector/src/main/res/layout/activity_filtered_rooms.xml
+++ b/vector/src/main/res/layout/activity_filtered_rooms.xml
@@ -13,7 +13,6 @@
             android:id="@+id/filteredRoomsToolbar"
             android:layout_width="0dp"
             android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
             app:contentInsetStart="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/activity_search.xml b/vector/src/main/res/layout/activity_search.xml
index cba8b01f34..5ccfdcc96b 100644
--- a/vector/src/main/res/layout/activity_search.xml
+++ b/vector/src/main/res/layout/activity_search.xml
@@ -13,7 +13,6 @@
             android:id="@+id/searchToolbar"
             android:layout_width="0dp"
             android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
             app:contentInsetStart="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/activity_vector_settings.xml b/vector/src/main/res/layout/activity_vector_settings.xml
index ecd53171af..5edc2ce808 100755
--- a/vector/src/main/res/layout/activity_vector_settings.xml
+++ b/vector/src/main/res/layout/activity_vector_settings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,13 +10,14 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <!-- Use VectorToolbarStyleWithPadding on this screen for better alignment with setting items -->
+        <!-- Use VectorToolbarSettings on this screen for better alignment with setting items -->
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/settingsToolbar"
-            style="@style/VectorToolbarStyleWithPadding"
+            style="@style/VectorToolbarSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="4dp" />
+            tools:navigationIcon="@drawable/ic_back_24dp"
+            tools:title="Title" />
 
         <FrameLayout
             android:id="@+id/vector_settings_page"
diff --git a/vector/src/main/res/layout/activity_vector_web_view.xml b/vector/src/main/res/layout/activity_vector_web_view.xml
index f53f7d41e6..1214505ab2 100644
--- a/vector/src/main/res/layout/activity_vector_web_view.xml
+++ b/vector/src/main/res/layout/activity_vector_web_view.xml
@@ -10,7 +10,6 @@
         android:id="@+id/webview_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:elevation="4dp"
         app:layout_constraintTop_toTopOf="parent"
         tools:title="Title of the web page" />
 
diff --git a/vector/src/main/res/layout/fragment_attachments_preview.xml b/vector/src/main/res/layout/fragment_attachments_preview.xml
index 2eeffb65e1..f6a6e4360f 100644
--- a/vector/src/main/res/layout/fragment_attachments_preview.xml
+++ b/vector/src/main/res/layout/fragment_attachments_preview.xml
@@ -20,6 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="#40000000"
+        android:elevation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index b4248514eb..25ed53382a 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -14,7 +14,6 @@
             android:id="@+id/phoneBookToolbar"
             android:layout_width="0dp"
             android:layout_height="?actionBarSize"
-            android:elevation="4dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
diff --git a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index 574a191e55..e768b2a829 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
@@ -14,7 +14,6 @@
             android:id="@+id/createRoomToolbar"
             android:layout_width="0dp"
             android:layout_height="?actionBarSize"
-            android:elevation="4dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index 6288273d8c..80c6312c78 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -15,7 +15,6 @@
             android:id="@+id/createRoomToolbar"
             android:layout_width="0dp"
             android:layout_height="?actionBarSize"
-            android:elevation="4dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 7ddffb2a77..df21c6af80 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -10,7 +10,6 @@
         android:id="@+id/groupToolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:elevation="4dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
diff --git a/vector/src/main/res/layout/fragment_login_web.xml b/vector/src/main/res/layout/fragment_login_web.xml
index 46a3796e22..116b341006 100644
--- a/vector/src/main/res/layout/fragment_login_web.xml
+++ b/vector/src/main/res/layout/fragment_login_web.xml
@@ -10,7 +10,6 @@
         android:id="@+id/loginWebToolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
         tools:subtitle="https://www.example.org"
         tools:title="@string/auth_login" />
 
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index 2569a8a092..99a6a25e88 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -24,7 +24,6 @@
             android:id="@+id/publicRoomsToolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
             android:minHeight="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index f40c4352d9..a379e7bb9d 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -26,7 +26,6 @@
             android:id="@+id/addRoomToSpaceToolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
             android:minHeight="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index ae7494894c..5c0c220aa6 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -10,7 +10,6 @@
         android:id="@+id/roomToolbar"
         android:layout_width="0dp"
         android:layout_height="?actionBarSize"
-        android:elevation="4dp"
         android:transitionName="toolbar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_directory_picker.xml b/vector/src/main/res/layout/fragment_room_directory_picker.xml
index 28c3c4d184..17ff4c0c34 100644
--- a/vector/src/main/res/layout/fragment_room_directory_picker.xml
+++ b/vector/src/main/res/layout/fragment_room_directory_picker.xml
@@ -38,7 +38,6 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:elevation="4dp"
                 app:layout_collapseMode="pin"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 2fd7644a76..f8e031694e 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -14,8 +14,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/roomPreviewNoPreviewToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?actionBarSize"
-            android:elevation="4dp">
+            android:layout_height="?actionBarSize">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index f00e9c425c..8a37326acd 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -11,7 +11,6 @@
         android:id="@+id/roomSettingsToolbar"
         android:layout_width="0dp"
         android:layout_height="?actionBarSize"
-        android:elevation="4dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index 3c598a2ac2..332b4f7558 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -18,7 +18,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            android:elevation="4dp"
             app:layout_collapseMode="pin">
 
             <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 0380b3e740..b6125010a9 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -25,7 +25,6 @@
             android:id="@+id/addRoomToSpaceToolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
             android:minHeight="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 05a9d447d2..061b6f9b10 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -15,7 +15,6 @@
             android:id="@+id/roomPreviewNoPreviewToolbar"
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
-            android:elevation="4dp"
             app:navigationIcon="@drawable/ic_x_18dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 29ea47e2ae..6acb4d7fee 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -13,7 +13,6 @@
             android:id="@+id/showUserCodeToolBar"
             android:layout_width="0dp"
             android:layout_height="?actionBarSize"
-            android:elevation="4dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index d8bb517685..601ec21198 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -14,7 +14,6 @@
             android:id="@+id/userDirectoryToolbar"
             android:layout_width="0dp"
             android:layout_height="?actionBarSize"
-            android:elevation="4dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 9b4b19ca7f..028ab4fb8d 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -13,7 +13,6 @@
             android:id="@+id/userListToolbar"
             android:layout_width="0dp"
             android:layout_height="?actionBarSize"
-            android:elevation="4dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index 385f367873..951ffedbac 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -42,6 +42,9 @@
     <color name="android_status_bar_background_dark">@color/element_background_dark</color>
     <color name="android_navigation_bar_background_dark">@color/element_system_dark</color>
 
+    <!-- Used for toolbar background -->
+    <attr name="vctr_toolbar_background" format="color" />
+
     <!-- Used for header background -->
     <attr name="vctr_header_background" format="color" />
 
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 56f7f95d87..f5b39c2c74 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -3,14 +3,6 @@
 
     <!-- ************************ Common items ************************ -->
 
-    <!-- toolbar styles-->
-    <style name="VectorToolbarStyleWithPadding" parent="Widget.MaterialComponents.Toolbar">
-        <!-- main text -->
-        <item name="titleTextAppearance">@style/Vector.Toolbar.Title</item>
-        <item name="subtitleTextAppearance">@style/Vector.Toolbar.SubTitle</item>
-        <item name="android:background">?android:colorBackground</item>
-    </style>
-
     <style name="ActionModeTheme" parent="Widget.AppCompat.ActionMode">
         <item name="background">?android:colorBackground</item>
         <item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
@@ -18,20 +10,6 @@
         <item name="actionMenuTextColor">?colorOnPrimary</item>
     </style>
 
-    <style name="VectorToolbarStyle" parent="VectorToolbarStyleWithPadding">
-        <item name="contentInsetStartWithNavigation">0dp</item>
-    </style>
-
-    <style name="Vector.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-        <item name="android:textSize">20sp</item>
-        <item name="android:fontFamily">"sans-serif-medium"</item>
-    </style>
-
-    <style name="Vector.Toolbar.SubTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
-        <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">"sans-serif"</item>
-    </style>
-
     <style name="Vector.Toolbar.Profile" parent="@style/ThemeOverlay.AppCompat.ActionBar">
         <item name="colorControlNormal">?colorSecondary</item>
     </style>
@@ -74,40 +52,6 @@
         <item name="android:dropDownVerticalOffset">0dp</item>
     </style>
 
-    <!-- actionbar icons color -->
-    <style name="Vector.ActionBarTheme" parent="ThemeOverlay.MaterialComponents.ActionBar">
-        <item name="colorControlNormal">?vctr_content_primary</item>
-    </style>
-
-    <!-- custom action bar -->
-    <style name="Vector.Styled.ActionBar" parent="Widget.MaterialComponents.Toolbar">
-        <item name="android:background">?colorPrimary</item>
-        <item name="background">?colorPrimary</item>
-
-        <!-- remove shadow under the action bar -->
-        <item name="elevation">0dp</item>
-
-        <!-- main text -->
-        <item name="titleTextStyle">@style/ActionBarTitleText</item>
-
-        <!-- sub text -->
-        <item name="subtitleTextStyle">@style/ActionBarSubTitleText</item>
-    </style>
-
-    <!-- main text -->
-    <style name="ActionBarTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:fontFamily">"sans-serif-medium"</item>
-        <item name="android:textSize">20sp</item>
-    </style>
-
-    <!-- sub text -->
-    <style name="ActionBarSubTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:fontFamily">"sans-serif-medium"</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
     <!-- Styles for login screen -->
     <style name="LoginEditTextStyle" parent="Widget.AppCompat.EditText">
         <item name="android:textSize">16sp</item>
diff --git a/vector/src/main/res/values/styles_toolbar.xml b/vector/src/main/res/values/styles_toolbar.xml
new file mode 100644
index 0000000000..58ba004038
--- /dev/null
+++ b/vector/src/main/res/values/styles_toolbar.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorToolbarBase" parent="Widget.MaterialComponents.Toolbar">
+        <item name="android:background">?vctr_toolbar_background</item>
+
+        <item name="android:elevation">4dp</item>
+
+        <!-- main text -->
+        <item name="titleTextStyle">@style/ActionBarTitleText</item>
+
+        <!-- sub text -->
+        <item name="subtitleTextStyle">@style/ActionBarSubTitleText</item>
+    </style>
+
+    <!-- Default toolbar style -->
+    <style name="VectorToolbar" parent="VectorToolbarBase">
+        <item name="contentInsetStartWithNavigation">0dp</item>
+    </style>
+
+    <!-- Toolbar for settings Activity (so we keep the default contentInsetStartWithNavigation here) -->
+    <style name="VectorToolbarSettings" parent="VectorToolbarBase" />
+
+    <!-- Toolbar text style -->
+    <!-- main text -->
+    <style name="ActionBarTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">?vctr_content_primary</item>
+        <item name="android:fontFamily">"sans-serif-medium"</item>
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <!-- sub text -->
+    <style name="ActionBarSubTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
+        <item name="android:textColor">?vctr_content_primary</item>
+        <item name="android:fontFamily">"sans-serif-medium"</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <!-- Action mode text style -->
+    <style name="Vector.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">20sp</item>
+        <item name="android:fontFamily">"sans-serif-medium"</item>
+    </style>
+
+    <style name="Vector.Toolbar.SubTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">"sans-serif"</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index cb7381843f..e0df15b65b 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -20,6 +20,7 @@
         <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_black</item>
         <item name="vctr_reaction_background_on">@color/vctr_reaction_background_on_black</item>
         <item name="vctr_markdown_block_background_color">#FF4D4D4D</item>
+        <item name="vctr_toolbar_background">@color/element_background_black</item>
 
         <!-- Material color -->
         <item name="colorSurface">@android:color/black</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 040e73501a..3904ac5b45 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -32,6 +32,7 @@
         <item name="vctr_bottom_nav_icon_color">@color/vctr_bottom_nav_icon_color_dark</item>
         <item name="vctr_waiting_background_color">@color/vctr_waiting_background_color_dark</item>
         <item name="vctr_chat_effect_snow_background">@color/vctr_chat_effect_snow_background_dark</item>
+        <item name="vctr_toolbar_background">@color/element_system_dark</item>
 
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
@@ -65,7 +66,7 @@
 
         <!-- Default styles -->
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
-        <item name="toolbarStyle">@style/VectorToolbarStyle</item>
+        <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
 
         <!-- Default style for text input -->
@@ -89,13 +90,6 @@
         <!-- fonts -->
         <item name="android:typeface">sans</item>
 
-        <!-- custom action bar -->
-        <item name="android:actionBarStyle">@style/Vector.Styled.ActionBar</item>
-        <item name="actionBarStyle">@style/Vector.Styled.ActionBar</item>
-
-        <!-- actionbar icons color -->
-        <item name="actionBarTheme">@style/Vector.ActionBarTheme</item>
-
         <!-- remove the shadow under the actionbar -->
         <item name="android:windowContentOverlay">@null</item>
 
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 9469b0f5e6..61e7242c94 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -32,6 +32,7 @@
         <item name="vctr_bottom_nav_icon_color">@color/vctr_bottom_nav_icon_color_light</item>
         <item name="vctr_waiting_background_color">@color/vctr_waiting_background_color_light</item>
         <item name="vctr_chat_effect_snow_background">@color/vctr_chat_effect_snow_background_light</item>
+        <item name="vctr_toolbar_background">@color/element_background_light</item>
 
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
@@ -65,7 +66,7 @@
 
         <!-- Default styles -->
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
-        <item name="toolbarStyle">@style/VectorToolbarStyle</item>
+        <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>
 
         <!-- Default style for text input -->
@@ -89,13 +90,6 @@
         <!-- fonts -->
         <item name="android:typeface">sans</item>
 
-        <!-- custom action bar -->
-        <item name="android:actionBarStyle">@style/Vector.Styled.ActionBar</item>
-        <item name="actionBarStyle">@style/Vector.Styled.ActionBar</item>
-
-        <!-- actionbar icons color -->
-        <item name="actionBarTheme">@style/Vector.ActionBarTheme</item>
-
         <!-- remove the shadow under the actionbar -->
         <item name="android:windowContentOverlay">@null</item>