Not sure if this accounts for swapped models...

cms/templates/cms/page.html

@@ -10,7 +10,7 @@
     {% include_section section %}
   {% endfor %}
 
-  {% if user.is_staff %}
+  {% if perms.cms_page.change %}
     <div class="edit page">
       <a href="{% if page.slug %}{% url 'cms:updatepage' page.slug %}{% else %}{% url 'cms:updatepage' %}{% endif %}"><img src="{% static 'cms/edit.png' %}"></a>
     </div>