diff --git a/invenio_app_rdm/config.py b/invenio_app_rdm/config.py
index dd6dae132..f5a9f099f 100644
--- a/invenio_app_rdm/config.py
+++ b/invenio_app_rdm/config.py
@@ -994,6 +994,25 @@ def github_link_render(record):
 APP_RDM_ADMIN_EMAIL_RECIPIENT = "info@inveniosoftware.org"
 """Admin e-mail"""
 
+APP_RDM_IDENTIFIER_SCHEMES_UI = {
+    "orcid": {
+        "url_prefix": "http://orcid.org/",
+        "icon": "images/orcid.svg",
+        "label": "ORCID",
+    },
+    "ror": {
+        "url_prefix": "https://ror.org/",
+        "icon": "images/ror-icon.svg",
+        "label": "ROR",
+    },
+    "gnd": {
+        "url_prefix": "http://d-nb.info/gnd/",
+        "icon": "images/gnd-icon.svg",
+        "label": "GND",
+    },
+}
+"""Identifier Schemes UI config"""
+
 # Invenio-Communities
 # ===================
 
diff --git a/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/creatibutors.html b/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/creatibutors.html
index 6930a5025..45c034cac 100644
--- a/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/creatibutors.html
+++ b/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/creatibutors.html
@@ -11,32 +11,33 @@
 {% macro creatibutor_icon(creatibutor) %}
   {% set identifier_found = namespace(value=False) %}
 
-  {% for scheme, identifier in creatibutor.person_or_org.identifiers|groupby("scheme") %}
-    {%- if scheme == "orcid" %}
-      {% set identifier_found.value = True %}
-      <a class="no-text-decoration" href="{{ identifier[0]['identifier']|pid_url('orcid') }}" aria-label="{{ creatibutor.person_or_org.name }}'s ORCID {{ _('profile') }}" title="{{ creatibutor.person_or_org.name }}'s ORCID {{ _('profile') }}">
-        <img class="ml-5 inline-id-icon" src="{{ url_for('static', filename='images/orcid.svg') }}" alt="ORCID icon"/>
-      </a>
-    {%- elif scheme == "ror" %}
-      {% set identifier_found.value = True %}
-      <a href="{{ identifier[0]['identifier']|pid_url('ror') }}" aria-label="{{ creatibutor.person_or_org.name }}'s ROR {{ _('profile') }}" title="{{ creatibutor.person_or_org.name }}'s ROR {{ _('profile') }}">
-        <img class="ml-5 inline-id-icon" src="{{ url_for('static', filename='images/ror-icon.svg') }}" alt="ROR icon"/>
-      </a>
-    {%- elif scheme == "gnd" %}
-      {% set identifier_found.value = True %}
-      <a href="{{ identifier[0]['identifier']|pid_url('gnd') }}" aria-label="{{ creatibutor.person_or_org.name }}'s GND {{ _('profile') }}" title="{{ creatibutor.person_or_org.name }}'s GND {{ _('profile') }}">
-        <img class="ml-5 inline-id-icon" src="{{ url_for('static', filename='images/gnd-icon.svg') }}" alt="GND icon"/>
-      </a>
-    {%- endif %}
-  {% endfor %}
+  {% if config.APP_RDM_IDENTIFIER_SCHEMES_UI %}
+    {% for scheme, details in config.APP_RDM_IDENTIFIER_SCHEMES_UI.items() %}
+      {% for identifier in creatibutor.person_or_org.identifiers|selectattr("scheme", "equalto", scheme) %}
+        {% set identifier_found.value = True %}
+        <a href="{{ identifier.identifier|pid_url(scheme) }}" 
+           aria-label="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}" 
+           title="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}">
+          <img class="ml-5 inline-id-icon" 
+               src="{{ url_for('static', filename=details.icon) }}" 
+               alt="{{ details.label }} icon"/>
+        </a>
+      {% endfor %}
+    {% endfor %}
+  {% endif %}
 
-  {# if no identifiers: distinguish btw people and organizations #}
-  {%- if not identifier_found.value and creatibutor.person_or_org.type == 'organizational'%}
-    <i class="group icon"></i>
-  {%- endif %}
+  {# Fallback for missing identifiers #}
+  {% if not identifier_found.value %}
+    {% if creatibutor.person_or_org.type == 'organizational' %}
+      <i class="group icon"></i>
+    {% else %}
+      <i class="user icon"></i>
+    {% endif %}
+  {% endif %}
 {% endmacro %}
 
 
+
 {% macro show_creatibutors(creatibutors, show_affiliations=False, type="creators", show_role=False) %}
   {% for creatibutor in creatibutors %}
   <li class="creatibutor-wrap separated">
@@ -81,22 +82,32 @@
 
 <section class="ui sixteen wide column content" id="{{ group }}-affiliations" aria-label="{{ _('Affiliations for') }} {{ group }}">
   <ul>
-  {% for affiliation in affiliations %}
-      <li>
-          {{ affiliation[0] }}.
-
-          {% if affiliation[2] %}
+    {% for affiliation in affiliations %}
+    <li>
+      {{ affiliation[0] }}.
+  
+      {% if affiliation[2] %}
+        {% set scheme, identifier = (affiliation[2].split(':', 1) if ':' in affiliation[2] else ('ror', affiliation[2])) %}
+        {% set scheme_config = config.APP_RDM_IDENTIFIER_SCHEMES_UI.get(scheme) %}
+        
+        {% if scheme_config %}
           <a class="no-text-decoration"
-             href="https://ror.org/{{affiliation[2]}}"
-             aria-label="{{ affiliation[1] }}'s ROR {{ _('profile') }}"
-             title="{{ affiliation[1] }}'s ROR {{ _('profile') }}"
+             href="{{ scheme_config.url_prefix + identifier }}"
+             aria-label="{{ affiliation[1] }}'s {{ scheme_config.label }} {{ _('profile') }}"
+             title="{{ affiliation[1] }}'s {{ scheme_config.label }} {{ _('profile') }}"
           >
-              <img class="ml-5 inline-id-icon" src="{{ url_for('static', filename='images/ror-icon.svg') }}" alt="ROR icon"/>
+            <img class="ml-5 inline-id-icon"
+                 src="{{ url_for('static', filename=scheme_config.icon) }}"
+                 alt="{{ scheme_config.label }} icon"
+            />
           </a>
-          {%- endif %}
-          {{affiliation[1]}}
-        </li>
+        {% endif %}
+      {% endif %}
+  
+      {{ affiliation[1] }}
+    </li>
   {% endfor %}
+  
     </ul>
 </section>
 {% endmacro %}
diff --git a/invenio_app_rdm/users_ui/templates/semantic-ui/invenio_app_rdm/users/header.html b/invenio_app_rdm/users_ui/templates/semantic-ui/invenio_app_rdm/users/header.html
index 74fe9a725..6ed2c008b 100644
--- a/invenio_app_rdm/users_ui/templates/semantic-ui/invenio_app_rdm/users/header.html
+++ b/invenio_app_rdm/users_ui/templates/semantic-ui/invenio_app_rdm/users/header.html
@@ -23,14 +23,14 @@ <h1 class="ui medium header" aria-label="{{ _('Your dashboard') }}">{{ current_u
       </div>
     </div>
     {% if active_dashboard_menu_item == "uploads" %}
-      <a class="ui tiny button positive left labeled icon m-0" href={{ url_for("deposit_create") }}>
+      <a class="ui tiny button positive left labeled icon m-0" href={{ url_for("invenio_app_rdm_records.deposit_create") }}>
         <i class="upload icon" aria-hidden="true"></i>
         {{ _('New upload') }}
       </a>
     {% endif %}
 
     {% if active_dashboard_menu_item == "communities" %}
-      <a class="ui tiny button positive left labeled icon m-0" href={{ url_for("communities_new") }}>
+      <a class="ui tiny button positive left labeled icon m-0" href={{ url_for("invenio_communities.communities_new") }}>
         <i class="plus icon" aria-hidden="true"></i>
         {{ _('New community') }}
       </a>