diff --git a/res/layout/contact_selection_activity.xml b/res/layout/contact_selection_activity.xml
index 709f7b65e6..25883ed2af 100644
--- a/res/layout/contact_selection_activity.xml
+++ b/res/layout/contact_selection_activity.xml
@@ -12,7 +12,8 @@
             android:layout_width="match_parent"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:theme="?attr/actionBarStyle"/>
+            android:theme="?attr/actionBarStyle"
+            app:contentInsetStartWithNavigation="0dp"/>
 
         <fragment android:id="@+id/contact_selection_list_fragment"
                   android:layout_width="match_parent"
diff --git a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
index 48894602d1..a9029865db 100644
--- a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
+++ b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
@@ -95,7 +95,7 @@ public class ContactFilterToolbar extends Toolbar {
     });
 
     setLogo(null);
-
+    setContentInsetStartWithNavigation(0);
     expandTapArea(toggleContainer, dialpadToggle);
   }
 
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
index a84d7bdd03..669c824bf5 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
@@ -112,6 +112,9 @@ public class GiphyActivityToolbar extends Toolbar {
       }
     });
 
+    setLogo(null);
+    setNavigationIcon(null);
+    setContentInsetStartWithNavigation(0);
     expandTapArea(this, action);
     expandTapArea(toggleContainer, gridToggle);
   }