diff --git a/mobile/android/base/resources/drawable-hdpi/close_edit_mode.png b/mobile/android/base/resources/drawable-hdpi/close_edit_mode.png
index 70caf842d33e..efb5ab8e7474 100644
Binary files a/mobile/android/base/resources/drawable-hdpi/close_edit_mode.png and b/mobile/android/base/resources/drawable-hdpi/close_edit_mode.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi/close_edit_mode.png b/mobile/android/base/resources/drawable-mdpi/close_edit_mode.png
index 608a80f47210..eda09a3f6b27 100644
Binary files a/mobile/android/base/resources/drawable-mdpi/close_edit_mode.png and b/mobile/android/base/resources/drawable-mdpi/close_edit_mode.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/close_edit_mode.png b/mobile/android/base/resources/drawable-xhdpi/close_edit_mode.png
index 4b6f1f34fd46..8fd7a3d1d00f 100644
Binary files a/mobile/android/base/resources/drawable-xhdpi/close_edit_mode.png and b/mobile/android/base/resources/drawable-xhdpi/close_edit_mode.png differ
diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
index 8df7416111da..f07972e98662 100644
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -22,12 +22,11 @@
     <ImageView android:id="@+id/url_bar_entry"
                style="@style/UrlBar.Button"
                android:layout_marginLeft="4dp"
-               android:layout_marginRight="-19dp"
+               android:layout_marginRight="-15dp"
                android:layout_marginTop="5dp"
                android:layout_marginBottom="5dp"
                android:layout_centerVertical="true"
                android:layout_toLeftOf="@+id/tabs"
-               android:paddingRight="4dp"
                android:duplicateParentState="true"
                android:clickable="false"
                android:focusable="false"
@@ -43,8 +42,7 @@
                android:layout_toLeftOf="@+id/tabs"
                android:layout_alignTop="@id/url_bar_entry"
                android:layout_alignBottom="@id/url_bar_entry"
-               android:layout_marginRight="-19dp"
-               android:paddingRight="4dp"
+               android:layout_marginRight="-15dp"
                android:duplicateParentState="true"
                android:clickable="false"
                android:focusable="false"
@@ -103,17 +101,22 @@
                style="@style/UrlBar.ImageButton.Icon"
                android:layout_alignParentRight="true"
                android:src="@drawable/close_edit_mode"
+               android:layout_marginLeft="2dp"
+               android:layout_marginRight="2dp"
                android:contentDescription="@string/edit_mode_cancel"
                android:visibility="invisible"/>
 
+    <!-- The left margin of the cancel button is larger than the right because
+         the url bar drawable contains some whitespace, so we compensate by adding
+         a negative right margin (value determined through experimentation). -->
     <org.mozilla.gecko.toolbar.ToolbarEditLayout android:id="@+id/edit_layout"
                   style="@style/UrlBar.Button"
                   android:layout_toLeftOf="@id/edit_cancel"
                   android:layout_marginLeft="4dp"
-                  android:layout_marginRight="4dp"
+                  android:layout_marginRight="-2dp"
                   android:paddingLeft="8dp"
                   android:paddingRight="8dp"
-                  android:visibility="gone"/>
+                  android:visibility="invisible"/>
 
     <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_layout"
                   style="@style/UrlBar.Button"
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index 6093539dd7ca..94261b536e7a 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -37,6 +37,8 @@ import org.mozilla.gecko.widget.ThemedRelativeLayout;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.os.Build;
@@ -136,7 +138,7 @@ public class BrowserToolbar extends ThemedRelativeLayout
     private MenuPopup menuPopup;
     private List<View> focusOrder;
 
-    private final View editCancel;
+    private final ImageView editCancel;
 
     private boolean shouldShrinkURLBar = false;
 
@@ -218,7 +220,7 @@ public class BrowserToolbar extends ThemedRelativeLayout
         actionItemBar = (LinearLayout) findViewById(R.id.menu_items);
         hasSoftMenuButton = !HardwareUtils.hasMenuButton();
 
-        editCancel = findViewById(R.id.edit_cancel);
+        editCancel = (ImageView) findViewById(R.id.edit_cancel);
 
         // We use different layouts on phones and tablets, so adjust the focus
         // order appropriately.
@@ -603,10 +605,9 @@ public class BrowserToolbar extends ThemedRelativeLayout
             return 0;
         }
 
-        // We would ideally use the right-most point of the edit layout instead of the
-        // edit separator and its margin, but it is not inflated when this code initially runs.
-        final LayoutParams lp = (LayoutParams) editCancel.getLayoutParams();
-        return editCancel.getLeft() - lp.leftMargin - urlBarEntry.getRight();
+        // Subtract the right margin because it's negative.
+        final LayoutParams lp = (LayoutParams) urlEditLayout.getLayoutParams();
+        return urlEditLayout.getRight() - lp.rightMargin - urlBarEntry.getRight();
     }
 
     private int getUrlBarCurveTranslation() {
@@ -1102,6 +1103,10 @@ public class BrowserToolbar extends ThemedRelativeLayout
 
         updateProgressVisibility();
 
+        // The animation looks cleaner if the text in the URL bar is
+        // not selected so clear the selection by clearing focus.
+        urlEditLayout.clearFocus();
+
         if (Build.VERSION.SDK_INT < 11) {
             stopEditingWithoutAnimation();
         } else if (HardwareUtils.isTablet()) {