diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js
index 04ed2744a..2b7207e44 100644
--- a/public/akaunting-js/generalAction.js
+++ b/public/akaunting-js/generalAction.js
@@ -451,16 +451,17 @@ document.querySelectorAll('[data-truncate-marquee]').forEach((truncate) => {
 
 //disable/enable icons ejected from data-truncate-marquee, HTML of icons ejected from parent element (data-truncate-marquee)
 document.querySelectorAll('[data-index-icon]').forEach((defaultText) => {
-    let icon_parents_element = defaultText.parentElement.parentElement.parentElement;
+    if (defaultText.closest('tr')) {
+        let icon_parents_element = defaultText.parentElement.parentElement.parentElement;
     
-    if (icon_parents_element.classList.contains('flex')) {
-        icon_parents_element.appendChild(defaultText);
-        icon_parents_element.classList.remove('truncate');
-    } else {
-        if (icon_parents_element.classList.contains('overflow-x-hidden')) {
-            icon_parents_element.parentElement.appendChild(defaultText);
+        if (icon_parents_element.classList.contains('flex')) {
+            icon_parents_element.appendChild(defaultText);
         } else {
-            defaultText.parentElement.appendChild(defaultText);
+            if (icon_parents_element.classList.contains('overflow-x-hidden')) {
+                icon_parents_element.parentElement.appendChild(defaultText);
+            } else {
+                defaultText.parentElement.appendChild(defaultText);
+            }
         }
     }
 });
diff --git a/resources/views/components/layouts/admin/header.blade.php b/resources/views/components/layouts/admin/header.blade.php
index b9056c767..f624a1212 100644
--- a/resources/views/components/layouts/admin/header.blade.php
+++ b/resources/views/components/layouts/admin/header.blade.php
@@ -3,7 +3,7 @@
 <div id="header" class="xl:pt-6 -mt-2">
     <div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
         <div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
-            <div class="flex items-center">
+            <div class="flex items-center space-y-4">
                 <h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
                     <x-title>
                         {!! $title !!}
@@ -13,7 +13,7 @@
                 </h1>
 
                 @if (! empty($status))
-                <div class="ltr:ml-4 rtl:mr-4 mt-2">
+                <div class="ltr:ml-4 rtl:mr-4 -mt-4">
                     {!! $status !!}
                 </div>
                 @endif
diff --git a/resources/views/components/layouts/portal/header.blade.php b/resources/views/components/layouts/portal/header.blade.php
index 9cdec71d8..07dd35097 100644
--- a/resources/views/components/layouts/portal/header.blade.php
+++ b/resources/views/components/layouts/portal/header.blade.php
@@ -3,7 +3,7 @@
 <div id="header" class="xl:pt-6 -mt-2">
     <div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
         <div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
-            <div class="flex items-center">
+            <div class="flex items-center space-y-4">
                 <h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
                     <x-title>
                         {!! $title !!}
@@ -13,7 +13,7 @@
                 </h1>
 
                 @if (! empty($status))
-                <div class="ltr:ml-4 rtl:mr-4 mt-2">
+                <div class="ltr:ml-4 rtl:mr-4 -mt-4">
                     {!! $status !!}
                 </div>
                 @endif
diff --git a/resources/views/components/layouts/preview/header.blade.php b/resources/views/components/layouts/preview/header.blade.php
index 9cdec71d8..07dd35097 100644
--- a/resources/views/components/layouts/preview/header.blade.php
+++ b/resources/views/components/layouts/preview/header.blade.php
@@ -3,7 +3,7 @@
 <div id="header" class="xl:pt-6 -mt-2">
     <div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
         <div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
-            <div class="flex items-center">
+            <div class="flex items-center space-y-4">
                 <h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
                     <x-title>
                         {!! $title !!}
@@ -13,7 +13,7 @@
                 </h1>
 
                 @if (! empty($status))
-                <div class="ltr:ml-4 rtl:mr-4 mt-2">
+                <div class="ltr:ml-4 rtl:mr-4 -mt-4">
                     {!! $status !!}
                 </div>
                 @endif
diff --git a/resources/views/components/layouts/signed/header.blade.php b/resources/views/components/layouts/signed/header.blade.php
index c216f420c..f880a0f2c 100644
--- a/resources/views/components/layouts/signed/header.blade.php
+++ b/resources/views/components/layouts/signed/header.blade.php
@@ -3,7 +3,7 @@
 <div id="header" class="xl:pt-6 -mt-2">
     <div lass="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
         <div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
-            <div class="flex items-center">
+            <div class="flex items-center space-y-4">
                 <h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
                     <x-title>
                         {!! $title !!}
@@ -13,7 +13,7 @@
                 </h1>
 
                 @if (! empty($status))
-                <div class="ltr:ml-4 rtl:mr-4 mt-2">
+                <div class="ltr:ml-4 rtl:mr-4 -mt-4">
                     {!! $status !!}
                 </div>
                 @endif
diff --git a/resources/views/components/tabs/nav-link.blade.php b/resources/views/components/tabs/nav-link.blade.php
index 7452a7400..8b2125ac0 100644
--- a/resources/views/components/tabs/nav-link.blade.php
+++ b/resources/views/components/tabs/nav-link.blade.php
@@ -1,7 +1,7 @@
 @props(['id', 'name', 'href', 'active'])
 
 <li 
-    class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
+    class="relative flex-auto px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
     id="tab-{{ $id }}"
     data-id="tab-{{ $id }}"
     data-tabs="{{ $id }}"
diff --git a/resources/views/components/tabs/nav.blade.php b/resources/views/components/tabs/nav.blade.php
index 4c5ec9d3d..d8a1ff2e8 100644
--- a/resources/views/components/tabs/nav.blade.php
+++ b/resources/views/components/tabs/nav.blade.php
@@ -1,7 +1,7 @@
 @props(['id', 'name', 'active'])
 
 <li 
-    class="relative px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
+    class="relative flex-auto px-8 text-sm text-center pb-2 cursor-pointer transition-all border-b whitespace-nowrap tabs-link"
     id="tab-{{ $id }}"
     data-id="tab-{{ $id }}"
     data-tabs="{{ $id }}"
diff --git a/resources/views/livewire/menu/favorite.blade.php b/resources/views/livewire/menu/favorite.blade.php
index 7a02147ea..a998fc4e9 100644
--- a/resources/views/livewire/menu/favorite.blade.php
+++ b/resources/views/livewire/menu/favorite.blade.php
@@ -3,7 +3,7 @@
         <span
             id="{{ $favorited ? 'remove-from-favorite' : 'add-to-favorite' }}"
             @class([
-                'flex items-center text-purple text-2xl ltr:ml-2 rtl:mr-2 lg:mt-4 cursor-pointer',
+                'flex items-center text-purple text-2xl ltr:ml-2 rtl:mr-2 cursor-pointer',
                 'material-icons-outlined transform transition-all hover:scale-125' => ($favorited) ? false : true,
                 'material-icons' => (! $favorited) ? false : true,
             ])