diff --git a/package.json b/package.json
index c6e522a4c7..b8694a9665 100755
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.16.49",
+  "version": "0.16.50",
   "myplanet": {
-    "latest": "v0.21.81",
-    "min": "v0.20.81"
+    "latest": "v0.21.88",
+    "min": "v0.20.88"
   },
   "scripts": {
     "ng": "ng",
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 6296f3e295..4a3e34eca7 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -49,7 +49,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
       <ng-container *planetAuthorizedRoles>
         <button mat-icon-button planetSync i18n-title title="Sync" *ngIf="onlineStatus === 'accepted'"><mat-icon svgIcon="feedback"></mat-icon></button>
       </ng-container>
-      <button mat-icon-button routerLink="/manager" i18n-title title="Manager Settings" *planetAuthorizedRoles="'manager,monitor'"><mat-icon svgIcon="usersettings"></mat-icon></button>
+      <button mat-icon-button routerLink="/manager" i18n-title title="Manager Settings" *planetAuthorizedRoles="'manager,monitor'"><mat-icon>settings</mat-icon></button>
       <planet-language></planet-language>
     </span>
     <ng-container *planetAuthorizedRoles="'learner'">
@@ -109,7 +109,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
               planetPulsateIcon
               i18n-title title="Community"
               [routerLinkActiveOptions]="{exact:true}">
-              <mat-icon svgIcon="home"></mat-icon>
+              <mat-icon>home</mat-icon>
               <label i18n>Community</label>
             </a>
           </li>
@@ -119,7 +119,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
               planetPulsateIcon
               i18n-title title="Nation"
               [routerLinkActiveOptions]="{exact:true}">
-              <mat-icon svgIcon="home"></mat-icon>
+              <mat-icon>library_books</mat-icon>
               <label i18n>Nation</label>
             </a>
           </li>
@@ -129,7 +129,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
             routerLinkActive="active"
             planetPulsateIcon
             i18n-title title="Dashboard">
-            <mat-icon>turned_in_not</mat-icon>
+            <mat-icon>dashboard</mat-icon>
             <label i18n>myDashboard</label>
           </a>
         </li>
@@ -138,7 +138,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
             routerLinkActive="active"
             planetPulsateIcon
             i18n-title title="Library">
-            <mat-icon svgIcon="myLibrary"></mat-icon>
+            <mat-icon>folder</mat-icon>
             <label i18n>Library</label>
           </a>
         </li>
@@ -147,7 +147,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
             routerLinkActive="active"
             planetPulsateIcon
             i18n-title title="Courses">
-            <mat-icon svgIcon="myCourses"></mat-icon>
+            <mat-icon>school</mat-icon>
             <label i18n>Courses</label>
           </a>
         </li>
@@ -156,7 +156,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
             routerLinkActive="active"
             planetPulsateIcon
             i18n-title title="Teams">
-            <mat-icon svgIcon="myTeams"></mat-icon>
+            <mat-icon>groups</mat-icon>
             <label i18n>Teams</label>
           </a>
         </li>
@@ -165,7 +165,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
             routerLinkActive="active"
             planetPulsateIcon
             i18n-title title="Enterprises">
-            <mat-icon>business</mat-icon>
+            <mat-icon>work</mat-icon>
             <label i18n>Enterprises</label>
           </a>
         </li>
@@ -187,7 +187,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
       <ul class="bottom-nav">
         <li>
           <a mat-button routerLink="/chat" i18n-title title="Chat">
-            <mat-icon>chat_bubble_outline</mat-icon>
+            <mat-icon>question_answer</mat-icon>
             <label i18n>Chat</label>
           </a>
         </li>
@@ -199,20 +199,23 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
         </li>
         <li>
           <a mat-button routerLink="/feedback" i18n-title title="Messages">
-            <mat-icon>mail_outline</mat-icon>
+            <mat-icon>mail</mat-icon>
             <label i18n>Messages</label>
           </a>
         </li>
         <ng-container *planetAuthorizedRoles="'manager,monitor'">
           <li>
             <a mat-button routerLink="/manager" i18n-title title="Manager Settings">
-              <mat-icon svgIcon="usersettings"></mat-icon>
+              <mat-icon>settings</mat-icon>
               <label i18n>Manager Settings</label>
             </a>
           </li>
         </ng-container>
-        <li style="text-align: center;">
-          <planet-language [iconOnly]="layout === 'modern' || forceModern"></planet-language>
+        <li>
+          <a mat-button (click)="openLanguageDialog()" i18n-title title="Change Language">
+            <mat-icon>translate</mat-icon>
+            <label *ngIf="sidenavState === 'open'" i18n>Language</label>
+          </a>
         </li>
         <ng-container *planetAuthorizedRoles>
           <li *ngIf="onlineStatus === 'accepted'">
diff --git a/src/assets/icons/logout.svg b/src/assets/icons/logout.svg
index 2464672fc3..185a3d42c9 100644
--- a/src/assets/icons/logout.svg
+++ b/src/assets/icons/logout.svg
@@ -1,28 +1,12 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 511.989 511.989" style="enable-background:new 0 0 511.989 511.989;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M110.933,221.782c-4.71,0-8.533,3.823-8.533,8.533v51.2c0,4.71,3.823,8.533,8.533,8.533s8.533-3.823,8.533-8.533v-51.2
-				C119.467,225.605,115.644,221.782,110.933,221.782z"/>
-			<path d="M111.855,2.304L31.172,34.586C8.448,43,0,54.418,0,76.715v358.477c0,22.298,8.448,33.715,30.959,42.061l81.058,32.427
-				c4.011,1.519,8.038,2.287,11.981,2.287c17.152,0,29.602-14.336,29.602-34.091V34.049C153.6,9.78,134.246-6.126,111.855,2.304z
-				 M136.533,477.876c0,10.18-5.035,17.024-12.535,17.024c-1.869,0-3.883-0.401-5.803-1.118L37.103,461.33
-				c-16.102-5.965-20.036-11.102-20.036-26.138V76.715c0-15.036,3.934-20.164,20.241-26.206l80.725-32.29
-				c2.082-0.785,4.087-1.186,5.956-1.186c7.501,0,12.544,6.835,12.544,17.016V477.876z"/>
-			<path d="M178.133,51.115h120.533c14.114,0,25.6,11.486,25.6,25.6v128c0,4.71,3.814,8.533,8.533,8.533
-				c4.719,0,8.533-3.823,8.533-8.533v-128c0-23.526-19.14-42.667-42.667-42.667H178.133c-4.71,0-8.533,3.823-8.533,8.533
-				S173.423,51.115,178.133,51.115z"/>
-			<path d="M332.8,298.582c-4.719,0-8.533,3.823-8.533,8.533v128c0,14.114-11.486,25.6-25.6,25.6H179.2
-				c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467c23.526,0,42.667-19.14,42.667-42.667v-128
-				C341.333,302.405,337.519,298.582,332.8,298.582z"/>
-			<path d="M511.343,252.655c-0.435-1.05-1.058-1.988-1.852-2.782l-85.325-85.333c-3.337-3.336-8.73-3.336-12.066,0
-				c-3.337,3.337-3.337,8.73,0,12.066l70.767,70.775H196.267c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533
-				h286.601L412.1,335.215c-3.337,3.337-3.337,8.73,0,12.066c1.664,1.664,3.849,2.5,6.033,2.5c2.185,0,4.369-0.836,6.033-2.5
-				l85.325-85.325c0.794-0.794,1.417-1.732,1.852-2.782C512.205,257.093,512.205,254.738,511.343,252.655z"/>
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Uploaded to: SVG Find, www.svgrepo.com, Generator: SVG Find Mixer Tools -->
+<svg width="800px" height="800px" version="1.1" viewBox="144 144 512 512" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <clipPath id="a">
+   <path d="m148.09 148.09h503.81v503.81h-503.81z"/>
+  </clipPath>
+ </defs>
+ <g clip-path="url(#a)">
+  <path d="m649.6 405.56-70.848 70.848v0.003906c-1.4766 1.4766-3.4805 2.3047-5.5664 2.3047-2.0898 0-4.0898-0.82812-5.5664-2.3047l-23.617-23.617c-1.4766-1.4766-2.3047-3.4766-2.3047-5.5664 0-2.0859 0.82813-4.0898 2.3047-5.5664l18.051-18.051h-130.56c-4.3477 0-7.875-3.5234-7.875-7.8711v-31.488c0-4.3477 3.5273-7.8711 7.875-7.8711h130.56l-18.051-18.051c-1.4766-1.4766-2.3047-3.4766-2.3047-5.5664 0-2.0859 0.82813-4.0898 2.3047-5.5664l23.617-23.617v0.003907c1.4766-1.4766 3.4766-2.3086 5.5664-2.3086 2.0859 0 4.0898 0.83203 5.5664 2.3086l70.848 70.848c1.4766 1.4766 2.3047 3.4766 2.3047 5.5664 0 2.0859-0.82812 4.0898-2.3047 5.5625zm-241.73 10.18v-31.488c0.019531-6.2578 2.5117-12.254 6.9375-16.68 4.4258-4.4219 10.422-6.918 16.68-6.9375h78.719v-157.44c-0.011719-4.3438-3.5312-7.8594-7.8711-7.875h-149.57v409.35h149.57c4.3398-0.011719 7.8594-3.5312 7.8711-7.8711v-157.44h-78.719c-6.2578-0.019531-12.254-2.5117-16.68-6.9375-4.4258-4.4258-6.918-10.422-6.9375-16.68zm-125.95-23.617c-3.1836 0-6.0547 1.918-7.2734 4.8594s-0.54297 6.3281 1.707 8.582c2.25 2.25 5.6367 2.9219 8.5781 1.7031 2.9414-1.2148 4.8594-4.0859 4.8594-7.2695-0.003906-4.3477-3.5234-7.8711-7.8711-7.875zm55.105-236.16v488.07c0 2.5273-1.2109 4.9023-3.2617 6.3828-2.0469 1.4805-4.6797 1.8867-7.0781 1.0938l-173.18-57.203-0.003906 0.003906c-3.2266-1.0664-5.4023-4.082-5.4023-7.4805v-373.66c0-3.3984 2.1758-6.4141 5.4023-7.4766l173.18-57.203h0.003906c2.3984-0.79297 5.0312-0.38672 7.0781 1.0977 2.0508 1.4805 3.2617 3.8516 3.2617 6.3789zm-31.488 244.04c0-6.2656-2.4883-12.273-6.918-16.699-4.4297-4.4297-10.438-6.918-16.699-6.918s-12.27 2.4883-16.699 6.918c-4.4297 4.4258-6.918 10.434-6.918 16.699 0 6.2617 2.4883 12.27 6.918 16.699 4.4297 4.4258 10.438 6.9141 16.699 6.9141 6.2617-0.003906 12.266-2.4961 16.691-6.9219 4.4258-4.4297 6.918-10.43 6.9258-16.691z"/>
+ </g>
+</svg>
\ No newline at end of file