diff --git a/src/App/ComponentsDocumentation/components/ActionList/__snapshots__/index.test.js.snap b/src/App/ComponentsDocumentation/components/ActionList/__snapshots__/index.test.js.snap
index 11b8ba9208..27bff24301 100644
--- a/src/App/ComponentsDocumentation/components/ActionList/__snapshots__/index.test.js.snap
+++ b/src/App/ComponentsDocumentation/components/ActionList/__snapshots__/index.test.js.snap
@@ -682,7 +682,7 @@ exports[`Components: ActionList renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-error alert-icon"
+        className="at-exclamation-triangle alert-icon"
       />
       <p>
         <b>
diff --git a/src/App/ComponentsDocumentation/components/ActionList/index.js b/src/App/ComponentsDocumentation/components/ActionList/index.js
index 78dc203c8e..8b6ea1a31d 100644
--- a/src/App/ComponentsDocumentation/components/ActionList/index.js
+++ b/src/App/ComponentsDocumentation/components/ActionList/index.js
@@ -87,7 +87,7 @@ const ActionList = () => {
 		<DocContainer>
 			<Alert
 				type="danger"
-				icon="error"
+				icon="exclamation-triangle"
 				text={
 					<p>
 						<b>Deprecated:</b> Be aware, this component will not be maintained
diff --git a/src/App/ComponentsDocumentation/components/Charts/__snapshots__/index.test.js.snap b/src/App/ComponentsDocumentation/components/Charts/__snapshots__/index.test.js.snap
index 0bdf55fc7d..7321bddbd5 100644
--- a/src/App/ComponentsDocumentation/components/Charts/__snapshots__/index.test.js.snap
+++ b/src/App/ComponentsDocumentation/components/Charts/__snapshots__/index.test.js.snap
@@ -2507,7 +2507,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-error alert-icon"
+        className="at-exclamation-triangle alert-icon"
       />
       <p>
         <b>
@@ -3316,7 +3316,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
@@ -3640,7 +3640,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
@@ -3868,7 +3868,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
@@ -4167,7 +4167,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
@@ -4494,7 +4494,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
@@ -4847,7 +4847,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
@@ -5086,7 +5086,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
@@ -5313,7 +5313,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
@@ -5636,7 +5636,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
@@ -5893,7 +5893,7 @@ exports[`Dashboard: Charts renders 1`] = `
 
       <i
         aria-hidden="true"
-        className="at-info alert-icon"
+        className="at-info-circle alert-icon"
       />
       <p>
         <b>
diff --git a/src/App/ComponentsDocumentation/components/Charts/index.js b/src/App/ComponentsDocumentation/components/Charts/index.js
index 397026f965..dc95736600 100644
--- a/src/App/ComponentsDocumentation/components/Charts/index.js
+++ b/src/App/ComponentsDocumentation/components/Charts/index.js
@@ -9,7 +9,7 @@ import Alert from "@components/Alert";
 const AccessibilityAlert = () => (
 	<Alert
 		type="informative"
-		icon="info"
+		icon="info-circle"
 		className="mt-3"
 		text={
 			<p>
@@ -838,7 +838,7 @@ const Charts = () => (
 	<DocContainer>
 		<Alert
 			type="danger"
-			icon="error"
+			icon="exclamation-triangle"
 			text={
 				<p>
 					<b>Deprecated:</b> Be aware, this component will not be maintained
diff --git a/src/App/ComponentsDocumentation/components/Nav/index.js b/src/App/ComponentsDocumentation/components/Nav/index.js
index c035989f45..ab7a41eb3e 100644
--- a/src/App/ComponentsDocumentation/components/Nav/index.js
+++ b/src/App/ComponentsDocumentation/components/Nav/index.js
@@ -87,7 +87,7 @@ const Nav = () => {
 		<DocContainer>
 			<Alert
 				type="danger"
-				icon="error"
+				icon="exclamation-triangle"
 				text={
 					<p>
 						<b>Deprecated:</b> Be aware, this component will not be maintained
diff --git a/src/App/ComponentsDocumentation/components/Select/index.js b/src/App/ComponentsDocumentation/components/Select/index.js
index ffff2a27b1..b01e3c69ec 100644
--- a/src/App/ComponentsDocumentation/components/Select/index.js
+++ b/src/App/ComponentsDocumentation/components/Select/index.js
@@ -38,7 +38,7 @@ const WhenToUse = () => (
 					</div>
 					{text}
 				</React.Fragment>
-			)
+			),
 		)}
 	</>
 );
@@ -67,7 +67,7 @@ const Overview = () => (
 					Select the appropriate styling.
 				</p>
 			}
-			icon="info"
+			icon="info-circle"
 		/>
 
 		{/*
diff --git a/src/App/ComponentsDocumentation/components/Toast/constants.js b/src/App/ComponentsDocumentation/components/Toast/constants.js
index 1a30a1a701..1362ce3bcf 100644
--- a/src/App/ComponentsDocumentation/components/Toast/constants.js
+++ b/src/App/ComponentsDocumentation/components/Toast/constants.js
@@ -81,7 +81,7 @@ const AlertBox = () => (
 	<Alert
 		id="toast-overview-alert"
 		type="informative"
-		icon={"info"}
+		icon={"info-circle"}
 		text={
 			<p>
 				<b>Static code example</b> The code viewer shows an example on how to
diff --git a/src/App/Home/index.js b/src/App/Home/index.js
index 95737afaf1..9543a5b6cd 100644
--- a/src/App/Home/index.js
+++ b/src/App/Home/index.js
@@ -27,8 +27,6 @@ const Home = () => {
 				<header>
 					<span className="dg-title-small d-block m-0">Welcome to the</span>
 					<span className="dg-title-big my-0">{brandTitle} Design Guide</span>
-					<i class="at-home" aria-hidden="true"></i>
-					<i class="at-soccer-football-field" aria-hidden="true"></i>
 				</header>
 
 				<div className="dg-version-indicator">
@@ -150,7 +148,7 @@ const Home = () => {
 					</span>
 					<Alert
 						type="informative"
-						icon="info"
+						icon="info-circle"
 						text={
 							<p>
 								<b>Versioning:</b>
diff --git a/src/App/Patterns/components/LoginForm/index.js b/src/App/Patterns/components/LoginForm/index.js
index 73e93b63e5..faedeb990e 100644
--- a/src/App/Patterns/components/LoginForm/index.js
+++ b/src/App/Patterns/components/LoginForm/index.js
@@ -75,7 +75,7 @@ const LoginForm = ({
 			{alternativeLogins && <AlternativeLogins />}
 			{error && (
 				<Alert
-					icon="cancel"
+					icon="xmark-circle"
 					type="danger"
 					text={
 						<p>
diff --git a/src/App/Patterns/content/Forms/__snapshots__/index.test.js.snap b/src/App/Patterns/content/Forms/__snapshots__/index.test.js.snap
index cfd0b1eaa4..120b97fb64 100644
--- a/src/App/Patterns/content/Forms/__snapshots__/index.test.js.snap
+++ b/src/App/Patterns/content/Forms/__snapshots__/index.test.js.snap
@@ -1543,7 +1543,7 @@ exports[`Forms: index renders 1`] = `
 
                 <i
                   aria-hidden="true"
-                  className="at-cancel alert-icon"
+                  className="at-xmark-circle alert-icon"
                 />
                 <p>
                   <b>
diff --git a/src/App/docutils/DeprecatedComponentAlert/__snapshots__/index.test.js.snap b/src/App/docutils/DeprecatedComponentAlert/__snapshots__/index.test.js.snap
index e4e3e9cd33..be292acf34 100644
--- a/src/App/docutils/DeprecatedComponentAlert/__snapshots__/index.test.js.snap
+++ b/src/App/docutils/DeprecatedComponentAlert/__snapshots__/index.test.js.snap
@@ -8,7 +8,7 @@ exports[`Utilities: DeprecatedComponentAlert renders 1`] = `
 
   <i
     aria-hidden="true"
-    className="at-undefined alert-icon"
+    className="at-exclamation-triangle alert-icon"
   />
   
 
diff --git a/src/App/docutils/DeprecatedComponentAlert/index.js b/src/App/docutils/DeprecatedComponentAlert/index.js
index fb3b606ea5..11c56e8bd0 100644
--- a/src/App/docutils/DeprecatedComponentAlert/index.js
+++ b/src/App/docutils/DeprecatedComponentAlert/index.js
@@ -1,8 +1,9 @@
 import React from "react";
 import Alert from "@components/Alert";
 
+// TODO: is it actually used anywhere? else remove
 const DeprecatedComponentAlert = () => (
-	<Alert type="danger">
+	<Alert type="danger" icon="exclamation-triangle">
 		<h3 className="text-danger">Component deprecated!</h3>
 		<p>This component has been deprecated and should not be used!</p>
 	</Alert>
diff --git a/src/App/docutils/ExperimentalComponentAlert/__snapshots__/index.test.js.snap b/src/App/docutils/ExperimentalComponentAlert/__snapshots__/index.test.js.snap
index 013cb8383d..afcadb5829 100644
--- a/src/App/docutils/ExperimentalComponentAlert/__snapshots__/index.test.js.snap
+++ b/src/App/docutils/ExperimentalComponentAlert/__snapshots__/index.test.js.snap
@@ -8,7 +8,7 @@ exports[`Utilities: ExperimentalComponentAlert renders 1`] = `
 
   <i
     aria-hidden="true"
-    className="at-undefined alert-icon"
+    className="at-exclamation-triangle alert-icon"
   />
   
 
diff --git a/src/App/docutils/ExperimentalComponentAlert/index.js b/src/App/docutils/ExperimentalComponentAlert/index.js
index 291e8d82e3..3dd09e6bb5 100644
--- a/src/App/docutils/ExperimentalComponentAlert/index.js
+++ b/src/App/docutils/ExperimentalComponentAlert/index.js
@@ -1,8 +1,9 @@
 import React from "react";
 import Alert from "@components/Alert";
 
+// TODO: is it actually used anywhere? else remove
 const ExperimentalComponentAlert = () => (
-	<Alert type="danger">
+	<Alert type="danger" icon="exclamation-triangle">
 		<h3 className="text-danger">Component under development!</h3>
 		<p>This component is still under development and is subject to change.</p>
 	</Alert>