diff --git a/extensions/Servers/Proxmox/views/components/layout.blade.php b/extensions/Servers/Proxmox/views/components/layout.blade.php
index e9fa052d2..a943c49c8 100644
--- a/extensions/Servers/Proxmox/views/components/layout.blade.php
+++ b/extensions/Servers/Proxmox/views/components/layout.blade.php
@@ -201,6 +201,8 @@
                             0 1px 3px rgba(0, 0, 0, 0.05),
                             0 0 0 1px rgba(0, 0, 0, 0.02);
                         transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+                        position: relative;
+                        z-index: 10;
                     }
 
                     .dark .proxmox-nav-container {
diff --git a/extensions/Servers/Proxmox/views/firewall.blade.php b/extensions/Servers/Proxmox/views/firewall.blade.php
index c6675f46e..cea3f315b 100644
--- a/extensions/Servers/Proxmox/views/firewall.blade.php
+++ b/extensions/Servers/Proxmox/views/firewall.blade.php
@@ -595,10 +595,11 @@
                     <button 
                         @click="editingPositions = !editingPositions"
                         class="px-4 py-2 rounded-lg transition-colors text-sm font-medium border"
-                        :class="editingPositions ? 'bg-primary text-white border-primary hover:bg-primary/90' : 'bg-background-secondary text-base border-neutral/20 hover:bg-background-secondary/80'"
-                        :title="editingPositions ? 'Done editing order' : 'Edit rule order'">
-                        <x-ri-draggable class="size-4 inline mr-1" />
-                        <span x-text="editingPositions ? 'Done' : 'Edit Order'"></span>
+                        :class="editingPositions ? 'bg-success text-white border-success hover:bg-success/90' : 'bg-background-secondary text-base border-neutral/20 hover:bg-background-secondary/80'"
+                        :title="editingPositions ? 'Save order changes' : 'Edit rule order'">
+                        <x-ri-draggable class="size-4 inline mr-1" x-show="!editingPositions" />
+                        <x-ri-save-line class="size-4 inline mr-1" x-show="editingPositions" />
+                        <span x-text="editingPositions ? 'Save' : 'Edit Order'"></span>
                     </button>
                     <button 
                         wire:click="startCreateRule"
@@ -616,7 +617,7 @@
                         <thead>
                             <tr class="border-b border-neutral">
                                 <th class="text-left py-3 px-2 font-semibold text-sm w-8"></th>
-                                <th class="text-left py-3 px-4 font-semibold text-sm">Position</th>
+                                <th class="text-left py-3 px-4 font-semibold text-sm">Order</th>
                                 <th class="text-left py-3 px-4 font-semibold text-sm">Action</th>
                                 <th class="text-left py-3 px-4 font-semibold text-sm">Source</th>
                                 <th class="text-left py-3 px-4 font-semibold text-sm">Destination</th>