diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 7a4942cac..13fc75c65 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -17,6 +17,9 @@
 "Date" = "Date";
 "Calendars" = "Calendars";
 
+"No events for selected criteria" = "No events for selected criteria";
+"No tasks for selected criteria" = "No tasks for selected criteria";
+
 /* Day */
 
 "DayOfTheMonth" = "Day of the month";
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 7717b1c59..007892706 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -348,7 +348,7 @@
           </div>
         </div>
       </md-toolbar>
-      <md-content layout="row">
+      <md-content layout="row" class="md-flex">
         <div class="view-list md-flex" layout="column" style="position: relative;">
           <md-content id="componentsList">
             <md-tabs md-dynamic-height="true"
@@ -365,13 +365,18 @@
                                   componentId: event.c_name})">
                       <h3>{{event.c_title}}</h3>
                       <p>{{event.c_location}}</p>
-                      <p class="md-secondary">
+                      <p class="md-secondary" layout="row">
                         {{event.formatted_startdate}}
-                        <md-icon ng-show="event.c_iscycle">repeat</md-icon>
-                        <md-icon ng-show="event.c_nextalarm">alarm</md-icon>
+                        <span class="sg-tile-icons">
+                          <md-icon ng-show="event.c_iscycle">repeat</md-icon>
+                          <md-icon ng-show="event.c_nextalarm">alarm</md-icon>
+                        </span>
                       </p>
                     </div>
                   </md-list-item>
+                  <md-list-item ng-if="list.component.$events.length == 0">
+                    <p class="sg-md-caption"><var:string label:value="No events for selected criteria"/></p>
+                  </md-list-item>
                 </md-list>
               </md-tab>
               <md-tab label:label="Tasks"
@@ -385,13 +390,18 @@
                                   componentType: 'task',
                                   componentId: task.c_name})">
                       <h3>{{task.c_title}}</h3>
-                      <p class="md-secondary">
+                      <p class="md-secondary" layout="row">
                         {{task.formatted_enddate}}
-                        <md-icon ng-show="task.c_iscycle">repeat</md-icon>
-                        <md-icon ng-show="event.c_nextalarm">alarm</md-icon>
+                        <span class="sg-tile-icons">
+                          <md-icon ng-show="task.c_iscycle">repeat</md-icon>
+                          <md-icon ng-show="event.c_nextalarm">alarm</md-icon>
+                        </span>
                       </p>
                     </div>
                   </md-list-item>
+                  <md-list-item ng-if="list.component.$tasks.length == 0">
+                    <p class="sg-md-caption"><var:string label:value="No tasks for selected criteria"/></p>
+                  </md-list-item>
                 </md-list>
               </md-tab>
             </md-tabs>