diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 1e9bc2e781..4342e9cf32 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_conversation_v2.*
 import network.loki.messenger.R
-import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.mms.GlideApp
@@ -46,9 +45,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity() {
     private fun setUpToolbar() {
         backButton.setOnClickListener { onBackPressed() }
         conversationTitleView.text = thread.toShortString()
-        conversationSettingsButton.glide = glide
-        conversationSettingsButton.update(thread, threadID)
-        conversationSettingsButton.setOnClickListener { showConversationSettings() }
+        profilePictureView.glide = glide
+        profilePictureView.update(thread, threadID)
     }
     // endregion
 
diff --git a/app/src/main/res/drawable/conversation_back_button_background.xml b/app/src/main/res/drawable/conversation_back_button_background.xml
new file mode 100644
index 0000000000..f259e83e74
--- /dev/null
+++ b/app/src/main/res/drawable/conversation_back_button_background.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">
+    <item
+        android:id="@android:id/mask"
+        android:right="24dp">
+        <shape>
+            <corners
+                android:bottomLeftRadius="46dp"
+                android:topLeftRadius="46dp" />
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index d76737410e..aad8fb4c39 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -20,14 +20,29 @@
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp">
 
-            <ImageButton
+            <LinearLayout
                 android:id="@+id/backButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:gravity="center_vertical"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
-                android:src="?attr/homeAsUpIndicator"
-                android:background="?attr/selectableItemBackgroundBorderless" />
+                android:orientation="horizontal"
+                android:background="@drawable/conversation_back_button_background">
+
+                <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/small_profile_picture_size"
+                    android:layout_height="@dimen/small_profile_picture_size" />
+
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/conversationTitleView"
@@ -35,19 +50,12 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="64dp"
+                android:layout_marginLeft="66dp"
                 android:text="Elon"
                 android:textColor="@color/text"
                 android:textStyle="bold"
                 android:textSize="@dimen/very_large_font_size" />
 
-            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
-                android:id="@+id/conversationSettingsButton"
-                android:layout_width="@dimen/small_profile_picture_size"
-                android:layout_height="@dimen/small_profile_picture_size"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true" />
-
         </RelativeLayout>
 
     </androidx.appcompat.widget.Toolbar>