diff --git a/maloja/web/jinja/admin_issues.jinja b/maloja/web/jinja/admin_issues.jinja
index a6d7b1e..931bb4c 100644
--- a/maloja/web/jinja/admin_issues.jinja
+++ b/maloja/web/jinja/admin_issues.jinja
@@ -45,7 +45,7 @@
 {% if issuedata.inconsistent %}
 	<tr>
 		<td>The current database wasn't built with all current rules in effect. Any problem below might be a false alarm and fixing it could create redundant rules.</td>
-		<td class='button important' onclick="fullrebuild()"><div>Rebuild the database</div></td>
+		<td><button type="button" class='warning' onclick="fullrebuild()">Rebuild the database</button></td>
 	</tr>
 {% endif %}
 
@@ -53,10 +53,10 @@
 	<tr>
 		<td>{{ links.link(issue[0]) }} is a possible duplicate of {{ links.link(issue[1]) }}</td>
 		<td>
-			<button onclick="newrule(this,'replaceartist','{{ issue[0] }}','{{ issue[1] }}')">{{ issue[1] }} is correct</button>
+			<button type="button" onclick="newrule(this,'replaceartist','{{ issue[0] }}','{{ issue[1] }}')">{{ issue[1] }} is correct</button>
 		</td>
 		<td>
-			<button onclick="newrule(this,'replaceartist','{{ issue[1] }}','{{ issue[0] }}')">{{ issue[0] }} is correct</button>
+			<button type="button" onclick="newrule(this,'replaceartist','{{ issue[1] }}','{{ issue[0] }}')">{{ issue[0] }} is correct</button>
 		</td>
 	</tr>
 {% endfor %}
@@ -67,7 +67,7 @@
 			{{ issue[1]|join(", ") }}
 		</td>
 		<td>
-			<button onclick="newrule(this,'replaceartist','{{ issue[0] }}','{{ issue[1] | join('␟') }}')">Fix it</button>
+			<button type="button" onclick="newrule(this,'replaceartist','{{ issue[0] }}','{{ issue[1] | join('␟') }}')">Fix it</button>
 		</td>
 	</tr>
 {% endfor %}
@@ -76,7 +76,7 @@
 	<tr>
 		<td>Is '{{ issue[0] }}' in '{{ links.link(issue[1]) }}' an artist?</td>
 		<td>
-			<button onclick="newrule(this,'replaceartist','{{ issue[1] }}','{{ (issue[2] + [issue[0]]) | join('␟') }}')">Yes</button>
+			<button type="button" onclick="newrule(this,'replaceartist','{{ issue[1] }}','{{ (issue[2] + [issue[0]]) | join('␟') }}')">Yes</button>
 		</td>
 	</tr>
 {% endfor %}
diff --git a/maloja/web/jinja/admin_manual.jinja b/maloja/web/jinja/admin_manual.jinja
index db3b973..d5f9ba4 100644
--- a/maloja/web/jinja/admin_manual.jinja
+++ b/maloja/web/jinja/admin_manual.jinja
@@ -30,8 +30,8 @@
 
 	<br/>
 
-	<button onclick="scrobbleNew(event)">Scrobble!</button>
-	<button onclick="repeatLast()">↻</button>
+	<button type="button" onclick="scrobbleNew(event)">Scrobble!</button>
+	<button type="button" onclick="repeatLast()">↻</button>
 
 	<br/>
 
diff --git a/maloja/web/jinja/admin_overview.jinja b/maloja/web/jinja/admin_overview.jinja
index 9d6913d..5568965 100644
--- a/maloja/web/jinja/admin_overview.jinja
+++ b/maloja/web/jinja/admin_overview.jinja
@@ -70,9 +70,9 @@
 	</ul>
 
 	{% if adminmode %}
-	<button id="adminmodebutton" onclick="deactivate()">Deactivate</button>
+	<button type="button" id="adminmodebutton" onclick="deactivate()">Deactivate</button>
 	{% else %}
-	<button id="adminmodebutton" onclick="activate()">Activate</button>
+	<button type="button" id="adminmodebutton" onclick="activate()">Activate</button>
 	{% endif %}
 
 	<h2>Links</h2>
@@ -85,6 +85,6 @@
 
 	<input class="simpleinput" type="password" placeholder="New Password"></input><br/>
 	<input class="simpleinput" type="password" placeholder="Repeat"></input><br/><br/>
-	<button onclick="changepw()">Change</button>
+	<button type="button" onclick="changepw()">Change</button>
 	{% endif %}
 	{% endblock %}
diff --git a/maloja/web/jinja/track.jinja b/maloja/web/jinja/track.jinja
index 632fd34..95076c6 100644
--- a/maloja/web/jinja/track.jinja
+++ b/maloja/web/jinja/track.jinja
@@ -48,7 +48,7 @@
 				<br/>
 
 			<p class="stats">
-				{% if adminmode %}<button onclick="scrobble('{{ encodedtrack }}')">Scrobble now</button>{% endif %}
+				{% if adminmode %}<button type="button" onclick="scrobble('{{ encodedtrack }}')">Scrobble now</button>{% endif %}
 				<a href="{{ mlj_uri.create_uri("/scrobbles",filterkeys) }}">{{ info['scrobbles'] }} Scrobbles</a>
 			</p>
 
diff --git a/maloja/web/static/css/maloja.css b/maloja/web/static/css/maloja.css
index b8712d0..75d287d 100644
--- a/maloja/web/static/css/maloja.css
+++ b/maloja/web/static/css/maloja.css
@@ -430,7 +430,7 @@ button {
 	color: var(--button-color-fg);
 	cursor:pointer;
 }
-button.important {
+button.warning {
 	background-color:red;
 	color:white;
 }