diff --git a/resources/skins.citizen.icons/shared/beta.svg b/resources/skins.citizen.icons/shared/beta.svg
deleted file mode 100644
index fc612ac0..00000000
--- a/resources/skins.citizen.icons/shared/beta.svg
+++ /dev/null
@@ -1,7 +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>
-		beaker
-	</title>
-	<path d="M13 7.61V3h1V1H6v2h1v4.61l-5.86 9.88A1 1 0 0 0 2 19h16a1 1 0 0 0 .86-1.51zm-4.2.88a1 1 0 0 0 .2-.6V3h2v4.89a1 1 0 0 0 .14.51l2.14 3.6H6.72z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/bright.svg b/resources/skins.citizen.icons/shared/bright.svg
deleted file mode 100644
index 4f9b4977..00000000
--- a/resources/skins.citizen.icons/shared/bright.svg
+++ /dev/null
@@ -1,8 +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>
-		bright
-	</title>
-	<path d="M17.07 7.07V2.93h-4.14L10 0 7.07 2.93H2.93v4.14L0 10l2.93 2.93v4.14h4.14L10 20l2.93-2.93h4.14v-4.14L20 10zM10 16a6 6 0 1 1 6-6 6 6 0 0 1-6 6z"/>
-	<circle cx="10" cy="10" r="4.5"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/close.svg b/resources/skins.citizen.icons/shared/close.svg
deleted file mode 100644
index ba03b200..00000000
--- a/resources/skins.citizen.icons/shared/close.svg
+++ /dev/null
@@ -1,8 +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>
-		close
-	</title>
-	<path d="m4.34 2.93 12.73 12.73-1.41 1.41L2.93 4.35z"/>
-	<path d="M17.07 4.34 4.34 17.07l-1.41-1.41L15.66 2.93z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/delete.svg b/resources/skins.citizen.icons/shared/delete.svg
deleted file mode 100644
index 96dd42a6..00000000
--- a/resources/skins.citizen.icons/shared/delete.svg
+++ /dev/null
@@ -1,7 +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>
-		trash
-	</title>
-	<path d="M17 2h-3.5l-1-1h-5l-1 1H3v2h14zM4 17a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V5H4z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/eyeClosed.svg b/resources/skins.citizen.icons/shared/eyeClosed.svg
deleted file mode 100644
index 5400d34a..00000000
--- a/resources/skins.citizen.icons/shared/eyeClosed.svg
+++ /dev/null
@@ -1,8 +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>
-		eye closed
-	</title>
-	<path d="M12.49 9.94A2.5 2.5 0 0 0 10 7.5z"/>
-	<path d="M8.2 5.9a4.38 4.38 0 0 1 1.8-.4 4.5 4.5 0 0 1 4.5 4.5 4.34 4.34 0 0 1-.29 1.55L17 14.14A14 14 0 0 0 20 10s-3-7-10-7a9.63 9.63 0 0 0-4 .85zM2 2 1 3l2.55 2.4A13.89 13.89 0 0 0 0 10s3 7 10 7a9.67 9.67 0 0 0 4.64-1.16L18 19l1-1zm8 12.5A4.5 4.5 0 0 1 5.5 10a4.45 4.45 0 0 1 .6-2.2l1.53 1.44a2.47 2.47 0 0 0-.13.76 2.49 2.49 0 0 0 3.41 2.32l1.54 1.45a4.47 4.47 0 0 1-2.45.73z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/image.svg b/resources/skins.citizen.icons/shared/image.svg
deleted file mode 100644
index 6ecd7155..00000000
--- a/resources/skins.citizen.icons/shared/image.svg
+++ /dev/null
@@ -1,7 +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>
-		image
-	</title>
-	<path d="M2 2a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2zm-.17 13 4.09-5.25 2.92 3.51L12.92 8l5.25 7z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/lock.svg b/resources/skins.citizen.icons/shared/lock.svg
deleted file mode 100644
index 577d4a20..00000000
--- a/resources/skins.citizen.icons/shared/lock.svg
+++ /dev/null
@@ -1,7 +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>
-		lock
-	</title>
-	<path d="M16.07 8H15V5s0-5-5-5-5 5-5 5v3H3.93A1.93 1.93 0 0 0 2 9.93v8.15A1.93 1.93 0 0 0 3.93 20h12.14A1.93 1.93 0 0 0 18 18.07V9.93A1.93 1.93 0 0 0 16.07 8zM10 16a2 2 0 1 1 2-2 2 2 0 0 1-2 2zm3-8H7V5.5C7 4 7 2 10 2s3 2 3 3.5z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/logIn-ltr.svg b/resources/skins.citizen.icons/shared/logIn-ltr.svg
deleted file mode 100644
index db2295fc..00000000
--- a/resources/skins.citizen.icons/shared/logIn-ltr.svg
+++ /dev/null
@@ -1,7 +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>
-		log in
-	</title>
-	<path d="M1 11v6c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2H3c-1.1 0-2 .9-2 2v6h8V5l4.75 5L9 15v-4H1z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/logIn-rtl.svg b/resources/skins.citizen.icons/shared/logIn-rtl.svg
deleted file mode 100644
index dc776316..00000000
--- a/resources/skins.citizen.icons/shared/logIn-rtl.svg
+++ /dev/null
@@ -1,7 +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>
-		log in
-	</title>
-	<path d="M19 11v6c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h14c1.1 0 2 .9 2 2v6h-8V5l-4.75 5L11 15v-4h8z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/logOut-ltr.svg b/resources/skins.citizen.icons/shared/logOut-ltr.svg
deleted file mode 100644
index f9e4a7ff..00000000
--- a/resources/skins.citizen.icons/shared/logOut-ltr.svg
+++ /dev/null
@@ -1,8 +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>
-		log out
-	</title>
-	<path d="M3 3h8V1H3a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h8v-2H3z"/>
-	<path d="M13 5v4H5v2h8v4l6-5z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/logOut-rtl.svg b/resources/skins.citizen.icons/shared/logOut-rtl.svg
deleted file mode 100644
index ffc279d4..00000000
--- a/resources/skins.citizen.icons/shared/logOut-rtl.svg
+++ /dev/null
@@ -1,8 +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>
-		log out
-	</title>
-	<path d="M17 17H9v2h8c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2H9v2h8z"/>
-	<path d="M7 15v-4h8V9H7V5l-6 5z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/moon.svg b/resources/skins.citizen.icons/shared/moon.svg
deleted file mode 100644
index c7abb1ae..00000000
--- a/resources/skins.citizen.icons/shared/moon.svg
+++ /dev/null
@@ -1,7 +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>
-		moon
-	</title>
-	<path d="M17.39 15.14A7.33 7.33 0 0 1 11.75 1.6c.23-.11.56-.23.79-.34a8.19 8.19 0 0 0-5.41.45 9 9 0 1 0 7 16.58 8.42 8.42 0 0 0 4.29-3.84 5.3 5.3 0 0 1-1.03.69z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/move.svg b/resources/skins.citizen.icons/shared/move.svg
deleted file mode 100644
index aece5067..00000000
--- a/resources/skins.citizen.icons/shared/move.svg
+++ /dev/null
@@ -1,7 +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>
-		move
-	</title>
-	<path d="m19 10-4-3v2h-4V5h2l-3-4-3 4h2v4H5V7l-4 3 4 3v-2h4v4H7l3 4 3-4h-2v-4h4v2z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/profile.svg b/resources/skins.citizen.icons/shared/profile.svg
deleted file mode 100644
index 09bd2b80..00000000
--- a/resources/skins.citizen.icons/shared/profile.svg
+++ /dev/null
@@ -1,5 +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">
-	<path fill="#54595d" d="M12 13c-5.9 0-8 3-8 5v3h16v-3c0-2-2.1-5-8-5z"/>
-	<circle cx="12" cy="7.5" r="4.5" fill="#54595d"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/reddit.svg b/resources/skins.citizen.icons/shared/reddit.svg
deleted file mode 100644
index ae42dd04..00000000
--- a/resources/skins.citizen.icons/shared/reddit.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-	<path d="M24 11.779a2.654 2.654 0 0 0-4.497-1.899c-1.81-1.191-4.259-1.949-6.971-2.046l1.483-4.669 4.016.941-.006.058a2.17 2.17 0 0 0 2.174 2.163 2.17 2.17 0 0 0 2.172-2.163 2.171 2.171 0 0 0-4.193-.785l-4.329-1.015a.37.37 0 0 0-.44.249L11.755 7.82c-2.838.034-5.409.798-7.3 2.025a2.643 2.643 0 0 0-1.799-.712A2.654 2.654 0 0 0 0 11.779c0 .97.533 1.811 1.317 2.271a4.716 4.716 0 0 0-.086.857C1.231 18.818 6.039 22 11.95 22s10.72-3.182 10.72-7.093c0-.274-.029-.544-.075-.81A2.633 2.633 0 0 0 24 11.779zM6.776 13.595c0-.868.71-1.575 1.582-1.575.872 0 1.581.707 1.581 1.575s-.709 1.574-1.581 1.574-1.582-.706-1.582-1.574zm9.061 4.669c-.797.793-2.048 1.179-3.824 1.179L12 19.44l-.013.003c-1.777 0-3.028-.386-3.824-1.179a.369.369 0 0 1 0-.523.372.372 0 0 1 .526 0c.65.647 1.729.961 3.298.961l.013.003.013-.003c1.569 0 2.648-.315 3.298-.962a.373.373 0 0 1 .526 0 .37.37 0 0 1 0 .524zm-.189-3.095a1.58 1.58 0 0 1-1.581-1.574c0-.868.709-1.575 1.581-1.575s1.581.707 1.581 1.575-.709 1.574-1.581 1.574z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/unLock.svg b/resources/skins.citizen.icons/shared/unLock.svg
deleted file mode 100644
index 37bfd51a..00000000
--- a/resources/skins.citizen.icons/shared/unLock.svg
+++ /dev/null
@@ -1,7 +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>
-		un-lock
-	</title>
-	<path d="M15 8V5s0-5-5-5a4.63 4.63 0 0 0-4.88 4h2C7.31 2.93 8 2 10 2c3 0 3 2 3 3.5V8H3.93A1.93 1.93 0 0 0 2 9.93v8.15A1.93 1.93 0 0 0 3.93 20h12.14A1.93 1.93 0 0 0 18 18.07V9.93A1.93 1.93 0 0 0 16.07 8zm-5 8a2 2 0 1 1 2-2 2 2 0 0 1-2 2z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/userNormal.svg b/resources/skins.citizen.icons/shared/userNormal.svg
deleted file mode 100644
index b94fcbf6..00000000
--- a/resources/skins.citizen.icons/shared/userNormal.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="271.5 72.8 16 16">
-	<path d="M273.59 72.8c-2.03 0-2.09 1.907-2.09 2.032V88.8h13.91c2.03 0 2.09-1.907 2.09-2.032V72.8h-13.91z"/>
-	<g fill="#fff" transform="matrix(.042 0 0 .042 259.047 68.752)">
-		<circle cx="437" cy="234.1" r="28"/>
-		<circle cx="553.5" cy="234.1" r="28"/>
-	</g>
-	<path fill="#fff" d="M279.88 85.338c-1.8 0-3.533-.617-4.583-1.61-.248-.247-.248-.68 0-.927s.68-.243.928 0c.806.81 2.167 1.24 3.654 1.24 1.42 0 2.784-.43 3.59-1.24.244-.243.68-.243.924 0s.248.68 0 .93c-1.113.99-2.722 1.61-4.52 1.61z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/userTalk-ltr.svg b/resources/skins.citizen.icons/shared/userTalk-ltr.svg
deleted file mode 100644
index f158d943..00000000
--- a/resources/skins.citizen.icons/shared/userTalk-ltr.svg
+++ /dev/null
@@ -1,7 +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 talk
-	</title>
-	<path d="M18 0H2a2 2 0 0 0-2 2v18l4-4h14a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm-4 4a1.5 1.5 0 1 1-1.5 1.5A1.5 1.5 0 0 1 14 4zM6 4a1.5 1.5 0 1 1-1.5 1.5A1.5 1.5 0 0 1 6 4zm4 8c-2.61 0-4.83-.67-5.65-3h11.3c-.82 2.33-3.04 3-5.65 3z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/userTalk-rtl.svg b/resources/skins.citizen.icons/shared/userTalk-rtl.svg
deleted file mode 100644
index 918946ca..00000000
--- a/resources/skins.citizen.icons/shared/userTalk-rtl.svg
+++ /dev/null
@@ -1,7 +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 talk
-	</title>
-	<path d="M0 2v12c0 1.1.9 2 2 2h14l4 4V2c0-1.1-.9-2-2-2H2C.9 0 0 .9 0 2zm7.5 3.5C7.5 6.3 6.8 7 6 7s-1.5-.7-1.5-1.5S5.2 4 6 4s1.5.7 1.5 1.5zm8 0c0 .8-.7 1.5-1.5 1.5s-1.5-.7-1.5-1.5S13.2 4 14 4s1.5.7 1.5 1.5zM4.4 9h11.3c-.8 2.3-3 3-5.6 3s-4.9-.7-5.7-3z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/warning.svg b/resources/skins.citizen.icons/shared/warning.svg
deleted file mode 100644
index 84c0ed9e..00000000
--- a/resources/skins.citizen.icons/shared/warning.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80">
-	<path fill="#4a4f53" d="m1.092 73.695 38.906-67.39 38.91 67.39z"/>
-	<path fill="#fff" d="M43.528 57.71v7.104h-6.83V57.71h6.83zm-2.03-5.908h-3.275L36.47 39.55v-7.86h6.827v7.858l-1.8 12.254z"/>
-</svg>
diff --git a/resources/skins.citizen.icons/shared/watchlist.svg b/resources/skins.citizen.icons/shared/watchlist.svg
deleted file mode 100644
index a5901e3b..00000000
--- a/resources/skins.citizen.icons/shared/watchlist.svg
+++ /dev/null
@@ -1,4 +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">
-	<path fill-rule="evenodd" d="M12 18.27 18.18 22l-1.64-7.03L22 10.24l-7.19-.61L12 3 9.19 9.63 2 10.24l5.46 4.73L5.82 22z"/>
-</svg>
diff --git a/resources/skins.citizen.styles/Menu.less b/resources/skins.citizen.styles/Menu.less
index 759e0cbf..ec88fa0e 100644
--- a/resources/skins.citizen.styles/Menu.less
+++ b/resources/skins.citizen.styles/Menu.less
@@ -2,7 +2,7 @@
 	&__heading {
 		&-label {
 			display: block;
-			padding: 0.625rem 1.25rem;
+			padding: 0.625rem var( --space-md );
 			margin: 0;
 			color: var( --color-base--subtle );
 			font-size: inherit;
diff --git a/resources/skins.citizen.styles/Pagetools.less b/resources/skins.citizen.styles/Pagetools.less
index b470da7f..a7d929e3 100644
--- a/resources/skins.citizen.styles/Pagetools.less
+++ b/resources/skins.citizen.styles/Pagetools.less
@@ -60,7 +60,7 @@
 		.citizen-card-hide( top right );
 
 		a {
-			padding: 0.625rem 1.25rem;
+			padding: 0.625rem var( --space-md );
 			.menu-item-link;
 
 			&:hover {