diff --git a/doc/ChangeLog b/doc/ChangeLog
index 097795879..26b3fb94d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-22 chrisaga
+
+	* bug 177 fixed: icon tools wrong position in Safari and Konqueror
+	Needed a little trick to fix it. Put the trick in a fix-khtml.css
+	Loading in header.tpl and protected from IE, Geko and Opera,
+	just in case (couldn't foud a safari css-only filter wich validate)
+	
+	* bug fixed: issue in the FORM in remote_site.tpl which prevented
+	HTML validation (still something to do with the TABLE).
+
 2005-10-22 Pierrick LE GALL
 
 	* bug fixed: link on a single day in
diff --git a/template/yoga/admin/remote_site.tpl b/template/yoga/admin/remote_site.tpl
index 1da98cab7..13d2e2117 100644
--- a/template/yoga/admin/remote_site.tpl
+++ b/template/yoga/admin/remote_site.tpl
@@ -59,9 +59,13 @@
 <!-- END local -->
 
 <form action="{F_ACTION}" method="post">
-  {L_REMOTE_SITE_CREATE} 
-  <input type="text" name="galleries_url" value="{F_GALLERIES_URL}" />
-  <input type="submit" name="submit" value="{L_SUBMIT}" />
+  <p>
+    <label for="galleries_url" >{L_REMOTE_SITE_CREATE}</label> 
+    <input type="text" name="galleries_url" id="galleries_url" value="{F_GALLERIES_URL}" />
+  </p>
+  <p>
+    <input type="submit" name="submit" value="{L_SUBMIT}" />
+  </p>
 </form>
 
 <table>
diff --git a/template/yoga/content.css b/template/yoga/content.css
index 769b6f9be..46ee26a07 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -120,9 +120,11 @@ BODY#theNotificationPage #content
 /* actions */
 ul.categoryActions {
   text-align: center;
-  margin: 1px 1px 0 0;
+  margin: 0 0 0 0;
+  width: auto;
   padding: 0;
   text-indent: 0;
+  list-style: none;
 }
 
 #content div.titrePage ul.categoryActions {
diff --git a/template/yoga/default-colors.css b/template/yoga/default-colors.css
index 0e52b2eba..3edf2d7cc 100644
--- a/template/yoga/default-colors.css
+++ b/template/yoga/default-colors.css
@@ -67,10 +67,6 @@ A.navThumb, A.navThumb:hover {
     background:#eeeeee;
 }
 
-#content H2 {
-    text-align: left;
-}
-
 #content H3 {
     text-align: center;
 }
diff --git a/template/yoga/fix-khtml.css b/template/yoga/fix-khtml.css
new file mode 100644
index 000000000..cbf276b4a
--- /dev/null
+++ b/template/yoga/fix-khtml.css
@@ -0,0 +1,14 @@
+/* $Id:*/
+/* Issue in Safari/Konqueror only                                                 */
+/* If H2 has a 0 margin-top categoryActions doesn't float right but overwrites H2 */
+#content>DIV.titrePage>H2 {
+    margin: 1px 0 0 0;	/* add an arbitrary margin-top */
+}
+
+#content>div.titrePage {
+    position: relative;
+    top: -1px;		/* move the container up by the same amount */
+    margin-bottom: 5px; 
+}
+/* end Safari/Konqueror */
+
diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index c56aeb480..d58d6c893 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -6,6 +6,9 @@
 <!-- BIG FIX ME BELOW (paths) -->
 <link rel="stylesheet" type="text/css" href="template/yoga/default-layout.css">
 <link rel="stylesheet" type="text/css" href="template/yoga/default-colors.css">
+<!-- the next css is used to fix khtml (Konqueror/Safari) issue
+the "extra-keyword" and "text/nonsense" prevent other browsers to load it -->
+<link rel="extra-keyword stylesheet" type="text/nonsense" href="template/yoga/fix-khtml.css">
 <link rel="stylesheet" type="text/css" media="print" href="template/yoga/print.css">
 <!-- AN OTHER FIX ME -->
 <style type="text/css">