diff --git a/includes/menu/PageActions/DefaultOverflowBuilder.php b/includes/menu/PageActions/DefaultOverflowBuilder.php
index 8d02da570..29e014fbd 100644
--- a/includes/menu/PageActions/DefaultOverflowBuilder.php
+++ b/includes/menu/PageActions/DefaultOverflowBuilder.php
@@ -50,7 +50,7 @@ class DefaultOverflowBuilder implements IOverflowBuilder {
 			$this->build( 'info', 'info', 'info', $toolbox ),
 			$this->build( 'permalink', 'link', 'permalink', $toolbox ),
 			$this->build( 'backlinks', 'articleRedirect', 'whatlinkshere', $toolbox ),
-			$this->build( 'wikibase', 'logo-Wikidata', 'wikibase', $toolbox ),
+			$this->build( 'wikibase', 'logoWikidata', 'wikibase', $toolbox ),
 			$this->build( 'cite', 'quotes', 'citethispage', $toolbox )
 		] );
 
diff --git a/resources/wikimedia.ui/articleRedirect-ltr.svg b/resources/wikimedia.ui/articleRedirect-ltr.svg
deleted file mode 100644
index 666dac202..000000000
--- a/resources/wikimedia.ui/articleRedirect-ltr.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>article redirect</title><path d="M5 1a2 2 0 0 0-2 2v1c0 5 2 8 7 8V9l5 4-5 4v-3c-3.18 0-5.51-.85-7-2.68V17a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2z"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/articleRedirect-rtl.svg b/resources/wikimedia.ui/articleRedirect-rtl.svg
deleted file mode 100644
index b5c50641c..000000000
--- a/resources/wikimedia.ui/articleRedirect-rtl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>article redirect</title><path d="M3 17c0 1.1.9 2 2 2h10c1.1 0 2-.9 2-2v-5.7c-1.5 1.8-3.8 2.7-7 2.7v3l-5-4 5-4v3c5 0 7-3 7-8V3c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2z"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/info.svg b/resources/wikimedia.ui/info.svg
deleted file mode 100644
index 1fec150d8..000000000
--- a/resources/wikimedia.ui/info.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M10 20C4.477 20 0 15.523 0 10S4.477 0 10 0s10 4.477 10 10-4.477 10-10 10zM9 9v6h2V9H9zm1-2a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/link.svg b/resources/wikimedia.ui/link.svg
deleted file mode 100644
index d5e07b377..000000000
--- a/resources/wikimedia.ui/link.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>link</title><path d="M4.83 15h2.91a4.88 4.88 0 0 1-1.55-2H5a3 3 0 1 1 0-6h3a3 3 0 0 1 2.82 4h2.1a4.82 4.82 0 0 0 .08-.83v-.34A4.83 4.83 0 0 0 8.17 5H4.83A4.83 4.83 0 0 0 0 9.83v.34A4.83 4.83 0 0 0 4.83 15z"/><path d="M15.17 5h-2.91a4.88 4.88 0 0 1 1.55 2H15a3 3 0 1 1 0 6h-3a3 3 0 0 1-2.82-4h-2.1a4.82 4.82 0 0 0-.08.83v.34A4.83 4.83 0 0 0 11.83 15h3.34A4.83 4.83 0 0 0 20 10.17v-.34A4.83 4.83 0 0 0 15.17 5z"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/listBullet-ltr.svg b/resources/wikimedia.ui/listBullet-ltr.svg
deleted file mode 100644
index 094ee6680..000000000
--- a/resources/wikimedia.ui/listBullet-ltr.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>bullet list</title><path d="M7 15h12v2H7zm0-6h12v2H7zm0-6h12v2H7z"/><circle cx="3" cy="4" r="2"/><circle cx="3" cy="10" r="2"/><circle cx="3" cy="16" r="2"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/listBullet-rtl.svg b/resources/wikimedia.ui/listBullet-rtl.svg
deleted file mode 100644
index 1dd19934e..000000000
--- a/resources/wikimedia.ui/listBullet-rtl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>bullet list</title><path d="M1 15h12v2H1zm0-6h12v2H1zm0-6h12v2H1z"/><circle cx="17" cy="4" r="2"/><circle cx="17" cy="10" r="2"/><circle cx="17" cy="16" r="2"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/logo-Wikidata.svg b/resources/wikimedia.ui/logo-Wikidata.svg
deleted file mode 100644
index 27a6b2d78..000000000
--- a/resources/wikimedia.ui/logo-Wikidata.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" stroke-width="30.2" viewBox="0 0 20 20"><title>Wikidata logo</title><path stroke="#54595d" stroke-width=".743" d="M.371 4v12.257m1.482 0V4m.74 0v12.257m.741 0V4m1.481 0v12.257m.741 0V4m.74 0v12.257M7.778 4v12.257m1.481 0V4m8.888 0v12.257m1.482 0V4M10.74 4v12.257m.741 0V4m.741 0v12.257m1.481 0V4m1.482 0v12.257m.74 0V4m.74 0v12.257"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/logo-Wikimedia.svg b/resources/wikimedia.ui/logo-Wikimedia.svg
deleted file mode 100644
index c0fa0f171..000000000
--- a/resources/wikimedia.ui/logo-Wikimedia.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>Wikimedia logo</title><clipPath id="a"><path d="M0-33l471 471v363h82V438l471-471v1057H0"/></clipPath><g clip-path="url(#a)" transform="matrix(.021 0 0 .021 -.756 -.588)"><path d="M511 224a288 288 0 1 0 2 0"/><path fill="none" stroke="#000" stroke-width="116" d="M511 102a410 410 0 1 0 2 0"/></g><circle cx="10" cy="3.32" r="3.32"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/quotes-ltr.svg b/resources/wikimedia.ui/quotes-ltr.svg
deleted file mode 100644
index 110a60cb2..000000000
--- a/resources/wikimedia.ui/quotes-ltr.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>quotes</title><path d="M7 6l1-2H6C3.79 4 2 6.79 2 9v7h7V9H5c0-3 2-3 2-3zm7 3c0-3 2-3 2-3l1-2h-2c-2.21 0-4 2.79-4 5v7h7V9z"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/quotes-rtl.svg b/resources/wikimedia.ui/quotes-rtl.svg
deleted file mode 100644
index 56053284c..000000000
--- a/resources/wikimedia.ui/quotes-rtl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>quotes</title><path d="M11 9v7h7V9c0-2.2-1.8-5-4-5h-2l1 2s2 0 2 3zM2 9v7h7V9c0-2.2-1.8-5-4-5H3l1 2s2 0 2 3z"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/upload.svg b/resources/wikimedia.ui/upload.svg
deleted file mode 100644
index 3133d6c0a..000000000
--- a/resources/wikimedia.ui/upload.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>upload</title><path d="M17 12v5H3v-5H1v5a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-5z"/><path d="M10 1L5 7h4v8h2V7h4z"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/userAvatar.svg b/resources/wikimedia.ui/userAvatar.svg
deleted file mode 100644
index 425a23e15..000000000
--- a/resources/wikimedia.ui/userAvatar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>user avatar</title><path d="M10 11c-5.92 0-8 3-8 5v3h16v-3c0-2-2.08-5-8-5z"/><circle cx="10" cy="5.5" r="4.5"/></svg>
\ No newline at end of file
diff --git a/skin.json b/skin.json
index bbeae6194..046a336a7 100644
--- a/skin.json
+++ b/skin.json
@@ -260,42 +260,12 @@
 			]
 		},
 		"wikimedia.ui": {
-			"class": "ResourceLoaderImageModule",
-			"selectorWithoutVariant": ".wikimedia-ui-{name}:before",
-			"selectorWithVariant": ".wikimedia-ui-{name}-{variant}:before",
+			"selectorWithoutVariant": ".wikimedia-ui-{name}-base20:before",
 			"useDataURI": false,
-			"variants": {
-				"base20": {
-					"color": "#54595d",
-					"global": true
-				}
-			},
-			"images": {
-				"articleRedirect": {
-					"file": {
-						"ltr": "resources/wikimedia.ui/articleRedirect-ltr.svg",
-						"rtl": "resources/wikimedia.ui/articleRedirect-rtl.svg"
-					}
-				},
-				"info": "resources/wikimedia.ui/info.svg",
-				"link": "resources/wikimedia.ui/link.svg",
-				"listBullet": {
-					"file": {
-						"ltr": "resources/wikimedia.ui/listBullet-ltr.svg",
-						"rtl": "resources/wikimedia.ui/listBullet-rtl.svg"
-					}
-				},
-				"logo-Wikidata": "resources/wikimedia.ui/logo-Wikidata.svg",
-				"logo-Wikimedia": "resources/wikimedia.ui/logo-Wikimedia.svg",
-				"quotes": {
-					"file": {
-						"ltr": "resources/wikimedia.ui/quotes-ltr.svg",
-						"rtl": "resources/wikimedia.ui/quotes-rtl.svg"
-					}
-				},
-				"upload": "resources/wikimedia.ui/upload.svg",
-				"userAvatar": "resources/wikimedia.ui/userAvatar.svg"
-			}
+			"defaultColor": "#54595d",
+			"class": "ResourceLoaderOOUIIconPackModule",
+			"icons": [ "articleRedirect", "info", "link", "listBullet",
+				"logoWikidata", "logoWikimedia", "quotes", "upload", "userAvatar" ]
 		},
 		"skins.minerva.icons.images": {
 			"class": "ResourceLoaderImageModule",