diff --git a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
index 65ba3710b..90c0ee75b 100644
--- a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
@@ -1,9 +1,10 @@
-using Nancy;
+using Nancy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Ical.Net;
 using Ical.Net.DataTypes;
+using Ical.Net.General;
 using Ical.Net.Interfaces.Serialization;
 using Ical.Net.Serialization;
 using Ical.Net.Serialization.iCalendar.Factory;
@@ -86,6 +87,10 @@ namespace NzbDrone.Api.Calendar
                 ProductId = "-//radarr.video//Radarr//EN"
             };
 
+            var calendarName = "Radarr Movies Calendar";
+            calendar.AddProperty(new CalendarProperty("NAME", calendarName));
+            calendar.AddProperty(new CalendarProperty("X-WR-CALNAME", calendarName));
+
             foreach (var movie in movies.OrderBy(v => v.Added))
             {
                 if (tags.Any() && tags.None(movie.Tags.Contains))
@@ -114,8 +119,10 @@ namespace NzbDrone.Api.Calendar
                             occurrence.End = new CalDateTime(movie.InCinemas.Value.AddMinutes(movie.Runtime)) { HasTime = true };
                         }
                         break;
+
                     case MovieStatusType.Announced:
                         continue; // no date
+
                     default:
                         if (movie.PhysicalRelease != null)
                         {
diff --git a/src/UI/Settings/UI/UiViewTemplate.hbs b/src/UI/Settings/UI/UiViewTemplate.hbs
index c0cd483b5..838c716fc 100644
--- a/src/UI/Settings/UI/UiViewTemplate.hbs
+++ b/src/UI/Settings/UI/UiViewTemplate.hbs
@@ -45,10 +45,10 @@
 
             <div class="col-sm-4 col-sm-pull-1">
                 <select name="calendarWeekColumnHeader" class="form-control">
-                    <option value="ddd M/D">Tue 3/5</option>
-                    <option value="ddd MM/DD">Tue 03/05</option>
-                    <option value="ddd D/M">Tue 5/3</option>
-                    <option value="ddd DD/MM">Tue 05/03</option>
+                    <option value="ddd M/D">Tue 3/25</option>
+                    <option value="ddd MM/DD">Tue 03/25</option>
+                    <option value="ddd D/M">Tue 25/3</option>
+                    <option value="ddd DD/MM">Tue 25/03</option>
                 </select>
             </div>
         </div>
@@ -62,12 +62,12 @@
 
             <div class="col-sm-4">
                 <select name="shortDateFormat" class="form-control">
-                    <option value="MMM D YYYY">Mar 5 2014</option>
-                    <option value="DD MMM YYYY">05 Mar 2014</option>
-                    <option value="MM/D/YYYY">03/5/2014</option>
-                    <option value="MM/DD/YYYY">03/05/2014</option>
-                    <option value="DD/MM/YYYY">05/03/2014</option>
-                    <option value="YYYY-MM-DD">2014-03-05</option>
+                    <option value="MMM D YYYY">Mar 25 2014</option>
+                    <option value="DD MMM YYYY">25 Mar 2014</option>
+                    <option value="MM/D/YYYY">03/25/2014</option>
+                    <option value="MM/DD/YYYY">03/25/2014</option>
+                    <option value="DD/MM/YYYY">25/03/2014</option>
+                    <option value="YYYY-MM-DD">2014-03-25</option>
                 </select>
             </div>
         </div>
@@ -77,8 +77,8 @@
 
             <div class="col-sm-4">
                 <select name="longDateFormat" class="form-control">
-                    <option value="dddd, MMMM D YYYY">Tuesday, March 5, 2014</option>
-                    <option value="dddd, D MMMM YYYY">Tuesday, 5 March, 2014</option>
+                    <option value="dddd, MMMM D YYYY">Tuesday, March 25, 2014</option>
+                    <option value="dddd, D MMMM YYYY">Tuesday, 25 March, 2014</option>
                 </select>
             </div>
         </div>