diff --git a/resources/views/components/back-btn.blade.php b/resources/views/components/back-btn.blade.php
new file mode 100644
index 0000000..245a480
--- /dev/null
+++ b/resources/views/components/back-btn.blade.php
@@ -0,0 +1,4 @@
+<a href="{{$route}}" class="btn btn-success btn-sm mx-1">
+    <i class="fas fa-arrow-left me-1"></i>
+    {{$text ?? 'Go back'}}
+</a>
diff --git a/resources/views/components/edit-btn.blade.php b/resources/views/components/edit-btn.blade.php
new file mode 100644
index 0000000..5e0f98c
--- /dev/null
+++ b/resources/views/components/edit-btn.blade.php
@@ -0,0 +1,4 @@
+<a href="{{$route}}" class="btn btn-primary btn-sm mx-1">
+    <i class="fas fa-pen me-1"></i>
+    {{$text ?? 'Edit'}}
+</a>
diff --git a/resources/views/reseller/show.blade.php b/resources/views/reseller/show.blade.php
index fd23e79..78d7b25 100644
--- a/resources/views/reseller/show.blade.php
+++ b/resources/views/reseller/show.blade.php
@@ -138,14 +138,12 @@
 
                 </div>
             </div>
-            <a href="{{ route('reseller.index') }}"
-               class="btn btn-success btn-sm mx-2">
-                Go back
-            </a>
-            <a href="{{ route('reseller.edit', $reseller->id) }}"
-               class="btn btn-primary btn-sm mx-2">
-                Edit
-            </a>
+            <x-back-btn>
+                <x-slot name="route">{{ route('reseller.index') }}</x-slot>
+            </x-back-btn>
+            <x-edit-btn>
+                <x-slot name="route">{{ route('reseller.edit', $reseller->id) }}</x-slot>
+            </x-edit-btn>
         </x-card>
         @if(Session::has('timer_version_footer') && Session::get('timer_version_footer') === 1)
             <p class="text-muted mt-4 text-end"><small>
diff --git a/resources/views/servers/show.blade.php b/resources/views/servers/show.blade.php
index 16833ad..b561031 100644
--- a/resources/views/servers/show.blade.php
+++ b/resources/views/servers/show.blade.php
@@ -129,14 +129,12 @@
                             </tbody>
                         </table>
                     </div>
-                    <a href="{{ route('servers.index') }}"
-                       class="btn btn-success btn-sm mx-2">
-                        Go back
-                    </a>
-                    <a href="{{ route('servers.edit', $server_data->id) }}"
-                       class="btn btn-primary btn-sm mx-2">
-                        Edit
-                    </a>
+                    <x-back-btn>
+                        <x-slot name="route">{{ route('servers.index') }}</x-slot>
+                    </x-back-btn>
+                    <x-edit-btn>
+                        <x-slot name="route">{{ route('servers.edit', $server_data->id) }}</x-slot>
+                    </x-edit-btn>
                 </div>
                 <div class="col-12 col-lg-6">
                     @if($server_data->has_yabs)
diff --git a/resources/views/shared/show.blade.php b/resources/views/shared/show.blade.php
index d1d274b..4cef2da 100644
--- a/resources/views/shared/show.blade.php
+++ b/resources/views/shared/show.blade.php
@@ -133,14 +133,12 @@
 
                 </div>
             </div>
-            <a href="{{ route('shared.index') }}"
-               class="btn btn-success btn-sm mx-2">
-                Go back
-            </a>
-            <a href="{{ route('shared.edit', $shared->id) }}"
-               class="btn btn-primary btn-sm mx-2">
-                Edit
-            </a>
+            <x-back-btn>
+                <x-slot name="route">{{ route('shared.index') }}</x-slot>
+            </x-back-btn>
+            <x-edit-btn>
+                <x-slot name="route">{{ route('shared.edit', $shared->id) }}</x-slot>
+            </x-edit-btn>
         </x-card>
         @if(Session::has('timer_version_footer') && Session::get('timer_version_footer') === 1)
             <p class="text-muted mt-4 text-end"><small>
diff --git a/resources/views/yabs/show.blade.php b/resources/views/yabs/show.blade.php
index 35f8475..ba1065a 100644
--- a/resources/views/yabs/show.blade.php
+++ b/resources/views/yabs/show.blade.php
@@ -5,10 +5,9 @@
     </x-slot>
     <div class="container">
         <x-card class="shadow mt-3">
-            <x-back-button>
-                <x-slot name="href">{{ route('yabs.index') }}</x-slot>
-                Go back
-            </x-back-button>
+            <x-back-btn>
+                <x-slot name="route">{{ route('yabs.index') }}</x-slot>
+            </x-back-btn>
                 <div class="row">
                     <div class="'col-12 col-lg-6">
                         <div class="table-responsive">