diff --git a/Admin/Templates/Notice/all.tpl b/Admin/Templates/Notice/all.tpl
index 4f3ab47c..e5725837 100644
--- a/Admin/Templates/Notice/all.tpl
+++ b/Admin/Templates/Notice/all.tpl
@@ -19,13 +19,13 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
 		<?php } else { ?>
 		<input class="check" type="checkbox" id="s10" name="s10" onclick="Allmsg(this.form);" />
 		<?php } ?></th>
-			<th class="buttons"><input name="del" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" value="delete" alt="delete" />
+			<th class="buttons"><button name="del" id="btn_delete" class="trav_buttons" value="delete" alt="delete" /> Delete </button>
             <?php if($session->plus) {
 			if(isset($_GET['t']) && $_GET['t'] == 5) {
-				echo "<input name=\"start\" type=\"image\" value=\"back\" alt=\"back\" id=\"btn_back\" class=\"dynamic_img\" src=\"img/x.gif\" />";
+				echo "<button name=\"start\" value=\"back\" alt=\"back\" id=\"btn_back\" class=\"trav_buttons\" /> Back </button>";
 			}
 			else {
-				echo "<input name=\"archive\" type=\"image\" value=\"Archive\" alt=\"Archive\" id=\"btn_archiv\" class=\"dynamic_img\" src=\"img/x.gif\" />";
+				echo "<button name=\"archive\" value=\"Archive\" alt=\"Archive\" id=\"btn_archiv\" class=\"trav_buttons\" /> Archive </button>";
 			}
 			}?>
             </th>
diff --git a/Admin/Templates/addABTroops.tpl b/Admin/Templates/addABTroops.tpl
index 613e816e..caea46d3 100644
--- a/Admin/Templates/addABTroops.tpl
+++ b/Admin/Templates/addABTroops.tpl
@@ -52,8 +52,8 @@ if(isset($id))
 	<thead>
 	<tr>
 		<td colspan="3">
-			<input style="float: right" name="save" type="image" id="btn_save" class="dynamic_img" src="img/x.gif" value="save" alt="save" />
-			<input style="float: left" name="back" type="image" id="btn_back" class="dynamic_img" src="img/x.gif" value="back" alt="back" onclick="return go_url('../Admin/admin.php?p=village&did=<?php echo $_GET["did"];?>')" />
+			<button style="float: right" name="save" id="btn_save" class="trav_buttons" value="save" alt="save" /> Save </button>
+			<button style="float: left" name="back" id="btn_back" class="trav_buttons" value="back" alt="back" onclick="return go_url('../Admin/admin.php?p=village&did=<?php echo $_GET["did"];?>')" /> Back </button>
 		</td>
 	</tr>
 	</thead>	
diff --git a/Admin/Templates/addTroops.tpl b/Admin/Templates/addTroops.tpl
index 0f0db969..a3434a47 100644
--- a/Admin/Templates/addTroops.tpl
+++ b/Admin/Templates/addTroops.tpl
@@ -45,8 +45,8 @@ if(isset($id))
 	<thead>
 	<tr>
 		<td colspan="2">
-			<input style="float: right" name="save" type="image" id="btn_save" class="dynamic_img" src="img/x.gif" value="save" alt="save" />
-			<input style="float: left" name="back" type="image" id="btn_back" class="dynamic_img" src="img/x.gif" value="back" alt="back" onclick="return go_url('../Admin/admin.php?p=village&did=<?php echo $_GET["did"];?>')" />
+			<button style="float: right" name="save" id="btn_save" class="trav_buttons" value="save" alt="save" /> Save </button>
+			<button style="float: left" name="back" id="btn_back" class="trav_buttons" value="back" alt="back" onclick="return go_url('../Admin/admin.php?p=village&did=<?php echo $_GET["did"];?>')" /> Back </button>
 		</td>
 	</tr>
 	</thead>	
diff --git a/Templates/Alliance/Forum/forum_3.tpl b/Templates/Alliance/Forum/forum_3.tpl
index 756e5be4..0fc302a3 100644
--- a/Templates/Alliance/Forum/forum_3.tpl
+++ b/Templates/Alliance/Forum/forum_3.tpl
@@ -44,9 +44,9 @@ $show_cat = $database->ForumCat($session->alliance);
 		</tr>
 	</tbody></table>
 
-	<p class="btn"><input type="image" id="fbtn_ok" value="ok" name="s1" class="dynamic_img" src="img/x.gif" alt="OK" /></form></p>
+	<p class="btn"><button id="fbtn_ok" value="ok" name="s1" class="trav_buttons" alt="OK" /> Ok </button></form></p>
 <?php }else{
 header("Location: banned.php");
 exit;
 }
-?>
\ No newline at end of file
+?>
diff --git a/Templates/Build/19.tpl b/Templates/Build/19.tpl
index 8253e270..565d8d7d 100644
--- a/Templates/Build/19.tpl
+++ b/Templates/Build/19.tpl
@@ -17,7 +17,7 @@
                 <?php
 	                include("19_train.tpl");
                 ?></table>
-	<p><input type="image" id="btn_train" class="dynamic_img" value="ok" name="s1" src="img/x.gif" alt="train" onclick="this.disabled=true;this.form.submit();"/></form></p>
+	<p><button id="btn_train" class="trav_buttons" value="ok" name="s1" alt="train" onclick="this.disabled=true;this.form.submit();"/> Train </button></form></p>
     <?php
 	} else {
 		echo "<b>".TRAINING_COMMENCE_BARRACKS."</b><br>\n";
diff --git a/Templates/Build/ww.tpl b/Templates/Build/ww.tpl
index 5e591b1d..02c07f3e 100644
--- a/Templates/Build/ww.tpl
+++ b/Templates/Build/ww.tpl
@@ -26,12 +26,12 @@ $wwname = $database->getWWName($vref);
 
 if($village->resarray['f'.$id] < 0){
 echo ''.WORLD_WONDER_CHANGE_NAME.'.
-			<center><br />'.WORLD_WONDER_NAME.': <input class="text" name="wwname" id="wwname" disabled="disabled" value="'.$wwname.'" maxlength="20"></center><p class="btn"><input type="image" value="" tabindex="9" name="s1" disabled="disabled" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></p>';
+			<center><br />'.WORLD_WONDER_NAME.': <input class="text" name="wwname" id="wwname" disabled="disabled" value="'.$wwname.'" maxlength="20"></center><p class="btn"><button value="" tabindex="9" name="s1" disabled="disabled" id="btn_ok" class="trav_buttons"  alt="OK" /> Ok </button></p>';
 } else if($village->resarray['f'.$id] > 0 and $village->resarray['f'.$id] < 11) {
-echo '<center><br />'.WORLD_WONDER_NAME.': <input class="text" name="wwname" id="wwname" value="'.$wwname.'" maxlength="20"></center><p class="btn"><input type="image" value="" tabindex="9" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></p>'; 
+echo '<center><br />'.WORLD_WONDER_NAME.': <input class="text" name="wwname" id="wwname" value="'.$wwname.'" maxlength="20"></center><p class="btn"><button value="" tabindex="9" name="s1" id="btn_ok" class="trav_buttons" alt="OK" /> Ok </button></p>'; 
 } else if ($village->resarray['f'.$id] > 10){
 echo ''.WORLD_WONDER_NOTCHANGE_NAME.'.
-			<center><br />'.WORLD_WONDER_NAME.': <input class="text" name="wwname" id="wwname" disabled="disabled" value="'.$wwname.'" maxlength="20"></center><p class="btn"><input type="image" value="" tabindex="9" name="s1" disabled="disabled" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></p>';
+			<center><br />'.WORLD_WONDER_NAME.': <input class="text" name="wwname" id="wwname" disabled="disabled" value="'.$wwname.'" maxlength="20"></center><p class="btn"><button value="" tabindex="9" name="s1" disabled="disabled" id="btn_ok" class="trav_buttons" alt="OK" /> Ok </button></p>';
 }?>
     </form>
 	<?php
diff --git a/Templates/Message/archive.tpl b/Templates/Message/archive.tpl
index 3f9406b1..4c9d533d 100644
--- a/Templates/Message/archive.tpl
+++ b/Templates/Message/archive.tpl
@@ -13,7 +13,7 @@ include("menu.tpl");
 		<input class="check" type="checkbox" id="s10" name="s10" onclick="Allmsg(this.form);" />
 	</th>
 	<th colspan="2" class="buttons">
-		<input name="delmsg" value="delete" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" alt="delete" /> <input name="start" type="image" value="Back" alt="Back" id="btn_back" class="dynamic_img" src="img/x.gif" /></th>
+		<button name="delmsg" value="delete" id="btn_delete" class="trav_buttons" alt="delete" /> Delete </button <button name="start" value="Back" alt="Back" id="btn_back" class="trav_buttons" /> Back </button</th>
         <th class="navi"><?php
     if(!isset($_GET['s']) && count($message->archived1) < 10) {
         echo "&laquo;&raquo;";
diff --git a/Templates/Message/inbox.tpl b/Templates/Message/inbox.tpl
index 22aebc98..185a3ce1 100644
--- a/Templates/Message/inbox.tpl
+++ b/Templates/Message/inbox.tpl
@@ -20,8 +20,8 @@
 		<?php } ?>
 	    </th>
 	    <th colspan="2" class="buttons">
-		<input name="delmsg" value="delete" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" alt="delete" />
-		<?php if($session->plus) { echo "<input name=\"archive\" value=\"Archive\" type=\"image\" id=\"btn_archiv\" class=\"dynamic_img\" src=\"img/x.gif\" alt=\"Archive\" />"; } ?>
+		<button name="delmsg" value="delete" id="btn_delete" class="trav_buttons" alt="delete" /> Delete </button>
+		<?php if($session->plus) { echo "<button name=\"archive\" value=\"Archive\" id=\"btn_archiv\" class=\"trav_buttons\" alt=\"Archive\" /> Archive </button>"; } ?>
 		<input name="ft" value="m3" type="hidden" />
 	    </th><th class="navi"><?php
 		if(!isset($_GET['s']) && count($message->inbox1) < 10) {
diff --git a/Templates/Message/read.tpl b/Templates/Message/read.tpl
index f23daedd..a4c4fdfe 100644
--- a/Templates/Message/read.tpl
+++ b/Templates/Message/read.tpl
@@ -43,7 +43,7 @@ include("menu.tpl");
     <input type="hidden" name="ft" value="m1" />
 	<input type="hidden" name="t" value="1" />
 	<p class="btn">
-		<input type="image" value="" name="s1" id="btn_reply" class="dynamic_img" src="img/x.gif" alt="answer" />
+		<button value="" name="s1" id="btn_reply" class="trav_buttons" alt="answer" /> Answer </button>
 	</p>
 </div>
 <div id="read_foot" class="msg_foot"></div>
diff --git a/Templates/Profile/graphic.tpl b/Templates/Profile/graphic.tpl
index 64b6e041..b5c5367c 100644
--- a/Templates/Profile/graphic.tpl
+++ b/Templates/Profile/graphic.tpl
@@ -18,7 +18,7 @@ $database->updateUserField($session->uid,gpack,$_POST["custom_url"],1);
 <li>Your browser does not support Graphic Packs hosted on your computer and needs them to be online, with a path starting with '<b>http://</b>'.</li>
 </ul>			<form action="spieler.php" method="post">
 				<input type="hidden" name="s" value="4">
-				<div class="btn"><input type="image" alt="OK" src="img/x.gif" value="ok" class="dynamic_img" id="btn_ok"></div>
+				<div class="btn"><button alt="OK" value="ok" class="trav_buttons" id="btn_ok"> Ok </button></div>
 			</form>
 		</div>
 
@@ -32,7 +32,7 @@ $database->updateUserField($session->uid,gpack,$_POST["custom_url"],1);
 			<form action="spieler.php" method="post">
 				<input type="hidden" name="s" value="4">
 				<input type="hidden" name="custom_url" value="<?php echo $_GET["custom_url"]; ?>">
-				<div class="btn"><input type="image" alt="save" src="img/x.gif" value="save" class="dynamic_img" id="btn_save" name="gp_activate_button"></div>
+				<div class="btn"><button alt="save" value="save" class="trav_buttons" id="btn_save" name="gp_activate_button"> Save </button></div>
 			</form>
 		</div>
 	</div>
@@ -71,7 +71,7 @@ $database->updateUserField($session->uid,gpack,$_POST["custom_url"],1);
             </tr>
         </tbody>
     </table>
-    <p class="btn"><input type="image" alt="OK" src="img/x.gif" name="gp_selection_button" value="ok" class="dynamic_img" id="btn_ok" /></p>
+    <p class="btn"><button alt="OK" name="gp_selection_button" value="ok" class="trav_buttons" id="btn_ok" /> Ok </button></p>
     </form>
 
 
@@ -104,4 +104,4 @@ $database->updateUserField($session->uid,gpack,$_POST["custom_url"],1);
 	header("Location: ".$_SERVER['PHP_SELF']."?uid=".$session->uid);
 	exit;
 	}
-    ?>
\ No newline at end of file
+    ?>
diff --git a/Templates/Ranking/ranksearch.tpl b/Templates/Ranking/ranksearch.tpl
index 8db96a8c..e7d421bb 100644
--- a/Templates/Ranking/ranksearch.tpl
+++ b/Templates/Ranking/ranksearch.tpl
@@ -10,7 +10,7 @@ if(!isset($_GET['id'])){ $_GET['id']='1'; }
 								<span class="or">or</span>
 								<span>name<input type="text" class="text name" maxlength="30" name="name" value="<?php if(!is_numeric($search)) {echo $search; } ?>" /></span>
                                 <input type="hidden" name="ft" value="r<?php echo isset($_GET['id'])? $_GET['id'] : 1; ?>" />
-								<input type="image" value="submit" name="submit" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" />
+								<button value="submit" name="submit" id="btn_ok" class="trav_buttons" alt="OK" /> Ok </button>
 							</div>
 							</form>
 							<div class="navi">
@@ -27,4 +27,4 @@ else if($start == 1 && $start+20 < count($ranking)) {
     else {
     	echo "&laquo; back | forward &raquo;";
     }
-    ?>
\ No newline at end of file
+    ?>
diff --git a/Templates/activate/delete.tpl b/Templates/activate/delete.tpl
index 8df201e5..5ea435f9 100644
--- a/Templates/activate/delete.tpl
+++ b/Templates/activate/delete.tpl
@@ -28,7 +28,7 @@ Then the activation code will be send again</div>
 			</tr>
 		</table>
 		<p class="btn">
-			<input type="image" src="img/x.gif" class="dynamic_img" id="btn_delete" alt="delete" value="delete" name="delreports" />
+			<button class="trav_buttons" id="btn_delete" alt="delete" value="delete" name="delreports" /> Delete </button>
 		</p>
 		</form>
-        </div>
\ No newline at end of file
+        </div>