diff --git a/maloja/web/jinja/abstracts/base.jinja b/maloja/web/jinja/abstracts/base.jinja
index 7074886..bed8868 100644
--- a/maloja/web/jinja/abstracts/base.jinja
+++ b/maloja/web/jinja/abstracts/base.jinja
@@ -80,9 +80,11 @@
 			</div>
 		</div>
 
-		<a href="/admin_overview">
+		<div id="icon_bar">
+			{% block icon_bar %}{% endblock %}
 			{% include 'icons/settings.jinja' %}
-		</a>
+		</div>
+
 
 	</body>
 </html>
diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja
index f896ea8..5675127 100644
--- a/maloja/web/jinja/artist.jinja
+++ b/maloja/web/jinja/artist.jinja
@@ -27,6 +27,13 @@
 
 {% set encodedartist = mlj_uri.uriencode({'artist':artist}) %}
 
+{% block icon_bar %}
+	{% if adminmode %}
+		{% include 'icons/edit.jinja' %}
+		{% include 'icons/merge.jinja' %}
+		{% include 'icons/merge_mark.jinja' %}
+	{% endif %}
+{% endblock %}
 
 {% block content %}
 
@@ -53,7 +60,6 @@
 		</td>
 		<td class="text">
 			<h1 id="main_entity_name" class="headerwithextra">{{ info.artist }}</h1>
-				{% if adminmode %}{% include 'icons/edit.jinja' %}{% endif %}
 				{% if competes %}<span class="rank"><a href="/charts_artists?max=100">#{{ info.position }}</a></span>{% endif %}
 				<br/>
 				{% if competes and included %}
@@ -62,7 +68,9 @@
 					<span>Competing under {{ links.link(credited) }} (#{{ info.position }})</span>
 				{% endif %}
 
-			<p class="stats"><a href="{{ mlj_uri.create_uri("/scrobbles",filterkeys) }}">{{ info['scrobbles'] }} Scrobbles</a></p>
+			<p class="stats">
+				<a href="{{ mlj_uri.create_uri("/scrobbles",filterkeys) }}">{{ info['scrobbles'] }} Scrobbles</a>
+			</p>
 
 
 
diff --git a/maloja/web/jinja/icons/edit.jinja b/maloja/web/jinja/icons/edit.jinja
index 4ffb9f0..6c76a60 100644
--- a/maloja/web/jinja/icons/edit.jinja
+++ b/maloja/web/jinja/icons/edit.jinja
@@ -1,5 +1,5 @@
 <div title="Edit" id="editicon" class="clickable_icon" onclick="editEntity()">
-	<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="20px" y="20px"
+	<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 		 viewBox="0 0 59.985 59.985" style="enable-background:new 0 0 59.985 59.985;" xml:space="preserve">
 		<path d="M5.243,44.844L42.378,7.708l9.899,9.899L15.141,54.742L5.243,44.844z"/>
 		<path d="M56.521,13.364l1.414-1.414c1.322-1.322,2.05-3.079,2.05-4.949s-0.728-3.627-2.05-4.949S54.855,0,52.985,0
diff --git a/maloja/web/jinja/icons/merge.jinja b/maloja/web/jinja/icons/merge.jinja
index 9963b90..ff722fd 100644
--- a/maloja/web/jinja/icons/merge.jinja
+++ b/maloja/web/jinja/icons/merge.jinja
@@ -1,5 +1,5 @@
-<div title="merge" id="mergeicon" class="clickable_icon" onclick="merge()">
-	<svg width="20px" height="20px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<div title="Merge" id="mergeicon" class="clickable_icon" onclick="merge()">
+	<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
 	<g>
 		<path fill="none" d="M0 0h24v24H0z"/>
 		<path d="M7.105 8.79A3.001 3.001 0 0 0 10 11h4a5.001 5.001 0 0 1 4.927 4.146A3.001 3.001 0 0 1 18 21a3 3 0 0 1-1.105-5.79A3.001 3.001 0 0 0 14 13h-4a4.978 4.978 0 0 1-3-1v3.17a3.001 3.001 0 1 1-2 0V8.83a3.001 3.001 0 1 1 2.105-.04z"/>
diff --git a/maloja/web/jinja/icons/merge_mark.jinja b/maloja/web/jinja/icons/merge_mark.jinja
index 11f4bdb..74bdad5 100644
--- a/maloja/web/jinja/icons/merge_mark.jinja
+++ b/maloja/web/jinja/icons/merge_mark.jinja
@@ -1,5 +1,5 @@
 <div title="Mark for merging" id="mergemarkicon" class="clickable_icon" onclick="markForMerge()">
-	<svg width="20px" height="20px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+	<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
 	<path fill-rule="evenodd" d="M10,0 L10,2.60002 C12.2108812,3.04881281 13.8920863,4.95644867 13.9950026,7.27443311 L14,7.5 L14,11.2676 C14.5978,11.6134 15,12.2597 15,13 C15,14.1046 14.1046,15 13,15 C11.8954,15 11,14.1046 11,13 C11,12.3166462 11.342703,11.713387 11.8656124,11.3526403 L12,11.2676 L12,7.5 C12,6.259091 11.246593,5.19415145 10.1722389,4.73766702 L10,4.67071 L10,7 L6,3.5 L10,0 Z M3,1 C4.10457,1 5,1.89543 5,3 C5,3.68333538 4.65729704,4.28663574 4.13438762,4.6473967 L4,4.73244 L4,11.2676 C4.5978,11.6134 5,12.2597 5,13 C5,14.1046 4.10457,15 3,15 C1.89543,15 1,14.1046 1,13 C1,12.3166462 1.34270296,11.713387 1.86561238,11.3526403 L2,11.2676 L2,4.73244 C1.4022,4.38663 1,3.74028 1,3 C1,1.89543 1.89543,1 3,1 Z"/>
 	</svg>
 </div>
diff --git a/maloja/web/jinja/icons/settings.jinja b/maloja/web/jinja/icons/settings.jinja
index ea2e003..62434cc 100644
--- a/maloja/web/jinja/icons/settings.jinja
+++ b/maloja/web/jinja/icons/settings.jinja
@@ -1,5 +1,7 @@
-<div title="Server Administration" id="settingsicon" class="clickable_icon">
-	<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<a class='hidelink' href="/admin_overview">
+<div title="Server Administration" id="settingsicon" class="clickable_icon" style="margin-left:25px;">
+	<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<path d="M17 12.645v-2.289c-1.17-.417-1.907-.533-2.28-1.431-.373-.9.07-1.512.6-2.625l-1.618-1.619c-1.105.525-1.723.974-2.626.6-.9-.374-1.017-1.117-1.431-2.281h-2.29c-.412 1.158-.53 1.907-1.431 2.28h-.001c-.9.374-1.51-.07-2.625-.6l-1.617 1.619c.527 1.11.973 1.724.6 2.625-.375.901-1.123 1.019-2.281 1.431v2.289c1.155.412 1.907.531 2.28 1.431.376.908-.081 1.534-.6 2.625l1.618 1.619c1.107-.525 1.724-.974 2.625-.6h.001c.9.373 1.018 1.118 1.431 2.28h2.289c.412-1.158.53-1.905 1.437-2.282h.001c.894-.372 1.501.071 2.619.602l1.618-1.619c-.525-1.107-.974-1.723-.601-2.625.374-.899 1.126-1.019 2.282-1.43zm-8.5 1.689c-1.564 0-2.833-1.269-2.833-2.834s1.269-2.834 2.833-2.834 2.833 1.269 2.833 2.834-1.269 2.834-2.833 2.834zm15.5 4.205v-1.077c-.55-.196-.897-.251-1.073-.673-.176-.424.033-.711.282-1.236l-.762-.762c-.52.248-.811.458-1.235.283-.424-.175-.479-.525-.674-1.073h-1.076c-.194.545-.25.897-.674 1.073-.424.176-.711-.033-1.235-.283l-.762.762c.248.523.458.812.282 1.236-.176.424-.528.479-1.073.673v1.077c.544.193.897.25 1.073.673.177.427-.038.722-.282 1.236l.762.762c.521-.248.812-.458 1.235-.283.424.175.479.526.674 1.073h1.076c.194-.545.25-.897.676-1.074h.001c.421-.175.706.034 1.232.284l.762-.762c-.247-.521-.458-.812-.282-1.235s.529-.481 1.073-.674zm-4 .794c-.736 0-1.333-.597-1.333-1.333s.597-1.333 1.333-1.333 1.333.597 1.333 1.333-.597 1.333-1.333 1.333z"/>
 	</svg>
 </div>
+</a>
diff --git a/maloja/web/jinja/track.jinja b/maloja/web/jinja/track.jinja
index 17d79e9..dfc5815 100644
--- a/maloja/web/jinja/track.jinja
+++ b/maloja/web/jinja/track.jinja
@@ -22,6 +22,14 @@
 {% set encodedtrack = mlj_uri.uriencode({'track':track}) %}
 
 
+{% block icon_bar %}
+	{% if adminmode %}
+		{% include 'icons/edit.jinja' %}
+		{% include 'icons/merge.jinja' %}
+		{% include 'icons/merge_mark.jinja' %}
+	{% endif %}
+{% endblock %}
+
 {% block content %}
 
 <script>
@@ -50,7 +58,6 @@
 		<td class="text">
 			<span>{{ links.links(track.artists) }}</span><br/>
 			<h1 id="main_entity_name" class="headerwithextra">{{ info.track.title }}</h1>
-				{% if adminmode %}{% include 'icons/edit.jinja' %}{% endif %}
 				{{ awards.certs(track) }}
 				<span class="rank"><a href="/charts_tracks?max=100">#{{ info.position }}</a></span>
 				<br/>
diff --git a/maloja/web/static/css/maloja.css b/maloja/web/static/css/maloja.css
index abf70aa..6890698 100644
--- a/maloja/web/static/css/maloja.css
+++ b/maloja/web/static/css/maloja.css
@@ -55,8 +55,18 @@ div.header h1 {
  settings icon
 **/
 
-div.clickable_icon {
+div#icon_bar {
+	position:fixed;
+	right:30px;
+	top:30px;
+}
+
+div#icon_bar div.clickable_icon {
 	display: inline-block;
+	height:26px;
+	width:26px;
+}
+div.clickable_icon {
 	fill: var(--text-color);
 	cursor: pointer;
 }
@@ -67,15 +77,6 @@ div.clickable_icon.danger:hover {
 	fill: red;
 }
 
-div#settingsicon {
-	position:fixed;
-	right:30px;
-	top:30px;
-}
-div#editicon {
-	height:20px;
-	width:20px;
-}
 
 
 /**
diff --git a/maloja/web/static/js/edit.js b/maloja/web/static/js/edit.js
index e6ded86..9df0c19 100644
--- a/maloja/web/static/js/edit.js
+++ b/maloja/web/static/js/edit.js
@@ -61,6 +61,7 @@ function editEntity() {
 }
 
 function doneEditing() {
+	window.getSelection().removeAllRanges();
 	var namefield = document.getElementById('main_entity_name');
 	namefield.contentEditable = "false";
 	newname = namefield.textContent;