diff --git a/resources/views/common/reports/index.blade.php b/resources/views/common/reports/index.blade.php
index ecc615873..3de7091d1 100644
--- a/resources/views/common/reports/index.blade.php
+++ b/resources/views/common/reports/index.blade.php
@@ -40,7 +40,7 @@
                                 <div class="col">
                                     <a href="{{ route('reports.show', $report->id) }}">
                                         <h5 class="card-title text-uppercase text-muted mb-0">{{ $report->name }}</h5>
-                                        <span class="h2 font-weight-bold mb-0">{{ $totals[$report->id] }}</span>
+                                        <h2 class="font-weight-bold mb-0">{{ $totals[$report->id] }}</h2>
                                     </a>
                                 </div>
                                 <div class="col-auto">
@@ -52,7 +52,7 @@
                                 </div>
                             </div>
                             <p class="mt-3 mb-0 text-sm">
-                                <a href="{{ route('reports.show', $report->id) }}">
+                                <a class="text-default" href="{{ route('reports.show', $report->id) }}">
                                     <span class="text-nowrap">{{ $report->description }}</span>
                                 </a>
                             </p>
diff --git a/resources/views/partials/admin/empty_page.blade.php b/resources/views/partials/admin/empty_page.blade.php
index f9c03044b..8efeb5404 100644
--- a/resources/views/partials/admin/empty_page.blade.php
+++ b/resources/views/partials/admin/empty_page.blade.php
@@ -7,8 +7,8 @@
         <div class="col-xs-12 col-sm-6 text-center p-5">
             <p class="text-justify description">{!! trans('general.empty.' . $page) !!} {!! trans('general.empty.documentation', ['url' => 'https://akaunting.com/docs/user-manual/' . $docs_path]) !!}</p>
             <a href="{{ route($page . '.create') }}" class="btn btn-success header-button-top float-right mt-4">
-                <span class="btn-inner--icon text-white"><i class="fas fa-plus"></i></span>
-                <span class="btn-inner--text text-white">{{ trans('general.title.create', ['type' => trans_choice('general.' . $page, 1)]) }}</span>
+                <span class="btn-inner--icon"><i class="fas fa-plus"></i></span>
+                <span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice('general.' . $page, 1)]) }}</span>
             </a>
         </div>
     </div>
diff --git a/resources/views/partials/admin/footer.blade.php b/resources/views/partials/admin/footer.blade.php
index 8336f2727..29a9a36be 100644
--- a/resources/views/partials/admin/footer.blade.php
+++ b/resources/views/partials/admin/footer.blade.php
@@ -1,12 +1,12 @@
 @stack('footer_start')
     <footer class="footer">
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-xs-12 col-sm-6">
                 <div class="text-sm float-left text-muted footer-texts">
-                    {{ trans('footer.powered') }}: <a class="text-success" href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
+                    {{ trans('footer.powered') }}: <a href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-xs-12 col-sm-6">
                 <div class="text-sm float-right text-muted footer-texts">
                     {{ trans('footer.version') }} {{ version('short') }}
                 </div>
diff --git a/resources/views/partials/admin/pagination.blade.php b/resources/views/partials/admin/pagination.blade.php
index c842c248d..eb1585ba6 100644
--- a/resources/views/partials/admin/pagination.blade.php
+++ b/resources/views/partials/admin/pagination.blade.php
@@ -1,6 +1,6 @@
 @stack('pagination_start')
     @if ($items->firstItem())
-        <div class="col-6 d-flex align-items-center">
+        <div class="col-xs-12 col-sm-6 d-flex align-items-center">
             {!! Form::select('limit', $limits, request('limit', setting('default.list_limit', '25')), ['class' => 'form-control form-control-sm d-inline-block w-auto d-none d-md-block', '@change' => 'onChangePaginationLimit($event)']) !!}
             <span class="table-text d-none d-lg-block ml-2">
                 {{ trans('pagination.page') }}
@@ -8,13 +8,13 @@
             </span>
         </div>
 
-        <div class="col-6">
+        <div class="col-xs-12 col-sm-6">
             <nav class="float-right">
                 {!! $items->withPath(request()->url())->appends(request()->except('page'))->links() !!}
             </nav>
         </div>
     @else
-        <div class="col-12" id="datatable-basic_info" role="status" aria-live="polite">
+        <div class="col-xs-12 col-sm-12" id="datatable-basic_info" role="status" aria-live="polite">
             <small>{{ trans('general.no_records') }}</small>
         </div>
     @endif
diff --git a/resources/views/partials/modules/bar.blade.php b/resources/views/partials/modules/bar.blade.php
index 8c96f1150..ee18375ee 100644
--- a/resources/views/partials/modules/bar.blade.php
+++ b/resources/views/partials/modules/bar.blade.php
@@ -1,9 +1,9 @@
 <div class="row justify-content-center">
-    <div class="col-sm-12 col-md-12 col-lg-12 col-xl-12">
+    <div class="col-xs-12 col-sm-12">
         <div class="card">
             <div class="card-body">
                 <div class="row align-items-center">
-                    <div class="col-xs-9 col-sm-9">
+                    <div class="col-xs-12 col-sm-9">
                         <akaunting-select
                             class="form-control-sm d-inline-block w-auto"
                             :placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}'"
@@ -15,11 +15,11 @@
                         ></akaunting-select>
                         {{ Form::hidden('category_page', url("apps/categories"), ['id' => 'category_page']) }}
 
-                        <a href="{{ route('apps.paid') }}" class="btn btn-sm btn-white">{{ trans('modules.top_paid') }}</a>
-                        <a href="{{ route('apps.new') }}" class="btn btn-sm btn-white">{{ trans('modules.new') }}</a>
-                        <a href="{{ route('apps.free') }}" class="btn btn-sm btn-white">{{ trans('modules.top_free') }}</a>
+                        <a href="{{ route('apps.paid') }}" class="btn btn-sm btn-white header-button-top">{{ trans('modules.top_paid') }}</a>
+                        <a href="{{ route('apps.new') }}" class="btn btn-sm btn-white header-button-top">{{ trans('modules.new') }}</a>
+                        <a href="{{ route('apps.free') }}" class="btn btn-sm btn-white header-button-top">{{ trans('modules.top_free') }}</a>
                     </div>
-                    <div class="col-xs-3 col-sm-3 text-right">
+                    <div class="col-xs-12 col-sm-3 text-right">
                         {!! Form::open(['route' => ['apps.search'], 'role' => 'form', 'method' => 'GET', 'class' => 'm-0']) !!}
                             <input name="keyword" value="{{ isset($keyword) ? $keyword : '' }}" type="text" class="form-control form-control-sm d-inline-block w-auto" placeholder="Search Apps">
                             <span class="glyphicon glyphicon-search form-control-feedback"></span>
diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php
index af1164640..1dd0d9963 100644
--- a/resources/views/portal/invoices/signed.blade.php
+++ b/resources/views/portal/invoices/signed.blade.php
@@ -3,7 +3,7 @@
 @section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
 
 @section('new_button')
-    <span><a href="{{ route('portal.dashboard') }}" class="btn btn-success btn-sm"><span class="fa fa-user"></span> &nbsp;{{ trans('invoices.all_invoices') }}</a></span>
+    <a href="{{ route('portal.dashboard') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-user"></span> &nbsp;{{ trans('invoices.all_invoices') }}</a>
 @endsection
 
 @section('content')
@@ -236,10 +236,10 @@
                 </div>
 
                 <div class="col-md-8 text-right">
-                    <a href="{{ $print_action }}" target="_blank" class="btn btn-success">
+                    <a href="{{ $print_action }}" target="_blank" class="btn btn-success header-button-top">
                         <i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
                     </a>
-                    <a href="{{ $pdf_action }}" class="btn btn-white" data-toggle="tooltip" title="{{ trans('invoices.download_pdf') }}">
+                    <a href="{{ $pdf_action }}" class="btn btn-white header-button-top" data-toggle="tooltip" title="{{ trans('invoices.download_pdf') }}">
                         <i class="fa fa-file-pdf"></i>&nbsp; {{ trans('general.download') }}
                     </a>
                 </div>