diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index cf2a2580b..a84a904fa 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -376,11 +376,6 @@ IMG {
 	border: none;
 }
 
-HR.separation {
-	visibility: hidden;
-	clear: both;
-}
-
 /** General defaults **/
 INPUT, SELECT {
 	margin: 0;
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 60b3a9a86..e414c1c0c 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -465,7 +465,7 @@ function get_tags_content_title()
       .l10n('remove this tag from the list')
       .'"><img src="'
         .get_root_url().get_themeconf('icon_dir').'/remove_s.png'
-      .'" alt="x" style="vertical-align:bottom;" class="button">'
+      .'" alt="x" style="vertical-align:bottom;">'
       .'</a>';
   }
   return $title;
diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl
index d35b2e18f..852153897 100644
--- a/themes/default/template/comment_list.tpl
+++ b/themes/default/template/comment_list.tpl
@@ -40,7 +40,7 @@
 				<label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
 				<input type="hidden" name="key" value="{$comment.KEY}">
 				<input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
-				<input class="submit" type="submit" value="{'Submit'|@translate}">
+				<input type="submit" value="{'Submit'|@translate}">
 			</fieldset>
 		</form>
 		{else}
diff --git a/themes/default/template/comments.tpl b/themes/default/template/comments.tpl
index ab1455590..28a0a5074 100644
--- a/themes/default/template/comments.tpl
+++ b/themes/default/template/comments.tpl
@@ -63,7 +63,7 @@
 
   </fieldset>
 
-  <p><input class="submit" type="submit" value="{'Filter and display'|@translate}"></p>
+  <p><input type="submit" value="{'Filter and display'|@translate}"></p>
 
 </form>
 
diff --git a/themes/default/template/identification.tpl b/themes/default/template/identification.tpl
index 5ccfb7133..3deff9c54 100644
--- a/themes/default/template/identification.tpl
+++ b/themes/default/template/identification.tpl
@@ -52,7 +52,7 @@
 
   <p>
     <input type="hidden" name="redirect" value="{$U_REDIRECT|@urlencode}">
-    <input class="submit" tabindex="4" type="submit" name="login" value="{'Submit'|@translate}">
+    <input tabindex="4" type="submit" name="login" value="{'Submit'|@translate}">
   </p>
 
   <p>
diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl
index eef2c64e2..493e1000f 100644
--- a/themes/default/template/password.tpl
+++ b/themes/default/template/password.tpl
@@ -47,7 +47,7 @@
     </label>
   </p>
 
-  <p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Change my password'|@translate}"></p>
+  <p class="bottomButtons"><input type="submit" name="submit" value="{'Change my password'|@translate}"></p>
   {elseif $action eq 'reset'}
 
   <div class="message">{'Hello'|@translate} <em>{$username}</em>. {'Enter your new password below.'|@translate}</div>
@@ -68,7 +68,7 @@
     </label>
   </p>
 
-  <p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Submit'|@translate}"></p>
+  <p class="bottomButtons"><input type="submit" name="submit" value="{'Submit'|@translate}"></p>
   {/if}
 
 </form>
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index c4dddac98..d98160a73 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -290,8 +290,6 @@ y.callService(
 {/if}
 </div>
 
-<hr class="separation">
-
 {if isset($COMMENT_COUNT)}
 <div id="comments">
 	{if $COMMENT_COUNT > 0}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index f1e0df44b..7c2d75d97 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -356,8 +356,8 @@ TD.calDayHead {
 }
 
 #imageInfos {
-	position:relative;
-	min-height:110px;
+	position: relative;
+	min-height: 120px;
 }
 
 #linkPrev {
@@ -415,9 +415,8 @@ TD.calDayHead {
 	margin-left:20em;
 }
 .pictureContent #imageToolBar, 
-.pictureContent #theImage, 
-.pictureContent hr.separation { 
-	clear:none;
+.pictureContent #theImage { 
+	clear: none;
 }
 
 
@@ -466,11 +465,6 @@ IMG {
 	border: 0;
 }
 
-HR.separation {
-	visibility: hidden;
-	clear: both;
-}
-
 #copyright {
 	clear: both;
 	font-size: 83%;
@@ -790,7 +784,6 @@ LEGEND {
 .message {
   background-color: lightyellow;
   color:#333;
-  /* margin: 0.5em 1em 0.5em 1em; */
   margin-bottom:1em;
   padding: 12px;
   -moz-border-radius: 3px;