diff --git a/templates/includes/individual-identities.twig b/templates/includes/individual-identities.twig
index 12cca533a88a214ec2cddce937eb2f2e819bd76e..e6fd772ecd2a6c3f83c26e2e5807d9f1316539f1 100644
--- a/templates/includes/individual-identities.twig
+++ b/templates/includes/individual-identities.twig
@@ -18,7 +18,7 @@
 
     {% for idp in configuration.identities %}
         <div class="{% if muni_jvs %}margin-bottom-12{% endif %}{% if loop.index0 >= configuration.number_shown %} idp-hidden d-none vhide{% endif %}">
-            <button class="btn-individual-identity btn {% if muni_jvs %}btn-primary btn-border color-{{ configuration.priority }} hover-none-{{ configuration.priority }}{% else %}btn-light {% if configuration.priority == 'primary' %}border-dark text-dark{% else %}border-muted text-muted{% endif %} border-2 btn-lg{% endif %}" type="submit" name="idpentityid" value="{{ idp.upstream_idp }}">
+            <button class="btn-individual-identity btn {% if muni_jvs %}btn-primary btn-border color-{{ configuration.priority }} hover-none-{{ configuration.priority }}{% else %}btn-light shadow-sm {% if configuration.priority == 'primary' %}border-dark text-dark{% else %}border-muted text-muted{% endif %} border-2 btn-lg{% endif %}" type="submit" name="idpentityid" value="{{ idp.upstream_idp }}">
                 {% if muni_jvs %}<span class="no-uppercase color-{{ configuration.priority }} individual-identity-span-wrap">{% endif %}
                     <img class="individual-identity-logo{% if not muni_jvs %} border-end border-2 border-{% if configuration.priority == 'primary' %}dark{% else %}muted{% endif %}{% endif %}" {% if idp.background_color is defined %}style="background-color: {{ idp.background_color }}"{% endif %} src="{{ idp.logo }}" alt=""/>
                     <span class="idp-text">{{ '{campusmultiauth:sign_in_with}'|trans }}{{ " " }}{% if attribute(idp.name, currentLanguage) is defined %}{{ attribute(idp.name, currentLanguage) }}
diff --git a/templates/includes/local-login.twig b/templates/includes/local-login.twig
index 29cf88ec2fd8724f5ed0b7fee7299fe35bf530c9..ef22a9a9836d20c78d5466b879f4c2257db5cb85 100644
--- a/templates/includes/local-login.twig
+++ b/templates/includes/local-login.twig
@@ -37,7 +37,7 @@
         </label>
         <br>
         {% if muni_jvs %}<span class="inp-fix">{% endif %}
-            <input id="username" class="{% if muni_jvs %}inp-text input-height border color-border-{{ configuration.priority }}{% else %}input-height form-control border-2{% if wrongUserPass %} is-invalid{% else %} border-{% if configuration.priority == 'primary' %}dark{% else %}muted{% endif %}{% endif %}{% endif %}"
+            <input id="username" class="{% if muni_jvs %}inp-text input-height border color-border-{{ configuration.priority }}{% else %}input-height form-control shadow-sm border-2{% if wrongUserPass %} is-invalid{% else %} border-{% if configuration.priority == 'primary' %}dark{% else %}muted{% endif %}{% endif %}{% endif %}"
                    type="text" name="username"{% if cookie_username is not null %} value="{{ cookie_username }}"{% endif %} placeholder="{% if attribute(configuration.username_placeholder, currentLanguage) is defined %}{{ attribute(configuration.username_placeholder, currentLanguage) }}
                 {% elseif configuration.username_placeholder is defined and configuration.username_placeholder is iterable and configuration.username_placeholder is not empty %}{{ configuration.username_placeholder | first }}
                 {% elseif configuration.username_placeholder is defined and configuration.username_placeholder is not iterable %}{{ configuration.username_placeholder }}
@@ -64,9 +64,9 @@
                    class="inp-text input-height border color-border-{{ configuration.priority }}"
                {% else %}
                    {% if configuration.priority == 'primary' %}
-                       class="form-control border-2 input-height{% if wrongUserPass %} is-invalid{% else %} border-dark{% endif %}"
+                       class="form-control shadow-sm border-2 input-height{% if wrongUserPass %} is-invalid{% else %} border-dark{% endif %}"
                    {% else %}
-                       class="form-control border-2 input-height{% if wrongUserPass %} is-invalid{% else %} border-muted{% endif %}"
+                       class="form-control shadow-sm border-2 input-height{% if wrongUserPass %} is-invalid{% else %} border-muted{% endif %}"
                    {% endif %}
                {% endif %}
                    type="password" name="password" autocomplete="current-password"{% if cookie_password is not null %} value="{{ cookie_password }}"{% endif %} placeholder="{% if attribute(configuration.password_placeholder, currentLanguage) is defined %}{{ attribute(configuration.password_placeholder, currentLanguage) }}
@@ -105,7 +105,7 @@
                 </span>
             </button>
         {% else %}
-            <button id="submit_button" class="btn btn-{{ configuration.priority }} btn-lg" type="submit">
+            <button id="submit_button" class="btn btn-{{ configuration.priority }} btn-lg shadow-sm" type="submit">
                 {{ '{campusmultiauth:login}'|trans }}
             </button>
         {% endif %}
diff --git a/templates/includes/searchbox.twig b/templates/includes/searchbox.twig
index 66a1d854274352185f44cb6f55e7bca93f0eb290..16f24c0c5453fc1391f11cccc45276db52b5f353 100644
--- a/templates/includes/searchbox.twig
+++ b/templates/includes/searchbox.twig
@@ -17,7 +17,7 @@
             {% if muni_jvs %}
                 inp-text js-suggest searchbox-input input-height selectized color-border-{{ configuration.priority }}
             {% else %}
-                border border-2 input-height rounded border-{% if configuration.priority == 'primary' %}dark{% else %}muted{% endif %}
+                border border-2 input-height shadow-sm rounded border-{% if configuration.priority == 'primary' %}dark{% else %}muted{% endif %}
             {% endif %}">
 
         {% if prev_idps is not null %}