diff --git a/public/css/custom.css b/public/css/custom.css
index 36acd045c..573362874 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -445,14 +445,6 @@
 /*--------Card Header Bulk Action Finish--------*/
 
 
-/*--------Card Buttons--------*/
-.card-buttons
-{
-    margin-top: -0.4rem !important;
-}
-/*--------Card Buttons Finish--------*/
-
-
 /*--------Card Action Button--------*/
 .card-action-button
 {
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
index 8bb960802..5bf220c13 100644
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@@ -21,13 +21,13 @@
     <div class="row">
         <div class="col-md-8">
             <div class="row">
-                <div class="col-md-6">
+                <div class="col-xs-6 col-sm-6">
                     <div class="float-left">
                         <h3>{{ $module->name }}</h3>
                     </div>
                 </div>
 
-                <div class="col-md-6">
+                <div class="col-xs-6 col-sm-6">
                     <div class="float-right">
                         @for($i = 1; $i <= $module->vote; $i++)
                             <i class="fa fa-star fa-sm text-yellow"></i>
@@ -151,7 +151,7 @@
                                 @endif
                             </div>
 
-                            <div class="card-footer pb-0 px-0 mt-4">
+                            <div class="card-footer mx--4 mt-4 mb--4">
                                 <div class="row">
                                     <div class="col-md-12 text-right">
                                         @if (!empty($module->review_action))
diff --git a/resources/views/partials/form/date_range.blade.php b/resources/views/partials/form/date_range.blade.php
index 5e1e808a9..2af7145ca 100644
--- a/resources/views/partials/form/date_range.blade.php
+++ b/resources/views/partials/form/date_range.blade.php
@@ -1,4 +1,4 @@
-<button type="button" class="btn btn-sm btn-secondary btn-secondary date-range-btn card-buttons filter-button">
+<button type="button" class="btn btn-sm btn-secondary btn-secondary">
     <span><i class="fa fa-{{ $icon }}"></i> {{ $text }}</span>
     <i class="fa fa-caret-down"></i>
     {!! Form::hidden($name, null, []) !!}
diff --git a/resources/views/partials/modules/bar.blade.php b/resources/views/partials/modules/bar.blade.php
index b126cb6dc..3e7de6c83 100644
--- a/resources/views/partials/modules/bar.blade.php
+++ b/resources/views/partials/modules/bar.blade.php
@@ -3,9 +3,9 @@
         <div class="card">
             <div class="card-body">
                 <div class="row align-items-center">
-                    <div class="col-9">
+                    <div class="col-xs-9 col-sm-9">
                         <akaunting-select
-                            class="form-control-sm table-header-search mt-0"
+                            class="form-control-sm table-header-search"
                             :placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}'"
                             :name="'category'"
                             :icon="'folder'"
@@ -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 card-buttons filter-button ml-2">{{ trans('modules.top_paid') }}</a>
-                        <a href="{{ route('apps.new') }}" class="btn btn-sm btn-white card-buttons filter-button">{{ trans('modules.new') }}</a>
-                        <a href="{{ route('apps.free') }}" class="btn btn-sm btn-white card-buttons filter-button">{{ trans('modules.top_free') }}</a>
+                        <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>
                     </div>
-                    <div class="col-3 text-right">
+                    <div class="col-xs-3 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 table-header-search" placeholder="Search Apps">
                             <span class="glyphicon glyphicon-search form-control-feedback"></span>
diff --git a/resources/views/partials/reports/filter.blade.php b/resources/views/partials/reports/filter.blade.php
index 96afd005b..72633eb3a 100644
--- a/resources/views/partials/reports/filter.blade.php
+++ b/resources/views/partials/reports/filter.blade.php
@@ -11,7 +11,7 @@
         @foreach($class->filters as $name => $values)
             {!! Form::select($name . '[]', $values, request($name), ['id' => 'filter-' . $name, 'class' => 'form-control form-control-sm table-header-search']) !!}
         @endforeach
-        {!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-secondary btn-sm card-buttons']) !!}
+        {!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-secondary']) !!}
     </div>
 
     {!! Form::close() !!}