diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js
index b549022e8c1d425ebb8c94b943ae758fc20d66b1..7d4a70fa59f6dd6bb7d5be54cb72fff29255c938 100644
--- a/packages/app-shell/src/app-shell.js
+++ b/packages/app-shell/src/app-shell.js
@@ -3,6 +3,7 @@ import {html, css, LitElement} from 'lit-element';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import {LanguageSelect} from 'vpu-language-select';
 import 'vpu-common/vpu-button.js';
+import {Icon} from 'vpu-common';
 import {Auth} from 'vpu-auth';
 import {Notification} from 'vpu-notification';
 import * as commonUtils from 'vpu-common/utils';
@@ -69,8 +70,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
           'vpu-build-info': BuildInfo,
           'vpu-auth': Auth,
           'vpu-notification': Notification,
-          // https://github.com/open-wc/open-wc/issues/1541
-          'vpu-icon': customElements.get('vpu-icon'),
+          'vpu-icon': Icon,
         };
     }
 
diff --git a/packages/app-shell/vendor/auth b/packages/app-shell/vendor/auth
index b5a43f69e9784f27099b48e2674be2e171148cb7..fbf83528159f7d3eeceedff287831dece6b9b46d 160000
--- a/packages/app-shell/vendor/auth
+++ b/packages/app-shell/vendor/auth
@@ -1 +1 @@
-Subproject commit b5a43f69e9784f27099b48e2674be2e171148cb7
+Subproject commit fbf83528159f7d3eeceedff287831dece6b9b46d
diff --git a/packages/app-shell/vendor/common b/packages/app-shell/vendor/common
index 2e8b0cea73254a82df4dfb5d5dcb2439d057e6a8..010b54fa455829d732152b6794c7a92a874249aa 160000
--- a/packages/app-shell/vendor/common
+++ b/packages/app-shell/vendor/common
@@ -1 +1 @@
-Subproject commit 2e8b0cea73254a82df4dfb5d5dcb2439d057e6a8
+Subproject commit 010b54fa455829d732152b6794c7a92a874249aa