diff --git a/patches/@ionic+core+5.9.2.patch b/patches/@ionic+core+5.9.4.patch
similarity index 100%
rename from patches/@ionic+core+5.9.2.patch
rename to patches/@ionic+core+5.9.4.patch
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index ffa4f87a9..9657c471a 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -16,7 +16,7 @@
                     [iconAction]="syncIcon" [closeOnClick]="false">
                 </core-context-menu-item>
                 <core-context-menu-item [hidden]="!event || !event.canedit || event.deleted || (!canEdit && event.id > 0)" [priority]="300"
-                    [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-pen-to-square">
+                    [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-pen">
                 </core-context-menu-item>
                 <core-context-menu-item [hidden]="!event || !event.candelete || event.deleted" [priority]="200"
                     [content]="'core.delete' | translate" (action)="deleteEvent()" iconAction="fas-trash"></core-context-menu-item>
diff --git a/src/addons/mod/data/components/action/addon-mod-data-action.html b/src/addons/mod/data/components/action/addon-mod-data-action.html
index 7f1df86da..e8688a7ac 100644
--- a/src/addons/mod/data/components/action/addon-mod-data-action.html
+++ b/src/addons/mod/data/components/action/addon-mod-data-action.html
@@ -3,7 +3,7 @@
 </ion-button>
 
 <ion-button size="small" *ngIf="action == 'edit'" fill="clear" (click)="editEntry()" [attr.aria-label]="'core.edit' | translate">
-    <ion-icon name="fas-gear" slot="icon-only" aria-hidden="true"></ion-icon>
+    <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
 
 <ion-button size="small" *ngIf="action == 'delete' && !entry.deleted" fill="clear" color="danger" (click)="deleteEntry()"
diff --git a/src/addons/mod/data/services/data-helper.ts b/src/addons/mod/data/services/data-helper.ts
index 52b822c95..40751a9c5 100644
--- a/src/addons/mod/data/services/data-helper.ts
+++ b/src/addons/mod/data/services/data-helper.ts
@@ -714,7 +714,9 @@ export class AddonModDataHelperProvider {
                     courseId = await this.getActivityCourseIdIfNotSet(dataId, courseId, siteId);
                 }
 
-                AddonModData.deleteEntry(dataId, entryId, courseId!, siteId);
+                if (courseId) {
+                    await AddonModData.deleteEntry(dataId, entryId, courseId, siteId);
+                }
             } catch (message) {
                 CoreDomUtils.showErrorModalDefault(message, 'addon.mod_data.errordeleting', true);
 
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index 4ae50a264..cf3a053cb 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -14,7 +14,7 @@
 
     <core-context-menu>
         <core-context-menu-item *ngIf="canEdit && (isOnline || pageIsOffline)" [priority]="590" [content]="'core.edit' | translate"
-            iconAction="fas-pen-to-square" (action)="goToEditPage()">
+            iconAction="fas-pen" (action)="goToEditPage()">
         </core-context-menu-item>
         <core-context-menu-item *ngIf="canEdit" [priority]="580" [content]="'addon.mod_wiki.createpage' | translate" iconAction="fas-plus"
             (action)="goToNewPage()">
diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
index 7bd625917..8d486e1bf 100644
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -220,7 +220,7 @@
             </ion-button>
             <ion-button expand="block" *ngIf="access.modifyingsubmissionallowed && submission" (click)="gotoSubmit()"
                 class="ion-text-wrap ion-margin">
-                <ion-icon slot="start" name="fas-pen-to-square" aria-hidden="true"></ion-icon>
+                <ion-icon slot="start" name="fas-pen" aria-hidden="true"></ion-icon>
                 {{ 'addon.mod_workshop.editsubmission' | translate }}
             </ion-button>
         </div>
diff --git a/src/addons/mod/workshop/pages/submission/submission.html b/src/addons/mod/workshop/pages/submission/submission.html
index e7793e5a2..b435c4d83 100644
--- a/src/addons/mod/workshop/pages/submission/submission.html
+++ b/src/addons/mod/workshop/pages/submission/submission.html
@@ -33,7 +33,7 @@
             <ion-item class="ion-text-wrap" *ngIf="canEdit || canDelete">
                 <ion-label>
                     <ion-button expand="block" *ngIf="canEdit" (click)="editSubmission()">
-                        <ion-icon name="fas-pen-to-square" slot="start" aria-hidden="true"></ion-icon>
+                        <ion-icon name="fas-pen" slot="start" aria-hidden="true"></ion-icon>
                         {{ 'addon.mod_workshop.editsubmission' | translate }}
                     </ion-button>
                     <ion-button expand="block" *ngIf="!submission.deleted && canDelete" color="danger" (click)="deleteSubmission()">
diff --git a/src/assets/fonts/font-awesome/aliases.json b/src/assets/fonts/font-awesome/aliases.json
index b18c8f7f6..62d54e2d0 100644
--- a/src/assets/fonts/font-awesome/aliases.json
+++ b/src/assets/fonts/font-awesome/aliases.json
@@ -139,7 +139,7 @@
   "drivers-license": "id-card",
   "earth-america": "earth-americas",
   "earth": "earth-americas",
-  "edit": "pen-to-square",
+  "edit": "pen",
   "ellipsis-h": "ellipsis",
   "ellipsis-v": "ellipsis-vertical",
   "envelope-square": "square-envelope",