diff --git a/src/addons/mod/glossary/services/handlers/index-link.ts b/src/addons/mod/glossary/services/handlers/index-link.ts
index 3658be016..6dd91ec52 100644
--- a/src/addons/mod/glossary/services/handlers/index-link.ts
+++ b/src/addons/mod/glossary/services/handlers/index-link.ts
@@ -28,6 +28,13 @@ export class AddonModGlossaryIndexLinkHandlerService extends CoreContentLinksMod
         super('AddonModGlossary', 'glossary', 'g');
     }
 
+    /**
+     * @inheritdoc
+     */
+    async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
+        return !params.hook && !params.eid;
+    }
+
 }
 
 export const AddonModGlossaryIndexLinkHandler = makeSingleton(AddonModGlossaryIndexLinkHandlerService);
diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.scss b/src/addons/mod/lesson/pages/user-retake/user-retake.scss
index 88e4e2989..8c364a127 100644
--- a/src/addons/mod/lesson/pages/user-retake/user-retake.scss
+++ b/src/addons/mod/lesson/pages/user-retake/user-retake.scss
@@ -17,7 +17,7 @@
         opacity: 0.5;
     }
 
-    .addon-mod_lesson-answer-success {
-        @include margin-horizontal(4px, null);
+    .addon-mod_lesson-answer-stats {
+        @include margin-horizontal(null, 4px);
     }
 }
diff --git a/src/core/components/message/message.html b/src/core/components/message/message.html
index c4815fdb9..9380c0137 100644
--- a/src/core/components/message/message.html
+++ b/src/core/components/message/message.html
@@ -35,8 +35,8 @@
             color="danger" (click)="delete($event)" [attr.aria-label]="'addon.messages.deletemessage' | translate" class="delete-button">
             <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
-        <ion-button *ngIf="showDelete && message.deleted" fill="clear" color="danger" (click)="undoDelete($event)"
-            [attr.aria-label]="'core.restore' | translate" class="delete-button">
+        <ion-button *ngIf="showDelete && message.deleted" fill="clear" [@coreSlideInOut]="'fromRight'" color="danger"
+            (click)="undoDelete($event)" [attr.aria-label]="'core.restore' | translate" class="delete-button">
             <ion-icon name="fas-rotate-left" slot="icon-only" aria-hidden="true"></ion-icon>
         </ion-button>
     </div>
diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html
index b941f87e2..cee1b18af 100644
--- a/src/core/features/comments/pages/viewer/viewer.html
+++ b/src/core/features/comments/pages/viewer/viewer.html
@@ -12,7 +12,8 @@
         <ion-buttons slot="end">
             <ion-button *ngIf="canDeleteComments" slot="end" fill="clear" (click)="toggleDelete()"
                 [attr.aria-label]="'core.toggledelete' | translate">
-                <ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
+                <ion-icon *ngIf="!showDelete" name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
+                <ion-icon *ngIf="showDelete" name="fas-check" slot="icon-only" aria-hidden="true"></ion-icon>
             </ion-button>
             <core-context-menu>
                 <core-context-menu-item [hidden]="!(commentsLoaded && !hasOffline)" [priority]="100" [content]="'core.refresh' | translate"
diff --git a/src/core/features/comments/pages/viewer/viewer.ts b/src/core/features/comments/pages/viewer/viewer.ts
index 43a98924e..ba750924b 100644
--- a/src/core/features/comments/pages/viewer/viewer.ts
+++ b/src/core/features/comments/pages/viewer/viewer.ts
@@ -222,6 +222,7 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy {
         comment.showDate = this.showDate(comment, prevComment);
         comment.showUserData = this.showUserData(comment, prevComment);
         comment.showTail = this.showTail(comment, prevComment);
+        comment.delete = comment.delete ?? false; // If this property is undefined, core-message assumes comment can be deleted.
     }
 
     /**