diff --git a/src/c3nav/editor/templates/editor/index.html b/src/c3nav/editor/templates/editor/index.html
index b24d8fe8..3361d60e 100644
--- a/src/c3nav/editor/templates/editor/index.html
+++ b/src/c3nav/editor/templates/editor/index.html
@@ -1,14 +1,16 @@
 {% load bootstrap3 %}
 {% load i18n %}
 
-{% if can_edit %}
-    <a class="btn btn-default btn-sm pull-right" accesskey="n" href="{% url 'editor.levels.create' %}">
-        {% trans 'Level' as model_title %}
-        {% blocktrans %}New {{ model_title }}{% endblocktrans %}
-    </a>
-{% endif %}
-<h3>{% trans 'Level' %}</h3>
+<h3>{% trans 'Levels' %}</h3>
 {% bootstrap_messages %}
+{% if can_edit %}
+    <p>
+        <a class="btn btn-default btn-xs" accesskey="n" href="{% url 'editor.levels.create' %}">
+            {% trans 'Level' as model_title %}
+            <i class="glyphicon glyphicon-plus"></i> {% blocktrans %}New {{ model_title }}{% endblocktrans %}
+        </a>
+    </p>
+{% endif %}
 <div class="list-group">
     {% for l in levels %}
         <a href="{% url 'editor.levels.detail' pk=l.pk %}" class="list-group-item">
diff --git a/src/c3nav/editor/templates/editor/level.html b/src/c3nav/editor/templates/editor/level.html
index d7873faf..9cf643bf 100644
--- a/src/c3nav/editor/templates/editor/level.html
+++ b/src/c3nav/editor/templates/editor/level.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% include 'editor/fragment_levels.html' %}
 
-<a class="btn btn-default btn-sm pull-right" accesskey="e" href="{% url 'editor.levels.edit' pk=level.pk %}">
-    {% trans 'Level' as model_title %}
-    {% blocktrans %}Edit {{ model_title }}{% endblocktrans %}
-</a>
 <h3>
     {{ level.title }}
     {% if level.on_top_of != None %}
@@ -14,6 +10,12 @@
         {% endwith %}
     {% endif %}
 </h3>
+<p>
+    <a class="btn btn-default btn-xs" accesskey="e" href="{% url 'editor.levels.edit' pk=level.pk %}">
+        {% trans 'Level' as model_title %}
+        <i class="glyphicon glyphicon-pencil"></i> {% blocktrans %}Edit {{ model_title }}{% endblocktrans %}
+    </a>
+</p>
 <p>
     {% if level.on_top_of == None %}
         <a href="{% url 'editor.index' %}">&laquo; {% trans 'back to overview' %}</a>
@@ -28,12 +30,14 @@
 <div class="clearfix"></div>
 
 {% if level.on_top_of is None %}
-    {% if can_edit %}
-        <a class="btn btn-default btn-sm pull-right" accesskey="n" href="{% url 'editor.levels_on_top.create' on_top_of=level.pk %}">
-            {% blocktrans %}New {{ model_title }}{% endblocktrans %}
-        </a>
-    {% endif %}
     <h3>{% trans 'Levels on top' %}</h3>
+    {% if can_edit %}
+        <p>
+            <a class="btn btn-default btn-xs" accesskey="n" href="{% url 'editor.levels_on_top.create' on_top_of=level.pk %}">
+                <i class="glyphicon glyphicon-plus"></i> {% blocktrans %}New {{ model_title }}{% endblocktrans %}
+            </a>
+        </p>
+    {% endif %}
     <div class="list-group">
     {% for l in levels_on_top %}
         <a href="{% url 'editor.levels.detail' pk=l.pk %}" class="list-group-item">
diff --git a/src/c3nav/editor/templates/editor/list.html b/src/c3nav/editor/templates/editor/list.html
index 832e41eb..ef72a23c 100644
--- a/src/c3nav/editor/templates/editor/list.html
+++ b/src/c3nav/editor/templates/editor/list.html
@@ -3,11 +3,6 @@
 
 {% include 'editor/fragment_levels.html' %}
 
-{% if can_edit %}
-    <a class="btn btn-default btn-sm pull-right" accesskey="n" href="{{ create_url }}">
-        {% blocktrans %}New {{ model_title }}{% endblocktrans %}
-    </a>
-{% endif %}
 <h3>
     {{ model_title_plural }}
     {% if level %}
@@ -22,6 +17,11 @@
     {% endif %}
 </h3>
 {% bootstrap_messages %}
+{% if can_edit %}
+    <a class="btn btn-default btn-xs" accesskey="n" href="{{ create_url }}">
+        <i class="glyphicon glyphicon-plus"></i> {% blocktrans %}New {{ model_title }}{% endblocktrans %}
+    </a>
+{% endif %}
 
 {% if explicit_edit %}
     {% trans 'Details' as edit_caption %}
diff --git a/src/c3nav/editor/templates/editor/space.html b/src/c3nav/editor/templates/editor/space.html
index 2b04b5fd..cad93e75 100644
--- a/src/c3nav/editor/templates/editor/space.html
+++ b/src/c3nav/editor/templates/editor/space.html
@@ -2,11 +2,13 @@
 {% load i18n %}
 {% include 'editor/fragment_levels.html' %}
 
-<a class="btn btn-default btn-sm pull-right" accesskey="e" href="{% url 'editor.spaces.edit' level=space.level.pk pk=space.pk %}">
-    {% trans 'Space' as model_title %}
-    {% blocktrans %}Edit {{ model_title }}{% endblocktrans %}
-</a>
 <h3>{{ space.title }}</h3>
+<p>
+    <a class="btn btn-default btn-xs" accesskey="e" href="{% url 'editor.spaces.edit' level=space.level.pk pk=space.pk %}">
+        {% trans 'Space' as model_title %}
+        <i class="glyphicon glyphicon-pencil"></i> {% blocktrans %}Edit {{ model_title }}{% endblocktrans %}
+    </a>
+</p>
 <p>
     <a href="{% url 'editor.spaces.list' level=space.level.pk %}">&laquo; {% trans 'back to overview' %}</a>
 </p>