Index: styles/vulfgar/template/overall_header.html
@@ -104,9 +104,7 @@
 			<div class="inner"><span class="corners-top"><span></span></span>
 
 			<ul class="linklist navlinks">
-				<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>
 
-<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
 
 				<li class="rightside"><!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
 			<span class="search-box">
@@ -125,24 +123,29 @@
 				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
 				<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF -->
-			</ul>
 
-			<!-- IF S_DISPLAY_SEARCH or (not S_IS_BOT and S_USER_LOGGED_IN) -->
-			<ul class="linklist leftside">
-				<li class="icon-ucp">
-          <!-- IF S_USER_LOGGED_IN -->
-					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="u">{L_PROFILE}</a>
-						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> - 
-					<!-- ENDIF -->
+				<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>
+<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
+          <!-- IF S_DISPLAY_SEARCH -->
+				<li class="searchlinks">
           {L_SEARCH_SHOW}
           <!-- IF S_USER_LOGGED_IN -->
           <a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a> &bull;
 					<a href="http://ubuntu-se.org/phpBB3/search.php?fid[]=17&fid[]=19&fid[]=35&fid[]=38&fid[]=54&fid[]=55&fid[]=61&fid[]=62&fid[]=67&fid[]=70&fid[]=75&fid[]=83&fid[]=96&fid[]=99&fid[]=103&fid[]=113&fid[]=138&fid[]=139&fid[]=140&fid[]=141&fid[]=142&fid[]=143&fid[]=144&fid[]=145&fid[]=146&fid[]=147&fid[]=148&fid[]=149&fid[]=150&fid[]=153&fid[]=155&fid[]=156&fid[]=157&fid[]=158&fid[]=159&fid[]=160&fid[]=161&fid[]=162&fid[]=163&fid[]=164&fid[]=165&fid[]=167&fid[]=168&fid[]=169&fid[]=171&fid[]=174&fid[]=177&fid[]=179&fid[]=180&fid[]=183&fid[]=184&fid[]=185&fid[]=197&fid[]=199&fid[]=200&fid[]=204&fid[]=206&fid[]=207&fid[]=208&fid[]=212&fid[]=213&fid[]=214&fid[]=215&fid[]=216&fid[]=217&fid[]=218&fid[]=219&fid[]=220&fid[]=222&fid[]=223&fid[]=224&fid[]=225&fid[]=229&fid[]=231&fid[]=233&fid[]=234&search_id=newposts">{L_SEARCH_NEW}</a> &bull;
           <!-- ENDIF -->
-          <!-- IF S_DISPLAY_SEARCH -->
           <a href="http://ubuntu-se.org/phpBB3/search.php?fid[]=17&fid[]=19&fid[]=35&fid[]=54&fid[]=55&fid[]=61&fid[]=62&fid[]=67&fid[]=70&fid[]=75&fid[]=83&fid[]=96&fid[]=99&fid[]=103&fid[]=113&fid[]=149&fid[]=171&fid[]=174&fid[]=179&fid[]=180&fid[]=200&fid[]=204&fid[]=206&fid[]=207&fid[]=208&fid[]=213&fid[]=214&fid[]=215&fid[]=216&fid[]=217&fid[]=218&fid[]=219&fid[]=220&fid[]=222&fid[]=223&fid[]=224&fid[]=225&fid[]=229&fid[]=233&fid[]=234&st=90&search_id=unanswered">{L_SEARCH_UNANSWERED}</a>
+				</li>
           <!-- ENDIF -->
-					<!-- IF U_RESTORE_PERMISSIONS --> &bull;
+			</ul>
+
+			<!-- IF S_DISPLAY_SEARCH or (not S_IS_BOT and S_USER_LOGGED_IN) -->
+			<ul class="linklist leftside">
+				<li class="icon-ucp">
+          <!-- IF S_USER_LOGGED_IN -->
+					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="u">{L_PROFILE}</a>
+						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF -->
+					<!-- ENDIF -->
+					<!-- IF U_RESTORE_PERMISSIONS --> -
 					<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
 					<!-- ENDIF -->
 				</li>
Index: styles/vulfgar/theme/common.css
@@ -323,6 +323,15 @@
 	text-align: right;
 }
 
+ul.linklist li.icon-home {
+	float: none;
+}
+
+ul.linklist li.searchlinks {
+	font-weight: normal;
+	margin-top: 0.2em;
+}
+
 ul.navlinks {
 	padding-bottom: 1px;
 	margin-bottom: 1px;