diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt
index 92eec6cdfd..4ebc4008c1 100644
--- a/tools/check/forbidden_strings_in_resources.txt
+++ b/tools/check/forbidden_strings_in_resources.txt
@@ -98,6 +98,10 @@ layout_constraintLeft_
 ### Use com.google.android.material.switchmaterial.SwitchMaterial instead of Switch, the inflater will not automatically inflate Material Views for Switch.
 <Switch
 
+### Use com.google.android.material.appbar.MaterialToolbar instead of Toolbar, the inflater will not automatically inflate Material Views for Toolbar.
+<Toolbar
+<androidx\.appcompat\.widget\.Toolbar
+
 ### Use colorSecondary
 colorAccent
 
diff --git a/tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl b/tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl
index ea301b241b..a4622d1d21 100644
--- a/tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl
+++ b/tools/templates/ElementFeature/root/src/app_package/Activity.kt.ftl
@@ -2,7 +2,7 @@ package ${escapeKotlinIdentifiers(packageName)}
 
 import android.content.Context
 import android.content.Intent
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.ToolbarConfigurable
@@ -42,7 +42,7 @@ class ${activityClass} : VectorBaseActivity(), ToolbarConfigurable {
         }
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 
diff --git a/vector/lint.xml b/vector/lint.xml
index e7e5fe78fe..a8eed30160 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -58,6 +58,9 @@
     <!-- Manifest -->
     <issue id="PermissionImpliesUnsupportedChromeOsHardware" severity="error" />
 
+    <!-- Performance -->
+    <issue id="UselessParent" severity="error" />
+
     <!-- Dependencies -->
     <issue id="KtxExtensionAvailable" severity="error" />
 
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
index de6b981c02..69dc683bf3 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
@@ -33,6 +33,12 @@ abstract class DebugMaterialThemeActivity : AppCompatActivity() {
         val views = ActivityTestMaterialThemeBinding.inflate(layoutInflater)
         setContentView(views.root)
 
+        setSupportActionBar(views.debugToolbar)
+        supportActionBar?.let {
+            it.setDisplayShowHomeEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+        }
+
         views.debugShowSnackbar.setOnClickListener {
             Snackbar.make(views.coordinatorLayout, "Snackbar!", Snackbar.LENGTH_SHORT)
                     .setAction("Action") { }
@@ -60,7 +66,7 @@ abstract class DebugMaterialThemeActivity : AppCompatActivity() {
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.home, menu)
+        menuInflater.inflate(R.menu.menu_debug, menu)
         return true
     }
 }
diff --git a/vector/src/debug/res/layout/activity_test_material_theme.xml b/vector/src/debug/res/layout/activity_test_material_theme.xml
index 2ec23a4b31..486c23478f 100644
--- a/vector/src/debug/res/layout/activity_test_material_theme.xml
+++ b/vector/src/debug/res/layout/activity_test_material_theme.xml
@@ -8,437 +8,456 @@
     tools:context=".features.debug.DebugMaterialThemeActivity"
     tools:ignore="HardcodedText">
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:divider="@drawable/linear_divider"
-            android:orientation="vertical"
-            android:padding="16dp"
-            android:showDividers="middle">
+            app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/debug_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_constraintTop_toTopOf="parent"
                 app:subtitle="Toolbar Subtitle"
                 app:title="Toolbar Title" />
 
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:baselineAligned="false"
                 android:divider="@drawable/linear_divider"
+                android:orientation="vertical"
+                android:padding="16dp"
                 android:showDividers="middle">
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="#FFFFFF"
+                    android:baselineAligned="false"
                     android:divider="@drawable/linear_divider"
-                    android:orientation="vertical"
-                    android:padding="8dp"
                     android:showDividers="middle">
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorPrimary"
-                        android:text="colorPrimary" />
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="#FFFFFF"
+                        android:divider="@drawable/linear_divider"
+                        android:orientation="vertical"
+                        android:padding="8dp"
+                        android:showDividers="middle">
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorPrimaryVariant"
-                        android:text="colorPrimaryVariant" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorPrimary"
+                            android:text="colorPrimary" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorOnPrimary"
-                        android:text="colorOnPrimary" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorPrimaryVariant"
+                            android:text="colorPrimaryVariant" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorSecondary"
-                        android:text="colorSecondary" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorOnPrimary"
+                            android:text="colorOnPrimary" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorSecondaryVariant"
-                        android:text="colorSecondaryVariant" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorSecondary"
+                            android:text="colorSecondary" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorOnSecondary"
-                        android:text="colorOnSecondary" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorSecondaryVariant"
+                            android:text="colorSecondaryVariant" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorError"
-                        android:text="colorError" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorOnSecondary"
+                            android:text="colorOnSecondary" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorOnError"
-                        android:text="colorOnError" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorError"
+                            android:text="colorError" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorSurface"
-                        android:text="colorSurface" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorOnError"
+                            android:text="colorOnError" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorOnSurface"
-                        android:text="colorOnSurface" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorSurface"
+                            android:text="colorSurface" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?android:colorBackground"
-                        android:text="android:colorBackground" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorOnSurface"
+                            android:text="colorOnSurface" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorOnBackground"
-                        android:text="colorOnBackground" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?android:colorBackground"
+                            android:text="android:colorBackground" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?colorAccent"
-                        android:text="colorAccent" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorOnBackground"
+                            android:text="colorOnBackground" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?android:statusBarColor"
-                        android:text="android:statusBarColor" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?colorAccent"
+                            android:text="colorAccent" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?android:navigationBarColor"
-                        android:text="android:navigationBarColor" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?android:statusBarColor"
+                            android:text="android:statusBarColor" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?android:textColorPrimary"
-                        android:text="android:textColorPrimary" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?android:navigationBarColor"
+                            android:text="android:navigationBarColor" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?android:textColorSecondary"
-                        android:text="android:textColorSecondary" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?android:textColorPrimary"
+                            android:text="android:textColorPrimary" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?android:textColorTertiary"
-                        android:text="android:textColorTertiary" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?android:textColorSecondary"
+                            android:text="android:textColorSecondary" />
 
-                    <TextView
-                        style="@style/DebugTextColorDemo.White"
-                        android:background="?android:textColorLink"
-                        android:text="android:textColorLink" />
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?android:textColorTertiary"
+                            android:text="android:textColorTertiary" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.White"
+                            android:background="?android:textColorLink"
+                            android:text="android:textColorLink" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="#000000"
+                        android:divider="@drawable/linear_divider"
+                        android:dividerPadding="8dp"
+                        android:orientation="vertical"
+                        android:padding="8dp"
+                        android:showDividers="middle">
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorPrimary"
+                            android:text="colorPrimary" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorPrimaryVariant"
+                            android:text="colorPrimaryVariant" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorOnPrimary"
+                            android:text="colorOnPrimary" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorSecondary"
+                            android:text="colorSecondary" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorSecondaryVariant"
+                            android:text="colorSecondaryVariant" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorOnSecondary"
+                            android:text="colorOnSecondary" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorError"
+                            android:text="colorError" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorOnError"
+                            android:text="colorOnError" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorSurface"
+                            android:text="colorSurface" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorOnSurface"
+                            android:text="colorOnSurface" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?android:colorBackground"
+                            android:text="android:colorBackground" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorOnBackground"
+                            android:text="colorOnBackground" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?colorAccent"
+                            android:text="colorAccent" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?android:statusBarColor"
+                            android:text="android:statusBarColor" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?android:navigationBarColor"
+                            android:text="android:navigationBarColor" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?android:textColorPrimary"
+                            android:text="android:textColorPrimary" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?android:textColorSecondary"
+                            android:text="android:textColorSecondary" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?android:textColorTertiary"
+                            android:text="android:textColorTertiary" />
+
+                        <TextView
+                            style="@style/DebugTextColorDemo.Black"
+                            android:background="?android:textColorLink"
+                            android:text="android:textColorLink" />
+                    </LinearLayout>
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="#000000"
-                    android:divider="@drawable/linear_divider"
-                    android:dividerPadding="8dp"
-                    android:orientation="vertical"
-                    android:padding="8dp"
-                    android:showDividers="middle">
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorPrimary"
-                        android:text="colorPrimary" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorPrimaryVariant"
-                        android:text="colorPrimaryVariant" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorOnPrimary"
-                        android:text="colorOnPrimary" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorSecondary"
-                        android:text="colorSecondary" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorSecondaryVariant"
-                        android:text="colorSecondaryVariant" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorOnSecondary"
-                        android:text="colorOnSecondary" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorError"
-                        android:text="colorError" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorOnError"
-                        android:text="colorOnError" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorSurface"
-                        android:text="colorSurface" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorOnSurface"
-                        android:text="colorOnSurface" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?android:colorBackground"
-                        android:text="android:colorBackground" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorOnBackground"
-                        android:text="colorOnBackground" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?colorAccent"
-                        android:text="colorAccent" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?android:statusBarColor"
-                        android:text="android:statusBarColor" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?android:navigationBarColor"
-                        android:text="android:navigationBarColor" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?android:textColorPrimary"
-                        android:text="android:textColorPrimary" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?android:textColorSecondary"
-                        android:text="android:textColorSecondary" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?android:textColorTertiary"
-                        android:text="android:textColorTertiary" />
-
-                    <TextView
-                        style="@style/DebugTextColorDemo.Black"
-                        android:background="?android:textColorLink"
-                        android:text="android:textColorLink" />
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="OutlinedBox">
-
-                <com.google.android.material.textfield.TextInputEditText
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:maxLines="1" />
+                    android:hint="OutlinedBox">
 
-            </com.google.android.material.textfield.TextInputLayout>
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1" />
 
-            <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="OutlinedBox.Dense">
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <com.google.android.material.textfield.TextInputEditText
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:maxLines="1" />
+                    android:hint="OutlinedBox.Dense">
 
-            </com.google.android.material.textfield.TextInputLayout>
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1" />
+
+                </com.google.android.material.textfield.TextInputLayout>
 
 
-            <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="FilledBox">
-
-                <com.google.android.material.textfield.TextInputEditText
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:maxLines="1" />
+                    android:hint="FilledBox">
 
-            </com.google.android.material.textfield.TextInputLayout>
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1" />
 
-            <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="FilledBox.Dense">
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <com.google.android.material.textfield.TextInputEditText
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:maxLines="1" />
+                    android:hint="FilledBox.Dense">
 
-            </com.google.android.material.textfield.TextInputLayout>
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Buttons" />
-
-            <Button
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Classic"
-                app:icon="@drawable/ic_settings_x" />
-
-            <Button
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:enabled="false"
-                android:text="Classic Disabled"
-                app:icon="@drawable/ic_settings_x" />
-
-            <Button
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="OutlinedButton"
-                app:icon="@drawable/ic_settings_x" />
-
-            <Button
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:enabled="false"
-                android:text="OutlinedButton Disabled"
-                app:icon="@drawable/ic_settings_x" />
-
-            <Button
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="TextButton"
-                app:icon="@drawable/ic_settings_x" />
-
-            <Button
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:enabled="false"
-                android:text="TextButton Disabled"
-                app:icon="@drawable/ic_settings_x" />
-
-            <Button
-                style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="UnelevatedButton"
-                app:icon="@drawable/ic_settings_x" />
-
-            <Button
-                style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:enabled="false"
-                android:text="UnelevatedButton Disabled"
-                app:icon="@drawable/ic_settings_x" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Actions" />
-
-            <Button
-                android:id="@+id/debugShowSnackbar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="Show Snackbar" />
-
-            <Button
-                android:id="@+id/debugShowToast"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="Show Toast" />
-
-            <Button
-                android:id="@+id/debugShowDialog"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="Show Dialog" />
-
-            <Button
-                android:id="@+id/debugShowBottomSheet"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="Show Bottom Sheet" />
-
-            <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Material CheckBox" />
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Material Switch" />
-
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal">
+                </com.google.android.material.textfield.TextInputLayout>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="48dp"
-                    android:text="TextView in MaterialCardView" />
+                    android:text="Buttons" />
 
-            </com.google.android.material.card.MaterialCardView>
+                <Button
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Classic"
+                    app:icon="@drawable/ic_settings_x" />
 
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_margin="16dp"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_settings_x" />
+                <Button
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    android:text="Classic Disabled"
+                    app:icon="@drawable/ic_settings_x" />
 
-            <com.google.android.material.bottomnavigation.BottomNavigationView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:menu="@menu/home_bottom_navigation" />
+                <Button
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="OutlinedButton"
+                    app:icon="@drawable/ic_settings_x" />
 
-        </LinearLayout>
+                <Button
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    android:text="OutlinedButton Disabled"
+                    app:icon="@drawable/ic_settings_x" />
 
-    </androidx.core.widget.NestedScrollView>
+                <Button
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="TextButton"
+                    app:icon="@drawable/ic_settings_x" />
+
+                <Button
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    android:text="TextButton Disabled"
+                    app:icon="@drawable/ic_settings_x" />
+
+                <Button
+                    style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="UnelevatedButton"
+                    app:icon="@drawable/ic_settings_x" />
+
+                <Button
+                    style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:enabled="false"
+                    android:text="UnelevatedButton Disabled"
+                    app:icon="@drawable/ic_settings_x" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Actions" />
+
+                <Button
+                    android:id="@+id/debugShowSnackbar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="Show Snackbar" />
+
+                <Button
+                    android:id="@+id/debugShowToast"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="Show Toast" />
+
+                <Button
+                    android:id="@+id/debugShowDialog"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="Show Dialog" />
+
+                <Button
+                    android:id="@+id/debugShowBottomSheet"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="Show Bottom Sheet" />
+
+                <CheckBox
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Material CheckBox" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Material Switch" />
+
+                <com.google.android.material.card.MaterialCardView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="48dp"
+                        android:text="TextView in MaterialCardView" />
+
+                </com.google.android.material.card.MaterialCardView>
+
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_margin="16dp"
+                    android:importantForAccessibility="no"
+                    android:src="@drawable/ic_settings_x" />
+
+                <com.google.android.material.bottomnavigation.BottomNavigationView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:menu="@menu/home_bottom_navigation" />
+
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/debug/res/menu/menu_debug.xml b/vector/src/debug/res/menu/menu_debug.xml
new file mode 100644
index 0000000000..c4fdaa435d
--- /dev/null
+++ b/vector/src/debug/res/menu/menu_debug.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menuDebug1"
+        android:icon="@drawable/ic_edit"
+        android:title="@string/edit"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menuDebug2"
+        android:icon="@drawable/ic_send"
+        android:title="@string/send"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file
diff --git a/vector/src/debug/res/values/styles.xml b/vector/src/debug/res/values/debug_styles.xml
similarity index 100%
rename from vector/src/debug/res/values/styles.xml
rename to vector/src/debug/res/values/debug_styles.xml
diff --git a/vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt b/vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt
index c42a47c40c..9aca8dd17f 100644
--- a/vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt
@@ -16,9 +16,9 @@
 
 package im.vector.app.core.platform
 
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 
 interface ToolbarConfigurable {
 
-    fun configure(toolbar: Toolbar)
+    fun configure(toolbar: MaterialToolbar)
 }
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index ddfb578e95..899a99c314 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -32,7 +32,7 @@ import androidx.annotation.MainThread
 import androidx.annotation.MenuRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
@@ -519,7 +519,7 @@ abstract class VectorBaseActivity<VB: ViewBinding> : AppCompatActivity(), HasScr
     /**
      * Configure the Toolbar, with default back button.
      */
-    protected fun configureToolbar(toolbar: Toolbar, displayBack: Boolean = true) {
+    protected fun configureToolbar(toolbar: MaterialToolbar, displayBack: Boolean = true) {
         setSupportActionBar(toolbar)
         supportActionBar?.let {
             it.setDisplayShowHomeEnabled(displayBack)
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index b5b6937aad..c513007c3d 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -29,7 +29,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.CallSuper
 import androidx.annotation.MainThread
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import androidx.lifecycle.ViewModelProvider
 import androidx.viewbinding.ViewBinding
 import com.airbnb.mvrx.BaseMvRxFragment
@@ -224,7 +224,7 @@ abstract class VectorBaseFragment<VB: ViewBinding> : BaseMvRxFragment(), HasScre
     /**
      * Configure the Toolbar.
      */
-    protected fun setupToolbar(toolbar: Toolbar) {
+    protected fun setupToolbar(toolbar: MaterialToolbar) {
         val parentActivity = vectorBaseActivity
         if (parentActivity is ToolbarConfigurable) {
             parentActivity.configure(toolbar)
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
index f282cc3358..6c25f688bd 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.attachments.preview
 
 import android.content.Context
 import android.content.Intent
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.ToolbarConfigurable
@@ -72,7 +72,7 @@ class AttachmentsPreviewActivity : VectorBaseActivity<ActivitySimpleBinding>(),
         finish()
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 64c87d00e9..4a563b563a 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -24,7 +24,7 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.view.Menu
 import android.view.MenuItem
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import androidx.core.view.GravityCompat
 import androidx.core.view.isVisible
 import androidx.drawerlayout.widget.DrawerLayout
@@ -437,7 +437,7 @@ class HomeActivity :
         serverBackupStatusViewModel.refreshRemoteStateIfNeeded()
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar, false)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
index 640e9a62ff..ce3346f8a6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
@@ -20,7 +20,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import com.airbnb.mvrx.viewModel
@@ -132,7 +132,7 @@ class RoomDetailActivity :
         super.onDestroy()
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 9ed4feebc4..0d4fcc31b5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1189,7 +1189,7 @@ class RoomDetailFragment @Inject constructor(
                 return sendUri(contentUri)
             }
 
-            override fun onTextEmptyStateChanged(isEmpty: Boolean) {
+            override fun onTextBlankStateChanged(isBlank: Boolean) {
                 // No op
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
index 2a2ae56c4c..79ff7be441 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
@@ -37,11 +37,11 @@ class ComposerEditText @JvmOverloads constructor(context: Context, attrs: Attrib
 
     interface Callback {
         fun onRichContentSelected(contentUri: Uri): Boolean
-        fun onTextEmptyStateChanged(isEmpty: Boolean)
+        fun onTextBlankStateChanged(isBlank: Boolean)
     }
 
     var callback: Callback? = null
-    private var isEmptyText = true
+    private var isBlankText = true
 
     override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection? {
         val ic = super.onCreateInputConnection(editorInfo) ?: return null
@@ -96,9 +96,9 @@ class ComposerEditText @JvmOverloads constructor(context: Context, attrs: Attrib
                             spanToRemove = null
                         }
                         // Report blank status of EditText to be able to arrange other elements of the composer
-                        if (s.isEmpty() != isEmptyText) {
-                            isEmptyText = !isEmptyText
-                            callback?.onTextEmptyStateChanged(isEmptyText)
+                        if (s.isBlank() != isBlankText) {
+                            isBlankText = !isBlankText
+                            callback?.onTextBlankStateChanged(isBlankText)
                         }
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
index d5e24dbb6b..fa5e736c1c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
@@ -25,6 +25,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.text.toSpannable
 import androidx.core.view.isVisible
+import androidx.transition.AutoTransition
 import androidx.transition.ChangeBounds
 import androidx.transition.Fade
 import androidx.transition.Transition
@@ -35,7 +36,6 @@ import im.vector.app.databinding.ComposerLayoutBinding
 
 /**
  * Encapsulate the timeline composer UX.
- *
  */
 class TextComposerView @JvmOverloads constructor(
         context: Context,
@@ -70,8 +70,16 @@ class TextComposerView @JvmOverloads constructor(
                 return callback?.onRichContentSelected(contentUri) ?: false
             }
 
-            override fun onTextEmptyStateChanged(isEmpty: Boolean) {
-                views.sendButton.isVisible = currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded || !isEmpty
+            override fun onTextBlankStateChanged(isBlank: Boolean) {
+                callback?.onTextBlankStateChanged(isBlank)
+                val shouldBeVisible = currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded || !isBlank
+                if (views.sendButton.isVisible != shouldBeVisible) {
+                    TransitionManager.beginDelayedTransition(
+                            this@TextComposerView,
+                            AutoTransition().also { it.duration = 150 }
+                    )
+                    views.sendButton.isVisible = shouldBeVisible
+                }
             }
         }
         views.composerRelatedMessageCloseButton.setOnClickListener {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
index ae099dba3f..07dfc62602 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
@@ -21,7 +21,7 @@ import android.content.Intent
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.CallSuper
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import androidx.core.view.ViewCompat
 import androidx.core.view.children
 import androidx.core.view.isVisible
@@ -356,7 +356,7 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), ToolbarCo
         }
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
index 9adf4bd6c2..60eb1934d0 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
@@ -21,7 +21,7 @@ import android.content.Intent
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.CallSuper
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import androidx.core.view.ViewCompat
 import androidx.core.view.children
 import androidx.core.view.isVisible
@@ -388,7 +388,7 @@ open class LoginActivity2 : VectorBaseActivity<ActivityLoginBinding>(), ToolbarC
         }
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
index 66ebfa929d..6866afa0a6 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
@@ -18,7 +18,7 @@ package im.vector.app.features.pin
 
 import android.content.Context
 import android.content.Intent
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import com.airbnb.mvrx.MvRx
 import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
@@ -47,7 +47,7 @@ class PinActivity : VectorBaseActivity<ActivitySimpleBinding>(), ToolbarConfigur
         }
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
index b2f1c3c15a..ecfaf93747 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
@@ -24,7 +24,6 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.widget.SearchView
-import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.viewModel
 import com.google.android.material.tabs.TabLayout
@@ -150,13 +149,13 @@ class EmojiReactionPickerActivity : VectorBaseActivity<ActivityEmojiReactionPick
                     searchView.isIconified = false
                     searchView.requestFocusFromTouch()
                     // we want to force the tool bar as visible even if hidden with scroll flags
-                    findViewById<Toolbar>(R.id.toolbar)?.minimumHeight = getActionBarSize()
+                    views.emojiPickerToolbar.minimumHeight = getActionBarSize()
                     return true
                 }
 
                 override fun onMenuItemActionCollapse(p0: MenuItem?): Boolean {
                     // when back, clear all search
-                    findViewById<Toolbar>(R.id.toolbar)?.minimumHeight = 0
+                    views.emojiPickerToolbar.minimumHeight = 0
                     searchView.setQuery("", true)
                     return true
                 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
index 5c4ee2b761..07dfadb753 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.roomdirectory.createroom
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.addFragment
@@ -40,7 +40,7 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>(), ToolbarC
 
     override fun getCoordinatorLayout() = views.coordinatorLayout
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
index f9cf8e6dd7..d56870d623 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.roomdirectory.roompreview
 import android.content.Context
 import android.content.Intent
 import android.os.Parcelable
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.ToolbarConfigurable
@@ -77,7 +77,7 @@ class RoomPreviewActivity : VectorBaseActivity<ActivitySimpleBinding>(), Toolbar
 
     override fun getCoordinatorLayout() = views.coordinatorLayout
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
index ef0c7dc962..37ad2741ca 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
@@ -20,7 +20,7 @@ package im.vector.app.features.roommemberprofile
 import android.content.Context
 import android.content.Intent
 import android.widget.Toast
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
 import im.vector.app.R
@@ -77,7 +77,7 @@ class RoomMemberProfileActivity :
         }
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
index 8a075e650e..07ba442621 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
@@ -20,7 +20,7 @@ package im.vector.app.features.roomprofile
 import android.content.Context
 import android.content.Intent
 import android.widget.Toast
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
 import im.vector.app.R
@@ -162,7 +162,7 @@ class RoomProfileActivity :
         addFragmentToBackstack(R.id.simpleFragmentContainer, RoomBannedMemberListFragment::class.java, roomProfileArgs)
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
index d0b3500258..b9d3b1ba14 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.share
 
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.ToolbarConfigurable
@@ -35,7 +35,7 @@ class IncomingShareActivity : VectorBaseActivity<ActivitySimpleBinding>(), Toolb
         }
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar, displayBack = false)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
index a4585df474..334c7bd64d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
@@ -20,7 +20,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.MvRx
@@ -169,7 +169,7 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
 
     override fun create(initialState: SpaceManageViewState) = sharedViewModelFactory.create(initialState)
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
index df995930c6..9072957a95 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.widgets
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import androidx.appcompat.widget.Toolbar
+import com.google.android.material.appbar.MaterialToolbar
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
@@ -150,7 +150,7 @@ class WidgetActivity : VectorBaseActivity<ActivityWidgetBinding>(),
         finish()
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 }
diff --git a/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml b/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
index a6cf578295..403ed865e7 100644
--- a/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
+++ b/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?colorPrimary" android:state_checked="true" />
-    <item android:color="?vctr_content_secondary" />
+    <item android:color="?vctr_content_tertiary" />
 </selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_bottom_navigation.xml b/vector/src/main/res/drawable/bg_bottom_navigation.xml
new file mode 100644
index 0000000000..3011da0026
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_bottom_navigation.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="?vctr_toolbar_background"/>
+
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity.xml b/vector/src/main/res/layout/activity.xml
index f403fcff82..c8dd97cd89 100644
--- a/vector/src/main/res/layout/activity.xml
+++ b/vector/src/main/res/layout/activity.xml
@@ -9,12 +9,18 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="4dp"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/container"
@@ -23,7 +29,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar" />
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
         <include
             android:id="@+id/waiting_view"
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..3865e26261 100644
--- a/vector/src/main/res/layout/activity_big_image_viewer.xml
+++ b/vector/src/main/res/layout/activity_big_image_viewer.xml
@@ -4,14 +4,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/bigImageViewerToolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
         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" />
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/bigImageViewerToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <com.github.piasy.biv.view.BigImageView
         android:id="@+id/bigImageViewerImageView"
@@ -21,7 +25,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bigImageViewerToolbar"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
         app:optimizeDisplay="true" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 69d4d11862..9c52cd6851 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -6,11 +6,16 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/bugReportToolbar"
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="4dp" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/bugReportToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <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..bb540d780a 100644
--- a/vector/src/main/res/layout/activity_call_transfer.xml
+++ b/vector/src/main/res/layout/activity_call_transfer.xml
@@ -9,21 +9,26 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/callTransferToolbar"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="4dp"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/callTransferTabLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/callTransferToolbar"
-            app:tabGravity="fill"
-            app:tabMaxWidth="0dp"
-            app:tabMode="fixed" />
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/callTransferToolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/callTransferTabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:tabGravity="fill"
+                app:tabMaxWidth="0dp"
+                app:tabMode="fixed" />
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/callTransferViewPager"
@@ -33,7 +38,7 @@
             app:layout_constraintBottom_toTopOf="@+id/callTransferActionsLayout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/callTransferTabLayout" />
+            app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
         <RelativeLayout
             android:id="@+id/callTransferActionsLayout"
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..3e8f604d74 100644
--- a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
+++ b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
@@ -26,10 +26,9 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="4dp">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/emojiPickerToolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -44,5 +43,4 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_filtered_rooms.xml b/vector/src/main/res/layout/activity_filtered_rooms.xml
index 310ad2bfa4..270de8f514 100644
--- a/vector/src/main/res/layout/activity_filtered_rooms.xml
+++ b/vector/src/main/res/layout/activity_filtered_rooms.xml
@@ -9,25 +9,28 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            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"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.SearchView
-                android:id="@+id/filteredRoomsSearchView"
-                style="@style/VectorSearchView"
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/filteredRoomsToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:queryHint="@string/room_filtering_filter_hint"
-                app:searchIcon="@drawable/ic_filter" />
+                android:layout_height="?attr/actionBarSize"
+                app:contentInsetStart="0dp">
 
-        </androidx.appcompat.widget.Toolbar>
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/filteredRoomsSearchView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:queryHint="@string/room_filtering_filter_hint"
+                    app:searchIcon="@drawable/ic_filter" />
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/filteredRoomsFragmentContainer"
@@ -36,7 +39,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/filteredRoomsToolbar" />
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/activity_incoming_share.xml b/vector/src/main/res/layout/activity_incoming_share.xml
index b85a5d6759..f0e0c0a485 100644
--- a/vector/src/main/res/layout/activity_incoming_share.xml
+++ b/vector/src/main/res/layout/activity_incoming_share.xml
@@ -9,24 +9,28 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/incomingShareToolbar"
-            android:layout_width="0dp"
-            android:layout_height="?attr/actionBarSize"
-            app:contentInsetStart="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.SearchView
-                android:id="@+id/incomingShareSearchView"
-                style="@style/VectorSearchView"
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/incomingShareToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:queryHint="@string/room_filtering_filter_hint"
-                app:searchIcon="@drawable/ic_filter" />
+                android:layout_height="?attr/actionBarSize"
+                app:contentInsetStart="0dp">
 
-        </androidx.appcompat.widget.Toolbar>
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/incomingShareSearchView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:queryHint="@string/room_filtering_filter_hint"
+                    app:searchIcon="@drawable/ic_filter" />
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/shareRoomListFragmentContainer"
@@ -35,7 +39,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/incomingShareToolbar" />
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/activity_search.xml b/vector/src/main/res/layout/activity_search.xml
index cba8b01f34..7c71217f64 100644
--- a/vector/src/main/res/layout/activity_search.xml
+++ b/vector/src/main/res/layout/activity_search.xml
@@ -9,25 +9,28 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            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"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.SearchView
-                android:id="@+id/searchView"
-                style="@style/VectorSearchView"
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/searchToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:backgroundTint="@color/base_color"
-                app:queryHint="@string/search_hint" />
+                android:layout_height="?attr/actionBarSize"
+                app:contentInsetStart="0dp">
 
-        </androidx.appcompat.widget.Toolbar>
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/searchView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:backgroundTint="@color/base_color"
+                    app:queryHint="@string/search_hint" />
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/searchFragmentContainer"
@@ -36,7 +39,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/searchToolbar" />
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/activity_vector_settings.xml b/vector/src/main/res/layout/activity_vector_settings.xml
index ecd53171af..f664d4c60d 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,21 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <!-- Use VectorToolbarStyleWithPadding on this screen for better alignment with setting items -->
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/settingsToolbar"
-            style="@style/VectorToolbarStyleWithPadding"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:elevation="4dp" />
+            android:layout_height="wrap_content">
+
+            <!-- Use VectorToolbarSettings on this screen for better alignment with setting items -->
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/settingsToolbar"
+                style="@style/VectorToolbarSettings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:navigationIcon="@drawable/ic_back_24dp"
+                tools:title="Title" />
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <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..d691f4de5d 100644
--- a/vector/src/main/res/layout/activity_vector_web_view.xml
+++ b/vector/src/main/res/layout/activity_vector_web_view.xml
@@ -6,30 +6,36 @@
     android:layout_height="match_parent"
     tools:context=".features.webview.VectorWebViewActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/webview_toolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
         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" />
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/webview_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            tools:title="Title of the web page" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <WebView
         android:id="@+id/simple_webview"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/webview_toolbar" />
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
     <ProgressBar
         android:id="@+id/simple_webview_loader"
-        style="@style/Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/activity_widget.xml b/vector/src/main/res/layout/activity_widget.xml
index 06a411331e..b278bb5a1a 100755
--- a/vector/src/main/res/layout/activity_widget.xml
+++ b/vector/src/main/res/layout/activity_widget.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/fragmentContainer"
diff --git a/vector/src/main/res/layout/alerter_verification_layout.xml b/vector/src/main/res/layout/alerter_verification_layout.xml
index 3db8a3343c..3fb677540e 100644
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@@ -9,20 +9,22 @@
     tools:foreground="?android:attr/selectableItemBackground"
     tools:style="@style/AlertStyle">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <ImageView
         android:id="@+id/ivUserAvatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:contentDescription="@string/avatar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/alerter_texts"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/user_round_avatars" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <ImageView
         android:id="@+id/ivIcon"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:importantForAccessibility="no"
         android:src="@drawable/ic_shield_warning"
         app:layout_constraintCircle="@+id/ivUserAvatar"
         app:layout_constraintCircleAngle="135"
@@ -40,7 +42,7 @@
         app:layout_constraintStart_toEndOf="@id/ivUserAvatar"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -53,7 +55,7 @@
             tools:text="Title"
             tools:visibility="visible" />
 
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
             android:id="@+id/tvText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -71,21 +73,4 @@
 
     </LinearLayout>
 
-    <!--    <FrameLayout-->
-    <!--        android:id="@+id/flRightIconContainer"-->
-    <!--        android:layout_width="wrap_content"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:layout_gravity="center_vertical">-->
-
-    <!--        <androidx.appcompat.widget.AppCompatImageView-->
-    <!--            android:id="@+id/ivRightIcon"-->
-    <!--            android:layout_width="@dimen/alerter_alert_icn_size"-->
-    <!--            android:layout_height="@dimen/alerter_alert_icn_size"-->
-    <!--            android:maxWidth="@dimen/alerter_alert_icn_size"-->
-    <!--            android:maxHeight="@dimen/alerter_alert_icn_size"-->
-    <!--            android:visibility="gone"-->
-    <!--            app:srcCompat="@drawable/alerter_ic_notifications"-->
-    <!--            app:tint="@color/alert_default_icon_color"-->
-    <!--            tools:visibility="visible" />-->
-    <!--    </FrameLayout>-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_attachments_preview.xml b/vector/src/main/res/layout/fragment_attachments_preview.xml
index 2eeffb65e1..259ef38924 100644
--- a/vector/src/main/res/layout/fragment_attachments_preview.xml
+++ b/vector/src/main/res/layout/fragment_attachments_preview.xml
@@ -15,16 +15,24 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:listitem="@layout/item_attachment_big_preview" />
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/attachmentPreviewerToolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="#40000000"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:titleTextColor="@android:color/white"
-        tools:title="Title" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/attachmentPreviewerToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@android:color/transparent"
+            app:titleTextColor="@android:color/white"
+            tools:title="Title" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/attachmentPreviewerBottomContainer"
diff --git a/vector/src/main/res/layout/fragment_contacts_book.xml b/vector/src/main/res/layout/fragment_contacts_book.xml
index b4248514eb..8e98a0b1af 100644
--- a/vector/src/main/res/layout/fragment_contacts_book.xml
+++ b/vector/src/main/res/layout/fragment_contacts_book.xml
@@ -10,118 +10,97 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            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"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/phoneBookToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="?actionBarSize">
 
-                <ImageView
-                    android:id="@+id/phoneBookClose"
-                    android:layout_width="@dimen/layout_touch_size"
-                    android:layout_height="@dimen/layout_touch_size"
-                    android:clickable="true"
-                    android:contentDescription="@string/action_close"
-                    android:focusable="true"
-                    android:foreground="?attr/selectableItemBackground"
-                    android:scaleType="center"
-                    android:src="@drawable/ic_x_18dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-                <TextView
-                    android:id="@+id/phoneBookTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:text="@string/contacts_book_title"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/phoneBookClose"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    <ImageView
+                        android:id="@+id/phoneBookClose"
+                        android:layout_width="@dimen/layout_touch_size"
+                        android:layout_height="@dimen/layout_touch_size"
+                        android:clickable="true"
+                        android:contentDescription="@string/action_close"
+                        android:focusable="true"
+                        android:foreground="?attr/selectableItemBackground"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_x_18dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <TextView
+                        android:id="@+id/phoneBookTitle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@string/contacts_book_title"
+                        android:textColor="?vctr_content_primary"
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toEndOf="@+id/phoneBookClose"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-        </androidx.appcompat.widget.Toolbar>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/phoneBookFilterContainer"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/phoneBookToolbar">
+            </com.google.android.material.appbar.MaterialToolbar>
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/phoneBookFilter"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/phoneBookFilterContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/search" />
+                android:layout_marginStart="@dimen/layout_horizontal_margin"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="@dimen/layout_horizontal_margin">
 
-        </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/phoneBookFilter"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/search" />
 
-        <CheckBox
-            android:id="@+id/phoneBookOnlyBoundContacts"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:text="@string/matrix_only_filter"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterContainer"
-            tools:visibility="visible" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-        <Button
-            android:id="@+id/phoneBookSearchForMatrixContacts"
-            style="@style/VectorButtonStyleText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:text="@string/phone_book_perform_lookup"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterContainer"
-            tools:visibility="visible" />
+            <CheckBox
+                android:id="@+id/phoneBookOnlyBoundContacts"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/layout_horizontal_margin"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="@dimen/layout_horizontal_margin"
+                android:text="@string/matrix_only_filter"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/phoneBookBottomBarrier"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="phoneBookSearchForMatrixContacts,phoneBookOnlyBoundContacts" />
+            <Button
+                android:id="@+id/phoneBookSearchForMatrixContacts"
+                style="@style/VectorButtonStyleText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/layout_horizontal_margin"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="@dimen/layout_horizontal_margin"
+                android:text="@string/phone_book_perform_lookup"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
-        <View
-            android:id="@+id/phoneBookFilterDivider"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="4dp"
-            android:background="?vctr_list_separator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/phoneBookBottomBarrier" />
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/phoneBookRecyclerView"
@@ -133,7 +112,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterDivider"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
             tools:listitem="@layout/item_contact_main" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
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..12452868cd 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
@@ -10,96 +10,87 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            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"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/createRoomToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="?actionBarSize">
 
-                <ImageView
-                    android:id="@+id/createDirectRoomClose"
-                    android:layout_width="@dimen/layout_touch_size"
-                    android:layout_height="@dimen/layout_touch_size"
-                    android:clickable="true"
-                    android:contentDescription="@string/action_close"
-                    android:focusable="true"
-                    android:foreground="?attr/selectableItemBackground"
-                    android:scaleType="center"
-                    android:src="@drawable/ic_x_18dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-                <TextView
-                    android:id="@+id/createDirectRoomTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:text="@string/direct_chats_header"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/createDirectRoomClose"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    <ImageView
+                        android:id="@+id/createDirectRoomClose"
+                        android:layout_width="@dimen/layout_touch_size"
+                        android:layout_height="@dimen/layout_touch_size"
+                        android:clickable="true"
+                        android:contentDescription="@string/action_close"
+                        android:focusable="true"
+                        android:foreground="?attr/selectableItemBackground"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_x_18dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <TextView
+                        android:id="@+id/createDirectRoomTitle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@string/direct_chats_header"
+                        android:textColor="?vctr_content_primary"
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toEndOf="@+id/createDirectRoomClose"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-        </androidx.appcompat.widget.Toolbar>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/createDirectRoomSearchByIdContainer"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/createRoomToolbar">
+            </com.google.android.material.appbar.MaterialToolbar>
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/createDirectRoomSearchById"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/createDirectRoomSearchByIdContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/add_by_matrix_id" />
+                android:layout_marginStart="@dimen/layout_horizontal_margin"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="@dimen/layout_horizontal_margin"
+                android:layout_marginBottom="16dp">
 
-        </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/createDirectRoomSearchById"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/add_by_matrix_id" />
 
-        <View
-            android:id="@+id/createDirectRoomFilterDivider"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="16dp"
-            android:background="?vctr_list_separator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/createDirectRoomSearchByIdContainer" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/createDirectRoomRecyclerView"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="16dp"
             android:fastScrollEnabled="true"
             android:overScrollMode="always"
             android:scrollbars="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/createDirectRoomFilterDivider"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
             tools:listitem="@layout/item_create_direct_room_user" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
index 6288273d8c..1d2edac40e 100644
--- a/vector/src/main/res/layout/fragment_create_room.xml
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -10,52 +10,55 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-
-        <androidx.appcompat.widget.Toolbar
-            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"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/createRoomToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="?actionBarSize">
 
-                <ImageView
-                    android:id="@+id/createRoomClose"
-                    android:layout_width="@dimen/layout_touch_size"
-                    android:layout_height="@dimen/layout_touch_size"
-                    android:contentDescription="@string/action_close"
-                    android:scaleType="center"
-                    android:src="@drawable/ic_x_18dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-                <TextView
-                    android:id="@+id/createRoomTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:text="@string/create_room_title"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/createRoomClose"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    <ImageView
+                        android:id="@+id/createRoomClose"
+                        android:layout_width="@dimen/layout_touch_size"
+                        android:layout_height="@dimen/layout_touch_size"
+                        android:contentDescription="@string/action_close"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_x_18dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <TextView
+                        android:id="@+id/createRoomTitle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@string/create_room_title"
+                        android:textColor="?vctr_content_primary"
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toEndOf="@+id/createRoomClose"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-        </androidx.appcompat.widget.Toolbar>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/createRoomForm"
@@ -64,7 +67,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/createRoomToolbar"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
             tools:listitem="@layout/item_form_switch" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 7ddffb2a77..79ba14dba1 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -1,108 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/groupToolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:elevation="4dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/groupToolbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:baselineAligned="false"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <RelativeLayout
-                android:id="@+id/groupToolbarAvatarImageView"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:contentDescription="@string/a11y_open_drawer"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginStart="4dp"
-                    android:importantForAccessibility="no"
-                    android:src="@drawable/ic_space_icons"
-                    app:tint="?vctr_content_secondary"
-                    tools:ignore="MissingPrefix" />
-
-                <im.vector.app.features.home.room.list.UnreadCounterBadgeView
-                    android:id="@+id/drawerUnreadCounterBadgeView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginEnd="0dp"
-                    android:gravity="center"
-                    android:minWidth="16dp"
-                    android:minHeight="16dp"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="4dp"
-                    android:textColor="?colorOnError"
-                    android:textSize="10sp"
-                    android:visibility="gone"
-                    tools:background="@drawable/bg_unread_highlight"
-                    tools:text="4"
-                    tools:visibility="visible" />
-            </RelativeLayout>
+            android:layout_height="?attr/actionBarSize">
 
             <LinearLayout
-                android:id="@+id/homeToolbarContent"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="start"
-                android:orientation="vertical"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:baselineAligned="false"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/groupToolbarTitleView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:gravity="start"
-                    android:maxLines="1"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="20sp"
-                    android:textStyle="bold"
-                    tools:text="@tools:sample/lorem/random" />
+                <RelativeLayout
+                    android:id="@+id/groupToolbarAvatarImageView"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:contentDescription="@string/a11y_open_drawer"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
 
-                <TextView
-                    android:id="@+id/groupToolbarSpaceTitleView"
-                    android:layout_width="wrap_content"
+                    <ImageView
+                        android:layout_width="28dp"
+                        android:layout_height="28dp"
+                        android:layout_centerVertical="true"
+                        android:layout_marginStart="4dp"
+                        android:importantForAccessibility="no"
+                        android:src="@drawable/ic_space_icons"
+                        app:tint="?vctr_content_secondary"
+                        tools:ignore="MissingPrefix" />
+
+                    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+                        android:id="@+id/drawerUnreadCounterBadgeView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginEnd="0dp"
+                        android:gravity="center"
+                        android:minWidth="16dp"
+                        android:minHeight="16dp"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="4dp"
+                        android:textColor="?colorOnError"
+                        android:textSize="10sp"
+                        android:visibility="gone"
+                        tools:background="@drawable/bg_unread_highlight"
+                        tools:text="4"
+                        tools:visibility="visible" />
+
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:id="@+id/homeToolbarContent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
+                    android:layout_weight="1"
                     android:gravity="start"
-                    android:maxLines="1"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="14sp"
-                    android:visibility="gone"
-                    tools:text="@tools:sample/lorem/random"
-                    tools:visibility="visible" />
+                    android:orientation="vertical"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp">
+
+                    <TextView
+                        android:id="@+id/groupToolbarTitleView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:gravity="start"
+                        android:maxLines="1"
+                        android:textColor="?vctr_content_primary"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
+                        tools:text="@tools:sample/lorem/random" />
+
+                    <TextView
+                        android:id="@+id/groupToolbarSpaceTitleView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:gravity="start"
+                        android:maxLines="1"
+                        android:textColor="?vctr_content_primary"
+                        android:textSize="14sp"
+                        android:visibility="gone"
+                        tools:text="@tools:sample/lorem/random"
+                        tools:visibility="visible" />
+
+                </LinearLayout>
 
             </LinearLayout>
 
+        </com.google.android.material.appbar.MaterialToolbar>
 
-        </LinearLayout>
-
-    </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <im.vector.app.features.sync.widget.SyncStateView
         android:id="@+id/syncStateView"
@@ -110,7 +114,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/groupToolbar" />
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
     <im.vector.app.core.ui.views.KeysBackupBanner
         android:id="@+id/homeKeysBackupBanner"
@@ -165,10 +169,6 @@
         android:id="@+id/bottomNavigationView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?vctr_system"
-        app:itemIconSize="20dp"
-        app:itemIconTint="@color/bottom_navigation_icon_tint_selector"
-        app:labelVisibilityMode="unlabeled"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_incoming_share.xml b/vector/src/main/res/layout/fragment_incoming_share.xml
index a9351b545f..ee92e7c353 100644
--- a/vector/src/main/res/layout/fragment_incoming_share.xml
+++ b/vector/src/main/res/layout/fragment_incoming_share.xml
@@ -10,24 +10,28 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/incomingShareToolbar"
-            android:layout_width="0dp"
-            android:layout_height="?attr/actionBarSize"
-            app:contentInsetStart="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.SearchView
-                android:id="@+id/incomingShareSearchView"
-                style="@style/VectorSearchView"
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/incomingShareToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:queryHint="@string/room_filtering_filter_hint"
-                app:searchIcon="@drawable/ic_filter" />
+                android:layout_height="?attr/actionBarSize"
+                app:contentInsetStart="0dp">
 
-        </androidx.appcompat.widget.Toolbar>
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/incomingShareSearchView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:queryHint="@string/room_filtering_filter_hint"
+                    app:searchIcon="@drawable/ic_filter" />
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/incomingShareRoomList"
@@ -36,7 +40,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/incomingShareToolbar"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
             tools:listitem="@layout/item_room" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
index e70f038197..accb43e244 100644
--- a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
@@ -40,7 +40,7 @@
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
 
             <ProgressBar
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                style="@style/VectorHorizontalProgressBar"
                 android:layout_width="240dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/vector/src/main/res/layout/fragment_login_web.xml b/vector/src/main/res/layout/fragment_login_web.xml
index 46a3796e22..b9cbc536b7 100644
--- a/vector/src/main/res/layout/fragment_login_web.xml
+++ b/vector/src/main/res/layout/fragment_login_web.xml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?android:colorBackground"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/loginWebToolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
-        tools:subtitle="https://www.example.org"
-        tools:title="@string/auth_login" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/loginWebToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:subtitle="https://www.example.org"
+            tools:title="@string/auth_login" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <WebView
         android:id="@+id/loginWebWebView"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index ee4b12b73b..5f42580a22 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -33,7 +33,7 @@
                 app:layout_collapseMode="parallax"
                 app:layout_collapseParallaxMultiplier="0.9" />
 
-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/matrixProfileToolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
@@ -90,7 +90,7 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-            </androidx.appcompat.widget.Toolbar>
+            </com.google.android.material.appbar.MaterialToolbar>
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index 2569a8a092..94a5b84d78 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -17,28 +17,22 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="4dp">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             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"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways">
 
             <androidx.appcompat.widget.SearchView
                 android:id="@+id/publicRoomsFilter"
-                style="@style/VectorSearchView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:queryHint="@string/room_directory_search_hint" />
 
-        </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.MaterialToolbar>
 
         <Button
             android:id="@+id/publicRoomsCreateNewRoom"
@@ -48,9 +42,9 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
+            android:icon="@drawable/ic_plus_circle"
             android:minHeight="@dimen/layout_touch_size"
             android:text="@string/create_new_room"
-            app:icon="@drawable/ic_plus_circle"
             app:iconPadding="13dp"
             app:iconTint="?colorPrimary"
             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..f065a5a8b0 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -22,15 +22,11 @@
         android:elevation="4dp">
 
         <!-- minHeight="0dp" is important to collapse on scroll -->
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             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"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways">
 
             <LinearLayout
@@ -66,12 +62,11 @@
 
             </LinearLayout>
 
-        </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.MaterialToolbar>
 
 
         <androidx.appcompat.widget.SearchView
             android:id="@+id/memberNameFilter"
-            style="@style/VectorSearchView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -81,14 +76,6 @@
             app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
             app:queryHint="@string/search_hint_room_name" />
 
-        <!--        <ProgressBar-->
-        <!--            android:id="@+id/listBuildingProgress"-->
-        <!--            android:indeterminate="true"-->
-        <!--            android:layout_width="match_parent"-->
-        <!--            android:layout_height="8dp"-->
-        <!--            style="@style/Widget.AppCompat.ProgressBar.Horizontal"-->
-        <!--            />-->
-
     </com.google.android.material.appbar.AppBarLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index ae7494894c..1013120134 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -6,79 +6,83 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.Toolbar
-        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"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/roomToolbarContentView"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/roomToolbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="?actionBarSize"
+            android:transitionName="toolbar">
 
-            <ImageView
-                android:id="@+id/roomToolbarAvatarImageView"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:contentDescription="@string/avatar"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@sample/room_round_avatars" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/roomToolbarContentView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
-            <im.vector.app.core.ui.views.ShieldImageView
-                android:id="@+id/roomToolbarDecorationImageView"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                app:layout_constraintCircle="@+id/roomToolbarAvatarImageView"
-                app:layout_constraintCircleAngle="135"
-                app:layout_constraintCircleRadius="20dp"
-                tools:ignore="MissingConstraints" />
+                <ImageView
+                    android:id="@+id/roomToolbarAvatarImageView"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:contentDescription="@string/avatar"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:src="@sample/room_round_avatars" />
 
-            <TextView
-                android:id="@+id/roomToolbarTitleView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="?vctr_content_primary"
-                android:textSize="18sp"
-                app:layout_constraintBottom_toTopOf="@+id/roomToolbarSubtitleView"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="@sample/rooms.json/data/name" />
+                <im.vector.app.core.ui.views.ShieldImageView
+                    android:id="@+id/roomToolbarDecorationImageView"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    app:layout_constraintCircle="@+id/roomToolbarAvatarImageView"
+                    app:layout_constraintCircleAngle="135"
+                    app:layout_constraintCircleRadius="20dp"
+                    tools:ignore="MissingConstraints" />
 
-            <TextView
-                android:id="@+id/roomToolbarSubtitleView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="?vctr_content_primary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
-                app:layout_constraintTop_toBottomOf="@+id/roomToolbarTitleView"
-                tools:text="@sample/rooms.json/data/topic" />
+                <TextView
+                    android:id="@+id/roomToolbarTitleView"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="?vctr_content_primary"
+                    android:textSize="18sp"
+                    app:layout_constraintBottom_toTopOf="@+id/roomToolbarSubtitleView"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="@sample/rooms.json/data/name" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <TextView
+                    android:id="@+id/roomToolbarSubtitleView"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="?vctr_content_primary"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
+                    app:layout_constraintTop_toBottomOf="@+id/roomToolbarTitleView"
+                    tools:text="@sample/rooms.json/data/topic" />
 
-    </androidx.appcompat.widget.Toolbar>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.appbar.MaterialToolbar>
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/timelineRecyclerViewBarrier"
@@ -93,7 +97,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/roomToolbar" />
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
     <im.vector.app.core.ui.views.CurrentCallsView
         android:id="@+id/activeCallView"
@@ -188,7 +192,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomToolbar"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
         tools:visibility="gone" />
 
     <androidx.constraintlayout.widget.Barrier
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..288ed7addb 100644
--- a/vector/src/main/res/layout/fragment_room_directory_picker.xml
+++ b/vector/src/main/res/layout/fragment_room_directory_picker.xml
@@ -9,8 +9,7 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="4dp">
+        android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/spaceExploreCollapsingToolbarLayout"
@@ -32,18 +31,14 @@
                 <include
                     android:id="@+id/spaceCard"
                     layout="@layout/fragment_matrix_to_room_space_card" />
+
             </FrameLayout>
 
-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
                 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"
-                app:layout_constraintTop_toTopOf="parent" />
-
+                app:layout_collapseMode="pin" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
@@ -52,9 +47,9 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/roomDirectoryPickerList"
-        android:background="?android:colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="?android:colorBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/item_room_directory" />
 
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..8983498451 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
@@ -11,56 +11,62 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/roomPreviewNoPreviewToolbar"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
-            android:layout_height="?actionBarSize"
-            android:elevation="4dp">
+            android:layout_height="wrap_content">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/roomPreviewNoPreviewToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="?actionBarSize">
 
-                <ImageView
-                    android:id="@+id/roomPreviewNoPreviewToolbarAvatar"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@sample/room_round_avatars" />
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-                <TextView
-                    android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/roomPreviewNoPreviewToolbarAvatar"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/users.json/data/displayName" />
+                    <ImageView
+                        android:id="@+id/roomPreviewNoPreviewToolbarAvatar"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:contentDescription="@string/avatar"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:src="@sample/room_round_avatars" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <TextView
+                        android:id="@+id/roomPreviewNoPreviewToolbarTitle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textColor="?vctr_content_primary"
+                        android:textSize="18sp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toEndOf="@+id/roomPreviewNoPreviewToolbarAvatar"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="@sample/users.json/data/displayName" />
 
-        </androidx.appcompat.widget.Toolbar>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <ProgressBar
-            android:id="@+id/roomPreviewPeekingProgress"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="14dp"
-            android:layout_gravity="center"
-            android:indeterminate="true" />
+            </com.google.android.material.appbar.MaterialToolbar>
+
+            <ProgressBar
+                android:id="@+id/roomPreviewPeekingProgress"
+                style="@style/VectorHorizontalProgressBar"
+                android:layout_width="match_parent"
+                android:layout_height="14dp"
+                android:layout_gravity="center"
+                android:indeterminate="true" />
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.core.widget.NestedScrollView
             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..cf41d67a35 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -7,60 +7,66 @@
     android:layout_height="match_parent"
     android:background="?android:colorBackground">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/roomSettingsToolbar"
-        android:layout_width="0dp"
-        android:layout_height="?actionBarSize"
-        android:elevation="4dp"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/roomSettingsToolbarContentView"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/roomSettingsToolbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="?actionBarSize">
 
-            <ImageView
-                android:id="@+id/roomSettingsToolbarAvatarImageView"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:contentDescription="@string/avatar"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@sample/room_round_avatars" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/roomSettingsToolbarContentView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
-            <im.vector.app.core.ui.views.ShieldImageView
-                android:id="@+id/roomSettingsDecorationToolbarAvatarImageView"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                app:layout_constraintCircle="@+id/roomSettingsToolbarAvatarImageView"
-                app:layout_constraintCircleAngle="135"
-                app:layout_constraintCircleRadius="20dp"
-                tools:ignore="MissingConstraints" />
+                <ImageView
+                    android:id="@+id/roomSettingsToolbarAvatarImageView"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:contentDescription="@string/avatar"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:src="@sample/room_round_avatars" />
 
-            <TextView
-                android:id="@+id/roomSettingsToolbarTitleView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="?vctr_content_primary"
-                android:textSize="18sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/roomSettingsToolbarAvatarImageView"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="@sample/rooms.json/data/name" />
+                <im.vector.app.core.ui.views.ShieldImageView
+                    android:id="@+id/roomSettingsDecorationToolbarAvatarImageView"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    app:layout_constraintCircle="@+id/roomSettingsToolbarAvatarImageView"
+                    app:layout_constraintCircleAngle="135"
+                    app:layout_constraintCircleRadius="20dp"
+                    tools:ignore="MissingConstraints" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <TextView
+                    android:id="@+id/roomSettingsToolbarTitleView"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="?vctr_content_primary"
+                    android:textSize="18sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/roomSettingsToolbarAvatarImageView"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="@sample/rooms.json/data/name" />
 
-    </androidx.appcompat.widget.Toolbar>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.appbar.MaterialToolbar>
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinatorLayout"
@@ -69,7 +75,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomSettingsToolbar">
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/roomSettingsRecyclerView"
@@ -95,7 +101,6 @@
 
                 <androidx.appcompat.widget.SearchView
                     android:id="@+id/searchView"
-                    style="@style/VectorSearchView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index 3c598a2ac2..3ebed9ab44 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -10,15 +10,12 @@
         android:id="@+id/roomUploadsAppBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
         android:transitionName="toolbar">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/roomUploadsToolbar"
             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
@@ -65,7 +62,7 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.MaterialToolbar>
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/roomUploadsTabs"
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..3dd57f6101 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -17,19 +17,14 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="4dp">
+        android:layout_height="wrap_content">
 
         <!-- minHeight="0dp" is important to collapse on scroll -->
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             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"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways">
 
             <LinearLayout
@@ -65,12 +60,11 @@
 
             </LinearLayout>
 
-        </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.MaterialToolbar>
 
 
         <androidx.appcompat.widget.SearchView
             android:id="@+id/publicRoomsFilter"
-            style="@style/VectorSearchView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -94,7 +88,8 @@
             app:iconPadding="13dp"
             app:iconTint="?colorPrimary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar" />
+            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
+            tools:ignore="MissingPrefix" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 05a9d447d2..6096c33d2f 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -11,70 +11,76 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/roomPreviewNoPreviewToolbar"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
-            android:layout_height="?actionBarSize"
-            android:elevation="4dp"
-            app:navigationIcon="@drawable/ic_x_18dp">
+            android:layout_height="wrap_content">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/roomPreviewNoPreviewToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="?actionBarSize"
+                app:navigationIcon="@drawable/ic_x_18dp">
 
-                <!--                <ImageView-->
-                <!--                    android:id="@+id/spacePreviewClose"-->
-                <!--                    android:layout_width="@dimen/layout_touch_size"-->
-                <!--                    android:layout_height="@dimen/layout_touch_size"-->
-                <!--                    android:clickable="true"-->
-                <!--                    android:focusable="true"-->
-                <!--                    android:foreground="?attr/selectableItemBackground"-->
-                <!--                    android:scaleType="center"-->
-                <!--                    android:src="@drawable/ic_x_18dp"-->
-                <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-                <!--                    app:layout_constraintStart_toStartOf="parent"-->
-                <!--                    app:layout_constraintTop_toTopOf="parent" />-->
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-                <ImageView
-                    android:id="@+id/spacePreviewToolbarAvatar"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:contentDescription="@string/avatar"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@sample/space_avatars" />
+                    <!--                <ImageView-->
+                    <!--                    android:id="@+id/spacePreviewClose"-->
+                    <!--                    android:layout_width="@dimen/layout_touch_size"-->
+                    <!--                    android:layout_height="@dimen/layout_touch_size"-->
+                    <!--                    android:clickable="true"-->
+                    <!--                    android:focusable="true"-->
+                    <!--                    android:foreground="?attr/selectableItemBackground"-->
+                    <!--                    android:scaleType="center"-->
+                    <!--                    android:src="@drawable/ic_x_18dp"-->
+                    <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+                    <!--                    app:layout_constraintStart_toStartOf="parent"-->
+                    <!--                    app:layout_constraintTop_toTopOf="parent" />-->
 
-                <TextView
-                    android:id="@+id/roomPreviewNoPreviewToolbarTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/spacePreviewToolbarAvatar"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/users.json/data/displayName" />
+                    <ImageView
+                        android:id="@+id/spacePreviewToolbarAvatar"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:contentDescription="@string/avatar"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:src="@sample/space_avatars" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <TextView
+                        android:id="@+id/roomPreviewNoPreviewToolbarTitle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textColor="?vctr_content_primary"
+                        android:textSize="18sp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toEndOf="@+id/spacePreviewToolbarAvatar"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="@sample/users.json/data/displayName" />
 
-        </androidx.appcompat.widget.Toolbar>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <ProgressBar
-            android:id="@+id/spacePreviewPeekingProgress"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="14dp"
-            android:layout_gravity="center"
-            android:indeterminate="true" />
+            </com.google.android.material.appbar.MaterialToolbar>
+
+            <ProgressBar
+                android:id="@+id/spacePreviewPeekingProgress"
+                style="@style/VectorHorizontalProgressBar"
+                android:layout_width="match_parent"
+                android:layout_height="14dp"
+                android:layout_gravity="center"
+                android:indeterminate="true" />
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/spacePreviewRecyclerView"
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..2bcc7cac0e 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -9,51 +9,55 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
-            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"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/showUserCodeToolBar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="?actionBarSize">
 
-                <ImageView
-                    android:id="@+id/showUserCodeClose"
-                    android:layout_width="@dimen/layout_touch_size"
-                    android:layout_height="@dimen/layout_touch_size"
-                    android:contentDescription="@string/action_close"
-                    android:scaleType="center"
-                    android:src="@drawable/ic_x_18dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-                <TextView
-                    android:id="@+id/showUserCodeTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:text="@string/add_by_qr_code"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/showUserCodeClose"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    <ImageView
+                        android:id="@+id/showUserCodeClose"
+                        android:layout_width="@dimen/layout_touch_size"
+                        android:layout_height="@dimen/layout_touch_size"
+                        android:contentDescription="@string/action_close"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_x_18dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <TextView
+                        android:id="@+id/showUserCodeTitle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@string/add_by_qr_code"
+                        android:textColor="?vctr_content_primary"
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toEndOf="@+id/showUserCodeClose"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-        </androidx.appcompat.widget.Toolbar>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </com.google.android.material.appbar.MaterialToolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
 
         <ImageView
@@ -87,7 +91,7 @@
             app:cardCornerRadius="20dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/showUserCodeToolBar"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
             app:layout_constraintWidth_percent="0.8">
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -178,7 +182,8 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/showUserCodeInfoText"
-            app:layout_constraintVertical_bias="0" />
+            app:layout_constraintVertical_bias="0"
+            tools:ignore="MissingPrefix" />
 
         <Button
             android:id="@+id/showUserCodeScanButton"
diff --git a/vector/src/main/res/layout/fragment_user_directory.xml b/vector/src/main/res/layout/fragment_user_directory.xml
index d8bb517685..8c59e0101f 100644
--- a/vector/src/main/res/layout/fragment_user_directory.xml
+++ b/vector/src/main/res/layout/fragment_user_directory.xml
@@ -10,96 +10,90 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            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"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/userDirectoryToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="?actionBarSize">
 
-                <ImageView
-                    android:id="@+id/userDirectoryClose"
-                    android:layout_width="@dimen/layout_touch_size"
-                    android:layout_height="@dimen/layout_touch_size"
-                    android:clickable="true"
-                    android:contentDescription="@string/action_close"
-                    android:focusable="true"
-                    android:foreground="?attr/selectableItemBackground"
-                    android:scaleType="center"
-                    android:src="@drawable/ic_x_18dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-                <TextView
-                    android:id="@+id/userDirectoryTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:text="@string/direct_chats_header"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toEndOf="@+id/userDirectoryClose"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    <ImageView
+                        android:id="@+id/userDirectoryClose"
+                        android:layout_width="@dimen/layout_touch_size"
+                        android:layout_height="@dimen/layout_touch_size"
+                        android:clickable="true"
+                        android:contentDescription="@string/action_close"
+                        android:focusable="true"
+                        android:foreground="?attr/selectableItemBackground"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_x_18dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <TextView
+                        android:id="@+id/userDirectoryTitle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="@string/direct_chats_header"
+                        android:textColor="?vctr_content_primary"
+                        android:textSize="18sp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toEndOf="@+id/userDirectoryClose"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-        </androidx.appcompat.widget.Toolbar>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/userDirectorySearchByIdContainer"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/userDirectoryToolbar">
+            </com.google.android.material.appbar.MaterialToolbar>
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/userDirectorySearchById"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/userDirectorySearchByIdContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/add_by_matrix_id" />
+                android:layout_marginStart="@dimen/layout_horizontal_margin"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="@dimen/layout_horizontal_margin"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
 
-        </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/userDirectorySearchById"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/add_by_matrix_id" />
 
-        <View
-            android:id="@+id/userDirectoryFilterDivider"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="16dp"
-            android:background="?vctr_list_separator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/userDirectorySearchByIdContainer" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/userDirectoryRecyclerView"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="16dp"
             android:fastScrollEnabled="true"
             android:overScrollMode="always"
             android:scrollbars="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/userDirectoryFilterDivider"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
             tools:listitem="@layout/item_known_user" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 9b4b19ca7f..8a211b9a7b 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -5,18 +5,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             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">
+            android:layout_width="match_parent"
+            android:layout_height="?actionBarSize">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -56,84 +54,85 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.MaterialToolbar>
 
-        <im.vector.app.core.platform.MaxHeightScrollView
-            android:id="@+id/chipGroupScrollView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/userListToolbar"
-            app:maxHeight="64dp">
+    </com.google.android.material.appbar.AppBarLayout>
 
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/chipGroup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:lineSpacing="2dp" />
+    <im.vector.app.core.platform.MaxHeightScrollView
+        android:id="@+id/chipGroupScrollView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
+        app:maxHeight="64dp">
 
-        </im.vector.app.core.platform.MaxHeightScrollView>
-
-        <EditText
-            android:id="@+id/userListSearch"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:background="@null"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
-            android:hint="@string/user_directory_search_hint"
-            android:importantForAutofill="no"
-            android:inputType="text"
-            android:maxHeight="80dp"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/chipGroupScrollView" />
-
-        <View
-            android:id="@+id/userListFilterDivider"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:background="?vctr_list_separator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/userListSearch" />
-
-
-        <TextView
-            android:id="@+id/userListE2EbyDefaultDisabled"
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/chipGroup"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:drawablePadding="8dp"
-            android:text="@string/settings_hs_admin_e2e_disabled"
-            android:textColor="?vctr_content_secondary"
-            android:textSize="14sp"
-            android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@id/userListFilterDivider"
-            tools:visibility="visible" />
+            app:lineSpacing="2dp" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/userListRecyclerView"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:fastScrollEnabled="true"
-            android:overScrollMode="always"
-            android:scrollbars="vertical"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/userListE2EbyDefaultDisabled"
-            tools:listitem="@layout/item_known_user" />
+    </im.vector.app.core.platform.MaxHeightScrollView>
+
+    <EditText
+        android:id="@+id/userListSearch"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:background="@null"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:hint="@string/user_directory_search_hint"
+        android:importantForAutofill="no"
+        android:inputType="text"
+        android:maxHeight="80dp"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/chipGroupScrollView" />
+
+    <View
+        android:id="@+id/userListFilterDivider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?vctr_list_separator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/userListSearch" />
+
+
+    <TextView
+        android:id="@+id/userListE2EbyDefaultDisabled"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:drawablePadding="8dp"
+        android:text="@string/settings_hs_admin_e2e_disabled"
+        android:textColor="?vctr_content_secondary"
+        android:textSize="14sp"
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@id/userListFilterDivider"
+        tools:visibility="visible" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/userListRecyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:fastScrollEnabled="true"
+        android:overScrollMode="always"
+        android:scrollbars="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/userListE2EbyDefaultDisabled"
+        tools:listitem="@layout/item_known_user" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index 9fe977e060..4d54d2980a 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -1,168 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:background="@drawable/bg_attachment_type_selector"
+    android:orientation="vertical"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:background="@drawable/bg_attachment_type_selector"
-        android:orientation="vertical"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp">
+        android:layout_height="match_parent"
+        android:layout_margin="16dp"
+        android:baselineAligned="false"
+        android:orientation="horizontal"
+        android:weightSum="3">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="16dp"
-            android:baselineAligned="false"
-            android:orientation="horizontal"
-            android:weightSum="3">
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
+            <ImageButton
+                android:id="@+id/attachmentCameraButton"
+                style="@style/AttachmentTypeSelectorButton"
+                android:contentDescription="@string/attachment_type_camera"
+                android:src="@drawable/ic_attachment_camera_white_24dp"
+                tools:background="?colorPrimary" />
 
-                <ImageButton
-                    android:id="@+id/attachmentCameraButton"
-                    style="@style/AttachmentTypeSelectorButton"
-                    android:contentDescription="@string/attachment_type_camera"
-                    android:src="@drawable/ic_attachment_camera_white_24dp"
-                    tools:background="?colorPrimary" />
-
-                <TextView
-                    style="@style/AttachmentTypeSelectorLabel"
-                    android:importantForAccessibility="no"
-                    android:text="@string/attachment_type_camera" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageButton
-                    android:id="@+id/attachmentGalleryButton"
-                    style="@style/AttachmentTypeSelectorButton"
-                    android:contentDescription="@string/attachment_type_gallery"
-                    android:src="@drawable/ic_attachment_gallery_white_24dp"
-                    tools:background="?colorPrimary" />
-
-                <TextView
-                    style="@style/AttachmentTypeSelectorLabel"
-                    android:importantForAccessibility="no"
-                    android:text="@string/attachment_type_gallery" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageButton
-                    android:id="@+id/attachmentFileButton"
-                    style="@style/AttachmentTypeSelectorButton"
-                    android:contentDescription="@string/attachment_type_file"
-                    android:src="@drawable/ic_attachment_file_white_24dp"
-                    tools:background="?colorPrimary" />
-
-                <TextView
-                    style="@style/AttachmentTypeSelectorLabel"
-                    android:importantForAccessibility="no"
-                    android:text="@string/attachment_type_file" />
-
-            </LinearLayout>
+            <TextView
+                style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
+                android:text="@string/attachment_type_camera" />
 
         </LinearLayout>
 
+
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="16dp"
-            android:baselineAligned="false"
-            android:orientation="horizontal"
-            android:weightSum="3">
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
+            <ImageButton
+                android:id="@+id/attachmentGalleryButton"
+                style="@style/AttachmentTypeSelectorButton"
+                android:contentDescription="@string/attachment_type_gallery"
+                android:src="@drawable/ic_attachment_gallery_white_24dp"
+                tools:background="?colorPrimary" />
 
-                <ImageButton
-                    android:id="@+id/attachmentAudioButton"
-                    style="@style/AttachmentTypeSelectorButton"
-                    android:contentDescription="@string/attachment_type_audio"
-                    android:src="@drawable/ic_attachment_audio_white_24dp"
-                    tools:background="?colorPrimary" />
+            <TextView
+                style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
+                android:text="@string/attachment_type_gallery" />
 
-                <TextView
-                    style="@style/AttachmentTypeSelectorLabel"
-                    android:importantForAccessibility="no"
-                    android:text="@string/attachment_type_audio" />
-
-            </LinearLayout>
+        </LinearLayout>
 
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
 
-                <ImageButton
-                    android:id="@+id/attachmentContactButton"
-                    style="@style/AttachmentTypeSelectorButton"
-                    android:contentDescription="@string/attachment_type_contact"
-                    android:src="@drawable/ic_attachment_contact_white_24dp"
-                    tools:background="?colorPrimary" />
+            <ImageButton
+                android:id="@+id/attachmentFileButton"
+                style="@style/AttachmentTypeSelectorButton"
+                android:contentDescription="@string/attachment_type_file"
+                android:src="@drawable/ic_attachment_file_white_24dp"
+                tools:background="?colorPrimary" />
 
-                <TextView
-                    style="@style/AttachmentTypeSelectorLabel"
-                    android:importantForAccessibility="no"
-                    android:text="@string/attachment_type_contact" />
+            <TextView
+                style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
+                android:text="@string/attachment_type_file" />
 
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageButton
-                    android:id="@+id/attachmentStickersButton"
-                    style="@style/AttachmentTypeSelectorButton"
-                    android:contentDescription="@string/attachment_type_sticker"
-                    android:src="@drawable/ic_attachment_stickers_white_24dp"
-                    tools:background="?colorPrimary" />
-
-                <TextView
-                    style="@style/AttachmentTypeSelectorLabel"
-                    android:importantForAccessibility="no"
-                    android:text="@string/attachment_type_sticker" />
-
-            </LinearLayout>
         </LinearLayout>
 
     </LinearLayout>
 
-</FrameLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="16dp"
+        android:baselineAligned="false"
+        android:orientation="horizontal"
+        android:weightSum="3">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageButton
+                android:id="@+id/attachmentAudioButton"
+                style="@style/AttachmentTypeSelectorButton"
+                android:contentDescription="@string/attachment_type_audio"
+                android:src="@drawable/ic_attachment_audio_white_24dp"
+                tools:background="?colorPrimary" />
+
+            <TextView
+                style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
+                android:text="@string/attachment_type_audio" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageButton
+                android:id="@+id/attachmentContactButton"
+                style="@style/AttachmentTypeSelectorButton"
+                android:contentDescription="@string/attachment_type_contact"
+                android:src="@drawable/ic_attachment_contact_white_24dp"
+                tools:background="?colorPrimary" />
+
+            <TextView
+                style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
+                android:text="@string/attachment_type_contact" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageButton
+                android:id="@+id/attachmentStickersButton"
+                style="@style/AttachmentTypeSelectorButton"
+                android:contentDescription="@string/attachment_type_sticker"
+                android:src="@drawable/ic_attachment_stickers_white_24dp"
+                tools:background="?colorPrimary" />
+
+            <TextView
+                style="@style/AttachmentTypeSelectorLabel"
+                android:importantForAccessibility="no"
+                android:text="@string/attachment_type_sticker" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/view_sync_state.xml b/vector/src/main/res/layout/view_sync_state.xml
index 3d8720da99..86e3133ace 100644
--- a/vector/src/main/res/layout/view_sync_state.xml
+++ b/vector/src/main/res/layout/view_sync_state.xml
@@ -16,7 +16,7 @@
         tools:visibility="visible">
 
         <ProgressBar
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            style="@style/VectorHorizontalProgressBar"
             android:layout_width="match_parent"
             android:layout_height="14dp"
             android:layout_gravity="center"
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 4dc18d5b86..5e5b4727e6 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -2725,7 +2725,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="jitsi_leave_conf_to_join_another_one_content">Salir de la conferencia actual y cambiar a otra\?</string>
     <string name="error_jitsi_join_conf">Lo siento, un error ha ocurrido cuando se intentaba unir a la conferencia</string>
     <string name="room_settings_room_access_entry_unknown">Configuración de acceso desconocido (%s)</string>
-    <string name="room_alias_publish_to_directory">Publicar esta sala publicamente en el directorio de salas %1$s\?</string>
+    <string name="room_alias_publish_to_directory">Publicar esta sala públicamente en el directorio de salas %1$s\?</string>
     <string name="room_settings_guest_access_title">Permitir que invitados se unan</string>
     <string name="room_alias_action_unpublish">Quitar publicación de esta dirección</string>
     <string name="room_alias_publish_to_directory_error">No se puede recibir la visibilidad actual de esta sala (%1$s).</string>
@@ -2759,7 +2759,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_alias_title">Direcciones de la Sala</string>
     <string name="room_settings_alias_title">Direcciones de la sala</string>
     <string name="room_settings_room_access_title">Acceso a la sala</string>
-    <string name="template_settings_add_3pid_flow_not_supported">No puedes hacer eso desde ${app_name} movil</string>
+    <string name="template_settings_add_3pid_flow_not_supported">No puedes hacer eso desde ${app_name} móvil</string>
     <string name="option_always_ask">Siempre preguntar</string>
     <string name="spaces_header">Espacios</string>
     <string name="settings_room_directory_show_all_rooms_summary">mostrar todas las salas en el directorio de salas, incluyendo salas con contenido explícito.</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index a2ac2c93aa..838ed7860f 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -2416,7 +2416,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="settings_troubleshoot_test_push_loop_title">Push tesztelése</string>
     <string name="error_threepid_auth_failed">Ellenőrizd, hogy rákattintottál arra a hivatkozásra amit e-mailben küldtünk neked.</string>
     <string name="settings_remove_three_pid_confirmation_content">%s törlése\?</string>
-    <string name="search_is_not_supported_in_e2e_room">Titkosított szobákban való keresés egyenlőre nem támogatott.</string>
+    <string name="search_is_not_supported_in_e2e_room">Titkosított szobákban való keresés egyelőre nem támogatott.</string>
     <string name="search_banned_user_hint">Kitiltott felhasználók szűrése</string>
     <string name="room_permissions_change_topic">Téma megváltoztatása</string>
     <string name="room_permissions_upgrade_the_room">Szoba fejlesztése</string>
@@ -2469,7 +2469,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \nNincs jogosultságod szobák hozzáadásához.</string>
     <string name="this_space_has_no_rooms">Ezen a Téren nincsenek szobák</string>
     <string name="spaces_no_server_support_description">További információért vedd fel a kapcsolatot a matrix szerver adminisztrátorával</string>
-    <string name="spaces_no_server_support_title">Úgy látszik a matrix szervered nem támogatja egyenlőre a Tereket</string>
+    <string name="spaces_no_server_support_title">Úgy látszik a matrix szervered nem támogatja egyelőre a Tereket</string>
     <string name="spaces_feeling_experimental_subspace">Szeretsz kísérletezni\?
 \nTereket adhatsz terekhez.</string>
     <string name="labs_space_show_orphan_in_home">Kísérleti tér - Csak árvák mutatása a Kezdőlapon</string>
@@ -2506,7 +2506,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="join_anyway">Belépés mindenképpen</string>
     <string name="join_space">Belépés a Térbe</string>
     <string name="create_space">Tér készítése</string>
-    <string name="skip_for_now">Kihagy egyenlőre</string>
+    <string name="skip_for_now">Kihagy egyelőre</string>
     <string name="share_space_link_message">Csatlakozz a Teremhez %1$s %2$s</string>
     <string name="invite_just_to_this_room_desc">Nem lesznek a részesei ennek: %s</string>
     <string name="invite_just_to_this_room">Csak ehhez a szobához</string>
@@ -2515,7 +2515,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="invite_by_link">Megosztás hivatkozás</string>
     <string name="invite_by_mxid">Meghívás felhasználónévvel</string>
     <string name="invite_by_email">Meghívás e-maillel</string>
-    <string name="invite_people_to_your_space_desc">Egyenlőre csak te vagy itt, %s még jobb lehet másokkal együtt.</string>
+    <string name="invite_people_to_your_space_desc">Egyelőre csak te vagy itt, %s még jobb lehet másokkal együtt.</string>
     <string name="invite_to_space">Meghívó ide: %s</string>
     <string name="invite_people_to_your_space">Emberek meghívása a teredbe</string>
     <string name="invite_people_menu">Személyek meghívása</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 7b4a6a60ff..15b383649f 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2068,8 +2068,8 @@
 \nA confirmação vai ser salvada localmente e compartilhada numa versão futura do app.</string>
     <string name="room_list_sharing_header_recent_rooms">Salas recentes</string>
     <string name="room_list_sharing_header_other_rooms">Outras salas</string>
-    <string name="command_description_rainbow">Envia a dada mensagem colorida como um arcoíris</string>
-    <string name="command_description_rainbow_emote">Envia o dado emote colorido como um arcoíris</string>
+    <string name="command_description_rainbow">Envia a dada mensagem colorida como um arco-íris</string>
+    <string name="command_description_rainbow_emote">Envia o dado emote colorido como um arco-íris</string>
     <string name="settings_category_timeline">Timeline</string>
     <string name="settings_category_composer">Editor de mensagem</string>
     <string name="room_settings_enable_encryption">Ativar encriptação ponta-a-ponta…</string>
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index 7158554833..951ffedbac 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -37,10 +37,13 @@
     <color name="vctr_home_drawer_header_background_black">#FF000000</color>
 
     <!-- For Android status bar and navigation bar -->
-    <color name="android_status_bar_background_light">#FFF3F8FD</color>
-    <color name="android_navigation_bar_background_light">#FFF3F8FD</color>
-    <color name="android_status_bar_background_dark">#FF22262E</color>
-    <color name="android_navigation_bar_background_dark">#FF22262E</color>
+    <color name="android_status_bar_background_light">@color/element_system_light</color>
+    <color name="android_navigation_bar_background_light">@color/element_system_light</color>
+    <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_alert_dialog.xml b/vector/src/main/res/values/styles_alert_dialog.xml
new file mode 100644
index 0000000000..08ce9d4dda
--- /dev/null
+++ b/vector/src/main/res/values/styles_alert_dialog.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorAlertDialogStyleLight" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+        <item name="colorPrimary">@color/palette_element_green</item>
+        <item name="colorSecondary">@color/palette_element_green</item>
+        <item name="colorSurface">@color/element_system_light</item>
+        <item name="colorOnSurface">@color/element_content_primary_light</item>
+        <item name="colorError">@color/element_alert_light</item>
+        <!--item name="alertDialogStyle">@style/MaterialAlertDialog.App</item>
+        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.App.Title.Text</item>
+        <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>
+        <item name="buttonBarNeutralButtonStyle">@style/Widget.App.Button</item-->
+    </style>
+
+    <style name="VectorAlertDialogStyleDark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+        <item name="colorPrimary">@color/palette_element_green</item>
+        <item name="colorSecondary">@color/palette_element_green</item>
+        <item name="colorSurface">@color/element_system_dark</item>
+        <item name="colorOnSurface">@color/element_content_primary_dark</item>
+        <item name="colorError">@color/element_alert_dark</item>
+        <!--item name="alertDialogStyle">@style/MaterialAlertDialog.App</item>
+        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.App.Title.Text</item>
+        <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>
+        <item name="buttonBarNeutralButtonStyle">@style/Widget.App.Button</item-->
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_attachments.xml b/vector/src/main/res/values/styles_attachments.xml
new file mode 100644
index 0000000000..18c2e3f95f
--- /dev/null
+++ b/vector/src/main/res/values/styles_attachments.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AttachmentTypeSelectorButton">
+        <item name="android:layout_width">56dp</item>
+        <item name="android:layout_height">56dp</item>
+        <item name="android:scaleType">center</item>
+    </style>
+
+    <style name="AttachmentTypeSelectorLabel">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">?vctr_content_primary</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:layout_marginTop">8dp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_bottom_navigation.xml b/vector/src/main/res/values/styles_bottom_navigation.xml
new file mode 100644
index 0000000000..ddd5e7d30a
--- /dev/null
+++ b/vector/src/main/res/values/styles_bottom_navigation.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorBottomNavigation" parent="Widget.MaterialComponents.BottomNavigationView">
+        <item name="android:background">@drawable/bg_bottom_navigation</item>
+        <item name="itemBackground">@drawable/bg_bottom_navigation</item>
+        <item name="itemIconSize">20dp</item>
+        <item name="itemIconTint">@color/bottom_navigation_icon_tint_selector</item>
+        <item name="labelVisibilityMode">unlabeled</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_bottom_sheet.xml b/vector/src/main/res/values/styles_bottom_sheet.xml
new file mode 100644
index 0000000000..f244a80969
--- /dev/null
+++ b/vector/src/main/res/values/styles_bottom_sheet.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- BottomSheet theming -->
+    <style name="Vector.BottomSheet.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+        <item name="colorPrimary">@color/element_accent_light</item>
+        <item name="colorSecondary">@color/palette_element_green</item>
+        <item name="colorSurface">@color/element_background_light</item>
+        <item name="colorOnSurface">@color/element_content_primary_light</item>
+        <item name="colorError">@color/element_alert_light</item>
+        <!-- Default color for text View -->
+        <item name="android:textColorTertiary">@color/element_content_primary_light</item>
+        <item name="android:textColorLink">@color/element_link_light</item>
+    </style>
+
+    <style name="Vector.BottomSheet.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
+        <item name="colorPrimary">@color/element_accent_dark</item>
+        <item name="colorSecondary">@color/palette_element_green</item>
+        <item name="colorSurface">@color/element_background_dark</item>
+        <item name="colorOnSurface">@color/element_content_primary_dark</item>
+        <item name="colorError">@color/element_alert_dark</item>
+        <!-- Default color for text View -->
+        <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
+        <item name="android:textColorLink">@color/element_link_dark</item>
+    </style>
+
+    <style name="Vector.BottomSheet.Black" parent="Vector.BottomSheet.Dark">
+        <item name="colorSurface">@color/element_background_black</item>
+    </style>
+
+    <!-- BottomSheet style -->
+    <style name="BottomSheetItemTextMain">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:lines">1</item>
+        <item name="android:textColor">?vctr_content_primary</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="BottomSheetItemTextSecondary">
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:textColor">?vctr_content_secondary</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="BottomSheetItemTime">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:lines">1</item>
+        <item name="android:textColor">?vctr_content_secondary</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_edit_text.xml b/vector/src/main/res/values/styles_edit_text.xml
new file mode 100644
index 0000000000..586e77ffe7
--- /dev/null
+++ b/vector/src/main/res/values/styles_edit_text.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Default style for TextInputLayout -->
+    <style name="VectorTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
+
+    <style name="ComposerEditTextStyle" parent="Widget.AppCompat.EditText">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:inputType">textCapSentences|textMultiLine</item>
+        <item name="android:maxLines">12</item>
+        <item name="android:minHeight">48dp</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">?vctr_message_text_color</item>
+    </style>
+
+    <!-- Styles for login screen -->
+    <style name="LoginEditTextStyle" parent="Widget.AppCompat.EditText">
+        <item name="android:textSize">16sp</item>
+    </style>
+
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_label.xml b/vector/src/main/res/values/styles_label.xml
new file mode 100644
index 0000000000..3f38855430
--- /dev/null
+++ b/vector/src/main/res/values/styles_label.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorLabel">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">?vctr_fab_label_color</item>
+        <item name="android:background">@drawable/vector_label_background</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_popup.xml b/vector/src/main/res/values/styles_popup.xml
new file mode 100644
index 0000000000..dbc292b8c8
--- /dev/null
+++ b/vector/src/main/res/values/styles_popup.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Vector.PopupMenuBase" parent="Widget.AppCompat.PopupMenu">
+        <item name="android:textColor">?vctr_content_primary</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:dropDownHorizontalOffset">0dp</item>
+        <item name="android:dropDownVerticalOffset">0dp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_progress.xml b/vector/src/main/res/values/styles_progress.xml
new file mode 100644
index 0000000000..73e8a075e1
--- /dev/null
+++ b/vector/src/main/res/values/styles_progress.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="FileProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:progressDrawable">@drawable/file_progress_bar</item>
+        <item name="android:minHeight">10dp</item>
+        <item name="android:maxHeight">40dp</item>
+    </style>
+
+    <style name="VectorHorizontalProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
deleted file mode 100644
index 56f7f95d87..0000000000
--- a/vector/src/main/res/values/styles_riot.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- ************************ 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>
-        <item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>
-        <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>
-
-    <style name="VectorAppBarLayoutStyle" parent="Widget.MaterialComponents.AppBarLayout.Primary">
-        <item name="android:background">?android:colorBackground</item>
-    </style>
-
-    <style name="VectorAlertDialogStyleLight" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="colorPrimary">@color/palette_element_green</item>
-        <item name="colorSecondary">@color/palette_element_green</item>
-        <item name="colorSurface">@color/element_system_light</item>
-        <item name="colorOnSurface">@color/element_content_primary_light</item>
-        <item name="colorError">@color/element_alert_light</item>
-        <!--item name="alertDialogStyle">@style/MaterialAlertDialog.App</item>
-        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.App.Title.Text</item>
-        <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>
-        <item name="buttonBarNeutralButtonStyle">@style/Widget.App.Button</item-->
-    </style>
-
-    <style name="VectorAlertDialogStyleDark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="colorPrimary">@color/palette_element_green</item>
-        <item name="colorSecondary">@color/palette_element_green</item>
-        <item name="colorSurface">@color/element_system_dark</item>
-        <item name="colorOnSurface">@color/element_content_primary_dark</item>
-        <item name="colorError">@color/element_alert_dark</item>
-        <!--item name="alertDialogStyle">@style/MaterialAlertDialog.App</item>
-        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.App.Title.Text</item>
-        <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>
-        <item name="buttonBarNeutralButtonStyle">@style/Widget.App.Button</item-->
-    </style>
-
-    <!-- TextInputLayout -->
-    <style name="VectorTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
-
-    <style name="Vector.PopupMenuBase" parent="Widget.AppCompat.PopupMenu">
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:dropDownHorizontalOffset">0dp</item>
-        <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>
-    </style>
-
-
-    <style name="VectorSearchView" parent="Widget.AppCompat.SearchView">
-        <item name="searchIcon">@drawable/ic_search</item>
-        <item name="closeIcon">@drawable/ic_x_gray</item>
-        <item name="iconifiedByDefault">false</item>
-    </style>
-
-    <!-- BottomSheet theming -->
-    <style name="Vector.BottomSheet.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
-        <item name="colorPrimary">@color/element_accent_light</item>
-        <item name="colorSecondary">@color/palette_element_green</item>
-        <item name="colorSurface">@color/element_background_light</item>
-        <item name="colorOnSurface">@color/element_content_primary_light</item>
-        <item name="colorError">@color/element_alert_light</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/element_content_primary_light</item>
-        <item name="android:textColorLink">@color/element_link_light</item>
-    </style>
-
-    <style name="Vector.BottomSheet.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
-        <item name="colorPrimary">@color/element_accent_dark</item>
-        <item name="colorSecondary">@color/palette_element_green</item>
-        <item name="colorSurface">@color/element_background_dark</item>
-        <item name="colorOnSurface">@color/element_content_primary_dark</item>
-        <item name="colorError">@color/element_alert_dark</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
-        <item name="android:textColorLink">@color/element_link_dark</item>
-    </style>
-
-    <style name="Vector.BottomSheet.Black" parent="Vector.BottomSheet.Dark">
-        <item name="colorSurface">@color/element_background_black</item>
-    </style>
-
-    <style name="TimelineContentStubBaseParams">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">8dp</item>
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginEnd">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
-        <item name="android:layout_marginBottom">4dp</item>
-        <item name="android:layout_marginTop">4dp</item>
-    </style>
-
-    <style name="VectorLabel">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:paddingLeft">12dp</item>
-        <item name="android:paddingRight">12dp</item>
-        <item name="android:paddingTop">4dp</item>
-        <item name="android:paddingBottom">4dp</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">?vctr_fab_label_color</item>
-        <item name="android:background">@drawable/vector_label_background</item>
-    </style>
-
-    <style name="BottomSheetItemTextMain">
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:lines">1</item>
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="BottomSheetItemTextSecondary">
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="BottomSheetItemTime">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:lines">1</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-
-    <style name="AttachmentTypeSelectorButton">
-        <item name="android:layout_width">56dp</item>
-        <item name="android:layout_height">56dp</item>
-        <item name="android:scaleType">center</item>
-    </style>
-
-    <style name="AttachmentTypeSelectorLabel">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:layout_marginTop">8dp</item>
-    </style>
-
-    <style name="FileProgressBar" parent="android:Widget.ProgressBar.Horizontal">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@drawable/file_progress_bar</item>
-        <item name="android:minHeight">10dp</item>
-        <item name="android:maxHeight">40dp</item>
-    </style>
-
-    <style name="ComposerEditTextStyle" parent="Widget.AppCompat.EditText">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:inputType">textCapSentences|textMultiLine</item>
-        <item name="android:maxLines">12</item>
-        <item name="android:minHeight">48dp</item>
-        <item name="android:padding">8dp</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">?vctr_message_text_color</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_search_view.xml b/vector/src/main/res/values/styles_search_view.xml
new file mode 100644
index 0000000000..5cf6db538f
--- /dev/null
+++ b/vector/src/main/res/values/styles_search_view.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorSearchView" parent="Widget.AppCompat.SearchView">
+        <item name="searchIcon">@drawable/ic_search</item>
+        <item name="closeIcon">@drawable/ic_x_gray</item>
+        <item name="iconifiedByDefault">false</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_timeline.xml b/vector/src/main/res/values/styles_timeline.xml
new file mode 100644
index 0000000000..7fd7eac0ec
--- /dev/null
+++ b/vector/src/main/res/values/styles_timeline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TimelineContentStubBaseParams">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginStart">8dp</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginEnd">8dp</item>
+        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_marginBottom">4dp</item>
+        <item name="android:layout_marginTop">4dp</item>
+    </style>
+
+</resources>
\ No newline at end of file
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..faca4feb25
--- /dev/null
+++ b/vector/src/main/res/values/styles_toolbar.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorAppBarLayoutStyle" parent="Widget.MaterialComponents.AppBarLayout.Primary">
+        <item name="android:background">?vctr_toolbar_background</item>
+        <item name="elevation">4dp</item>
+    </style>
+
+    <style name="VectorToolbarBase" parent="Widget.MaterialComponents.Toolbar">
+        <item name="android:background">?vctr_toolbar_background</item>
+        <item name="elevation">0dp</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>
+
+    <!-- Action mode style -->
+    <style name="VectorActionMode" parent="Widget.AppCompat.ActionMode">
+        <item name="background">?android:colorBackground</item>
+        <item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
+        <item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>
+        <item name="actionMenuTextColor">?colorOnPrimary</item>
+    </style>
+
+    <style name="Vector.Toolbar.Profile" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+        <item name="colorControlNormal">?colorSecondary</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..0eb46baee0 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,14 +66,18 @@
 
         <!-- 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 -->
+        <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
+        <item name="searchViewStyle">@style/VectorSearchView</item>
         <item name="textInputStyle">@style/VectorTextInputLayout</item>
-
-        <!-- Default style for AppBarLayout -->
         <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
+        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Dark</item>
+        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
+        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
+        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
+        <item name="actionModeStyle">@style/VectorActionMode</item>
 
         <item name="android:textColorLink">@color/element_link_dark</item>
 
@@ -89,34 +94,8 @@
         <!-- 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>
-
-        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
-
-        <!-- no divider -->
-        <item name="android:actionBarDivider">@null</item>
-
-        <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Dark</item>
-
-        <!-- SnackBar -->
-        <!-- Style to use for SnackBars in this theme. -->
-        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
-        <!-- Style to use for action button within a SnackBar in this theme. -->
-        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
-        <!-- Style to use for message text within a SnackBar in this theme. -->
-        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
-
         <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
         <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
         <item name="pf_title">@style/PinCodeTitleStyle</item>
@@ -142,8 +121,6 @@
         <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Dark</item>
         <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Dark</item>
         <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Dark</item>
-
-        <item name="actionModeStyle">@style/ActionModeTheme</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 9469b0f5e6..e976ca6e8d 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,14 +66,18 @@
 
         <!-- 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 -->
+        <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
+        <item name="searchViewStyle">@style/VectorSearchView</item>
         <item name="textInputStyle">@style/VectorTextInputLayout</item>
-
-        <!-- Default style for AppBarLayout -->
         <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
+        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Light</item>
+        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
+        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
+        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
+        <item name="actionModeStyle">@style/VectorActionMode</item>
 
         <item name="android:textColorLink">@color/element_link_light</item>
 
@@ -89,34 +94,8 @@
         <!-- 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>
-
-        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
-
-        <!-- no divider -->
-        <item name="android:actionBarDivider">@null</item>
-
-        <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Light</item>
-
-        <!-- SnackBar -->
-        <!-- Style to use for SnackBars in this theme. -->
-        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
-        <!-- Style to use for action button within a SnackBar in this theme. -->
-        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
-        <!-- Style to use for message text within a SnackBar in this theme. -->
-        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
-
         <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
         <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
         <item name="pf_title">@style/PinCodeTitleStyle</item>
@@ -144,8 +123,6 @@
         <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Light</item>
         <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Light</item>
         <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Light</item>
-
-        <item name="actionModeStyle">@style/ActionModeTheme</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />