diff --git a/site/plugins/admin/templates/content/entries/index.html b/site/plugins/admin/templates/content/entries/index.html
index e326f0e7..a3f1ba3e 100644
--- a/site/plugins/admin/templates/content/entries/index.html
+++ b/site/plugins/admin/templates/content/entries/index.html
@@ -104,7 +104,7 @@
                 {% endfor %}
             </div>
         {% else %}
-            <table>
+            <table class="table">
                 <tbody>
                     {% for entry in entries_list %}
                         <tr>
diff --git a/site/plugins/admin/templates/extends/fieldsets/index.html b/site/plugins/admin/templates/extends/fieldsets/index.html
index e368da49..8299698c 100644
--- a/site/plugins/admin/templates/extends/fieldsets/index.html
+++ b/site/plugins/admin/templates/extends/fieldsets/index.html
@@ -2,7 +2,7 @@
 
 {% block content %}
     {% if fieldsets_list | length > 0 %}
-        <table>
+        <table class="table">
             <tbody>
                 {% for id, title in fieldsets_list %}
                     {% set fieldset_path = PATH_FIELDSETS ~ '/' ~ id ~ '.yaml' %}
diff --git a/site/plugins/admin/templates/extends/plugins/index.html b/site/plugins/admin/templates/extends/plugins/index.html
index 34d66a10..99b0204a 100644
--- a/site/plugins/admin/templates/extends/plugins/index.html
+++ b/site/plugins/admin/templates/extends/plugins/index.html
@@ -2,7 +2,7 @@
 
 {% block content %}
     {% if (plugins_list | length > 0) %}
-        <table>
+        <table class="table">
             <tbody>
                 {% for key, plugin in plugins_list %}
                     <tr>
diff --git a/site/plugins/admin/templates/extends/snippets/index.html b/site/plugins/admin/templates/extends/snippets/index.html
index 0e059678..36e8d030 100644
--- a/site/plugins/admin/templates/extends/snippets/index.html
+++ b/site/plugins/admin/templates/extends/snippets/index.html
@@ -2,7 +2,7 @@
 
 {% block content %}
     {% if snippets_list | length > 0 %}
-        <table>
+        <table class="table">
             <tbody>
                 {% for id in snippets_list %}
                     <tr>
diff --git a/site/plugins/admin/templates/extends/themes/index.html b/site/plugins/admin/templates/extends/themes/index.html
index 747393d7..5e75cf30 100644
--- a/site/plugins/admin/templates/extends/themes/index.html
+++ b/site/plugins/admin/templates/extends/themes/index.html
@@ -2,7 +2,7 @@
 
 {% block content %}
     {% if (themes_list | length > 0) %}
-        <table>
+        <table class="table">
             <tbody>
                 {% for key, theme in themes_list %}
                     <tr>
diff --git a/site/plugins/admin/templates/extends/themes/information.html b/site/plugins/admin/templates/extends/themes/information.html
index b32dae14..87c91f59 100644
--- a/site/plugins/admin/templates/extends/themes/information.html
+++ b/site/plugins/admin/templates/extends/themes/information.html
@@ -1,7 +1,7 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-    <table>
+    <table class="table">
         <tbody>
             <tr>
                 <td>{{ tr('admin_name') }}:</td>
diff --git a/site/plugins/admin/templates/extends/themes/templates/index.html b/site/plugins/admin/templates/extends/themes/templates/index.html
index 182dda9e..c3928f0d 100644
--- a/site/plugins/admin/templates/extends/themes/templates/index.html
+++ b/site/plugins/admin/templates/extends/themes/templates/index.html
@@ -3,7 +3,7 @@
 {% block content %}
     {% if (templates_list | length > 0) 
         or(partials_list | length > 0) %}
-        <table>
+        <table class="table">
             <tbody>
                 {% if templates_list | length > 0 %}
                     {% for template in templates_list %}
diff --git a/site/plugins/admin/templates/system/api/delivery/add.html b/site/plugins/admin/templates/system/api/delivery/add.html
index 1340422f..ae79791c 100644
--- a/site/plugins/admin/templates/system/api/delivery/add.html
+++ b/site/plugins/admin/templates/system/api/delivery/add.html
@@ -56,8 +56,7 @@
                     </select>
                 </div>
                 <div class="mb-2">
-                    <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
-                    <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button button--white">
+                    <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button mr-3">
                 </div>
             </div>
         </div>