diff --git a/vector/src/main/res/values-v23/theme_sc.xml b/library/ui-styles/src/main/res/values-v23/theme_sc.xml
similarity index 100%
rename from vector/src/main/res/values-v23/theme_sc.xml
rename to library/ui-styles/src/main/res/values-v23/theme_sc.xml
diff --git a/vector/src/main/res/values-v27/theme_sc.xml b/library/ui-styles/src/main/res/values-v27/theme_sc.xml
similarity index 100%
rename from vector/src/main/res/values-v27/theme_sc.xml
rename to library/ui-styles/src/main/res/values-v27/theme_sc.xml
diff --git a/vector/src/main/res/values/colors_sc.xml b/library/ui-styles/src/main/res/values/colors_sc.xml
similarity index 100%
rename from vector/src/main/res/values/colors_sc.xml
rename to library/ui-styles/src/main/res/values/colors_sc.xml
diff --git a/vector/src/main/res/values/styles_sc.xml b/library/ui-styles/src/main/res/values/styles_sc.xml
similarity index 80%
rename from vector/src/main/res/values/styles_sc.xml
rename to library/ui-styles/src/main/res/values/styles_sc.xml
index 71d0272a99..950cfbfd78 100644
--- a/vector/src/main/res/values/styles_sc.xml
+++ b/library/ui-styles/src/main/res/values/styles_sc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="VectorAlertDialogStyleDark.SC">
+    <style name="VectorAlertDialogStyleDark.SC" parent="AlertDialog.Vector.Dark">
         <item name="colorPrimary">@color/accent_sc</item>
         <item name="colorSecondary">@color/accent_sc</item>
         <item name="colorSurface">@color/background_sc</item>
@@ -9,19 +9,19 @@
         <item name="colorError">@color/element_alert_dark</item>
     </style>
 
-    <style name="VectorAlertDialogStyleLight.SC">
+    <style name="VectorAlertDialogStyleLight.SC" parent="AlertDialog.Vector.Light">
         <item name="colorPrimary">@color/accent_sc</item>
         <item name="colorSecondary">@color/accent_sc</item>
     </style>
 
     <!-- custom action bar -->
-    <style name="Vector.Styled.ActionBar.SC">
+    <style name="Vector.Styled.ActionBar.SC" parent="Widget.Vector.Toolbar.Base">
         <item name="android:background">@color/background_dark_sc</item>
         <item name="background">@color/background_dark_sc</item>
     </style>
 
     <!-- BottomSheet theming -->
-    <style name="Vector.BottomSheet.SC" parent="Vector.BottomSheet.Dark">
+    <style name="Vector.BottomSheet.SC" parent="Theme.Vector.BottomSheetDialog.Dark">
         <item name="colorPrimary">@color/text_color_primary_sc</item>
         <item name="colorSecondary">@color/text_color_secondary_sc</item>
         <item name="colorSurface">@color/background_floating_sc</item>
@@ -37,7 +37,7 @@
         <item name="colorAccent">@color/accent_sc</item>
     </style>
 
-    <style name="Vector.BottomSheet.SC.Light" parent="Vector.BottomSheet.Light">
+    <style name="Vector.BottomSheet.SC.Light" parent="Theme.Vector.BottomSheetDialog.Light">
         <!-- Accent color -->
         <item name="android:colorAccent">@color/accent_sc</item>
         <item name="colorAccent">@color/accent_sc</item>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 22b937ff30..f88bc6bab5 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -124,7 +124,6 @@
         <item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item>
         <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
         <item name="colorAccentPale">@color/element_accent_pale</item>
-        <item name="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined</item>
 
         <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
         <item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item>
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 818c6f3898..89510c0efd 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -124,7 +124,6 @@
         <item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item>
         <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
         <item name="colorAccentPale">@color/element_accent_pale</item>
-        <item name="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined</item>
 
         <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
         <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
diff --git a/vector/src/main/res/values/theme_sc.xml b/library/ui-styles/src/main/res/values/theme_sc.xml
similarity index 89%
rename from vector/src/main/res/values/theme_sc.xml
rename to library/ui-styles/src/main/res/values/theme_sc.xml
index b56e596c96..0166db69ff 100644
--- a/vector/src/main/res/values/theme_sc.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <!-- SC THEME COLORS -->
-    <style name="AppTheme.Base.SC" parent="AppTheme.Base.Black">
+    <style name="AppTheme.Base.SC" parent="Base.Theme.Vector.Black">
         <!-- Element attribute for palette -->
         <!-- content colors -->
         <item name="vctr_content_primary">@color/text_color_primary_sc</item>
@@ -15,7 +15,6 @@
         <item name="vctr_system">@color/background_dark_sc</item>
 
         <!-- other colors -->
-        <item name="vctr_home_drawer_header_background">?android:colorBackground</item>
         <item name="vctr_unread_room_badge">?colorAccent</item>
         <item name="vctr_fab_label_bg">@color/background_floating_sc</item>
         <item name="vctr_fab_label_stroke">@android:color/black</item>
@@ -28,9 +27,9 @@
         <item name="vctr_room_active_widgets_banner_text">?vctr_content_secondary</item>
         <item name="vctr_reaction_background_off">@color/background_sc</item>
         <item name="vctr_reaction_background_on">@color/sc_reaction_background_on_dark</item>
-        <item name="vctr_bottom_nav_icon_color">#ff808080</item>
         <item name="vctr_waiting_background_color">#555555</item>
         <item name="vctr_chat_effect_snow_background">@android:color/transparent</item>
+        <item name="vctr_toolbar_background">@color/background_dark_sc</item>
 
         <!-- room message colors -->
         <item name="vctr_notice_secondary">?vctr_content_secondary</item>
@@ -43,7 +42,7 @@
         <item name="vctr_spoiler_background_color">#FFFFFFFF</item>
 
         <!-- Some alias -->
-        <item name="vctr_header_background">?vctr_content_quinary</item>
+        <item name="vctr_header_background">?vctr_system</item>
         <item name="vctr_list_separator">@color/background_black_sc</item>
         <item name="vctr_list_separator_system">?vctr_system</item>
         <item name="vctr_list_separator_on_surface">?vctr_system</item>
@@ -81,14 +80,6 @@
 
         <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC</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>
-
         <!-- SC additions -->
         <item name="colorAccent">@color/accent_sc</item>
         <item name="android:colorAccent">@color/accent_sc</item>
@@ -105,7 +96,6 @@
     <style name="AppTheme.Base.SC.Dark">
         <item name="riotx_toolbar_bg">@color/background_sc</item>
         <item name="android:colorBackground">@color/background_dark_sc</item>
-        <item name="vctr_home_drawer_header_background">@color/background_sc</item>
         <item name="vctr_header_background">@color/background_sc</item>
 
         <item name="android:statusBarColor">@color/background_dark_sc</item>
diff --git a/vector/src/main/res/values/theme_sc_light.xml b/library/ui-styles/src/main/res/values/theme_sc_light.xml
similarity index 97%
rename from vector/src/main/res/values/theme_sc_light.xml
rename to library/ui-styles/src/main/res/values/theme_sc_light.xml
index c118b495f7..acc6d13000 100644
--- a/vector/src/main/res/values/theme_sc_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <!-- SC THEME COLORS -->
-    <style name="AppTheme.Base.SC.Light" parent="AppTheme.Base.Light">
+    <style name="AppTheme.Base.SC.Light" parent="Base.Theme.Vector.Light">
         <item name="colorPrimary">@color/accent_sc</item>
         <item name="colorPrimaryVariant">@color/accent_sc</item>
         <item name="colorSecondary">@color/accent_sc</item>
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index d398d3e1b3..1ae30450b0 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -75,7 +75,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.SC.Light"
-        tools:replace="android:allowBackup">
+        tools:replace="android:allowBackup,android:theme">
 
         <!-- No limit for screen ratio: avoid black strips -->
         <meta-data
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index f20682274e..54ebde4abc 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -215,7 +215,7 @@ class HomeDetailFragment @Inject constructor(
         callManager.checkForProtocolsSupportIfNeeded()
     }
 
-    private fun checkNotificationTwbStatus() {
+    private fun checkNotificationTabStatus() {
         val wasVisible = views.bottomNavigationView.menu.findItem(R.id.bottom_action_notification).isVisible
         val combinedOverview = vectorPreferences.combinedOverview()
         val combinedOverviewWasVisible = views.bottomNavigationView.menu.findItem(R.id.bottom_action_all).isVisible
@@ -229,11 +229,11 @@ class HomeDetailFragment @Inject constructor(
                 val menuId = it.currentTab.toMenuId()
                 if (combinedOverview) {
                     if (menuId == R.id.bottom_action_people || menuId == R.id.bottom_action_rooms) {
-                        viewModel.handle(HomeDetailAction.SwitchDisplayMode(RoomListDisplayMode.ALL))
+                        viewModel.handle(HomeDetailAction.SwitchTab(HomeTab.RoomList(RoomListDisplayMode.ALL)))
                     }
                 } else {
                     if (menuId == R.id.bottom_action_all) {
-                        viewModel.handle(HomeDetailAction.SwitchDisplayMode(RoomListDisplayMode.PEOPLE))
+                        viewModel.handle(HomeDetailAction.SwitchTab(HomeTab.RoomList(RoomListDisplayMode.PEOPLE)))
                     }
                 }
             }
@@ -243,16 +243,22 @@ class HomeDetailFragment @Inject constructor(
             withState(viewModel) {
                 if (it.currentTab.toMenuId() == R.id.bottom_action_notification) {
                     if (combinedOverview) {
-                        viewModel.handle(HomeDetailAction.SwitchDisplayMode(RoomListDisplayMode.ALL))
+                        viewModel.handle(HomeDetailAction.SwitchTab(HomeTab.RoomList(RoomListDisplayMode.ALL)))
                     } else {
-                        viewModel.handle(HomeDetailAction.SwitchDisplayMode(RoomListDisplayMode.PEOPLE))
+                        viewModel.handle(HomeDetailAction.SwitchTab(HomeTab.RoomList(RoomListDisplayMode.PEOPLE)))
                     }
                 }
             }
         }
         val wasBottomBarVisible = views.bottomNavigationView.isVisible
-        if (wasBottomBarVisible != vectorPreferences.enableOverviewTabs()) {
-            loadNavigationView()
+        viewModel.selectSubscribe(this, HomeDetailViewState::showDialPadTab) { showDialPadTab ->
+            updateTabVisibilitySafely(R.id.bottom_action_dial_pad, showDialPadTab)
+        }
+        withState(viewModel) {
+            val showTabBar = vectorPreferences.enableOverviewTabs() || it.showDialPadTab
+            if (wasBottomBarVisible != showTabBar) {
+                loadNavigationView()
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt b/vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt
index bfde36cc8a..7893afdd3e 100644
--- a/vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/PromptSimplifiedModeActivity.kt
@@ -18,7 +18,7 @@ package im.vector.app.features.login
 
 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
@@ -46,7 +46,7 @@ open class PromptSimplifiedModeActivity : VectorBaseActivity<ActivityLoginBindin
         }
     }
 
-    override fun configure(toolbar: Toolbar) {
+    override fun configure(toolbar: MaterialToolbar) {
         configureToolbar(toolbar)
     }
 
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index c16a32fe76..47904e8fb0 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -61,11 +61,11 @@
 
                 <TextView
                     android:id="@+id/loginServerIKnowMyIdSubmitTitle"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_connect_using_matrix_id_title_sc"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                     android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerIKnowMyIdSubmitText"
@@ -75,12 +75,12 @@
 
                 <TextView
                     android:id="@+id/loginServerIKnowMyIdSubmitText"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/login_connect_using_matrix_id_text_sc"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -104,11 +104,11 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/login_server_other_title_sc"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                     android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
@@ -118,12 +118,12 @@
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherText"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/login_server_other_text_sc"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml b/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
index 8751eb1f32..10c7f4cbc3 100644
--- a/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
+++ b/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
@@ -11,8 +11,8 @@
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/LoginFormContainer">
 
             <ImageView
-                style="@style/LoginLogo"
                 android:id="@+id/loginLogo"
+                style="@style/LoginLogo"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -20,11 +20,12 @@
 
             <TextView
                 android:id="@+id/promptSimplifiedModeTitle"
+                style="@style/Widget.Vector.TextView.Title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
                 android:text="@string/prompt_simplified_mode_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+                android:textColor="?vctr_content_primary"
                 android:transitionName="loginTitleTransition"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -32,12 +33,13 @@
 
             <TextView
                 android:id="@+id/promptSimplifiedModeText"
+                style="@style/Widget.Vector.TextView.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
                 android:gravity="start"
                 android:text="@string/prompt_simplified_mode_text"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+                android:textColor="?vctr_content_secondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/promptSimplifiedModeTitle" />
@@ -60,11 +62,11 @@
 
                 <TextView
                     android:id="@+id/promptSimplifiedModeOnTitle"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/prompt_simplified_mode_on"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                     android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOnText"
@@ -74,12 +76,12 @@
 
                 <TextView
                     android:id="@+id/promptSimplifiedModeOnText"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/prompt_simplified_mode_on_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -104,11 +106,11 @@
 
                 <TextView
                     android:id="@+id/promptSimplifiedModeOffTitle"
+                    style="@style/Widget.Vector.TextView.Body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="start"
                     android:text="@string/prompt_simplified_mode_off"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                     android:textColor="?vctr_content_primary"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOffText"
@@ -118,12 +120,12 @@
 
                 <TextView
                     android:id="@+id/promptSimplifiedModeOffText"
+                    style="@style/Widget.Vector.TextView.Caption"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:gravity="start"
                     android:text="@string/prompt_simplified_mode_off_text"
-                    android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/values/attrs_sc.xml b/vector/src/main/res/values/attrs_sc.xml
index e39c6de7e2..9bce4f35f6 100644
--- a/vector/src/main/res/values/attrs_sc.xml
+++ b/vector/src/main/res/values/attrs_sc.xml
@@ -14,11 +14,6 @@
         <attr name="timestamp_overlay_fg" format="color" />
         <attr name="timestamp_overlay_bg" format="color" />
 
-        <!-- use materialButtonStyle for vectorButtonStyle
-        <attr name="vectorButtonStyle" format="reference" />
-        -->
-        <attr name="vectorButtonStyleOutlined" format="reference" />
-
     </declare-styleable>
 
 </resources>