diff --git a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
index da99394bc..17a7b0abb 100644
--- a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
+++ b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html
@@ -63,7 +63,7 @@
                 [attr.aria-label]="'core.question.incorrect' | translate"></ion-icon>
         </ion-item>
         <ion-button *ngIf="!multiQuestion.disabled" class="ion-text-wrap ion-margin-top" expand="block" fill="outline"
-            [disabled]="!multiQuestion.singleChoiceModel" (click)="clear()" type="reset">
+            [disabled]="!multiQuestion.singleChoiceModel" (click)="clear()" type="button">
             {{ 'addon.mod_quiz.clearchoice' | translate }}
         </ion-button>
 
diff --git a/src/core/components/show-password/core-show-password.html b/src/core/components/show-password/core-show-password.html
index f6f283d40..bd1589bb6 100644
--- a/src/core/components/show-password/core-show-password.html
+++ b/src/core/components/show-password/core-show-password.html
@@ -1,6 +1,5 @@
 <ng-content></ng-content>
 <ion-button fill="clear" [attr.aria-label]="label | translate" core-suppress-events (onClick)="toggle($event)"
     (mousedown)="doNotBlur($event)" (keydown)="doNotBlur($event)" (keyup)="toggle($event)">
-    <ion-icon [name]=" iconName" slot="icon-only" aria-hidden="true">
-    </ion-icon>
+    <ion-icon [name]="shown ? 'fas-eye-slash' : 'fas-eye'" slot="icon-only" aria-hidden="true"></ion-icon>
 </ion-button>
diff --git a/src/core/components/show-password/show-password.ts b/src/core/components/show-password/show-password.ts
index 61d6bbc08..22faec88f 100644
--- a/src/core/components/show-password/show-password.ts
+++ b/src/core/components/show-password/show-password.ts
@@ -46,7 +46,6 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
 
     shown = false; // Whether the password is shown.
     label = ''; // Label for the button to show/hide.
-    iconName = ''; // Name of the icon of the button to show/hide.
 
     protected input?: HTMLInputElement; // Input affected.
     protected element: HTMLElement; // Current element.
@@ -99,7 +98,6 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
      */
     protected setData(input: HTMLInputElement): void {
         this.label = this.shown ? 'core.hide' : 'core.show';
-        this.iconName = this.shown ? 'fas-eye-slash' : 'fas-eye';
         input.type = this.shown ? 'text' : 'password';
     }