diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index 4dc65d21b..ce78f83a5 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -10,11 +10,13 @@
 
     <ImageView android:id="@+id/up_button"
                android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
+               android:layout_height="match_parent"
                android:src="@drawable/ic_arrow_back_white_24dp"
                android:clickable="true"
                android:paddingRight="12dp"
                android:paddingEnd="12dp"
+               android:paddingStart="12dp"
+               android:paddingLeft="12dp"
                android:layout_marginRight="4dp"
                android:layout_marginEnd="4dp"
                android:layout_alignParentLeft="true"
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 55563033d..d5da5b881 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -37,6 +37,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.view.WindowCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -811,6 +812,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     supportActionBar.setCustomView(R.layout.conversation_title_view);
     supportActionBar.setDisplayShowCustomEnabled(true);
     supportActionBar.setDisplayShowTitleEnabled(false);
+
+    Toolbar parent = (Toolbar) supportActionBar.getCustomView().getParent();
+    parent.setPadding(0,0,0,0);
+    parent.setContentInsetsAbsolute(0,0);
   }
 
   private void initializeResources() {
diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java
index 9ec4aa725..f28522458 100644
--- a/src/org/thoughtcrime/securesms/ProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/ProfileActivity.java
@@ -89,6 +89,9 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
     supportActionBar.setCustomView(R.layout.conversation_title_view);
     supportActionBar.setDisplayShowCustomEnabled(true);
     supportActionBar.setDisplayShowTitleEnabled(false);
+    Toolbar parent = (Toolbar) supportActionBar.getCustomView().getParent();
+    parent.setPadding(0,0,0,0);
+    parent.setContentInsetsAbsolute(0,0);
 
     titleView = (ConversationTitleView) supportActionBar.getCustomView();
     titleView.setOnBackClickedListener(view -> onBackPressed());