diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/header.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/header.less
index 84668b6..5f102be 100644
--- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/header.less
+++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/header.less
@@ -73,29 +73,37 @@ a {
 }
 .short-menu-right {
   display: table-cell;
-  vertical-align: top;
   width: 50%;
   color: #000000;
 }
-.search-icon-header {
-  display: inline-block;
+
+.short-menu-left-lang {
+  background-color: transparent;
+  & a {
+    color: #000;
+  }
+}
+
+.short-menu-left-lang:hover {
+  background-color: #000;
+  & a {
+    color: #fff;
+    text-decoration: none;
+  }
 }
 
 .search-icon-header {
+  display: inline-block;
   background-color: transparent;
-  & a svg g {
-    stroke: #e4154b;
-  }
 }
 
 .search-icon-header:hover {
   background-color: #000;
+  & i {
+    color: #fff;
+  }
   & a {
-    & svg {
-      & g {
-        stroke: #fff !important;
-      }
-    }
+    text-decoration: none;
   }
 }
 
@@ -104,6 +112,7 @@ a {
   margin: 12px 9px 6px 0;
   color: #000000;
 }
+
 .short-menu-right-h {
   cursor: pointer;
   display: inline-block;
diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less
index 8d7efb1..f7826a5 100644
--- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less
+++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less
@@ -61,6 +61,4 @@ forcing the font changes
 */
 body {
   font-family: "Source Sans Pro";
-  font-weight: 300;
-  font-size: 16px;
 }
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
index 45d008a..a8d79d2 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
@@ -81,47 +81,25 @@
         <div class="short-menu" id="all-menu-top-table">
 
           <div class="short-menu-left">
-
-
             <div id="all-menu-top-left-item">
-              <div class="short-menu-left-lang">
-                <!-- TODO language change not necessary because we have no english version -->
-
-              </div>
-
               <div class="short-menu-left-search">
                 {%- if config.I18N_LANGUAGES %}
-                <span style="margin-right:10px; font-size:18px;">
+                <span class="short-menu-left-lang" style="margin-right:10px; font-size:18px;">
                   {%- for l in current_i18n.get_locales() %}
                   {%- if current_i18n.language != l.language %}
                   <a
                     href="{{ url_for('invenio_i18n.set_lang', lang_code=l.language) }}">{{ l.get_display_name() [0:2]}}</a>
-                  {% else %}
-                  <strong>{{ l.get_display_name() [0:2] }}</strong>
                   {%- endif %}
                   {%- endfor %}
                 </span>
                 {%- endif %}
-                <div class="search-icon-header">
+                <span class="search-icon-header">
                   <a href="/search">
-                    <svg version="1.1" xmlns="http://www.w3.org/2000/svg"
-                      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
-                      xmlns:cc="http://creativecommons.org/ns#" viewBox="0 0 26.01515 26.01515" width="26.015"
-                      height="26.015" class="all-menu-top-icon">
-                      <g transform="translate(1,1)" stroke-miterlimit="10"
-                        style="stroke-linejoin:round;stroke:#000;stroke-miterlimit:10;stroke-width:2;fill:none">
-                        <circle style="stroke-miterlimit:10;stroke-width:2" r="8" cx="8.5" cy="8.5"></circle>
-                        <path d="m14.156 14.156 9.344 9.344"
-                          style="stroke-width:2;stroke-miterlimit:10;stroke-linecap:round"></path>
-                      </g>
-                    </svg>
+                    <i class="search icon large fitted"></i>
                   </a>
-                </div>
+                </span>
               </div>
-
             </div>
-
-
           </div>
 
           <div class="short-menu-right">