diff --git a/templates/database/qbe/ins_del_and_or_cell.twig b/templates/database/qbe/ins_del_and_or_cell.twig
index 3a54d04657..29beef66bd 100644
--- a/templates/database/qbe/ins_del_and_or_cell.twig
+++ b/templates/database/qbe/ins_del_and_or_cell.twig
@@ -1,26 +1,26 @@
 <td class="value nowrap">
-  <table class="pma-table nospacing nopadding">
+  <table class="table table-borderless table-sm">
     <tr>
-      <td class="value nowrap">
+      <td class="value nowrap p-0">
         <small>{% trans 'Ins:' %}</small>
         <input type="checkbox" name="criteriaRowInsert[{{ row_index }}]" aria-label="{% trans 'Insert' %}">
       </td>
-      <td class="value">
+      <td class="value p-0">
         <strong>{% trans 'And:' %}</strong>
       </td>
-      <td>
+      <td class="p-0">
         <input type="radio" name="criteriaAndOrRow[{{ row_index }}]" value="and"{{ checked_options.and ? ' checked' }} aria-label="{% trans 'And' %}">
       </td>
     </tr>
     <tr>
-      <td class="value nowrap">
+      <td class="value nowrap p-0">
         <small>{% trans 'Del:' %}</small>
         <input type="checkbox" name="criteriaRowDelete[{{ row_index }}]" aria-label="{% trans 'Delete' %}">
       </td>
-      <td class="value">
+      <td class="value p-0">
         <strong>{% trans 'Or:' %}</strong>
       </td>
-      <td>
+      <td class="p-0">
         <input type="radio" name="criteriaAndOrRow[{{ row_index }}]" value="or"{{ checked_options.or ? ' checked' }} aria-label="{% trans 'Or' %}">
       </td>
     </tr>
diff --git a/templates/database/qbe/selection_form.twig b/templates/database/qbe/selection_form.twig
index 32a91c3f6b..c58c5c9118 100644
--- a/templates/database/qbe/selection_form.twig
+++ b/templates/database/qbe/selection_form.twig
@@ -6,8 +6,8 @@
 
       {{ saved_searches_field|raw }}
 
-      <div class="responsivetable jsresponsive">
-        <table class="pma-table data w-100">
+      <div class="table-responsive jsresponsive">
+        <table class="table table-borderless table-sm">
           <tr class="noclick">
             <th>{% trans 'Column:' %}</th>
             {{ column_names_row|raw }}