diff --git a/library/ui-styles/src/main/res/color/edit_text_outline_dark.xml b/library/ui-styles/src/main/res/color/edit_text_outline_dark.xml
new file mode 100644
index 0000000000..7e64f28951
--- /dev/null
+++ b/library/ui-styles/src/main/res/color/edit_text_outline_dark.xml
@@ -0,0 +1,5 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:colorAccent" android:state_focused="true"/>
+    <item android:color="?android:textColorHint"/>
+</selector>
+
diff --git a/vector/src/main/res/values/attrs_sc.xml b/library/ui-styles/src/main/res/values/attrs_sc.xml
similarity index 88%
rename from vector/src/main/res/values/attrs_sc.xml
rename to library/ui-styles/src/main/res/values/attrs_sc.xml
index 9bce4f35f6..09454e6e69 100644
--- a/vector/src/main/res/values/attrs_sc.xml
+++ b/library/ui-styles/src/main/res/values/attrs_sc.xml
@@ -7,13 +7,14 @@
         <attr name="sc_message_bg_outgoing" format="color" />
 
         <attr name="colorAccentPale" format="color" />
-        <attr name="riotx_toolbar_bg" format="color" />
 
         <attr name="riotx_unread_unimportant_room_badge" format="color" />
 
         <attr name="timestamp_overlay_fg" format="color" />
         <attr name="timestamp_overlay_bg" format="color" />
 
+        <attr name="dense_dropdown_text_input" format="reference" />
+
     </declare-styleable>
 
 </resources>
diff --git a/library/ui-styles/src/main/res/values/colors_sc.xml b/library/ui-styles/src/main/res/values/colors_sc.xml
index 70954b28e0..8d1accc342 100644
--- a/library/ui-styles/src/main/res/values/colors_sc.xml
+++ b/library/ui-styles/src/main/res/values/colors_sc.xml
@@ -27,7 +27,8 @@
     <color name="background_floating_sc">#ff424242</color>
     <color name="background_touch_guard_sc">#bf000000</color>
 
-    <color name="list_divider_color_sc">#80ffffff</color>
+    <color name="list_divider_color_sc">#1fffffff</color>
+    <color name="list_divider_color_sc_light">#1f000000</color>
 
     <color name="timestamp_overlay_fg">#ffffff</color>
     <color name="timestamp_overlay_bg">#80000000</color>
diff --git a/library/ui-styles/src/main/res/values/styles_sc.xml b/library/ui-styles/src/main/res/values/styles_sc.xml
index 950cfbfd78..bc6bd1bfd2 100644
--- a/library/ui-styles/src/main/res/values/styles_sc.xml
+++ b/library/ui-styles/src/main/res/values/styles_sc.xml
@@ -4,7 +4,7 @@
     <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>
+        <item name="colorSurface">@color/background_dark_sc</item>
         <item name="colorOnSurface">@color/text_color_primary_sc</item>
         <item name="colorError">@color/element_alert_dark</item>
     </style>
@@ -15,16 +15,16 @@
     </style>
 
     <!-- custom action bar -->
-    <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 name="Vector.Styled.ActionBar.SC" parent="Widget.Vector.Toolbar">
+        <item name="android:background">@color/background_sc</item>
+        <item name="background">@color/background_sc</item>
     </style>
 
     <!-- BottomSheet theming -->
     <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>
+        <item name="colorPrimary">?android:colorAccent</item>
+        <item name="colorSecondary">?android:colorAccent</item>
+        <item name="colorSurface">@color/background_dark_sc</item>
         <item name="colorOnSurface">@color/text_color_primary_sc</item>
         <item name="colorError">@color/element_alert_dark</item>
         <!-- Default color for text View -->
@@ -41,6 +41,23 @@
         <!-- Accent color -->
         <item name="android:colorAccent">@color/accent_sc</item>
         <item name="colorAccent">@color/accent_sc</item>
+        <item name="colorPrimary">?android:colorAccent</item>
+        <item name="colorSecondary">?android:colorAccent</item>
+    </style>
+
+    <style name="Widget.Vector.TextInputLayout.Dark.SC" parent="Widget.Vector.TextInputLayout">
+        <!-- WTF? Why is this required for dark theme? Since v1.1.10/v1.1.11 merge -->
+        <!-- While this works to get hint showing for text inputs during login again... this seems like a bad idea
+        <item name="android:textColorHint">?android:textColorHint</item>
+        -->
+        <item name="android:textColorHint">@color/text_color_disabled_sc</item>
+        <item name="boxStrokeColor">@color/edit_text_outline_dark</item>
+    </style>
+
+    <style name="Widget.Vector.TextInputLayout.Dense.ExposedDropdownMenu.Dark.SC" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu">
+        <!-- Same comments as for Widget.Vector.TextInputLayout.Dark.SC apply -->
+        <item name="android:textColorHint">@color/text_color_disabled_sc</item>
+        <item name="boxStrokeColor">@color/edit_text_outline_dark</item>
     </style>
 
 </resources>
diff --git a/library/ui-styles/src/main/res/values/styles_text_view.xml b/library/ui-styles/src/main/res/values/styles_text_view.xml
index 77e32da345..89c5e08a60 100644
--- a/library/ui-styles/src/main/res/values/styles_text_view.xml
+++ b/library/ui-styles/src/main/res/values/styles_text_view.xml
@@ -10,7 +10,9 @@
     <!-- Note: lineHeight attribute cannot be added in textAppearance style -->
     <style name="Widget.Vector.TextView.Title">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Title</item>
+        <!--
         <item name="lineHeight">32sp</item>
+        -->
     </style>
 
     <style name="Widget.Vector.TextView.Title.Medium">
@@ -31,7 +33,9 @@
 
     <style name="Widget.Vector.TextView.Body">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
+        <!--
         <item name="lineHeight">20sp</item>
+        -->
     </style>
 
     <style name="Widget.Vector.TextView.Body.Medium">
@@ -40,12 +44,16 @@
 
     <style name="Widget.Vector.TextView.Caption">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item>
+        <!--
         <item name="lineHeight">16sp</item>
+        -->
     </style>
 
     <style name="Widget.Vector.TextView.Micro">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item>
+        <!--
         <item name="lineHeight">16sp</item>
+        -->
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_timeline.xml b/library/ui-styles/src/main/res/values/styles_timeline.xml
index 7fd7eac0ec..56554ac0b1 100644
--- a/library/ui-styles/src/main/res/values/styles_timeline.xml
+++ b/library/ui-styles/src/main/res/values/styles_timeline.xml
@@ -4,12 +4,12 @@
     <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>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginLeft">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:layout_marginRight">0dp</item>
+        <item name="android:layout_marginBottom">0dp</item>
+        <item name="android:layout_marginTop">0dp</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_toolbar.xml b/library/ui-styles/src/main/res/values/styles_toolbar.xml
index 9f6ba102ed..9a543cc5f9 100644
--- a/library/ui-styles/src/main/res/values/styles_toolbar.xml
+++ b/library/ui-styles/src/main/res/values/styles_toolbar.xml
@@ -35,4 +35,4 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library/ui-styles/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
index 88192f70e6..e81b20b432 100644
--- a/library/ui-styles/src/main/res/values/text_appearances.xml
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -47,8 +47,10 @@
 
     <!-- Note: this is the default text appearance for all the TextViews -->
     <style name="TextAppearance.Vector.Body" parent="TextAppearance.MaterialComponents.Body1">
+        <!--
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
+        -->
         <item name="android:textSize">14sp</item>
         <item name="android:letterSpacing">0</item>
         <item name="android:textColor">?vctr_content_primary</item>
diff --git a/library/ui-styles/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
index c472a4fae5..9a1ed6d385 100644
--- a/library/ui-styles/src/main/res/values/theme_black.xml
+++ b/library/ui-styles/src/main/res/values/theme_black.xml
@@ -7,7 +7,9 @@
         <!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting -->
 
         <!-- other colors -->
+        <!--
         <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_black</item>
+        -->
         <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_black</item>
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_black</item>
         <item name="vctr_fab_label_color">@color/vctr_fab_label_color_black</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 f88bc6bab5..c3113b2d65 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -16,7 +16,7 @@
         <item name="vctr_system">@color/element_system_dark</item>
 
         <!-- other colors -->
-        <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_dark</item>
+        <item name="vctr_unread_room_badge">?colorPrimary</item>
         <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_dark</item>
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_dark</item>
         <item name="vctr_fab_label_color">@color/vctr_fab_label_color_dark</item>
@@ -119,11 +119,11 @@
         <!-- SC additions -->
         <item name="sc_message_bg_incoming">#FF465561</item>
         <item name="sc_message_bg_outgoing">#ff343b47</item>
-        <item name="riotx_toolbar_bg">?android:colorBackground</item>
         <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_dark</item>
         <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="dense_dropdown_text_input">@style/Widget.Vector.TextInputLayout.Dense.ExposedDropdownMenu.Dark.SC</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 89510c0efd..d1156dafd1 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -119,11 +119,11 @@
         <!-- SC additions -->
         <item name="sc_message_bg_incoming">#FFEEEEEE</item>
         <item name="sc_message_bg_outgoing">#FFDDDDDD</item>
-        <item name="riotx_toolbar_bg">?android:colorBackground</item>
         <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_light</item>
         <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="dense_dropdown_text_input">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu</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/library/ui-styles/src/main/res/values/theme_sc.xml b/library/ui-styles/src/main/res/values/theme_sc.xml
index 0166db69ff..f315a836f7 100644
--- a/library/ui-styles/src/main/res/values/theme_sc.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc.xml
@@ -22,14 +22,14 @@
         <item name="vctr_touch_guard_bg">@color/background_touch_guard_sc</item>
         <item name="vctr_keys_backup_banner_accent_color">@color/background_floating_sc</item>
         <item name="vctr_attachment_selector_background">?colorBackgroundFloating</item>
-        <item name="vctr_attachment_selector_border">@color/background_dark_sc</item>
+        <item name="vctr_attachment_selector_border">@color/list_divider_color_sc</item>
         <item name="vctr_room_active_widgets_banner_bg">@color/background_floating_sc</item>
         <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_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>
+        <item name="vctr_toolbar_background">?android:colorBackground</item>
 
         <!-- room message colors -->
         <item name="vctr_notice_secondary">?vctr_content_secondary</item>
@@ -42,10 +42,10 @@
         <item name="vctr_spoiler_background_color">#FFFFFFFF</item>
 
         <!-- Some alias -->
-        <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>
+        <item name="vctr_header_background">?android:colorBackground</item>
+        <item name="vctr_list_separator">@color/list_divider_color_sc</item>
+        <item name="vctr_list_separator_system">?vctr_list_separator</item>
+        <item name="vctr_list_separator_on_surface">?vctr_list_separator</item>
 
         <!-- Material color -->
         <item name="colorPrimary">?colorAccent</item>
@@ -56,9 +56,9 @@
         <item name="colorOnSecondary">?vctr_content_primary</item>
         <item name="colorError">@color/element_alert_dark</item>
         <item name="colorOnError">?vctr_content_primary</item>
-        <item name="colorSurface">@color/element_system_dark</item>
+        <item name="colorSurface">?android:colorBackground</item>
         <item name="colorOnSurface">?vctr_content_primary</item>
-        <item name="android:colorBackground">@color/background_dark_sc</item>
+        <item name="android:colorBackground">@color/background_black_sc</item>
         <item name="colorOnBackground">?vctr_content_primary</item>
 
         <!-- TODO styles? -->
@@ -71,8 +71,7 @@
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">?vctr_content_tertiary</item>
 
-        <!-- TODO styles? -->
-        <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark.SC</item>
+        <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark.SC</item>
 
         <!-- custom action bar -->
         <item name="android:actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
@@ -85,16 +84,18 @@
         <item name="android:colorAccent">@color/accent_sc</item>
         <item name="sc_message_bg_incoming">@color/background_floating_sc</item>
         <item name="sc_message_bg_outgoing">@color/background_sc</item>
-        <item name="riotx_toolbar_bg">?android:colorBackground</item>
         <item name="riotx_unread_unimportant_room_badge">@color/background_floating_sc</item>
         <item name="colorAccentPale">@color/accent_sc_pale</item>
 
         <item name="android:statusBarColor">@color/background_black_sc</item>
         <item name="android:navigationBarColor">@color/background_black_sc</item>
+
+        <!-- Broken login screen outline color on dark theme  otherwise? -->
+        <item name="textInputStyle">@style/Widget.Vector.TextInputLayout.Dark.SC</item>
     </style>
 
     <style name="AppTheme.Base.SC.Dark">
-        <item name="riotx_toolbar_bg">@color/background_sc</item>
+        <item name="vctr_toolbar_background">@color/background_sc</item>
         <item name="android:colorBackground">@color/background_dark_sc</item>
         <item name="vctr_header_background">@color/background_sc</item>
 
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light.xml b/library/ui-styles/src/main/res/values/theme_sc_light.xml
index acc6d13000..fdc636ab36 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light.xml
@@ -11,7 +11,7 @@
         <!-- Keep color accent for legacy widget-->
         <item name="colorAccent">@color/accent_sc</item>
 
-        <item name="alertDialogTheme">@style/VectorAlertDialogStyleLight.SC</item>
+        <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight.SC</item>
 
         <item name="vctr_encrypting_message_text_color">@color/accent_sc</item>
 
@@ -22,8 +22,7 @@
         <!-- SC additions -->
         <item name="sc_message_bg_incoming">#FFEEEEEE</item>
         <item name="sc_message_bg_outgoing">@color/accent_sc_alpha12</item>
-        <item name="riotx_toolbar_bg">?android:colorBackground</item>
-        <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_light</item>
+        <item name="riotx_unread_unimportant_room_badge">?vctr_content_tertiary</item>
         <item name="colorAccentPale">@color/accent_sc_pale</item>
 
         <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light</item>
@@ -44,6 +43,11 @@
 
         <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_light</item>
         <item name="vctr_reaction_background_on">@color/sc_reaction_background_on_light</item>
+
+        <!-- Some alias -->
+        <item name="vctr_list_separator">@color/list_divider_color_sc_light</item>
+        <item name="vctr_list_separator_system">?vctr_list_separator</item>
+        <item name="vctr_list_separator_on_surface">?vctr_list_separator</item>
     </style>
 
     <!-- Default AppTheme for usage where settings don't apply -->
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 b23c53cdd0..fb6827d7e2 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
@@ -17,6 +17,7 @@
 package im.vector.app.features.home.room.detail.composer
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.net.Uri
 import android.text.Editable
 import android.util.AttributeSet
@@ -33,6 +34,7 @@ import androidx.transition.TransitionManager
 import androidx.transition.TransitionSet
 import im.vector.app.R
 import im.vector.app.databinding.ComposerLayoutBinding
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * Encapsulate the timeline composer UX.
@@ -72,6 +74,7 @@ class TextComposerView @JvmOverloads constructor(
 
             override fun onTextBlankStateChanged(isBlank: Boolean) {
                 callback?.onTextBlankStateChanged(isBlank)
+                /*
                 val shouldBeVisible = currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded || !isBlank
                 TransitionManager.endTransitions(this@TextComposerView)
                 if (views.sendButton.isVisible != shouldBeVisible) {
@@ -81,6 +84,8 @@ class TextComposerView @JvmOverloads constructor(
                     )
                     views.sendButton.isVisible = shouldBeVisible
                 }
+                 */
+                updateSendButtonColor(isBlank)
             }
         }
         views.composerRelatedMessageCloseButton.setOnClickListener {
@@ -98,6 +103,11 @@ class TextComposerView @JvmOverloads constructor(
         }
     }
 
+    private fun updateSendButtonColor(isBlank: Boolean) {
+        val color = ThemeUtils.getColor(views.sendButton.context, if (isBlank) R.attr.vctr_content_tertiary else R.attr.colorAccent)
+        views.sendButton.imageTintList = ColorStateList.valueOf(color)
+    }
+
     fun collapse(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) {
         if (currentConstraintSetId == R.layout.composer_layout_constraint_set_compact) {
             // ignore we good
@@ -105,7 +115,7 @@ class TextComposerView @JvmOverloads constructor(
         }
         currentConstraintSetId = R.layout.composer_layout_constraint_set_compact
         applyNewConstraintSet(animate, transitionComplete)
-        views.sendButton.isVisible = !views.composerEditText.text.isNullOrEmpty()
+        //views.sendButton.isVisible = !views.composerEditText.text.isNullOrEmpty()
     }
 
     fun expand(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) {
@@ -115,7 +125,7 @@ class TextComposerView @JvmOverloads constructor(
         }
         currentConstraintSetId = R.layout.composer_layout_constraint_set_expanded
         applyNewConstraintSet(animate, transitionComplete)
-        views.sendButton.isVisible = true
+        //views.sendButton.isVisible = true
     }
 
     private fun applyNewConstraintSet(animate: Boolean, transitionComplete: (() -> Unit)?) {
diff --git a/vector/src/main/res/drawable/ic_radio_off.xml b/vector/src/main/res/drawable/ic_radio_off.xml
index 90524c7ac2..54ffa02363 100644
--- a/vector/src/main/res/drawable/ic_radio_off.xml
+++ b/vector/src/main/res/drawable/ic_radio_off.xml
@@ -2,9 +2,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?android:attr/textColorHint">
   <path
       android:pathData="M12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2ZM12,20C7.6,20 4,16.4 4,12C4,7.6 7.6,4 12,4C16.4,4 20,7.6 20,12C20,16.4 16.4,20 12,20Z"
-      android:fillColor="#8E99A4"
+      android:fillColor="#808080"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_radio_on.xml b/vector/src/main/res/drawable/ic_radio_on.xml
index 5cda8285e6..14d33bcf80 100644
--- a/vector/src/main/res/drawable/ic_radio_on.xml
+++ b/vector/src/main/res/drawable/ic_radio_on.xml
@@ -2,13 +2,14 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorAccent">
   <group>
     <clip-path
         android:pathData="M12,7C9.2,7 7,9.2 7,12C7,14.8 9.2,17 12,17C14.8,17 17,14.8 17,12C17,9.2 14.8,7 12,7V7ZM12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2V2ZM12,20C7.6,20 4,16.4 4,12C4,7.6 7.6,4 12,4C16.4,4 20,7.6 20,12C20,16.4 16.4,20 12,20V20Z"
         android:fillType="evenOdd"/>
     <path
         android:pathData="M2,2h20v20h-20z"
-        android:fillColor="#0DBD8B"/>
+        android:fillColor="#808080" />
   </group>
 </vector>
diff --git a/vector/src/main/res/drawable/line_divider_sc.xml b/vector/src/main/res/drawable/line_divider_sc.xml
deleted file mode 100644
index 7c37b022e3..0000000000
--- a/vector/src/main/res/drawable/line_divider_sc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size
-        android:width="1dp"
-        android:height="1dp" />
-
-    <solid android:color="@color/list_divider_color_sc" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index f85f51c462..118a23a73a 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -94,7 +94,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/option_send_files"
         android:src="@drawable/ic_attachment"
-        android:tint="?android:textColorHint"
+        app:tint="?android:textColorHint"
         tools:ignore="MissingConstraints" />
 
     <FrameLayout
@@ -120,7 +120,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/a11y_open_emoji_picker"
         android:src="@drawable/ic_insert_emoji"
-        app:tint="?vctr_content_tertiary"
+        app:tint="?android:textColorHint"
         tools:ignore="MissingConstraints,MissingPrefix" />
 
     <ImageButton
@@ -130,6 +130,7 @@
         android:background="@drawable/bg_send"
         android:contentDescription="@string/send"
         android:src="@drawable/ic_send"
+        app:tint="?vctr_content_tertiary"
         tools:ignore="MissingConstraints" />
 
 </merge>
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index a1ddd62049..4d56b284c0 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -114,7 +114,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/option_send_files"
         android:src="@drawable/ic_attachment"
-        android:tint="?android:textColorHint"
+        app:tint="?android:textColorHint"
         app:layout_constraintBottom_toBottomOf="@id/sendButton"
         app:layout_constraintEnd_toStartOf="@+id/sendButton"
         app:layout_constraintStart_toEndOf="@id/composerEditText"
@@ -126,11 +126,12 @@
         android:id="@+id/composerEditTextOuterBorder"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/sendButton"
-        app:layout_constraintStart_toEndOf="@id/attachmentButton"
+        app:layout_constraintStart_toEndOf="@id/composerEmojiButton"
+        app:layout_constraintEnd_toStartOf="@id/attachmentButton"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginEnd="12dp" />
 
@@ -157,7 +158,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/a11y_open_emoji_picker"
         android:src="@drawable/ic_insert_emoji"
-        android:tint="?vctr_content_quaternary"
+        app:tint="?android:textColorHint"
         app:layout_constraintBottom_toBottomOf="@id/sendButton"
         app:layout_constraintEnd_toStartOf="@+id/composerEditText"
         app:layout_constraintStart_toStartOf="parent"
@@ -172,7 +173,6 @@
         android:contentDescription="@string/send"
         android:scaleType="center"
         android:src="@drawable/ic_send"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/attachmentButton"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 73d4a3ad6a..7931cce2b3 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -127,7 +127,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/option_send_files"
         android:src="@drawable/ic_attachment"
-        android:tint="?android:textColorHint"
+        app:tint="?android:textColorHint"
         app:layout_constraintEnd_toStartOf="@+id/sendButton"
         app:layout_constraintTop_toBottomOf="parent"
         tools:ignore="MissingPrefix" />
@@ -136,12 +136,12 @@
         android:id="@+id/composerEditTextOuterBorder"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/composerEmojiButton"
         app:layout_constraintEnd_toStartOf="@id/sendButton"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
         app:layout_goneMarginEnd="12dp" />
 
@@ -171,7 +171,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/sendButton"
         app:layout_constraintEnd_toStartOf="@+id/composerEditText"
         app:layout_constraintStart_toStartOf="parent"
-        app:tint="?vctr_content_quaternary"
+        app:tint="?android:textColorHint"
         tools:ignore="MissingPrefix" />
 
     <ImageButton
@@ -182,7 +182,6 @@
         android:contentDescription="@string/send"
         android:scaleType="center"
         android:src="@drawable/ic_send"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index 0a5c10935a..a2396e8dff 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -55,7 +55,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginServerUrlFormHomeServerUrlTil"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                style="?dense_dropdown_text_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="26dp"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
index 6038cfaedd..3ec13ea9b6 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
@@ -26,7 +26,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginServerUrlFormHomeServerUrlTil"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                style="?dense_dropdown_text_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="26dp"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index d741b0a0af..8cda90b542 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -178,7 +178,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:colorBackground"
-        android:minHeight="56dp"
+        android:minHeight="48dp"
         android:transitionName="composer"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_generic_footer.xml b/vector/src/main/res/layout/item_generic_footer.xml
index 4152cb1371..0977fa172b 100644
--- a/vector/src/main/res/layout/item_generic_footer.xml
+++ b/vector/src/main/res/layout/item_generic_footer.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?vctr_header_background"
     android:orientation="vertical"
     android:padding="16dp">
 
@@ -14,4 +15,4 @@
         android:gravity="center"
         tools:text="Empty list, nothing here" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 7b5e62dca2..dc4e158d7a 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -11,7 +11,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:background="?vctr_content_tertiary" />
+        android:background="?vctr_list_separator" />
 
     <TextView
         android:id="@+id/itemDayTextView"
@@ -23,6 +23,7 @@
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         android:textColor="?vctr_content_tertiary"
+        android:textSize="15sp"
         tools:text="@tools:sample/date/day_of_week" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 464722a340..7408ca00ac 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -18,6 +18,7 @@
         style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="0dp"
         android:textColor="?vctr_content_primary"
         android:layout_gravity="left"
         tools:text="@sample/messages.json/data/message"
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index 455c5ce9a4..c58d48d999 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -5,10 +5,9 @@
     android:id="@+id/itemVerificationClickableZone"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground"
+    android:background="?attr/selectableItemBackground"
     android:minHeight="64dp"
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"