diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb
index 172a87a..949ec06 100644
--- a/app/views/categories/edit.html.erb
+++ b/app/views/categories/edit.html.erb
@@ -1,10 +1,10 @@
 <% content_for :title, "Kategorie bearbeiten" %>
 
 <% content_for :top_bar_actions do %>
-  <%= link_to categories_path, class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
+  <%= link_to "javascript:history.back()", class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
     <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18" /></svg>
     <div class="hidden md:inline">
-      Zurück zur Übersicht
+      Zurück
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb
index 4546fbc..fa7e33c 100644
--- a/app/views/categories/new.html.erb
+++ b/app/views/categories/new.html.erb
@@ -1,10 +1,10 @@
 <% content_for :title, "Kategorien anlegen" %>
 
 <% content_for :top_bar_actions do %>
-  <%= link_to categories_path, class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
+  <%= link_to "javascript:history.back()", class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
     <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18" /></svg>
     <div class="hidden md:inline">
-      Zurück zur Übersicht
+      Zurück
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb
index 549c86c..a76548e 100644
--- a/app/views/categories/show.html.erb
+++ b/app/views/categories/show.html.erb
@@ -1,9 +1,11 @@
 <% content_for :title, "Kategorie: #{@category.name}" %>
 
 <% content_for :top_bar_actions do %>
-  <%= link_to categories_path, class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
+  <%= link_to "javascript:history.back()", class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
     <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18" /></svg>
-    Alle Kategorien
+    <div class="hidden md:inline">
+      Zurück
+    </div>
   <% end %>
 <% end %>
 
diff --git a/app/views/items/edit.html.erb b/app/views/items/edit.html.erb
index 9949b55..e8a828f 100644
--- a/app/views/items/edit.html.erb
+++ b/app/views/items/edit.html.erb
@@ -2,10 +2,12 @@
 
 <!-- OBERE AKTIONSLISTE (Zurück-Button in der Top-Bar) -->
 <% content_for :top_bar_actions do %>
-  <%= link_to item_path(@item), class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
+  <%= link_to "javascript:history.back()", class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
     <!-- Heroicon: arrow-left -->
     <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18" /></svg>
-    Zurück zu den Details
+    <div class="hidden md:inline">
+      Zurück
+    </div>
   <% end %>
 <% end %>
 
diff --git a/app/views/items/new.html.erb b/app/views/items/new.html.erb
index 65bd7ff..584c3b2 100644
--- a/app/views/items/new.html.erb
+++ b/app/views/items/new.html.erb
@@ -2,10 +2,12 @@
 
 <!-- OBERE LEISTE (Zurück-Button in der Top-Bar via Layout-Yield) -->
 <% content_for :top_bar_actions do %>
-  <%= link_to items_path, class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
+  <%= link_to "javascript:history.back()", class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
     <!-- Heroicon: arrow-left -->
     <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18" /></svg>
-    Zurück zur Übersicht
+    <div class="hidden md:inline">
+      Zurück
+    </div>
   <% end %>
 <% end %>
 
diff --git a/app/views/rooms/edit.html.erb b/app/views/rooms/edit.html.erb
index ec83e19..c406838 100644
--- a/app/views/rooms/edit.html.erb
+++ b/app/views/rooms/edit.html.erb
@@ -1,10 +1,10 @@
 <% content_for :title, "Raum bearbeiten: #{@room.name}" %>
 
 <% content_for :top_bar_actions do %>
-  <%= link_to rooms_path, class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
+  <%= link_to "javascript:history.back()", class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
     <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18" /></svg>
     <div class="hidden md:inline">
-      Zurück zur Übersicht
+      Zurück
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/rooms/new.html.erb b/app/views/rooms/new.html.erb
index e1eff05..8c9b66d 100644
--- a/app/views/rooms/new.html.erb
+++ b/app/views/rooms/new.html.erb
@@ -1,10 +1,10 @@
 <% content_for :title, "Raum anlegen" %>
 
 <% content_for :top_bar_actions do %>
-  <%= link_to rooms_path, class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
+  <%= link_to "javascript:history.back()", class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
     <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18" /></svg>
     <div class="hidden md:inline">
-      Zurück zur Übersicht
+      Zurück
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb
index 4710615..b08210e 100644
--- a/app/views/rooms/show.html.erb
+++ b/app/views/rooms/show.html.erb
@@ -1,9 +1,11 @@
 <% content_for :title, "Standort: #{@room.name}" %>
 
 <% content_for :top_bar_actions do %>
-  <%= link_to rooms_path, class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
+  <%= link_to "javascript:history.back()", class: "py-2 px-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 flex items-center gap-1.5 shadow-sm transition" do %>
     <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18" /></svg>
-    Alle Räume
+    <div class="hidden md:inline">
+      Zurück
+    </div>
   <% end %>
 <% end %>