diff --git a/core/admin/mailu/ui/templates/admin/create.html b/core/admin/mailu/ui/templates/admin/create.html
index 8d3a7b58..6c2413bc 100644
--- a/core/admin/mailu/ui/templates/admin/create.html
+++ b/core/admin/mailu/ui/templates/admin/create.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block content %}
-{% call macros.box() %}
+{% call macros.card() %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.admin, class_='mailselect') }}
diff --git a/core/admin/mailu/ui/templates/alias/create.html b/core/admin/mailu/ui/templates/alias/create.html
index 38d7e7e5..4b0ea3e2 100644
--- a/core/admin/mailu/ui/templates/alias/create.html
+++ b/core/admin/mailu/ui/templates/alias/create.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-{% call macros.box() %}
+{% call macros.card() %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }}
diff --git a/core/admin/mailu/ui/templates/announcement.html b/core/admin/mailu/ui/templates/announcement.html
index 7dd34d3f..acdbde1a 100644
--- a/core/admin/mailu/ui/templates/announcement.html
+++ b/core/admin/mailu/ui/templates/announcement.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block content %}
-{% call macros.box() %}
+{% call macros.card() %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.announcement_subject) }}
diff --git a/core/admin/mailu/ui/templates/client.html b/core/admin/mailu/ui/templates/client.html
index 81bee135..ee1b1c28 100644
--- a/core/admin/mailu/ui/templates/client.html
+++ b/core/admin/mailu/ui/templates/client.html
@@ -9,7 +9,7 @@ configure your email client
 {% endblock %}
 
 {% block content %}
-{% call macros.box(title="Incoming mail") %}
+{% call macros.card(title="Incoming mail") %}
 <table class="table table-bordered">
   <tbody>
     <tr>
@@ -36,7 +36,7 @@ configure your email client
 </table>
 {% endcall %}
 
-{% call macros.box(title="Outgoing mail") %}
+{% call macros.card(title="Outgoing mail") %}
 <table class="table table-bordered">
   <tbody>
     <tr>
diff --git a/core/admin/mailu/ui/templates/confirm.html b/core/admin/mailu/ui/templates/confirm.html
index 3b8a451f..d0f6acf3 100644
--- a/core/admin/mailu/ui/templates/confirm.html
+++ b/core/admin/mailu/ui/templates/confirm.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-{% call macros.box(theme="warning") %}
+{% call macros.card(theme="warning") %}
 <p>{% trans action %}You are about to {{ action }}. Please confirm your action.{% endtrans %}</p>
 {{ macros.form(form) }}
 {% endcall %}
diff --git a/core/admin/mailu/ui/templates/domain/create.html b/core/admin/mailu/ui/templates/domain/create.html
index d67e3e89..d84159b1 100644
--- a/core/admin/mailu/ui/templates/domain/create.html
+++ b/core/admin/mailu/ui/templates/domain/create.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block content %}
-{% call macros.box() %}
+{% call macros.card() %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.name) }}
diff --git a/core/admin/mailu/ui/templates/domain/signup.html b/core/admin/mailu/ui/templates/domain/signup.html
index c8a52f6c..77b7fec9 100644
--- a/core/admin/mailu/ui/templates/domain/signup.html
+++ b/core/admin/mailu/ui/templates/domain/signup.html
@@ -9,7 +9,7 @@
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
 
-  {% call macros.box(title="Requirements") %}
+  {% call macros.card(title="Requirements") %}
   <p>{% trans %}In order to register a new domain, you must first setup the
     domain zone so that the domain <code>MX</code> points to this server{% endtrans %}
     (<code>{{ config["HOSTNAMES"].split(",")[0] }}</code>).
@@ -22,7 +22,7 @@
   </p>
   {% endcall %}
 
-  {% call macros.box() %}
+  {% call macros.card() %}
   {% if form.localpart %}
   {{ macros.form_fields((form.localpart, form.name), append='<span class="input-group-addon">@</span>') }}
   {{ macros.form_fields((form.pw, form.pw2)) }}
diff --git a/core/admin/mailu/ui/templates/fetch/create.html b/core/admin/mailu/ui/templates/fetch/create.html
index bc69fc44..ed190961 100644
--- a/core/admin/mailu/ui/templates/fetch/create.html
+++ b/core/admin/mailu/ui/templates/fetch/create.html
@@ -11,7 +11,7 @@
 {% block content %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
-  {% call macros.box(title="Remote server") %}
+  {% call macros.card(title="Remote server") %}
   {{ macros.form_field(form.protocol) }}
   {{ macros.form_fields((form.host, form.port)) }}
   {{ macros.form_field(form.tls) }}
@@ -22,7 +22,7 @@
   {{ macros.form_field(form.password) }}
   {% endcall %}
 
-  {% call macros.box(title="Settings") %}
+  {% call macros.card(title="Settings") %}
   {{ macros.form_field(form.keep) }}
   {% endcall %}
 
diff --git a/core/admin/mailu/ui/templates/form.html b/core/admin/mailu/ui/templates/form.html
index 25d7e83c..0e65ce33 100644
--- a/core/admin/mailu/ui/templates/form.html
+++ b/core/admin/mailu/ui/templates/form.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-{% call macros.box() %}
+{% call macros.card() %}
 {{ macros.form(form) }}
 {% endcall %}
 {% endblock %}
diff --git a/core/admin/mailu/ui/templates/manager/create.html b/core/admin/mailu/ui/templates/manager/create.html
index e3911642..bc5e6ca9 100644
--- a/core/admin/mailu/ui/templates/manager/create.html
+++ b/core/admin/mailu/ui/templates/manager/create.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-{% call macros.box() %}
+{% call macros.card() %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.manager, class_='mailselect') }}
diff --git a/core/admin/mailu/ui/templates/user/create.html b/core/admin/mailu/ui/templates/user/create.html
index ed7b9884..a28c7048 100644
--- a/core/admin/mailu/ui/templates/user/create.html
+++ b/core/admin/mailu/ui/templates/user/create.html
@@ -12,7 +12,7 @@
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
 
-  {% call macros.box(_("General")) %}
+  {% call macros.card(_("General")) %}
   {{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }}
   {{ macros.form_fields((form.pw, form.pw2)) }}
   {{ macros.form_field(form.displayed_name) }}
@@ -20,7 +20,7 @@
   {{ macros.form_field(form.enabled) }}
   {% endcall %}
 
-  {% call macros.box(_("Features and quotas"), theme="success") %}
+  {% call macros.card(_("Features and quotas"), theme="success") %}
   {{ macros.form_field(form.quota_bytes, step=1000000000, max=(max_quota_bytes or domain.max_quota_bytes or 50000000000),
       prepend='<span class="input-group-addon"><span id="quota">'+((form.quota_bytes.data//1000000000).__str__() if form.quota_bytes.data else '∞')+'</span> GiB</span>',
       oninput='$("#quota").text(this.value == 0  ? "∞" : this.value/1000000000);') }}
diff --git a/core/admin/mailu/ui/templates/user/forward.html b/core/admin/mailu/ui/templates/user/forward.html
index 769d439d..6059f0ed 100644
--- a/core/admin/mailu/ui/templates/user/forward.html
+++ b/core/admin/mailu/ui/templates/user/forward.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-{% call macros.box() %}
+{% call macros.card() %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.forward_enabled,
diff --git a/core/admin/mailu/ui/templates/user/reply.html b/core/admin/mailu/ui/templates/user/reply.html
index 7225a178..7a6b7fa8 100644
--- a/core/admin/mailu/ui/templates/user/reply.html
+++ b/core/admin/mailu/ui/templates/user/reply.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-{% call macros.box() %}
+{% call macros.card() %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.reply_enabled,
diff --git a/core/admin/mailu/ui/templates/user/signup.html b/core/admin/mailu/ui/templates/user/signup.html
index f540d660..2b20bde9 100644
--- a/core/admin/mailu/ui/templates/user/signup.html
+++ b/core/admin/mailu/ui/templates/user/signup.html
@@ -11,7 +11,7 @@
 {% block content %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
-  {% call macros.box() %}
+  {% call macros.card() %}
   {{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }}
   {{ macros.form_fields((form.pw, form.pw2)) }}
   {% if form.captcha %}