diff --git a/src/patternfly/components/DataList/data-list.scss b/src/patternfly/components/DataList/data-list.scss
index 7cc7e88d7c..16b4402c23 100644
--- a/src/patternfly/components/DataList/data-list.scss
+++ b/src/patternfly/components/DataList/data-list.scss
@@ -405,6 +405,8 @@
 
 // toggle icon rotate
 .#{$data-list}__toggle-icon {
+  @include pf-v5-mirror-inline-on-rtl;
+
   height: var(--#{$data-list}__toggle-icon--Height);
   pointer-events: none;
   transition: var(--#{$data-list}__toggle-icon--Transition);
diff --git a/src/patternfly/components/NotificationBadge/notification-badge.hbs b/src/patternfly/components/NotificationBadge/notification-badge.hbs
index d2e5f0d1e0..6396991204 100644
--- a/src/patternfly/components/NotificationBadge/notification-badge.hbs
+++ b/src/patternfly/components/NotificationBadge/notification-badge.hbs
@@ -14,6 +14,9 @@
     {{#if notification-badge--attribute}}
       {{{notification-badge--attribute}}}
     {{/if}}>
+    {{!-- TODO in Breaking Change: Add a wrapper element around the icon to follow
+          how other components' markup is structured for icons
+     --}}
     <i class="
       {{~#if notification-badge--IsTask}}
         pf-v5-pficon-task