diff --git a/Templates/Message/notes.tpl b/Templates/Message/notes.tpl
index 0da607e1..7267034c 100644
--- a/Templates/Message/notes.tpl
+++ b/Templates/Message/notes.tpl
@@ -7,7 +7,7 @@ include("menu.tpl");
 <div id="block">
 	<input type="hidden" name="ft" value="m6" />
 	<textarea name="notizen" id="notice"><?php echo $message->note; ?></textarea>
-	<p class="btn"><input id="btn_save" type="image" value="" name="s1" src="img/x.gif" class="dynamic_img" alt"save" /><br />
+	<p class="btn"><button id="btn_save" value="" name="s1" class="trav_buttons" alt"save" /> Save </button><br />
 	&nbsp;</p>
 </div>
 </form>
diff --git a/img/admin/admin.css b/img/admin/admin.css
index 40efc02a..cf5572e1 100644
--- a/img/admin/admin.css
+++ b/img/admin/admin.css
@@ -573,34 +573,45 @@ input#btn_search {width:97px; background-image: url(b/search.gif);}
 
 /* Start tooltips for the admin panel settings */
 .tooltip {
-    border-bottom: 1px dotted #000000;
-    color: #000000;
-    outline: none;
-    cursor: help;
-    text-decoration: none;
     position: relative;
+    display: inline-block;
+    border-bottom: 1px dotted black;
+    cursor: help;
 }
 
-.tooltip span {
-    margin-left: -999em;
-    position: absolute;
-}
-
-.tooltip:hover span {
-    font-family: Calibri, Tahoma, Geneva, sans-serif;
-    font-size: 1.2em;
-    position: absolute;
-    left: -2em;
-    bottom: 1em;
-    z-index: 99;
-    margin-left: 0;
+.tooltip .classic {
+    visibility: hidden;
     width: 250px;
+    background-color: black;
+    color: #fff;
+    text-align: center;
+    font-style: normal;
+    border-radius: 5px;
+    padding: 10px;
+    position: absolute;
+    z-index: 99;
+    bottom: 120%;
+    left: 50%;
+    margin-left: -40px;
+    
+    /* Fade in tooltip - takes 1 second to go from 0% to 100% opac: */
+    opacity: 0;
+    transition: opacity 1s;
 }
 
-.classic {
-    padding: 0.8em 1em;
-    background: #FFFFAA;
-    border: 1px solid #FFAD33;
-    border-radius: 5px;
+.tooltip .classic::after {
+    content: "";
+    position: absolute;
+    top: 100%;
+    left: 40px;
+    margin-left: -5px;
+    border-width: 5px;
+    border-style: solid;
+    border-color: black transparent transparent transparent;
+}
+
+.tooltip:hover .classic {
+    visibility: visible;
+    opacity: 1;
 }
 /* End of tooltips */
\ No newline at end of file
diff --git a/password.php b/password.php
index d6430712..fa6f7ba9 100644
--- a/password.php
+++ b/password.php
@@ -106,7 +106,7 @@ if(!isset($_REQUEST['npw'])){
 			</p>
 
 			<p>
-				<input type="image" value="ok" name="s1" src="img/x.gif" class="dynamic_img" id="btn_ok" alt="OK" />
+				<button value="ok" name="s1" class="trav_buttons" id="btn_ok" alt="OK" /> ok </button>
 			</p>
 		</form>
 <?php
@@ -125,4 +125,4 @@ if(!isset($_REQUEST['npw'])){
 <?php include("Templates/footer.tpl"); ?>
 <div id="ce"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/warsim.php b/warsim.php
index dff6163a..9d2a586e 100644
--- a/warsim.php
+++ b/warsim.php
@@ -162,7 +162,7 @@ if(count($target) > 0) {
 </tr></tbody>
 </table>
 
-<p class="btn"><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></p>
+<p class="btn"><button value="ok" name="s1" id="btn_ok" class="trav_buttons" alt="OK" /> OK </button></p>
 </form>
 </div>
 <br /><br /><br /><br /><div id="side_info">