diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css
index 96839d70..d2071fdc 100644
--- a/res/app/device-list/device-list.css
+++ b/res/app/device-list/device-list.css
@@ -6,6 +6,10 @@
   margin-top: -32px;
 }
 
+.stf-device-list .clear-filtering-buttons {
+  margin-top: 0px;
+}
+
 .stf-device-list .device-not-usable {
   /*background: rgb(245, 245, 245);*/
   opacity: 0.7;
@@ -112,12 +116,14 @@ ul.devices-icon-view .device-is-busy .device-photo-small img {
 
 
 .device-list-active-tabs.ng-enter {
-  -webkit-transition: 150ms;
-  transition: 150ms;
-  margin-top: -100%;
+  -webkit-transition: 250ms;
+  transition: 250ms;
+  /*margin-top: -100%;*/
+  opacity: 0;
 }
 
 .device-list-active-tabs.ng-enter-active {
-  margin-top: 0;
+  /*margin-top: 0;*/
+  opacity: 1;
 }
 
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index f0dcbc07..d7b7074b 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -11,8 +11,19 @@ div.stf-device-list
               div(ng-if='activeTabs.devices').device-list-devices-content
                 nothing-to-show(message='{{"No devices connected"|translate}}', icon='fa-sitemap', ng-show='!tracker.devices.length')
 
+                .filtering-buttons.pull-right
+                  input(type='search',results='5', autosave='deviceSearch'
+                  name='deviceSearch', ng-model='deviceSearch', ng-change='deviceSearchChanged()', autofocus).xform-control
+
+                  //.input-group
+                    input(type='text').form-control
+                    //span.input-group-btn
+                      button.btn.btn-primary-outline(type='button') Search
+                  //clear-button(ng-click="tableParams.sorting({}); tableParams.filter({})")
+                .clear-filtering-buttons
+
                 ul.devices-icon-view
-                  li(ng-repeat='device in tracker.devices | filter:{usable:true} | orderBy:"name" track by device.serial',
+                  li(ng-repeat='device in tracker.devices | filter:{usable:true} | filter:{name:deviceSearch} | orderBy:"name" track by device.serial',
                   ng-click='toggle(device)',
                   ).cursor-select.pointer.thumbnail
                     .device-photo-small
@@ -24,7 +35,7 @@ div.stf-device-list
                 .clear-fix
                 .line
                 ul.devices-icon-view
-                  li(ng-repeat='device in tracker.devices | filter:{usable:false} | orderBy:"name" track by device.serial',
+                  li(ng-repeat='device in tracker.devices | filter:{usable:false} | filter:{name:deviceSearch} | orderBy:"name" track by device.serial',
                   ng-disabled='true',
                   ).cursor-select.pointer.thumbnail.device-is-busy
                     .device-photo-small
@@ -50,6 +61,7 @@ div.stf-device-list
                     i.fa.fa-list-alt
                     span {{"Show All"|translate}}
 
+
                 //table.table.table-hover.dataTable(ng-table='tableParams', show-filter='filterEnabled')
                   thead
                     tr