diff --git a/packages/styles/stories/Components/object-status/clickable-object-status.example.html b/packages/styles/stories/Components/object-status/clickable-object-status.example.html
index 8ec4dab32a..e91f260ed2 100644
--- a/packages/styles/stories/Components/object-status/clickable-object-status.example.html
+++ b/packages/styles/stories/Components/object-status/clickable-object-status.example.html
@@ -1,19 +1,19 @@
 <h3>Regular State</h3>
 <div class="fddocs-container">
     <a href="#"  class="fd-object-status fd-object-status--negative fd-object-status--link">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </a>
     <a href="#"  class="fd-object-status fd-object-status--critical fd-object-status--link">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </a>
     <a href="#"class="fd-object-status fd-object-status--positive fd-object-status--link">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </a>
     <span role="button" class="fd-object-status fd-object-status--informative fd-object-status--link" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Info</span>
     </span>
     <span role="button" class="fd-object-status fd-object-status--link" tabindex="0">
@@ -49,19 +49,19 @@ <h3>Regular State</h3>
 <h3>Hover State</h3>
 <div class="fddocs-container">
     <a href="#"  class="fd-object-status fd-object-status--negative fd-object-status--link is-hover">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </a>
     <a href="#"  class="fd-object-status fd-object-status--critical fd-object-status--link is-hover">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </a>
     <a href="#"class="fd-object-status fd-object-status--positive fd-object-status--link is-hover">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </a>
     <span role="button" class="fd-object-status fd-object-status--informative fd-object-status--link is-hover" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Info</span>
     </span>
     <span role="button" class="fd-object-status fd-object-status--link is-hover" tabindex="0">
@@ -97,19 +97,19 @@ <h3>Hover State</h3>
 <h3>Down State</h3>
 <div class="fddocs-container">
     <a href="#"  class="fd-object-status fd-object-status--negative fd-object-status--link is-active">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </a>
     <a href="#"  class="fd-object-status fd-object-status--critical fd-object-status--link is-active">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </a>
     <a href="#"class="fd-object-status fd-object-status--positive fd-object-status--link is-active">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </a>
     <span role="button" class="fd-object-status fd-object-status--informative fd-object-status--link is-active" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Info</span>
     </span>
     <span role="button" class="fd-object-status fd-object-status--link is-active" tabindex="0">
@@ -145,19 +145,19 @@ <h3>Down State</h3>
 <h3>Visited State</h3>
 <div class="fddocs-container">
     <a href="#"  class="fd-object-status fd-object-status--negative fd-object-status--link is-visited">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </a>
     <a href="#"  class="fd-object-status fd-object-status--critical fd-object-status--link is-visited">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </a>
     <a href="#"class="fd-object-status fd-object-status--positive fd-object-status--link is-visited">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </a>
     <span role="button" class="fd-object-status fd-object-status--informative fd-object-status--link is-visited" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Info</span>
     </span>
     <span role="button" class="fd-object-status fd-object-status--link is-visited" tabindex="0">
@@ -193,19 +193,19 @@ <h3>Visited State</h3>
 <h3>Focus State</h3>
 <div class="fddocs-container">
     <a href="#"  class="fd-object-status fd-object-status--negative fd-object-status--link is-focus">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </a>
     <a href="#"  class="fd-object-status fd-object-status--critical fd-object-status--link is-focus">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </a>
     <a href="#"class="fd-object-status fd-object-status--positive fd-object-status--link is-focus">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </a>
     <span role="button" class="fd-object-status fd-object-status--informative fd-object-status--link is-focus" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Info</span>
     </span>
     <span role="button" class="fd-object-status fd-object-status--link is-focus" tabindex="0">
diff --git a/packages/styles/stories/Components/object-status/icon-and-text.example.html b/packages/styles/stories/Components/object-status/icon-and-text.example.html
index 557f3b5900..59b89ba2c2 100644
--- a/packages/styles/stories/Components/object-status/icon-and-text.example.html
+++ b/packages/styles/stories/Components/object-status/icon-and-text.example.html
@@ -1,18 +1,18 @@
 <div class="fddocs-container">
     <span class="fd-object-status fd-object-status--negative">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
     <span class="fd-object-status fd-object-status--critical">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </span>
     <span class="fd-object-status fd-object-status--positive">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--informative">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Info</span>
     </span>
     <span class="fd-object-status fd-object-status--neutral">
diff --git a/packages/styles/stories/Components/object-status/icon.example.html b/packages/styles/stories/Components/object-status/icon.example.html
index 324433b44b..a9fc140250 100644
--- a/packages/styles/stories/Components/object-status/icon.example.html
+++ b/packages/styles/stories/Components/object-status/icon.example.html
@@ -1,14 +1,14 @@
 <div class="fddocs-container">
     <span class="fd-object-status fd-object-status--negative">
-        <i class="fd-object-status__icon sap-icon--message-error" aria-label="Negative"></i>
+        <i class="fd-object-status__icon sap-icon--error" aria-label="Negative"></i>
     </span>
     <span class="fd-object-status fd-object-status--critical">
-        <i class="fd-object-status__icon sap-icon--message-warning" aria-label="Warning"></i>
+        <i class="fd-object-status__icon sap-icon--alert" aria-label="Warning"></i>
     </span>
     <span class="fd-object-status fd-object-status--positive">
-        <i class="fd-object-status__icon sap-icon--message-success" aria-label="Correct"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" aria-label="Correct"></i>
     </span>
     <span class="fd-object-status fd-object-status--informative">
-        <i class="fd-object-status__icon sap-icon--message-information" aria-label="More information"></i>
+        <i class="fd-object-status__icon sap-icon--information" aria-label="More information"></i>
     </span>
 </div>
diff --git a/packages/styles/stories/Components/object-status/inverted-states.example.html b/packages/styles/stories/Components/object-status/inverted-states.example.html
index 49dc808c5a..ca4bb4838a 100644
--- a/packages/styles/stories/Components/object-status/inverted-states.example.html
+++ b/packages/styles/stories/Components/object-status/inverted-states.example.html
@@ -4,19 +4,19 @@ <h4>Regular</h4>
         <span class="fd-object-status__text">Neutral</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--informative" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Information</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--critical" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Caution</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--positive" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--negative" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
 </div>
@@ -27,19 +27,19 @@ <h4>Hover</h4>
         <span class="fd-object-status__text">Neutral</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--informative is-hover" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Information</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--critical is-hover" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Caution</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--positive is-hover" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--negative is-hover" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
 </div>
@@ -50,19 +50,19 @@ <h4>Down</h4>
         <span class="fd-object-status__text">Neutral</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--informative is-active" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Information</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--critical is-active" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Caution</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--positive is-active" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--negative is-active" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
 </div>
@@ -73,19 +73,19 @@ <h4>Regular, Focus</h4>
         <span class="fd-object-status__text">Neutral</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--informative is-focus" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Information</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--critical is-focus" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Caution</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--positive is-focus" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--negative is-focus" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
 </div>
@@ -96,19 +96,19 @@ <h4>Hover, Focus</h4>
         <span class="fd-object-status__text">Neutral</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--informative is-hover is-focus" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Information</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--critical is-hover is-focus" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Caution</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--positive is-hover is-focus" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--negative is-hover is-focus" tabindex="0">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
 </div>
diff --git a/packages/styles/stories/Components/object-status/inverted.example.html b/packages/styles/stories/Components/object-status/inverted.example.html
index 5090f9ba9a..5d1522f2d1 100644
--- a/packages/styles/stories/Components/object-status/inverted.example.html
+++ b/packages/styles/stories/Components/object-status/inverted.example.html
@@ -15,22 +15,22 @@
         <span class="fd-object-status__text">Inverted Neutral</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--negative">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--negative">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--critical">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--positive">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--informative">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Informative</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted">
@@ -57,22 +57,22 @@ <h4>Large Inverted Object Status</h4>
         <span class="fd-object-status__text">Inverted Neutral</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--negative fd-object-status--large fd-object-status--icon-only">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--negative fd-object-status--large">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--critical fd-object-status--large">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--positive fd-object-status--large">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--informative fd-object-status--large">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Informative</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--large">
diff --git a/packages/styles/stories/Components/object-status/large-object-status.example.html b/packages/styles/stories/Components/object-status/large-object-status.example.html
index 2add961696..f9933d10ad 100644
--- a/packages/styles/stories/Components/object-status/large-object-status.example.html
+++ b/packages/styles/stories/Components/object-status/large-object-status.example.html
@@ -1,18 +1,18 @@
 <div class="fddocs-container">
     <span class="fd-object-status fd-object-status--large fd-object-status--negative">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
     <span class="fd-object-status fd-object-status--large fd-object-status--critical">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </span>
     <span class="fd-object-status fd-object-status--large fd-object-status--positive">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--large fd-object-status--informative">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Info</span>
     </span>
     <span class="fd-object-status fd-object-status--large">
diff --git a/packages/styles/stories/Components/object-status/primary.example.html b/packages/styles/stories/Components/object-status/primary.example.html
index 578211101d..551fe11b64 100644
--- a/packages/styles/stories/Components/object-status/primary.example.html
+++ b/packages/styles/stories/Components/object-status/primary.example.html
@@ -1,18 +1,18 @@
 <div class="fddocs-container">
     <span class="fd-object-status fd-object-status--negative">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Negative</span>
     </span>
     <span class="fd-object-status fd-object-status--critical">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Critical</span>
     </span>
     <span class="fd-object-status fd-object-status--positive">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive</span>
     </span>
     <span class="fd-object-status fd-object-status--informative">
-        <i class="fd-object-status__icon sap-icon--message-information" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--information" role="presentation"></i>
         <span class="fd-object-status__text">Info</span>
     </span>
 </div>
diff --git a/packages/styles/stories/Components/object-status/truncate-example.example.html b/packages/styles/stories/Components/object-status/truncate-example.example.html
index f4f13a931a..a36581a45c 100644
--- a/packages/styles/stories/Components/object-status/truncate-example.example.html
+++ b/packages/styles/stories/Components/object-status/truncate-example.example.html
@@ -1,17 +1,17 @@
 <div class="fddocs-container">
     <span class="fd-object-status fd-object-status--negative fd-object-status--truncate" style="max-width: 15rem;">
-        <i class="fd-object-status__icon sap-icon--message-error" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--error" role="presentation"></i>
         <span class="fd-object-status__text">Default behaviour of Object Status with very long text. The text goes on multiple lines.</span>
     </span>
     <span class="fd-object-status fd-object-status--critical fd-object-status--truncate" style="max-width: 15rem;">
-        <i class="fd-object-status__icon sap-icon--message-warning" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--alert" role="presentation"></i>
         <span class="fd-object-status__text">Object Status with text truncation with ellipsis</span>
     </span>
     <span class="fd-object-status fd-object-status--negative fd-object-status--inverted fd-object-status--truncate" style="max-width: 15rem;">
         <span class="fd-object-status__text">Inverted Negative with very, very long text which truncates</span>
     </span>
     <span class="fd-object-status fd-object-status--large fd-object-status--positive fd-object-status--truncate" style="max-width: 15rem;">
-        <i class="fd-object-status__icon sap-icon--message-success" role="presentation"></i>
+        <i class="fd-object-status__icon sap-icon--sys-enter-2" role="presentation"></i>
         <span class="fd-object-status__text">Positive with very, very long text which truncates</span>
     </span>
     <span class="fd-object-status fd-object-status--inverted fd-object-status--link fd-object-status--indication-8 fd-object-status--truncate" tabindex="0" style="max-width: 15rem;">