diff --git a/core/templates/core/item_editor.html b/core/templates/core/item_editor.html
index 0973ca4..9bf1e55 100644
--- a/core/templates/core/item_editor.html
+++ b/core/templates/core/item_editor.html
@@ -1,10 +1,12 @@
 {% extends 'core/base.html' %}
 {% block content %}
-<a class="btn btn-sm btn-outline-secondary mb-3" href="{{ next_url }}">← zurück</a>
 <form class="card item-card shadow-sm position-relative" method="post" enctype="multipart/form-data" x-data="quickComposer([{% for tag in tags %}'{{ tag.name|escapejs }}'{% if not forloop.last %},{% endif %}{% endfor %}], {{ item.id }})" x-init="text=$el.querySelector('textarea[name=content]').value">
   {% csrf_token %}
   <div class="card-body vstack gap-3">
-    <h1 class="h4">Eintrag #{{ item.id }} im Editor bearbeiten</h1>
+    <div class="d-flex justify-content-between align-items-center gap-2 sticky-top bg-white py-2" style="z-index:5">
+      <h1 class="h5 m-0">Eintrag #{{ item.id }} bearbeiten</h1>
+      <div class="d-flex gap-2"><button class="btn btn-success px-3 py-2" title="Speichern">✓</button><a class="btn btn-danger px-3 py-2" href="{{ next_url }}" title="Abbrechen">×</a></div>
+    </div>
     <div class="small text-muted">Typ: {{ item.get_kind_display }}</div>
     <div class="mobile-tag-picker">
       <button type="button" class="btn btn-sm btn-outline-secondary" @click="showTags=true">Tags hinzufügen</button>
@@ -25,7 +27,7 @@
     </div>
     {% if item.kind == 'link' %}<input class="form-control" type="url" name="url" value="{{ item.url }}" placeholder="URL">{% endif %}
     <template x-if="preview"><div class="small"><span class="text-muted">Bildvorschau:</span><br><img :src="preview" class="img-thumbnail mt-1" style="max-height:180px"></div></template>
-    <div class="d-flex gap-2"><button class="btn btn-dark">Speichern</button><a class="btn btn-outline-secondary" href="{{ next_url }}">Abbrechen</a></div>
+    <div class="d-flex gap-2 d-none d-md-flex"><button class="btn btn-dark">Speichern</button><a class="btn btn-outline-secondary" href="{{ next_url }}">Abbrechen</a></div>
   </div>
 </form>
 {% endblock %}
diff --git a/core/templates/core/new_item.html b/core/templates/core/new_item.html
index 3979964..9b2676b 100644
--- a/core/templates/core/new_item.html
+++ b/core/templates/core/new_item.html
@@ -6,7 +6,7 @@
   <div class="card-body vstack gap-3">
     <div class="d-flex justify-content-between align-items-center gap-2 sticky-top bg-white py-2" style="z-index:5">
       <h1 class="h5 m-0">{% if requested_kind == 'todo' %}Aufgabe erstellen{% elif requested_kind == 'link' %}Link erstellen{% elif requested_kind == 'journal' %}Journal-Eintrag erstellen{% else %}Notiz erstellen{% endif %}</h1>
-      <div class="btn-group btn-group-sm"><a class="btn btn-outline-secondary" href="{{ next_url }}">Abbrechen</a><button class="btn btn-dark">Speichern</button></div>
+      <div class="d-flex gap-2"><button class="btn btn-success px-3 py-2" title="Speichern">✓</button><a class="btn btn-danger px-3 py-2" href="{{ next_url }}" title="Abbrechen">×</a></div>
     </div>
     <div class="mobile-tag-picker">
       <button type="button" class="btn btn-sm btn-outline-secondary" @click="showTags=true">Tags hinzufügen</button>