diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js
index a56012d327b821958fdc2a1118d1e4c8427109a6..b549022e8c1d425ebb8c94b943ae758fc20d66b1 100644
--- a/packages/app-shell/src/app-shell.js
+++ b/packages/app-shell/src/app-shell.js
@@ -4,7 +4,7 @@ import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import {LanguageSelect} from 'vpu-language-select';
 import 'vpu-common/vpu-button.js';
 import {Auth} from 'vpu-auth';
-import 'vpu-notification';
+import {Notification} from 'vpu-notification';
 import * as commonUtils from 'vpu-common/utils';
 import * as commonStyles from 'vpu-common/styles';
 import buildinfo from 'consts:buildinfo';
@@ -13,7 +13,7 @@ import {Router} from './router.js';
 import * as events from 'vpu-common/events.js';
 import {BuildInfo} from './build-info.js';
 import {TUGrazLogo} from './tugraz-logo.js';
-import {send as notify} from 'vpu-notification';
+import {send as notify} from 'vpu-common/notification';
 import {userProfileMeta} from './vpu-app-shell-user-profile.js';
 import {appWelcomeMeta} from './vpu-app-shell-welcome.js';
 
@@ -68,11 +68,11 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
           'vpu-tugraz-logo': TUGrazLogo,
           'vpu-build-info': BuildInfo,
           'vpu-auth': Auth,
+          'vpu-notification': Notification,
           // https://github.com/open-wc/open-wc/issues/1541
-          'vpu-notification': customElements.get('vpu-notification'),
           'vpu-icon': customElements.get('vpu-icon'),
         };
-      }
+    }
 
     onAttributeObserved(mutationsList, observer) {
         for(let mutation of mutationsList) {
diff --git a/packages/app-shell/vendor/language-select b/packages/app-shell/vendor/language-select
index f6797279a5f00dfe4db52e44f1e016aedeec6a6d..05266ff50d60b31743904ca3988afa9647455a1f 160000
--- a/packages/app-shell/vendor/language-select
+++ b/packages/app-shell/vendor/language-select
@@ -1 +1 @@
-Subproject commit f6797279a5f00dfe4db52e44f1e016aedeec6a6d
+Subproject commit 05266ff50d60b31743904ca3988afa9647455a1f
diff --git a/packages/app-shell/vendor/notification b/packages/app-shell/vendor/notification
index b4e2cbb05eb4c4b57f48d96da1caf9b0e1a1d2a1..c7fe70928a4414a0943d5e5ca4e38e851faad270 160000
--- a/packages/app-shell/vendor/notification
+++ b/packages/app-shell/vendor/notification
@@ -1 +1 @@
-Subproject commit b4e2cbb05eb4c4b57f48d96da1caf9b0e1a1d2a1
+Subproject commit c7fe70928a4414a0943d5e5ca4e38e851faad270