diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 13dbb534ab..30032cbd8b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -144,6 +144,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity"
+            android:label="@string/activity_edit_closed_group_title"
             android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.JoinPublicChatActivity"
diff --git a/res/drawable/conversation_home_touch_highlight.xml b/res/drawable/conversation_home_touch_highlight.xml
new file mode 100644
index 0000000000..5fbf5ba7d0
--- /dev/null
+++ b/res/drawable/conversation_home_touch_highlight.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <!-- Add half of the medium_profile_picture_size padding on the right to better work with the group icons. -->
+    <item
+        android:id="@android:id/mask"
+        android:right="24dp">
+        <shape>
+            <corners
+                android:bottomLeftRadius="@dimen/medium_profile_picture_size"
+                android:topLeftRadius="@dimen/medium_profile_picture_size" />
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/ic_baseline_arrow_back_24.xml b/res/drawable/ic_baseline_arrow_back_24.xml
new file mode 100644
index 0000000000..bab545a707
--- /dev/null
+++ b/res/drawable/ic_baseline_arrow_back_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_arrow_back_compact_24.xml b/res/drawable/ic_baseline_arrow_back_compact_24.xml
new file mode 100644
index 0000000000..f632160152
--- /dev/null
+++ b/res/drawable/ic_baseline_arrow_back_compact_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
+</vector>
diff --git a/res/layout/camera_fragment.xml b/res/layout/camera_fragment.xml
index 3ce5bbe7d0..ccddcb26e3 100644
--- a/res/layout/camera_fragment.xml
+++ b/res/layout/camera_fragment.xml
@@ -16,4 +16,22 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <FrameLayout
+        android:id="@+id/camera_close_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/small_spacing"
+        android:padding="@dimen/small_spacing"
+        android:background="@drawable/circle_touch_highlight_background"
+        android:clickable="true"
+        android:focusable="true">
+
+        <ImageView
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:src="@drawable/ic_baseline_clear_24"
+            android:tint="@android:color/white"/>
+
+    </FrameLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index de99e57802..394ad2d311 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -11,19 +11,47 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:clipChildren="false"
+        android:contentInsetLeft="24dp"
+        android:contentInsetStart="24dp"
         app:contentInsetLeft="24dp"
-        app:contentInsetRight="20dp">
+        app:contentInsetStart="24dp"
+        android:contentInsetRight="20dp"
+        android:contentInsetEnd="20dp"
+        app:contentInsetRight="20dp"
+        app:contentInsetEnd="20dp">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:clipChildren="false">
 
-            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
-                android:id="@+id/profilePictureView"
-                android:layout_width="@dimen/medium_profile_picture_size"
-                android:layout_height="@dimen/medium_profile_picture_size" />
+            <LinearLayout
+                android:id="@+id/homeButtonContainer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:background="@drawable/conversation_home_touch_highlight"
+                android:clickable="true"
+                android:focusable="true"
+                android:layout_marginLeft="-24dp">
+
+                <ImageView
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:src="@drawable/ic_baseline_arrow_back_compact_24"
+                    android:layout_marginRight="-2dp"
+                    android:layout_marginLeft="8dp"/>
+
+                <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+                    android:id="@+id/profilePictureView"
+                    android:layout_width="@dimen/medium_profile_picture_size"
+                    android:layout_height="@dimen/medium_profile_picture_size" />
+
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
diff --git a/res/layout/mediasend_fragment.xml b/res/layout/mediasend_fragment.xml
index fd15041ea9..7f05206915 100644
--- a/res/layout/mediasend_fragment.xml
+++ b/res/layout/mediasend_fragment.xml
@@ -153,4 +153,22 @@
 
     </org.thoughtcrime.securesms.components.InputAwareLayout>
 
+    <FrameLayout
+        android:id="@+id/mediasend_close_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/small_spacing"
+        android:padding="@dimen/small_spacing"
+        android:background="@drawable/circle_touch_highlight_background"
+        android:clickable="true"
+        android:focusable="true">
+
+        <ImageView
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:src="@drawable/ic_baseline_clear_24"
+            android:tint="@android:color/white"/>
+
+    </FrameLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/session_logo_action_bar_content.xml b/res/layout/session_logo_action_bar_content.xml
new file mode 100644
index 0000000000..52f99ecdea
--- /dev/null
+++ b/res/layout/session_logo_action_bar_content.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?actionBarSize">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:src="@drawable/session_logo"/>
+
+    <FrameLayout
+        android:id="@+id/back_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_margin="@dimen/small_spacing"
+        android:padding="@dimen/small_spacing"
+        android:background="@drawable/circle_touch_highlight_background"
+        android:clickable="true"
+        android:focusable="true">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/ic_baseline_arrow_back_24"
+            android:alpha="0.5"/>
+
+    </FrameLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 268915c03a..db1af0eab2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,8 +18,8 @@
         <item name="android:textSize">@dimen/very_large_font_size</item>
     </style>
 
-    <style name="TextSecure.BaseDarkTheme.SearchView" parent="@style/Widget.AppCompat.SearchView">
-        <item name="closeIcon">@drawable/ic_baseline_clear_24</item>
+    <style name="Widget.Session.SearchView" parent="@style/Widget.AppCompat.SearchView">
+        <item name="closeIcon">@drawable/ic_clear</item>
     </style>
 
     <style name="ThemeOverlay.Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1bccd76368..5a6e6f7e78 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -41,6 +41,8 @@
         <item name="dividerVertical">@color/separator</item>
         <item name="dividerHorizontal">?dividerVertical</item>
 
+        <item name="searchViewStyle">@style/Widget.Session.SearchView</item>
+
         <!-- App specific attributes -->
         <item name="ic_visibility_on">@drawable/ic_baseline_visibility_24</item>
         <item name="ic_visibility_off">@drawable/ic_baseline_visibility_off_24</item>
@@ -50,8 +52,7 @@
 
         <item name="media_overview_toolbar_background">@color/transparent</item>
         <item name="media_overview_header_foreground">@color/text</item>
-        <item name="media_keyboard_button_color">@color/core_grey_25</item>
-        <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
+        <item name="media_keyboard_button_color">@color/core_grey_25</item>\
 
         <item name="attachment_type_selector_background">?android:windowBackground</item>
         <item name="attachment_type_selector_hide_button_background">@color/gray50</item>
@@ -161,7 +162,6 @@
         <item name="media_overview_header_foreground">@color/text</item>
 
         <item name="theme_type">dark</item>
-        <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
         <item name="android:navigationBarColor">@color/compose_view_background</item>
 
         <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
index 17e06dfea0..07af397071 100644
--- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
@@ -12,6 +12,7 @@ import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -42,6 +43,13 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
     if (BaseActivity.isMenuWorkaroundRequired()) {
       forceOverflowMenu();
     }
+
+    ActionBar actionBar = getSupportActionBar();
+    if (actionBar != null) {
+      actionBar.setDisplayHomeAsUpEnabled(true);
+      actionBar.setHomeButtonEnabled(true);
+    }
+
     super.onCreate(savedInstanceState);
   }
 
@@ -69,6 +77,14 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
     LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, new IntentFilter("unexpectedDeviceLinkRequestReceived"));
   }
 
+  @Override
+  public boolean onSupportNavigateUp() {
+    if (super.onSupportNavigateUp()) return true;
+
+    onBackPressed();
+    return true;
+  }
+
   @Override
   protected void onDestroy() {
     LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver);
diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
index 3bb2b6eb77..0b3da4a02e 100644
--- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -34,6 +34,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
@@ -136,9 +137,12 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
 
   private void initializeToolbar() {
     setSupportActionBar(this.toolbar);
-    getSupportActionBar().setTitle(recipient.toShortString());
+    ActionBar actionBar = getSupportActionBar();
+    actionBar.setTitle(recipient.toShortString());
+    actionBar.setDisplayHomeAsUpEnabled(true);
+    actionBar.setHomeButtonEnabled(true);
     this.recipient.addListener(recipient -> {
-      Util.runOnMain(() -> getSupportActionBar().setTitle(recipient.toShortString()));
+      Util.runOnMain(() -> actionBar.setTitle(recipient.toShortString()));
     });
   }
 
diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 429b39c00e..407dfd920a 100644
--- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -19,7 +19,8 @@ package org.thoughtcrime.securesms;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 
-import androidx.lifecycle.ViewModelProviders;
+import androidx.appcompat.app.ActionBar;
+import androidx.lifecycle.ViewModelProvider;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -122,7 +123,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
   protected void onCreate(Bundle bundle, boolean ready) {
     dynamicLanguage.onCreate(this);
 
-    viewModel = ViewModelProviders.of(this).get(MediaPreviewViewModel.class);
+    viewModel = new ViewModelProvider(this).get(MediaPreviewViewModel.class);
 
     setContentView(R.layout.media_preview_activity);
 
@@ -224,8 +225,10 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
     captionContainer          = findViewById(R.id.media_preview_caption_container);
     playbackControlsContainer = findViewById(R.id.media_preview_playback_controls_container);
 
-
     setSupportActionBar(findViewById(R.id.toolbar));
+    ActionBar actionBar = getSupportActionBar();
+    actionBar.setDisplayHomeAsUpEnabled(true);
+    actionBar.setHomeButtonEnabled(true);
   }
 
   private void initializeResources() {
diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index c49aa7375b..8e05fccc69 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -32,6 +32,7 @@ import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 
 import org.thoughtcrime.securesms.components.SearchToolbar;
@@ -151,6 +152,9 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   private void initializeToolbar() {
     Toolbar toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
+    ActionBar actionBar = getSupportActionBar();
+    actionBar.setDisplayHomeAsUpEnabled(true);
+    actionBar.setHomeButtonEnabled(true);
   }
 
   private void initializeResources() {
diff --git a/src/org/thoughtcrime/securesms/components/SearchToolbar.java b/src/org/thoughtcrime/securesms/components/SearchToolbar.java
index e4f9ad41b7..b3ef44585a 100644
--- a/src/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/src/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -3,8 +3,6 @@ package org.thoughtcrime.securesms.components;
 
 import android.animation.Animator;
 import android.content.Context;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.MenuItem;
@@ -49,11 +47,8 @@ public class SearchToolbar extends LinearLayout {
 
     Toolbar toolbar = findViewById(R.id.toolbar);
 
-    Drawable drawable = getContext().getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp);
-    drawable.mutate();
-    drawable.setColorFilter(getContext().getResources().getColor(R.color.grey_700), PorterDuff.Mode.SRC_IN);
-
-    toolbar.setNavigationIcon(drawable);
+    toolbar.setNavigationIcon(
+            getContext().getResources().getDrawable(R.drawable.ic_baseline_clear_24));
     toolbar.inflateMenu(R.menu.conversation_list_search);
 
     this.searchItem = toolbar.getMenu().findItem(R.id.action_filter_search);
@@ -122,7 +117,6 @@ public class SearchToolbar extends LinearLayout {
   private void hide() {
     if (getVisibility() == View.VISIBLE) {
 
-
       if (listener != null) listener.onSearchClosed();
 
       if (Build.VERSION.SDK_INT >= 21) {
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index dfd5d86685..e0fe6dd4f8 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -323,6 +323,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   ProgressBar                 messageStatusProgressBar;
   private   ImageView                   muteIndicatorImageView;
   private   TextView                    subtitleTextView;
+  private   View                        homeButtonContainer;
 
   private   AttachmentTypeSelector attachmentTypeSelector;
   private   AttachmentManager      attachmentManager;
@@ -474,6 +475,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       }
       collapsedKeyboardHeight = Math.min(collapsedKeyboardHeight, height);
       keyboardHeight = expandedKeyboardHeight - collapsedKeyboardHeight;
+
+      // Use 300dp if the keyboard wasn't opened yet.
+      if (keyboardHeight == 0) {
+        keyboardHeight = (int)(300f * getResources().getDisplayMetrics().density);
+      }
     });
   }
 
@@ -1691,6 +1697,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     messageStatusProgressBar               = ViewUtil.findById(this, R.id.messageStatusProgressBar);
     muteIndicatorImageView                 = ViewUtil.findById(this, R.id.muteIndicatorImageView);
     subtitleTextView                       = ViewUtil.findById(this, R.id.subtitleTextView);
+    homeButtonContainer                    = ViewUtil.findById(this, R.id.homeButtonContainer);
 
     ImageButton quickCameraToggle      = ViewUtil.findById(this, R.id.quick_camera_toggle);
     ImageButton inlineAttachmentButton = ViewUtil.findById(this, R.id.inline_attachment_button);
@@ -1745,6 +1752,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     searchNav.setEventListener(this);
 
     inlineAttachmentButton.setOnClickListener(v -> handleAddAttachment());
+
+    homeButtonContainer.setOnClickListener(v -> onSupportNavigateUp());
   }
 
   protected void initializeActionBar() {
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
index 32a4a8f868..ac1215f6fd 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
@@ -71,8 +71,8 @@ public class GiphyActivity extends PassphraseRequiredActionBarActivity
 
     setSupportActionBar(toolbar);
 
-    getSupportActionBar().setDisplayHomeAsUpEnabled(false);
-    getSupportActionBar().setDisplayShowTitleEnabled(false);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setHomeButtonEnabled(true);
   }
 
   private void initializeResources() {
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index c513d08993..f21339ab42 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -12,6 +12,7 @@ import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import androidx.appcompat.content.res.AppCompatResources
 import kotlinx.android.synthetic.main.activity_create_closed_group.emptyStateContainer
 import kotlinx.android.synthetic.main.activity_create_closed_group.mainContentContainer
 import kotlinx.android.synthetic.main.activity_edit_closed_group.*
@@ -27,6 +28,7 @@ import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.GroupUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.thoughtcrime.securesms.util.ThemeUtil
 import org.whispersystems.signalservice.loki.utilities.toHexString
 import java.io.IOException
 
@@ -60,11 +62,12 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
-
         setContentView(R.layout.activity_edit_closed_group)
-        supportActionBar!!.title = resources.getString(R.string.activity_edit_closed_group_title)
 
-        groupID = intent.getStringExtra(Companion.groupIDKey)
+        supportActionBar!!.setHomeAsUpIndicator(
+                ThemeUtil.getThemedDrawableResId(this, R.attr.actionModeCloseDrawable))
+
+        groupID = intent.getStringExtra(groupIDKey)!!
         originalName = DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title
         name = originalName
 
@@ -88,7 +91,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
             }
         }
 
-        LoaderManager.getInstance(this).initLoader(Companion.loaderID, null, object : LoaderManager.LoaderCallbacks<List<String>> {
+        LoaderManager.getInstance(this).initLoader(loaderID, null, object : LoaderManager.LoaderCallbacks<List<String>> {
 
             override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
                 return EditClosedGroupLoader(this@EditClosedGroupActivity, groupID)
@@ -97,7 +100,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
             override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
                 // We no longer need any subsequent loading events
                 // (they will occur on every activity resume).
-                LoaderManager.getInstance(this@EditClosedGroupActivity).destroyLoader(Companion.loaderID)
+                LoaderManager.getInstance(this@EditClosedGroupActivity).destroyLoader(loaderID)
 
                 originalMembers.clear()
                 originalMembers.addAll(members.toHashSet())
@@ -120,7 +123,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
-            Companion.addUsersRequestCode -> {
+            addUsersRequestCode -> {
                 if (resultCode != RESULT_OK) return
                 if (data == null || data.extras == null || !data.hasExtra(SelectContactsActivity.selectedContactsKey)) return
 
@@ -180,8 +183,8 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
 
     private fun onAddMembersClick() {
         val intent = Intent(this@EditClosedGroupActivity, SelectContactsActivity::class.java)
-        intent.putExtra(SelectContactsActivity.Companion.usersToExcludeKey, members.toTypedArray())
-        startActivityForResult(intent, Companion.addUsersRequestCode)
+        intent.putExtra(SelectContactsActivity.usersToExcludeKey, members.toTypedArray())
+        startActivityForResult(intent, addUsersRequestCode)
     }
 
     private fun saveName() {
@@ -227,7 +230,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
             return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
         }
 
-        val maxGroupMembers = if (isSSKBasedClosedGroup) ClosedGroupsProtocol.groupSizeLimit else Companion.legacyGroupSizeLimit
+        val maxGroupMembers = if (isSSKBasedClosedGroup) ClosedGroupsProtocol.groupSizeLimit else legacyGroupSizeLimit
         if (members.size >= maxGroupMembers) {
             // TODO: Update copy for SSK based closed groups
             return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
diff --git a/src/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt
index d19a0002ab..383a39352e 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt
@@ -40,7 +40,7 @@ class LandingActivity : BaseActionBarActivity(), LinkDeviceSlaveModeDialogDelega
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_landing)
-        setUpActionBarSessionLogo()
+        setUpActionBarSessionLogo(true)
         fakeChatView.startAnimating()
         registerButton.setOnClickListener { register() }
         restoreButton.setOnClickListener { restore() }
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
index 656de0436f..6fd9250e0d 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
@@ -1,24 +1,36 @@
 package org.thoughtcrime.securesms.loki.utilities
 
 import android.content.Intent
-import androidx.appcompat.app.ActionBar
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import android.view.Gravity
-import android.widget.ImageView
-import android.widget.RelativeLayout
+import androidx.appcompat.widget.Toolbar
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.BaseActionBarActivity
 
-fun AppCompatActivity.setUpActionBarSessionLogo() {
-    supportActionBar!!.setDisplayShowHomeEnabled(false)
-    supportActionBar!!.setDisplayShowTitleEnabled(false)
-    val logoImageView = ImageView(this)
-    logoImageView.setImageResource(R.drawable.session_logo)
-    val logoImageViewContainer = RelativeLayout(this)
-    logoImageViewContainer.addView(logoImageView)
-    logoImageViewContainer.gravity = Gravity.CENTER
-    val logoImageViewContainerLayoutParams = ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT)
-    supportActionBar!!.setCustomView(logoImageViewContainer, logoImageViewContainerLayoutParams)
-    supportActionBar!!.setDisplayShowCustomEnabled(true)
+fun BaseActionBarActivity.setUpActionBarSessionLogo(hideBackButton: Boolean = false) {
+    val actionbar = supportActionBar!!
+
+    actionbar.setDisplayShowHomeEnabled(false)
+    actionbar.setDisplayShowTitleEnabled(false)
+    actionbar.setDisplayHomeAsUpEnabled(false)
+    actionbar.setHomeButtonEnabled(false)
+
+    actionbar.setCustomView(R.layout.session_logo_action_bar_content)
+    actionbar.setDisplayShowCustomEnabled(true)
+
+    val rootView: Toolbar = actionbar.customView!!.parent as Toolbar
+    rootView.setPadding(0,0,0,0)
+    rootView.setContentInsetsAbsolute(0,0);
+
+    val backButton = actionbar.customView!!.findViewById<View>(R.id.back_button)
+    if (hideBackButton) {
+        backButton.visibility = View.GONE
+    } else {
+        backButton.visibility = View.VISIBLE
+        backButton.setOnClickListener {
+            onSupportNavigateUp()
+        }
+    }
 }
 
 val AppCompatActivity.defaultSessionRequestCode: Int
diff --git a/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
index df51dba9f4..42285049df 100644
--- a/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
@@ -27,6 +27,7 @@ import android.view.animation.DecelerateInterpolator;
 import android.view.animation.RotateAnimation;
 import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 
 import com.bumptech.glide.load.MultiTransformation;
 import com.bumptech.glide.load.Transformation;
@@ -51,6 +52,7 @@ public class Camera1Fragment extends Fragment implements TextureView.SurfaceText
 
   private TextureView                  cameraPreview;
   private ViewGroup                    controlsContainer;
+  private View                         cameraCloseButton;
   private ImageButton                  flipButton;
   private Button                       captureButton;
   private Camera1Controller            camera;
@@ -95,6 +97,7 @@ public class Camera1Fragment extends Fragment implements TextureView.SurfaceText
 
     cameraPreview     = view.findViewById(R.id.camera_preview);
     controlsContainer = view.findViewById(R.id.camera_controls_container);
+    cameraCloseButton = view.findViewById(R.id.camera_close_button);
 
     onOrientationChanged(getResources().getConfiguration().orientation);
 
@@ -102,6 +105,8 @@ public class Camera1Fragment extends Fragment implements TextureView.SurfaceText
 
     GestureDetector gestureDetector = new GestureDetector(flipGestureListener);
     cameraPreview.setOnTouchListener((v, event) -> gestureDetector.onTouchEvent(event));
+
+    cameraCloseButton.setOnClickListener(v -> requireActivity().onBackPressed());
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
index d492a113d1..0df12eb0a0 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.mediasend;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -53,7 +55,7 @@ public class MediaPickerFolderFragment extends Fragment implements MediaPickerFo
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     recipientName = getArguments().getString(KEY_RECIPIENT_NAME);
-    viewModel     = ViewModelProviders.of(requireActivity(), new MediaSendViewModel.Factory(requireActivity().getApplication(), new MediaRepository())).get(MediaSendViewModel.class);
+    viewModel     = new ViewModelProvider(requireActivity(), new MediaSendViewModel.Factory(requireActivity().getApplication(), new MediaRepository())).get(MediaSendViewModel.class);
   }
 
   @Override
@@ -85,7 +87,7 @@ public class MediaPickerFolderFragment extends Fragment implements MediaPickerFo
     list.setLayoutManager(layoutManager);
     list.setAdapter(adapter);
 
-    viewModel.getFolders(requireContext()).observe(this, adapter::setFolders);
+    viewModel.getFolders(requireContext()).observe(getViewLifecycleOwner(), adapter::setFolders);
 
     initToolbar(view.findViewById(R.id.mediapicker_toolbar));
   }
@@ -107,7 +109,10 @@ public class MediaPickerFolderFragment extends Fragment implements MediaPickerFo
 
   private void initToolbar(Toolbar toolbar) {
     ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
-    ((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(getString(R.string.MediaPickerActivity_send_to, recipientName));
+    ActionBar actionBar = ((AppCompatActivity) requireActivity()).getSupportActionBar();
+    actionBar.setTitle(getString(R.string.MediaPickerActivity_send_to, recipientName));
+    actionBar.setDisplayHomeAsUpEnabled(true);
+    actionBar.setHomeButtonEnabled(true);
 
     toolbar.setNavigationOnClickListener(v -> requireActivity().onBackPressed());
   }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
index 25dec732d6..76abd535fa 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.mediasend;
 
+import androidx.appcompat.app.ActionBar;
 import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -166,8 +167,12 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
   }
 
   private void initToolbar(Toolbar toolbar) {
-    ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
-    ((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(folderTitle);
+    AppCompatActivity activity = (AppCompatActivity) requireActivity();
+    activity.setSupportActionBar(toolbar);
+    ActionBar actionBar = activity.getSupportActionBar();
+    actionBar.setTitle(folderTitle);
+    actionBar.setDisplayHomeAsUpEnabled(true);
+    actionBar.setHomeButtonEnabled(true);
 
     toolbar.setNavigationOnClickListener(v -> requireActivity().onBackPressed());
   }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index ff1792ec1a..cc8269032d 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -1,16 +1,10 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.Manifest;
-
-import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AccelerateInterpolator;
@@ -21,8 +15,13 @@ import android.view.animation.ScaleAnimation;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.ViewModelProvider;
+
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.logging.Log;
@@ -41,6 +40,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import network.loki.messenger.R;
+
 /**
  * Encompasses the entire flow of sending media, starting from the selection process to the actual
  * captioning and editing of the content.
@@ -124,6 +125,8 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
 
   @Override
   protected void onCreate(Bundle savedInstanceState, boolean ready) {
+    super.onCreate(savedInstanceState, ready);
+
     setContentView(R.layout.mediasend_activity);
     setResult(RESULT_CANCELED);
 
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
index a563f3546f..73d8468724 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
@@ -91,6 +91,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
   private Stub<MediaKeyboard> emojiDrawer;
   private ViewGroup         playbackControlsContainer;
   private TextView          charactersLeft;
+  private View              closeButton;
 
   private ControllableViewPager         fragmentPager;
   private MediaSendFragmentPagerAdapter fragmentPagerAdapter;
@@ -154,6 +155,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
     mediaRail                 = view.findViewById(R.id.mediasend_media_rail);
     playbackControlsContainer = view.findViewById(R.id.mediasend_playback_controls_container);
     charactersLeft            = view.findViewById(R.id.mediasend_characters_left);
+    closeButton               = view.findViewById(R.id.mediasend_close_button);
 
     View sendButtonBkg = view.findViewById(R.id.mediasend_send_button_bkg);
 
@@ -227,6 +229,8 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
     } else {
       emojiToggle.setOnClickListener(this::onEmojiToggleClicked);
     }
+
+    closeButton.setOnClickListener(v -> requireActivity().onBackPressed());
   }
 
   @Override