diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/footer.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/footer.less
index d3ab161..953f178 100644
--- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/footer.less
+++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/footer.less
@@ -48,4 +48,4 @@
  }
  .spacer-long{
   margin-top: 20px;
-}
\ No newline at end of file
+}
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 2d9c99f..0b1f086 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
@@ -39,8 +39,9 @@
 
 .affiliation-text {
   display: table-cell;
-  font-size: 17px;
-  vertical-align: middle;
+  font-size: 12px;
+  line-height: 17px;
+  letter-spacing: 2px;
   white-space: nowrap;
 }
 
@@ -248,3 +249,7 @@ svg:not(:root) {
 .inline-elements{
   display: flex;
 }
+
+span.home-inline{
+  white-space: nowrap;
+}
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/header_login.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/header_login.html
index b0ea481..3bda648 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/header_login.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/header_login.html
@@ -5,14 +5,14 @@
 {%- if config.SECURITY_REGISTERABLE %}
 <div class="short-menu-right-button">
     <a href="{{ url_for('security.register') }}">
-        <i class="user plus icon circular"></i> {{_ ("Sign Up")}}
+        {{_ ("Sign up")}}
     </a>
 </div>
    {%- endif %}
 
 <div class="short-menu-right-button">
     <a href="{{url_for_security('login', next=request.path)}}" style="text-decoration:none">
-        <i class="sign in icon circular"></i> {{_ ("Log in")}}
+        {{_ ("Log in")}}
     </a>
 </div>
 
@@ -27,7 +27,7 @@
 </div>
 <div class="short-menu-right-button">
     <a class="dropdown-item" href="{{url_for_security('logout')}}">
-        <i class="sign out icon circular"></i>{{_('Logout')}}
+        {{_('Sign out')}}
     </a>
 </div>
 
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html
index fb500ed..b6b4187 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html
@@ -24,11 +24,11 @@
         <h3 class="ui login header">{{ _('Log in to Repository') }}</h3>
         {%- endblock form_header %}
 
-        <!--Login with SSO-->
+        <!--Log in with SSO-->
         {%- if config.INVENIO_CONFIG_TUGRAZ_SHIBBOLETH %}
         <div class="login-page-button">
           <a href="{{ url_for('sso_saml.sso', idp='idp') }}" class="inverted tiny image label">
-            {% trans type='TUGRAZ' %} Login with {{ type }}{% endtrans %}
+            {% trans type='TUGRAZ' %} Log in with {{ type }}{% endtrans %}
             <img src="{{ url_for('static', filename=config.INVENIO_THEME_TUGRAZ_ICON)}}" height="20px" />
           </a>
         </div>
@@ -56,7 +56,7 @@
       {%- if security.registerable %}
       <div class="ui primary segment padded text-muted">
         {% trans sitename=config.ACCOUNTS_SITENAME %}New to {{ sitename }}?{% endtrans %}
-        <a href="{{ url_for_security('register', next=request.args.get('next')) }}">{{ _('Sign Up') }}</a>
+        <a href="{{ url_for_security('register', next=request.args.get('next')) }}">{{ _('Sign up') }}</a>
       </div>
       {%- endif %}
       {%- endblock registerable %}
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html
index 0eb299f..0262e7d 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html
@@ -77,7 +77,7 @@
 
           <div class="centered row">
             <button type="submit" class="ui fluid large submit button">
-              <i class="ui edit outline icon"></i>{{ _('Sign Up') }}
+              <i class="ui edit outline icon"></i>{{ _('Sign up') }}
             </button>
           </div>
         </form>
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
index 1720fea..6b11fad 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
@@ -19,8 +19,9 @@
     <div class="ui container">
         <div class="ui grid stackable container">
           <div class="three column row centered" style="padding-bottom: 0;">
-            <div class="two wide column main-menu-entry main-menu-entry-svg">
+            <div class="two wide column main-menu-entry">
               <a href="{{url_for('invenio_theme_tugraz.index')}}" title="Home">
+                <span class="home-inline">
                 <svg shape-rendering="geometricPrecision" id="int-menu-q-home-icon"
                   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg"
                   version="1.1" xml:space="preserve" height="36.997" width="35.969"
@@ -32,6 +33,7 @@
                   </polyline>
                 </svg>
                 {{_ ("Home")}}
+              </span>
               </a>
             </div>
             {%- for item in current_menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/navbar.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/navbar.html
index 8781aeb..96e101b 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/navbar.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/navbar.html
@@ -62,9 +62,11 @@
         </div>
         <div class="affiliation-text">
           <a title="RDM" href="{{url_for('invenio_theme_tugraz.index')}}">
-            TU Graz
+            TU GRAZ
             <br>
-            {{_ ("Repository")}}
+            {{_ ("REPOSITORY")}}
+            <br>
+            {{_ ("LIBRARY & ARCHIVES")}} 
           </a>
         </div>
       </div>