--- a/mobile/android/base/resources/layout/search_engine_row.xml
+++ b/mobile/android/base/resources/layout/search_engine_row.xml
@@ -14,16 +14,17 @@
                                           android:minWidth="@dimen/favicon_bg"
                                           android:minHeight="@dimen/favicon_bg"/>
 
     <org.mozilla.gecko.widget.FlowLayout android:id="@+id/suggestion_layout"
                                          android:layout_toRightOf="@id/suggestion_icon"
                                          android:layout_centerVertical="true"
                                          android:layout_width="wrap_content"
                                          android:layout_height="wrap_content"
+                                         android:layout_marginRight="15dp"
                                          android:duplicateParentState="true">
 
         <include layout="@layout/suggestion_item"
                  android:id="@+id/suggestion_user_entered"/>
 
     </org.mozilla.gecko.widget.FlowLayout>
 
 </merge>

--- a/mobile/android/base/resources/layout/suggestion_item.xml
+++ b/mobile/android/base/resources/layout/suggestion_item.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!-- For reasons unknown, the minHeight attribute is required to keep suggestion_user_entered the same size as all other
-     search suggestion buttons-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="wrap_content"
-              android:layout_height="32dp"
+              android:layout_height="wrap_content"
               android:minHeight="32dp"
               android:orientation="horizontal"
               android:background="@drawable/search_suggestion_button"
               android:gravity="center_vertical"
               android:clickable="true"
               android:padding="5dp">
 
     <ImageView android:id="@+id/suggestion_item_icon"