diff --git a/src/addon/calendar/components/calendar/addon-calendar-calendar.html b/src/addon/calendar/components/calendar/addon-calendar-calendar.html
index 030377251..093b97064 100644
--- a/src/addon/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addon/calendar/components/calendar/addon-calendar-calendar.html
@@ -39,7 +39,7 @@
         <!-- Weeks. -->
         <ion-row *ngFor="let week of weeks" class="addon-calendar-week">
             <ion-col *ngFor="let value of week.prepadding" class="dayblank addon-calendar-day"></ion-col> <!-- Empty slots (first week). -->
-            <ion-col text-center *ngFor="let day of week.days"  (click)="dayClicked(day.mday)" [ngClass]='{"hasevents": day.hasevents, "today": day.istoday, "weekend": day.isweekend, "duration_finish": day.haslastdayofevent}' class="addon-calendar-day" [class.addon-calendar-event-past-day]="isPastMonth || day.ispast">
+            <ion-col text-center *ngFor="let day of week.days"  (click)="dayClicked(day.mday)" [ngClass]='{"hasevents": day.hasevents, "today": isCurrentMonth && day.istoday, "weekend": day.isweekend, "duration_finish": day.haslastdayofevent}' class="addon-calendar-day" [class.addon-calendar-event-past-day]="isPastMonth || day.ispast">
                 <p class="addon-calendar-day-number"><span>{{ day.mday }}</span></p>
 
                 <!-- In phone, display some dots to indicate the type of events. -->
diff --git a/src/addon/calendar/components/calendar/calendar.ts b/src/addon/calendar/components/calendar/calendar.ts
index 985f284c8..7b088b76f 100644
--- a/src/addon/calendar/components/calendar/calendar.ts
+++ b/src/addon/calendar/components/calendar/calendar.ts
@@ -205,9 +205,12 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
             this.calculateIsCurrentMonth();
 
             if (this.isCurrentMonth) {
+                const currentDay = new Date().getDate();
                 let isPast = true;
+
                 this.weeks.forEach((week) => {
                     week.days.some((day) => {
+                        day.istoday = day.mday == currentDay;
                         day.ispast = isPast && !day.istoday;
                         isPast = day.ispast;
 
diff --git a/src/addon/mod/feedback/components/index/index.ts b/src/addon/mod/feedback/components/index/index.ts
index 18aa04c65..eefc27a7e 100644
--- a/src/addon/mod/feedback/components/index/index.ts
+++ b/src/addon/mod/feedback/components/index/index.ts
@@ -195,14 +195,14 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
             }
 
             return this.fetchFeedbackOverviewData(this.access);
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
+            // Now fill the context menu.
             this.fillContextMenu(refresh);
 
             // Check if there are responses stored in offline.
-            return this.feedbackOffline.hasFeedbackOfflineData(this.feedback.id);
-        }).then((hasOffline) => {
-            this.hasOffline = hasOffline;
+            return this.feedbackOffline.hasFeedbackOfflineData(this.feedback.id).then((hasOffline) => {
+                this.hasOffline = hasOffline;
+            });
         });
     }