diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less
index aa3c1d3c2..bc99522b4 100644
--- a/resources/assets/less/skins/skin-black-dark.less
+++ b/resources/assets/less/skins/skin-black-dark.less
@@ -403,3 +403,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-black.less b/resources/assets/less/skins/skin-black.less
index 7dfb52534..b1660b26b 100755
--- a/resources/assets/less/skins/skin-black.less
+++ b/resources/assets/less/skins/skin-black.less
@@ -108,4 +108,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @black;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less
index e387a54b5..aca5b7f4a 100644
--- a/resources/assets/less/skins/skin-blue-dark.less
+++ b/resources/assets/less/skins/skin-blue-dark.less
@@ -392,3 +392,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-blue.less b/resources/assets/less/skins/skin-blue.less
index 1268415f5..1644faeaa 100755
--- a/resources/assets/less/skins/skin-blue.less
+++ b/resources/assets/less/skins/skin-blue.less
@@ -120,4 +120,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: #3c8dbc;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-contrast.less b/resources/assets/less/skins/skin-contrast.less
index bca355c52..f66e76676 100644
--- a/resources/assets/less/skins/skin-contrast.less
+++ b/resources/assets/less/skins/skin-contrast.less
@@ -168,4 +168,8 @@ input::-ms-input-placeholder { /* IE 10+ */
 
 .fixed-table-container tbody .selected td {
   background-color: #fff8af;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less
index 315fe3ba0..41f2c69f5 100644
--- a/resources/assets/less/skins/skin-green-dark.less
+++ b/resources/assets/less/skins/skin-green-dark.less
@@ -392,3 +392,7 @@ a {
   display: table-cell;
 }
 
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-green.less b/resources/assets/less/skins/skin-green.less
index d8fcf8403..0c0a9bdbc 100755
--- a/resources/assets/less/skins/skin-green.less
+++ b/resources/assets/less/skins/skin-green.less
@@ -105,4 +105,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @green;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less
index 148a77903..78e2ab64e 100644
--- a/resources/assets/less/skins/skin-orange-dark.less
+++ b/resources/assets/less/skins/skin-orange-dark.less
@@ -394,3 +394,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-orange.less b/resources/assets/less/skins/skin-orange.less
index 1884b66d0..fb6630924 100644
--- a/resources/assets/less/skins/skin-orange.less
+++ b/resources/assets/less/skins/skin-orange.less
@@ -105,4 +105,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @orange;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less
index 112ae19e9..97498c7aa 100644
--- a/resources/assets/less/skins/skin-purple-dark.less
+++ b/resources/assets/less/skins/skin-purple-dark.less
@@ -394,3 +394,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-purple.less b/resources/assets/less/skins/skin-purple.less
index 294839e43..4c4accd59 100755
--- a/resources/assets/less/skins/skin-purple.less
+++ b/resources/assets/less/skins/skin-purple.less
@@ -108,3 +108,6 @@ a {
   background-color: @purple;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less
index 405e14f13..59705c163 100644
--- a/resources/assets/less/skins/skin-red-dark.less
+++ b/resources/assets/less/skins/skin-red-dark.less
@@ -393,3 +393,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-red.less b/resources/assets/less/skins/skin-red.less
index 3aab107e4..e53f812c5 100755
--- a/resources/assets/less/skins/skin-red.less
+++ b/resources/assets/less/skins/skin-red.less
@@ -105,4 +105,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @red;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }
\ No newline at end of file
diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less
index b01d89283..c123340b9 100644
--- a/resources/assets/less/skins/skin-yellow-dark.less
+++ b/resources/assets/less/skins/skin-yellow-dark.less
@@ -391,3 +391,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
diff --git a/resources/assets/less/skins/skin-yellow.less b/resources/assets/less/skins/skin-yellow.less
index fadb5824f..c6ecc5c7b 100755
--- a/resources/assets/less/skins/skin-yellow.less
+++ b/resources/assets/less/skins/skin-yellow.less
@@ -106,3 +106,7 @@ a {
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @yellow;
 }
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}
\ No newline at end of file
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index a458d3c8a..13de846d3 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -1,13 +1,15 @@
 @push('css')
 <link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
+
 @endpush
 
 @push('js')
-<script src="{{ asset(mix('js/dist/bootstrap-table.js')) }}"></script>
+<script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
 <script nonce="{{ csrf_token() }}">
 
     $(function () {
 
+
         var stickyHeaderOffsetY = 0;
 
         if ( $('.navbar-fixed-top').css('height') ) {
@@ -21,7 +23,7 @@
 
         var keyBlocked = function(key) {
             for(var j in blockedFields) {
-                if(key === blockedFields[j]) {
+                if (key === blockedFields[j]) {
                     return true;
                 }
             }
@@ -44,6 +46,7 @@
             mobileResponsive: true,
             maintainSelected: true,
             trimOnSearch: false,
+            showSearchClearButton: true,
             paginationFirstText: "{{ trans('general.first') }}",
             paginationLastText: "{{ trans('general.last') }}",
             paginationPreText: "{{ trans('general.previous') }}",
@@ -69,12 +72,14 @@
                 paginationSwitchUp: 'fa-caret-square-o-up',
                 columns: 'fa-columns',
                 refresh: 'fa-refresh',
-                export: 'fa-download'
+                export: 'fa-download',
+                clearSearch: 'fa-times'
             },
             exportTypes: ['csv', 'excel', 'doc', 'txt','json', 'xml', 'pdf'],
             onLoadSuccess: function () {
-                $('[data-toggle="tooltip"]').tooltip(); // Need to attach tooltips after ajax call
+                $('[data-toggle="tooltip"]').tooltip(); // Needed to attach tooltips after ajax call
             }
+
         });
     });
 
@@ -621,13 +626,37 @@
     });
 
 
-    // This is necessary to make the bootstrap tooltips work inside of the
-    // wenzhixin/bootstrap-table formatters
+
     $(function() {
+
+        // This handles the search box highlighting on both ajax and client-side
+        // bootstrap tables
+        var searchboxHighlighter = function (event) {
+
+            $('.search-input').each(function (index, element) {
+
+                if ($(element).val() != '') {
+                    $(element).addClass('search-highlight');
+                    $(element).next().children().addClass('search-highlight');
+                } else {
+                    $(element).removeClass('search-highlight');
+                    $(element).next().children().removeClass('search-highlight');
+                }
+            });
+        };
+
+        $('.search button[name=clearSearch]').click(searchboxHighlighter);
+        searchboxHighlighter({ name:'pageload'});
+        $('.search-input').keyup(searchboxHighlighter);
+
+        //  This is necessary to make the bootstrap tooltips work inside of the
+        // wenzhixin/bootstrap-table formatters
         $('#table').on('post-body.bs.table', function () {
             $('[data-toggle="tooltip"]').tooltip({
                 container: 'body'
             });
+
+
         });
     });