diff --git a/src/components/show-password/show-password.scss b/src/components/show-password/show-password.scss
index fd66ae745..f02632d8e 100644
--- a/src/components/show-password/show-password.scss
+++ b/src/components/show-password/show-password.scss
@@ -11,8 +11,7 @@ core-show-password {
         background: transparent;
         padding: 0 ($content-padding / 2);
         position: absolute;
-        bottom: $content-padding / 2;
-        right: 0;
+        @include position(null, 0, $content-padding / 2, null);
         margin-top: 0;
         margin-bottom: 0;
     }
@@ -43,7 +42,6 @@ core-show-password {
         bottom: 7px;
     }
     core-show-password .button[icon-only] {
-        bottom: 12px;
-        right: 5px;
+        @include position(null, 5px, 12px, null);
     }
 }
diff --git a/src/core/course/components/module/module.scss b/src/core/course/components/module/module.scss
index b77077df8..f7203aa18 100644
--- a/src/core/course/components/module/module.scss
+++ b/src/core/course/components/module/module.scss
@@ -45,7 +45,7 @@ core-course-module {
         }
 
         .core-module-buttons-more .spinner {
-            right: 13px;
+            @include position(null, 13px, null, null);
             position: absolute;
         }
     }
diff --git a/src/core/courses/pages/my-overview/my-overview.html b/src/core/courses/pages/my-overview/my-overview.html
index 0a9acea64..99400fe6a 100644
--- a/src/core/courses/pages/my-overview/my-overview.html
+++ b/src/core/courses/pages/my-overview/my-overview.html
@@ -37,7 +37,7 @@
                     <core-loading [hideUntil]="courses.loaded" class="core-loading-center">
                         <!-- "Time" selector. -->
                         <div padding class="clearfix" [hidden]="showFilter" ion-row justify-content-between>
-                            <ion-select float-start [title]="'core.show' | translate" [(ngModel)]="courses.selected"  ion-col (ngModelChange)="selectedChanged()" interface="popover">
+                            <ion-select float-start [title]="'core.show' | translate" [(ngModel)]="courses.selected" ion-col (ngModelChange)="selectedChanged()" interface="popover">
                                 <ion-option value="inprogress">{{ 'core.courses.inprogress' | translate }}</ion-option>
                                 <ion-option value="future">{{ 'core.courses.future' | translate }}</ion-option>
                                 <ion-option value="past">{{ 'core.courses.past' | translate }}</ion-option>
diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html
index e7160fbc8..fbde4964c 100644
--- a/src/core/login/pages/credentials/credentials.html
+++ b/src/core/login/pages/credentials/credentials.html
@@ -21,7 +21,7 @@
                 <ion-item *ngIf="siteChecked && !isBrowserSSO">
                     <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username" autocapitalize="none" autocorrect="off"></ion-input>
                 </ion-item>
-                <ion-item *ngIf="siteChecked && !isBrowserSSO">
+                <ion-item *ngIf="siteChecked && !isBrowserSSO" margin-bottom>
                     <core-show-password item-content [name]="'password'">
                         <ion-input class="core-ioninput-password" name="password" type="password" placeholder="{{ 'core.login.password' | translate }}" formControlName="password" core-show-password [clearOnEdit]="false"></ion-input>
                     </core-show-password>
diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html
index ca9d980b1..95b6a5593 100644
--- a/src/core/login/pages/reconnect/reconnect.html
+++ b/src/core/login/pages/reconnect/reconnect.html
@@ -31,7 +31,7 @@
                 <p>{{username}}</p>
             </ion-item>
             <form [formGroup]="credForm" (ngSubmit)="login()">
-                <ion-item>
+                <ion-item margin-bottom>
                     <core-show-password item-content [name]="'password'">
                         <ion-input class="core-ioninput-password" name="password" type="password" placeholder="{{ 'core.login.password' | translate }}" formControlName="password" [clearOnEdit]="false"></ion-input>
                     </core-show-password>