diff --git a/Bootstrap.Client/wwwroot/css/blue.css b/Bootstrap.Client/wwwroot/css/blue.css
index fc7c3a63..fd046e94 100644
--- a/Bootstrap.Client/wwwroot/css/blue.css
+++ b/Bootstrap.Client/wwwroot/css/blue.css
@@ -48,7 +48,8 @@
 }
 
 .card, .modal-footer, .form-control, .popover, .date .input-group-text,
-.input-group .btn:not(.btn-secondary):not(.btn-primary):not(.btn-warning):not(.btn-info):not(.btn-danger) {
+.input-group .btn:not(.btn-secondary):not(.btn-primary):not(.btn-warning):not(.btn-info):not(.btn-danger),
+.form-select-input:hover {
     border-color: #5198cb;
 }
 
@@ -74,7 +75,7 @@
     color: #467fa7;
 }
 
-.breadcrumb > li + li:before, .breadcrumb, .pagination-detail {
+.breadcrumb > li + li:before, .breadcrumb, .pagination-detail, .form-select-append  {
     color: #337ab7;
 }
 
diff --git a/Bootstrap.Client/wwwroot/css/theme-responsive.css b/Bootstrap.Client/wwwroot/css/theme-responsive.css
index f13aab7d..42c718d3 100644
--- a/Bootstrap.Client/wwwroot/css/theme-responsive.css
+++ b/Bootstrap.Client/wwwroot/css/theme-responsive.css
@@ -36,18 +36,18 @@
         padding-bottom: 6px;
     }
 
-    .form-inline select.form-control, .form-inline .select.form-control {
-        min-width: 194px;
+    .form-inline input.form-control, .form-inline .input-group, .form-select > input.form-control {
+        width: 194px;
+    }
+
+    .form-inline .input-group input.form-control {
+        width: 1%;
     }
 
     .modal-lg {
         max-width: calc(90%);
     }
 
-    .input-group.date {
-        width: 194px;
-    }
-
     .btn-fill {
         width: auto;
     }
diff --git a/Bootstrap.Client/wwwroot/css/theme.css b/Bootstrap.Client/wwwroot/css/theme.css
index 952f2acf..e5992c34 100644
--- a/Bootstrap.Client/wwwroot/css/theme.css
+++ b/Bootstrap.Client/wwwroot/css/theme.css
@@ -481,7 +481,7 @@ input.pending {
         margin-left: 6px;
     }
 
-.btn span:last-child {
+.btn i + span {
     margin-left: 4px;
 }
 
@@ -554,7 +554,6 @@ input.pending {
         margin-left: 5px;
     }
 
-
     .bootstrap-table .badge {
         padding: 4px 6px;
     }
@@ -630,6 +629,15 @@ input.pending {
             padding: 1px 5px;
         }
 
+    .bootstrap-table .fixed-table-container .table.table-sm tbody td {
+        padding: 0.3rem;
+    }
+
+    /* fix bootstrap bottom margin */
+    .bootstrap-table .fixed-table-pagination > .pagination-detail, .bootstrap-table .fixed-table-pagination > .pagination {
+        margin-bottom: -5px;
+    }
+
 .card-body .bootstrap-table {
     margin-top: -10px;
 }
@@ -776,3 +784,7 @@ input.pending {
 .alert-danger {
     border-left: solid 4px #f78792;
 }
+
+label[for] {
+    cursor: pointer;
+}
\ No newline at end of file