diff --git a/mobile/android/base/resources/drawable-hdpi/close_edit_mode_dark.png b/mobile/android/base/resources/drawable-hdpi/close_edit_mode_dark.png
new file mode 100644
index 000000000000..14765da7ef5d
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/close_edit_mode_dark.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi/close_edit_mode.png b/mobile/android/base/resources/drawable-hdpi/close_edit_mode_light.png
similarity index 100%
rename from mobile/android/base/resources/drawable-hdpi/close_edit_mode.png
rename to mobile/android/base/resources/drawable-hdpi/close_edit_mode_light.png
diff --git a/mobile/android/base/resources/drawable-mdpi/close_edit_mode_dark.png b/mobile/android/base/resources/drawable-mdpi/close_edit_mode_dark.png
new file mode 100644
index 000000000000..b0eea2e7704d
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi/close_edit_mode_dark.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_light.png
similarity index 100%
rename from mobile/android/base/resources/drawable-mdpi/close_edit_mode.png
rename to mobile/android/base/resources/drawable-mdpi/close_edit_mode_light.png
diff --git a/mobile/android/base/resources/drawable-xhdpi/close_edit_mode_dark.png b/mobile/android/base/resources/drawable-xhdpi/close_edit_mode_dark.png
new file mode 100644
index 000000000000..a6297a75e1a3
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi/close_edit_mode_dark.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_light.png
similarity index 100%
rename from mobile/android/base/resources/drawable-xhdpi/close_edit_mode.png
rename to mobile/android/base/resources/drawable-xhdpi/close_edit_mode_light.png
diff --git a/mobile/android/base/resources/drawable/close_edit_mode_selector.xml b/mobile/android/base/resources/drawable/close_edit_mode_selector.xml
new file mode 100644
index 000000000000..b7b6c6505447
--- /dev/null
+++ b/mobile/android/base/resources/drawable/close_edit_mode_selector.xml
@@ -0,0 +1,14 @@
+<?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/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+    <item gecko:state_dark="true"
+          android:drawable="@drawable/close_edit_mode_dark"/>
+
+    <item android:drawable="@drawable/close_edit_mode_light"/>
+
+</selector>
diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
index cdb8d0ad4fc7..fa80632d0260 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -109,13 +109,14 @@
 
     <!-- We draw after the menu items so when they are hidden, the cancel button,
          which is thus drawn on top, may be pressed. -->
-    <ImageView android:id="@+id/edit_cancel"
-               style="@style/UrlBar.ImageButton.Icon"
-               android:layout_alignParentRight="true"
-               android:src="@drawable/close_edit_mode"
-               android:paddingLeft="2dp"
-               android:paddingRight="2dp"
-               android:contentDescription="@string/edit_mode_cancel"
-               android:visibility="gone"/>
+    <org.mozilla.gecko.widget.ThemedImageView
+            android:id="@+id/edit_cancel"
+            style="@style/UrlBar.ImageButton.Icon"
+            android:layout_alignParentRight="true"
+            android:src="@drawable/close_edit_mode_selector"
+            android:paddingLeft="2dp"
+            android:paddingRight="2dp"
+            android:contentDescription="@string/edit_mode_cancel"
+            android:visibility="gone"/>
 
 </merge>
diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
index b6729c514ad5..5ecf1a537e50 100644
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -97,14 +97,15 @@
 
     <!-- Note that the edit components are invisible so that the views
          depending on their location can properly layout. -->
-    <ImageView android:id="@+id/edit_cancel"
-               style="@style/UrlBar.ImageButton.Icon"
-               android:layout_alignParentRight="true"
-               android:src="@drawable/close_edit_mode"
-               android:paddingLeft="2dp"
-               android:paddingRight="2dp"
-               android:contentDescription="@string/edit_mode_cancel"
-               android:visibility="invisible"/>
+    <org.mozilla.gecko.widget.ThemedImageView
+            android:id="@+id/edit_cancel"
+            style="@style/UrlBar.ImageButton.Icon"
+            android:layout_alignParentRight="true"
+            android:src="@drawable/close_edit_mode_selector"
+            android:paddingLeft="2dp"
+            android:paddingRight="2dp"
+            android:contentDescription="@string/edit_mode_cancel"
+            android:visibility="invisible"/>
 
     <!-- The space to the left of the cancel button would be larger than the right because
          the url bar drawable contains some whitespace, so we compensate by removing
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index db90a4ab5e8b..3411eb80a237 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -141,7 +141,7 @@ public class BrowserToolbar extends ThemedRelativeLayout
     private MenuPopup menuPopup;
     private List<View> focusOrder;
 
-    private final ImageView editCancel;
+    private final ThemedImageView editCancel;
 
     private final View[] tabletDisplayModeViews;
     private boolean hidForwardButtonOnStartEditing = false;
@@ -234,7 +234,7 @@ public class BrowserToolbar extends ThemedRelativeLayout
         actionItemBar = (LinearLayout) findViewById(R.id.menu_items);
         hasSoftMenuButton = !HardwareUtils.hasMenuButton();
 
-        editCancel = (ImageView) findViewById(R.id.edit_cancel);
+        editCancel = (ThemedImageView) findViewById(R.id.edit_cancel);
 
         // We use different layouts on phones and tablets, so adjust the focus
         // order appropriately.
@@ -1455,10 +1455,13 @@ public class BrowserToolbar extends ThemedRelativeLayout
         stateList.addState(EMPTY_STATE_SET, drawable);
 
         setBackgroundDrawable(stateList);
+
+        editCancel.onLightweightThemeChanged();
     }
 
     @Override
     public void onLightweightThemeReset() {
         setBackgroundResource(R.drawable.url_bar_bg);
+        editCancel.onLightweightThemeReset();
     }
 }