diff --git a/resources/skins.minerva.base.styles/magnifying-glass.png b/resources/skins.minerva.base.styles/magnifying-glass.png
deleted file mode 100644
index fa603b3..0000000
Binary files a/resources/skins.minerva.base.styles/magnifying-glass.png and /dev/null differ
diff --git a/resources/skins.minerva.base.styles/ui.less b/resources/skins.minerva.base.styles/ui.less
index 0ba0bd7..01fa5ed 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -143,9 +143,6 @@ body {
 	.search {
 		@searchIconSize: 20px;
 		@searchIconGutter: 6px;
-		// FIXME: input's cannot have child elements so not possible to use mw-ui-icon-before here
-		// How can we avoid multiple use of magnifying glass icon?
-		.background-image-svg( 'magnifying-glass.svg', 'magnifying-glass.png' );
 		outline: 0;
 		width: 100%;
 		// FIXME: unable to check but the important may not be needed for Nokia S60;
diff --git a/resources/skins.minerva.base.styles/magnifying-glass.svg b/resources/skins.minerva.content.styles.images/magnifying-glass.svg
similarity index 100%
rename from resources/skins.minerva.base.styles/magnifying-glass.svg
rename to resources/skins.minerva.content.styles.images/magnifying-glass.svg
diff --git a/resources/skins.minerva.icons.images/magnifying-glass.svg b/resources/skins.minerva.icons.images/magnifying-glass.svg
deleted file mode 100644
index ad2e5f6..0000000
--- a/resources/skins.minerva.icons.images/magnifying-glass.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>magnifying glass</title><path fill="#54595d" fill-rule="evenodd" d="M16.474 15.44c1.147-1.375 1.835-3.21 1.835-5.16a7.98 7.98 0 0 0-8.03-8.03 7.98 7.98 0 0 0-8.03 8.03 7.98 7.98 0 0 0 8.03 8.03c1.72 0 3.21-.46 4.47-1.378l4.473 4.474c.46.46 1.262.46 1.836 0l.69-.688-5.278-5.277zm-11.93-5.16c0-3.21 2.524-5.735 5.735-5.735 3.21 0 5.732 2.524 5.732 5.735 0 3.212-2.524 5.736-5.736 5.736-3.212 0-5.736-2.638-5.736-5.736z"/></svg>
\ No newline at end of file
diff --git a/skin.json b/skin.json
index 489bc77..680a2d5 100644
--- a/skin.json
+++ b/skin.json
@@ -173,17 +173,18 @@
 		},
 		"skins.minerva.content.styles.images": {
 			"class": "ResourceLoaderImageModule",
-			"selector": "a.{name}",
+			"selector": "{name}",
 			"defaultColor": "#36c",
 			"useDataURI": false,
 			"images": {
-				"external": {
+				"input.search,.mw-ui-icon-minerva-magnifying-glass:before": "resources/skins.minerva.content.styles.images/magnifying-glass.svg",
+				"a.external": {
 					"file": {
 						"ltr": "resources/skins.minerva.content.styles.images/link-external-ltr.svg",
 						"rtl": "resources/skins.minerva.content.styles.images/link-external-rtl.svg"
 					}
 				},
-				"extiw": {
+				"a.extiw": {
 					"file": {
 						"ltr": "resources/skins.minerva.content.styles.images/link-internal-ltr.svg",
 						"rtl": "resources/skins.minerva.content.styles.images/link-internal-rtl.svg"
@@ -218,7 +219,6 @@
 				"mainmenu": "resources/skins.minerva.icons.images/hamburger.svg",
 				"edit": "resources/skins.minerva.icons.images/editLocked.svg",
 				"edit-enabled": "resources/skins.minerva.icons.images/edit.svg",
-				"magnifying-glass": "resources/skins.minerva.icons.images/magnifying-glass.svg",
 				"language-switcher": "resources/skins.minerva.icons.images/languageSwitcher.svg"
 			}
 		},