diff --git a/UI/Templates/AdministrationUI/UIxAdministration.wox b/UI/Templates/AdministrationUI/UIxAdministration.wox
index a2e71eb56..bec34c0dd 100644
--- a/UI/Templates/AdministrationUI/UIxAdministration.wox
+++ b/UI/Templates/AdministrationUI/UIxAdministration.wox
@@ -44,7 +44,7 @@
   <script type="text/ng-template" id="rights.html">
     <!-- TOP RIGHT TOOLBAR -->
     <md-toolbar layout="row" layout-align="space-between center" class="toolbar-main">
-      <var:component className="UIxTopnavToolbarTemplate" />
+      <var:component className="UIxTopnavToolbar" />
     </md-toolbar>
 
     <div layout="row" class="md-flex">
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 0f4e04025..9ee524688 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -192,7 +192,7 @@
 
   <script type="text/ng-template" id="addressbook">
     <md-toolbar layout="row" layout-align="space-between center" class="toolbar-main">
-      <var:component className="UIxTopnavToolbarTemplate" />
+      <var:component className="UIxTopnavToolbar" />
     </md-toolbar>
 
     <div layout="row" class="md-flex">
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index ffb2f3b83..52d162282 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -179,7 +179,7 @@
 
     <section layout="column" layout-fill="layout-fill" ui-view="mailbox">
       <md-toolbar layout="row" layout-align="space-between center" class="toolbar-main">
-        <var:component className="UIxTopnavToolbarTemplate"/>
+        <var:component className="UIxTopnavToolbar"/>
       </md-toolbar>
       <md-content class="md-flex md-hue-2"
                   layout="column" layout-align="center center" layout-fill="layout-fill">
@@ -193,7 +193,7 @@
   <script type="text/ng-template" id="UIxMailFolderTemplate">
     <md-toolbar layout="row" layout-align="space-between center" class="toolbar-main"
                 ng-hide="app.showingAdvancedSearch">
-      <var:component className="UIxTopnavToolbarTemplate"/>
+      <var:component className="UIxTopnavToolbar"/>
     </md-toolbar>
 
     <!-- Advanced search toolbar -->
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 63f046e68..5398b6d1d 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -72,7 +72,7 @@
 
       <!-- TOP RIGHT TOOLBAR -->
       <md-toolbar layout="row" layout-align="space-between start" class="md-tall">
-        <var:component className="UIxTopnavToolbarTemplate" const:navButtonClick="app.confirmChanges($event, preferencesForm)"/>
+        <var:component className="UIxTopnavToolbar" const:navButtonClick="app.confirmChanges($event, preferencesForm)"/>
         <md-button type="button" class="md-fab md-fab-bottom-right md-fab-overlap-bottom"
                    ng-disabled="preferencesForm.$invalid || preferencesForm.$pristine"
                    ng-click="app.save(preferencesForm)">
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 6f92dfd33..60ed48099 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -271,7 +271,7 @@
     <section layout="column" layout-fill="layout-fill"
              ng-controller="CalendarListController as list">
       <md-toolbar class="toolbar-main" flex-none="flex-none" layout="row" layout-align="space-between center">
-        <var:component className="UIxTopnavToolbarTemplate" />
+        <var:component className="UIxTopnavToolbar"/>
         <!-- <div class="sg-toolbar-group-2">
              <md-button class="sg-icon-button" label:aria-label="Search">
              <md-icon>search</md-icon>