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 a6ac5f4..eaecf9a 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
@@ -54,11 +54,6 @@
   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 {
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 224af01..2bfb325 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
@@ -24,3 +24,11 @@
 
 //@import "../invenio_app_rdm/theme";
 //@import "variables";
+
+// used in various templates
+// add no hyperlink decoration
+.no-decoration{
+  color: inherit;
+  text-decoration: none;
+  transition: background-color 0.15s ease 0s, color 0.15s ease 0s;
+}
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 3bda648..512a0af 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
@@ -4,14 +4,14 @@
 
 {%- if config.SECURITY_REGISTERABLE %}
 <div class="short-menu-right-button">
-    <a href="{{ url_for('security.register') }}">
+    <a href="{{ url_for('security.register') }}" class="no-decoration">
         {{_ ("Sign up")}}
     </a>
 </div>
    {%- endif %}
 
 <div class="short-menu-right-button">
-    <a href="{{url_for_security('login', next=request.path)}}" style="text-decoration:none">
+    <a href="{{url_for_security('login', next=request.path)}}" class="no-decoration">
         {{_ ("Log in")}}
     </a>
 </div>
@@ -21,12 +21,12 @@
 {%- if config.USERPROFILES %}
 
 <div class="short-menu-right-button">
-    <a href="{{ url_for('invenio_userprofiles.profile') }}">
+    <a href="{{ url_for('invenio_userprofiles.profile') }}" class="no-decoration">
         <i class="user icon"></i> {{ current_user.email }}
     </a>
 </div>
 <div class="short-menu-right-button">
-    <a class="dropdown-item" href="{{url_for_security('logout')}}">
+    <a class="dropdown-item no-decoration" href="{{url_for_security('logout')}}">
         {{_('Sign out')}}
     </a>
 </div>
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
index bf3cfd5..7080684 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html
@@ -19,7 +19,7 @@
         <div class="ui grid stackable container">
           <div class="three column row centered" style="padding-bottom: 0;">
             <div class="two wide column main-menu-entry">
-              <a href="{{url_for('invenio_theme_tugraz.index')}}" title="Home">
+              <a href="{{url_for('invenio_theme_tugraz.index')}}" title="Home" class="no-decoration">
                 <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"
@@ -44,7 +44,7 @@
 
             <!--TODO: remove this once above is uncommented-->
             <div class="two wide column main-menu-entry">
-              <a href="{{url_for('invenio_app_rdm_records.deposit_search')}}">{{_ ("Uploads")}}</a>
+              <a href="{{url_for('invenio_app_rdm_records.deposit_search')}}" class="no-decoration">{{_ ("Uploads")}}</a>
             </div>
           </div>
        
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
index 2a1e5d5..549afc7 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
@@ -73,7 +73,7 @@
         </div>
 
         <h4>
-          <a href="{{ record_url }}">
+          <a href="{{ record_url }}" class="no-decoration">
             {{r.metadata.title}}
           </a>
         </h4>
@@ -83,7 +83,7 @@
         </p>
 
         <p class="hidden-xs">
-          <a href="{{record_url}}">
+          <a href="{{record_url}}" class="no-decoration">
             {{ r.metadata.description | striptags | truncate(300) }}
           </a>
         </p>
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/navbar.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/navbar.html
index 19275d6..4248fa2 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/navbar.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/navbar.html
@@ -16,13 +16,13 @@
             {%- 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().upper() [0:2]}}</a>
+              href="{{ url_for('invenio_i18n.set_lang', lang_code=l.language) }}" class="no-decoration">{{ l.get_display_name().upper() [0:2]}}</a>
             {%- endif %}
             {%- endfor %}
           </div>
           {%- endif %}
           <div class="search-icon-header">
-            <a href="{{url_for('invenio_search_ui.search')}}">
+            <a href="{{url_for('invenio_search_ui.search')}}" class="no-decoration">
               <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/"
@@ -60,7 +60,7 @@
           <img height="51.862" src="{{ url_for('static', filename='images/library_logo.png')}}">
         </div>
         <div class="affiliation-text">
-          <a title="Home" href="{{url_for('invenio_theme_tugraz.index')}}">
+          <a title="Home" href="{{url_for('invenio_theme_tugraz.index')}}" class="no-decoration">
             TU GRAZ
             <br>
             {{_ ("REPOSITORY")}}
@@ -73,7 +73,7 @@
     <!--Right-->
     <div class="right floated right aligned six wide column">
       <div class="affiliation-logo" id="int-header-logo">
-        <a href="https://www.tugraz.at" title="TU Graz Home" target="_blank">
+        <a href="https://www.tugraz.at" title="TU Graz Home" target="_blank" class="no-decoration">
           <div class="affiliation-logo-claim">
             <div class="affiliation-logo-claim-single">{{_ ("SCIENCE")}}</div>
             <div class="affiliation-logo-claim-single">{{_ ("PASSION")}}</div>