diff --git a/public/css/custom.css b/public/css/custom.css
index 7e083be9a..83b285182 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -252,7 +252,7 @@
 
 
 /*--------Navbar Notification--------*/
-.nav-link .badge-floating
+.nav-link .badge-update
 {
     position: absolute;
     top: 15%;
@@ -262,6 +262,18 @@
     height: 1rem !important;
     font-size: 0.5rem;
 }
+
+
+.nav-link .badge-reminder
+{
+    position: absolute;
+    top: -59%;
+    margin-left: -0.35rem;
+    transform: translateY(50%);
+    width: 1rem !important;
+    height: 1rem !important;
+    font-size: 0.5rem;
+}
 /*--------Navbar Notification Finish--------*/
 
 
diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php
index 8e7b53be3..92e3b480e 100644
--- a/resources/views/partials/admin/navbar.blade.php
+++ b/resources/views/partials/admin/navbar.blade.php
@@ -124,14 +124,16 @@
                                 <i class="far fa-bell"></i>
                             </span>
                             @if ($notifications)
-                                <span class="badge badge-md badge-circle badge-floating badge-warning">{{ $notifications }}</span>
+                                <span class="badge badge-md badge-circle badge-reminder badge-warning">{{ $notifications }}</span>
                             @endif
                         </a>
 
                         <div class="dropdown-menu dropdown-menu-lg dropdown-menu-right py-0 overflow-hidden">
-                            <div class="px-3 py-3">
-                                <a class="text-sm text-muted m-0">{{ trans_choice('header.notifications.counter', $notifications, ['count' => $notifications]) }}</a>
-                            </div>
+                            @if ($notifications)
+                                <div class="p-3">
+                                    <a class="text-sm text-muted">{{ trans_choice('header.notifications.counter', $notifications, ['count' => $notifications]) }}</a>
+                                </div>
+                            @endif
 
                             <div class="list-group list-group-flush">
                                 @if (count($bills))
@@ -153,7 +155,7 @@
                                     <a href="{{ route('users.read.invoices', $user->id) }}" class="list-group-item list-group-item-action">
                                         <div class="row align-items-center">
                                             <div class="col-auto">
-                                                <i class="fa fa-money-bill-alt"></i>
+                                                <i class="fa fa-money-bill"></i>
                                             </div>
                                             <div class="col ml--2">
                                                 <div class="d-flex justify-content-between align-items-center">
@@ -165,7 +167,11 @@
                                 @endif
                             </div>
 
-                            <a href="#" class="dropdown-item text-center text-success font-weight-bold py-3">{{ trans('header.notifications.view_all') }}</a>
+                            @if ($notifications)
+                                <a href="#" class="dropdown-item text-center text-primary font-weight-bold py-3">{{ trans('header.notifications.view_all') }}</a>
+                            @else
+                                <a class="dropdown-item text-center text-primary font-weight-bold py-3">{{ trans_choice('header.notifications.counter', $notifications, ['count' => $notifications]) }}</a>
+                            @endif
                         </div>
                     </li>
 
@@ -176,7 +182,7 @@
                                     <i class="fa fa-sync-alt"></i>
                                 </span>
                                 @if ($updates)
-                                    <span class="badge badge-md badge-circle badge-floating badge-warning">{{ $updates }}</span>
+                                    <span class="badge badge-md badge-circle badge-update badge-warning">{{ $updates }}</span>
                                 @endif
                             </a>
                         </li>
diff --git a/resources/views/partials/form/save_buttons.blade.php b/resources/views/partials/form/save_buttons.blade.php
index 50002cd09..13388beb7 100644
--- a/resources/views/partials/form/save_buttons.blade.php
+++ b/resources/views/partials/form/save_buttons.blade.php
@@ -1,14 +1,14 @@
 @stack('save_buttons_start')
 
     <div class="{{ $col }}">
-        <a href="{{ url($cancel) }}" class="btn btn-icon btn-outline-secondary">
+        <a href="{{ url($cancel) }}" class="btn btn-icon btn-outline-secondary header-button-top">
             <span class="btn-inner--icon"><i class="fas fa-times"></i></span>
             <span class="btn-inner--text">{{ trans('general.cancel') }}</span>
         </a>
 
         {!! Form::button(
         '<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>',
-        [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit', 'data-loading-text' => trans('general.loading')]) !!}
+        [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
     </div>
 
 @stack('save_buttons_end')
diff --git a/resources/views/partials/portal/navbar.blade.php b/resources/views/partials/portal/navbar.blade.php
index d88ab5a3b..8d9e54551 100644
--- a/resources/views/partials/portal/navbar.blade.php
+++ b/resources/views/partials/portal/navbar.blade.php
@@ -15,12 +15,17 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <i class="far fa-bell"></i>
+                        @if ($notifications)
+                            <span class="badge badge-md badge-circle badge-reminder badge-warning">{{ $notifications }}</span>
+                        @endif
                     </a>
 
                     <div class="dropdown-menu dropdown-menu-xl dropdown-menu-right py-0 overflow-hidden">
-                        <div class="px-3 py-3">
-                            <a class="text-sm text-muted m-0">{{ trans_choice('header.notifications.counter', $notifications, ['count' => $notifications]) }}</a>
-                        </div>
+                        @if ($notifications)
+                            <div class="p-3">
+                                <a class="text-sm text-muted m-0">{{ trans_choice('header.notifications.counter', $notifications, ['count' => $notifications]) }}</a>
+                            </div>
+                        @endif
 
                         <div class="list-group list-group-flush">
                             @if (count($bills))
@@ -42,7 +47,7 @@
                                 <a href="{{ url('auth/users/' . $user->id . '/read-invoices') }}" class="list-group-item list-group-item-action">
                                     <div class="row align-items-center">
                                         <div class="col-auto">
-                                            <i class="fa fa-money-bill-alt"></i>
+                                            <i class="fa fa-money-bill"></i>
                                         </div>
                                         <div class="col ml--2">
                                             <div class="d-flex justify-content-between align-items-center">
@@ -54,7 +59,11 @@
                             @endif
                         </div>
 
-                        <a href="#!" class="dropdown-item text-center text-success font-weight-bold py-3">{{ trans('header.notifications.view_all') }}</a>
+                        @if ($notifications)
+                            <a href="#" class="dropdown-item text-center text-primary font-weight-bold py-3">{{ trans('header.notifications.view_all') }}</a>
+                        @else
+                            <a class="dropdown-item text-center text-primary font-weight-bold py-3">{{ trans_choice('header.notifications.counter', $notifications, ['count' => $notifications]) }}</a>
+                        @endif
                     </div>
                 </li>
 
@@ -65,7 +74,7 @@
                                 <i class="fa fa-sync-alt"></i>
                             </span>
                             @if ($updates)
-                                <span class="badge badge-md badge-circle badge-floating badge-warning">{{ $updates }}</span>
+                                <span class="badge badge-md badge-circle badge-update badge-warning">{{ $updates }}</span>
                             @endif
                         </a>
                     </li>
diff --git a/resources/views/partials/reports/filter.blade.php b/resources/views/partials/reports/filter.blade.php
index c536b5b75..96afd005b 100644
--- a/resources/views/partials/reports/filter.blade.php
+++ b/resources/views/partials/reports/filter.blade.php
@@ -3,7 +3,6 @@
         'url' => 'common/reports/' . $class->report->id . '/display',
         'role' => 'form',
         'method' => 'GET',
-        'class' => 'mb-0',
     ]) !!}
 
     <div id="items" class="float-left">