diff --git a/htroot/Messages_p.html b/htroot/Messages_p.html
index 47c5a035b..f707a52bd 100644
--- a/htroot/Messages_p.html
+++ b/htroot/Messages_p.html
@@ -9,7 +9,7 @@
     #%env/templates/header.template%#
     <h2>Messages</h2>
     #(peersKnown)#::
-    <form enctype="multipart/form-data" action="MessageSend_p.html" method="get">
+    <form action="MessageSend_p.html" method="get">
       <fieldset><legend>Compose Message</legend>
       <dl>
         <dt><label for="peers">Send message to peer</label>:</dt>
diff --git a/htroot/env/base.css b/htroot/env/base.css
index f0457e9c1..fdc25ab5a 100644
--- a/htroot/env/base.css
+++ b/htroot/env/base.css
@@ -280,6 +280,7 @@ div.yacysearch {
 
 div.urlactions {
   float:left;
+  clear:left;
 }
 
 /*----------
@@ -424,12 +425,9 @@ a:hover.MenuItemLink {
 
 div.urlactions a {
   display:block;
-}
-
-div.urlactions > a {
   width: 11px;
   height: 11px;
-  margin: 1px 1px 1px 7px;
+  margin: 1px 4px;
 }
 
 a.bookmarklink:hover, div.searchresults:hover a.bookmarklink, div.searchresults.hover a.bookmarklink {
@@ -590,6 +588,10 @@ form.search.small fieldset {
     clear:left;
     margin-left:100px;
 }
+
+form.search.small fieldset * {
+  margin-left:0;
+}
 /*----------
 <img>
 */
@@ -700,10 +702,8 @@ ul#menu a.MenuItemLink {
 }
 
 img.favicon{
-	margin-right: 3px;
-	width: 16px;
-	height: 16px;
-}
-p.iconindented{
-	padding-left: 19px;
+  margin: 4px 1px;
+  width: 16px;
+  height: 16px;
+  float: left;
 }
diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index 9a1aeacd0..0bac60667 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -137,7 +137,8 @@ document.getElementById("Enter").value = "search again - catch up more links";
 	<div id="hidden_results"></div>
 	#{results}#
 	<!-- link begin -->
-	     <div class="searchresults" name="searchresults">
+	     <div class="searchresults">
+	       <img src="ViewImage.png?width=16&height=16&code=#[faviconCode]#" id="f#[urlhash]#" class="favicon" width="16" height="16" alt="favicon of #[url]#" />
 	       #(authorized)#::
 	       <div class="urlactions">
 	         <a href="/Bookmarks.html?edit=#[urlhash]#" class="bookmarklink" title="bookmark"><img src="/env/grafics/empty.gif" title="bookmark" alt="bookmark" class="bookmarkIcon" /></a>
@@ -150,10 +151,10 @@ document.getElementById("Enter").value = "search again - catch up more links";
 	         #(/recommend)#
 	       </div>
 	       #(/authorized)#
-	       <h4 class="linktitle"><img src="ViewImage.png?width=16&height=16&code=#[faviconCode]#" id="f#[urlhash]#" class="favicon" width="16" height="16" /><a href="#[url]#" target="_parent">#[description]#</a></h4>
-	       <p class="snippet iconindented"><span class="#(snippet)#snippetLoading::snippetLoaded#(/snippet)#" id="h#[urlhash]#">#(snippet)#loading snippet ...::#[text]##(/snippet)#</span></p>
-	       <p class="url iconindented"><a href="#[url]#" id="url#[urlhash]#" target="_parent">#[urlname]#</a></p>
-	       <p class="urlinfo iconindented">#[date]# | YBR-#[ybr]# | <a href="ViewFile.html?urlHash=#[urlhash]#&amp;words=#[words]#">Info</a> | <a href="yacysearch.html?cat=image&amp;url=#[url]#&amp;search=#[former]#">Pictures</a></p>
+	       <h4 class="linktitle"><a href="#[url]#" target="_parent">#[description]#</a></h4>
+	       <p class="snippet"><span class="#(snippet)#snippetLoading::snippetLoaded#(/snippet)#" id="h#[urlhash]#">#(snippet)#loading snippet ...::#[text]##(/snippet)#</span></p>
+	       <p class="url"><a href="#[url]#" id="url#[urlhash]#" target="_parent">#[urlname]#</a></p>
+	       <p class="urlinfo">#[date]# | YBR-#[ybr]# | <a href="ViewFile.html?urlHash=#[urlhash]#&amp;words=#[words]#">Info</a> | <a href="yacysearch.html?cat=image&amp;url=#[url]#&amp;search=#[former]#">Pictures</a></p>
 	     </div>
 	<!-- link end -->
 	#{/results}#
@@ -245,7 +246,7 @@ document.getElementById("Enter").value = "search again - catch up more links";
 	<div id="hidden_results"></div>
 	#{results}#
 	<!-- link begin -->
-	     <div class="searchresults" name="searchresults">
+	     <div class="searchresults">
 	     <!--#include virtual="yacysearchitem.html?item=#[item]#&eventID=#[eventID]#" -->
 	     </div>
 	<!-- link end -->