diff --git a/suit/templates/reversion/change_list.html b/suit/templates/reversion/change_list.html
index 3c52938a..ec9c4ca2 100644
--- a/suit/templates/reversion/change_list.html
+++ b/suit/templates/reversion/change_list.html
@@ -1,9 +1,9 @@
 {% extends "admin/change_list.html" %}
-{% load i18n %}
+{% load i18n admin_urls %}
 
 {% block object-tools-items %}
 {% if not is_popup %}
-<a href="{{ recoverlist_url }}" class="recoverlink btn">
+<a href="{% url opts|admin_urlname:'recoverlist' %}" class="recoverlink btn">
     <i class="icon-repeat"></i>&nbsp;
     {% blocktrans with cl.opts.verbose_name_plural|escape as name %}Recover deleted {{ name }}{% endblocktrans %}</a>
 {% endif %}
diff --git a/suit/templates/reversion/recover_form.html b/suit/templates/reversion/recover_form.html
index cc6e0ec4..8c551366 100644
--- a/suit/templates/reversion/recover_form.html
+++ b/suit/templates/reversion/recover_form.html
@@ -1,6 +1,6 @@
 {% extends "reversion/revision_form.html" %}
 {% load url from suit_compat %}
-{% load i18n %}
+{% load i18n admin_urls %}
 
 
 {% block breadcrumbs %}
@@ -9,15 +9,22 @@
         <span class="divider">&raquo;</span></li>
     <li><a href="{% url 'admin:app_list' app_label %}">{{ app_label|capfirst|escape }}</a>
         <span class="divider">&raquo;</span></li>
-    <li><a href="{{changelist_url}}">{{opts.verbose_name_plural|capfirst}}</a>
+    <li><a href="{% url opts|admin_urlname:'changelist' %}">{{opts.verbose_name_plural|capfirst}}</a>
         <span class="divider">&raquo;</span></li>
-    <li><a href="{{recoverlist_url}}">{% blocktrans with opts.verbose_name_plural as name %}Recover deleted {{name}}{% endblocktrans %}</a>
+    <li><a href="{% url opts|admin_urlname:'recoverlist' %}">{% blocktrans with opts.verbose_name_plural as name %}Recover deleted {{name}}{% endblocktrans %}</a>
         <span class="divider">&raquo;</span></li>
     <li class="active">{{title}}</li>
 </ul>
 {% endblock %}
 
 
+{% block object-tools %}{% endblock %}
+
+
 {% block form_top %}
 <div class="alert alert-info">{% blocktrans %}Press the save button below to recover this version of the object.{% endblocktrans %}</div>
 {% endblock %}
+
+
+{% block submit_buttons_top %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %}
+{% block submit_buttons_bottom %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %}
diff --git a/suit/templates/reversion/recover_list.html b/suit/templates/reversion/recover_list.html
index 78fbc9d8..3cdd4cc2 100644
--- a/suit/templates/reversion/recover_list.html
+++ b/suit/templates/reversion/recover_list.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 {% load url from suit_compat %}
-{% load i18n %}
+{% load i18n admin_url %}
 
 
 {% block breadcrumbs %}
@@ -9,7 +9,7 @@
         <span class="divider">&raquo;</span></li>
     <li><a href="{% url 'admin:app_list' app_label %}">{{ app_label|capfirst|escape }}</a>
         <span class="divider">&raquo;</span></li>
-    <li><a href="{{changelist_url}}">{{opts.verbose_name_plural|capfirst}}</a>
+    <li><a href="{% url opts|admin_urlname:'changelist' %}">{{opts.verbose_name_plural|capfirst}}</a>
         <span class="divider">&raquo;</span></li>
     <li class="active">{% blocktrans with opts.verbose_name_plural|escape as name %}Recover deleted {{name}}{% endblocktrans %}</li>
 </ul>
diff --git a/suit/templates/reversion/revision_form.html b/suit/templates/reversion/revision_form.html
index ecaba8b3..8084db60 100644
--- a/suit/templates/reversion/revision_form.html
+++ b/suit/templates/reversion/revision_form.html
@@ -1,6 +1,6 @@
 {% extends "admin/change_form.html" %}
 {% load url from suit_compat %}
-{% load i18n %}
+{% load i18n admin_urls %}
 
 
 {% block breadcrumbs %}
@@ -9,24 +9,24 @@
         <span class="divider">&raquo;</span></li>
     <li><a href="{% url 'admin:app_list' app_label %}">{{ app_label|capfirst|escape }}</a>
         <span class="divider">&raquo;</span></li>
-    <li><a href="{{changelist_url}}">{{opts.verbose_name_plural|capfirst}}</a>
+    <li><a href="{% url opts|admin_urlname:'changelist' %}">{{opts.verbose_name_plural|capfirst}}</a>
         <span class="divider">&raquo;</span></li>
-    <li><a href="{{change_url}}">{{original|truncatewords:"18"}}</a>
+    <li><a href="{% url opts|admin_urlname:'change' object_id %}">{{original|truncatewords:"18"}}</a>
         <span class="divider">&raquo;</span></li>
-    <li><a href="../">{% trans "History" %}</a>
+    <li><a href="{% url opts|admin_urlname:'history' object_id %}">{% trans "History" %}</a>
         <span class="divider">&raquo;</span></li>
     <li class="active">{% blocktrans with opts.verbose_name as verbose_name %}Revert {{verbose_name}}{% endblocktrans %}</li>
 </ul>
 {% endblock %}
 
 
-{% block content %}
-{% with 1 as is_popup %}
-{{block.super}}
-{% endwith %}
-{% endblock %}
+{% block object-tools %}{% endblock %}
 
 
 {% block form_top %}
 <div class="alert alert-info">{% blocktrans %}Press the save button below to revert to this version of the object.{% endblocktrans %}</div>
 {% endblock %}
+
+
+{% block submit_buttons_top %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %}
+{% block submit_buttons_bottom %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %}