--- a/mobile/android/app/src/australis/res/layout/toolbar_edit_layout.xml
+++ b/mobile/android/app/src/australis/res/layout/toolbar_edit_layout.xml
@@ -16,17 +16,17 @@
         android:layout_marginEnd="@dimen/browser_toolbar_site_security_margin_end"
         android:paddingBottom="@dimen/browser_toolbar_site_security_padding_vertical"
         android:paddingLeft="@dimen/browser_toolbar_site_security_padding_horizontal"
         android:paddingStart="@dimen/browser_toolbar_site_security_padding_horizontal"
         android:paddingRight="@dimen/browser_toolbar_site_security_padding_horizontal"
         android:paddingEnd="@dimen/browser_toolbar_site_security_padding_horizontal"
         android:paddingTop="@dimen/browser_toolbar_site_security_padding_vertical"
         android:scaleType="fitCenter"
-        android:src="@drawable/search_icon_inactive"
+        android:src="@drawable/ic_search_icon"
         android:visibility="gone"/>
 
     <org.mozilla.gecko.toolbar.ToolbarEditText
           android:id="@+id/url_edit_text"
           style="@style/UrlBar.Title"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           android:layout_weight="1.0"
@@ -36,18 +36,18 @@
           android:contentDescription="@string/url_bar_default_text"
           android:paddingRight="8dp"
           android:paddingEnd="8dp"
           gecko:autoUpdateTheme="false"/>
 
     <org.mozilla.gecko.widget.themed.ThemedImageButton android:id="@+id/qrcode"
                  android:layout_width="@dimen/page_action_button_width"
                  android:layout_height="match_parent"
-                 android:src="@drawable/ab_qrcode"
+                 android:src="@drawable/ic_qrcode"
                  android:background="@android:color/transparent"/>
 
     <org.mozilla.gecko.widget.themed.ThemedImageButton android:id="@+id/mic"
                  android:layout_width="@dimen/page_action_button_width"
                  android:layout_height="match_parent"
-                 android:src="@drawable/ab_mic"
+                 android:src="@drawable/ic_mic"
                  android:background="@android:color/transparent"/>
 
 </merge>

rename from mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_dark.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_cancel_nm.png

rename from mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_light.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_cancel_pm.png

rename from mobile/android/app/src/main/res/drawable-hdpi/lock_secure.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_lock.png

rename from mobile/android/app/src/main/res/drawable-hdpi/lock_disabled.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_lock_disabled.png

rename from mobile/android/app/src/main/res/drawable-hdpi/lock_inactive.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_lock_inactive.png

rename from mobile/android/app/src/main/res/drawable-hdpi/ab_mic.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_mic.png

rename from mobile/android/app/src/main/res/drawable-hdpi/ab_menu.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_overflow.png

rename from mobile/android/app/src/main/res/drawable-hdpi/ab_qrcode.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_qrcode.png

rename from mobile/android/app/src/main/res/drawable-hdpi/search_icon_inactive.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_search_icon.png

rename from mobile/android/app/src/main/res/drawable-hdpi/shield_disabled.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_shield_disabled.png

rename from mobile/android/app/src/main/res/drawable-hdpi/shield_enabled.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_shield_enabled.png

rename from mobile/android/app/src/main/res/drawable-hdpi/warning_major.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_warning_major.png

rename from mobile/android/app/src/main/res/drawable-hdpi/warning_minor.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_warning_minor.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_dark.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_cancel_nm.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_light.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_cancel_pm.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/lock_secure.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_lock.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/lock_disabled.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_lock_disabled.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/lock_inactive.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_lock_inactive.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/ab_mic.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_mic.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/ab_menu.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_overflow.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/ab_qrcode.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_qrcode.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/search_icon_inactive.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_search_icon.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/shield_disabled.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_shield_disabled.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/shield_enabled.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_shield_enabled.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/warning_major.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_warning_major.png

rename from mobile/android/app/src/main/res/drawable-xhdpi/warning_minor.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_warning_minor.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_dark.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_cancel_nm.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_light.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_cancel_pm.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/lock_secure.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/lock_disabled.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock_disabled.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/lock_inactive.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_lock_inactive.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/ab_mic.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_mic.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/ab_qrcode.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_qrcode.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/search_icon_inactive.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_search_icon.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/shield_disabled.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_shield_disabled.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/shield_enabled.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_shield_enabled.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/warning_major.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_warning_major.png

rename from mobile/android/app/src/main/res/drawable-xxhdpi/warning_minor.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_warning_minor.png

--- a/mobile/android/app/src/main/res/drawable/close_edit_mode_selector.xml
+++ b/mobile/android/app/src/main/res/drawable/close_edit_mode_selector.xml
@@ -2,16 +2,16 @@
 <!-- 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"/>
+          android:drawable="@drawable/ic_cancel_nm"/>
 
     <item gecko:state_private="true"
-          android:drawable="@drawable/close_edit_mode_light"/>
+          android:drawable="@drawable/ic_cancel_pm"/>
 
-    <item android:drawable="@drawable/close_edit_mode_light"/>
+    <item android:drawable="@drawable/ic_cancel_pm"/>
 
 </selector>

--- a/mobile/android/app/src/main/res/drawable/site_security_icon.xml
+++ b/mobile/android/app/src/main/res/drawable/site_security_icon.xml
@@ -6,27 +6,27 @@
 
 <!-- level value is matter. It should match SecurityModeUtil.getImageLevel -->
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:drawable="@drawable/site_security_unknown"
         android:maxLevel="0" />
     <item
-        android:drawable="@drawable/lock_secure"
+        android:drawable="@drawable/ic_lock"
         android:maxLevel="1" />
     <item
-        android:drawable="@drawable/warning_minor"
+        android:drawable="@drawable/ic_warning_minor"
         android:maxLevel="2" />
     <item
-        android:drawable="@drawable/lock_disabled"
+        android:drawable="@drawable/ic_lock_disabled"
         android:maxLevel="3" />
     <item
-        android:drawable="@drawable/shield_enabled"
+        android:drawable="@drawable/ic_shield_enabled"
         android:maxLevel="4" />
     <item
-        android:drawable="@drawable/shield_disabled"
+        android:drawable="@drawable/ic_shield_disabled"
         android:maxLevel="5" />
     <item
-        android:drawable="@drawable/search_icon_inactive"
+        android:drawable="@drawable/ic_search_icon"
         android:maxLevel="6" />
 
 </level-list>

--- a/mobile/android/app/src/main/res/layout/search_bar.xml
+++ b/mobile/android/app/src/main/res/layout/search_bar.xml
@@ -6,18 +6,18 @@
 
     <org.mozilla.search.ui.BackCaptureEditText
         android:id="@+id/edit_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:imeOptions="actionSearch"
         android:inputType="textNoSuggestions"
-        android:drawableLeft="@drawable/search_icon_inactive"
-        android:drawableStart="@drawable/search_icon_inactive"
+        android:drawableLeft="@drawable/ic_search_icon"
+        android:drawableStart="@drawable/ic_search_icon"
         android:paddingRight="30dp"
         android:paddingEnd="30dp"
         android:drawablePadding="5dp"
         android:textSize="@dimen/query_text_size"
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:textColorHighlight="@color/fennec_ui_orange"
         android:textSelectHandle="@drawable/handle_middle"

--- a/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml
+++ b/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml
@@ -26,17 +26,17 @@
         android:background="@drawable/action_bar_button"
         android:paddingBottom="@dimen/browser_toolbar_site_security_padding_vertical"
         android:paddingEnd="@dimen/browser_toolbar_site_security_padding_horizontal"
         android:paddingLeft="@dimen/browser_toolbar_site_security_padding_horizontal"
         android:paddingRight="@dimen/browser_toolbar_site_security_padding_horizontal"
         android:paddingStart="@dimen/browser_toolbar_site_security_padding_horizontal"
         android:paddingTop="@dimen/browser_toolbar_site_security_padding_vertical"
         android:scaleType="fitCenter"
-        android:src="@drawable/search_icon_inactive"
+        android:src="@drawable/ic_search_icon"
         android:visibility="gone"
         tools:visibility="visible" />
 
     <org.mozilla.gecko.toolbar.ToolbarEditText
         android:id="@+id/url_edit_text"
         style="@style/UrlBar.Title"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

--- a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
@@ -220,17 +220,17 @@ public class CustomTabsActivity extends 
                         }
                     });
         }
 
         // insert an action button for menu. click it to show popup menu
         popupMenu = createCustomPopupMenu();
 
         @SuppressWarnings("deprecation")
-        Drawable icon = getResources().getDrawable(R.drawable.ab_menu);
+        Drawable icon = getResources().getDrawable(R.drawable.ic_overflow);
         actionBarPresenter.addActionButton(menu, icon, true)
                 .setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View anchor) {
                         popupMenu.setAnchor(anchor);
                         popupMenu.show();
                     }
                 });

--- a/mobile/android/base/java/org/mozilla/gecko/home/SearchEngine.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/SearchEngine.java
@@ -44,17 +44,17 @@ public class SearchEngine {
             Log.w(LOG_TAG, "iconURI is null for search engine " + this.name);
         }
         final Bitmap tempIcon = BitmapUtils.getBitmapFromDataURI(iconURI);
 
         this.icon = (tempIcon != null) ? tempIcon : getDefaultFavicon(context);
     }
 
     private Bitmap getDefaultFavicon(final Context context) {
-        return BitmapFactory.decodeResource(context.getResources(), R.drawable.search_icon_inactive);
+        return BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_search_icon);
     }
 
     /**
      * @return a non-null string suitable for use by FHR.
      */
     @NonNull
     public String getEngineIdentifier() {
         if (this.identifier != null) {

--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java
@@ -317,26 +317,26 @@ public class SiteIdentityPopup extends A
             mIcon.setImageResource(R.drawable.icon);
             clearSecurityStateIcon();
 
             mMixedContentActivity.setVisibility(View.GONE);
             mLink.setVisibility(View.GONE);
         } else if (!siteIdentity.isSecure()) {
             if (siteIdentity.getMixedModeActive() == MixedMode.LOADED) {
                 // Active Mixed Content loaded because user has disabled blocking.
-                mIcon.setImageResource(R.drawable.lock_disabled);
+                mIcon.setImageResource(R.drawable.ic_lock_disabled);
                 clearSecurityStateIcon();
                 mMixedContentActivity.setVisibility(View.VISIBLE);
                 mMixedContentActivity.setText(R.string.mixed_content_protection_disabled);
 
                 mLink.setVisibility(View.VISIBLE);
             } else if (siteIdentity.getMixedModeDisplay() == MixedMode.LOADED) {
                 // Passive Mixed Content loaded.
-                mIcon.setImageResource(R.drawable.lock_inactive);
-                setSecurityStateIcon(R.drawable.warning_major, 1);
+                mIcon.setImageResource(R.drawable.ic_lock_inactive);
+                setSecurityStateIcon(R.drawable.ic_warning_major, 1);
                 mMixedContentActivity.setVisibility(View.VISIBLE);
                 if (siteIdentity.getMixedModeActive() == MixedMode.BLOCKED) {
                     mMixedContentActivity.setText(R.string.mixed_content_blocked_some);
                 } else {
                     mMixedContentActivity.setText(R.string.mixed_content_display_loaded);
                 }
                 mLink.setVisibility(View.VISIBLE);
 
@@ -349,24 +349,24 @@ public class SiteIdentityPopup extends A
                 mLink.setVisibility(View.GONE);
             }
 
             mSecurityState.setText(R.string.identity_connection_insecure);
             mSecurityState.setTextColor(ContextCompat.getColor(mContext, R.color.placeholder_active_grey));
 
         } else if (siteIdentity.isSecurityException()) {
 
-            mIcon.setImageResource(R.drawable.lock_inactive);
-            setSecurityStateIcon(R.drawable.warning_major, 1);
+            mIcon.setImageResource(R.drawable.ic_lock_inactive);
+            setSecurityStateIcon(R.drawable.ic_warning_major, 1);
             mSecurityState.setText(R.string.identity_connection_insecure);
             mSecurityState.setTextColor(ContextCompat.getColor(mContext, R.color.placeholder_active_grey));
 
         } else {
             // Connection is secure.
-            mIcon.setImageResource(R.drawable.lock_secure);
+            mIcon.setImageResource(R.drawable.ic_lock);
 
             setSecurityStateIcon(R.drawable.img_check, 2);
             mSecurityState.setTextColor(ContextCompat.getColor(mContext, R.color.affirmative_green));
             mSecurityState.setText(R.string.identity_connection_secure);
 
             // Mixed content has been blocked, if present.
             if (siteIdentity.getMixedModeActive() == MixedMode.BLOCKED ||
                 siteIdentity.getMixedModeDisplay() == MixedMode.BLOCKED) {
@@ -415,17 +415,17 @@ public class SiteIdentityPopup extends A
     }
 
     private void addTrackingContentNotification(boolean blocked) {
         // Remove any existing tracking content notification.
         removeTrackingContentNotification();
 
         final DoorhangerConfig config = new DoorhangerConfig(DoorHanger.Type.TRACKING, mContentButtonClickListener);
 
-        final int icon = blocked ? R.drawable.shield_enabled : R.drawable.shield_disabled;
+        final int icon = blocked ? R.drawable.ic_shield_enabled : R.drawable.ic_shield_disabled;
 
         final GeckoBundle options = new GeckoBundle();
         final GeckoBundle tracking = new GeckoBundle();
         tracking.putBoolean("enabled", blocked);
         options.putBundle("tracking_protection", tracking);
         config.setOptions(options);
 
         config.setLink(mContext.getString(R.string.learn_more), TRACKING_CONTENT_SUPPORT_URL);

--- a/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java
+++ b/mobile/android/search/java/org/mozilla/search/autocomplete/SearchBar.java
@@ -159,17 +159,17 @@ public class SearchBar extends FrameLayo
         }
         this.active = active;
 
         updateClearButtonVisibility();
 
         editText.setFocusable(active);
         editText.setFocusableInTouchMode(active);
 
-        final int startDrawable = active ? R.drawable.search_icon_active : R.drawable.search_icon_inactive;
+        final int startDrawable = active ? R.drawable.search_icon_active : R.drawable.ic_search_icon;
         TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(editText, startDrawable, 0, 0, 0);
 
         // We can't use a selector drawable because we apply a color filter to the focused
         // background at run time.
         // TODO: setBackgroundDrawable is deprecated in API level 16
         editText.setBackgroundDrawable(active ? focusedBackground : defaultBackground);
 
         if (active) {

--- a/mobile/android/themes/core/aboutLogins.css
+++ b/mobile/android/themes/core/aboutLogins.css
@@ -74,17 +74,17 @@ body {
   border-radius: 3px;
 }
 
 #filter-button {
   background-image: url("resource://android/res/drawable-mdpi-v4/ab_search.png");
 }
 
 #filter-clear {
-  background-image: url("resource://android/res/drawable-mdpi-v4/close_edit_mode_light.png");
+  background-image: url("resource://android/res/drawable-mdpi-v4/ic_cancel_pm.png");
   background-position: center;
   background-size: 12px 12px;
   background-repeat: no-repeat;
   height: 32px;
   width: 32px;
   margin: 0 5px;
 }
 
@@ -170,31 +170,31 @@ body {
 }
 
 @media screen and (min-resolution: 1.25dppx) {
   #filter-button {
     background-image: url("resource://android/res/drawable-hdpi-v4/ab_search.png");
   }
 
   #filter-clear {
-    background-image: url("resource://android/res/drawable-hdpi-v4/close_edit_mode_light.png");
+    background-image: url("resource://android/res/drawable-hdpi-v4/ic_cancel_pm.png");
   }
 
   .icon {
     background-image: url("resource://android/res/drawable-hdpi-v4/favicon_globe.png");
   }
 }
 
 @media screen and (min-resolution: 2dppx) {
   #filter-button {
     background-image: url("resource://android/res/drawable-xhdpi-v4/ab_search.png");
   }
 
   #filter-clear {
-    background-image: url("resource://android/res/drawable-hdpi-v4/close_edit_mode_light.png");
+    background-image: url("resource://android/res/drawable-hdpi-v4/ic_cancel_pm.png");
   }
 
   .icon {
     background-image: url("resource://android/res/drawable-xhdpi-v4/favicon_globe.png");
   }
 }
 
 #loading-img-container{