diff --git a/public/themes/bootstrap/scss/_common.scss b/public/themes/bootstrap/scss/_common.scss
index 116f940309..de642b28ce 100644
--- a/public/themes/bootstrap/scss/_common.scss
+++ b/public/themes/bootstrap/scss/_common.scss
@@ -1781,14 +1781,6 @@ div#page_content div {
   }
 }
 
-table.show_create {
-  margin-top: 1em;
-
-  td {
-    border-right: 1px solid #bbb;
-  }
-}
-
 #alias_modal {
   table {
     width: 100%;
diff --git a/public/themes/metro/scss/_common.scss b/public/themes/metro/scss/_common.scss
index af1c4e482f..a63d959a28 100644
--- a/public/themes/metro/scss/_common.scss
+++ b/public/themes/metro/scss/_common.scss
@@ -2050,14 +2050,6 @@ div#page_content div {
   }
 }
 
-table.show_create {
-  margin-top: 1em;
-
-  td {
-    border-right: 1px solid #bbb;
-  }
-}
-
 #alias_modal {
   table th {
     vertical-align: middle;
diff --git a/public/themes/original/scss/_common.scss b/public/themes/original/scss/_common.scss
index cd4b788601..d4a9121c48 100644
--- a/public/themes/original/scss/_common.scss
+++ b/public/themes/original/scss/_common.scss
@@ -1784,14 +1784,6 @@ div#page_content div {
   }
 }
 
-table.show_create {
-  margin-top: 1em;
-
-  td {
-    border-right: 1px solid #bbb;
-  }
-}
-
 #alias_modal {
   table {
     width: 100%;
diff --git a/public/themes/pmahomme/scss/_common.scss b/public/themes/pmahomme/scss/_common.scss
index 43df5ed0fe..3f1652963a 100644
--- a/public/themes/pmahomme/scss/_common.scss
+++ b/public/themes/pmahomme/scss/_common.scss
@@ -1966,14 +1966,6 @@ div#page_content div {
   }
 }
 
-table.show_create {
-  margin-top: 1em;
-
-  td {
-    border-right: 1px solid #bbb;
-  }
-}
-
 #alias_modal {
   table {
     width: 100%;
diff --git a/templates/database/structure/add_prefix.twig b/templates/database/structure/add_prefix.twig
index 1217c00dbb..56fb11c782 100644
--- a/templates/database/structure/add_prefix.twig
+++ b/templates/database/structure/add_prefix.twig
@@ -1,15 +1,7 @@
 <form id="ajax_form" action="{{ url('/database/structure/add-prefix-table') }}" method="post">
   {{ get_hidden_inputs(url_params) }}
-
-  <fieldset class="pma-fieldset input">
-    <table>
-      <tr>
-        <td>{% trans 'Add prefix' %}</td>
-        <td>
-          <input type="text" name="add_prefix" id="txtPrefix" aria-label="{% trans 'Add prefix' %}">
-        </td>
-      </tr>
-      <tr>
-    </table>
-  </fieldset>
+  <div>
+    <label for="addTablePrefixInput" class="form-label">{% trans 'Add prefix' %}</label>
+    <input type="text" class="form-control" id="addTablePrefixInput" name="add_prefix">
+  </div>
 </form>
diff --git a/templates/database/structure/change_prefix_form.twig b/templates/database/structure/change_prefix_form.twig
index 9cd3b18ddd..725ce384a8 100644
--- a/templates/database/structure/change_prefix_form.twig
+++ b/templates/database/structure/change_prefix_form.twig
@@ -1,20 +1,11 @@
 <form id="ajax_form" action="{{ url(route) }}" method="post">
   {{ get_hidden_inputs(url_params) }}
-
-  <fieldset class="pma-fieldset input">
-    <table>
-      <tr>
-        <td>{% trans 'From' %}</td>
-        <td>
-          <input type="text" name="from_prefix" id="initialPrefix">
-        </td>
-      </tr>
-      <tr>
-        <td>{% trans 'To' %}</td>
-        <td>
-          <input type="text" name="to_prefix" id="newPrefix">
-        </td>
-      </tr>
-    </table>
-  </fieldset>
+  <div class="mb-3">
+    <label for="initialPrefixInput" class="form-label">{% trans 'From' %}</label>
+    <input type="text" class="form-control" id="initialPrefixInput" name="from_prefix">
+  </div>
+  <div>
+    <label for="newPrefixInput" class="form-label">{% trans 'To' %}</label>
+    <input type="text" class="form-control" id="newPrefixInput" name="to_prefix">
+  </div>
 </form>
diff --git a/templates/database/structure/copy_form.twig b/templates/database/structure/copy_form.twig
index b53b7638b9..6424f43cf4 100644
--- a/templates/database/structure/copy_form.twig
+++ b/templates/database/structure/copy_form.twig
@@ -1,54 +1,49 @@
 <form id="ajax_form" action="{{ url('/database/structure/copy-table') }}" method="post">
   {{ get_hidden_inputs(url_params) }}
 
-  <fieldset class="pma-fieldset">
-    <strong><label for="db_name_dropdown">{% trans 'Database:' %}</label></strong>
-    <select id="db_name_dropdown" name="target_db">
+  <div class="mb-3">
+    <label for="databaseNameSelect" class="form-label">{% trans 'Database:' %}</label>
+    <select class="form-select" id="databaseNameSelect" name="target_db">
       {% for each_db in options %}
         <option value="{{ each_db.name }}"{{ each_db.is_selected ? ' selected' }}>{{ each_db.name }}</option>
       {% endfor %}
     </select>
+  </div>
 
-    <br><br>
+  <fieldset class="mb-3">
+    <legend class="col-form-label">{% trans 'Options:' %}</legend>
+    <div class="form-check">
+      <input class="form-check-input" type="radio" name="what" id="whatDataRadio" value="data" checked>
+      <label class="form-check-label" for="whatDataRadio">{% trans 'Structure and data' %}</label>
+    </div>
+    <div class="form-check">
+      <input class="form-check-input" type="radio" name="what" id="whatStructureRadio" value="structure">
+      <label class="form-check-label" for="whatStructureRadio">{% trans 'Structure only' %}</label>
+    </div>
+    <div class="form-check">
+      <input class="form-check-input" type="radio" name="what" id="whatDataOnlyRadio" value="dataonly">
+      <label class="form-check-label" for="whatDataOnlyRadio">{% trans 'Data only' %}</label>
+    </div>
+  </fieldset>
 
-    <strong><label>{% trans 'Options:' %}</label></strong>
+  <div class="form-check">
+    <input class="form-check-input" type="checkbox" value="true" name="drop_if_exists" id="addDropTableCheckbox">
+    <label class="form-check-label" for="addDropTableCheckbox">{% trans 'Add DROP TABLE' %}</label>
+  </div>
+  <div class="form-check">
+    <input class="form-check-input" type="checkbox" value="1" name="sql_auto_increment" id="addAutoIncrementCheckbox">
+    <label class="form-check-label" for="addAutoIncrementCheckbox">{% trans 'Add AUTO INCREMENT value' %}</label>
+  </div>
+  <div class="form-check mb-3">
+    <input class="form-check-input" type="checkbox" value="1" name="add_constraints" id="addConstraintsCheckbox" checked>
+    <label class="form-check-label" for="addConstraintsCheckbox">{% trans 'Add constraints' %}</label>
+  </div>
 
-    <br>
-
-    <input type="radio" id="what_structure" value="structure" name="what">
-    <label for="what_structure">{% trans 'Structure only' %}</label>
-
-    <br>
-
-    <input type="radio" id="what_data" value="data" name="what" checked>
-    <label for="what_data">{% trans 'Structure and data' %}</label>
-
-    <br>
-
-    <input type="radio" id="what_dataonly" value="dataonly" name="what">
-    <label for="what_dataonly">{% trans 'Data only' %}</label>
-
-    <br><br>
-
-    <input type="checkbox" id="checkbox_drop" value="true" name="drop_if_exists">
-    <label for="checkbox_drop">{% trans 'Add DROP TABLE' %}</label>
-
-    <br>
-
-    <input type="checkbox" id="checkbox_auto_increment_cp" value="1" name="sql_auto_increment">
-    <label for="checkbox_auto_increment_cp">{% trans 'Add AUTO INCREMENT value' %}</label>
-
-    <br>
-
-    <input type="checkbox" id="checkbox_constraints" value="1" name="sql_auto_increment" checked>
-    <label for="checkbox_constraints">{% trans 'Add constraints' %}</label>
-
-    <br><br>
-
-    <input type="checkbox" name="adjust_privileges" value="1" id="checkbox_adjust_privileges" checked>
-    <label for="checkbox_adjust_privileges">
+  <div class="form-check">
+    <input class="form-check-input" type="checkbox" value="1" name="adjust_privileges" id="adjustPrivilegesCheckbox">
+    <label class="form-check-label" for="adjustPrivilegesCheckbox">
       {% trans 'Adjust privileges' %}
       {{ show_docu('faq', 'faq6-39') }}
     </label>
-  </fieldset>
+  </div>
 </form>
diff --git a/templates/database/structure/drop_form.twig b/templates/database/structure/drop_form.twig
index d7bbdb363e..8a1e5eb0f1 100644
--- a/templates/database/structure/drop_form.twig
+++ b/templates/database/structure/drop_form.twig
@@ -1,23 +1,24 @@
-<form action="{{ url('/database/structure/drop-table') }}" method="post">
-  {{ get_hidden_inputs(url_params) }}
+<div class="container">
+  <form action="{{ url('/database/structure/drop-table') }}" method="post" class="card">
+    {{ get_hidden_inputs(url_params) }}
+    <input type="hidden" name="fk_checks" value="0">
 
-  <fieldset class="pma-fieldset confirmation">
-    <legend>
-      {% trans 'Do you really want to execute the following query?' %}
-    </legend>
+    <div class="card-header">{% trans 'Do you really want to execute the following query?' %}</div>
 
-    <code>{{ full_query|raw }}</code>
-  </fieldset>
+    <div class="card-body">
+      <div class="card mb-3">
+        <div class="card-body"><code>{{ full_query|raw }}</code></div>
+      </div>
 
-  <fieldset class="pma-fieldset tblFooters">
-    <div id="foreignkeychk" class="float-start">
-      <input type="hidden" name="fk_checks" value="0">
-      <input type="checkbox" name="fk_checks" id="fk_checks" value="1"{{ is_foreign_key_check ? ' checked' }}>
-      <label for="fk_checks">{% trans 'Enable foreign key checks' %}</label>
+      <div class="form-check">
+        <input class="form-check-input" type="checkbox" name="fk_checks" id="checkForeignKeyCheckbox" value="1"{{ is_foreign_key_check ? ' checked' }}>
+        <label class="form-check-label" for="checkForeignKeyCheckbox">{% trans 'Enable foreign key checks' %}</label>
+      </div>
     </div>
-    <div class="float-end">
-      <input id="buttonYes" class="btn btn-secondary" type="submit" name="mult_btn" value="{% trans 'Yes' %}">
+
+    <div class="card-footer">
+      <input id="buttonYes" class="btn btn-danger" type="submit" name="mult_btn" value="{% trans 'Yes' %}">
       <input id="buttonNo" class="btn btn-secondary" type="submit" name="mult_btn" value="{% trans 'No' %}">
     </div>
-  </fieldset>
-</form>
+  </form>
+</div>
diff --git a/templates/database/structure/empty_form.twig b/templates/database/structure/empty_form.twig
index 0cf561c165..849d51280a 100644
--- a/templates/database/structure/empty_form.twig
+++ b/templates/database/structure/empty_form.twig
@@ -1,23 +1,24 @@
-<form action="{{ url('/database/structure/empty-table') }}" class="disableAjax" method="post">
-  {{ get_hidden_inputs(url_params) }}
+<div class="container">
+  <form action="{{ url('/database/structure/empty-table') }}" class="card disableAjax" method="post">
+    {{ get_hidden_inputs(url_params) }}
+    <input type="hidden" name="fk_checks" value="0">
 
-  <fieldset class="pma-fieldset confirmation">
-    <legend>
-      {% trans 'Do you really want to execute the following query?' %}
-    </legend>
+    <div class="card-header">{% trans 'Do you really want to execute the following query?' %}</div>
 
-    <code>{{ full_query|raw }}</code>
-  </fieldset>
+    <div class="card-body">
+      <div class="card mb-3">
+        <div class="card-body"><code>{{ full_query|raw }}</code></div>
+      </div>
 
-  <fieldset class="pma-fieldset tblFooters">
-    <div id="foreignkeychk" class="float-start">
-      <input type="hidden" name="fk_checks" value="0">
-      <input type="checkbox" name="fk_checks" id="fk_checks" value="1"{{ is_foreign_key_check ? ' checked' }}>
-      <label for="fk_checks">{% trans 'Enable foreign key checks' %}</label>
+      <div class="form-check">
+        <input class="form-check-input" type="checkbox" name="fk_checks" id="checkForeignKeyCheckbox" value="1"{{ is_foreign_key_check ? ' checked' }}>
+        <label class="form-check-label" for="checkForeignKeyCheckbox">{% trans 'Enable foreign key checks' %}</label>
+      </div>
     </div>
-    <div class="float-end">
-      <input id="buttonYes" class="btn btn-secondary" type="submit" name="mult_btn" value="{% trans 'Yes' %}">
+
+    <div class="card-footer">
+      <input id="buttonYes" class="btn btn-danger" type="submit" name="mult_btn" value="{% trans 'Yes' %}">
       <input id="buttonNo" class="btn btn-secondary" type="submit" name="mult_btn" value="{% trans 'No' %}">
     </div>
-  </fieldset>
-</form>
+  </form>
+</div>
diff --git a/templates/database/structure/show_create.twig b/templates/database/structure/show_create.twig
index 5ebed436fb..bf6368c8f5 100644
--- a/templates/database/structure/show_create.twig
+++ b/templates/database/structure/show_create.twig
@@ -1,47 +1,51 @@
-<div class="show_create_results">
+<div class="container">
   <h2>{% trans 'Showing create queries' %}</h2>
 
   {% if tables.tables is not empty %}
-    <fieldset class="pma-fieldset">
-      <legend>{% trans 'Tables' %}</legend>
-      <table class="table table-striped show_create">
-        <thead>
-          <tr>
-            <th>{% trans 'Table' %}</th>
-            <th>{% trans 'Create table' %}</th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for table in tables.tables %}
+    <div class="card mb-3">
+      <div class="card-header">{% trans 'Tables' %}</div>
+      <div class="card-body">
+        <table class="table">
+          <thead>
             <tr>
-              <td><strong>{{ table.name|raw }}</strong></td>
-              <td>{{ table.show_create|raw }}</td>
+              <th>{% trans 'Table' %}</th>
+              <th>{% trans 'Create table' %}</th>
             </tr>
-          {% endfor %}
-        </tbody>
-      </table>
-    </fieldset>
+          </thead>
+          <tbody>
+            {% for table in tables.tables %}
+              <tr>
+                <td><strong>{{ table.name|raw }}</strong></td>
+                <td>{{ table.show_create|raw }}</td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+    </div>
   {% endif %}
 
   {% if tables.views is not empty %}
-    <fieldset class="pma-fieldset">
-      <legend>{% trans 'Views' %}</legend>
-      <table class="table table-striped show_create">
-        <thead>
-          <tr>
-            <th>{% trans 'View' %}</th>
-            <th>{% trans 'Create view' %}</th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for view in tables.views %}
+    <div class="card">
+      <div class="card-header">{% trans 'Views' %}</div>
+      <div class="card-body">
+        <table class="table">
+          <thead>
             <tr>
-              <td><strong>{{ view.name }}</strong></td>
-              <td>{{ view.show_create|raw }}</td>
+              <th>{% trans 'View' %}</th>
+              <th>{% trans 'Create view' %}</th>
             </tr>
-          {% endfor %}
-        </tbody>
-      </table>
-    </fieldset>
+          </thead>
+          <tbody>
+            {% for view in tables.views %}
+              <tr>
+                <td><strong>{{ view.name }}</strong></td>
+                <td>{{ view.show_create|raw }}</td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+    </div>
   {% endif %}
 </div>