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 6be0bee..f39a2b3 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
@@ -6,232 +6,302 @@
  * under the terms of the MIT License; see LICENSE file for more details.
  */
 
- #int-menu-q-home-icon {
-    width: 18px;
-    height: 18px;
-    vertical-align: top;
-    fill: red;
+#int-menu-q-home-icon {
+  width: 18px;
+  height: 18px;
+  vertical-align: top;
+  fill: red;
+}
 
-  }
+/*****logo section******/
+.affiliation-spacer {
+  display: table-cell;
+  vertical-align: middle;
+  width: 100%;
+}
 
-  /*****logo section******/
-  .affiliation-spacer{
-    display: table-cell;
-    vertical-align: middle;
-    width: 100%;
-  }
-
-  .affiliation-logo {
-    display: table-cell;
-    padding: 0 50px 0 0;
-    vertical-align: middle;
-    white-space: nowrap;
-  }
-  .affiliation {
-    background-color: white;
-    display: table;
-    margin: 0 auto 80px;
-    max-width: 1060px;
-    width: 100%;
-    text-decoration: none;
-
-  }
-
-  .affiliation-text {
-    display: table-cell;
-    font-size: 17px;
-    padding: 0 0 0 50px;
-    vertical-align: middle;
-    white-space: nowrap;
-  }
-
-  .affiliation-logo-claim {
-    display: inline-block;
-    font-size: 12px;
-    letter-spacing: 2px;
-    line-height: 17px;
-    padding: 0 17px 0 0;
-    text-align: right;
-    vertical-align: top;
-  }
-
-  a {
-    color: inherit;
-    text-decoration: none;
-    transition: background-color 0.15s ease 0s, color 0.15s ease 0s;
-  }
-  /*****END logo section******/
-
-
-
-  .short-menu {
-    display: table;
-    height: 49px;
-    width: 100%;
-  }
-  .short-menu-left {
-    border-right: 1px solid black;
-    display: table-cell;
-    text-align: right;
-    width: 50%;
-  }
-  .short-menu-right {
-    display: table-cell;
-    vertical-align: top;
-    width: 50%;
-    color:#000000;
-  }
-  .short-menu-left-search {
-    display: inline-block;
-    margin: 12px 9px 6px 0;
-    color:#000000;
-  }
-  .short-menu-right-h {
-    cursor: pointer;
-    display: inline-block;
-    margin: 12px 0 6px 9px;
-    padding: 5px;
-  }
-
-  .short-menu-right-main-menu {
-    display: inline-block;
-    margin-right: 3px;
-    vertical-align: top;
-    width: 21px;
-  }
-  svg:not(:root) {
-    overflow: hidden;
-  }
-
-
-
-  /***********MAIN menu*************/
-  .header {
-    min-width: 0;
-    
-    position: relative;
-    width: 100%;
-    //height: 100%;
-  }
-
-  .main-menu-box {
-    box-sizing: border-box;
-    display: table;
-    margin: 0 auto;
-    max-width: 1060px;
-    padding: 9px 50px 8px;
-    text-align: left;
-    width: 100%;
-  }
-
-  .main-menu-entry {
-    display: table-cell;
-    text-align: center;
-  }
-  .main-menu-entry a {
-    box-decoration-break: clone;
-    padding: 5px 8px;
-  }
-
-  .main-menu-entry a:hover{
-    background-color: #000000;
-    color: #ffffff;
-    text-decoration: none;
-  }
-
-  .affiliation-text a:hover{
-    background-color: #000000;
-    color: #ffffff;
-    text-decoration : none;
-  }
-
-  .affiliation-logo :hover{
+.affiliation-logo {
+  display: table-cell;
+  padding: 0 50px 0 0;
+  vertical-align: middle;
+  white-space: nowrap;
+}
+.affiliation {
+  background-color: white;
+  display: table;
+  margin: 0 auto 80px;
+  max-width: 1060px;
+  width: 100%;
   text-decoration: none;
-  }
+}
 
-  .short-menu-right :hover{
-    background-color: #000000;
-    color: #ffffff;
-  }
+.affiliation-text {
+  display: table-cell;
+  font-size: 17px;
+  padding: 0 0 0 50px;
+  vertical-align: middle;
+  white-space: nowrap;
+}
 
-  .main-menu {
-    border-bottom: 1px solid #000;
-    box-sizing: border-box;
-    height: 39px;
-    margin-top: -1px;
-    overflow: hidden;
-    transition: height 0.3s linear 0s;
-  }
+.affiliation-logo-claim {
+  display: inline-block;
+  font-size: 12px;
+  letter-spacing: 2px;
+  line-height: 17px;
+  padding: 0 17px 0 0;
+  text-align: right;
+  vertical-align: top;
+}
 
-  @media (max-width: 767.9px){
+a {
+  color: inherit;
+  text-decoration: none;
+  transition: background-color 0.15s ease 0s, color 0.15s ease 0s;
+}
+/*****END logo section******/
+
+.short-menu {
+  display: table;
+  height: 49px;
+  width: 100%;
+}
+
+.short-menu-left {
+  border-right: 1px solid black;
+  display: table-cell;
+  text-align: right;
+  width: 50%;
+}
+
+.short-menu-right {
+  display: table-cell;
+  width: 50%;
+  color: #000000;
+  & div {
+    & svg {
+      & g {
+        stroke: #000;
+        stroke-linecap: round;
+        stroke-width: 2;
+        fill: none;
+      }
+    }
+  }
+}
+
+.short-menu-right :hover {
+  background-color: #000000;
+  color: #ffffff;
+  & svg {
+    & g {
+      stroke: #fff;
+    }
+  }
+}
+
+.short-menu-left-lang {
+  display: inline-block;
+  margin-right: 10px;
+  font-size: 17px !important;
+  font-weight: 300;
+  & a {
+    padding: 5px;
+    background-color: transparent;
+    color: #000;
+    text-decoration: none;
+  }
+}
+
+.short-menu-left-lang:hover {
+  & a {
+    background-color: #000;
+    color: #fff;
+    text-decoration: none;
+  }
+}
+
+.search-icon-header {
+  display: inline-block;
+  & a {
+    background-color: transparent;
+    padding: 5px;
+    text-decoration: none;
+    & svg {
+      & g {
+        stroke-linejoin: round;
+        stroke: #000;
+        stroke-miterlimit: 10;
+        stroke-width: 2;
+        fill: none;
+      }
+    }
+  }
+}
+
+.search-icon-header:hover {
+  & a {
+    background-color: #000;
+    text-decoration: none;
+    & svg {
+      & g {
+        stroke: #fff;
+      }
+    }
+  }
+}
+
+.short-menu-left-search {
+  display: inline-block;
+  margin: 12px 9px 6px 0;
+  color: #000000;
+}
+
+.short-menu-right-h {
+  cursor: pointer;
+  display: inline-block;
+  margin: 12px 0 6px 9px;
+  padding: 5px;
+}
+
+.short-menu-right-main-menu {
+  display: inline-block;
+  margin-right: 3px;
+  vertical-align: top;
+  width: 21px;
+}
+
+.short-menu-icon {
+  vertical-align: top;
+  width: 20px;
+  height: 19px;
+}
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/***********MAIN menu*************/
+.header {
+  min-width: 0;
+
+  position: relative;
+  width: 100%;
+  //height: 100%;
+}
+
+.main-menu-box {
+  font-size: 16px;
+  box-sizing: border-box;
+  display: table;
+  margin: 0 auto;
+  max-width: 1060px;
+  padding: 9px 50px 8px;
+  text-align: left;
+  width: 100%;
+}
+
+.main-menu-entry {
+  display: table-cell;
+  text-align: center;
+}
+.main-menu-entry a {
+  box-decoration-break: clone;
+  padding: 5px 8px;
+}
+
+.main-menu-entry a:hover {
+  background-color: #000000;
+  color: #ffffff;
+  text-decoration: none;
+}
+
+.affiliation-text a:hover {
+  background-color: #000000;
+  color: #ffffff;
+  text-decoration: none;
+}
+
+.affiliation-logo :hover {
+  text-decoration: none;
+}
+
+.main-menu {
+  border-bottom: 1px solid #000;
+  box-sizing: border-box;
+  height: 39px;
+  margin-top: -1px;
+  overflow: hidden;
+  transition: height 0.3s linear 0s;
+}
+
+@media (max-width: 767.9px) {
   .main-menu {
     height: auto;
   }
-  }
+}
 
-  @media (max-width: 767.9px){
+@media (max-width: 767.9px) {
   .main-menu-entry {
     display: table-row;
 
     line-height: 1.9em;
   }
-  }
+}
 
-  @media screen and (max-width: 767.9px){
+@media screen and (max-width: 767.9px) {
   #int-header-logo-img {
     width: 200px;
     height: 75px;
   }
-  }
+}
 
-  @media screen and (max-width: 767.9px){
+@media screen and (max-width: 767.9px) {
   #int-header-logo {
     padding: 50px 0;
     text-align: center;
-  }}
+  }
+}
 
-  @media screen and (max-width: 767.9px){
-  .affiliation{
+@media screen and (max-width: 767.9px) {
+  .affiliation {
     margin: 0;
     text-align: center;
-
   }
-  .affiliation-text{
+  .affiliation-text {
     display: none;
   }
-  .affiliation-logo-claim{
+  .affiliation-logo-claim {
     display: none;
   }
 
-  .affiliation-spacer{
+  .affiliation-spacer {
     display: none;
   }
+}
 
-  }
-
-  @media (max-width: 767.9px){
+@media (max-width: 767.9px) {
   .main-menu-box {
-    margin-top:15px;
+    margin-top: 15px;
     width: 100%;
     text-align: center;
   }
-  }
+}
 
-  .int-menu-q-open-icon {
-    width: 14px;
-    vertical-align: middle;
-    margin-left: 5px;
-  }
+.int-menu-q-open-icon {
+  width: 14px;
+  vertical-align: middle;
+  margin-left: 5px;
+}
 
-  /*********************Custom overrides**********************/
-  /** Login with SAML**/
-  .col a{
-    cursor: pointer;
-  }
+/*********************Custom overrides**********************/
+/** Login with SAML**/
+.col a {
+  cursor: pointer;
+}
 
-  /**** hyperlink hover color ****/
-  a:focus,
-  a:hover {
-  color:#E4154B;
-  text-decoration:underline
-  }
+/**** hyperlink hover color ****/
+a:focus,
+a:hover {
+  color: #e4154b;
+  text-decoration: underline;
+}
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 f1bcd5a..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
@@ -5,7 +5,7 @@
  * invenio-theme-tugraz  is free software; you can redistribute it and/or modify it
  * under the terms of the MIT License; see LICENSE file for more details.
  */
- 
+
 /* On hover color changed
 * from #0377cd
 * to #E4154B
@@ -16,7 +16,7 @@
 .section-content-light-bg a:focus,
 .hp-blog-section a:hover,
 .hp-blog-section a:focus {
-  color: #E4154B;
+  color: #e4154b;
 }
 
 /*
@@ -28,13 +28,13 @@
   background-color: #ffffff;
 }
 
-  /*
+/*
 * section title.
 * from #0377cd
 * to #000000
 */
 .section-title {
-color: #000000;
+  color: #000000;
 }
 
 /***
@@ -55,3 +55,10 @@ To #000000
 .panel-free-title {
   color: #000000;
 }
+
+/***
+forcing the font changes
+*/
+body {
+  font-family: "Source Sans Pro";
+}
diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less
index eff8101..dae2560 100644
--- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less
+++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less
@@ -5,11 +5,11 @@
  * invenio-theme-tugraz  is free software; you can redistribute it and/or modify it
  * under the terms of the MIT License; see LICENSE file for more details.
  */
- 
+
 @import "header";
 @import "footer";
 @import "overrides";
-
+@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap");
 
 /***
 **TODO:
@@ -17,4 +17,4 @@
 ***/
 
 //@import "../invenio_app_rdm/theme";
-//@import "variables";
\ No newline at end of file
+//@import "variables";
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
index ce8fa5f..c12b7fd 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
@@ -81,53 +81,42 @@
         <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;">
+                <div 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>
+                    href="{{ url_for('invenio_i18n.set_lang', lang_code=l.language) }}">{{ l.get_display_name().upper() [0:2]}}</a>
                   {%- endif %}
                   {%- endfor %}
-                </span>
+                </div>
                 {%- endif %}
-                <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>
-
-                </a>
+                <div class="search-icon-header">
+                  <a href="/search">
+                    <svg class="short-menu-icon" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="26.015" width="26.015" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 26.01515 26.01515">
+                      <g stroke-miterlimit="10" transform="translate(1,1)">
+                        <circle cy="8.5" cx="8.5" r="8" style="stroke-miterlimit:10;stroke-width:2"></circle>
+                        <path style="stroke-width:2;stroke-miterlimit:10;stroke-linecap:round" d="m14.156 14.156 9.344 9.344"></path>
+                      </g>
+                    </svg>
+                  </a>
+                </div>
               </div>
-
             </div>
-
-
           </div>
 
           <div class="short-menu-right">
             <div class="short-menu-right-h" onclick="toggleVisibility('heading');">
-
-              <i class="fa fa-bars fa-lg"></i><span style="margin-left:3px;">Menu</span>
+              <svg shape-rendering="optimizeQuality" class="short-menu-icon" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="20" width="24.103" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 24.103479 20">
+                <g transform="translate(0 -1032.4)">
+                  <path d="m2.0142 1034.4h20.972"></path>
+                  <path d="m2.0142 1042.4h20.972"></path>
+                  <path d="m2.0142 1050.4h20.972"></path>
+                </g>
+              </svg>
+              <span style="margin-left:3px; font-size:16px; font-weight:300">Main Menu</span>
 
             </div>
           </div>