diff --git a/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox b/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
index 728201a57..6b50eb2d9 100644
--- a/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
@@ -6,7 +6,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
-  <md-dialog flex="60" flex-sm="100">
+  <md-dialog flex="60" flex-sm="80" flex-xs="100">
     <md-toolbar>
       <md-icon class="material-icons sg-icon-toolbar-bg">link</md-icon>
       <div class="md-toolbar-tools">
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 7cdd3fa54..81e917ec3 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -443,7 +443,7 @@
 
   <!-- modal for cards import -->
   <script type="text/ng-template" id="UIxContactsImportDialog">
-    <md-dialog flex="40" flex-sm="100" label:aria-label="Import Cards">
+    <md-dialog flex="40" flex-sm="80" flex-xs="100" label:aria-label="Import Cards">
       <md-toolbar>
         <div class="md-toolbar-tools">
           <md-icon class="material-icons sg-icon-toolbar-bg">import_export</md-icon>
diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
index e5ca911ca..45ed4c2b6 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
@@ -6,7 +6,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     xmlns:uix="OGo:uix">
-  <md-dialog flex="50" flex-sm="100">
+  <md-dialog flex="50" flex-sm="80" flex-xs="100">
     <md-toolbar>
       <div class="md-toolbar-tools">
         <div class="sg-md-title md-flex"><var:string label:value="Subscribe to a shared folder"/></div>
diff --git a/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox b/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
index 9143cc286..40a90efac 100644
--- a/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
@@ -6,7 +6,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
-  <md-dialog flex="30" flex-sm="100">
+  <md-dialog flex="30" flex-sm="80" flex-xs="100">
     <md-toolbar>
       <div class="md-toolbar-tools">
         <md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>
diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index ebbd21d04..1f179d88b 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -7,7 +7,7 @@
     xmlns:label="OGo:label"
     xmlns:rsrc="OGo:url"
     xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
-  <md-dialog flex="50" flex-sm="100">
+  <md-dialog flex="50" flex-sm="80" flex-xs="100">
     <md-toolbar>
       <div class="md-toolbar-tools">
         <md-icon class="material-icons sg-icon-toolbar-bg">account_box</md-icon>
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index 6fbe58a37..9ba36746c 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -7,7 +7,7 @@
     xmlns:label="OGo:label"
     xmlns:rsrc="OGo:url"
     xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
-<md-dialog flex="50" flex-sm="100">
+<md-dialog flex="50" flex-sm="80" flex-xs="100">
   <form name="mainForm" ng-submit="filterEditor.save(mainForm)">
     <md-toolbar>
       <div class="md-toolbar-tools">
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 1c40b1f62..0995c9881 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -357,7 +357,7 @@
           <md-content class="md-padding">
             <div layout="column" flex="100">
               <md-list layout="row" layout-wrap="layout-wrap">
-                <md-list-item flex="50" flex-sm="100"
+                <md-list-item flex="50" flex-xs="100"
                               ng-repeat="item in
                                          app.preferences.defaults.SOGoCalendarCategories
                                          track by $index">
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
index aa39b6bfd..e7b232bbe 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
@@ -4,7 +4,7 @@
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label">
-  <md-dialog flex="60" flex-md="80" flex-sm="100">
+  <md-dialog flex="60" flex-sm="80" flex-xs="100">
     <form name="eventForm" ng-submit="editor.save(eventForm)">
       <md-toolbar ng-class="editor.component.getClassName('bg')">
         <div class="md-toolbar-tools">
@@ -178,7 +178,8 @@
         </div>
         <!-- end repeat -->
         <div layout="row" layout-align="start end">
-          <div ng-show="editor.component.repeat.frequency != 'never'">
+          <div flex="50" flex-xs="100"
+               ng-show="editor.component.repeat.frequency != 'never'">
             <md-input-container>
               <label><var:string label:value="End Repeat"/></label>
               <md-select ng-model="editor.component.repeat.end"
diff --git a/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox b/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
index 251610194..0b6cce096 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
@@ -7,7 +7,7 @@
     xmlns:label="OGo:label"
     >
 
-  <md-dialog flex="60" flex-sm="100">
+  <md-dialog flex="60" flex-sm="80" flex-xs="100">
     <md-toolbar>
       <md-icon class="material-icons sg-icon-toolbar-bg">link</md-icon>
       <div class="md-toolbar-tools">
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index d1ce3ae5b..12b87edc8 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -6,7 +6,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
-  <md-dialog flex-sm="100">
+  <md-dialog flex-xs="100">
 
     <md-toolbar ng-class="properties.calendar.getClassName('bg')">
       <div class="md-toolbar-tools">
diff --git a/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox b/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
index deb9c7468..e7f6ebbf1 100644
--- a/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox
@@ -27,7 +27,7 @@
     <div class="pseudo-input-container layout-padding" layout="row" layout-align="center center">
       <label class="pseudo-input-label"><var:string label:value="On"/></label>
       <md-grid-list md-cols="7" md-row-height="2em" md-gutter="0.5em"
-                    flex="50" flex-md="80" flex-sm="100"
+                    flex="50" flex-sm="80" flex-xs="100"
                     sg-toggle-grid="editor.component.repeat.days"
                     sg-toggle-grid-attr="day">
         <var:foreach list="shortWeekDaysList" item="item">
@@ -52,7 +52,7 @@
       </md-radio-button>
       <div layout="row" layout-align="start center">
         <md-grid-list md-cols="7" md-row-height="2em" md-gutter="0.5em"
-                      flex="50" flex-md="80" flex-sm="100"
+                      flex="50" flex-sm="80" flex-xs="100"
                       sg-toggle-grid="editor.component.repeat.monthdays">
           <md-grid-tile value="1">1</md-grid-tile>
           <md-grid-tile value="2">2</md-grid-tile>
@@ -120,7 +120,7 @@
     </div>
     <div layout="row" layout-align="start center">
       <md-grid-list md-cols="6" md-row-height="2em" md-gutter="0.5em"
-                    flex="50" flex-md="80" flex-sm="100"
+                    flex="50" flex-sm="80" flex-xs="100"
                     sg-toggle-grid="editor.component.repeat.months">
         <var:foreach list="yearlyMonthList" item="item">
           <md-grid-tile var:value="valueForYearlyMonth"><var:string value="item"/></md-grid-tile>
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
index b0e32485c..9ec61fd15 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
@@ -4,7 +4,7 @@
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label">
-  <md-dialog flex="60" flex-sm="100">
+  <md-dialog flex="60" flex-sm="80" flex-xs="100">
     <form name="eventForm" ng-submit="editor.save(eventForm)">
       <md-toolbar ng-class="editor.component.getClassName('bg')">
         <div class="md-toolbar-tools">
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 096101bef..b5b056f24 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -6,7 +6,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
-  <md-dialog flex="50" flex-sm="100">
+  <md-dialog flex="50" flex-sm="80" flex-xs="100">
     <md-toolbar>
       <div class="md-toolbar-tools">
         <md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>