diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php
index 2ff13e2ea7..05eb3521d6 100644
--- a/libraries/classes/CentralColumns.php
+++ b/libraries/classes/CentralColumns.php
@@ -947,20 +947,18 @@ class CentralColumns
             'text_dir' => $text_dir,
             'form_name' => 'tableslistcontainer',
         ]);
-        $html_output .= Generator::getButtonOrImage(
-            'edit_central_columns',
-            'mult_submit change_central_columns',
-            __('Edit'),
-            'b_edit',
-            'edit central columns'
-        );
-        $html_output .= Generator::getButtonOrImage(
-            'delete_central_columns',
-            'mult_submit',
-            __('Delete'),
-            'b_drop',
-            'remove_from_central_columns'
-        );
+
+        $html_output .= '<button class="btn btn-link mult_submit change_central_columns" type="submit"'
+            . ' name="edit_central_columns" value="edit central columns"'
+            . ' title="' . __('Edit') . '">' . "\n"
+            . Generator::getIcon('b_edit', __('Edit'))
+            . '</button>' . "\n";
+
+        $html_output .= '<button class="btn btn-link mult_submit" type="submit"'
+            . ' name="delete_central_columns" value="remove_from_central_columns"'
+            . ' title="' . __('Delete') . '">' . "\n"
+            . Generator::getIcon('b_drop', __('Delete'))
+            . '</button>' . "\n";
 
         return $html_output;
     }
diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php
index 9963939b23..f1478dcacd 100644
--- a/test/classes/CentralColumnsTest.php
+++ b/test/classes/CentralColumnsTest.php
@@ -673,20 +673,18 @@ class CentralColumnsTest extends AbstractTestCase
         $this->assertStringContainsString(__('Click to sort.'), $result);
         $this->assertStringContainsString(Url::getHiddenInputs($db), $result);
         $this->assertStringContainsString(Url::getHiddenInputs($db), $result);
-        $editSelectedButton = Generator::getButtonOrImage(
-            'edit_central_columns',
-            'mult_submit change_central_columns',
-            __('Edit'),
-            'b_edit',
-            'edit central columns'
-        );
-        $deleteSelectedButton = Generator::getButtonOrImage(
-            'delete_central_columns',
-            'mult_submit',
-            __('Delete'),
-            'b_drop',
-            'remove_from_central_columns'
-        );
+        $editSelectedButton = '            <button class="btn btn-link mult_submit change_central_columns"'
+            . ' type="submit" name="edit_central_columns"' . "\n"
+            . '                    value="edit central columns" title="' . __('Edit') . '">' . "\n"
+            . '                ' . Generator::getIcon('b_edit', __('Edit')) . "\n"
+            . '            </button>' . "\n";
+
+        $deleteSelectedButton = '            <button class="btn btn-link mult_submit" type="submit"'
+            . ' name="delete_central_columns"' . "\n"
+            . '                    value="remove_from_central_columns" title="' . __('Delete') . '">' . "\n"
+            . '                ' . Generator::getIcon('b_drop', __('Delete')) . "\n"
+            . '            </button>' . "\n";
+
         $this->assertStringContainsString($editSelectedButton, $result);
         $this->assertStringContainsString($deleteSelectedButton, $result);
         // test for empty table