diff --git a/invenio_theme_iform/templates/invenio_theme_iform/accounts/accounts_base.html b/invenio_theme_iform/templates/invenio_theme_iform/accounts/accounts_base.html
index 69aac4d..19b8aeb 100644
--- a/invenio_theme_iform/templates/invenio_theme_iform/accounts/accounts_base.html
+++ b/invenio_theme_iform/templates/invenio_theme_iform/accounts/accounts_base.html
@@ -39,7 +39,7 @@
                 <title>{{ title }}</title>
             {%- endblock head_title %}
             {%- block head_links %}
-                <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}" />
+                <link rel="shortcut icon" href="{{ url_for('invenio_theme_iform.static', filename='favicon.ico') }}" />
                 {%- if keywords %}<link rel="canonical" href="{{ canonical_url }}" />{% endif %}
                 {%- block head_links_langs %}
                     {%- if alternate_urls %}
@@ -58,7 +58,7 @@
                         <link
                             rel="apple-touch-icon-precomposed"
                             sizes="{{ size }}x{{ size }}"
-                            href="{{ url_for('static', filename=icon_name) }}"
+                            href="{{ url_for('invenio_theme_iform.static', filename=icon_name) }}"
                         />
                     {%- endfor %}
                 {%- endblock head_apple_icons %}
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/accounts/login_user.html b/invenio_theme_iform/templates/invenio_theme_iform/accounts/login_user.html
index 9daa8d1..a91445d 100644
--- a/invenio_theme_iform/templates/invenio_theme_iform/accounts/login_user.html
+++ b/invenio_theme_iform/templates/invenio_theme_iform/accounts/login_user.html
@@ -36,7 +36,7 @@
                                     Log in with
                                     {{ config.SSO_SAML_IDPS[name]['title']|default("SAML", true) }}
                                     <img
-                                        src="{{ url_for('static', filename=config.INVENIO_THEME_IFORM_ICON) }}"
+                                        src="{{ url_for('invenio_theme_iform.static', filename=config.INVENIO_THEME_IFORM_ICON) }}"
                                         height="20px"
                                     />
                                 </a>
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/accounts/register_user.html b/invenio_theme_iform/templates/invenio_theme_iform/accounts/register_user.html
index 3df5166..135006a 100644
--- a/invenio_theme_iform/templates/invenio_theme_iform/accounts/register_user.html
+++ b/invenio_theme_iform/templates/invenio_theme_iform/accounts/register_user.html
@@ -42,12 +42,12 @@
                 {%- if config.INVENIO_CONFIG_IFORM_SHIBBOLETH %}
                     <div class="ui divider"></div>
                     <a
-                        href="{{ url_for("sso_saml.sso", idp="idp") }}"
+                        href="{{ url_for('sso_saml.sso', idp='idp') }}"
                         class="login-page-button ui fluid large button"
                     >
                         <span style="font-size: 18px;">Sign up with I-Form</span>
                         <img
-                            src="{{ url_for("static", filename=config.INVENIO_THEME_IFORM_ICON) }}"
+                            src="{{ url_for('invenio_theme_iform.static', filename=config.INVENIO_THEME_IFORM_ICON) }}"
                             height="20px"
                         />
                     </a>
@@ -73,7 +73,7 @@
                             <div class="content {{ accordion_active }}">
                                 <form
                                     class="ui large form"
-                                    action="{{ url_for_security("register") }}"
+                                    action="{{ url_for_security('register') }}"
                                     method="POST"
                                     name="register_user_form"
                                 >
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/base.html b/invenio_theme_iform/templates/invenio_theme_iform/base.html
index 4111c29..547a81b 100644
--- a/invenio_theme_iform/templates/invenio_theme_iform/base.html
+++ b/invenio_theme_iform/templates/invenio_theme_iform/base.html
@@ -36,7 +36,7 @@
             {%- endblock head_title %}
 
             {%- block head_links %}
-                <link rel="shortcut icon" href="{{ url_for("static", filename="favicon.ico") }}" />
+                <link rel="shortcut icon" href="{{ url_for('inveino_theme_iform.static', filename='favicon.ico') }}" />
 
                 {%- if keywords %}
                     <link rel="canonical" href="{{ canonical_url }}" />
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/footer.html b/invenio_theme_iform/templates/invenio_theme_iform/footer.html
index b9db8cf..4e1a7a4 100644
--- a/invenio_theme_iform/templates/invenio_theme_iform/footer.html
+++ b/invenio_theme_iform/templates/invenio_theme_iform/footer.html
@@ -132,7 +132,7 @@
                             title="invenioRDM"
                         >
                             <img
-                                src="{{ url_for("static", filename="images/inveniordm-tail.svg") }}"
+                                src="{{ url_for('invenio_theme_iform.static', filename='images/inveniordm-tail.svg') }}"
                                 alt="InvenioRDM logo"
                                 style="display: block; height: 90px; margin-top: 8px;"
                             />
@@ -148,7 +148,7 @@
                             title="Science Foundation Ireland"
                         >
                             <img
-                                src="{{ url_for("static", filename="images/SFI_logo.png") }}"
+                                src="{{ url_for('invenio_theme_iform.static', filename='images/SFI_logo.png') }}"
                                 alt="Science Foundation Ireland"
                                 style="display: block; height: auto; margin-top: 15px; width: 230px;"
                             />
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/macros/authors.html b/invenio_theme_iform/templates/invenio_theme_iform/macros/authors.html
index c0f1945..7ecb505 100644
--- a/invenio_theme_iform/templates/invenio_theme_iform/macros/authors.html
+++ b/invenio_theme_iform/templates/invenio_theme_iform/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') }}"
+                    src="{{ url_for('invenio_theme_iform.static', filename='extra/orcid.png') }}"
             /></a>
         {%- endif %}
 
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/navbar.html b/invenio_theme_iform/templates/invenio_theme_iform/navbar.html
index c2db667..f04f6cb 100644
--- a/invenio_theme_iform/templates/invenio_theme_iform/navbar.html
+++ b/invenio_theme_iform/templates/invenio_theme_iform/navbar.html
@@ -64,7 +64,7 @@
                 <div class="affiliation-text">
                     <a
                         title="Home"
-                        href="{{ url_for("invenio_theme_iform.index") }}"
+                        href="{{ url_for('invenio_theme_iform.index') }}"
                         class="no-decoration"
                     >
                         I-FORM
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/overview.html b/invenio_theme_iform/templates/invenio_theme_iform/overview.html
index 94aae05..449574f 100644
--- a/invenio_theme_iform/templates/invenio_theme_iform/overview.html
+++ b/invenio_theme_iform/templates/invenio_theme_iform/overview.html
@@ -33,7 +33,7 @@
                             <img
                                 width="400px"
                                 alt="Research Results"
-                                src="{{ url_for('static', filename='images/diamond.svg') }}"
+                                src="{{ url_for('invenio_theme_iform.static', filename='images/diamond.svg') }}"
                             />
                         </a>
                         <div class="ui right floated text">
@@ -48,7 +48,7 @@
                             <img
                                 width="400px"
                                 alt="Communities"
-                                src="{{ url_for('static', filename='images/group-discussion.svg') }}"
+                                src="{{ url_for('invenio_theme_iform.static', filename='images/group-discussion.svg') }}"
                             />
                         </a>
                         <div>Overview: Description of Communities</div>
@@ -61,7 +61,7 @@
                             <img
                                 width="400px"
                                 alt="Requests"
-                                src="{{ url_for('static', filename='images/umbrella.svg') }}"
+                                src="{{ url_for('invenio_theme_iform.static', filename='images/umbrella.svg') }}"
                             />
                         </a>
                         <div>Overview: Description of Requests</div>
@@ -112,7 +112,7 @@
                             <img
                                 width="400px"
                                 alt="Research Results"
-                                src="{{ url_for('static', filename='images/diamond.svg') }}"
+                                src="{{ url_for('invenio_theme_iform.static', filename='images/diamond.svg') }}"
                             />
                         </div>
                         <div class="ui right floated text">
@@ -129,7 +129,7 @@
                             <img
                                 width="400px"
                                 alt="Publications"
-                                src="{{ url_for('static', filename='images/library-book-svgrepo-com.svg') }}"
+                                src="{{ url_for('invenio_theme_iform.static', filename='images/library-book-svgrepo-com.svg') }}"
                             />
                         </a>
                         <div>Overview: Description for publications</div>
@@ -143,7 +143,7 @@
                         <img
                             width="400px"
                             alt="Open Educational Resources"
-                            src="{{ url_for('static', filename='images/play.svg') }}"
+                            src="{{ url_for('invenio_theme_iform.static', filename='images/play.svg') }}"
                         />
                     </a>
                     <div>Overview: Description for open educational resources</div>