diff --git a/elements/rh-navigation-primary/demo/color-context.html b/elements/rh-navigation-primary/demo/color-context.html
index 650a06f029..1497809448 100644
--- a/elements/rh-navigation-primary/demo/color-context.html
+++ b/elements/rh-navigation-primary/demo/color-context.html
@@ -69,7 +69,7 @@
     </rh-navigation-primary-item>
 
     <rh-navigation-primary-item slot="dropdowns" variant="dropdown">
-      <rh-avatar slot="icon" plain layout="inline"></rh-avatar>
+      <rh-icon slot="icon" icon="profile" set="ui"></rh-icon>
       <span slot="summary">My Red Hat</span>
       <!-- Mock content -->
       <div class="grid">
diff --git a/elements/rh-navigation-primary/demo/links-as-top-level.html b/elements/rh-navigation-primary/demo/links-as-top-level.html
index fd31a67fdd..a5d19722be 100644
--- a/elements/rh-navigation-primary/demo/links-as-top-level.html
+++ b/elements/rh-navigation-primary/demo/links-as-top-level.html
@@ -19,7 +19,6 @@
     <a href="#partners">Partners</a>
   </rh-navigation-primary-item>
 
-
   <rh-navigation-primary-item slot="event">
     <a href="#summit">
       <svg width="64" height="35" viewBox="0 0 64 35" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -64,7 +63,7 @@
   </rh-navigation-primary-item>
 
   <rh-navigation-primary-item slot="dropdowns" variant="dropdown">
-    <rh-avatar slot="icon" plain layout="inline"></rh-avatar>
+    <rh-icon slot="icon" icon="profile" set="ui"></rh-icon>
     <span slot="summary">My Red Hat</span>
     <!-- Mock content -->
     <div class="grid">
diff --git a/elements/rh-navigation-primary/demo/not-defined.html b/elements/rh-navigation-primary/demo/not-defined.html
index 69bb902d40..471589f107 100644
--- a/elements/rh-navigation-primary/demo/not-defined.html
+++ b/elements/rh-navigation-primary/demo/not-defined.html
@@ -68,7 +68,7 @@
   </rh-navigation-primary-item>
 
     <rh-navigation-primary-item slot="dropdowns" variant="dropdown">
-      <rh-avatar slot="icon" plain layout="inline"></rh-avatar>
+      <rh-icon slot="icon" icon="profile" set="ui"></rh-icon>
       <span slot="summary">My Red Hat</span>
       <!-- Mock content -->
       <div class="grid">
diff --git a/elements/rh-navigation-primary/demo/rh-navigation-primary.html b/elements/rh-navigation-primary/demo/rh-navigation-primary.html
index fed4326df5..ebc36ec18a 100644
--- a/elements/rh-navigation-primary/demo/rh-navigation-primary.html
+++ b/elements/rh-navigation-primary/demo/rh-navigation-primary.html
@@ -254,7 +254,7 @@ <h2>Recommendations for you</h2>
   </rh-navigation-primary-item>
 
   <rh-navigation-primary-item slot="dropdowns" variant="dropdown">
-    <rh-avatar slot="icon" plain layout="inline"></rh-avatar>
+    <rh-icon slot="icon" icon="profile" set="ui"></rh-icon>
     <span slot="summary">My Red Hat</span>
     <!-- Mock content -->
     <div class="grid">
diff --git a/elements/rh-navigation-primary/demo/right-to-left.html b/elements/rh-navigation-primary/demo/right-to-left.html
index f0cf6df800..11570c867a 100644
--- a/elements/rh-navigation-primary/demo/right-to-left.html
+++ b/elements/rh-navigation-primary/demo/right-to-left.html
@@ -284,9 +284,7 @@ <h2>המלצות מותאמות אישית</h2>
 
     <rh-navigation-primary-item slot="dropdowns"
                                 variant="dropdown">
-      <rh-avatar slot="icon"
-                 plain
-                 layout="inline"></rh-avatar>
+      <rh-icon slot="icon" icon="profile" set="ui"></rh-icon>
       <span slot="summary">My Red Hat</span>
       <!-- Mock content -->
       <div class="grid">
diff --git a/elements/rh-navigation-primary/demo/translation.html b/elements/rh-navigation-primary/demo/translation.html
index daab753523..70b7f1f953 100644
--- a/elements/rh-navigation-primary/demo/translation.html
+++ b/elements/rh-navigation-primary/demo/translation.html
@@ -67,7 +67,7 @@
   </rh-navigation-primary-item>
 
   <rh-navigation-primary-item slot="dropdowns" variant="dropdown">
-    <rh-avatar slot="icon" plain layout="inline"></rh-avatar>
+    <rh-icon slot="icon" icon="profile" set="ui"></rh-icon>
     <span slot="summary">My Red Hat</span>
     <!-- Mock content -->
     <div class="grid">