diff --git a/templates/attributequery.php b/templates/attributequery.php
index fc1459071618f9fc997321aa9d9f08a77e876b3d..9c84eaeb47c0ffa0ed45e8f0b596a8e4dece7abe 100644
--- a/templates/attributequery.php
+++ b/templates/attributequery.php
@@ -59,7 +59,7 @@ assert('is_null($attributes) || is_array($attributes)');
 </p>
 
 <p>
-<input type="submit" name="send" value="Send query" />
+<button type="submit" name="send" class="btn">Send query</button>
 </p>
 </form>
 
diff --git a/templates/login-ldapmulti.php b/templates/login-ldapmulti.php
index b4430cbd8ada3beecadf88152670428a384ac32b..6f73d5a5d2e0608e83fb487942a7616886218a78 100644
--- a/templates/login-ldapmulti.php
+++ b/templates/login-ldapmulti.php
@@ -31,7 +31,7 @@
 
 					
 				<td style="padding: .4em;" rowspan="3">
-					<input type="submit" tabindex="3" id="regularsubmit" value="<?php echo $this->t('login_button'); ?>" />
+					<button type="submit" tabindex="3" id="regularsubmit" class="btn"><?php echo $this->t('login_button'); ?></button>
 					<input type="hidden" name="RelayState" value="<?php echo htmlspecialchars($this->data['relaystate']); ?>" />
 				</td>
 			</tr>
@@ -56,7 +56,7 @@
 				<td><input type="password" tabindex="2" name="password" /></td>
 			</tr>
 		<tr><td></td><td>
-		<input type="submit" tabindex="5" id="mobilesubmit" value="<?php echo $this->t('login_button'); ?>" />
+		<button type="submit" tabindex="5" id="mobilesubmit" class="btn"><?php echo $this->t('login_button'); ?></button>
 		</td></tr>
 		</table>
 		
diff --git a/templates/login.php b/templates/login.php
index bded6d6d14bca27b1cc583152219299f46f77b0e..1112a3f3193a3af0be42c873bba6cfe33cc388b5 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -45,7 +45,7 @@
 			</td>
 
 			<td style="padding: .4em;" rowspan="2">
-				<input type="submit" class="regularsubmit" tabindex="3" value="<?php echo $this->t('login_button'); ?>" />
+				<button type="submit" class="regularsubmit" tabindex="3" class="btn"><?php echo $this->t('login_button'); ?></button>
 				<input type="hidden" name="RelayState" value="<?php echo htmlspecialchars($this->data['relaystate']); ?>" />
 			</td>
 		</tr>
@@ -54,7 +54,7 @@
 			<td><input id="password" type="password" tabindex="2" name="password" /></td>
 		</tr>
 	<tr><td></td><td>
-	<input type="submit" tabindex="5" id="mobilesubmit" value="<?php echo $this->t('login_button'); ?>" />
+	<button type="submit" tabindex="5" id="mobilesubmit" class="btn"><?php echo $this->t('login_button'); ?></button>
 	</td></tr>
 	</table>
 	
diff --git a/templates/metadata-converter.php b/templates/metadata-converter.php
index 13a580941c898f6d08498e0f8fdcbcf7b0a4da80..19fac27e4c415ed88ccb75fc927e32ec8bcb5a85 100644
--- a/templates/metadata-converter.php
+++ b/templates/metadata-converter.php
@@ -13,7 +13,7 @@ $this->includeAtTemplateBase('includes/header.php');
             <?php echo $this->t('metaconv_selectfile'); ?>
             <input type="file" name="xmlfile"/></p>
         <p>
-            <input type="submit" value="<?php echo $this->t('metaconv_parse'); ?>" class="btn"/>
+            <button type="submit" class="btn"><?php echo $this->t('metaconv_parse'); ?></button>
         </p>
     </form>
 <?php
diff --git a/templates/post.php b/templates/post.php
index 323c39ceabd30ff385741fdc0e9e219f77e607ef..1018929170c43832d86eb1a06aaafe60d43fd312 100644
--- a/templates/post.php
+++ b/templates/post.php
@@ -62,7 +62,7 @@ foreach ($post as $name => $value) {
 ?>
 
 		<noscript>
-			<input type="submit" value="Submit" />
+			<button type="submit" class="btn">Submit</button>
 		</noscript>
 	</form>