diff --git a/public/css/custom.css b/public/css/custom.css
index 1e96f50eb..bceb22f3e 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -673,7 +673,7 @@ table .align-items-center td span.badge {
 
 /*----------------RESPONSIVE START LINE----------------*/
 /*--------Xs Breakpoint--------*/
-@media (min-width: 304px) and (max-width: 575.98px)
+@media (max-width: 575.98px)
 {
     .col-xs-1 {width: 8.33%;}
     .col-xs-2 {width: 16.66%;}
diff --git a/resources/views/auth/login/create.blade.php b/resources/views/auth/login/create.blade.php
index 5da9c6946..35e8a6dbd 100644
--- a/resources/views/auth/login/create.blade.php
+++ b/resources/views/auth/login/create.blade.php
@@ -40,7 +40,7 @@
             <div class="col-xs-12 col-sm-4">
                 {!! Form::button(
                 '<div class="aka-loader"></div> <span>' . trans('auth.login') . '</span>',
-                [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-success header-button-top float-right', 'data-loading-text' => trans('general.loading')]) !!}
+                [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-success float-right header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
             </div>
         </div>
 
diff --git a/resources/views/auth/permissions/create.blade.php b/resources/views/auth/permissions/create.blade.php
index 4ed813f75..c82b075bf 100644
--- a/resources/views/auth/permissions/create.blade.php
+++ b/resources/views/auth/permissions/create.blade.php
@@ -17,7 +17,7 @@
 
             <div class="card-body">
                 <div class="row">
-                    {{ Form::textGroup('display_name', trans('general.name'), 'tasks') }}
+                    {{ Form::textGroup('display_name', trans('general.name'), 'font') }}
 
                     {{ Form::textGroup('name', trans('general.code'), 'code') }}
 
diff --git a/resources/views/auth/permissions/edit.blade.php b/resources/views/auth/permissions/edit.blade.php
index 56dda8641..8b81c8ee6 100644
--- a/resources/views/auth/permissions/edit.blade.php
+++ b/resources/views/auth/permissions/edit.blade.php
@@ -18,7 +18,7 @@
 
             <div class="card-body">
                 <div class="row">
-                    {{ Form::textGroup('display_name', trans('general.name'), 'tasks') }}
+                    {{ Form::textGroup('display_name', trans('general.name'), 'font') }}
 
                     {{ Form::textGroup('name', trans('general.code'), 'code') }}
 
diff --git a/resources/views/auth/permissions/index.blade.php b/resources/views/auth/permissions/index.blade.php
index e1c0f969d..3989118c4 100644
--- a/resources/views/auth/permissions/index.blade.php
+++ b/resources/views/auth/permissions/index.blade.php
@@ -4,7 +4,7 @@
 
 @permission('update-auth-permissions')
     @section('new_button')
-        <span><a href="{{ route('permissions.create') }}" class="btn btn-success btn-sm btn-alone"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
+        <span><a href="{{ route('permissions.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
     @endsection
 @endpermission
 
diff --git a/resources/views/auth/roles/create.blade.php b/resources/views/auth/roles/create.blade.php
index 65bf06bf4..3bd82da87 100644
--- a/resources/views/auth/roles/create.blade.php
+++ b/resources/views/auth/roles/create.blade.php
@@ -17,7 +17,7 @@
         <div class="card">
             <div class="card-body">
                 <div class="row">
-                    {{ Form::textGroup('display_name', trans('general.name'), 'user-tag') }}
+                    {{ Form::textGroup('display_name', trans('general.name'), 'font') }}
 
                     {{ Form::textGroup('name', trans('general.code'), 'code') }}
 
diff --git a/resources/views/auth/roles/edit.blade.php b/resources/views/auth/roles/edit.blade.php
index ae63581d3..29c83ed09 100644
--- a/resources/views/auth/roles/edit.blade.php
+++ b/resources/views/auth/roles/edit.blade.php
@@ -18,7 +18,7 @@
         <div class="card">
             <div class="card-body">
                 <div class="row">
-                    {{ Form::textGroup('display_name', trans('general.name'), 'user-tag') }}
+                    {{ Form::textGroup('display_name', trans('general.name'), 'font') }}
 
                     {{ Form::textGroup('name', trans('general.code'), 'code') }}
 
diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php
index 53d80ca38..e2667c1c9 100644
--- a/resources/views/auth/users/create.blade.php
+++ b/resources/views/auth/users/create.blade.php
@@ -17,7 +17,7 @@
 
             <div class="card-body">
                 <div class="row">
-                    {{ Form::textGroup('name', trans('general.name'), 'user') }}
+                    {{ Form::textGroup('name', trans('general.name'), 'font') }}
 
                     {{ Form::emailGroup('email', trans('general.email'), 'envelope') }}
 
diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php
index 30098c248..642023604 100644
--- a/resources/views/auth/users/edit.blade.php
+++ b/resources/views/auth/users/edit.blade.php
@@ -18,7 +18,7 @@
 
             <div class="card-body">
                 <div class="row">
-                    {{ Form::textGroup('name', trans('general.name'), 'user') }}
+                    {{ Form::textGroup('name', trans('general.name'), 'font') }}
 
                     {{ Form::emailGroup('email', trans('general.email'), 'envelope') }}