diff --git a/packages/ui-color-picker/src/ColorPicker/index.tsx b/packages/ui-color-picker/src/ColorPicker/index.tsx
index 55cbfb2872..3cf3c41d00 100644
--- a/packages/ui-color-picker/src/ColorPicker/index.tsx
+++ b/packages/ui-color-picker/src/ColorPicker/index.tsx
@@ -390,7 +390,7 @@ class ColorPicker extends Component<ColorPickerProps, ColorPickerState> {
         <span css={styles?.label}>{label}</span>
         <span>
           <Tooltip renderTip={tooltip}>
-            <IconInfoLine tabIndex={-1} />
+            <IconInfoLine aria-hidden={false} />
           </Tooltip>
         </span>
       </span>
diff --git a/packages/ui-svg-images/src/InlineSVG/index.tsx b/packages/ui-svg-images/src/InlineSVG/index.tsx
index c889436ee9..6b21220ba9 100644
--- a/packages/ui-svg-images/src/InlineSVG/index.tsx
+++ b/packages/ui-svg-images/src/InlineSVG/index.tsx
@@ -163,7 +163,6 @@ class InlineSVG extends Component<InlineSVGProps> {
     return (
       <svg
         {...parseAttributes(src)}
-        {...omitProps(this.props, InlineSVG.allowedProps, ['inline'])}
         style={{
           ...style,
           width,
@@ -173,6 +172,7 @@ class InlineSVG extends Component<InlineSVGProps> {
         height={height}
         aria-hidden={title ? undefined : 'true'}
         aria-labelledby={this.labelledBy}
+        {...omitProps(this.props, InlineSVG.allowedProps, ['inline'])}
         role={this.role}
         focusable={focusable ? 'true' : 'false'}
         css={styles?.inlineSVG}