diff --git a/src/addon/calendar/pages/event/event.html b/src/addon/calendar/pages/event/event.html
index 7e1087d80..dfa30e593 100644
--- a/src/addon/calendar/pages/event/event.html
+++ b/src/addon/calendar/pages/event/event.html
@@ -11,7 +11,7 @@
         <ion-card>
             <ion-card-content>
                 <ion-card-title text-wrap>
-                    <ion-icon *ngIf="!event.moduleIcon" name="{{event.icon}}" item-start></ion-icon>
+                    <core-icon *ngIf="event.icon && !event.moduleIcon" [name]="event.icon" item-start></core-icon>
                     <core-format-text [text]="event.name"></core-format-text>
                 </ion-card-title>
                 <ion-item text-wrap>
diff --git a/src/addon/calendar/pages/list/list.html b/src/addon/calendar/pages/list/list.html
index de5065205..04e0d3e8a 100644
--- a/src/addon/calendar/pages/list/list.html
+++ b/src/addon/calendar/pages/list/list.html
@@ -23,7 +23,7 @@
             <ion-list *ngIf="filteredEvents && filteredEvents.length" no-margin>
                 <a ion-item text-wrap *ngFor="let event of filteredEvents" [title]="event.name" (click)="gotoEvent(event.id)" [class.core-split-item-selected]="event.id == eventId">
                     <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start class="core-module-icon">
-                    <ion-icon *ngIf="!event.moduleIcon" name="{{event.icon}}" item-start></ion-icon>
+                    <core-icon *ngIf="event.icon && !event.moduleIcon" [name]="event.icon" item-start></core-icon>
                     <h2><core-format-text [text]="event.name"></core-format-text></h2>
                     <p>{{ event.timestart | coreToLocaleString }}</p>
                 </a>
diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts
index c1a0a8888..a1a85759d 100644
--- a/src/addon/calendar/providers/helper.ts
+++ b/src/addon/calendar/providers/helper.ts
@@ -24,11 +24,11 @@ export class AddonCalendarHelperProvider {
     protected logger;
 
     protected EVENTICONS = {
-        course: 'ionic',
+        course: 'fa-university',
         group: 'people',
         site: 'globe',
         user: 'person',
-        category: 'albums'
+        category: 'fa-cubes'
     };
 
     constructor(logger: CoreLoggerProvider, private courseProvider: CoreCourseProvider) {
diff --git a/src/core/courses/providers/mainmenu-handler.ts b/src/core/courses/providers/mainmenu-handler.ts
index 17073d458..aad553987 100644
--- a/src/core/courses/providers/mainmenu-handler.ts
+++ b/src/core/courses/providers/mainmenu-handler.ts
@@ -61,7 +61,7 @@ export class CoreCoursesMainMenuHandler implements CoreMainMenuHandler {
             };
         } else {
             return {
-                icon: 'ionic',
+                icon: 'fa-graduation-cap',
                 title: 'core.courses.mycourses',
                 page: 'CoreCoursesMyCoursesPage',
                 class: 'core-mycourses-handler'
diff --git a/src/core/mainmenu/pages/menu/menu.scss b/src/core/mainmenu/pages/menu/menu.scss
index 87c7bcce9..9ccb4fadc 100644
--- a/src/core/mainmenu/pages/menu/menu.scss
+++ b/src/core/mainmenu/pages/menu/menu.scss
@@ -1,3 +1,9 @@
 page-core-mainmenu {
-
+    .ion-md-fa-graduation-cap,
+    .ion-ios-fa-graduation-cap,
+    .ion-wp-fa-graduation-cap,
+    .ion-fa-graduation-cap {
+        @extend .fa-graduation-cap;
+        @extend .fa;
+    }
 }
diff --git a/src/core/sitehome/providers/mainmenu-handler.ts b/src/core/sitehome/providers/mainmenu-handler.ts
index 56cd67156..0ebb62738 100644
--- a/src/core/sitehome/providers/mainmenu-handler.ts
+++ b/src/core/sitehome/providers/mainmenu-handler.ts
@@ -23,7 +23,7 @@ import { CoreCoursesMyOverviewProvider } from '@core/courses/providers/my-overvi
 @Injectable()
 export class CoreSiteHomeMainMenuHandler implements CoreMainMenuHandler {
     name = 'CoreSiteHome';
-    priority = 1000;
+    priority = 1200;
     isOverviewEnabled: boolean;
 
     constructor(private siteHomeProvider: CoreSiteHomeProvider, private myOverviewProvider: CoreCoursesMyOverviewProvider) { }