diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
index 44080f4..424ca0f 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
@@ -58,12 +58,12 @@
         -->
         <div class="badges">
           <!--Publication date/Version badge-->
-          <span class="ui label blue" title="{{_('Publication date')}}">
+          <span class="ui label blue" data-tooltip="{{_('Publication date')}}" data-inverted="">
             {{ r.metadata.publication_date }} {{ '(' ~ r.metadata.version ~ ')' if r.metadata.version }}
           </span>
 
           <!--Resource type badge-->
-          <span class="ui label grey" title="{{_('Resource type')}}">
+          <span class="ui label grey" data-tooltip="{{_('Resource type')}}" data-inverted>
             {{r.metadata.resource_type | cast_to_dict | vocabulary_title('resource_type') }}
           </span>
           
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
index 67decb6..4705883 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
@@ -15,7 +15,7 @@
 <a href="{{creators.identifiers.orcid|pid_url('orcid')}}" target="_blank" ><img class="inline-orcid" src="{{ url_for('static', filename='extra/orcid.png')}}" /></a>
 {%- endif %}
 
-<span class="text-muted" {% if creators.affiliations %} {% for affiliation in creators.affiliations %} data-toggle="tooltip" title="{{affiliation.name}}" {%- endfor %} {% endif %}>{{creators.person_or_org.name}}</span>
+<span class="text-muted" {% if creators.affiliations %} {% for affiliation in creators.affiliations %} data-tooltip="{{affiliation.name}}" data-inverted="" {%- endfor %} {% endif %}>{{creators.person_or_org.name}}</span>
 {% if not loop.last %}; {% endif %}
 
 {%- endfor %}