diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index 776c2b38d..a4f3a9479 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -400,7 +400,7 @@ export class AddonCalendarHelperProvider {
     ): Promise<{ daynames: Partial<AddonCalendarDayName>[]; weeks: AddonCalendarWeek[] }> {
         const site = await CoreSites.getSite(siteId);
         // Get starting week day user preference, fallback to site configuration.
-        let startWeekDayStr = site.getStoredConfig('calendar_startwday');
+        let startWeekDayStr = site.getStoredConfig('calendar_startwday') || '1';
         startWeekDayStr = await CoreConfig.get(AddonCalendarProvider.STARTING_WEEK_DAY, startWeekDayStr);
         const startWeekDay = parseInt(startWeekDayStr, 10);
 
diff --git a/src/assets/img/icons/calendar.png b/src/assets/img/icons/calendar.png
new file mode 100644
index 000000000..e825eeee4
Binary files /dev/null and b/src/assets/img/icons/calendar.png differ