diff --git a/Composer/packages/extensions/obiformeditor/__tests__/Form/ArrayFieldTemplate/ObjectArray.test.tsx b/Composer/packages/extensions/obiformeditor/__tests__/Form/ArrayFieldTemplate/ObjectArray.test.tsx
index cebc7aa97b..9390497bfc 100644
--- a/Composer/packages/extensions/obiformeditor/__tests__/Form/ArrayFieldTemplate/ObjectArray.test.tsx
+++ b/Composer/packages/extensions/obiformeditor/__tests__/Form/ArrayFieldTemplate/ObjectArray.test.tsx
@@ -38,10 +38,10 @@ describe('<ObjectArray />', () => {
   });
 
   it('renders a DescriptionField in tooltip', async () => {
-    const { baseElement, findAllByRole } = renderDefault();
-    const [icon] = await findAllByRole('presentation');
+    const { baseElement } = renderDefault();
+    const icon = baseElement.querySelector('[data-icon-name="Unknown"]');
 
-    fireEvent.mouseOver(icon);
+    if (icon !== null) fireEvent.mouseOver(icon);
 
     expect(baseElement).toHaveTextContent('My array description.');
   });
diff --git a/Composer/packages/extensions/obiformeditor/__tests__/Form/ArrayFieldTemplate/StringArray.test.tsx b/Composer/packages/extensions/obiformeditor/__tests__/Form/ArrayFieldTemplate/StringArray.test.tsx
index ee26804c85..061b7ae2a8 100644
--- a/Composer/packages/extensions/obiformeditor/__tests__/Form/ArrayFieldTemplate/StringArray.test.tsx
+++ b/Composer/packages/extensions/obiformeditor/__tests__/Form/ArrayFieldTemplate/StringArray.test.tsx
@@ -38,10 +38,10 @@ describe('<StringArray />', () => {
   });
 
   it('renders a DescriptionField in tooltip', async () => {
-    const { baseElement, findAllByRole } = renderDefault();
-    const [icon] = await findAllByRole('presentation');
+    const { baseElement } = renderDefault();
+    const icon = baseElement.querySelector('[data-icon-name="Unknown"]');
 
-    fireEvent.mouseOver(icon);
+    if (icon !== null) fireEvent.mouseOver(icon);
 
     expect(baseElement).toHaveTextContent('My array description.');
   });
diff --git a/Composer/packages/extensions/obiformeditor/src/Form/widgets/WidgetLabel.tsx b/Composer/packages/extensions/obiformeditor/src/Form/widgets/WidgetLabel.tsx
index 7e3e33d079..5a90500734 100644
--- a/Composer/packages/extensions/obiformeditor/src/Form/widgets/WidgetLabel.tsx
+++ b/Composer/packages/extensions/obiformeditor/src/Form/widgets/WidgetLabel.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 import { DirectionalHint, TooltipHost, TooltipDelay } from 'office-ui-fabric-react/lib/Tooltip';
-import { IconButton } from 'office-ui-fabric-react/lib/Button';
+import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import { Label } from 'office-ui-fabric-react/lib/Label';
 import { NeutralColors } from '@uifabric/fluent-theme';
 
@@ -50,18 +50,27 @@ const DescriptionCallout: React.FC<DescriptionCalloutProps> = props => {
       styles={{ root: { display: 'flex', alignItems: 'center' } }}
       id={`${id}-description`}
     >
-      <IconButton
-        iconProps={{
-          iconName: 'Unknown',
-        }}
-        styles={{
-          root: { width: '20px', minWidth: '20px', height: '20px' },
-          rootHovered: { backgroundColor: 'transparent' },
-          rootChecked: { backgroundColor: 'transparent' },
-          icon: { color: NeutralColors.gray160, fontSize: '12px', marginBottom: '-2px' },
-        }}
-        aria-labelledby={`${id}-description`}
-      />
+      <div tabIndex={0}>
+        <Icon
+          iconName="Unknown"
+          styles={{
+            root: {
+              width: '12px',
+              minWidth: '12px',
+              height: '12px',
+
+              padding: '0px 3px',
+
+              color: NeutralColors.gray160,
+              fontSize: '12px',
+            },
+          }}
+          aria-label={
+            // add a semicolon so the screen-reader pauses instead of making a confusing run-on
+            `;${description}`
+          }
+        />
+      </div>
     </TooltipHost>
   );
 };