diff --git a/src-docs/src/components/guide_page/guide_page_header.tsx b/src-docs/src/components/guide_page/guide_page_header.tsx
index 12ea673f97..637f202063 100644
--- a/src-docs/src/components/guide_page/guide_page_header.tsx
+++ b/src-docs/src/components/guide_page/guide_page_header.tsx
@@ -24,14 +24,8 @@ import { OuiPopover } from '../../../../src/components/popover';
 import { useIsWithinBreakpoints } from '../../../../src/services/hooks';
 import { OuiButtonEmpty } from '../../../../src/components/button';
 
-// @ts-ignore Not TS
-import { CodeSandboxLink } from '../../components/codesandbox/link';
 import logoOUI from '../../images/logo-oui.svg';
-import {
-  GuideThemeSelector,
-  GuideSketchLink,
-  GuideFigmaLink,
-} from '../guide_theme_selector';
+import { GuideThemeSelector } from '../guide_theme_selector';
 
 const pkg = require('../../../../package.json');
 
@@ -92,25 +86,6 @@ export const GuidePageHeader: React.FunctionComponent<GuidePageHeaderProps> = ({
     );
   }
 
-  function renderCodeSandbox() {
-    const label = 'Codesandbox';
-    return isMobileSize ? (
-      <CodeSandboxLink key="codesandbox">
-        <OuiButtonEmpty size="s" flush="both" iconType="logoCodesandbox">
-          {label}
-        </OuiButtonEmpty>
-      </CodeSandboxLink>
-    ) : (
-      <OuiToolTip content="Codesandbox" key="codesandbox">
-        <CodeSandboxLink>
-          <OuiHeaderSectionItemButton aria-label="Codesandbox">
-            <OuiIcon type="logoCodesandbox" aria-hidden="true" />
-          </OuiHeaderSectionItemButton>
-        </CodeSandboxLink>
-      </OuiToolTip>
-    );
-  }
-
   const [mobilePopoverIsOpen, setMobilePopoverIsOpen] = useState(false);
 
   function renderMobileMenu() {
@@ -128,12 +103,7 @@ export const GuidePageHeader: React.FunctionComponent<GuidePageHeaderProps> = ({
         button={button}
         isOpen={mobilePopoverIsOpen}
         closePopover={() => setMobilePopoverIsOpen(false)}>
-        <div className="guideOptionsPopover">
-          {renderGithub()}
-          <GuideSketchLink />
-          <GuideFigmaLink />
-          {renderCodeSandbox()}
-        </div>
+        <div className="guideOptionsPopover">{renderGithub()}</div>
       </OuiPopover>
     );
   }
@@ -152,9 +122,6 @@ export const GuidePageHeader: React.FunctionComponent<GuidePageHeaderProps> = ({
           selectedLocale={selectedLocale}
         />,
         renderGithub(),
-        <GuideSketchLink key="sketch" />,
-        <GuideFigmaLink key="figma" />,
-        renderCodeSandbox(),
       ];
 
   return (
diff --git a/src-docs/src/components/guide_theme_selector/guide_theme_selector.tsx b/src-docs/src/components/guide_theme_selector/guide_theme_selector.tsx
index 0156c19025..011dbcda90 100644
--- a/src-docs/src/components/guide_theme_selector/guide_theme_selector.tsx
+++ b/src-docs/src/components/guide_theme_selector/guide_theme_selector.tsx
@@ -18,13 +18,10 @@ import {
   OuiContextMenuItem,
 } from '../../../../src/components/context_menu';
 import { OuiPopover } from '../../../../src/components/popover';
-import { OuiHorizontalRule } from '../../../../src/components/horizontal_rule';
 import { useIsWithinBreakpoints } from '../../../../src/services/hooks/useIsWithinBreakpoints';
 import { OUI_THEME, OUI_THEMES } from '../../../../src/themes';
 
 import { ThemeContext } from '../with_theme';
-// @ts-ignore Not TS
-import { GuideLocaleSelector } from '../guide_locale_selector';
 
 type GuideThemeSelectorProps = {
   onToggleLocale: () => {};
@@ -45,8 +42,6 @@ export const GuideThemeSelector: React.FunctionComponent<GuideThemeSelectorProps
 // @ts-ignore Context has no type
 const GuideThemeSelectorComponent: React.FunctionComponent<GuideThemeSelectorProps> = ({
   context,
-  onToggleLocale,
-  selectedLocale,
 }) => {
   const isMobileSize = useIsWithinBreakpoints(['xs', 's']);
   const [isPopoverOpen, setPopover] = useState(false);
@@ -102,17 +97,6 @@ const GuideThemeSelectorComponent: React.FunctionComponent<GuideThemeSelectorPro
       panelPaddingSize="none"
       anchorPosition="downRight">
       <OuiContextMenuPanel size="s" items={items} />
-      {location.host.includes('803') && (
-        <>
-          <OuiHorizontalRule margin="none" />
-          <div style={{ padding: 8 }}>
-            <GuideLocaleSelector
-              onToggleLocale={onToggleLocale}
-              selectedLocale={selectedLocale}
-            />
-          </div>
-        </>
-      )}
     </OuiPopover>
   );
 };
diff --git a/src-docs/src/views/card/playground.js b/src-docs/src/views/card/playground.js
index 44abe97c3f..15d57ed104 100644
--- a/src-docs/src/views/card/playground.js
+++ b/src-docs/src/views/card/playground.js
@@ -49,7 +49,7 @@ export const cardConfig = () => {
   propsToUse.icon = {
     ...propsToUse.icon,
     type: PropTypes.ReactNode,
-    value: '<OuiIcon type="logoElastic" size="xl" />',
+    value: '<OuiIcon type="logoOUI" size="xl" />',
   };
 
   propsToUse.children = {
diff --git a/src-docs/src/views/collapsible_nav/collapsible_nav_all.tsx b/src-docs/src/views/collapsible_nav/collapsible_nav_all.tsx
index 508da42263..38f973273e 100644
--- a/src-docs/src/views/collapsible_nav/collapsible_nav_all.tsx
+++ b/src-docs/src/views/collapsible_nav/collapsible_nav_all.tsx
@@ -260,7 +260,7 @@ const CollapsibleNavAll = () => {
 
   const leftSectionItems = [
     collapsibleNav,
-    <OuiHeaderLogo href={exitPath} iconType="logoElastic">
+    <OuiHeaderLogo href={exitPath} iconType="logoOUI">
       Elastic
     </OuiHeaderLogo>,
   ];
diff --git a/src-docs/src/views/collapsible_nav/collapsible_nav_group.tsx b/src-docs/src/views/collapsible_nav/collapsible_nav_group.tsx
index 4d337013ae..99eea40bbf 100644
--- a/src-docs/src/views/collapsible_nav/collapsible_nav_group.tsx
+++ b/src-docs/src/views/collapsible_nav/collapsible_nav_group.tsx
@@ -25,7 +25,7 @@ export default () => (
     <OuiCollapsibleNavGroup
       data-test-subj="TEST"
       title="Nav group"
-      iconType="logoElastic">
+      iconType="logoOUI">
       <OuiText size="s" color="subdued">
         <p>
           This is a nice group with a heading supplied via{' '}
@@ -38,7 +38,7 @@ export default () => (
       background="light"
       title="Nav group"
       isCollapsible={true}
-      iconType="logoElastic"
+      iconType="logoOUI"
       initialIsOpen={true}>
       <OuiText size="s" color="subdued">
         <p>
diff --git a/src-docs/src/views/header/header.js b/src-docs/src/views/header/header.js
index 171db8f535..09e55e50ae 100644
--- a/src-docs/src/views/header/header.js
+++ b/src-docs/src/views/header/header.js
@@ -41,7 +41,7 @@ import { htmlIdGenerator } from '../../../../src/services';
 export default () => {
   const renderLogo = () => (
     <OuiHeaderLogo
-      iconType="logoElastic"
+      iconType="logoOUI"
       href="#"
       onClick={(e) => e.preventDefault()}
       aria-label="Go to home page"
diff --git a/src-docs/src/views/header/header_elastic_pattern.js b/src-docs/src/views/header/header_elastic_pattern.js
index c56c488e98..4364e06422 100644
--- a/src-docs/src/views/header/header_elastic_pattern.js
+++ b/src-docs/src/views/header/header_elastic_pattern.js
@@ -283,7 +283,7 @@ export default ({ theme }) => {
         sections={[
           {
             items: [
-              <OuiHeaderLogo iconType="logoElastic" href="">
+              <OuiHeaderLogo iconType="logoOUI" href="">
                 Elastic
               </OuiHeaderLogo>,
               deploymentMenu,
diff --git a/src-docs/src/views/header/header_sections.js b/src-docs/src/views/header/header_sections.js
index a82f012fad..5c3edc111a 100644
--- a/src-docs/src/views/header/header_sections.js
+++ b/src-docs/src/views/header/header_sections.js
@@ -27,7 +27,7 @@ import {
 export default () => {
   const renderLogo = (
     <OuiHeaderLogo
-      iconType="logoElastic"
+      iconType="logoOUI"
       href="#"
       onClick={(e) => e.preventDefault()}
       aria-label="Go to home page"
diff --git a/src-docs/src/views/header/header_stacked.js b/src-docs/src/views/header/header_stacked.js
index 943ed86410..e77081519e 100644
--- a/src-docs/src/views/header/header_stacked.js
+++ b/src-docs/src/views/header/header_stacked.js
@@ -52,9 +52,7 @@ export default () => {
         position={isFixed ? 'fixed' : 'static'}
         sections={[
           {
-            items: [
-              <OuiHeaderLogo iconType="logoElastic">Elastic</OuiHeaderLogo>,
-            ],
+            items: [<OuiHeaderLogo iconType="logoOUI">Elastic</OuiHeaderLogo>],
             borders: 'none',
           },
           {
diff --git a/src-docs/src/views/icon/logos.js b/src-docs/src/views/icon/logos.js
index f8d3687a46..4fe687eef4 100644
--- a/src-docs/src/views/icon/logos.js
+++ b/src-docs/src/views/icon/logos.js
@@ -28,7 +28,7 @@ export const iconTypes = [
   'logoCode',
   'logoCloud',
   'logoCloudEnterprise',
-  'logoElastic',
+  'logoOUI',
   'logoElasticStack',
   'logoElasticsearch',
   'logoEnterpriseSearch',
diff --git a/src-docs/src/views/notification_event/notification_event_flexible.js b/src-docs/src/views/notification_event/notification_event_flexible.js
index 2bfa2eb07b..16ff1beaf3 100644
--- a/src-docs/src/views/notification_event/notification_event_flexible.js
+++ b/src-docs/src/views/notification_event/notification_event_flexible.js
@@ -51,7 +51,7 @@ const notificationEventsData = [
   {
     id: 'news',
     type: 'News',
-    iconType: 'logoElastic',
+    iconType: 'logoOUI',
     iconAriaLabel: 'Elastic',
     time: '3 min ago',
     badgeColor: 'accent',
diff --git a/src-docs/src/views/notification_event/notification_event_props_methods.js b/src-docs/src/views/notification_event/notification_event_props_methods.js
index 72c0418b1f..0ad7a0c436 100644
--- a/src-docs/src/views/notification_event/notification_event_props_methods.js
+++ b/src-docs/src/views/notification_event/notification_event_props_methods.js
@@ -39,7 +39,7 @@ export default () => {
           <div className="guideDemo__notificationEventHighlight">
             <CircleIndicator name="B" />
             <OuiIcon
-              type="logoElastic"
+              type="logoOUI"
               className="guideDemo__notificationEventIcon"
             />
           </div>
diff --git a/src-docs/src/views/notification_event/notifications_feed.js b/src-docs/src/views/notification_event/notifications_feed.js
index 26ea40c0a9..0c3f3f0f3e 100644
--- a/src-docs/src/views/notification_event/notifications_feed.js
+++ b/src-docs/src/views/notification_event/notifications_feed.js
@@ -52,7 +52,7 @@ const notificationEventsData = [
   {
     id: 'news-01',
     type: 'News',
-    iconType: 'logoElastic',
+    iconType: 'logoOUI',
     iconAriaLabel: 'Elastic',
     time: '6 min ago',
     badgeColor: 'accent',
diff --git a/src-docs/src/views/page/page.js b/src-docs/src/views/page/page.js
index a4deab5bbc..51d024762b 100644
--- a/src-docs/src/views/page/page.js
+++ b/src-docs/src/views/page/page.js
@@ -28,7 +28,7 @@ export default () => (
     <OuiPageSideBar>SideBar nav</OuiPageSideBar>
     <OuiPageBody>
       <OuiPageHeader
-        iconType="logoElastic"
+        iconType="logoOUI"
         pageTitle="Page title"
         rightSideItems={[
           <OuiButton fill>Add something</OuiButton>,
diff --git a/src-docs/src/views/page/page_bottom_bar.js b/src-docs/src/views/page/page_bottom_bar.js
index 43cf0fea4d..6585f66c54 100644
--- a/src-docs/src/views/page/page_bottom_bar.js
+++ b/src-docs/src/views/page/page_bottom_bar.js
@@ -34,7 +34,7 @@ export default ({ button = <></>, content, sideNav, bottomBar }) => {
           <OuiPageHeader
             bottomBorder
             restrictWidth
-            iconType="logoElastic"
+            iconType="logoOUI"
             pageTitle="Page title"
             rightSideItems={[button]}
           />
diff --git a/src-docs/src/views/page/page_bottom_bar_template.js b/src-docs/src/views/page/page_bottom_bar_template.js
index ad87317fa6..26e6c012d9 100644
--- a/src-docs/src/views/page/page_bottom_bar_template.js
+++ b/src-docs/src/views/page/page_bottom_bar_template.js
@@ -18,7 +18,7 @@ export default ({ button = <></>, content, sideNav, bottomBar }) => {
     <OuiPageTemplate
       pageSideBar={sideNav}
       pageHeader={{
-        iconType: 'logoElastic',
+        iconType: 'logoOUI',
         pageTitle: 'Page title',
         rightSideItems: [button],
       }}
diff --git a/src-docs/src/views/page/page_centered_content.js b/src-docs/src/views/page/page_centered_content.js
index 0db3d5011f..2d38ff0e68 100644
--- a/src-docs/src/views/page/page_centered_content.js
+++ b/src-docs/src/views/page/page_centered_content.js
@@ -29,7 +29,7 @@ export default ({ button = <></>, content, sideNav }) => (
     <OuiPageBody panelled>
       <OuiPageHeader
         restrictWidth
-        iconType="logoElastic"
+        iconType="logoOUI"
         pageTitle="Page title"
         rightSideItems={[button]}
       />
diff --git a/src-docs/src/views/page/page_centered_content_template.js b/src-docs/src/views/page/page_centered_content_template.js
index 7b565ace30..6ba5821153 100644
--- a/src-docs/src/views/page/page_centered_content_template.js
+++ b/src-docs/src/views/page/page_centered_content_template.js
@@ -19,7 +19,7 @@ export default ({ button = <></>, content, sideNav }) => (
     pageContentProps={{ paddingSize: 'none' }}
     pageSideBar={sideNav}
     pageHeader={{
-      iconType: 'logoElastic',
+      iconType: 'logoOUI',
       pageTitle: 'Page title',
       rightSideItems: [button],
     }}>
diff --git a/src-docs/src/views/page/page_custom_content.js b/src-docs/src/views/page/page_custom_content.js
index 0c81cb3a3d..6490a18aa5 100644
--- a/src-docs/src/views/page/page_custom_content.js
+++ b/src-docs/src/views/page/page_custom_content.js
@@ -26,7 +26,7 @@ export default ({ button = <></> }) => (
   <OuiPage paddingSize="l">
     <OuiPageBody>
       <OuiPageHeader
-        iconType="logoElastic"
+        iconType="logoOUI"
         pageTitle="Page title"
         rightSideItems={[button, <OuiButton>Do something</OuiButton>]}
         bottomBorder
diff --git a/src-docs/src/views/page/page_custom_content_template.js b/src-docs/src/views/page/page_custom_content_template.js
index fd56e7ce68..ff0d5df869 100644
--- a/src-docs/src/views/page/page_custom_content_template.js
+++ b/src-docs/src/views/page/page_custom_content_template.js
@@ -24,7 +24,7 @@ export default ({ button = <></> }) => (
     restrictWidth={false}
     template="empty"
     pageHeader={{
-      iconType: 'logoElastic',
+      iconType: 'logoOUI',
       pageTitle: 'Page title',
       rightSideItems: [button, <OuiButton>Do something</OuiButton>],
     }}>
diff --git a/src-docs/src/views/page/page_new.js b/src-docs/src/views/page/page_new.js
index ef5433a9c6..1c1c7c2a9c 100644
--- a/src-docs/src/views/page/page_new.js
+++ b/src-docs/src/views/page/page_new.js
@@ -29,7 +29,7 @@ export default ({ button = <></>, content, sideNav }) => (
     <OuiPageBody panelled>
       <OuiPageHeader
         restrictWidth
-        iconType="logoElastic"
+        iconType="logoOUI"
         pageTitle="Page title"
         rightSideItems={[button]}
         tabs={[{ label: 'Tab 1', isSelected: true }, { label: 'Tab 2' }]}
diff --git a/src-docs/src/views/page/page_restricting_width.js b/src-docs/src/views/page/page_restricting_width.js
index f40c8e9eb2..534226bf79 100644
--- a/src-docs/src/views/page/page_restricting_width.js
+++ b/src-docs/src/views/page/page_restricting_width.js
@@ -30,7 +30,7 @@ export default ({ button = <></>, content, sideNav }) => {
       <OuiPageBody panelled>
         <OuiPageHeader
           restrictWidth={'75%'}
-          iconType="logoElastic"
+          iconType="logoOUI"
           pageTitle="Page title"
           rightSideItems={[button]}
           description="Restricting the width to 75%."
diff --git a/src-docs/src/views/page/page_restricting_width_template.js b/src-docs/src/views/page/page_restricting_width_template.js
index 416eb69286..5bb5f77e0e 100644
--- a/src-docs/src/views/page/page_restricting_width_template.js
+++ b/src-docs/src/views/page/page_restricting_width_template.js
@@ -19,7 +19,7 @@ export default ({ button = <></>, content, sideNav }) => {
       pageSideBar={sideNav}
       restrictWidth="75%"
       pageHeader={{
-        iconType: 'logoElastic',
+        iconType: 'logoOUI',
         pageTitle: 'Page title',
         rightSideItems: [button],
         description: 'Restricting the width to 75%.',
diff --git a/src-docs/src/views/page/page_simple_empty_content.js b/src-docs/src/views/page/page_simple_empty_content.js
index 7020e65abf..e3a5626b73 100644
--- a/src-docs/src/views/page/page_simple_empty_content.js
+++ b/src-docs/src/views/page/page_simple_empty_content.js
@@ -24,7 +24,7 @@ export default ({ button = <></>, content }) => (
     <OuiPageBody>
       <OuiPageHeader
         restrictWidth
-        iconType="logoElastic"
+        iconType="logoOUI"
         pageTitle="Page title"
         rightSideItems={[button]}
         paddingSize="l"
diff --git a/src-docs/src/views/page/page_simple_empty_content_template.js b/src-docs/src/views/page/page_simple_empty_content_template.js
index 6518895fe6..33b5c1a2f7 100644
--- a/src-docs/src/views/page/page_simple_empty_content_template.js
+++ b/src-docs/src/views/page/page_simple_empty_content_template.js
@@ -18,7 +18,7 @@ export default ({ button = <></>, content }) => (
     template="centeredContent"
     pageContentProps={{ paddingSize: 'none' }}
     pageHeader={{
-      iconType: 'logoElastic',
+      iconType: 'logoOUI',
       pageTitle: 'Page title',
       rightSideItems: [button],
     }}>
diff --git a/src-docs/src/views/page/page_template.js b/src-docs/src/views/page/page_template.js
index 95d5b9c9a7..bf9727a19a 100644
--- a/src-docs/src/views/page/page_template.js
+++ b/src-docs/src/views/page/page_template.js
@@ -21,7 +21,7 @@ export default ({ button = <></>, content, sideNav }) => {
       pageSideBar={sideNav}
       bottomBar={showBottomBar ? 'Bottom bar' : undefined}
       pageHeader={{
-        iconType: 'logoElastic',
+        iconType: 'logoOUI',
         pageTitle: 'Page title',
         rightSideItems: [button],
         tabs: [
diff --git a/src-docs/src/views/tables/actions/actions.js b/src-docs/src/views/tables/actions/actions.js
index 99736ffac0..5a90f24ad1 100644
--- a/src-docs/src/views/tables/actions/actions.js
+++ b/src-docs/src/views/tables/actions/actions.js
@@ -183,7 +183,7 @@ export const Table = () => {
           {
             name: 'Elastic.co',
             description: 'Go to elastic.co',
-            icon: 'logoElastic',
+            icon: 'logoOUI',
             type: 'icon',
             href: 'https://elastic.co',
             target: '_blank',
diff --git a/src/components/header/__snapshots__/header_logo.test.tsx.snap b/src/components/header/__snapshots__/header_logo.test.tsx.snap
index da764f379b..5d3c01359e 100644
--- a/src/components/header/__snapshots__/header_logo.test.tsx.snap
+++ b/src/components/header/__snapshots__/header_logo.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`OuiHeaderLogo is rendered 1`] = `
   <span
     aria-label="Elastic"
     class="ouiHeaderLogo__icon"
-    data-ouiicon-type="logoElastic"
+    data-ouiicon-type="logoOUI"
   />
 </a>
 `;
@@ -24,7 +24,7 @@ exports[`OuiHeaderLogo renders href 1`] = `
   <span
     aria-label="Elastic"
     class="ouiHeaderLogo__icon"
-    data-ouiicon-type="logoElastic"
+    data-ouiicon-type="logoOUI"
   />
 </a>
 `;
@@ -38,7 +38,7 @@ exports[`OuiHeaderLogo renders href with rel 1`] = `
   <span
     aria-label="Elastic"
     class="ouiHeaderLogo__icon"
-    data-ouiicon-type="logoElastic"
+    data-ouiicon-type="logoOUI"
   />
 </a>
 `;
diff --git a/src/components/header/header_logo.tsx b/src/components/header/header_logo.tsx
index 027a8d15c9..f70de9bc21 100644
--- a/src/components/header/header_logo.tsx
+++ b/src/components/header/header_logo.tsx
@@ -54,7 +54,7 @@ export type OuiHeaderLogoProps = CommonProps &
   };
 
 export const OuiHeaderLogo: FunctionComponent<OuiHeaderLogoProps> = ({
-  iconType = 'logoElastic',
+  iconType = 'logoOUI',
   iconTitle = 'Elastic',
   href,
   rel,
diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap
index f0eda8f203..951f798e4a 100644
--- a/src/components/icon/__snapshots__/icon.test.tsx.snap
+++ b/src/components/icon/__snapshots__/icon.test.tsx.snap
@@ -4274,7 +4274,7 @@ exports[`OuiIcon props type logoDropwizard is rendered 1`] = `
 </svg>
 `;
 
-exports[`OuiIcon props type logoElastic is rendered 1`] = `
+exports[`OuiIcon props type logoOUI is rendered 1`] = `
 <svg
   aria-hidden="true"
   class="ouiIcon ouiIcon--medium ouiIcon-isLoaded"
diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx
index e5a68770af..29058ea30e 100644
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@ -237,7 +237,7 @@ const typeToPathMap = {
   logoCouchbase: 'logo_couchbase',
   logoDocker: 'logo_docker',
   logoDropwizard: 'logo_dropwizard',
-  logoElastic: 'logo_elastic',
+  logoOUI: 'logo_oui',
   logoElasticsearch: 'logo_elasticsearch',
   logoElasticStack: 'logo_elastic_stack',
   logoEnterpriseSearch: 'logo_enterprise_search',
diff --git a/src/components/loading/__snapshots__/loading_logo.test.tsx.snap b/src/components/loading/__snapshots__/loading_logo.test.tsx.snap
index f9e730a271..8249ddb82e 100644
--- a/src/components/loading/__snapshots__/loading_logo.test.tsx.snap
+++ b/src/components/loading/__snapshots__/loading_logo.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`OuiLoadingLogo logo is rendered 1`] = `
     class="ouiLoadingLogo__icon"
   >
     <span
-      data-ouiicon-type="logoElastic"
+      data-ouiicon-type="logoOUI"
     />
   </span>
 </span>
diff --git a/src/components/loading/loading_elastic.tsx b/src/components/loading/loading_elastic.tsx
index 72cd35c491..964560a070 100644
--- a/src/components/loading/loading_elastic.tsx
+++ b/src/components/loading/loading_elastic.tsx
@@ -57,7 +57,7 @@ export const OuiLoadingElastic: FunctionComponent<
 
   return (
     <span className={classes} {...rest}>
-      <OuiIcon type="logoElastic" size={size} />
+      <OuiIcon type="logoOUI" size={size} />
     </span>
   );
 };
diff --git a/src/components/loading/loading_logo.test.tsx b/src/components/loading/loading_logo.test.tsx
index 9140c6d3f7..c1f720f5ff 100644
--- a/src/components/loading/loading_logo.test.tsx
+++ b/src/components/loading/loading_logo.test.tsx
@@ -43,7 +43,7 @@ describe('OuiLoadingLogo', () => {
 
   test('logo is rendered', () => {
     const component = render(
-      <OuiLoadingLogo logo="logoElastic" {...requiredProps} />
+      <OuiLoadingLogo logo="logoOUI" {...requiredProps} />
     );
 
     expect(component).toMatchSnapshot();
diff --git a/src/themes/themes.ts b/src/themes/themes.ts
index d467dc0b0f..94b1bd5172 100644
--- a/src/themes/themes.ts
+++ b/src/themes/themes.ts
@@ -42,14 +42,6 @@ export const OUI_THEMES: OUI_THEME[] = [
     text: 'Dark',
     value: 'dark',
   },
-  {
-    text: 'Cascadia: Light',
-    value: 'cascadia-light',
-  },
-  {
-    text: 'Cascadia: Dark',
-    value: 'cascadia-dark',
-  },
 ];
 
 /* OUI -> EUI Aliases */