diff --git a/p/themes/Mapco/_components.scss b/p/themes/Mapco/_components.scss
index fc956dfc3..c3698659b 100644
--- a/p/themes/Mapco/_components.scss
+++ b/p/themes/Mapco/_components.scss
@@ -7,7 +7,7 @@
 /*=== COMPONENTS */
 /*===============*/
 /*=== Forms */
-// parti dans _forms.scss
+// see _forms.scss
 
 /*=== Horizontal-list */
 .horizontal-list {
@@ -41,7 +41,6 @@
 	}
 
 	.dropdown-header {
-		// padding: 0 5px 5px;
 		margin: 1rem 0.5rem 1rem 1rem;
 		font-weight: bold;
 		text-align: left;
@@ -66,6 +65,10 @@
 			background: variables.$main-first;
 			color: variables.$white;
 
+			.icon {
+				filter: brightness(3);
+			}
+
 			a, button, label {
 				text-decoration: none;
 				color: variables.$white;
@@ -91,7 +94,6 @@
 	.separator {
 		margin: 0.75rem 0;
 		border-bottom: 1px solid variables.$grey-light;
-		// display: none;
 	}
 
 }
@@ -122,7 +124,6 @@
 /*=== Alerts */
 .alert {
 	margin: 1rem 0;
-	// width: 100%;
 	padding: 1rem;
 	background: variables.$grey-lighter;
 	color: variables.$grey-dark;
@@ -144,7 +145,7 @@
 .alert-warn {
 	background: variables.$warning-light;
 	color: variables.$warning-text;
-	border: 1px solid string.unquote(variables.$warning-text + '33'); // on ajoute l’opacité à la fin
+	border: 1px solid string.unquote(variables.$warning-text + '33'); // add opacity at the end
 }
 
 .alert-success {
@@ -178,7 +179,6 @@
 /*=== Boxes */
 .box {
 	background: variables.$white;
-	// border: 1px solid #ddd;
 	border: none;
 	border-radius: 3px;
 
@@ -189,31 +189,24 @@
 		padding: 5px 10px;
 		background: variables.$grey-light;
 		color: variables.$main-font-color;
-		// border-bottom: 1px solid #ddd;
 		border-radius: 2px 2px 0 0;
 
 		.configure {
-			margin-right: 4px;
+			padding: 5px;
 		}
 
 		&:hover {
 			.configure {
-				background: url("icons/cog.svg") no-repeat 4px 4px;
-				display: block;
-				float: left;
-				width: 1.75rem;
-				height: 1.75rem;
-				border-radius: 2px;
-				margin-right: 0.5rem;
-
 				.icon {
-					display: none;
-					border-radius: 3px;
 					vertical-align: middle;
 				}
 
 				&:hover {
-					background: url("icons/cog-white.svg") no-repeat 4px 4px variables.$main-first;
+					background-color: variables.$main-first;
+
+					.icon {
+						filter: brightness(3);
+					}
 				}
 			}
 		}
@@ -229,7 +222,6 @@
 
 				a.dropdown-toggle {
 					padding: 0;
-					// float: right;
 					border-radius: 0;
 					background-image: url(icons/more.svg);
 					background-repeat: no-repeat;
@@ -244,41 +236,30 @@
 	}
 
 	.box-content {
-		// max-height: 260px;
 		padding-left: 30px;
 
 		.item {
-			padding: 0.5rem 0;
+			padding: 0.25rem 0;
 			color: variables.$main-font-color;
 			font-size: 1rem;
 			border-bottom: 1px solid variables.$grey-light;
 			line-height: 1.7em;
 
-			img {
-				margin-right: 0.75rem;
-			}
-
 			.configure {
-				background: url("icons/cog.svg") no-repeat 4px 4px;
-				display: block;
-				float: left;
-				width: 1.75rem;
-				height: 1.75rem;
-				border-radius: 2px;
-				margin-right: 0.5rem;
+				padding: 5px;
 
 				.icon {
-					display: none;
-					border-radius: 3px;
 					vertical-align: middle;
 				}
 
 				&:hover {
-					// background: $main-first;
-					background: url("icons/cog-white.svg") no-repeat 4px 4px variables.$main-first;
+					background-color: variables.$main-first;
+
+					.icon {
+						filter: brightness(3);
+					}
 				}
 			}
-
 		}
 
 		.item:last-child {
@@ -301,7 +282,7 @@
 		color: #fff;
 
 		.bigTick {
-			background: url(icons/tick-white.svg) center no-repeat;
+			filter: brightness(5);
 		}
 	}
 
@@ -315,48 +296,3 @@
 		white-space: nowrap;
 	}
 }
-
-// page de login
-.formLogin {
-	background: variables.$sid-bg;
-
-	.header {
-		.configure {
-			padding-right: 1rem;
-
-			img {
-				margin-right: 0.5rem;
-			}
-
-			a.signin {
-				color: variables.$white;
-			}
-		}
-	}
-
-	h1 {
-		color: variables.$white;
-	}
-
-	form#crypto-form {
-		div {
-			margin-bottom: 1rem;
-
-			label {
-				color: variables.$grey-medium;
-				font-size: 1rem;
-
-
-			}
-
-			input {
-				background: variables.$main-first-darker;
-
-				&:focus {
-					background: variables.$grey-lighter;
-					color: variables.$main-font-color;
-				}
-			}
-		}
-	}
-}
diff --git a/p/themes/Mapco/_configuration.scss b/p/themes/Mapco/_configuration.scss
index e2f9d054a..d14d54a5e 100644
--- a/p/themes/Mapco/_configuration.scss
+++ b/p/themes/Mapco/_configuration.scss
@@ -7,34 +7,13 @@
 
 	form {
 		margin: 1rem 0;
-
-		// Gestion des extensions
-		.horizontal-list {
-			margin-bottom: 0.5rem;
-
-			.item {
-				.stick {
-					// width: 65%;
-					// margin-right: 1rem;
-					// display:flex;
-
-				}
-
-				.btn {
-					// width: 8rem;
-					// flex-grow: 1;
-				}
-			}
-
-		}
 	}
 
 	&.content {
 		max-width: 550px;
 	}
 
-	h1, h2 { // pages titles
-		// font-family: "spectral";
+	h1, h2 {
 		color: variables.$main-font-color;
 		font-size: 3rem;
 		margin-top: 1.75rem;
@@ -42,17 +21,15 @@
 		line-height: 1.2em;
 	}
 
-	a[href="./"] { // C’est le bouton "Retour à vos flux"
+	a[href="./"] { // This is the "Back to your feeds" button.
 		margin: 0;
 		padding: 0.75rem 1.5rem;
 		background: variables.$grey-lighter;
 		display: inline-block;
-		// border: none;
 		color: variables.$grey-dark;
 		font-size: 1rem;
 		border: 1px solid variables.$grey-medium-light;
 		border-radius: 5px;
-		// min-height: 38px;
 		min-width: 15px;
 		line-height: 25px;
 		vertical-align: middle;
diff --git a/p/themes/Mapco/_forms.scss b/p/themes/Mapco/_forms.scss
index 0fc90894b..0f5f96681 100644
--- a/p/themes/Mapco/_forms.scss
+++ b/p/themes/Mapco/_forms.scss
@@ -25,7 +25,6 @@
 		background: variables.$main-first;
 		color: variables.$white;
 
-		// @include transition(all, 0.15s, ease-in-out);
 		&:hover,
 		&:active {
 			background: variables.$main-first-alt;
@@ -96,6 +95,11 @@ input, select, textarea, button {
 	vertical-align: middle;
 }
 
+select {
+	padding-top: 9px;
+	padding-bottom: 9px;
+}
+
 option {
 	padding: 0 .5em;
 }
@@ -130,13 +134,6 @@ input.extend {
 		clear: both;
 	}
 
-	&:hover {
-		// background: #fff;
-		// 	border: 1px solid #eee;
-		// 	border-radius: 3px;
-		// 	border: 1px solid #eee;
-	}
-
 	.group-name {
 		padding: 10px 0;
 		text-align: right;
@@ -154,7 +151,6 @@ input.extend {
 	&.form-actions {
 		margin: 15px 0 25px;
 		padding: 5px 0;
-		// background: #333;
 	}
 
 	&.form-actions .btn {
diff --git a/p/themes/Mapco/_global-view.scss b/p/themes/Mapco/_global-view.scss
index c2055c64f..dbf82f75f 100644
--- a/p/themes/Mapco/_global-view.scss
+++ b/p/themes/Mapco/_global-view.scss
@@ -4,17 +4,8 @@
 /*================*/
 #stream {
 	.box.category {
-		&:not([data-unread="0"]) .box-title {
-			// background: #3498db;
-		}
-
-		&:not([data-unread="0"]) .box-title:active {
-			// background: #2980b9;
-		}
-
 		&:not([data-unread="0"]) .box-title .title {
 			font-weight: bold;
-			// color: #fff;
 		}
 
 		.box-title {
@@ -53,7 +44,6 @@
 
 			.item.feed {
 				padding: 0.5rem 1.5rem;
-				// padding: 2px 10px;
 				font-size: 1rem;
 
 				a {
@@ -71,7 +61,7 @@
 }
 
 
-// le panel qui apparait en overlay pour afficher les flux
+// the panel that appears in overlay to display the flows
 #overlay {
 	background: rgba(0, 0, 0, 0.65);
 }
diff --git a/p/themes/Mapco/_layout.scss b/p/themes/Mapco/_layout.scss
index 02c0dceb8..a0c901f3f 100644
--- a/p/themes/Mapco/_layout.scss
+++ b/p/themes/Mapco/_layout.scss
@@ -10,7 +10,7 @@
 	background: variables.$sid-bg;
 	display: block;
 	width: auto;
-	height: 3rem;
+	height: 3.5rem;
 	table-layout: none;
 
 	.logo {
@@ -20,10 +20,7 @@
 
 	.item {
 		vertical-align: middle;
-		// text-align: center;
-		// display: flex;
-		// justify-content: space-between;
-		// flex-direction: row;
+
 		&.title {
 			width: 280px;
 
@@ -37,8 +34,6 @@
 		}
 
 		&.search {
-			// text-align: center;
-			// width: 50%;
 			input {
 				width: 230px;
 				color: variables.$sid-font-color;
@@ -60,50 +55,51 @@
 				}
 			}
 
-			.btn {
-				img {display: none;}
+			input:focus ~ .btn,
+			input:hover ~ .btn {
+				background-color: variables.$main-first;
 
+				.icon {
+					filter: brightness(3);
+				}
+			}
+
+			.btn {
 				width: 3rem;
 				border-radius: 0 2px 2px 0;
-
-				background-color: variables.$main-first;
-				background-position: center;
-				background-repeat: no-repeat;
-				background-image: url(icons/magnifier.svg);
-
+				background-color: variables.$sid-bg-alt;
 				border-left-width: 0;
 				min-height: 35px;
 
 				&:hover {
 					background-color: variables.$main-first-alt;
+
+					.icon {
+						filter: brightness(3);
+					}
 				}
 			}
 		}
 
 		&.configure {
-			width: 2rem;
+			width: 3rem;
 			position: absolute;
 			right: 1rem;
-			top: 1.25rem;
+			top: 1rem;
 			text-align: center;
-			// float: right;
+
+			.btn .icon,
+			> .icon {
+				filter: brightness(3)
+			}
+
+			.signin {
+				color: white;
+			}
+
 			.btn {
-				img {display: none;}
-
-				padding: 0 0.5rem;
-				// border-radius: 0 2px 2px 0;
-
+				padding: 0.25rem 1rem;
 				background-color: transparent;
-				background-position: center;
-				background-repeat: no-repeat;
-				background-image: url(icons/cog-white.svg);
-
-				// border-left-width: 0;
-
-				// width: 3rem;
-				&:hover {
-					// background-color: $main-first-alt;
-				}
 			}
 		}
 	}
@@ -111,26 +107,34 @@
 
 /*=== Body */
 #global {
-	height: calc(100% - 4rem);
+	height: calc(100% - 3.5rem);
 }
 
 /*=== Prompt (centered) */
+main.prompt {
+	margin: 3rem auto;
+	padding: 2rem;
+	background: variables.$grey-light;
+	max-width: 400px;
+	min-width: 300px;
+	width: 33%;
+	border-radius: 5px;
+}
+
 .prompt {
 	text-align: center;
 }
 
-.prompt label {
+.prompt label,
+.prompt .help {
 	text-align: left;
 }
 
-.prompt form {
-	margin: 10px auto 20px auto;
-	width: 200px;
-}
-
-.prompt input {
-	margin: 5px auto;
+.prompt input,
+.prompt select,
+.prompt .stick {
 	width: 100%;
+	box-sizing: border-box;
 }
 
 .prompt p {
@@ -164,16 +168,13 @@
 	line-height: 3em;
 	letter-spacing: 1px;
 	text-transform: uppercase;
-	// border-left: 2px solid #ecf0f1;
+
 	.name {
 		padding: 0 1rem 0 1rem;
-		// font-weight: 700;
 		color: variables.$main-font-color;
 		font-size: 0.875rem;
 		position: relative;
 		left: 0;
-
-		// letter-spacing: 1px;
 		text-transform: uppercase;
 	}
 }
@@ -193,6 +194,10 @@
 
 	&.active {
 		background-color: variables.$main-first;
+
+		.icon {
+			filter: brightness(3);
+		}
 	}
 }
 
@@ -209,13 +214,11 @@
 		background-repeat: no-repeat;
 
 		&:hover {
-			background-color: variables.$grey-light;
+			background-color: variables.$grey-medium-light;
 		}
 	}
 
 	.stick {
-		background: variables.$grey-lighter;
-
 		.btn {
 			border-left-width: 0;
 			padding: 0.5rem 1rem;
@@ -233,46 +236,22 @@
 				background-color: variables.$main-first;
 			}
 
-			img.icon {display: none;} // on efface pour afficher nos icones, mouhahaha !!
-
-
 			// actions
-			&#toggle-read {
-				background-image: url(icons/read.svg);
-			}
-
 			&#toggle-read.active {
-				background-image: url(icons/read-white.svg);
-			}
-
-			&#toggle-unread {
-				background-image: url(icons/unread.svg);
+				.icon {
+					filter: brightness(3.5);
+				}
 			}
 
 			&#toggle-unread.active {
-				background-image: url(icons/unread-white.svg);
-			}
-
-			&#toggle-starred {
-				background-image: url(icons/starred.svg);
-			}
-
-			&#toggle-starred.active {
-				background-image: url(icons/starred-white.svg);
-			}
-
-			&#toggle-non-starred {
-				background-image: url(icons/non-starred.svg);
-			}
-
-			&#toggle-non-starred.active {
-				background-image: url(icons/non-starred-white.svg);
+				.icon {
+					filter: brightness(3.5) grayscale(1);
+				}
 			}
 
 			// read all
 			&.read_all {
 				padding: 5px 16px;
-				// min-height: 0;
 				color: variables.$main-font-color;
 				background-color: variables.$grey-lighter;
 
@@ -282,55 +261,21 @@
 					background-color: variables.$grey-medium-light;
 				}
 			}
-
-			// views
-			&.view-normal {
-				background-image: url(icons/view-list.svg);
-			}
-
-			&.view-normal.active {
-				background-image: url(icons/view-list-white.svg);
-			}
-
-			&.view-global {
-				background-image: url(icons/view-global.svg);
-			}
-
-			&.view-global.active {
-				background-image: url(icons/view-global-white.svg);
-			}
-
-			&.view-reader {
-				background-image: url(icons/view-reader.svg);
-			}
-
-			&.view-reader.active {
-				background-image: url(icons/view-reader-white.svg);
-			}
-
-			&.view-rss {
-				background-image: url(icons/rss.svg);
-			}
-
 		}
 
 		.dropdown {
 			a.dropdown-toggle {
 				border-left-width: 0;
 				background-image: url(icons/more.svg);
+
+				.icon {
+					display: none;
+				}
 			}
 		}
 	}
 }
 
-
-#dropdown-query ~ .dropdown-menu .dropdown-header .icon {
-	vertical-align: middle;
-	background-color: variables.$grey-medium-dark;
-	border-radius: 3px;
-}
-
-
 /*=== Content of feed articles */
 .content, .content.thin {
 	padding: 20px 10px;
@@ -418,9 +363,7 @@
 	width: 100%;
 	height: 3rem;
 	color: variables.$grey-dark;
-	// font-weight: bold;
 	font-size: 1em;
-	// border-radius: 3px;
 	border: none;
 	position: fixed;
 	top: auto;
diff --git a/p/themes/Mapco/_list-view.scss b/p/themes/Mapco/_list-view.scss
index cd6e9efa5..3996f75fd 100644
--- a/p/themes/Mapco/_list-view.scss
+++ b/p/themes/Mapco/_list-view.scss
@@ -6,7 +6,6 @@
 
 /*=== Feed articles */
 .flux {
-	// border-left: 2px solid #ecf0f1;
 	background: variables.$white;
 
 	@include mixins.transition(all, 0.15s, ease-in-out);
@@ -27,7 +26,7 @@
 	}
 
 	&.not_read:not(.current) {
-		background: variables.$unread-bg; //--------------------
+		background: variables.$unread-bg;
 
 		&:hover .item.title {
 			background: variables.$unread-bg;
@@ -37,14 +36,14 @@
 	&.not_read {
 		.item.title {
 			a {
-				color: variables.$unread-font-color; //--------------------
+				color: variables.$unread-font-color;
 			}
 
 		}
 
 		.item.website {
 			a {
-				color: variables.$unread-font-color; //--------------------
+				color: variables.$unread-font-color;
 			}
 		}
 
diff --git a/p/themes/Mapco/_mobile.scss b/p/themes/Mapco/_mobile.scss
index 92e5d833f..769434892 100644
--- a/p/themes/Mapco/_mobile.scss
+++ b/p/themes/Mapco/_mobile.scss
@@ -6,40 +6,6 @@
 /*===========*/
 
 @media (max-width: 840px) {
-	html, body {
-		// font-size: 1rem;
-	}
-
-	ul.nav {
-		.item {
-			width: 100%;
-
-			img {
-				display: none;
-			}
-
-			a {
-				box-sizing: border-box;
-				padding: 1rem 1rem 1rem 2.5rem;
-
-				background: url("../../themes/icons/logout.svg") no-repeat variables.$sid-bg-dark 3% center;
-				display: inline-block;
-				width: 100%;
-				color: variables.$sid-font-color;
-
-				@include mixins.transition(all, 0.2s, ease-in-out);
-
-				&:hover,
-				&:active {
-					background: url("../../themes/icons/logout.svg") no-repeat variables.$alert-bg 3% center;
-					text-decoration: none;
-				}
-			}
-
-		}
-
-	}
-
 	.form-group .group-name {
 		text-align: left;
 	}
@@ -75,6 +41,7 @@
 
 	.header {
 		padding: 0.5rem;
+		height: 8rem;
 
 		.item {
 			&.search {
@@ -97,16 +64,21 @@
 
 					}
 				}
-
-				.btn {
-					min-height: 49px;
-					padding: 0.5rem 2rem;
-				}
 			}
 
 		}
 	}
 
+	#global {
+		height: calc(100% - 8rem);
+	}
+
+	main.prompt {
+		max-width: 100%;
+		min-width: auto;
+		width: 75%;
+	}
+
 	.post {
 		padding-left: 1rem;
 		padding-right: 1rem;
@@ -183,7 +155,6 @@
 
 		.name {
 			padding: 0;
-			// font-size: 1.1rem;
 			display: block;
 			width: 100%;
 			line-height: 1.5rem;
diff --git a/p/themes/Mapco/_sidebar.scss b/p/themes/Mapco/_sidebar.scss
index a5ee0ea82..06ae07d9e 100644
--- a/p/themes/Mapco/_sidebar.scss
+++ b/p/themes/Mapco/_sidebar.scss
@@ -92,8 +92,7 @@
 		border-radius: 0;
 	}
 
-	.btn:first-child,
-	input:first-child {
+	.btn:first-child {
 		border-radius: 5px 0 0 5px;
 	}
 
@@ -237,7 +236,6 @@
 	.nav-head {
 		margin: 0;
 		text-align: right;
-		// background: #34495e;
 		color: variables.$white;
 
 		a {
diff --git a/p/themes/Mapco/_variables.scss b/p/themes/Mapco/_variables.scss
index 0b5e65315..98136f496 100644
--- a/p/themes/Mapco/_variables.scss
+++ b/p/themes/Mapco/_variables.scss
@@ -1,18 +1,18 @@
-// La couleur principale du thème
-$main-first: #36c; // couleur principale
-$main-first-alt: #25c; // var pour les hovers
+// The main color of the theme
+$main-first: #36c; // main color
+$main-first-alt: #25c; // var for hovers
 $main-first-light: #effcfd; // var light 1
 $main-first-lighter: #f7fdfe; // var light 2
-$main-first-dark: #35363c; // var pour les hovers
-$main-first-darker: #1d1e22; // var pour les hovers
+$main-first-dark: #35363c; // var for hovers
+$main-first-darker: #1d1e22; // var for hovers
 
-// les couleurs de polices liées
+// linked font colors
 $main-font-color: #303136;
 $light-font-color: #5b6871;
-$white: #fff; // le blanc (des fois qu’on aurait envie de le teinter un peu)
+$white: #fff; // white (sometimes we would like to tint it a little)
 
-// toute la palette des gris, très utile
-// on essaiera de teinter ces gris suivant la couleur principale
+// the whole palette of grays, very useful
+// we will try to tint these grays according to the main color
 $grey-darker: #3b3f4d;
 $grey-dark: #5b6871;
 $grey-medium-dark: #a6a7ae;
@@ -25,10 +25,10 @@ $unread-font-color: $main-first;
 $unread-bg: #f2f6f8;
 $unread-bg-light: #fdfdfe;
 
-// les couleurs d’alertes (rouge, jaune, vert)
-$alert-bg: #f5633e; // la base
+// alert colors (red, yellow, green)
+$alert-bg: #f5633e; // the base
 $alert-light: #fde0d8; // +light
-$alert-text: #73341f; // +foncé
+$alert-text: #73341f; // +dark
 
 $warning-bg: #f4f762;
 $warning-light: #fdfde0;
@@ -38,18 +38,18 @@ $success-bg: #10f587;
 $success-light: #cffde7;
 $success-text: #0c7540;
 
-// les favoris
+// favourites
 $fav-bg: #ffc300;
 $fav-light: #fff6da;
 
-// la couleur de sidebar, utile si on a envie d’un thème qui aurait une sidebar foncé, e.g.
+// the sidebar color, useful if you want a theme that would have a dark sidebar, e.g.
 // stylelint-disable-next-line color-hex-length
-$sid-font-color: #ffffff; // la couleur de fond de la barre de gauche et du header
-$sid-bg: #303136; // le background général de la barre de gauche, et du header
+$sid-font-color: #ffffff; // the background color of the left bar and the header
+$sid-bg: #303136; // the general background of the left bar, and of the header
 $sid-bg-alt: #26272a; // background inside groups
-$sid-bg-dark: #17181a; // les hovers
-$sid-sep: #3f3f3f; // les séparateurs
-$sid-active: $main-first; // la couleur active
+$sid-bg-dark: #17181a; // the hover
+$sid-sep: #3f3f3f; // the separators
+$sid-active: $main-first; // the active color
 // stylelint-disable-next-line color-hex-length
-$sid-active-font: #ffffff; // la couleur active
-$sid-pills: rgba(0,0,0, 0.25); // les gélules
+$sid-active-font: #ffffff; // the active color
+$sid-pills: rgba(0,0,0, 0.25); // capsules
diff --git a/p/themes/Mapco/icons/cog-white.svg b/p/themes/Mapco/icons/cog-white.svg
deleted file mode 100644
index 3df8c2d70..000000000
--- a/p/themes/Mapco/icons/cog-white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16" version="1.1">
-<g id="surface2">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 6.667969 0 L 6.667969 2.839844 C 6.179688 2.964844 5.71875 3.160156 5.292969 3.410156 L 3.285156 1.402344 L 1.402344 3.285156 L 3.410156 5.292969 C 3.160156 5.71875 2.964844 6.179688 2.839844 6.667969 L 0 6.667969 L 0 9.332031 L 2.839844 9.332031 C 2.964844 9.820312 3.15625 10.28125 3.410156 10.707031 L 1.402344 12.714844 L 3.285156 14.597656 L 5.292969 12.589844 C 5.71875 12.839844 6.179688 13.03125 6.667969 13.15625 L 6.667969 16 L 9.332031 16 L 9.332031 13.15625 C 9.820312 13.03125 10.28125 12.839844 10.703125 12.589844 L 12.714844 14.597656 L 14.601562 12.714844 L 12.589844 10.707031 C 12.839844 10.28125 13.03125 9.820312 13.160156 9.332031 L 16 9.332031 L 16 6.667969 L 13.160156 6.667969 C 13.03125 6.179688 12.839844 5.71875 12.589844 5.292969 L 14.601562 3.285156 L 12.714844 1.398438 L 10.703125 3.410156 C 10.28125 3.15625 9.820312 2.964844 9.332031 2.839844 L 9.332031 0 Z M 8 5.332031 C 9.472656 5.332031 10.664062 6.527344 10.664062 8 C 10.664062 9.472656 9.472656 10.664062 8 10.664062 C 6.527344 10.664062 5.332031 9.472656 5.332031 8 C 5.332031 6.527344 6.527344 5.332031 8 5.332031 Z M 8 5.332031 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Mapco/icons/cog.svg b/p/themes/Mapco/icons/cog.svg
deleted file mode 100644
index aa56d862b..000000000
--- a/p/themes/Mapco/icons/cog.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="17"
-   viewBox="0 0 16 17"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="cog.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6.667969,1 v 2.839844 c -0.488281,0.125 -0.949219,0.320312 -1.375,0.570312 L 3.285156,2.402344 1.402344,4.285156 3.410156,6.292969 C 3.160156,6.71875 2.964844,7.179688 2.839844,7.664062 H 0 v 2.667969 h 2.839844 c 0.125,0.488281 0.316406,0.949219 0.570312,1.375 l -2.007812,2.007813 1.882812,1.882812 2.007813,-2.007812 c 0.425781,0.25 0.886719,0.441406 1.375,0.566406 V 17 h 2.664062 v -2.84375 c 0.488281,-0.125 0.949219,-0.316406 1.371094,-0.566406 l 2.011719,2.007812 1.886718,-1.882812 -2.011718,-2.007813 c 0.25,-0.425781 0.441406,-0.886719 0.570312,-1.375 H 16 V 7.664062 H 13.160156 C 13.03125,7.179688 12.839844,6.71875 12.589844,6.292969 L 14.601562,4.285156 12.714844,2.398438 10.703125,4.410156 C 10.28125,4.15625 9.820312,3.964844 9.332031,3.839844 V 1 Z M 8,6.332031 c 1.472656,0 2.664062,1.195313 2.664062,2.667969 0,1.472656 -1.191406,2.664062 -2.664062,2.664062 C 6.527344,11.664062 5.332031,10.472656 5.332031,9 5.332031,7.527344 6.527344,6.332031 8,6.332031 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/configure.svg b/p/themes/Mapco/icons/configure.svg
new file mode 100644
index 000000000..5ffe55442
--- /dev/null
+++ b/p/themes/Mapco/icons/configure.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="17">
+  <path fill="#666" d="M6.668.6v2.84c-.488.125-.95.32-1.375.57L3.285 2.002 1.402 3.885 3.41 5.893c-.25.426-.445.887-.57 1.371H0v2.668h2.84c.125.488.316.95.57 1.375l-2.008 2.008 1.883 1.883 2.008-2.008c.426.25.887.441 1.375.566V16.6h2.664v-2.844c.488-.125.95-.316 1.371-.566l2.012 2.008 1.887-1.883-2.012-2.008c.25-.426.441-.887.57-1.375H16V7.264h-2.84a5.498 5.498 0 0 0-.57-1.371l2.012-2.008-1.887-1.887-2.012 2.012a5.113 5.113 0 0 0-1.371-.57V.6ZM8 5.932a2.666 2.666 0 1 1-.003 5.331A2.666 2.666 0 0 1 8 5.932Zm0 0"/>
+</svg>
diff --git a/p/themes/Mapco/icons/down-white.svg b/p/themes/Mapco/icons/down-white.svg
deleted file mode 100644
index df05a4704..000000000
--- a/p/themes/Mapco/icons/down-white.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="10"
-   viewBox="0 0 16 10"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="down-white.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="26.222222"
-     inkscape:cx="7.5"
-     inkscape:cy="4.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 1.800781,0.347656 0.386719,1.761719 8.09375,9.46875 15.800781,1.761719 14.386719,0.347656 8.09375,6.640625 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/down.svg b/p/themes/Mapco/icons/down.svg
index 5c732e199..2ffcf409b 100644
--- a/p/themes/Mapco/icons/down.svg
+++ b/p/themes/Mapco/icons/down.svg
@@ -1,59 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="10"
-   viewBox="0 0 16 10"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="down.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="26.222222"
-     inkscape:cx="7.5"
-     inkscape:cy="4.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 1.800781,0.347656 0.386719,1.761719 8.09375,9.46875 15.800781,1.761719 14.386719,0.347656 8.09375,6.640625 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="10">
+  <path fill="#666" d="M1.8.348.388 1.762l7.707 7.707L15.8 1.762 14.387.348 8.094 6.64Zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/icons/icon.svg b/p/themes/Mapco/icons/icon.svg
index 594abba59..8ba9478e7 100644
--- a/p/themes/Mapco/icons/icon.svg
+++ b/p/themes/Mapco/icons/icon.svg
@@ -1,9 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="40" viewBox="0 0 40 40" version="1.1">
-<g id="surface2">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.15625 20 C 25.15625 17.152344 22.847656 14.84375 20 14.84375 C 17.152344 14.84375 14.84375 17.152344 14.84375 20 C 14.84375 22.847656 17.152344 25.15625 20 25.15625 C 22.847656 25.15625 25.15625 22.847656 25.15625 20 Z M 25.15625 20 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,39.215686%,43.137255%);fill-opacity:1;" d="M 19.558594 0.0078125 C 17.125 0.0585938 14.679688 0.554688 12.347656 1.523438 C 4.878906 4.617188 0 11.917969 0 20 L 3.75 20 C 3.75 13.421875 7.703125 7.503906 13.78125 4.988281 C 19.859375 2.46875 26.839844 3.859375 31.488281 8.511719 C 36.140625 13.160156 37.53125 20.140625 35.011719 26.21875 C 32.496094 32.296875 26.578125 36.25 20 36.25 L 20 40 C 28.082031 40 35.382812 35.121094 38.476562 27.652344 C 41.570312 20.183594 39.859375 11.574219 34.140625 5.859375 C 30.210938 1.929688 24.914062 -0.109375 19.558594 0.0078125 Z M 19.558594 0.0078125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,39.215686%,43.137255%);fill-opacity:1;" d="M 20.683594 6.582031 C 18.726562 6.480469 16.738281 6.804688 14.859375 7.585938 C 9.839844 9.664062 6.5625 14.570312 6.5625 20 L 10.3125 20 C 10.3125 16.078125 12.667969 12.550781 16.292969 11.050781 C 19.917969 9.546875 24.074219 10.375 26.851562 13.148438 C 29.625 15.925781 30.453125 20.082031 28.949219 23.707031 C 27.449219 27.332031 23.921875 29.6875 20 29.6875 L 20 33.4375 C 25.429688 33.4375 30.335938 30.160156 32.414062 25.140625 C 34.492188 20.125 33.339844 14.335938 29.5 10.5 C 27.101562 8.097656 23.941406 6.75 20.683594 6.582031 Z M 20.683594 6.582031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20 0 L 20 3.75 C 28.996094 3.75 36.25 11.003906 36.25 20 L 40 20 C 40 8.976562 31.023438 0 20 0 Z M 20 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20 6.5625 L 20 10.3125 C 25.371094 10.3125 29.6875 14.628906 29.6875 20 L 33.4375 20 C 33.4375 12.601562 27.398438 6.5625 20 6.5625 Z M 20 6.5625 "/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40">
+  <path fill="#fff" d="M25.156 20a5.156 5.156 0 1 0-10.312 0 5.156 5.156 0 0 0 10.312 0Zm0 0"/>
+  <path fill="#62646e" d="M19.559.008a19.86 19.86 0 0 0-7.211 1.515A20.013 20.013 0 0 0 0 20h3.75A16.234 16.234 0 0 1 13.781 4.988a16.228 16.228 0 0 1 17.707 3.524 16.228 16.228 0 0 1 3.524 17.707A16.234 16.234 0 0 1 20 36.25V40a20.013 20.013 0 0 0 18.477-12.348A20 20 0 0 0 19.559.007Zm0 0"/>
+  <path fill="#62646e" d="M20.684 6.582a13.347 13.347 0 0 0-5.825 1.004A13.445 13.445 0 0 0 6.563 20h3.75a9.676 9.676 0 0 1 5.98-8.95 9.676 9.676 0 0 1 10.559 2.098 9.676 9.676 0 0 1 2.097 10.559A9.676 9.676 0 0 1 20 29.687v3.75c5.43 0 10.336-3.277 12.414-8.296A13.44 13.44 0 0 0 29.5 10.5a13.424 13.424 0 0 0-8.816-3.918Zm0 0"/>
+  <path fill="#fff" d="M20 0v3.75c8.996 0 16.25 7.254 16.25 16.25H40C40 8.977 31.023 0 20 0Zm0 0"/>
+  <path fill="#fff" d="M20 6.563v3.75A9.66 9.66 0 0 1 29.688 20h3.75c0-7.398-6.04-13.438-13.438-13.438Zm0 0"/>
+</svg>
diff --git a/p/themes/Mapco/icons/link-white.svg b/p/themes/Mapco/icons/link-white.svg
deleted file mode 100644
index c6baadc85..000000000
--- a/p/themes/Mapco/icons/link-white.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="17"
-   height="17"
-   viewBox="0 0 17 17"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="link-white.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="13.882353"
-     inkscape:cx="8.5"
-     inkscape:cy="8.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2"
-     transform="translate(0,-1)">
-    <path
-       style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 8.5,1 C 3.816406,1 0,4.816406 0,9.5 0,14.183594 3.816406,18 8.5,18 13.183594,18 17,14.183594 17,9.5 17,4.816406 13.183594,1 8.5,1 Z M 5.480469,3.742188 C 4.609375,4.957031 3.78125,6.570312 3.558594,8.5 H 2.082031 C 2.402344,6.421875 3.691406,4.679688 5.480469,3.742188 Z m 6.035156,0 C 13.308594,4.679688 14.597656,6.421875 14.914062,8.5 H 13.4375 C 13.21875,6.570312 12.390625,4.957031 11.515625,3.742188 Z M 7.5,4.4375 V 8.5 H 5.578125 C 5.839844,6.835938 6.695312,5.4375 7.5,4.4375 Z m 2,0 c 0.804688,1 1.660156,2.398438 1.921875,4.0625 H 9.5 Z M 2.082031,10.5 h 1.472657 c 0.1875,1.828125 0.863281,3.371094 1.589843,4.566406 C 3.53125,14.09375 2.382812,12.441406 2.082031,10.5 Z m 3.488281,0 H 7.5 v 4.460938 C 6.734375,13.957031 5.820312,12.40625 5.570312,10.5 Z M 9.5,10.5 h 1.917969 C 11.160156,12.171875 10.304688,13.570312 9.5,14.5625 Z m 3.9375,0 h 1.476562 c -0.316406,2.078125 -1.605468,3.824219 -3.398437,4.757812 0.875,-1.214843 1.703125,-2.828124 1.921875,-4.757812 z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/link.svg b/p/themes/Mapco/icons/link.svg
index 44ee847b0..6bcfc1eb9 100644
--- a/p/themes/Mapco/icons/link.svg
+++ b/p/themes/Mapco/icons/link.svg
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17" height="17" viewBox="0 0 17 17" version="1.1">
-<g id="surface2">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(32.54902%,32.54902%,32.54902%);fill-opacity:1;" d="M 8.5 0 C 3.816406 0 0 3.816406 0 8.5 C 0 13.183594 3.816406 17 8.5 17 C 13.183594 17 17 13.183594 17 8.5 C 17 3.816406 13.183594 0 8.5 0 Z M 5.480469 2.742188 C 4.609375 3.957031 3.78125 5.570312 3.558594 7.5 L 2.082031 7.5 C 2.402344 5.421875 3.691406 3.679688 5.480469 2.742188 Z M 11.515625 2.742188 C 13.308594 3.679688 14.597656 5.421875 14.914062 7.5 L 13.4375 7.5 C 13.21875 5.570312 12.390625 3.957031 11.515625 2.742188 Z M 7.5 3.4375 L 7.5 7.5 L 5.578125 7.5 C 5.839844 5.835938 6.695312 4.4375 7.5 3.4375 Z M 9.5 3.4375 C 10.304688 4.4375 11.160156 5.835938 11.421875 7.5 L 9.5 7.5 Z M 2.082031 9.5 L 3.554688 9.5 C 3.742188 11.328125 4.417969 12.871094 5.144531 14.066406 C 3.53125 13.09375 2.382812 11.441406 2.082031 9.5 Z M 5.570312 9.5 L 7.5 9.5 L 7.5 13.960938 C 6.734375 12.957031 5.820312 11.40625 5.570312 9.5 Z M 9.5 9.5 L 11.417969 9.5 C 11.160156 11.171875 10.304688 12.570312 9.5 13.5625 Z M 13.4375 9.5 L 14.914062 9.5 C 14.597656 11.578125 13.308594 13.324219 11.515625 14.257812 C 12.390625 13.042969 13.21875 11.429688 13.4375 9.5 Z M 13.4375 9.5 "/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17">
+  <path fill="#666" d="M8.5 0C3.816 0 0 3.816 0 8.5S3.816 17 8.5 17 17 13.184 17 8.5 13.184 0 8.5 0ZM5.48 2.742C4.61 3.957 3.781 5.57 3.56 7.5H2.082A6.48 6.48 0 0 1 5.48 2.742Zm6.036 0A6.46 6.46 0 0 1 14.914 7.5h-1.476c-.22-1.93-1.047-3.543-1.922-4.758ZM7.5 3.438V7.5H5.578C5.84 5.836 6.695 4.437 7.5 3.437Zm2 0c.805 1 1.66 2.398 1.922 4.062H9.5ZM2.082 9.5h1.473c.187 1.828.863 3.371 1.59 4.566A6.489 6.489 0 0 1 2.082 9.5Zm3.488 0H7.5v4.46c-.766-1.003-1.68-2.554-1.93-4.46Zm3.93 0h1.918c-.258 1.672-1.113 3.07-1.918 4.063Zm3.938 0h1.476a6.454 6.454 0 0 1-3.398 4.758c.875-1.215 1.703-2.828 1.921-4.758Zm0 0"/>
+</svg>
diff --git a/p/themes/Mapco/icons/magnifier.svg b/p/themes/Mapco/icons/magnifier.svg
deleted file mode 100644
index ae3732c69..000000000
--- a/p/themes/Mapco/icons/magnifier.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16" version="1.1">
-<g id="surface2">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 9.464844 0 C 5.867188 0 2.929688 2.9375 2.929688 6.535156 C 2.929688 7.972656 3.40625 9.300781 4.199219 10.382812 L 0.710938 13.867188 L 0 14.578125 L 1.421875 16 L 2.132812 15.289062 L 5.617188 11.800781 C 6.699219 12.59375 8.027344 13.070312 9.464844 13.070312 C 13.0625 13.070312 16 10.132812 16 6.535156 C 16 2.9375 13.0625 0 9.464844 0 Z M 9.464844 2.011719 C 11.976562 2.011719 13.988281 4.023438 13.988281 6.535156 C 13.988281 9.046875 11.976562 11.058594 9.464844 11.058594 C 6.953125 11.058594 4.941406 9.046875 4.941406 6.535156 C 4.941406 4.023438 6.953125 2.011719 9.464844 2.011719 Z M 9.464844 2.011719 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Mapco/icons/more.svg b/p/themes/Mapco/icons/more.svg
index 6e505e71b..71535325a 100644
--- a/p/themes/Mapco/icons/more.svg
+++ b/p/themes/Mapco/icons/more.svg
@@ -1,59 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="3"
-   height="15"
-   viewBox="0 0 3 15"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="more.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="1.5"
-     inkscape:cy="7"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 0,0 H 3 V 3 H 0 Z M 0,6 H 3 V 9 H 0 Z m 0,6 h 3 v 3 H 0 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="3" height="15">
+  <path fill="#666" d="M0 0h3v3H0Zm0 6h3v3H0Zm0 6h3v3H0Zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/icons/non-starred-white.svg b/p/themes/Mapco/icons/non-starred-white.svg
deleted file mode 100644
index 9bd48c801..000000000
--- a/p/themes/Mapco/icons/non-starred-white.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="16"
-   viewBox="0 0 18 16"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="non-starred-white.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="15.733333"
-     inkscape:cx="8.5"
-     inkscape:cy="7.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2"
-     transform="translate(0,-1)">
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.26879001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="m 107.00018,143.49705 1.62575,-0.0138 0.49783,-1.54754 0.51657,1.54119 1.62575,-0.004 -1.30706,0.96642 0.50616,1.54542 -1.32372,-0.94419 -1.31226,0.95901 0.48845,-1.55072 z m 0,0"
-       transform="matrix(3.750673,0,0,3.690326,-399.91249,-522.49621)"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/non-starred.svg b/p/themes/Mapco/icons/non-starred.svg
index 9d49930c0..57405ef45 100644
--- a/p/themes/Mapco/icons/non-starred.svg
+++ b/p/themes/Mapco/icons/non-starred.svg
@@ -1,60 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="16"
-   viewBox="0 0 18 16"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="non-starred.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="15.733333"
-     inkscape:cx="8.5"
-     inkscape:cy="7.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:none;stroke:#515151;stroke-width:0.26879001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="m 107.00018,150.49714 1.62575,-0.0138 0.49783,-1.5486 0.51657,1.54225 1.62575,-0.004 -1.30706,0.96642 0.50616,1.54542 -1.32372,-0.94419 -1.31226,0.95901 0.48845,-1.55072 z m 0,0"
-       transform="matrix(3.750673,0,0,3.690326,-399.91249,-548.8718)"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="16">
+  <path fill="none" stroke="#666" stroke-linecap="round" stroke-linejoin="round" stroke-width=".269" d="m107 150.497 1.626-.014.498-1.548.516 1.542 1.626-.004-1.307.966.506 1.546-1.324-.944-1.312.959.489-1.551zm0 0" transform="matrix(3.75067 0 0 3.69033 -399.912 -548.872)"/>
 </svg>
diff --git a/p/themes/Mapco/icons/read-grey.svg b/p/themes/Mapco/icons/read-grey.svg
deleted file mode 100644
index 4857aca02..000000000
--- a/p/themes/Mapco/icons/read-grey.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="18" viewBox="0 0 16 18" version="1.1">
-<g id="surface2">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(80.784314%,80.784314%,80.784314%);fill-opacity:1;" d="M 8 0 L 0.460938 4.933594 L 0 5.234375 L 0 18 L 16 18 L 16 5.234375 Z M 8 2.417969 L 13.625 6.101562 L 8 10.601562 L 2.371094 6.101562 Z M 2 8.390625 L 8 13.1875 L 14 8.390625 L 14 15.964844 L 2 15.964844 Z M 2 8.390625 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Mapco/icons/read-white.svg b/p/themes/Mapco/icons/read-white.svg
deleted file mode 100644
index 578facdc7..000000000
--- a/p/themes/Mapco/icons/read-white.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="18"
-   viewBox="0 0 16 18"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="read-white.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="13.882353"
-     inkscape:cx="8"
-     inkscape:cy="8.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 8,0 0.460938,4.933594 0,5.234375 V 18 H 16 V 5.234375 Z m 0,2.417969 5.628906,3.683593 -5.628906,4.5 -5.628906,-4.5 z M 2,8.390625 8,13.1875 14,8.390625 v 7.574219 H 2 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/read.svg b/p/themes/Mapco/icons/read.svg
index d583cce03..91b0a8d17 100644
--- a/p/themes/Mapco/icons/read.svg
+++ b/p/themes/Mapco/icons/read.svg
@@ -1,59 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="18"
-   viewBox="0 0 16 18"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="read.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="13.882353"
-     inkscape:cx="8"
-     inkscape:cy="8.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 8,0 0.460938,4.933594 0,5.234375 V 18 H 16 V 5.234375 Z m 0,2.417969 5.628906,3.683593 -5.628906,4.5 -5.628906,-4.5 z M 2,8.390625 8,13.1875 14,8.390625 v 7.574219 H 2 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="18">
+  <path fill="#666" d="M8 0 .46 4.934l-.46.3V18h16V5.234Zm0 2.418 5.629 3.684L8 10.602l-5.629-4.5zM2 8.391l6 4.796 6-4.796v7.574H2Zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/icons/refresh.svg b/p/themes/Mapco/icons/refresh.svg
index f23fbf4a2..495432162 100644
--- a/p/themes/Mapco/icons/refresh.svg
+++ b/p/themes/Mapco/icons/refresh.svg
@@ -1,59 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="17"
-   height="17"
-   viewBox="0 0 17 17"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="refresh.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface3">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 15,0 V 3.042969 C 12.386719,-0.0820312 7.859375,-0.945312 4.25,1.132812 0.1875,3.480469 -1.207031,8.679688 1.140625,12.746094 3.488281,16.8125 8.683594,18.207031 12.75,15.859375 c 0.140625,-0.08594 0.28125,-0.179687 0.417969,-0.273437 L 12.171875,13.859375 C 12.035156,13.953125 11.894531,14.042969 11.75,14.125 8.640625,15.921875 4.667969,14.855469 2.871094,11.746094 1.078125,8.636719 2.140625,4.660156 5.25,2.863281 8.191406,1.167969 11.941406,2.019531 13.859375,4.820312 L 14.035156,5 H 10 v 2 h 7 V 0 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17">
+  <path fill="#666" d="M15 0v3.043a8.495 8.495 0 0 0-10.75-1.91 8.504 8.504 0 0 0-3.11 11.613 8.497 8.497 0 0 0 11.61 3.113c.14-.086.281-.18.418-.273l-.996-1.727a6.498 6.498 0 0 1-9.3-2.113A6.506 6.506 0 0 1 5.25 2.863a6.5 6.5 0 0 1 8.61 1.957l.175.18H10v2h7V0Zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/icons/rss-white.svg b/p/themes/Mapco/icons/rss-white.svg
deleted file mode 100644
index b7fbf9987..000000000
--- a/p/themes/Mapco/icons/rss-white.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="17"
-   height="17"
-   viewBox="0 0 17 17"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="rss-white.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="-5.9380772"
-     inkscape:cy="10.889349"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2"
-     transform="translate(0,-1)">
-    <path
-       style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4.246094,15.433594 c 0,1.101562 -0.898438,2 -2,2 -1.105469,0 -2,-0.898438 -2,-2 0,-1.105469 0.894531,-2 2,-2 1.101562,0 2,0.894531 2,2 m 5,2 c 0,-4.984375 -4.019532,-9 -9,-9 v -2 c 6.0625,0 11,4.933594 11,11 z m 5.5,0 c 0,-8.019532 -6.480469,-14.5 -14.5,-14.5 v -2 c 9.097656,0 16.5,7.398437 16.5,16.5 z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/rss.svg b/p/themes/Mapco/icons/rss.svg
index 7044bbaa4..cf3c34814 100644
--- a/p/themes/Mapco/icons/rss.svg
+++ b/p/themes/Mapco/icons/rss.svg
@@ -1,60 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="17"
-   height="17"
-   viewBox="0 0 17 17"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="rss.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2"
-     transform="translate(0,-1)">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 4.246094,15.433594 c 0,1.101562 -0.898438,2 -2,2 -1.105469,0 -2,-0.898438 -2,-2 0,-1.105469 0.894531,-2 2,-2 1.101562,0 2,0.894531 2,2 m 5,2 c 0,-4.984375 -4.019532,-9 -9,-9 v -2 c 6.0625,0 11,4.933594 11,11 z m 5.5,0 c 0,-8.019532 -6.480469,-14.5 -14.5,-14.5 v -2 c 9.097656,0 16.5,7.398437 16.5,16.5 z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17">
+  <path fill="#666" d="M4.246 14.434c0 1.101-.898 2-2 2a1.999 1.999 0 1 1 2-2m5 2c0-4.985-4.02-9-9-9v-2c6.063 0 11 4.933 11 11zm5.5 0c0-8.02-6.48-14.5-14.5-14.5v-2c9.098 0 16.5 7.398 16.5 16.5zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/icons/search.svg b/p/themes/Mapco/icons/search.svg
new file mode 100644
index 000000000..690c74942
--- /dev/null
+++ b/p/themes/Mapco/icons/search.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <path fill="#666" d="M9.465 0C5.867 0 2.93 2.938 2.93 6.535a6.49 6.49 0 0 0 1.27 3.848L.71 13.867l-.71.711L1.422 16l.71-.71 3.485-3.49a6.49 6.49 0 0 0 3.848 1.27c3.598 0 6.535-2.937 6.535-6.535C16 2.937 13.062 0 9.465 0Zm0 2.012a4.506 4.506 0 0 1 4.523 4.523 4.506 4.506 0 0 1-4.523 4.524A4.506 4.506 0 0 1 4.94 6.535a4.506 4.506 0 0 1 4.524-4.523Zm0 0"/>
+</svg>
diff --git a/p/themes/Mapco/icons/starred-white.svg b/p/themes/Mapco/icons/starred-white.svg
deleted file mode 100644
index 896dd1eeb..000000000
--- a/p/themes/Mapco/icons/starred-white.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="15"
-   viewBox="0 0 16 15"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="starred-white.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="7.5"
-     inkscape:cy="7"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 0.410156,6.054688 6.507812,6.003906 8.375,0.292969 10.3125,5.980469 16.410156,5.964844 11.507812,9.53125 13.40625,15.234375 8.441406,11.75 3.519531,15.289062 5.351562,9.566406 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/starred.svg b/p/themes/Mapco/icons/starred.svg
index 3b0bf8cb8..998164e85 100644
--- a/p/themes/Mapco/icons/starred.svg
+++ b/p/themes/Mapco/icons/starred.svg
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="15" viewBox="0 0 16 15" version="1.1">
-<g id="surface2">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(32.54902%,32.54902%,32.54902%);fill-opacity:1;" d="M 0 5.765625 L 6.097656 5.710938 L 7.964844 0 L 9.902344 5.691406 L 16 5.671875 L 11.097656 9.242188 L 13 14.941406 L 8.035156 11.457031 L 3.109375 15 L 4.945312 9.277344 Z M 0 5.765625 "/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="15">
+  <path fill="#666" d="m0 5.766 6.098-.055L7.965 0l1.937 5.691L16 5.671l-4.902 3.571 1.902 5.7-4.965-3.485L3.11 15l1.836-5.723Zm0 0"/>
+</svg>
diff --git a/p/themes/Mapco/icons/tick-color.svg b/p/themes/Mapco/icons/tick-color.svg
index 302541e80..da7d176aa 100644
--- a/p/themes/Mapco/icons/tick-color.svg
+++ b/p/themes/Mapco/icons/tick-color.svg
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" viewBox="0 0 48 48" version="1.1">
-<g id="surface3">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(20%,40%,80%);fill-opacity:1;" d="M 24 0 C 10.746094 0 0 10.746094 0 24 C 0 37.253906 10.746094 48 24 48 C 37.253906 48 48 37.253906 48 24 C 48 10.746094 37.253906 0 24 0 Z M 36.96875 14.488281 C 37.585938 14.472656 38.148438 14.835938 38.386719 15.402344 C 38.628906 15.96875 38.5 16.625 38.0625 17.054688 L 22.058594 33.058594 C 21.472656 33.644531 20.523438 33.644531 19.941406 33.058594 L 12.941406 26.0625 C 12.386719 25.472656 12.402344 24.550781 12.972656 23.976562 C 13.542969 23.402344 14.464844 23.386719 15.058594 23.9375 L 21.003906 29.878906 L 35.945312 14.9375 C 36.214844 14.664062 36.582031 14.5 36.96875 14.488281 Z M 36.96875 14.488281 "/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48">
+  <path fill="#36c" d="M24 0C10.746 0 0 10.746 0 24s10.746 24 24 24 24-10.746 24-24S37.254 0 24 0Zm12.969 14.488a1.496 1.496 0 0 1 1.418.914 1.493 1.493 0 0 1-.325 1.653L22.06 33.059a1.495 1.495 0 0 1-2.118 0l-7-6.996a1.5 1.5 0 0 1 2.118-2.125l5.945 5.94 14.941-14.94c.27-.274.637-.438 1.024-.45Zm0 0"/>
+</svg>
diff --git a/p/themes/Mapco/icons/tick-white.svg b/p/themes/Mapco/icons/tick-white.svg
deleted file mode 100644
index 0bcc26f47..000000000
--- a/p/themes/Mapco/icons/tick-white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" viewBox="0 0 48 48" version="1.1">
-<g id="surface3">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 24 0 C 10.746094 0 0 10.746094 0 24 C 0 37.253906 10.746094 48 24 48 C 37.253906 48 48 37.253906 48 24 C 48 10.746094 37.253906 0 24 0 Z M 36.96875 14.488281 C 37.585938 14.472656 38.148438 14.835938 38.386719 15.402344 C 38.628906 15.96875 38.5 16.625 38.0625 17.054688 L 22.058594 33.058594 C 21.472656 33.644531 20.523438 33.644531 19.941406 33.058594 L 12.941406 26.0625 C 12.386719 25.472656 12.402344 24.550781 12.972656 23.976562 C 13.542969 23.402344 14.464844 23.386719 15.058594 23.9375 L 21.003906 29.878906 L 35.945312 14.9375 C 36.214844 14.664062 36.582031 14.5 36.96875 14.488281 Z M 36.96875 14.488281 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Mapco/icons/tick.svg b/p/themes/Mapco/icons/tick.svg
deleted file mode 100644
index 9c436e7a0..000000000
--- a/p/themes/Mapco/icons/tick.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="47" viewBox="0 0 48 47" version="1.1">
-<g id="surface3">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(18.823529%,19.215686%,21.176471%);fill-opacity:1;" d="M 24 0 C 10.746094 0 0 10.746094 0 24 C 0 37.253906 10.746094 48 24 48 C 37.253906 48 48 37.253906 48 24 C 48 10.746094 37.253906 0 24 0 Z M 36.96875 14.488281 C 37.585938 14.472656 38.148438 14.835938 38.386719 15.402344 C 38.628906 15.96875 38.5 16.625 38.0625 17.054688 L 22.058594 33.058594 C 21.472656 33.644531 20.523438 33.644531 19.941406 33.058594 L 12.941406 26.0625 C 12.386719 25.472656 12.402344 24.550781 12.972656 23.976562 C 13.542969 23.402344 14.464844 23.386719 15.058594 23.9375 L 21.003906 29.878906 L 35.945312 14.9375 C 36.214844 14.664062 36.582031 14.5 36.96875 14.488281 Z M 36.96875 14.488281 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Mapco/icons/unread-grey.svg b/p/themes/Mapco/icons/unread-grey.svg
deleted file mode 100644
index 1981cf92c..000000000
--- a/p/themes/Mapco/icons/unread-grey.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="13"
-   viewBox="0 0 16 13"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="unread.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="19.666667"
-     inkscape:cx="8"
-     inkscape:cy="6"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 0,0 V 13 H 16 V 0 Z m 3.257812,2 h 9.484376 L 8,5.726562 Z M 2,3.554688 8,8.269531 14,3.554688 V 11 H 2 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/unread-white.svg b/p/themes/Mapco/icons/unread-white.svg
deleted file mode 100644
index 6623924ab..000000000
--- a/p/themes/Mapco/icons/unread-white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="13" viewBox="0 0 16 13" version="1.1">
-<g id="surface2">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 0 0 L 0 13 L 16 13 L 16 0 Z M 3.257812 2 L 12.742188 2 L 8 5.726562 Z M 2 3.558594 L 8 8.273438 L 14 3.558594 L 14 11 L 2 11 Z M 2 3.558594 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Mapco/icons/unread.svg b/p/themes/Mapco/icons/unread.svg
index 5c6c3ac8e..e80d4119c 100644
--- a/p/themes/Mapco/icons/unread.svg
+++ b/p/themes/Mapco/icons/unread.svg
@@ -1,59 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="13"
-   viewBox="0 0 16 13"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="unread-main-color.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="19.666667"
-     inkscape:cx="8"
-     inkscape:cy="6"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#3366cc;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 0,0 V 13 H 16 V 0 Z m 3.257812,2 h 9.484376 L 8,5.726562 Z M 2,3.554688 8,8.273438 14,3.554688 V 11 H 2 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13">
+  <path fill="#36c" d="M0 0v13h16V0Zm3.258 2h9.484L8 5.727ZM2 3.555l6 4.718 6-4.718V11H2Zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/icons/up-white.svg b/p/themes/Mapco/icons/up-white.svg
deleted file mode 100644
index e19d1e1d9..000000000
--- a/p/themes/Mapco/icons/up-white.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="10"
-   viewBox="0 0 16 10"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="up-white.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="26.222222"
-     inkscape:cx="7.5"
-     inkscape:cy="4.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 14.386719,9.46875 15.800781,8.054688 8.09375,0.347656 0.386719,8.054688 1.800781,9.46875 8.09375,3.175781 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/up.svg b/p/themes/Mapco/icons/up.svg
index 306b076e9..65da6b1a7 100644
--- a/p/themes/Mapco/icons/up.svg
+++ b/p/themes/Mapco/icons/up.svg
@@ -1,59 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="10"
-   viewBox="0 0 16 10"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="up.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="26.222222"
-     inkscape:cx="7.5"
-     inkscape:cy="4.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 14.386719,9.46875 15.800781,8.054688 8.09375,0.347656 0.386719,8.054688 1.800781,9.46875 8.09375,3.175781 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="10">
+  <path fill="#666" d="M14.387 9.469 15.8 8.055 8.094.348.387 8.055 1.8 9.469l6.293-6.293Zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/icons/view-global-white.svg b/p/themes/Mapco/icons/view-global-white.svg
deleted file mode 100644
index 950267f6a..000000000
--- a/p/themes/Mapco/icons/view-global-white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15" height="15" viewBox="0 0 15 15" version="1.1">
-<g id="surface2">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 6 12 L 9 12 L 9 15 L 6 15 Z M 12 12 L 15 12 L 15 15 L 12 15 Z M 0 12 L 3 12 L 3 15 L 0 15 Z M 6 6 L 9 6 L 9 9 L 6 9 Z M 12 6 L 15 6 L 15 9 L 12 9 Z M 0 6 L 3 6 L 3 9 L 0 9 Z M 6 0 L 9 0 L 9 3 L 6 3 Z M 12 0 L 15 0 L 15 3 L 12 3 Z M 0 0 L 3 0 L 3 3 L 0 3 Z M 0 0 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Mapco/icons/view-global.svg b/p/themes/Mapco/icons/view-global.svg
index 08632a190..ff9673422 100644
--- a/p/themes/Mapco/icons/view-global.svg
+++ b/p/themes/Mapco/icons/view-global.svg
@@ -1,59 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="15"
-   height="15"
-   viewBox="0 0 15 15"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="view-global.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="7.5"
-     inkscape:cy="7"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 6,12 h 3 v 3 H 6 Z m 6,0 h 3 v 3 H 12 Z M 0,12 h 3 v 3 H 0 Z M 6,6 H 9 V 9 H 6 Z m 6,0 h 3 V 9 H 12 Z M 0,6 H 3 V 9 H 0 Z M 6,0 H 9 V 3 H 6 Z m 6,0 h 3 V 3 H 12 Z M 0,0 H 3 V 3 H 0 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15">
+  <path fill="#666" d="M6 12h3v3H6Zm6 0h3v3h-3ZM0 12h3v3H0Zm6-6h3v3H6Zm6 0h3v3h-3ZM0 6h3v3H0Zm6-6h3v3H6Zm6 0h3v3h-3ZM0 0h3v3H0Zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/icons/view-list-white.svg b/p/themes/Mapco/icons/view-list-white.svg
deleted file mode 100644
index c76fc298b..000000000
--- a/p/themes/Mapco/icons/view-list-white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15" height="14" viewBox="0 0 15 14" version="1.1">
-<g id="surface2">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 0 12 L 15 12 L 15 14 L 0 14 Z M 0 6 L 15 6 L 15 8 L 0 8 Z M 0 0 L 15 0 L 15 2 L 0 2 Z M 0 0 "/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Mapco/icons/view-list.svg b/p/themes/Mapco/icons/view-list.svg
deleted file mode 100644
index bcea01055..000000000
--- a/p/themes/Mapco/icons/view-list.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="15"
-   height="14"
-   viewBox="0 0 15 14"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="view-list.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="7.5"
-     inkscape:cy="7"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2"
-     transform="translate(0,-1)">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 0,13 h 15 v 2 H 0 Z M 0,7 H 15 V 9 H 0 Z M 0,1 H 15 V 3 H 0 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/view-normal.svg b/p/themes/Mapco/icons/view-normal.svg
new file mode 100644
index 000000000..5b206352b
--- /dev/null
+++ b/p/themes/Mapco/icons/view-normal.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="14">
+  <path fill="#666" d="M0 12h15v2H0Zm0-6h15v2H0Zm0-6h15v2H0Zm0 0"/>
+</svg>
diff --git a/p/themes/Mapco/icons/view-reader-white.svg b/p/themes/Mapco/icons/view-reader-white.svg
deleted file mode 100644
index 70175c623..000000000
--- a/p/themes/Mapco/icons/view-reader-white.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="16"
-   viewBox="0 0 14 16"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="view-reader-white.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="15.733333"
-     inkscape:cx="7"
-     inkscape:cy="7.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 3.5,10 H 8 v 1.5 H 3.5 Z m 0,-3 h 7 v 1.5 h -7 z m 0,-3 h 7 v 1.5 h -7 z M 0,16 V 0 H 14 V 16 Z M 2,14 H 12 V 2 H 2 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/p/themes/Mapco/icons/view-reader.svg b/p/themes/Mapco/icons/view-reader.svg
index 7471037d9..30229af23 100644
--- a/p/themes/Mapco/icons/view-reader.svg
+++ b/p/themes/Mapco/icons/view-reader.svg
@@ -1,59 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14"
-   height="16"
-   viewBox="0 0 14 16"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="view-reader.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="841"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="-1.7138348"
-     inkscape:cy="3.5263348"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 3.5,10 H 8 v 1.5 H 3.5 Z m 0,-3 h 7 v 1.5 h -7 z m 0,-3 h 7 v 1.5 h -7 z M 0,16 V 0 H 14 V 16 Z M 2,14 H 12 V 2 H 2 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16">
+  <path fill="#666" d="M3.5 10H8v1.5H3.5Zm0-3h7v1.5h-7zm0-3h7v1.5h-7zM0 16V0h14v16Zm2-2h10V2H2Zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/mapco.css b/p/themes/Mapco/mapco.css
index 036c3ad60..eaeb00ab6 100644
--- a/p/themes/Mapco/mapco.css
+++ b/p/themes/Mapco/mapco.css
@@ -139,6 +139,11 @@ input, select, textarea, button {
 	vertical-align: middle;
 }
 
+select {
+	padding-top: 9px;
+	padding-bottom: 9px;
+}
+
 option {
 	padding: 0 0.5em;
 }
@@ -261,6 +266,9 @@ form th {
 	background: #36c;
 	color: #fff;
 }
+.dropdown-menu .item:not(.addItem):hover .icon {
+	filter: brightness(3);
+}
 .dropdown-menu .item:not(.addItem):hover a, .dropdown-menu .item:not(.addItem):hover button, .dropdown-menu .item:not(.addItem):hover label {
 	text-decoration: none;
 	color: #fff;
@@ -362,24 +370,16 @@ form th {
 	border-radius: 2px 2px 0 0;
 }
 .box .box-title .configure {
-	margin-right: 4px;
-}
-.box .box-title:hover .configure {
-	background: url("icons/cog.svg") no-repeat 4px 4px;
-	display: block;
-	float: left;
-	width: 1.75rem;
-	height: 1.75rem;
-	border-radius: 2px;
-	margin-right: 0.5rem;
+	padding: 5px;
 }
 .box .box-title:hover .configure .icon {
-	display: none;
-	border-radius: 3px;
 	vertical-align: middle;
 }
 .box .box-title:hover .configure:hover {
-	background: url("icons/cog-white.svg") no-repeat 4px 4px #36c;
+	background-color: #36c;
+}
+.box .box-title:hover .configure:hover .icon {
+	filter: brightness(3);
 }
 .box .box-title form input {
 	width: 85%;
@@ -401,31 +401,23 @@ form th {
 	padding-left: 30px;
 }
 .box .box-content .item {
-	padding: 0.5rem 0;
+	padding: 0.25rem 0;
 	color: #303136;
 	font-size: 1rem;
 	border-bottom: 1px solid #eff0f2;
 	line-height: 1.7em;
 }
-.box .box-content .item img {
-	margin-right: 0.75rem;
-}
 .box .box-content .item .configure {
-	background: url("icons/cog.svg") no-repeat 4px 4px;
-	display: block;
-	float: left;
-	width: 1.75rem;
-	height: 1.75rem;
-	border-radius: 2px;
-	margin-right: 0.5rem;
+	padding: 5px;
 }
 .box .box-content .item .configure .icon {
-	display: none;
-	border-radius: 3px;
 	vertical-align: middle;
 }
 .box .box-content .item .configure:hover {
-	background: url("icons/cog-white.svg") no-repeat 4px 4px #36c;
+	background-color: #36c;
+}
+.box .box-content .item .configure:hover .icon {
+	filter: brightness(3);
 }
 .box .box-content .item:last-child {
 	border-bottom: none;
@@ -444,7 +436,7 @@ form th {
 	color: #fff;
 }
 #bigMarkAsRead:hover .bigTick {
-	background: url(icons/tick-white.svg) center no-repeat;
+	filter: brightness(5);
 }
 #bigMarkAsRead .bigTick {
 	margin: 0.5rem 0;
@@ -456,36 +448,6 @@ form th {
 	white-space: nowrap;
 }
 
-.formLogin {
-	background: #303136;
-}
-.formLogin .header .configure {
-	padding-right: 1rem;
-}
-.formLogin .header .configure img {
-	margin-right: 0.5rem;
-}
-.formLogin .header .configure a.signin {
-	color: #fff;
-}
-.formLogin h1 {
-	color: #fff;
-}
-.formLogin form#crypto-form div {
-	margin-bottom: 1rem;
-}
-.formLogin form#crypto-form div label {
-	color: #c5ced3;
-	font-size: 1rem;
-}
-.formLogin form#crypto-form div input {
-	background: #1d1e22;
-}
-.formLogin form#crypto-form div input:focus {
-	background: #f9fafb;
-	color: #303136;
-}
-
 /*=== DIVERS */
 /*===========*/
 .aside.aside_feed .nav-form input,
@@ -570,8 +532,7 @@ form th {
 .stick input, .stick .btn {
 	border-radius: 0;
 }
-.stick .btn:first-child,
-.stick input:first-child {
+.stick .btn:first-child {
 	border-radius: 5px 0 0 5px;
 }
 .stick .btn:last-child, .stick input:last-child, .stick .btn + .dropdown > .btn {
@@ -746,7 +707,7 @@ form th {
 	background: #303136;
 	display: block;
 	width: auto;
-	height: 3rem;
+	height: 3.5rem;
 	table-layout: none;
 }
 .header .logo {
@@ -779,61 +740,76 @@ form th {
 	color: #5b6871;
 	background-color: #fff;
 }
+.header .item.search input:focus ~ .btn,
+.header .item.search input:hover ~ .btn {
+	background-color: #36c;
+}
+.header .item.search input:focus ~ .btn .icon,
+.header .item.search input:hover ~ .btn .icon {
+	filter: brightness(3);
+}
 .header .item.search .btn {
 	width: 3rem;
 	border-radius: 0 2px 2px 0;
-	background-color: #36c;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-image: url(icons/magnifier.svg);
+	background-color: #26272a;
 	border-left-width: 0;
 	min-height: 35px;
 }
-.header .item.search .btn img {
-	display: none;
-}
 .header .item.search .btn:hover {
 	background-color: #25c;
 }
+.header .item.search .btn:hover .icon {
+	filter: brightness(3);
+}
 .header .item.configure {
-	width: 2rem;
+	width: 3rem;
 	position: absolute;
 	right: 1rem;
-	top: 1.25rem;
+	top: 1rem;
 	text-align: center;
 }
+.header .item.configure .btn .icon,
+.header .item.configure > .icon {
+	filter: brightness(3);
+}
+.header .item.configure .signin {
+	color: white;
+}
 .header .item.configure .btn {
-	padding: 0 0.5rem;
+	padding: 0.25rem 1rem;
 	background-color: transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-image: url(icons/cog-white.svg);
-}
-.header .item.configure .btn img {
-	display: none;
 }
+
 /*=== Body */
 #global {
-	height: calc(100% - 4rem);
+	height: calc(100% - 3.5rem);
 }
 
 /*=== Prompt (centered) */
+main.prompt {
+	margin: 3rem auto;
+	padding: 2rem;
+	background: #eff0f2;
+	max-width: 400px;
+	min-width: 300px;
+	width: 33%;
+	border-radius: 5px;
+}
+
 .prompt {
 	text-align: center;
 }
 
-.prompt label {
+.prompt label,
+.prompt .help {
 	text-align: left;
 }
 
-.prompt form {
-	margin: 10px auto 20px auto;
-	width: 200px;
-}
-
-.prompt input {
-	margin: 5px auto;
+.prompt input,
+.prompt select,
+.prompt .stick {
 	width: 100%;
+	box-sizing: border-box;
 }
 
 .prompt p {
@@ -891,6 +867,9 @@ form th {
 .btn.active {
 	background-color: #36c;
 }
+.btn.active .icon {
+	filter: brightness(3);
+}
 
 /*=== Index menu */
 .nav_menu {
@@ -905,10 +884,7 @@ form th {
 	background-repeat: no-repeat;
 }
 .nav_menu .btn:hover {
-	background-color: #eff0f2;
-}
-.nav_menu .stick {
-	background: #f9fafb;
+	background-color: #d5d8db;
 }
 .nav_menu .stick .btn {
 	border-left-width: 0;
@@ -924,32 +900,11 @@ form th {
 .nav_menu .stick .btn.active {
 	background-color: #36c;
 }
-.nav_menu .stick .btn img.icon {
-	display: none;
+.nav_menu .stick .btn#toggle-read.active .icon {
+	filter: brightness(3.5);
 }
-.nav_menu .stick .btn#toggle-read {
-	background-image: url(icons/read.svg);
-}
-.nav_menu .stick .btn#toggle-read.active {
-	background-image: url(icons/read-white.svg);
-}
-.nav_menu .stick .btn#toggle-unread {
-	background-image: url(icons/unread.svg);
-}
-.nav_menu .stick .btn#toggle-unread.active {
-	background-image: url(icons/unread-white.svg);
-}
-.nav_menu .stick .btn#toggle-starred {
-	background-image: url(icons/starred.svg);
-}
-.nav_menu .stick .btn#toggle-starred.active {
-	background-image: url(icons/starred-white.svg);
-}
-.nav_menu .stick .btn#toggle-non-starred {
-	background-image: url(icons/non-starred.svg);
-}
-.nav_menu .stick .btn#toggle-non-starred.active {
-	background-image: url(icons/non-starred-white.svg);
+.nav_menu .stick .btn#toggle-unread.active .icon {
+	filter: brightness(3.5) grayscale(1);
 }
 .nav_menu .stick .btn.read_all {
 	padding: 5px 16px;
@@ -960,36 +915,12 @@ form th {
 .nav_menu .stick .btn.read_all:hover {
 	background-color: #d5d8db;
 }
-.nav_menu .stick .btn.view-normal {
-	background-image: url(icons/view-list.svg);
-}
-.nav_menu .stick .btn.view-normal.active {
-	background-image: url(icons/view-list-white.svg);
-}
-.nav_menu .stick .btn.view-global {
-	background-image: url(icons/view-global.svg);
-}
-.nav_menu .stick .btn.view-global.active {
-	background-image: url(icons/view-global-white.svg);
-}
-.nav_menu .stick .btn.view-reader {
-	background-image: url(icons/view-reader.svg);
-}
-.nav_menu .stick .btn.view-reader.active {
-	background-image: url(icons/view-reader-white.svg);
-}
-.nav_menu .stick .btn.view-rss {
-	background-image: url(icons/rss.svg);
-}
 .nav_menu .stick .dropdown a.dropdown-toggle {
 	border-left-width: 0;
 	background-image: url(icons/more.svg);
 }
-
-#dropdown-query ~ .dropdown-menu .dropdown-header .icon {
-	vertical-align: middle;
-	background-color: #a6a7ae;
-	border-radius: 3px;
+.nav_menu .stick .dropdown a.dropdown-toggle .icon {
+	display: none;
 }
 
 /*=== Content of feed articles */
@@ -1260,9 +1191,6 @@ form th {
 .post form {
 	margin: 1rem 0;
 }
-.post form .horizontal-list {
-	margin-bottom: 0.5rem;
-}
 .post.content {
 	max-width: 550px;
 }
@@ -1385,26 +1313,6 @@ form th {
 /*=== MOBILE */
 /*===========*/
 @media (max-width: 840px) {
-	ul.nav .item {
-		width: 100%;
-	}
-	ul.nav .item img {
-		display: none;
-	}
-	ul.nav .item a {
-		box-sizing: border-box;
-		padding: 1rem 1rem 1rem 2.5rem;
-		background: url("../../themes/icons/logout.svg") no-repeat #17181a 3% center;
-		display: inline-block;
-		width: 100%;
-		color: #ffffff;
-		transition: all 0.2s ease-in-out;
-	}
-	ul.nav .item a:hover, ul.nav .item a:active {
-		background: url("../../themes/icons/logout.svg") no-repeat #f5633e 3% center;
-		text-decoration: none;
-	}
-
 	.form-group .group-name {
 		text-align: left;
 	}
@@ -1439,6 +1347,7 @@ form th {
 
 	.header {
 		padding: 0.5rem;
+		height: 8rem;
 	}
 	.header .item.search {
 		display: block;
@@ -1456,9 +1365,15 @@ form th {
 	.header .item.search input:focus {
 		width: 100%;
 	}
-	.header .item.search .btn {
-		min-height: 49px;
-		padding: 0.5rem 2rem;
+
+	#global {
+		height: calc(100% - 8rem);
+	}
+
+	main.prompt {
+		max-width: 100%;
+		min-width: auto;
+		width: 75%;
 	}
 
 	.post {
@@ -1549,6 +1464,11 @@ html, body {
 	font-size: 0.875rem;
 }
 
+body.formLogin,
+body.register {
+	background: #303136;
+}
+
 /*=== Links */
 a, button.as-link {
 	outline: none;
diff --git a/p/themes/Mapco/mapco.rtl.css b/p/themes/Mapco/mapco.rtl.css
index 53844168e..2f0561e9e 100644
--- a/p/themes/Mapco/mapco.rtl.css
+++ b/p/themes/Mapco/mapco.rtl.css
@@ -139,6 +139,11 @@ input, select, textarea, button {
 	vertical-align: middle;
 }
 
+select {
+	padding-top: 9px;
+	padding-bottom: 9px;
+}
+
 option {
 	padding: 0 0.5em;
 }
@@ -261,6 +266,9 @@ form th {
 	background: #36c;
 	color: #fff;
 }
+.dropdown-menu .item:not(.addItem):hover .icon {
+	filter: brightness(3);
+}
 .dropdown-menu .item:not(.addItem):hover a, .dropdown-menu .item:not(.addItem):hover button, .dropdown-menu .item:not(.addItem):hover label {
 	text-decoration: none;
 	color: #fff;
@@ -362,24 +370,16 @@ form th {
 	border-radius: 2px 2px 0 0;
 }
 .box .box-title .configure {
-	margin-left: 4px;
-}
-.box .box-title:hover .configure {
-	background: url("icons/cog.svg") no-repeat 4px 4px;
-	display: block;
-	float: right;
-	width: 1.75rem;
-	height: 1.75rem;
-	border-radius: 2px;
-	margin-left: 0.5rem;
+	padding: 5px;
 }
 .box .box-title:hover .configure .icon {
-	display: none;
-	border-radius: 3px;
 	vertical-align: middle;
 }
 .box .box-title:hover .configure:hover {
-	background: url("icons/cog-white.svg") no-repeat 4px 4px #36c;
+	background-color: #36c;
+}
+.box .box-title:hover .configure:hover .icon {
+	filter: brightness(3);
 }
 .box .box-title form input {
 	width: 85%;
@@ -401,31 +401,23 @@ form th {
 	padding-right: 30px;
 }
 .box .box-content .item {
-	padding: 0.5rem 0;
+	padding: 0.25rem 0;
 	color: #303136;
 	font-size: 1rem;
 	border-bottom: 1px solid #eff0f2;
 	line-height: 1.7em;
 }
-.box .box-content .item img {
-	margin-left: 0.75rem;
-}
 .box .box-content .item .configure {
-	background: url("icons/cog.svg") no-repeat 4px 4px;
-	display: block;
-	float: right;
-	width: 1.75rem;
-	height: 1.75rem;
-	border-radius: 2px;
-	margin-left: 0.5rem;
+	padding: 5px;
 }
 .box .box-content .item .configure .icon {
-	display: none;
-	border-radius: 3px;
 	vertical-align: middle;
 }
 .box .box-content .item .configure:hover {
-	background: url("icons/cog-white.svg") no-repeat 4px 4px #36c;
+	background-color: #36c;
+}
+.box .box-content .item .configure:hover .icon {
+	filter: brightness(3);
 }
 .box .box-content .item:last-child {
 	border-bottom: none;
@@ -444,7 +436,7 @@ form th {
 	color: #fff;
 }
 #bigMarkAsRead:hover .bigTick {
-	background: url(icons/tick-white.svg) center no-repeat;
+	filter: brightness(5);
 }
 #bigMarkAsRead .bigTick {
 	margin: 0.5rem 0;
@@ -456,36 +448,6 @@ form th {
 	white-space: nowrap;
 }
 
-.formLogin {
-	background: #303136;
-}
-.formLogin .header .configure {
-	padding-left: 1rem;
-}
-.formLogin .header .configure img {
-	margin-left: 0.5rem;
-}
-.formLogin .header .configure a.signin {
-	color: #fff;
-}
-.formLogin h1 {
-	color: #fff;
-}
-.formLogin form#crypto-form div {
-	margin-bottom: 1rem;
-}
-.formLogin form#crypto-form div label {
-	color: #c5ced3;
-	font-size: 1rem;
-}
-.formLogin form#crypto-form div input {
-	background: #1d1e22;
-}
-.formLogin form#crypto-form div input:focus {
-	background: #f9fafb;
-	color: #303136;
-}
-
 /*=== DIVERS */
 /*===========*/
 .aside.aside_feed .nav-form input,
@@ -570,8 +532,7 @@ form th {
 .stick input, .stick .btn {
 	border-radius: 0;
 }
-.stick .btn:first-child,
-.stick input:first-child {
+.stick .btn:first-child {
 	border-radius: 0 5px 5px 0;
 }
 .stick .btn:last-child, .stick input:last-child, .stick .btn + .dropdown > .btn {
@@ -746,7 +707,7 @@ form th {
 	background: #303136;
 	display: block;
 	width: auto;
-	height: 3rem;
+	height: 3.5rem;
 	table-layout: none;
 }
 .header .logo {
@@ -779,61 +740,76 @@ form th {
 	color: #5b6871;
 	background-color: #fff;
 }
+.header .item.search input:focus ~ .btn,
+.header .item.search input:hover ~ .btn {
+	background-color: #36c;
+}
+.header .item.search input:focus ~ .btn .icon,
+.header .item.search input:hover ~ .btn .icon {
+	filter: brightness(3);
+}
 .header .item.search .btn {
 	width: 3rem;
 	border-radius: 2px 0 0 2px;
-	background-color: #36c;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-image: url(icons/magnifier.svg);
+	background-color: #26272a;
 	border-right-width: 0;
 	min-height: 35px;
 }
-.header .item.search .btn img {
-	display: none;
-}
 .header .item.search .btn:hover {
 	background-color: #25c;
 }
+.header .item.search .btn:hover .icon {
+	filter: brightness(3);
+}
 .header .item.configure {
-	width: 2rem;
+	width: 3rem;
 	position: absolute;
 	left: 1rem;
-	top: 1.25rem;
+	top: 1rem;
 	text-align: center;
 }
+.header .item.configure .btn .icon,
+.header .item.configure > .icon {
+	filter: brightness(3);
+}
+.header .item.configure .signin {
+	color: white;
+}
 .header .item.configure .btn {
-	padding: 0 0.5rem;
+	padding: 0.25rem 1rem;
 	background-color: transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-image: url(icons/cog-white.svg);
-}
-.header .item.configure .btn img {
-	display: none;
 }
+
 /*=== Body */
 #global {
-	height: calc(100% - 4rem);
+	height: calc(100% - 3.5rem);
 }
 
 /*=== Prompt (centered) */
+main.prompt {
+	margin: 3rem auto;
+	padding: 2rem;
+	background: #eff0f2;
+	max-width: 400px;
+	min-width: 300px;
+	width: 33%;
+	border-radius: 5px;
+}
+
 .prompt {
 	text-align: center;
 }
 
-.prompt label {
+.prompt label,
+.prompt .help {
 	text-align: right;
 }
 
-.prompt form {
-	margin: 10px auto 20px auto;
-	width: 200px;
-}
-
-.prompt input {
-	margin: 5px auto;
+.prompt input,
+.prompt select,
+.prompt .stick {
 	width: 100%;
+	box-sizing: border-box;
 }
 
 .prompt p {
@@ -891,6 +867,9 @@ form th {
 .btn.active {
 	background-color: #36c;
 }
+.btn.active .icon {
+	filter: brightness(3);
+}
 
 /*=== Index menu */
 .nav_menu {
@@ -905,10 +884,7 @@ form th {
 	background-repeat: no-repeat;
 }
 .nav_menu .btn:hover {
-	background-color: #eff0f2;
-}
-.nav_menu .stick {
-	background: #f9fafb;
+	background-color: #d5d8db;
 }
 .nav_menu .stick .btn {
 	border-right-width: 0;
@@ -924,32 +900,11 @@ form th {
 .nav_menu .stick .btn.active {
 	background-color: #36c;
 }
-.nav_menu .stick .btn img.icon {
-	display: none;
+.nav_menu .stick .btn#toggle-read.active .icon {
+	filter: brightness(3.5);
 }
-.nav_menu .stick .btn#toggle-read {
-	background-image: url(icons/read.svg);
-}
-.nav_menu .stick .btn#toggle-read.active {
-	background-image: url(icons/read-white.svg);
-}
-.nav_menu .stick .btn#toggle-unread {
-	background-image: url(icons/unread.svg);
-}
-.nav_menu .stick .btn#toggle-unread.active {
-	background-image: url(icons/unread-white.svg);
-}
-.nav_menu .stick .btn#toggle-starred {
-	background-image: url(icons/starred.svg);
-}
-.nav_menu .stick .btn#toggle-starred.active {
-	background-image: url(icons/starred-white.svg);
-}
-.nav_menu .stick .btn#toggle-non-starred {
-	background-image: url(icons/non-starred.svg);
-}
-.nav_menu .stick .btn#toggle-non-starred.active {
-	background-image: url(icons/non-starred-white.svg);
+.nav_menu .stick .btn#toggle-unread.active .icon {
+	filter: brightness(3.5) grayscale(1);
 }
 .nav_menu .stick .btn.read_all {
 	padding: 5px 16px;
@@ -960,36 +915,12 @@ form th {
 .nav_menu .stick .btn.read_all:hover {
 	background-color: #d5d8db;
 }
-.nav_menu .stick .btn.view-normal {
-	background-image: url(icons/view-list.svg);
-}
-.nav_menu .stick .btn.view-normal.active {
-	background-image: url(icons/view-list-white.svg);
-}
-.nav_menu .stick .btn.view-global {
-	background-image: url(icons/view-global.svg);
-}
-.nav_menu .stick .btn.view-global.active {
-	background-image: url(icons/view-global-white.svg);
-}
-.nav_menu .stick .btn.view-reader {
-	background-image: url(icons/view-reader.svg);
-}
-.nav_menu .stick .btn.view-reader.active {
-	background-image: url(icons/view-reader-white.svg);
-}
-.nav_menu .stick .btn.view-rss {
-	background-image: url(icons/rss.svg);
-}
 .nav_menu .stick .dropdown a.dropdown-toggle {
 	border-right-width: 0;
 	background-image: url(icons/more.svg);
 }
-
-#dropdown-query ~ .dropdown-menu .dropdown-header .icon {
-	vertical-align: middle;
-	background-color: #a6a7ae;
-	border-radius: 3px;
+.nav_menu .stick .dropdown a.dropdown-toggle .icon {
+	display: none;
 }
 
 /*=== Content of feed articles */
@@ -1260,9 +1191,6 @@ form th {
 .post form {
 	margin: 1rem 0;
 }
-.post form .horizontal-list {
-	margin-bottom: 0.5rem;
-}
 .post.content {
 	max-width: 550px;
 }
@@ -1385,26 +1313,6 @@ form th {
 /*=== MOBILE */
 /*===========*/
 @media (max-width: 840px) {
-	ul.nav .item {
-		width: 100%;
-	}
-	ul.nav .item img {
-		display: none;
-	}
-	ul.nav .item a {
-		box-sizing: border-box;
-		padding: 1rem 2.5rem 1rem 1rem;
-		background: url("../../themes/icons/logout.svg") no-repeat #17181a 97% center;
-		display: inline-block;
-		width: 100%;
-		color: #ffffff;
-		transition: all 0.2s ease-in-out;
-	}
-	ul.nav .item a:hover, ul.nav .item a:active {
-		background: url("../../themes/icons/logout.svg") no-repeat #f5633e 97% center;
-		text-decoration: none;
-	}
-
 	.form-group .group-name {
 		text-align: right;
 	}
@@ -1439,6 +1347,7 @@ form th {
 
 	.header {
 		padding: 0.5rem;
+		height: 8rem;
 	}
 	.header .item.search {
 		display: block;
@@ -1456,9 +1365,15 @@ form th {
 	.header .item.search input:focus {
 		width: 100%;
 	}
-	.header .item.search .btn {
-		min-height: 49px;
-		padding: 0.5rem 2rem;
+
+	#global {
+		height: calc(100% - 8rem);
+	}
+
+	main.prompt {
+		max-width: 100%;
+		min-width: auto;
+		width: 75%;
 	}
 
 	.post {
@@ -1549,6 +1464,11 @@ html, body {
 	font-size: 0.875rem;
 }
 
+body.formLogin,
+body.register {
+	background: #303136;
+}
+
 /*=== Links */
 a, button.as-link {
 	outline: none;
diff --git a/p/themes/Mapco/mapco.scss b/p/themes/Mapco/mapco.scss
index 0cf9a84f2..5457b15aa 100644
--- a/p/themes/Mapco/mapco.scss
+++ b/p/themes/Mapco/mapco.scss
@@ -40,6 +40,11 @@ html, body {
 	font-size: 0.875rem;
 }
 
+body.formLogin,
+body.register {
+	background: variables.$sid-bg;
+}
+
 /*=== Links */
 a, button.as-link {
 	outline: none;
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 17388af97..cbf793c7e 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -1425,21 +1425,6 @@ br {
 	height: 300px;
 }
 
-/*=== LOGIN VIEW */
-/*================*/
-.formLogin .header > .item {
-	padding: 10px 30px;
-}
-
-.formLogin .header > .item.title {
-	text-align: left;
-}
-
-.formLogin .header > .item.configure {
-	text-align: right;
-}
-
-
 /*=== GLOBAL VIEW */
 /*================*/
 #stream.global {
diff --git a/p/themes/base-theme/template.rtl.css b/p/themes/base-theme/template.rtl.css
index 56a98a765..82261e71f 100644
--- a/p/themes/base-theme/template.rtl.css
+++ b/p/themes/base-theme/template.rtl.css
@@ -1425,21 +1425,6 @@ br {
 	height: 300px;
 }
 
-/*=== LOGIN VIEW */
-/*================*/
-.formLogin .header > .item {
-	padding: 10px 30px;
-}
-
-.formLogin .header > .item.title {
-	text-align: right;
-}
-
-.formLogin .header > .item.configure {
-	text-align: left;
-}
-
-
 /*=== GLOBAL VIEW */
 /*================*/
 #stream.global {