diff --git a/src/Scaffold/Console/controller/_list_toolbar.stub b/src/Scaffold/Console/controller/_list_toolbar.stub
index b89b55f87..2092a00e2 100644
--- a/src/Scaffold/Console/controller/_list_toolbar.stub
+++ b/src/Scaffold/Console/controller/_list_toolbar.stub
@@ -1,17 +1,23 @@
-<div data-control="toolbar">
+<div data-control="toolbar loader-container">
     <a
         href="<?= Backend::url('{{namespace_path}}/{{lower_name}}/create') ?>"
-        class="btn btn-primary oc-icon-plus">
-        <?= e(trans('backend::lang.list.create_button', ['name'=>'{{title_singular_name}}'])) ?>
+        class="btn btn-primary">
+        <i class="icon-plus"></i>
+        <?= __("New :name", ['name' => '{{title_singular_name}}']) ?>
     </a>
 
+
+    <div class="toolbar-divider"></div>
+
     <button
-        class="btn btn-danger oc-icon-trash-o"
+        class="btn btn-secondary"
         data-request="onDelete"
+        data-request-message="<?= __("Deleting...") ?>"
+        data-request-confirm="<?= __("Are you sure?") ?>"
         data-list-checked-trigger
         data-list-checked-request
-        data-stripe-load-indicator
         disabled>
-        <?= e(trans('backend::lang.list.delete_selected')) ?>
+        <i class="icon-delete"></i>
+        <?= __("Delete") ?>
     </button>
 </div>