diff --git a/Bootstrap.Admin/wwwroot/css/site-responsive.css b/Bootstrap.Admin/wwwroot/css/site-responsive.css
index e299b586..82dbcdf8 100644
--- a/Bootstrap.Admin/wwwroot/css/site-responsive.css
+++ b/Bootstrap.Admin/wwwroot/css/site-responsive.css
@@ -4,17 +4,6 @@
     }
 }
 
-@media(min-width: 576px) {
-    .form-inline label {
-        padding-top: 5px;
-        padding-bottom: 5px;
-    }
-
-    .modal-lg {
-        max-width: calc(90%);
-    }
-}
-
 @media (min-width: 736px) {
     .sidebar-toggle-box span {
         display: inline;
@@ -40,16 +29,6 @@
         position: fixed;
         overflow: auto;
     }
-
-    .form-horizontal .control-label {
-        text-align: left;
-    }
-}
-
-@media (min-width: 992px) {
-    .modal-lg {
-        max-width: 900px;
-    }
 }
 
 @media (min-height: 672px) {
diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css
index 1ad195e8..aee9c236 100644
--- a/Bootstrap.Admin/wwwroot/css/site.css
+++ b/Bootstrap.Admin/wwwroot/css/site.css
@@ -5,7 +5,6 @@
 body {
     color: #797979;
     background: #f1f2f7;
-    font-family: 'Open Sans', sans-serif;
     font-size: 0.875rem;
     text-rendering: optimizeLegibility;
     -webkit-font-smoothing: antialiased;
@@ -16,14 +15,6 @@ ul li {
     list-style: none;
 }
 
-.btn {
-    font-size: 0.875rem;
-}
-
-.form-control {
-    font-size: 0.875rem;
-}
-
 a, a:hover, a:focus {
     text-decoration: none;
     outline: none;
@@ -44,10 +35,6 @@ a, a:hover, a:focus {
         margin: 1px 0;
     }
 
-.card-view:not(:last-child) {
-    margin-bottom: 6px;
-}
-
 .header {
     padding: 0 15px;
     height: 98px;
@@ -469,31 +456,11 @@ a, a:hover, a:focus {
     background-size: 100% 100%;
 }
 
-.file-drop-zone.clickable:hover {
-    border: 1px dashed #999;
-}
-
 /*bs v4.1.3*/
-.card {
-    margin-bottom: 15px;
-}
-
 label.dropdown-item:first-child {
     margin-top: 0.5rem;
 }
 
-.fixed-table-toolbar .bs-bars, .fixed-table-toolbar .search, .fixed-table-toolbar .columns {
-    line-height: normal;
-}
-
-.form-inline .form-row, .form-inline .row {
-    width: 100%;
-}
-
 .btn-xs {
     padding: 1px 5px;
 }
-
-.form-check-label {
-    cursor: pointer;
-}
diff --git a/Bootstrap.Admin/wwwroot/css/theme-responsive.css b/Bootstrap.Admin/wwwroot/css/theme-responsive.css
index 4b7d666a..21815eb8 100644
--- a/Bootstrap.Admin/wwwroot/css/theme-responsive.css
+++ b/Bootstrap.Admin/wwwroot/css/theme-responsive.css
@@ -1,10 +1,4 @@
-@media (min-width: 576px) {
-    .form-group .form-control-url {
-        width: calc(100% - 90px);
-    }
-}
-
-@media (min-width: 568px) {
+@media (min-width: 568px) {
     .toolbar {
         display: none;
     }
@@ -14,8 +8,29 @@
     }
 }
 
+@media (min-width: 576px) {
+    .form-group .form-control-url {
+        width: calc(100% - 90px);
+    }
+
+    .form-inline .control-label {
+        padding-top: 6px;
+        padding-bottom: 6px;
+    }
+
+    .modal-lg {
+        max-width: calc(90%);
+    }
+}
+
 @media (min-width: 940px) {
     .btn span:last-child {
         display: inline;
     }
 }
+
+@media (min-width: 992px) {
+    .modal-lg {
+        max-width: 900px;
+    }
+}
diff --git a/Bootstrap.Admin/wwwroot/css/theme.css b/Bootstrap.Admin/wwwroot/css/theme.css
index d7e26bf0..443ed5cc 100644
--- a/Bootstrap.Admin/wwwroot/css/theme.css
+++ b/Bootstrap.Admin/wwwroot/css/theme.css
@@ -1,4 +1,12 @@
-.tooltip-inner {
+.btn {
+    font-size: 0.875rem;
+}
+
+.form-control {
+    font-size: 0.875rem;
+}
+
+.tooltip-inner {
     max-width: 768px;
 }
 
@@ -64,6 +72,10 @@ input[data-valid="true"] {
     padding-right: 30px;
 }
 
+.form-check-label {
+    cursor: pointer;
+}
+
 .form-check-input + span, .form-check-input + label {
     max-width: 148px;
     overflow: hidden;
@@ -72,15 +84,39 @@ input[data-valid="true"] {
 }
 
 /*Bootstrap Table BUG */
+.fixed-table-toolbar .bs-bars, .fixed-table-toolbar .search, .fixed-table-toolbar .columns {
+    line-height: normal;
+}
+
+.card-view:not(:last-child) {
+    margin-bottom: 6px;
+}
+
 .fixed-table-loading {
     padding: 8px;
 }
 
-.bootstrap-table .fixed-table-body .table {
-    border-bottom: none;
+.bootstrap-table {
+    margin-bottom: 15px;
+}
+
+    .bootstrap-table .fixed-table-body .table {
+        border-bottom: none;
+    }
+
+.card {
+    margin-bottom: 15px;
 }
 
 .card-body .bootstrap-table {
     margin-top: -10px;
 }
 /*Bootstrap Table BUG END*/
+
+.file-drop-zone.clickable:hover {
+    border: 1px dashed #999;
+}
+
+.form-inline .form-row, .form-inline .row {
+    width: 100%;
+}