diff --git a/netbox/core/views.py b/netbox/core/views.py
index c766fdf80..3e9f9ff9d 100644
--- a/netbox/core/views.py
+++ b/netbox/core/views.py
@@ -22,7 +22,7 @@ from rq.worker_registration import clean_worker_registry
 
 from core.utils import delete_rq_job, enqueue_rq_job, get_rq_jobs_from_status, requeue_rq_job, stop_rq_job
 from netbox.config import get_config, PARAMS
-from netbox.object_actions import BulkDelete, BulkExport
+from netbox.object_actions import Add, BulkDelete, BulkExport, Delete
 from netbox.registry import registry
 from netbox.views import generic
 from netbox.views.generic.base import BaseObjectView
@@ -145,6 +145,7 @@ class DataFileListView(generic.ObjectListView):
 @register_model_view(DataFile)
 class DataFileView(generic.ObjectView):
     queryset = DataFile.objects.all()
+    actions = (Delete,)
 
 
 @register_model_view(DataFile, 'delete')
@@ -175,6 +176,7 @@ class JobListView(generic.ObjectListView):
 @register_model_view(Job)
 class JobView(generic.ObjectView):
     queryset = Job.objects.all()
+    actions = (Delete,)
 
 
 @register_model_view(Job, 'delete')
@@ -268,6 +270,7 @@ class ConfigRevisionListView(generic.ObjectListView):
     filterset = filtersets.ConfigRevisionFilterSet
     filterset_form = forms.ConfigRevisionFilterForm
     table = tables.ConfigRevisionTable
+    actions = (Add, BulkExport)
 
 
 @register_model_view(ConfigRevision)
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 582db2701..4c40323f2 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2108,6 +2108,7 @@ class DeviceListView(generic.ObjectListView):
     filterset = filtersets.DeviceFilterSet
     filterset_form = forms.DeviceFilterForm
     table = tables.DeviceTable
+    actions = (Add, BulkImport, BulkExport, BulkEdit, BulkRename, BulkDelete)
     template_name = 'dcim/device_list.html'
 
 
diff --git a/netbox/templates/core/datafile.html b/netbox/templates/core/datafile.html
index 175a0e2bc..0747547b1 100644
--- a/netbox/templates/core/datafile.html
+++ b/netbox/templates/core/datafile.html
@@ -11,12 +11,6 @@
   <li class="breadcrumb-item"><a href="{% url 'core:datafile_list' %}?source_id={{ object.source.pk }}">{{ object.source }}</a></li>
 {% endblock %}
 
-{% block control-buttons %}
-  {% if request.user|can_delete:object %}
-    {% delete_button object %}
-  {% endif %}
-{% endblock control-buttons %}
-
 {% block content %}
   <div class="row mb-3">
     <div class="col">
diff --git a/netbox/templates/core/job.html b/netbox/templates/core/job.html
index a38c3650a..49fa0231a 100644
--- a/netbox/templates/core/job.html
+++ b/netbox/templates/core/job.html
@@ -22,12 +22,6 @@
   {% endif %}
 {% endblock breadcrumbs %}
 
-{% block control-buttons %}
-  {% if request.user|can_delete:object %}
-    {% delete_button object %}
-  {% endif %}
-{% endblock control-buttons %}
-
 {% block content %}
   <div class="row mb-3">
     <div class="col col-12 col-md-6">
diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
index 493b652f5..a8b8a91c0 100644
--- a/netbox/templates/dcim/device_list.html
+++ b/netbox/templates/dcim/device_list.html
@@ -75,15 +75,9 @@
       </ul>
     </div>
   {% endif %}
-  {% if 'bulk_edit' in actions %}
-    <div class="btn-group" role="group">
-      {% bulk_edit_button model query_params=request.GET %}
-      <button type="submit" name="_rename" {% formaction %}="{% url 'dcim:device_bulk_rename' %}?return_url={% url 'dcim:device_list' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-outline-warning btn-float">
-        <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename" %}
-      </button>
-    </div>
-  {% endif %}
-  {% if 'bulk_delete' in actions %}
-    {% bulk_delete_button model query_params=request.GET %}
-  {% endif %}
+  <div class="bulk-action-buttons">
+    {% for name, action in actions.items %}
+      {% bulk_action_button action model %}
+    {% endfor %}
+  </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index cce005ed1..da5a812a2 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -1,18 +1,8 @@
 {% extends 'generic/object.html' %}
-{% load buttons %}
 {% load helpers %}
 {% load plugins %}
 {% load i18n %}
 
-{% block buttons %}
-  {% if perms.dcim.change_virtualchassis %}
-    {% edit_button object %}
-  {% endif %}
-  {% if perms.dcim.delete_virtualchassis %}
-    {% delete_button object %}
-  {% endif %}
-{% endblock %}
-
 {% block content %}
 <div class="row">
 	<div class="col col-12 col-md-4">