Index: /main/waeup.kofa/branches/uli-diazo-themed/layout/rules.xml
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/layout/rules.xml	(revision 11020)
+++ /main/waeup.kofa/branches/uli-diazo-themed/layout/rules.xml	(revision 11021)
@@ -96,6 +96,6 @@
     <!-- the language selector
 
-      quite tricky. We insert a <li> element at end of
-      ul.kofa-navbar-left. This <li> has a header element
+      quite tricky. We insert a <li> element at beginning of
+      ul.kofa-navbar-right. This <li> has a header element
       (the 'Language' button) and the a number of <li> elements
       representing the supported languages.
@@ -110,8 +110,10 @@
       creating new nodes (<xsl:element>) with attributes copied over.
     -->
-    <after css:theme-children="ul.kofa-navbar-left">
+    <before css:theme-children="ul.kofa-navbar-right">
       <li class="dropdown kofa-langselect">
         <a href="#" class="dropdown-toggle"
-           data-toggle="dropdown">Language <b class="caret"></b></a>
+           data-toggle="dropdown">
+           <img src="/static/static/img/earth.png" />
+           <b class="caret"></b></a>
         <ul class="dropdown-menu">
           <xsl:for-each css:select=" .language a">
@@ -127,5 +129,5 @@
         </ul>
       </li>
-    </after>
+    </before>
 
 
Index: /main/waeup.kofa/branches/uli-diazo-themed/layout/static/css/base.css
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/layout/static/css/base.css	(revision 11020)
+++ /main/waeup.kofa/branches/uli-diazo-themed/layout/static/css/base.css	(revision 11021)
@@ -21,4 +21,9 @@
 .navbar-nav.navbar-right:last-child {
   margin-right: -5px;
+}
+
+.kofa-langselect img {
+    margin-top: -10px;
+    margin-bottom: -10px;
 }
 
Index: /main/waeup.kofa/branches/uli-diazo-themed/layout/theme.html
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/layout/theme.html	(revision 11020)
+++ /main/waeup.kofa/branches/uli-diazo-themed/layout/theme.html	(revision 11021)
@@ -51,7 +51,12 @@
           <li><a href="#contact">Students</a></li>
           <li><a href="#contact">Hostels</a></li>
+        </ul>
+
+        <ul class="nav navbar-nav navbar-right kofa-navbar-right">
           <li class="dropdown kofa-langselect">
             <a href="#" class="dropdown-toggle"
-               data-toggle="dropdown">Language <b class="caret"></b></a>
+               data-toggle="dropdown">
+               <img src="static/img/earth.png" />
+               <b class="caret"></b></a>
             <ul class="dropdown-menu">
               <li class="kofa-language"><a href="#">en</a></li>
@@ -63,7 +68,4 @@
             </ul>
           </li>
-        </ul>
-
-        <ul class="nav navbar-nav navbar-right kofa-navbar-right">
           <li class="nav"><a href="#">Contact</a></li>
           <li class="nav"><a href="#">Logout</a></li>
