diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index d4306c936..40391a923 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -90,7 +90,11 @@
         <p>
          <input type="submit" name="login" value="{lang:submit}">
         </p>
-    
+    <ul class="actions">
+      <li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}"><img src="{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
+      <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
+    </ul>
+
       </fieldset>    
     </form>
     <!-- END quickconnect -->
diff --git a/template/yoga/content.css b/template/yoga/content.css
index 26182b09b..20455a31a 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -155,10 +155,6 @@ ul.categoryActions {
   margin: 0.2em;
 }
 
-#content DIV.comment  UL.actions  LI {
-  display: inline;
-}
-
 #content DIV.comment BLOCKQUOTE {
   margin-top: 1em;
   margin-right: 0.5em; 
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index bbfd46006..447cc957f 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -183,22 +183,6 @@ FORM.properties LABEL {
   padding: 0 0.5em 0 0;
 }
 
-FORM#quickconnect { 
-  margin: 0;
-}
-
-FORM#quickconnect FIELDSET {
-  margin: 5px;
-}
-
-FORM#quickconnect P {
-  text-align: center;
-}
-
-FORM#quickconnect P INPUT {
-  display: inline;
-}
-
 FORM.properties LABEL.mandatory {
   font-weight: bold;
 }
@@ -260,3 +244,16 @@ FORM#addComment FIELDSET LABEL {
 FORM#addComment FIELDSET INPUT[type="hidden"] {
   display: none;
 }
+
+/* button tools */
+UL.actions {
+  text-indent: 0;
+  list-style: none;
+}
+UL.actions  LI {
+  display: inline;
+}
+UL.actions  A {
+  border: none;
+}
+
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index 3b136fced..e5baa9dc5 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -59,3 +59,23 @@
 #menubar INPUT {
     text-indent: 2px;
 }
+
+/* quickconnect form */
+FORM#quickconnect { 
+  margin: 0;
+}
+
+FORM#quickconnect FIELDSET {
+  margin: 5px;
+}
+
+FORM#quickconnect P {
+  float: left;
+  margin: 0;
+}
+
+FORM#quickconnect UL.actions {
+  display: inline;
+  margin: 0,5em 0 0 0;
+  float: right;
+}