diff --git a/netbox_branching/templates/netbox_branching/branch.html b/netbox_branching/templates/netbox_branching/branch.html
index 75edc00..75eff0c 100644
--- a/netbox_branching/templates/netbox_branching/branch.html
+++ b/netbox_branching/templates/netbox_branching/branch.html
@@ -4,6 +4,7 @@
 {% load plugins %}
 {% load render_table from django_tables2 %}
 {% load i18n %}
+{% load branch_buttons %}
 
 {% block extra_controls %}
   {% if not object.is_active %}
@@ -22,44 +23,12 @@
     </a>
   {% endif %}
   {% if object.ready %}
-    {% if perms.netbox_branching.sync_branch %}
-      <a href="{% url 'plugins:netbox_branching:branch_sync' pk=object.pk %}" class="btn btn-primary">
-        <i class="mdi mdi-sync"></i> {% trans "Sync" %}
-      </a>
-    {% else %}
-      <button type="button" class="btn btn-primary disabled" aria-disabled="true">
-        <i class="mdi mdi-sync"></i> {% trans "Sync" %}
-      </button>
-    {% endif %}
-    {% if perms.netbox_branching.merge_branch %}
-      <a href="{% url 'plugins:netbox_branching:branch_merge' pk=object.pk %}" class="btn btn-primary">
-        <i class="mdi mdi-merge"></i> {% trans "Merge" %}
-      </a>
-    {% else %}
-      <button type="button" class="btn btn-primary disabled" aria-disabled="true">
-        <i class="mdi mdi-merge"></i> {% trans "Merge" %}
-      </button>
-    {% endif %}
+    {% branch_sync_button object %}
+    {% branch_merge_button object %}
   {% endif %}
   {% if object.merged %}
-    {% if perms.netbox_branching.revert_branch %}
-      <a href="{% url 'plugins:netbox_branching:branch_revert' pk=object.pk %}" class="btn btn-primary">
-        <i class="mdi mdi-arrow-u-left-top"></i> {% trans "Revert" %}
-      </a>
-    {% else %}
-      <button type="button" class="btn btn-primary disabled" aria-disabled="true">
-        <i class="mdi mdi-arrow-u-left-top"></i> {% trans "Revert" %}
-      </button>
-    {% endif %}
-    {% if perms.netbox_branching.archive_branch %}
-      <a href="{% url 'plugins:netbox_branching:branch_archive' pk=object.pk %}" class="btn btn-primary">
-        <i class="mdi mdi-archive-outline"></i> {% trans "Archive" %}
-      </a>
-    {% else %}
-      <button type="button" class="btn btn-primary disabled" aria-disabled="true">
-        <i class="mdi mdi-archive-outline"></i> {% trans "Archive" %}
-      </button>
-    {% endif %}
+    {% branch_revert_button object %}
+    {% branch_archive_button object %}
   {% endif %}
 {% endblock %}
 
diff --git a/netbox_branching/templates/netbox_branching/buttons/branch_archive.html b/netbox_branching/templates/netbox_branching/buttons/branch_archive.html
new file mode 100644
index 0000000..1ecbf34
--- /dev/null
+++ b/netbox_branching/templates/netbox_branching/buttons/branch_archive.html
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% if perms.netbox_branching.archive_branch %}
+  <a href="{% url 'plugins:netbox_branching:branch_archive' pk=branch.pk %}" class="btn btn-primary">
+    <i class="mdi mdi-archive-outline"></i> {% trans "Archive" %}
+  </a>
+{% else %}
+  <button type="button" class="btn btn-primary disabled" aria-disabled="true">
+    <i class="mdi mdi-archive-outline"></i> {% trans "Archive" %}
+  </button>
+{% endif %}
diff --git a/netbox_branching/templates/netbox_branching/buttons/branch_merge.html b/netbox_branching/templates/netbox_branching/buttons/branch_merge.html
new file mode 100644
index 0000000..efbb5b0
--- /dev/null
+++ b/netbox_branching/templates/netbox_branching/buttons/branch_merge.html
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% if perms.netbox_branching.merge_branch %}
+  <a href="{% url 'plugins:netbox_branching:branch_merge' pk=branch.pk %}" class="btn btn-primary">
+    <i class="mdi mdi-merge"></i> {% trans "Merge" %}
+  </a>
+{% else %}
+  <button type="button" class="btn btn-primary disabled" aria-disabled="true">
+    <i class="mdi mdi-merge"></i> {% trans "Merge" %}
+  </button>
+{% endif %}
diff --git a/netbox_branching/templates/netbox_branching/buttons/branch_revert.html b/netbox_branching/templates/netbox_branching/buttons/branch_revert.html
new file mode 100644
index 0000000..f004631
--- /dev/null
+++ b/netbox_branching/templates/netbox_branching/buttons/branch_revert.html
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% if perms.netbox_branching.revert_branch %}
+  <a href="{% url 'plugins:netbox_branching:branch_revert' pk=branch.pk %}" class="btn btn-primary">
+    <i class="mdi mdi-arrow-u-left-top"></i> {% trans "Revert" %}
+  </a>
+{% else %}
+  <button type="button" class="btn btn-primary disabled" aria-disabled="true">
+    <i class="mdi mdi-arrow-u-left-top"></i> {% trans "Revert" %}
+  </button>
+{% endif %}
diff --git a/netbox_branching/templates/netbox_branching/buttons/branch_sync.html b/netbox_branching/templates/netbox_branching/buttons/branch_sync.html
new file mode 100644
index 0000000..fcf21bb
--- /dev/null
+++ b/netbox_branching/templates/netbox_branching/buttons/branch_sync.html
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% if perms.netbox_branching.sync_branch %}
+  <a href="{% url 'plugins:netbox_branching:branch_sync' pk=branch.pk %}" class="btn btn-primary">
+    <i class="mdi mdi-sync"></i> {% trans "Sync" %}
+  </a>
+{% else %}
+  <button type="button" class="btn btn-primary disabled" aria-disabled="true">
+    <i class="mdi mdi-sync"></i> {% trans "Sync" %}
+  </button>
+{% endif %}
diff --git a/netbox_branching/templatetags/__init__.py b/netbox_branching/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/netbox_branching/templatetags/branch_buttons.py b/netbox_branching/templatetags/branch_buttons.py
new file mode 100644
index 0000000..2fa62f2
--- /dev/null
+++ b/netbox_branching/templatetags/branch_buttons.py
@@ -0,0 +1,42 @@
+from django import template
+
+__all__ = (
+    'branch_sync_button',
+    'branch_merge_button',
+    'branch_revert_button',
+    'branch_archive_button',
+)
+
+register = template.Library()
+
+
+@register.inclusion_tag('netbox_branching/buttons/branch_sync.html', takes_context=True)
+def branch_sync_button(context, branch):
+    return {
+        'branch': branch,
+        'perms': context.get('perms'),
+    }
+
+
+@register.inclusion_tag('netbox_branching/buttons/branch_merge.html', takes_context=True)
+def branch_merge_button(context, branch):
+    return {
+        'branch': branch,
+        'perms': context.get('perms'),
+    }
+
+
+@register.inclusion_tag('netbox_branching/buttons/branch_revert.html', takes_context=True)
+def branch_revert_button(context, branch):
+    return {
+        'branch': branch,
+        'perms': context.get('perms'),
+    }
+
+
+@register.inclusion_tag('netbox_branching/buttons/branch_archive.html', takes_context=True)
+def branch_archive_button(context, branch):
+    return {
+        'branch': branch,
+        'perms': context.get('perms'),
+    }