diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
index 731d7bcb0..ed977ffec 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
@@ -37,10 +37,9 @@
         '         sg-enter="$ctrl.saveFolder($event)"',
         '         sg-escape="$ctrl.revertEditing()" />',
         '</md-input-container>',
-        '<md-button class="md-secondary md-icon-button" ',
-        '           as-sortable-item-handle="as-sortable-item-handle">',
-        '  <md-icon md-colors="::{color: \'accent-400\'}">drag_handle</md-icon>',
-        '</md-button>',
+        '<md-icon class="md-menu md-secondary-container"',
+        '           as-sortable-item-handle="as-sortable-item-handle"',
+        '           md-colors="::{color: \'accent-400\'}">drag_handle</md-icon>',
         '<md-icon class="md-menu md-secondary-container sg-list-sortable-hide"',
         '         ng-click="$ctrl.showMenu($event)"',
         '         aria-label="' + l("Options") + '">more_vert</md-icon>'
diff --git a/UI/WebServerResources/scss/components/list/list.scss b/UI/WebServerResources/scss/components/list/list.scss
index 90894a3ba..72257bf25 100644
--- a/UI/WebServerResources/scss/components/list/list.scss
+++ b/UI/WebServerResources/scss/components/list/list.scss
@@ -261,19 +261,21 @@ div.md-tile-left {
  * See https://github.com/a5hik/ng-sortable
  */
 
-.as-sortable-hidden {
-  display: none !important;
-}
+.as-sortable-item {
+  .as-sortable-hidden {
+    display: none !important;
+  }
 
-.as-sortable-un-selectable {
-  user-select: none;
-}
+  .as-sortable-un-selectable {
+    user-select: none;
+  }
 
-.as-sortable-item-handle {
-  display: none; /* [1] */
-  cursor: move;
-  cursor: -webkit-grab;
-  cursor: -moz-grab;
+  .as-sortable-item-handle {
+    display: none; /* [1] */
+    cursor: move;
+    cursor: -webkit-grab;
+    cursor: -moz-grab;
+  }
 }
 
 .sg-list-sortable {