diff --git a/scripts/langindex.json b/scripts/langindex.json
index b252d570f..2e339fcb0 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -135,10 +135,10 @@
   "addon.coursecompletion.manualselfcompletion": "completion",
   "addon.coursecompletion.notyetstarted": "completion",
   "addon.coursecompletion.pending": "completion",
-  "addon.coursecompletion.required": "local_moodlemobileapp",
+  "addon.coursecompletion.required": "moodle",
   "addon.coursecompletion.requiredcriteria": "completion",
   "addon.coursecompletion.requirement": "block_completionstatus",
-  "addon.coursecompletion.status": "local_moodlemobileapp",
+  "addon.coursecompletion.status": "moodle",
   "addon.coursecompletion.viewcoursereport": "completion",
   "addon.files.couldnotloadfiles": "local_moodlemobileapp",
   "addon.files.emptyfilelist": "local_moodlemobileapp",
@@ -166,7 +166,7 @@
   "addon.messages.contacts": "message",
   "addon.messages.decline": "message",
   "addon.messages.deleteallconfirm": "message",
-  "addon.messages.deleteconversationq": "message",
+  "addon.messages.deleteconversation": "message",
   "addon.messages.deletemessage": "local_moodlemobileapp",
   "addon.messages.deletemessageconfirmation": "local_moodlemobileapp",
   "addon.messages.errordeletemessage": "local_moodlemobileapp",
@@ -174,8 +174,9 @@
   "addon.messages.errorwhileretrievingdiscussions": "local_moodlemobileapp",
   "addon.messages.errorwhileretrievingmessages": "local_moodlemobileapp",
   "addon.messages.errorwhileretrievingusers": "local_moodlemobileapp",
+  "addon.messages.groupconversations": "message",
   "addon.messages.groupinfo": "message",
-  "addon.messages.groupmessages": "message",
+  "addon.messages.individualconversations": "message",
   "addon.messages.info": "message",
   "addon.messages.isnotinyourcontacts": "message",
   "addon.messages.message": "message",
@@ -185,25 +186,26 @@
   "addon.messages.newmessage": "message",
   "addon.messages.newmessages": "local_moodlemobileapp",
   "addon.messages.nocontactrequests": "message",
-  "addon.messages.noncontacts": "message",
   "addon.messages.nocontactsgetstarted": "message",
   "addon.messages.nofavourites": "message",
-  "addon.messages.nogroupmessages": "message",
-  "addon.messages.nomessages": "message",
+  "addon.messages.nogroupconversations": "message",
+  "addon.messages.noindividualconversations": "message",
+  "addon.messages.nomessagesfound": "message",
+  "addon.messages.noncontacts": "message",
   "addon.messages.nousersfound": "local_moodlemobileapp",
   "addon.messages.numparticipants": "message",
   "addon.messages.removecontact": "message",
   "addon.messages.removecontactconfirm": "message",
-  "addon.messages.removefromyourcontacts": "message",
   "addon.messages.removefromfavourites": "message",
+  "addon.messages.removefromyourcontacts": "message",
   "addon.messages.requests": "moodle",
   "addon.messages.requirecontacttomessage": "message",
   "addon.messages.searchcombined": "message",
   "addon.messages.searchnocontactsfound": "message",
   "addon.messages.searchnomessagesfound": "message",
   "addon.messages.searchnononcontactsfound": "message",
-  "addon.messages.showdeletemessages": "local_moodlemobileapp",
   "addon.messages.sendcontactrequest": "message",
+  "addon.messages.showdeletemessages": "local_moodlemobileapp",
   "addon.messages.type_blocked": "local_moodlemobileapp",
   "addon.messages.type_offline": "local_moodlemobileapp",
   "addon.messages.type_online": "local_moodlemobileapp",
@@ -218,6 +220,7 @@
   "addon.messages.wouldliketocontactyou": "message",
   "addon.messages.you": "message",
   "addon.messages.youhaveblockeduser": "message",
+  "addon.messages.yourcontactrequestpending": "message",
   "addon.mod_assign.acceptsubmissionstatement": "local_moodlemobileapp",
   "addon.mod_assign.addattempt": "assign",
   "addon.mod_assign.addnewattempt": "assign",
@@ -1416,6 +1419,7 @@
   "core.login.invalidvaluemin": "local_moodlemobileapp",
   "core.login.legacymoodleversion": "local_moodlemobileapp",
   "core.login.legacymoodleversiondesktop": "local_moodlemobileapp",
+  "core.login.legacymoodleversiondesktopdownloadold": "local_moodlemobileapp",
   "core.login.localmobileunexpectedresponse": "local_moodlemobileapp",
   "core.login.loggedoutssodescription": "local_moodlemobileapp",
   "core.login.login": "moodle",
diff --git a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
index da99acca7..ce5b034bc 100644
--- a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -10,14 +10,14 @@
     </div>
     <core-context-menu item-end>
         <core-context-menu-item *ngIf="loaded && showFilterSwitchButton()" [priority]="1000" [content]="'core.courses.filtermycourses' | translate" (action)="switchFilter()" iconAction="funnel"></core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && showSortFilter && sort == 'lastaccess'" [priority]="900" content="{{('core.sortby' | translate) + ': ' + ('addon.block_myoverview.title' | translate)}}" (action)="switchSort('fullname')" iconAction="fa-sort"></core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && showSortFilter && sort == 'fullname'" [priority]="800" content="{{('core.sortby' | translate) + ': ' + ('addon.block_myoverview.lastaccessed' | translate)}}" (action)="switchSort('lastaccess')" iconAction="fa-sort"></core-context-menu-item>
+        <core-context-menu-item *ngIf="loaded && showSortFilter" [priority]="900" content="{{('core.sortby' | translate) + ' ' + ('addon.block_myoverview.title' | translate)}}" (action)="switchSort('fullname')" [iconAction]="sort == 'fullname' ? 'radio-button-on' : 'radio-button-off'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="loaded && showSortFilter" [priority]="800" content="{{('core.sortby' | translate) + ' ' + ('addon.block_myoverview.lastaccessed' | translate)}}" (action)="switchSort('lastaccess')" [iconAction]="sort == 'lastaccess' ? 'radio-button-on' : 'radio-button-off'"></core-context-menu-item>
     </core-context-menu>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" class="core-loading-center">
     <div padding [hidden]="showFilter || !showSelectorFilter" class="safe-padding-horizontal">
         <!-- "Time" selector. -->
-        <ion-select text-start [title]="'core.show' | translate" [(ngModel)]="selectedFilter" ion-col (ngModelChange)="selectedChanged()" interface="popover" class="core-button-select">
+        <ion-select text-start [title]="'core.show' | translate" [(ngModel)]="selectedFilter" (ngModelChange)="selectedChanged()" interface="popover" class="core-button-select">
             <ion-option value="all">{{ 'addon.block_myoverview.all' | translate }}</ion-option>∫
             <ion-option value="inprogress">{{ 'addon.block_myoverview.inprogress' | translate }}</ion-option>
             <ion-option value="future">{{ 'addon.block_myoverview.future' | translate }}</ion-option>
diff --git a/src/addon/block/timeline/components/timeline/addon-block-timeline.html b/src/addon/block/timeline/components/timeline/addon-block-timeline.html
index fe523db49..cee03f5eb 100644
--- a/src/addon/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addon/block/timeline/components/timeline/addon-block-timeline.html
@@ -1,8 +1,8 @@
 <ion-item-divider color="light">
     <h2>{{ 'addon.block_timeline.pluginname' | translate }}</h2>
     <core-context-menu item-end>
-        <core-context-menu-item *ngIf="loaded && sort == 'sortbycourses'" [priority]="900" [content]="'addon.block_timeline.sortbydates' | translate" (action)="switchSort('sortbydates')" iconAction="fa-sort"></core-context-menu-item>
-        <core-context-menu-item *ngIf="loaded && sort == 'sortbydates'" [priority]="800" [content]="'addon.block_timeline.sortbycourses' | translate" (action)="switchSort('sortbycourses')" iconAction="fa-sort"></core-context-menu-item>
+        <core-context-menu-item *ngIf="loaded" [priority]="900" [content]="'addon.block_timeline.sortbydates' | translate" (action)="switchSort('sortbydates')" [iconAction]="sort == 'sortbydates' ? 'radio-button-on' : 'radio-button-off'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="loaded" [priority]="800" [content]="'addon.block_timeline.sortbycourses' | translate" (action)="switchSort('sortbycourses')" [iconAction]="sort == 'sortbycourses' ? 'radio-button-on' : 'radio-button-off'"></core-context-menu-item>
     </core-context-menu>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" class="core-loading-center">
diff --git a/src/addon/messages/components/discussions/addon-messages-discussions.html b/src/addon/messages/components/discussions/addon-messages-discussions.html
index 02c90d858..dfe099c1a 100644
--- a/src/addon/messages/components/discussions/addon-messages-discussions.html
+++ b/src/addon/messages/components/discussions/addon-messages-discussions.html
@@ -33,7 +33,7 @@
             </a>
         </ion-list>
 
-        <core-empty-box *ngIf="(!discussions || discussions.length <= 0) && !search.showResults" icon="chatbubbles" [message]="'addon.messages.nomessages' | translate"></core-empty-box>
+        <core-empty-box *ngIf="(!discussions || discussions.length <= 0) && !search.showResults" icon="chatbubbles" [message]="'addon.messages.nomessagesfound' | translate"></core-empty-box>
 
         <core-empty-box *ngIf="(!search.results || search.results.length <= 0) && search.showResults" icon="search" [message]="'core.noresults' | translate"></core-empty-box>
     </core-loading>
diff --git a/src/addon/messages/lang/en.json b/src/addon/messages/lang/en.json
index 571118cf7..d7a68dddb 100644
--- a/src/addon/messages/lang/en.json
+++ b/src/addon/messages/lang/en.json
@@ -27,7 +27,8 @@
     "errorwhileretrievingmessages": "Error while retrieving messages from the server.",
     "errorwhileretrievingusers": "Error while retrieving users from the server.",
     "groupinfo": "Group info",
-    "groupmessages": "Group messages",
+    "groupconversations": "Group",
+    "individualconversations": "Private",
     "info": "Info",
     "isnotinyourcontacts": "{{$a}} is not in your contacts",
     "messagenotsent": "The message was not sent. Please try again later.",
@@ -39,9 +40,10 @@
     "nocontactrequests": "No contact requests",
     "noncontacts": "Non-contacts",
     "nocontactsgetstarted": "Try searching for someone to add them as a contact",
-    "nofavourites": "No favourites",
-    "nogroupmessages": "No group messages",
-    "nomessages": "No messages",
+    "nofavourites": "No starred conversations",
+    "nogroupconversations": "No group conversations",
+    "noindividualconversations": "No private conversations",
+    "nomessagesfound": "No messages were found",
     "nousersfound": "No users found",
     "numparticipants": "{{$a}} participants",
     "removecontact": "Remove contact",
diff --git a/src/addon/messages/pages/discussion/discussion.html b/src/addon/messages/pages/discussion/discussion.html
index 0c904ea55..cfa4dc7a0 100644
--- a/src/addon/messages/pages/discussion/discussion.html
+++ b/src/addon/messages/pages/discussion/discussion.html
@@ -58,7 +58,7 @@
                 </ion-item>
             </ng-container>
         </ion-list>
-        <core-empty-box *ngIf="!messages || messages.length <= 0" icon="chatbubbles" [message]="'addon.messages.nomessages' | translate"></core-empty-box>
+        <core-empty-box *ngIf="!messages || messages.length <= 0" icon="chatbubbles" [message]="'addon.messages.nomessagesfound' | translate"></core-empty-box>
     </core-loading>
 </ion-content>
 <ion-footer color="light" class="footer-adjustable" *ngIf="loaded && (!conversationId || conversation)">
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html
index a9d9c71a1..a6a5df814 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.html
+++ b/src/addon/messages/pages/group-conversations/group-conversations.html
@@ -46,7 +46,7 @@
                 <ion-item-divider color="light" text-wrap *ngIf="group.conversations" (click)="toggle(group)" class="core-expandable">
                     <core-icon *ngIf="!group.expanded" name="fa-caret-right" item-start></core-icon>
                     <core-icon *ngIf="group.expanded" name="fa-caret-down" item-start></core-icon>
-                    {{ 'addon.messages.groupmessages' | translate }} ({{ group.count }})
+                    {{ 'addon.messages.groupconversations' | translate }} ({{ group.count }})
                     <ion-badge item-end *ngIf="group.unread">{{ group.unread }}</ion-badge>
                 </ion-item-divider>
                 <div *ngIf="group.conversations && group.expanded">
@@ -54,14 +54,14 @@
                     <!-- The infinite loading cannot be inside the ng-template, it fails because it doesn't find ion-content. -->
                     <core-infinite-loading [enabled]="group.canLoadMore" (action)="loadMoreConversations(group, $event)" [error]="group.loadMoreError"></core-infinite-loading>
                     <ion-item text-wrap *ngIf="group.conversations.length == 0">
-                        <p>{{ 'addon.messages.nogroupmessages' | translate }}</p>
+                        <p>{{ 'addon.messages.nogroupconversations' | translate }}</p>
                     </ion-item>
                 </div>
 
                 <ion-item-divider color="light" text-wrap *ngIf="individual.conversations" (click)="toggle(individual)" class="core-expandable">
                     <core-icon *ngIf="!individual.expanded" name="fa-caret-right" item-start></core-icon>
                     <core-icon *ngIf="individual.expanded" name="fa-caret-down" item-start></core-icon>
-                    {{ 'addon.messages.messages' | translate }} ({{ individual.count }})
+                    {{ 'addon.messages.individualconversations' | translate }} ({{ individual.count }})
                     <ion-badge item-end *ngIf="individual.unread">{{ individual.unread }}</ion-badge>
                 </ion-item-divider>
                 <div *ngIf="individual.conversations && individual.expanded">
@@ -69,7 +69,7 @@
                     <!-- The infinite loading cannot be inside the ng-template, it fails because it doesn't find ion-content. -->
                     <core-infinite-loading [enabled]="individual.canLoadMore" (action)="loadMoreConversations(individual, $event)" [error]="individual.loadMoreError"></core-infinite-loading>
                     <ion-item text-wrap *ngIf="individual.conversations.length == 0">
-                        <p>{{ 'addon.messages.nomessages' | translate }}</p>
+                        <p>{{ 'addon.messages.noindividualconversations' | translate }}</p>
                     </ion-item>
                 </div>
             </ion-list>
diff --git a/src/app/app.scss b/src/app/app.scss
index 19d818cdf..d36bc1954 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -384,7 +384,6 @@ ion-app.app-root {
     &.select-wp,
     &.button-wp {
       background: $card-wp-background-color;
-      box-shadow: $card-wp-box-shadow;
     }
 
     .select-text {
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 880a6d7fa..6c3410e73 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -174,8 +174,9 @@
     "addon.messages.errorwhileretrievingdiscussions": "Error while retrieving discussions from the server.",
     "addon.messages.errorwhileretrievingmessages": "Error while retrieving messages from the server.",
     "addon.messages.errorwhileretrievingusers": "Error while retrieving users from the server.",
+    "addon.messages.groupconversations": "Group",
     "addon.messages.groupinfo": "Group info",
-    "addon.messages.groupmessages": "Group messages",
+    "addon.messages.individualconversations": "Private",
     "addon.messages.info": "Info",
     "addon.messages.isnotinyourcontacts": "{{$a}} is not in your contacts",
     "addon.messages.message": "Message",
@@ -186,9 +187,10 @@
     "addon.messages.newmessages": "New messages",
     "addon.messages.nocontactrequests": "No contact requests",
     "addon.messages.nocontactsgetstarted": "Try searching for someone to add them as a contact",
-    "addon.messages.nofavourites": "No favourites",
-    "addon.messages.nogroupmessages": "No group messages",
-    "addon.messages.nomessages": "No messages",
+    "addon.messages.nofavourites": "No starred conversations",
+    "addon.messages.nogroupconversations": "No group conversations",
+    "addon.messages.noindividualconversations": "No private conversations",
+    "addon.messages.nomessagesfound": "No messages were found",
     "addon.messages.noncontacts": "Non-contacts",
     "addon.messages.nousersfound": "No users found",
     "addon.messages.numparticipants": "{{$a}} participants",
diff --git a/src/components/search-box/search-box.scss b/src/components/search-box/search-box.scss
index 28e718b90..1e80c19f2 100644
--- a/src/components/search-box/search-box.scss
+++ b/src/components/search-box/search-box.scss
@@ -3,12 +3,19 @@ ion-app.app-root core-search-box {
         margin: 0;
         padding: ($content-padding / 2) $content-padding;
     }
+    .item.item-input.item-block .item-inner,
     .item.item-input.item-block .item-inner ion-input {
-       border-bottom: 0;
+       border-bottom: 0 !important;
+       box-shadow: none;
     }
 
     .item-inner {
         padding-right: 0 !important;
         padding-left: 0 !important;
     }
+
+    .item-wp .text-input {
+        border: 0;
+        margin: 0;
+    }
 }
diff --git a/src/core/login/pages/reconnect/reconnect.scss b/src/core/login/pages/reconnect/reconnect.scss
index ae0e7ea16..bb77e8287 100644
--- a/src/core/login/pages/reconnect/reconnect.scss
+++ b/src/core/login/pages/reconnect/reconnect.scss
@@ -20,12 +20,12 @@ ion-app.app-root page-core-login-reconnect {
         color: $core-login-box-text-color;
 
         .item {
-            background: $core-login-item-background-color;
+            background-color: $core-login-item-background-color;
             @include padding-horizontal(0);
         }
 
         .item-inner {
-            background: $core-login-item-inner-background-color;
+            background-color: $core-login-item-inner-background-color;
             @include padding-horizontal(0);
         }
     }