diff --git a/src/Jackett.Common/Content/custom.css b/src/Jackett.Common/Content/custom.css
index 6a459feda..ea0a09e67 100644
--- a/src/Jackett.Common/Content/custom.css
+++ b/src/Jackett.Common/Content/custom.css
@@ -7,10 +7,8 @@ body {
     border-radius: 6px;
     background-color: white;
     max-width: 900px;
-    margin: 0 auto;
-    margin-top: 30px;
     padding: 20px;
-    margin-bottom: 100px;
+    margin: 30px auto 100px;
 }
 
 .container-fluid {
@@ -22,7 +20,7 @@ body {
 
 #indexers {
    text-align: center;
-   margin-top: 30px;
+   margin-top: 20px;
 }
 
 .indexer-table {
@@ -116,7 +114,7 @@ hr {
 }
 
 .input-area {
-    margin: 4px 0px;
+    margin: 4px 0;
 }
 
     .input-area > * {
@@ -155,8 +153,7 @@ hr {
 
 #footer {
     color: #444444;
-    margin: 0 auto;
-    margin-top: 10px;
+    margin: 10px auto 0;
     text-align: center;
 }
 
@@ -170,7 +167,7 @@ hr {
 }
 
 .indexer-caps {
-   padding: 0px 15px 15px 15px;
+   padding: 0 15px 15px 15px;
    border-top: 1px solid #e5e5e5;
 }
 
@@ -201,23 +198,53 @@ hr {
 pre {
     display: block;
     padding: 3px;
-    margin: 0 0 0px;
+    margin: 0 0 0;
     font-size: 13px;
     line-height: 1.42857143;
     color: #333;
     word-break: break-all;
     word-wrap: break-word;
     background-color: transparent;
-    border: 0px;
-    border-radius: 0px;
+    border: 0;
+    border-radius: 0;
 }
 
 .modal-open .modal {
     overflow-x: auto;  /* Model can be bigger than the screen on mobiles */
 }
 
+.dataTables_length {
+    white-space: nowrap;
+}
+
+.dataTables_length select, .dataTables_filter input, .dataTable.compact tfoot td select {
+    display: inline-block;
+    height: 26px;
+    padding: 0 8px;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+}
+
+.dataTables_length select {
+    width: inherit;
+}
+
 .dataTables_filter input {
-    width: 400px 
+    width: 400px;
+}
+
+.dataTable.compact tfoot td {
+    padding: 4px 0;
+}
+
+.dataTable.compact tfoot td select {
+    height: 26px;
+    padding: 0;
+}
+
+.dataTables_wrapper .dataTables_paginate .paginate_button {
+    padding: 3px 9px !important;
 }
 
 #unconfigured-indexers-template {
@@ -272,7 +299,8 @@ table td.fit{
 }
 
 input#searchquery {
-	width:400px;
+	width: 400px;
+    display: inline-block;
 }
 
 #proxy-warning {
diff --git a/src/Jackett.Common/Content/custom.js b/src/Jackett.Common/Content/custom.js
index 953c17540..1d08fffc0 100644
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -956,22 +956,22 @@ function updateSearchResultTable(element, results) {
                     "searchable": false,
                     "type": 'num'
                 },
-                    {
-                        "targets": 5,
-                        "visible": true,
-                        "searchable": false,
-                        "iDataSort": 4
-                    }
+                {
+                    "targets": 5,
+                    "visible": true,
+                    "searchable": false,
+                    "iDataSort": 4
+                }
             ],
             fnPreDrawCallback: function () {
                 var table = this;
                 var deadfilterdiv = element.find(".dataTables_deadfilter");
                 var deadfiltercheckbox = deadfilterdiv.find("input");
                 if (!deadfiltercheckbox.length) {
-                    deadfilterlabel = $('<label><input type="checkbox" id="jackett-search-results-datatable_deadfilter_checkbox" value="1">Show dead torrents</label>'
+                    deadfilterlabel = $('<label><input type="checkbox" id="jackett-search-results-datatable_deadfilter_checkbox" value="1"> Show dead torrents</label>'
                         );
                     deadfilterdiv.append(deadfilterlabel);
-                    deadfiltercheckbox = deadfilterlabel.find("input")
+                    deadfiltercheckbox = deadfilterlabel.find("input");
                     deadfiltercheckbox.on("change", function () {
                         settings.deadfilter = this.checked;
                         table.api().draw();
diff --git a/src/Jackett.Common/Content/custom_mobile.css b/src/Jackett.Common/Content/custom_mobile.css
index 43f89518b..31a0eadf0 100644
--- a/src/Jackett.Common/Content/custom_mobile.css
+++ b/src/Jackett.Common/Content/custom_mobile.css
@@ -7,10 +7,8 @@ body {
     border-radius: 6px;
     background-color: white;
     max-width: 900px;
-    margin: 0 auto;
-    margin-top: 30px;
     padding: 20px;
-    margin-bottom: 30px;
+    margin: 30px auto;
 }
 
 .container-fluid {
@@ -22,7 +20,7 @@ body {
 
 #indexers {
    text-align: center;
-   margin-top: 30px;
+   margin-top: 20px;
 }
 
 .indexer-table {
@@ -116,7 +114,7 @@ hr {
 }
 
 .input-area {
-    margin: 4px 0px;
+    margin: 4px 0;
 }
 
     .input-area > * {
@@ -155,8 +153,7 @@ hr {
 
 #footer {
     color: #444444;
-    margin: 0 auto;
-    margin-top: 10px;
+    margin: 10px auto 0;
     text-align: center;
 }
 
@@ -170,7 +167,7 @@ hr {
 }
 
 .indexer-caps {
-   padding: 0px 15px 15px 15px;
+   padding: 0 15px 15px 15px;
    border-top: 1px solid #e5e5e5;
 }
 
@@ -201,23 +198,53 @@ hr {
 pre {
     display: block;
     padding: 3px;
-    margin: 0 0 0px;
+    margin: 0 0 0;
     font-size: 13px;
     line-height: 1.42857143;
     color: #333;
     word-break: break-all;
     word-wrap: break-word;
     background-color: transparent;
-    border: 0px;
-    border-radius: 0px;
+    border: 0;
+    border-radius: 0;
 }
 
 .modal-open .modal {
     overflow-x: auto;  /* Model can be bigger than the screen on mobiles */
 }
 
+.dataTables_length {
+    white-space: nowrap;
+}
+
+.dataTables_length select, .dataTables_filter input, .dataTable.compact tfoot td select {
+    display: inline-block;
+    height: 26px;
+    padding: 0 8px;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+}
+
+.dataTables_length select {
+    width: inherit;
+}
+
 .dataTables_filter input {
-    width: 75% 
+    width: 75%;
+}
+
+.dataTable.compact tfoot td {
+    padding: 4px 0;
+}
+
+.dataTable.compact tfoot td select {
+    height: 26px;
+    padding: 0;
+}
+
+.dataTables_wrapper .dataTables_paginate .paginate_button {
+    padding: 3px 9px !important;
 }
 
 #unconfigured-indexers-template {
@@ -282,7 +309,8 @@ div#jackett-releases-datatable_wrapper {
     overflow-x: scroll;
 }
 input#searchquery {
-	width:50%;
+	width: 50%;
+    display: inline-block;
 }
 
 #proxy-warning {
diff --git a/src/Jackett.Common/Content/index.html b/src/Jackett.Common/Content/index.html
index 6c51ae1a4..c50bfcb40 100644
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -471,7 +471,7 @@
                     <div class="modal-body">
                         <p>You can search all configured indexers from this screen.</p>
                         <label for="text">Query</label>
-                        <input type="text" name="query" id="searchquery" />
+                        <input class="form-control" type="text" name="query" id="searchquery" />
                         <label for="tracker">Tracker</label>
                         <select name="tracker" id="searchTracker" multiple="multiple">
                             {{#each indexers}}