diff --git a/core/fundamentalStyleClasses.js b/core/fundamentalStyleClasses.js
index 509e8eac65..2e11cbc8cc 100644
--- a/core/fundamentalStyleClasses.js
+++ b/core/fundamentalStyleClasses.js
@@ -1,11 +1,10 @@
 module.exports = [
-  './node_modules/fundamental-styles/dist/root.css',
   './node_modules/fundamental-styles/dist/variables.css',
   './node_modules/fundamental-styles/dist/icon.css',
   './node_modules/fundamental-styles/dist/layout.css',
   './node_modules/fundamental-styles/dist/action-bar.css',
   // './node_modules/fundamental-styles/dist/alert.css',
-  //'./node_modules/fundamental-styles/dist/asset-upload.css',
+  //'./node_modules/fundamental-styles/dist/file-uploader.css',
   //'./node_modules/fundamental-styles/dist/avatar.css',
   //'./node_modules/fundamental-styles/dist/badge.css',
   './node_modules/fundamental-styles/dist/bar.css',
@@ -26,7 +25,7 @@ module.exports = [
   //'./node_modules/fundamental-styles/dist/inline-help.css',
   './node_modules/fundamental-styles/dist/input.css',
   './node_modules/fundamental-styles/dist/input-group.css',
-  //'./node_modules/fundamental-styles/dist/label.css',
+  //'./node_modules/fundamental-styles/dist/info-label.css',
   //'./node_modules/fundamental-styles/dist/layout-grid.css',
   //'./node_modules/fundamental-styles/dist/layout-panel.css',
   './node_modules/fundamental-styles/dist/link.css',
@@ -36,7 +35,6 @@ module.exports = [
   //'./node_modules/fundamental-styles/dist/message-box.css',
   './node_modules/fundamental-styles/dist/message-strip.css',
   //'./node_modules/fundamental-styles/dist/message-toast.css',
-  //'./node_modules/fundamental-styles/dist/nav.css',
   //'./node_modules/fundamental-styles/dist/notification.css',
   //'./node_modules/fundamental-styles/dist/numeric-content.css',
   //'./node_modules/fundamental-styles/dist/object-status.css',
@@ -52,16 +50,16 @@ module.exports = [
   './node_modules/fundamental-styles/dist/shellbar.css',
   './node_modules/fundamental-styles/dist/side-nav.css',
   // './node_modules/fundamental-styles/dist/switch.css',
+  //'./node_modules/fundamental-styles/dist/step-input.css'
   //'./node_modules/fundamental-styles/dist/table.css',
   './node_modules/fundamental-styles/dist/tabs.css',
   // './node_modules/fundamental-styles/dist/textarea.css',
   //'./node_modules/fundamental-styles/dist/tile.css',
   //'./node_modules/fundamental-styles/dist/time.css',
+  //'./node_modules/fundamental-styles/dist/title.css',
   //'./node_modules/fundamental-styles/dist/token.css',
   //'./node_modules/fundamental-styles/dist/tokenizer.css',
   //'./node_modules/fundamental-styles/dist/toolbar.css',
   //'./node_modules/fundamental-styles/dist/tree.css',
   './node_modules/fundamental-styles/dist/helpers.css'
-  //'./node_modules/fundamental-styles/dist/info-label.css'
-  //'./node_modules/fundamental-styles/dist/step-input.css'
 ];
diff --git a/core/package-lock.json b/core/package-lock.json
index 4b4acb9ee8..be1d0e8cc0 100644
--- a/core/package-lock.json
+++ b/core/package-lock.json
@@ -977,9 +977,9 @@
       "dev": true
     },
     "@sap-theming/theming-base-content": {
-      "version": "11.1.19",
-      "resolved": "https://registry.npmjs.org/@sap-theming/theming-base-content/-/theming-base-content-11.1.19.tgz",
-      "integrity": "sha512-0RIoniX0XgQDMfMsySvNDeXVGtH3UQRQMkJYFIkaq/nrTGSyfXT9k+B4CbTf4546dyrlLM0YoaHIOtxmMsh1ZA==",
+      "version": "11.1.21",
+      "resolved": "https://registry.npmjs.org/@sap-theming/theming-base-content/-/theming-base-content-11.1.21.tgz",
+      "integrity": "sha512-oyEvgd6ucw8VpHF0EZCFBMh3Q1dmjVgoWDL14OGolXcuQJ55q5r79g6GgZ7GyTUVPmZ3zxn/Wt11YBWOfELluQ==",
       "dev": true
     },
     "@sinonjs/commons": {
@@ -4506,9 +4506,9 @@
       "dev": true
     },
     "fundamental-styles": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/fundamental-styles/-/fundamental-styles-0.10.0.tgz",
-      "integrity": "sha512-Y5kK1Y4wSgzJaW6rLVS6VXZGIPSmhjnPIFZ0R52KEsEKocR6BsWjWIY8XakeBs0VZaOFPwHEwSxacTXkIp2/jg==",
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/fundamental-styles/-/fundamental-styles-0.11.2.tgz",
+      "integrity": "sha512-b2PVIJpHs3ss3inz3epg2Ma/3ANtLbEe91lvG/O/WcoXrQetWWWxCXncce3XRpC2vqcCP9oOe7cRFRL2KXKwRw==",
       "dev": true
     },
     "gauge": {
diff --git a/core/package.json b/core/package.json
index ddf3496df2..3c97c46bb7 100644
--- a/core/package.json
+++ b/core/package.json
@@ -10,7 +10,7 @@
     "@babel/polyfill": "^7.6.0",
     "@babel/preset-env": "^7.6.2",
     "@babel/register": "^7.6.2",
-    "@sap-theming/theming-base-content": "~11.1.19",
+    "@sap-theming/theming-base-content": "~11.1.21",
     "@webcomponents/webcomponentsjs": "^2.3.0",
     "acorn": "^6.4.1",
     "axios": ">=0.18.1",
@@ -23,7 +23,7 @@
     "css-loader": "^3.0.0",
     "file-loader": "^2.0.0",
     "fs-extra": "9.0.0",
-    "fundamental-styles": "~0.10.0",
+    "fundamental-styles": "^0.11.0",
     "jsdom": "15.0.0",
     "jsdom-global": "3.0.2",
     "live-server": "^1.2.1",
diff --git a/core/src/Alerts.html b/core/src/Alerts.html
index e4a88abcf9..3a06be817b 100644
--- a/core/src/Alerts.html
+++ b/core/src/Alerts.html
@@ -1,7 +1,4 @@
-<div
-  class="fd-shell__overlay fd-overlay fd-overlay--message-strip"
-  aria-hidden="false"
->
+<div class="fd-shell__overlay luigi-alert--overlay" aria-hidden="false">
   {#each alertQueue as al}
   <div
     class="fd-message-strip fd-message-strip--{alertTypeMap[al.settings.type]} fd-message-strip--dismissible"
@@ -108,10 +105,14 @@
 </script>
 
 <style type="text/scss">
-  .fd-overlay--message-strip {
+  .luigi-alert--overlay {
     position: absolute;
     z-index: 1100;
     flex-direction: column;
+    left: 50%;
+    -webkit-transform: translate(-50%);
+    transform: translate(-50%);
+    margin-top: 28px;
     .fd-message-strip:not(:first-child) {
       margin-top: 8px;
     }
diff --git a/core/src/App.html b/core/src/App.html
index d0a0e76231..c8d635ec26 100644
--- a/core/src/App.html
+++ b/core/src/App.html
@@ -1639,13 +1639,6 @@
     max-height: calc(var(--vh, 1vh) * 100 - 76px);
   }
 
-  //Overwrites with SAP variables
-
-  :global(.fd-shellbar) {
-    border-bottom: #354a5f;
-    border-bottom: 1px solid var(--sapShell_BorderColor, #354a5f);
-  }
-
   .wcContainer {
     position: absolute;
     left: 0;
diff --git a/core/src/Authorization.html b/core/src/Authorization.html
index f05f40f3ab..14475eb2c2 100644
--- a/core/src/Authorization.html
+++ b/core/src/Authorization.html
@@ -27,7 +27,7 @@
         {#if profileItem.icon}
         {#if hasOpenUIicon(profileItem)}
         <span
-          class="fd-top-nav__icon sap-icon--{profileItem.icon} sap-icon--m"
+          class="fd-top-nav__icon sap-icon--{profileItem.icon}"
         ></span>
         {:else}
         <img
@@ -54,7 +54,7 @@
         {#if profileNav.logout.icon}
         {#if hasOpenUIicon(profileNav.logout)}
         <span
-          class="fd-top-nav__icon sap-icon--{profileNav.logout.icon} sap-icon--m"
+          class="fd-top-nav__icon sap-icon--{profileNav.logout.icon}"
         ></span>
         {:else}
         <img
diff --git a/core/src/Modal.html b/core/src/Modal.html
index b4eddfe452..4a4f8b80b3 100644
--- a/core/src/Modal.html
+++ b/core/src/Modal.html
@@ -12,7 +12,7 @@ <h3 class="fd-dialog__title">{modalSettings.title}</h3>
       <div class="fd-bar__right">
         <div class="fd-bar__element">
           <button
-            class="fd-button fd-button--transparent fd-button--compact fd-dialog__close sap-icon--decline sap-icon--l"
+            class="fd-button fd-button--transparent fd-button--compact fd-dialog__close sap-icon--decline"
             on:click="{() => dispatch('close')}"
             aria-label="close"
           ></button>
diff --git a/core/src/SplitView.html b/core/src/SplitView.html
index f5c8c4578d..ef14aad70f 100644
--- a/core/src/SplitView.html
+++ b/core/src/SplitView.html
@@ -11,7 +11,7 @@
         class="lui-collapse-btn"
         on:click|stopPropagation|preventDefault="{expand}"
       >
-        <span class="sap-icon--navigation-up-arrow sap-icon--s"></span>
+        <span class="sap-icon--navigation-up-arrow"></span>
       </a>
     </div>
     <h1 class="fd-splitView__title">{splitViewSettings.title}</h1>
@@ -28,7 +28,7 @@ <h1 class="fd-splitView__title">{splitViewSettings.title}</h1>
     class="lui-collapse-btn"
     on:click|stopPropagation|preventDefault="{collapse}"
   >
-    <span class="sap-icon--navigation-down-arrow sap-icon--s"></span>
+    <span class="sap-icon--navigation-down-arrow"></span>
   </a>
 </div>
 {/if}
diff --git a/core/src/TopNavDropDown.html b/core/src/TopNavDropDown.html
index 164b962122..51c43f634b 100644
--- a/core/src/TopNavDropDown.html
+++ b/core/src/TopNavDropDown.html
@@ -15,7 +15,7 @@
         class="fd-menu__link"
       >
         <span
-          class="fd-top-nav__icon {node.icon && hasOpenUIicon(node) ? 'sap-icon--' + node.icon + ' sap-icon--m' : '' }"
+          class="fd-top-nav__icon {node.icon && hasOpenUIicon(node) ? 'sap-icon--' + node.icon : '' }"
         >
           {#if !hasOpenUIicon(node)}
           <img
diff --git a/core/src/navigation/BadgeCounter.html b/core/src/navigation/BadgeCounter.html
index f58f9b0118..73c09c07d3 100644
--- a/core/src/navigation/BadgeCounter.html
+++ b/core/src/navigation/BadgeCounter.html
@@ -32,8 +32,8 @@
       .fd-counter--notification {
         transform: none;
         position: absolute;
-        top: -10px;
-        left: 10px;
+        top: -6px;
+        left: 6px;
         border-radius: 8px;
         font-size: 10px;
         line-height: 6px;
diff --git a/core/src/navigation/GlobalSearch.html b/core/src/navigation/GlobalSearch.html
index 5fbea516f4..9345874e69 100644
--- a/core/src/navigation/GlobalSearch.html
+++ b/core/src/navigation/GlobalSearch.html
@@ -251,6 +251,12 @@
   }
 </script>
 <style type="text/scss">
+  //remove default browser outline on focus for search results
+  .luigi-search-popover__body {
+    li[class*='luigi-search-result']:focus {
+      outline: none;
+    }
+  }
   .luigi-search {
     &[aria-hidden='true'] {
       visibility: hidden;
@@ -303,7 +309,7 @@
         top: 0;
         right: 0;
         background: var(--sapShellColor);
-        z-index: 1;
+        z-index: 2;
       }
       .fd-menu {
         max-width: 12rem;
diff --git a/core/src/navigation/LeftNav.html b/core/src/navigation/LeftNav.html
index 2af7bd1d00..640b00121c 100644
--- a/core/src/navigation/LeftNav.html
+++ b/core/src/navigation/LeftNav.html
@@ -45,7 +45,7 @@
               >{$getTranslation(node.label)}</span>
               {#if node.externalLink && node.externalLink.url}
               <span
-                class="sap-icon--action sap-icon--s"
+                class="sap-icon--action"
               ></span>
               {/if}
               {#if node.badgeCounter}
@@ -89,14 +89,15 @@
                   class="fd-nested-list__title"
                 >{$getTranslation(key)}</span>
               </a>
-              <a
-                class="fd-nested-list__expand-icon"
+              <button
+                class="fd-button fd-nested-list__button"
                 href="#"
                 tabindex="-1"
+                aria-label="Expand categories"
                 aria-haspopup="true"
                 aria-expanded="{isExpanded(nodes, expandedCategories)}"
                 on:click|preventDefault="{() => setExpandedState(nodes, !isExpanded(nodes, expandedCategories), this)}"
-              ></a>
+              ></button>
             </div>
             <ul
               class="fd-nested-list fd-nested-list--text-only level-2"
@@ -116,7 +117,7 @@
                   >{$getTranslation(node.label)}</span>
                   {#if node.externalLink && node.externalLink.url}
                   <span
-                    class="sap-icon--action sap-icon--s"
+                    class="sap-icon--action"
                   ></span>
                   {/if}
                   {#if node.badgeCounter}
@@ -148,7 +149,7 @@
                       >{$getTranslation(node.label)}</span>
                       {#if node.externalLink && node.externalLink.url}
                       <span
-                        class="sap-icon--action sap-icon--s"
+                        class="sap-icon--action"
                       ></span>
                       {/if}
                       {#if node.badgeCounter}
@@ -216,7 +217,7 @@
               >{$getTranslation(node.label)}</span>
               {#if node.externalLink && node.externalLink.url}
               <span
-                class="sap-icon--action sap-icon--s"
+                class="sap-icon--action"
               ></span>
               {/if}
               {#if node.badgeCounter}
@@ -652,6 +653,12 @@
     }
   }
 
+  //temporary fix of FD Styles 0.11.0 please review with new version
+  .lui-category {
+    border-top: var(--sapList_BorderWidth, 0.0625rem) solid
+      var(--sapList_GroupHeaderBorderColor, #d8d8d8);
+  }
+
   .lui-fd-side-nav-wrapper {
     height: 100%;
     overflow-y: auto;
diff --git a/core/src/navigation/TabNav.html b/core/src/navigation/TabNav.html
index e7e526978f..92a247526f 100644
--- a/core/src/navigation/TabNav.html
+++ b/core/src/navigation/TabNav.html
@@ -52,7 +52,7 @@
               aria-selected="{isSelectedCat(key,selectedNodeForTabNav)}"
             >
               <span class="label fd-tabs__tag">{$getTranslation(key)}</span>
-              <span class="sap-icon--dropdown sap-icon--l"></span>
+              <span class="sap-icon--dropdown luigi-icon--dropdown"></span>
             </a>
           </div>
           <div
@@ -97,7 +97,7 @@
           on:click|preventDefault="{toggleMoreBtn}"
         >
           <span class="label fd-tabs__tag">More</span>
-          <span class="sap-icon--dropdown sap-icon--l"></span>
+          <span class="sap-icon--dropdown luigi-icon--dropdown"></span>
         </a>
         <div
           class="fd-popover__body fd-popover__body--right fd-popover__body--no-arrow"
@@ -136,14 +136,15 @@
                 >
                   <span class="fd-nested-list__title">{$getTranslation(key)}</span>
                 </a>
-                <a
-                  class="fd-nested-list__expand-icon"
+                <button
+                  class="fd-button fd-nested-list__button"
                   href="#"
                   tabindex="-1"
+                  aria-label="Expand submenu"
                   aria-haspopup="true"
                   aria-expanded="{dropDownStates[key+index]}"
                   on:click|preventDefault="{() => toggleDropdownState(key+index)}"
-                ></a>
+                ></button>
               </div>
               <ul
                 class="fd-nested-list level-2"
@@ -420,7 +421,7 @@
       padding-right: 0;
 
       &.has-child {
-        .sap-icon--l {
+        .luigi-icon--dropdown {
           right: 0;
         }
       }
@@ -454,7 +455,7 @@
         .label {
           padding-right: 17px;
         }
-        .sap-icon--l {
+        .luigi-icon--dropdown {
           position: absolute;
           top: 0.4em;
           right: 14px;
diff --git a/core/src/navigation/TopNav.html b/core/src/navigation/TopNav.html
index ed5df0f7b4..a56645703a 100644
--- a/core/src/navigation/TopNav.html
+++ b/core/src/navigation/TopNav.html
@@ -58,7 +58,7 @@
             {#if node.icon}
             {#if hasOpenUIicon(node)}
             <span
-              class="fd-top-nav__icon sap-icon--{node.icon} sap-icon--m"
+              class="fd-top-nav__icon sap-icon--{node.icon}"
             ></span>
             {:else}
             <img
@@ -105,7 +105,7 @@
         {#if node.icon}
         {#if hasOpenUIicon(node)}
         <span
-          class="fd-top-nav__icon sap-icon--{node.icon} sap-icon--m"
+          class="fd-top-nav__icon sap-icon--{node.icon}"
         ></span>
         {:else}
         <img
@@ -188,7 +188,7 @@
                     on:click|stopPropagation="{openMobileContextSwitcher}"
                   >
                     <span
-                      class="fd-top-nav__icon sap-icon--m {contextSwitcherConfig.icon && hasOpenUIicon(contextSwitcherConfig) ? 'sap-icon--' + contextSwitcherConfig.icon : 'sap-icon--switch-views'}"
+                      class="fd-top-nav__icon {contextSwitcherConfig.icon && hasOpenUIicon(contextSwitcherConfig) ? 'sap-icon--' + contextSwitcherConfig.icon : 'sap-icon--switch-views'}"
                     ></span>
                     <span
                       class="fd-menu__title"
@@ -207,7 +207,7 @@
                     data-testid="{getTestId(node)}"
                   >
                     <span
-                      class="fd-top-nav__icon {node.icon && hasOpenUIicon(node) ? 'sap-icon--' + node.icon + ' sap-icon--m' : '' }"
+                      class="fd-top-nav__icon {node.icon && hasOpenUIicon(node) ? 'sap-icon--' + node.icon : '' }"
                     >
                       {#if !hasOpenUIicon(node)}
                       <img
@@ -230,7 +230,7 @@
                     data-e2e="mobile-topnav-dropdown-category"
                   >
                     <span
-                      class="fd-top-nav__icon {node.icon && hasOpenUIicon(node) ? 'sap-icon--' + node.icon + ' sap-icon--m' : '' }"
+                      class="fd-top-nav__icon {node.icon && hasOpenUIicon(node) ? 'sap-icon--' + node.icon : '' }"
                     >
                       {#if !hasOpenUIicon(node)}
                       <img
@@ -254,7 +254,7 @@
                   >
                     {#if node.icon} {#if hasOpenUIicon(node)}
                     <span
-                      class="fd-top-nav__icon sap-icon--{node.icon} sap-icon--m"
+                      class="fd-top-nav__icon sap-icon--{node.icon}"
                     ></span>
                     {:else}
                     <img
@@ -278,7 +278,7 @@
                   >
                     {#if hasOpenUIicon(productSwitcherConfig) || !productSwitcherConfig.icon}
                     <span
-                      class="fd-top-nav__icon sap-icon--{productSwitcherConfig.icon || 'grid'} sap-icon--m"
+                      class="fd-top-nav__icon sap-icon--{productSwitcherConfig.icon || 'grid'}"
                     ></span>
                     {:else}
                     <span class="fd-top-nav__icon">
@@ -339,7 +339,9 @@
             class="fd-popover__control"
             on:click|stopPropagation="{() => {}}"
           >
-            <div class="{userInfo.picture ? 'fd-user-menu__control' : '' }">
+            <div
+              class="{userInfo.picture ? 'fd-shellbar__button--user-menu' : '' }"
+            >
               <button
                 class="fd-shellbar__button fd-button {!userInfo.picture?'sap-icon--customer':'fd-identifier fd-identifier--xs fd-identifier--circle'}"
                 style="{userInfo.picture?`background-image: url('${userInfo.picture}');background-size:30px;background-repeat: no-repeat;background-position: center;`:''}"
@@ -625,20 +627,16 @@
 </script>
 
 <style type="text/scss">
-  // Fix for Fiori aligning everything to right inside shellbar end
-  .fd-shellbar__group--end {
-    text-align: unset;
-  }
-
+  // Fix FD Styles for icons in Shellbar 0.11.2
   .fd-shellbar__button {
     .fd-top-nav__icon {
+      line-height: 2.4rem;
+      color: var(--sapShell_TextColor, #fff);
+
       &:before {
         margin-top: 10px;
       }
     }
-    .fd-top-nav__icon + span {
-      line-height: 2.4rem;
-    }
   }
 
   .hideNavComponent {
diff --git a/test/e2e-test-application/src/index.html b/test/e2e-test-application/src/index.html
index 3434e89639..97ff9e7412 100644
--- a/test/e2e-test-application/src/index.html
+++ b/test/e2e-test-application/src/index.html
@@ -67,7 +67,7 @@
     <script src="/luigi-core/luigi.js"></script>
 
     <script src="/assets/extendedConfiguration.bundle.js"></script>
-
+    <!-- 
     <div luigi-app-loading-indicator>
       <div
         class="fd-busy-indicator--m"
@@ -79,7 +79,7 @@
         <div class="fd-busy-indicator--circle-1"></div>
         <div class="fd-busy-indicator--circle-2"></div>
       </div>
-    </div>
+    </div>-->
     <!-- LUIGI CUSTOM CONTAINER FEATURE -->
     <!-- <div class="custom" id="my-header">MY HEADER</div>
     <div class="main">
diff --git a/website/fiddle/package-lock.json b/website/fiddle/package-lock.json
index a38f89cd8b..a4bcc60b56 100644
--- a/website/fiddle/package-lock.json
+++ b/website/fiddle/package-lock.json
@@ -3,26 +3,6 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
-    "@luigi-project/client": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@luigi-project/client/-/client-1.3.1.tgz",
-      "integrity": "sha512-TaiU0WFyBiMBtK5u0AbNgdTBu5E1KG6VPYmc4J8/RxY8eyGArnUFJDogDkNKgcPPkd1++9NYtkqZX+z6qD4fww=="
-    },
-    "@luigi-project/core": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@luigi-project/core/-/core-1.3.1.tgz",
-      "integrity": "sha512-NuCJ5ApyjDiLcZg/4MnCHviFVPTwrdiOziZqEGo5buDYOiTM1+FYfg8BH8qDeFYX9R/z55H8Mip+7QRaFhGs2w=="
-    },
-    "@luigi-project/plugin-auth-oauth2": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@luigi-project/plugin-auth-oauth2/-/plugin-auth-oauth2-1.3.1.tgz",
-      "integrity": "sha512-n/JPuWJRPE/p2tCRyOP0CaRsv/+NGCqIFwmdQJSl8/R045mpy+Aw3hl+CpA3XsDIDK0y7M7tc9Edp1CIHnOYUQ=="
-    },
-    "@luigi-project/plugin-auth-oidc": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@luigi-project/plugin-auth-oidc/-/plugin-auth-oidc-1.3.1.tgz",
-      "integrity": "sha512-PNhHykr59DR48jQWEm4qJZppkr1aaUwn0WRnVu7ADSgw3w1yxqXLyGKNuglS4W5gNI8uCJ/9UlvbWHPaAaC03Q=="
-    },
     "@sap-theming/theming-base-content": {
       "version": "11.1.19",
       "resolved": "https://registry.npmjs.org/@sap-theming/theming-base-content/-/theming-base-content-11.1.19.tgz",