diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 08d3ae3fd..cad0637bc 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -259,13 +259,11 @@
                 </md-menu-item>
                 <md-menu-divider> <!-- divider --></md-menu-divider>
                 <md-menu-item >
-                  <md-button>
-                    <md-checkbox
-                        ng-change="addressbook.sort(addressbook.selectedFolder.constructor.$query.sort)"
-                        ng-model="addressbook.selectedFolder.constructor.$query.asc"
-                        ng-true-value="0"
-                        ng-false-value="1"><var:string label:value="Descending Order"/></md-checkbox>
-                  </md-button>
+                  <sg-checkmark
+                      ng-change="addressbook.sort(addressbook.selectedFolder.constructor.$query.sort)"
+                      ng-model="addressbook.selectedFolder.constructor.$query.asc"
+                      sg-true-value="0"
+                      sg-false-value="1"><var:string label:value="Descending Order"/></sg-checkmark>
                 </md-menu-item>
               </md-menu-content>
             </md-menu>
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 74c5ba9e3..dc170e676 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -164,11 +164,9 @@
             </md-button>
             <md-menu-content width="4">
               <md-menu-item>
-                <md-button>
-                  <md-checkbox ng-model="editor.message.editable.receipt">
-                    <var:string label:value="Return Receipt"/>
-                  </md-checkbox>
-                </md-button>
+                <sg-checkmark ng-model="editor.message.editable.receipt">
+                  <var:string label:value="Return Receipt"/>
+                </sg-checkmark>
               </md-menu-item>
               <md-menu-item>
                 <md-button class="md-primary" ng-disabled="true"><var:string label:value="Priority"/></md-button>
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index 5d5506040..aa2efc95b 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -29,14 +29,13 @@
           </md-button>
           <md-menu-content>
             <md-menu-item>
-              <md-button>
-                <md-checkbox ng-model="app.search.subfolders"
-                             ng-true-value="1"
-                             ng-false-value="0">
-                  <var:string label:value="Search subfolders"/>
-                </md-checkbox>
-              </md-button>
+              <sg-checkmark ng-model="app.search.subfolders"
+                            sg-true-value="1"
+                            sg-false-value="0">
+                <var:string label:value="Search subfolders"/>
+              </sg-checkmark>
             </md-menu-item>
+            <md-menu-divider> <!-- divider --></md-menu-divider>
             <md-menu-item>
               <md-button ng-click="app.search.match='AND'">
                 <md-icon ng-class="{ 'icon-check': app.search.match == 'AND'}">
@@ -102,12 +101,12 @@
             </md-menu-item>
             <md-menu-divider> <!-- divider --></md-menu-divider>
             <md-menu-item>
-              <md-button ng-click="mailbox.selectedFolder.$filter()">
-                <md-checkbox
-                    ng-model="mailbox.service.$query.asc"
-                    ng-true-value="0"
-                    ng-false-value="1"><var:string label:value="Descending Order"/></md-checkbox>
-              </md-button>
+              <sg-checkmark
+                  label:aria-label="Descending Order"
+                  ng-model="mailbox.service.$query.asc"
+                  ng-change="mailbox.selectedFolder.$filter()"
+                  sg-true-value="0"
+                  sg-false-value="1"><var:string label:value="Descending Order"/></sg-checkmark>
             </md-menu-item>
           </md-menu-content>
         </md-menu>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 0c26f09d9..67f760311 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -362,12 +362,11 @@
                 </md-menu-item>
                 <md-menu-divider ng-if="list.componentType == 'tasks'"><!-- divider --></md-menu-divider>
                 <md-menu-item ng-if="list.componentType == 'tasks'">
-                  <md-button ng-click="list.component.$filter(list.componentType)">
-                    <md-checkbox
-                        ng-model="list.component.$queryTasks.show_completed"
-                        ng-true-value="1"
-                        ng-false-value="0"> <var:string label:value="Show completed tasks"/></md-checkbox>
-                  </md-button>
+                  <sg-checkmark
+                      ng-change="list.component.$filter(list.componentType)"
+                      ng-model="list.component.$queryTasks.show_completed"
+                      sg-true-value="1"
+                      sg-false-value="0"> <var:string label:value="Show completed tasks"/></sg-checkmark>
                 </md-menu-item>
               </md-menu-content>
             </md-menu>
@@ -433,22 +432,20 @@
                 </md-menu-item>
                 <md-menu-divider><!-- divider --></md-menu-divider>
                 <md-menu-item ng-if="list.componentType == 'events'">
-                  <md-button>
-                    <md-checkbox class="sg-no-wrap"
-                        ng-change="list.component.$filter(list.componentType)"
-                        ng-model="list.component.$queryEvents.asc"
-                        ng-true-value="0"
-                        ng-false-value="1"><var:string label:value="Descending Order"/></md-checkbox>
-                  </md-button>
+                  <sg-checkmark
+                      class="sg-no-wrap"
+                      ng-change="list.component.$filter(list.componentType)"
+                      ng-model="list.component.$queryEvents.asc"
+                      sg-true-value="0"
+                      sg-false-value="1"><var:string label:value="Descending Order"/></sg-checkmark>
                 </md-menu-item>
                 <md-menu-item ng-if="list.componentType == 'tasks'">
-                  <md-button>
-                    <md-checkbox class="sg-no-wrap"
-                        ng-change="list.component.$filter(list.componentType)"
-                        ng-model="list.component.$queryTasks.asc"
-                        ng-true-value="0"
-                        ng-false-value="1"><var:string label:value="Descending Order"/></md-checkbox>
-                  </md-button>
+                  <sg-checkmark
+                      class="sg-no-wrap"
+                      ng-change="list.component.$filter(list.componentType)"
+                      ng-model="list.component.$queryTasks.asc"
+                      sg-true-value="0"
+                      sg-false-value="1"><var:string label:value="Descending Order"/></sg-checkmark>
                 </md-menu-item>
               </md-menu-content>
             </md-menu>