diff --git a/src/addon/notes/components/list/addon-notes-list.html b/src/addon/notes/components/list/addon-notes-list.html
index c2a0a52d2..0285ddd90 100644
--- a/src/addon/notes/components/list/addon-notes-list.html
+++ b/src/addon/notes/components/list/addon-notes-list.html
@@ -11,11 +11,13 @@
     </ion-refresher>
     <core-loading [hideUntil]="notesLoaded" class="core-loading-center">
 
-        <ion-select [(ngModel)]="type" (ngModelChange)="typeChanged()" interface="popover">
-            <ion-option value="site">{{ 'addon.notes.sitenotes' | translate }}</ion-option>
-            <ion-option value="course">{{ 'addon.notes.coursenotes' | translate }}</ion-option>
-            <ion-option value="personal">{{ 'addon.notes.personalnotes' | translate }}</ion-option>
-        </ion-select>
+        <div padding>
+            <ion-select [(ngModel)]="type" (ngModelChange)="typeChanged()" interface="popover" class="core-button-select">
+                <ion-option value="site">{{ 'addon.notes.sitenotes' | translate }}</ion-option>
+                <ion-option value="course">{{ 'addon.notes.coursenotes' | translate }}</ion-option>
+                <ion-option value="personal">{{ 'addon.notes.personalnotes' | translate }}</ion-option>
+            </ion-select>
+        </div>
 
         <div class="core-warning-card" icon-start *ngIf="hasOffline">
             <ion-icon name="warning"></ion-icon>
diff --git a/src/app/app.scss b/src/app/app.scss
index e61e6fdb0..6f95bbd02 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -377,6 +377,17 @@ ion-app.app-root {
     }
 
     @include core-headings();
+
+    img.icon {
+      font-size: 16px;
+      width: 16px;
+      height: 16px;
+      margin: 0;
+      padding: 0;
+      -webkit-box-sizing: content-box;
+      box-sizing: content-box;
+      margin-right: .5rem;
+    }
   }
 
   .item core-format-text {
diff --git a/src/components/empty-box/empty-box.scss b/src/components/empty-box/empty-box.scss
index 14b4e1b93..d348eb6d1 100644
--- a/src/components/empty-box/empty-box.scss
+++ b/src/components/empty-box/empty-box.scss
@@ -40,9 +40,11 @@ ion-app.app-root core-empty-box {
     }
   }
 
-  @include media-breakpoint-down(sm) {
+  @media (max-width: 350px) {
     .core-empty-box {
       position: relative;
+      height: auto;
+      margin-top: 50px;
 
       .icon {
         font-size: 100px;
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index 2c46e20f4..5e8eaee07 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -382,7 +382,7 @@ export class CoreFormatTextDirective implements OnChanges {
                 images.forEach((img: HTMLElement) => {
                     this.addMediaAdaptClass(img);
                     this.addExternalContent(img);
-                    if (this.utils.isTrueOrOne(this.adaptImg)) {
+                    if (this.utils.isTrueOrOne(this.adaptImg) && !img.classList.contains('icon')) {
                         this.adaptImage(elWidth, img);
                     }
                 });