diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 1a88caf9c..4fad8f40a 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -173,6 +173,17 @@
                ng-show="currentFolderIsConfigurable(folder)"><!-- options --></i>
           </md-list-item>
         </md-list>
+        <md-toolbar class="md-medium-tall">
+          <div class="md-toolbar-tools md-toolbar-tools-bottom">
+            <md-button
+                class="iconButton sg-button-navicon"
+                label:aria-label="Subscribe to an Addressbook..."
+              sg-subscribe="contact"
+              sg-subscribe-on-select="subscribeToFolder(folderData)">
+              <i class="md-icon-folder-shared"><!-- icon --></i>
+            </md-button>
+          </div>
+          </md-toolbar>
       </md-content>
     </md-sidenav>
 
diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
index 16276e355..dd836fb45 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
@@ -5,45 +5,42 @@
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
-    xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
-  <span class="joyride-nub left"><!-- dropdown nub --></span>
-  <div class="joyride-content-wrapper">
-    <ul>
-      <li class="title"><var:string label:value="Subscribe"/></li>
-      <li class="search">
-        <input type="text" label:placeholder="Search"
-               ng-model="searchString"
-               sg-user-typeahead="sg-user-typeahead" />
-      </li>
-      <li class="item"
-          ng-repeat="user in users">
-        <a ng-click="selectUser($index)"
-           ng-mouseenter="selectActive($index)">
-          <span bind-html-unsafe="user.$shortFormat() | typeaheadHighlight:query"><!-- user --></span>
-          <i class="icon right"
-             ng-class="{'icon-arrow-right': user.uid != selectedUser.uid, 'icon-arrow-down': user.uid == selectedUser.uid}"><!-- arrow --></i>
-        </a>
-        <ul class="subitems"
-            ng-if="user.uid == selectedUser.uid">
-          <li class="item"
-              ng-show="user.$$folders.length == 0">
-            <a class="disabled">
-              <i class="icon icon-notification"><!-- no subscription --></i>
+    xmlns:uix="OGo:uix">
+  <md-dialog>
+  <md-content>
+    <md-input-container md-no-float="md-no-float" layout="row">
+      <i class="md-icon-search"><!--icon--></i>
+      <input ng-model="searchString" type="text" placeholder="Name" sg-user-typeahead="sg-user-typeahead"/>
+    </md-input-container>
+
+    <md-list>
+      <md-list-item ng-repeat="user in users" layout="column">
+        <md-button ng-click="selectUser($index)">
+          {{user.$shortFormat()}}
+          <i class="md-icon-chevron-right"
+             ng-show="user.uid != selectedUser.uid"><!--icon--></i>
+          <i class="md-icon-chevron-more"
+             ng-show="user.uid == selectedUser.uid"><!--icon--></i>
+        </md-button>
+
+        <md-list ng-if="user.uid == selectedUser.uid">
+          <md-list-item ng-show="user.$$folders.length == 0">
+              <i class="md-icon-warning"><!-- no subscription --></i>
               <var:string label:value="No possible subscription"/>
-            </a>
-          </li>
-          <li class="item"
+          </md-list-item>
+          <md-list-item
               ng-repeat="folder in user.$$folders">
-            <a>
-              <i class="icon"
-                 ng-class="{'icon-address-book': folder.type == 'Contact'}"><!-- type --></i>
-              <span ng-bind="folder.displayName"><!-- folder --></span>
-              <button class="button tiny right"
-                      ng-click="selectFolder(folder)">Subscribe</button>
-            </a>
-          </li>
-        </ul>
-      </li>
-    </ul>
-  </div>
+              <i class="md-icon-contacts"
+                 ng-show="folder.type == 'Contact'"><!--icon--></i>
+              {{folder.displayName}}
+              <md-button class="button tiny right"
+                         ng-click="selectFolder(folder)">Subscribe</md-button>
+          </md-list-item>
+        </md-list>
+        <md-divider><!-- divider --></md-divider>
+      </md-list-item>
+    </md-list>
+    
+  </md-content>
+  </md-dialog>
 </container>
diff --git a/UI/WebServerResources/js/Common/ui-desktop.js b/UI/WebServerResources/js/Common/ui-desktop.js
index 731e2f930..a4966ee1f 100644
--- a/UI/WebServerResources/js/Common/ui-desktop.js
+++ b/UI/WebServerResources/js/Common/ui-desktop.js
@@ -460,26 +460,41 @@
     .directive('sgSubscribe', [function() {
       console.debug('registering sgSubscribe');
       return {
-        restrict: 'CA',
+        restrict: 'A',
         scope: {
           folderType: '@sgSubscribe',
-          onFolderSelect: '=sgSubscribeOnSelect'
+          onFolderSelect: '&sgSubscribeOnSelect'
         },
-        templateUrl: 'userFoldersTemplate', // UI/Templates/Contacts/UIxContactsUserFolders.wox
-        controller: ['$scope', function($scope) {
-          $scope.selectUser = function(i) {
-            // Fetch folders of specific type for selected user
-            $scope.users[i].$folders($scope.folderType).then(function() {
-              $scope.selectedUser = $scope.users[i];
+        replace: false,
+        link: function(scope, element, attrs, controller) {
+          element.on('click', controller.showDialog);
+        },
+        controllerAs: 'vm',
+        bindToController: true,
+        controller: ['$scope', '$mdDialog', function($scope, $mdDialog) {
+          var vm = this;
+          vm.showDialog = function() {
+            $mdDialog.show({
+              templateUrl: 'UIxContactsUserFolders',
+              clickOutsideToClose: true,
+	      locals: {
+                folderType: vm.folderType,
+                onFolderSelect: vm.onFolderSelect
+              },
+              controller: function($scope, folderType, onFolderSelect) {
+                $scope.selectUser = function(i) {
+                  // Fetch folders of specific type for selected user
+                  $scope.users[i].$folders(folderType).then(function() {
+                    $scope.selectedUser = $scope.users[i];
+                  });
+                };
+                $scope.selectFolder = function(folder) {
+                  onFolderSelect({folderData: folder});
+                };
+              }
             });
           };
-          $scope.selectFolder = function(folder) {
-            $scope.onFolderSelect(folder);
-          };
         }],
-        link: function(scope, element, attrs, controller) {
-          element.addClass('joyride-tip-guide');
-        }
       };
     }])