diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css
index e2184af9..5b130120 100644
--- a/res/app/device-list/device-list.css
+++ b/res/app/device-list/device-list.css
@@ -10,10 +10,6 @@
   right: 20px;
 }
 
-.stf-device-list .clear-filtering-buttons {
-  margin-top: 0;
-}
-
 .stf-device-list .device-not-usable {
   /*background: rgb(245, 245, 245);*/
   opacity: 0.8;
@@ -188,7 +184,7 @@ ul.devices-icon-view .device-is-busy .device-photo-small img {
   opacity: 1;
 }
 
-.device-list-details-content .stf-device-details-customize {
+.stf-device-list .stf-device-details-customize {
   white-space: nowrap;
   padding: 10px;
   padding-bottom: 0;
@@ -198,15 +194,12 @@ ul.devices-icon-view .device-is-busy .device-photo-small img {
   max-width: 800px;
 }
 
-.device-list-details-content .stf-device-details-customize .radio, .checkbox {
+.stf-device-list .stf-device-details-customize .radio,
+.stf-device-list .stf-device-details-customize .checkbox {
   margin: 0;
   margin-bottom: 10px;
 }
 
-.stf-device-list .stf-device-list-tabs {
-
-}
-
 .stf-device-list .device-product-name-unusable {
   color: inherit;
 }
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 7b79c1f6..8b4e045e 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -7,24 +7,43 @@
     .col-md-12
       .widget-container.fluid-height.stf-device-list-tabs
         .widget-content.padded
+
+          .filtering-buttons
+            datalist(id='searchFields')
+              select(name='searchFields')
+                option(ng-repeat='column in columns', ng-value='column.name + ": "',
+                ng-bind='columnDefinitions[column.name].title | translate')
+            input(type='search', results='5', autosave='deviceFilter'
+              name='deviceFilter', ng-model='search.deviceFilter', ng-change='applyFilter(search.deviceFilter)',
+              ng-model-options='{debounce: 150}'
+              autocorrect='off', autocapitalize='off', spellcheck='false',
+              list='searchFields', multiple, autofocusX
+              text-focus-selectX, accesskey='4').form-control.input-sm.device-search.pull-right
+
+            span.pull-right(ng-if='activeTabs.details')
+              .btn-group(dropdown).pull-right
+                button.btn.btn-sm.btn-primary-outline.dropdown-toggle
+                  i.fa.fa-columns
+                  span {{"Customize"|translate}}
+
+                ul.dropdown-menu(role='menu', data-toggle='dropdown').pointer.stf-device-details-customize
+                  li(ng-repeat='column in columns track by column.name',
+                  ng-hide='!adminMode && columnDefinitions[column.name].admin',
+                  ng-click='$event.stopPropagation()')
+                    label.checkbox.pointer
+                      input(type='checkbox', ng-model='column.selected')
+                      span(ng-bind='columnDefinitions[column.name].title | translate')
+                  li
+                    button(ng-click='reset()').btn.btn-xs.btn-danger-outline
+                      i.fa.fa-trash-o
+                      span(ng-bind='"Reset"|translate')
+
           tabset.overflow-auto.device-list-active-tabs(ng-if='activeTabs')
             tab(active='activeTabs.icons')
               tab-heading
                 i.fa.fa-th-large
                 span(translate) Devices
               div.device-list-devices-content(ng-if='activeTabs.icons')
-                .filtering-buttons
-                  datalist(id='searchFields')
-                    select(name='searchFields')
-                      option(ng-repeat='column in columns', ng-value='column.name + ": "',
-                      ng-bind='columnDefinitions[column.name].title | translate')
-                  input(type='search', results='5', autosave='deviceFilter'
-                    name='deviceFilter', ng-model='search.deviceFilter', ng-change='applyFilter(search.deviceFilter)',
-                    ng-model-options='{debounce: 150}'
-                    autocorrect='off', autocapitalize='off', spellcheck='false',
-                    list='searchFields', multiple,
-                    text-focus-select, accesskey='4').form-control.input-sm.device-search.pull-right
-                .clear-filtering-buttons
 
                 device-list-icons(tracker='tracker', columns='columns', sort='sort', filter='filter')
 
@@ -33,35 +52,5 @@
                 i.fa.fa-list
                 span(translate) Details
               div.device-list-details-content(ng-if='activeTabs.details')
-                .filtering-buttons
-                  datalist(id='searchFields')
-                    select(name='searchFields')
-                      option(ng-repeat='column in columns', ng-value='column.name + ": "',
-                        ng-bind='columnDefinitions[column.name].title | translate')
-                  input(type='search', results='5', autosave='deviceFilter'
-                    name='deviceFilter', ng-model='search.deviceFilter', ng-change='applyFilter(search.deviceFilter)',
-                    ng-model-options='{debounce: 150}'
-                    autocorrect='off', autocapitalize='off', spellcheck='false'
-                    list='searchFields', multiple,
-                    text-focus-select, accesskey='4').form-control.input-sm.device-search.pull-right
-
-                  span.pull-right
-                    .btn-group(dropdown).pull-right
-                      button.btn.btn-sm.btn-primary-outline.dropdown-toggle
-                        i.fa.fa-columns
-                        span {{"Customize"|translate}}
-
-                      ul.dropdown-menu(role='menu', data-toggle='dropdown').pointer.stf-device-details-customize
-                        li(ng-repeat='column in columns track by column.name',
-                          ng-hide='!adminMode && columnDefinitions[column.name].admin',
-                          ng-click='$event.stopPropagation()')
-                          label.checkbox.pointer
-                            input(type='checkbox', ng-model='column.selected')
-                            span(ng-bind='columnDefinitions[column.name].title | translate')
-                        li
-                          button(ng-click='reset()').btn.btn-xs.btn-danger-outline
-                            i.fa.fa-trash-o
-                            span(ng-bind='"Reset"|translate')
-
 
                 device-list-details(tracker='tracker', columns='columns', sort='sort', filter='filter').selectable