diff --git a/res/layout-sw400dp/activity_register.xml b/res/layout-sw400dp/activity_register.xml
index eaac89bcf9..8cc432c160 100644
--- a/res/layout-sw400dp/activity_register.xml
+++ b/res/layout-sw400dp/activity_register.xml
@@ -71,9 +71,9 @@
         android:layout_marginLeft="@dimen/massive_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
         android:gravity="center"
-        android:textColorLink="@color/text"
+        android:textColor="?android:textColorTertiary"
+        android:textColorLink="?colorAccent"
         android:textSize="@dimen/very_small_font_size"
-        android:textColor="@color/text"
         android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw400dp/activity_restore.xml b/res/layout-sw400dp/activity_restore.xml
index 1025380523..bb241b9abf 100644
--- a/res/layout-sw400dp/activity_restore.xml
+++ b/res/layout-sw400dp/activity_restore.xml
@@ -63,9 +63,9 @@
         android:layout_marginLeft="@dimen/massive_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
         android:gravity="center"
-        android:textColorLink="@color/text"
+        android:textColor="?android:textColorTertiary"
+        android:textColorLink="?colorAccent"
         android:textSize="@dimen/very_small_font_size"
-        android:textColor="@color/text"
         android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index f164a88708..ed1ac2526d 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -12,59 +12,67 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:minHeight="?attr/actionBarSize"
-        app:contentInsetLeft="20dp"
-        app:contentInsetRight="20dp">
+        android:layout_height="wrap_content"
+        android:background="?colorPrimary"
+        android:elevation="1dp">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
-                android:id="@+id/profileButton"
-                android:layout_width="@dimen/small_profile_picture_size"
-                android:layout_height="@dimen/small_profile_picture_size"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="9dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="64dp"
-                android:fontFamily="sans-serif-medium"
-                android:text="Session"
-                android:textColor="@color/text"
-                android:textSize="@dimen/very_large_font_size" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <RelativeLayout
-                android:id="@+id/pathStatusViewContainer"
-                android:layout_width="@dimen/small_profile_picture_size"
-                android:layout_height="@dimen/small_profile_picture_size"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true">
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp">
 
-                <org.thoughtcrime.securesms.loki.views.PathStatusView
-                    android:layout_width="@dimen/path_status_view_size"
-                    android:layout_height="@dimen/path_status_view_size"
-                    android:layout_alignParentRight="true"
+                <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+                    android:id="@+id/profileButton"
+                    android:layout_width="@dimen/small_profile_picture_size"
+                    android:layout_height="@dimen/small_profile_picture_size"
+                    android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginRight="8dp" />
+                    android:layout_marginLeft="9dp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="64dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="Session"
+                    android:textColor="@color/text"
+                    android:textSize="@dimen/very_large_font_size" />
+
+                <RelativeLayout
+                    android:id="@+id/pathStatusViewContainer"
+                    android:layout_width="@dimen/small_profile_picture_size"
+                    android:layout_height="@dimen/small_profile_picture_size"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true">
+
+                    <org.thoughtcrime.securesms.loki.views.PathStatusView
+                        android:layout_width="@dimen/path_status_view_size"
+                        android:layout_height="@dimen/path_status_view_size"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginRight="8dp" />
+
+                </RelativeLayout>
 
             </RelativeLayout>
 
-        </RelativeLayout>
+            <org.thoughtcrime.securesms.loki.views.SeedReminderView
+                android:id="@+id/seedReminderView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
 
     </androidx.appcompat.widget.Toolbar>
 
-    <org.thoughtcrime.securesms.loki.views.SeedReminderView
-        android:id="@+id/seedReminderView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/res/layout/activity_register.xml b/res/layout/activity_register.xml
index 7340e9d825..57a64e2fb3 100644
--- a/res/layout/activity_register.xml
+++ b/res/layout/activity_register.xml
@@ -72,9 +72,9 @@
         android:layout_marginLeft="@dimen/massive_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
         android:gravity="center"
-        android:textColorLink="@color/text"
+        android:textColor="?android:textColorTertiary"
+        android:textColorLink="?colorAccent"
         android:textSize="@dimen/very_small_font_size"
-        android:textColor="@color/text"
         android:text="By using this service, you agree to our Terms of Service and Privacy Policy" /> <!-- Intentionally not yet translated -->
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index b2279351a1..5a3f3aaed3 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -9,7 +9,6 @@
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
-        style="@style/Session.DarkActionBar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         app:contentInsetLeft="24dp"
diff --git a/res/layout/media_overview_activity.xml b/res/layout/media_overview_activity.xml
index 3e7238559b..c985986d56 100644
--- a/res/layout/media_overview_activity.xml
+++ b/res/layout/media_overview_activity.xml
@@ -14,7 +14,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                style="@style/Session.DarkActionBar"
+                style="@style/Widget.Session.ActionBar"
                 app:layout_scrollFlags="scroll|enterAlways"/>
 
         <org.thoughtcrime.securesms.components.ControllableTabLayout
diff --git a/res/layout/share_activity.xml b/res/layout/share_activity.xml
index 7e6d04936d..561d34dae2 100644
--- a/res/layout/share_activity.xml
+++ b/res/layout/share_activity.xml
@@ -15,7 +15,7 @@
             android:minHeight="?attr/actionBarSize"
             android:background="?colorPrimary"
             android:elevation="0dp"
-            android:theme="@style/Session.DarkActionBar">
+            android:theme="@style/Widget.Session.ActionBar">
 
         <RelativeLayout
                 android:layout_width="match_parent"
diff --git a/res/values-notnight-v28/styles.xml b/res/values-notnight-v28/styles.xml
index e3941a2ffa..a7940849a2 100644
--- a/res/values-notnight-v28/styles.xml
+++ b/res/values-notnight-v28/styles.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="SessionBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/SessionBottomSheetStyle</item>
-    </style>
+<!--    <style name="SessionBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">-->
+<!--        <item name="bottomSheetStyle">@style/SessionBottomSheetStyle</item>-->
+<!--    </style>-->
 
-    <style name="Session.DarkActionBar" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="background">@color/action_bar_background</item>
+<!--    <style name="Widget.Session.ActionBar" parent="@style/Widget.AppCompat.ActionBar">-->
+<!--        <item name="background">@color/action_bar_background</item>-->
 
-        <item name="titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item>
-        <item name="actionMenuTextColor">@color/text</item>
-    </style>
+<!--        <item name="titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item>-->
+<!--        <item name="actionMenuTextColor">@color/text</item>-->
+<!--    </style>-->
 
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f41bee2265..61113f181f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -2,39 +2,24 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Session -->
-    <style name="Session.DarkActionBar" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="background">@color/action_bar_background</item>
-        <item name="android:textColor">@color/text</item>
-        <item name="titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item>
-        <item name="elevation">0dp</item>
+    <style name="Widget.Session.ActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid">
+        <item name="android:elevation">1dp</item>
+        <item name="elevation">1dp</item>
+        <item name="titleTextStyle">@style/TextAppearance.Session.DarkActionBar.TitleTextStyle</item>
         <item name="minHeight">?attr/actionBarSize</item>
-        <item name="popupTheme">@style/Session.DarkActionBar</item>
+        <item name="popupTheme">@style/Widget.Session.ActionBar</item>
     </style>
 
-    <style name="Session.DarkSubtitleActionBar" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="titleTextStyle">@style/Session.DarkSubtitleActionBar.TitleTextStyle</item>
-        <item name="subtitleTextStyle">@style/Session.DarkSubtitleActionBar.SubtitleTextStyle</item>
+    <style name="Widget.Session.ActionBar.Flat">
+        <item name="android:elevation">0dp</item>
         <item name="elevation">0dp</item>
     </style>
 
-    <style name="Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-<!--        <item name="android:textColor">@color/text</item>-->
+    <style name="TextAppearance.Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:textSize">@dimen/very_large_font_size</item>
     </style>
 
-    <style name="Session.DarkSubtitleActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-<!--        <item name="android:textColor">@color/text</item>-->
-        <item name="android:textSize">@dimen/large_font_size</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="Session.DarkSubtitleActionBar.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-<!--        <item name="android:textColor">@color/text</item>-->
-        <item name="android:textSize">@dimen/small_font_size</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
-    </style>
-
     <style name="TextSecure.BaseDarkTheme.SearchView" parent="@style/Widget.AppCompat.SearchView">
         <item name="closeIcon">@drawable/ic_close_white_24dp</item>
     </style>
@@ -227,7 +212,7 @@
            parent="@style/Widget.AppCompat.ActionBar">
         <item name="background">@color/core_grey_90</item>
         <item name="android:popupTheme" tools:ignore="NewApi">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="elevation">4dp</item>
+        <item name="elevation">1dp</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
@@ -237,7 +222,7 @@
     <style name="TextSecure.LightActionBar"
            parent="@style/Widget.AppCompat.ActionBar">
         <item name="background">@color/textsecure_primary</item>
-        <item name="elevation">4dp</item>
+        <item name="elevation">1dp</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 52504709b3..2d2ae64f9d 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -18,15 +18,19 @@
         <item name="android:windowBackground">@drawable/default_session_background</item>
         <item name="android:colorBackground">@color/default_background_start</item>
         <item name="android:navigationBarColor">@color/compose_view_background</item>
-        <!-- TODO Separate action bar theme/style -->
-<!--        <item name="actionBarStyle">@style/Session.DarkActionBar</item>-->
-        <item name="actionBarTheme">@style/Session.DarkActionBar</item>
+<!--        <item name="actionBarStyle">@style/Widget.Session.ActionBar</item>-->
+<!--        <item name="actionBarTheme">@style/Widget.Session.ActionBar</item>-->
+
+        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="actionBarWidgetTheme">@null</item>
+        <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
+        <item name="actionBarStyle">@style/Widget.Session.ActionBar</item>
+
         <item name="alertDialogTheme">@style/Session.AlertDialog</item>
         <item name="bottomSheetDialogTheme">@style/SessionBottomSheetDialogTheme</item>
         <item name="preferenceTheme">@style/Session.SettingsTheme</item>
         <item name="statusBarBackground">@color/accent</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="titleTextColor">?android:textColorPrimary</item>
         <item name="appBarLayoutStyle">@style/Widget.Design.AppBarLayout</item>
 
 
@@ -373,7 +377,7 @@
 
         <item name="windowActionModeOverlay">true</item>
 
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+<!--        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>-->
         <item name="colorPrimary">@color/action_bar_background</item>
         <item name="colorPrimaryDark">@color/action_bar_background</item>
 
@@ -390,7 +394,7 @@
         <item name="media_overview_document_secondary">#99FFFFFF</item>
 
         <item name="theme_type">dark</item>
-        <item name="actionBarTheme">@style/Session.DarkActionBar</item>
+<!--        <item name="actionBarTheme">@style/Widget.Session.ActionBar</item>-->
         <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
 <!--        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>-->
diff --git a/src/org/thoughtcrime/securesms/loki/views/DeviceView.kt b/src/org/thoughtcrime/securesms/loki/views/DeviceView.kt
index 82ba64e101..54cc6ba269 100644
--- a/src/org/thoughtcrime/securesms/loki/views/DeviceView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/DeviceView.kt
@@ -30,7 +30,7 @@ class DeviceView : LinearLayout {
     }
 
     private fun setUpViewHierarchy() {
-        val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val contentView = inflater.inflate(R.layout.view_device, null)
         addView(contentView)
     }
diff --git a/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt b/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
index fe8f4a3ddc..60b0585715 100644
--- a/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
@@ -37,7 +37,7 @@ class FakeChatView : ScrollView {
     }
 
     private fun setUpViewHierarchy() {
-        val inflater = context.applicationContext.getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val inflater = context.getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val contentView = inflater.inflate(R.layout.view_fake_chat, null)
         addView(contentView)
         isVerticalScrollBarEnabled = false
diff --git a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
index 717baa3270..362f5ff35d 100644
--- a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
@@ -44,7 +44,7 @@ class ProfilePictureView : RelativeLayout {
     }
 
     private fun setUpViewHierarchy() {
-        val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val contentView = inflater.inflate(R.layout.view_profile_picture, null)
         addView(contentView)
     }
diff --git a/src/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt b/src/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt
index c728c22473..591a458227 100644
--- a/src/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/SeedReminderView.kt
@@ -35,7 +35,7 @@ class SeedReminderView : FrameLayout {
     }
 
     private fun setUpViewHierarchy() {
-        val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val contentView = inflater.inflate(R.layout.view_seed_reminder, null)
         addView(contentView)
         button.setOnClickListener { delegate?.handleSeedReminderViewContinueButtonTapped() }