diff --git a/.betterer.results b/.betterer.results
index 60ca53d69cf..a5ae922b47a 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2883,9 +2883,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"]
     ],
-    "public/app/features/playlist/PlaylistTableRows.tsx:5381": [
-      [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
-    ],
     "public/app/features/plugins/admin/components/AppConfigWrapper.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
diff --git a/packages/grafana-ui/src/components/Card/Card.test.tsx b/packages/grafana-ui/src/components/Card/Card.test.tsx
index 87e3c5fff6d..ec7c673faa0 100644
--- a/packages/grafana-ui/src/components/Card/Card.test.tsx
+++ b/packages/grafana-ui/src/components/Card/Card.test.tsx
@@ -27,7 +27,7 @@ describe('Card', () => {
             <Button>Click Me</Button>
           </Card.Actions>
           <Card.SecondaryActions>
-            <IconButton name="trash-alt" aria-label="Delete" />
+            <IconButton name="trash-alt" aria-label="Delete" tooltip="Delete" />
           </Card.SecondaryActions>
         </Card>
       );
@@ -42,7 +42,7 @@ describe('Card', () => {
             <Button>Click Me</Button>
           </Card.Actions>
           <Card.SecondaryActions>
-            <IconButton name="trash-alt" aria-label="Delete" />
+            <IconButton name="trash-alt" aria-label="Delete" tooltip="Delete" />
           </Card.SecondaryActions>
         </Card>
       );
@@ -59,7 +59,7 @@ describe('Card', () => {
             <Button disabled>Click Me</Button>
           </Card.Actions>
           <Card.SecondaryActions>
-            <IconButton name="trash-alt" aria-label="Delete" disabled />
+            <IconButton name="trash-alt" aria-label="Delete" tooltip="Delete" disabled />
           </Card.SecondaryActions>
         </Card>
       );
@@ -74,7 +74,7 @@ describe('Card', () => {
             <Button disabled={false}>Click Me</Button>
           </Card.Actions>
           <Card.SecondaryActions>
-            <IconButton name="trash-alt" aria-label="Delete" disabled={false} />
+            <IconButton name="trash-alt" aria-label="Delete" tooltip="Delete" disabled={false} />
           </Card.SecondaryActions>
         </Card>
       );
@@ -93,7 +93,7 @@ describe('Card', () => {
             {shouldNotRender && <Button>Delete</Button>}
           </Card.Actions>
           <Card.SecondaryActions>
-            {shouldNotRender && <IconButton name="trash-alt" aria-label="Delete" disabled={false} />}
+            {shouldNotRender && <IconButton name="trash-alt" aria-label="Delete" tooltip="Delete" disabled={false} />}
           </Card.SecondaryActions>
         </Card>
       );
diff --git a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.story.tsx b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.story.tsx
index 92a70e272c0..a28b51e737b 100644
--- a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.story.tsx
+++ b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.story.tsx
@@ -41,7 +41,7 @@ export const Basic: StoryFn<typeof ContextMenu> = (args: ContextMenuProps) => {
 export const WithState: StoryFn<typeof WithContextMenu> = (args: WithContextMenuProps) => {
   return (
     <WithContextMenu {...args}>
-      {({ openMenu }) => <IconButton name="info-circle" onClick={openMenu} />}
+      {({ openMenu }) => <IconButton name="info-circle" onClick={openMenu} tooltip="More information" />}
     </WithContextMenu>
   );
 };
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx
index 9ed7b744b03..0765e6b767a 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksInlineEditor/DataLinksListItem.tsx
@@ -35,8 +35,8 @@ export const DataLinksListItem = ({ link, onEdit, onRemove }: DataLinksListItemP
           {hasTitle ? title : 'Data link title not provided'}
         </div>
         <div className={styles.actionButtons}>
-          <IconButton name="pen" onClick={onEdit} />
-          <IconButton name="times" onClick={onRemove} />
+          <IconButton name="pen" onClick={onEdit} tooltip="Edit data link title" />
+          <IconButton name="times" onClick={onRemove} tooltip="Remove data link title" />
         </div>
       </div>
       <div
diff --git a/packages/grafana-ui/src/components/FileDropzone/FileListItem.tsx b/packages/grafana-ui/src/components/FileDropzone/FileListItem.tsx
index bd942ded6ff..a903777122f 100644
--- a/packages/grafana-ui/src/components/FileDropzone/FileListItem.tsx
+++ b/packages/grafana-ui/src/components/FileDropzone/FileListItem.tsx
@@ -26,24 +26,13 @@ export function FileListItem({ file: customFile, removeFile }: FileListItemProps
       return (
         <>
           <span className={styles.error}>{error.message}</span>
-          {retryUpload && (
-            <IconButton
-              type="button"
-              aria-label="Retry"
-              name="sync"
-              tooltip="Retry"
-              tooltipPlacement="top"
-              onClick={retryUpload}
-            />
-          )}
+          {retryUpload && <IconButton name="sync" tooltip="Retry" tooltipPlacement="top" onClick={retryUpload} />}
           {removeFile && (
             <IconButton
               className={retryUpload ? styles.marginLeft : ''}
-              type="button"
               name="trash-alt"
               onClick={() => removeFile(customFile)}
               tooltip={REMOVE_FILE}
-              aria-label={REMOVE_FILE}
             />
           )}
         </>
@@ -69,8 +58,6 @@ export function FileListItem({ file: customFile, removeFile }: FileListItemProps
           name="trash-alt"
           onClick={() => removeFile(customFile)}
           tooltip={REMOVE_FILE}
-          aria-label={REMOVE_FILE}
-          type="button"
           tooltipPlacement="top"
         />
       )
diff --git a/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx b/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx
index 399b1e247e8..011f3bdafc7 100644
--- a/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx
+++ b/packages/grafana-ui/src/components/IconButton/IconButton.story.tsx
@@ -66,7 +66,7 @@ export const ExamplesSizes = () => {
                 <div className={rowStyle} key={icon}>
                   {sizes.map((size) => (
                     <span key={icon + size}>
-                      <IconButton name={icon} size={size} variant={variant} />
+                      <IconButton name={icon} size={size} variant={variant} tooltip="Tooltip example" />
                     </span>
                   ))}
                 </div>
@@ -81,7 +81,7 @@ export const ExamplesSizes = () => {
           <div className={rowStyle} key={icon}>
             {sizes.map((size) => (
               <span key={icon + size}>
-                <IconButton name={icon} size={size} disabled />
+                <IconButton name={icon} size={size} tooltip="Tooltip example" disabled />
               </span>
             ))}
           </div>
@@ -121,9 +121,9 @@ const RenderBackgroundScenario = ({ background }: ScenarioProps) => {
           `}
         >
           {variants.map((variant) => {
-            return <IconButton name="times" size="xl" variant={variant} key={variant} />;
+            return <IconButton name="times" size="xl" variant={variant} key={variant} tooltip="Tooltip example" />;
           })}
-          <IconButton name="times" size="xl" disabled />
+          <IconButton name="times" size="xl" tooltip="Tooltip example" disabled />
         </div>
       </VerticalGroup>
     </div>
diff --git a/packages/grafana-ui/src/components/IconButton/IconButton.tsx b/packages/grafana-ui/src/components/IconButton/IconButton.tsx
index 72dbc49d732..5951bf3892b 100644
--- a/packages/grafana-ui/src/components/IconButton/IconButton.tsx
+++ b/packages/grafana-ui/src/components/IconButton/IconButton.tsx
@@ -28,7 +28,7 @@ export interface Props extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   tooltipPlacement?: TooltipPlacement;
   /** Variant to change the color of the Icon */
   variant?: IconButtonVariant;
-  /** Text avilable ony for screenscreen readers. Will use tooltip text as fallback. */
+  /** Text available only for screen readers. Will use tooltip text as fallback. */
   ariaLabel?: string;
 }
 
@@ -68,6 +68,7 @@ export const IconButton = React.forwardRef<HTMLButtonElement, Props>(
         aria-label={ariaLabel || tooltipString}
         {...restProps}
         className={cx(styles.button, className)}
+        type="button"
       >
         <Icon name={name} size={limitedIconSize} className={styles.icon} type={iconType} />
       </button>
diff --git a/packages/grafana-ui/src/components/Modal/Modal.tsx b/packages/grafana-ui/src/components/Modal/Modal.tsx
index 599dedb87a7..f6725631653 100644
--- a/packages/grafana-ui/src/components/Modal/Modal.tsx
+++ b/packages/grafana-ui/src/components/Modal/Modal.tsx
@@ -84,7 +84,7 @@ export function Modal(props: PropsWithChildren<Props>) {
               typeof title !== 'string' && title
             }
             <div className={styles.modalHeaderClose}>
-              <IconButton aria-label="Close dialog" name="times" size="xl" onClick={onDismiss} />
+              <IconButton aria-label="Close dialog" name="times" size="xl" onClick={onDismiss} tooltip="Close" />
             </div>
           </div>
           <div className={cx(styles.modalContent, contentClassName)}>{children}</div>
diff --git a/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx b/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx
index e1831ab37e5..5e767d1ae91 100644
--- a/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx
+++ b/packages/grafana-ui/src/components/PageLayout/PageToolbar.story.tsx
@@ -34,8 +34,8 @@ export const Examples = () => {
           titleHref=""
           parentHref=""
           leftItems={[
-            <IconButton name="share-alt" size="lg" key="share" />,
-            <IconButton name="favorite" iconType="mono" size="lg" key="favorite" />,
+            <IconButton name="share-alt" size="lg" key="share" tooltip="Share" />,
+            <IconButton name="favorite" iconType="mono" size="lg" key="favorite" tooltip="Add to favourites" />,
           ]}
         >
           <ToolbarButton icon="panel-add" />
diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.mdx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.mdx
index b06139a6bd6..72e16326947 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.mdx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.mdx
@@ -358,7 +358,7 @@ Component used for rendering content wrapped in the same style as grafana panels
           variant="secondary"
           tooltip="extra content to render"
         />
-        <IconButton name="sliders-v-alt" variant="secondary" tooltip="extra content2 to render" />
+        <IconButton name="sliders-v-alt" variant="secondary" tooltip="extra content to render" />
       </>
     }
     actions={
diff --git a/packages/grafana-ui/src/components/Select/MultiValue.tsx b/packages/grafana-ui/src/components/Select/MultiValue.tsx
index c06ec704f1e..cc05170f756 100644
--- a/packages/grafana-ui/src/components/Select/MultiValue.tsx
+++ b/packages/grafana-ui/src/components/Select/MultiValue.tsx
@@ -27,5 +27,5 @@ export type MultiValueRemoveProps = {
 export const MultiValueRemove = ({ children, innerProps }: React.PropsWithChildren<MultiValueRemoveProps>) => {
   const theme = useTheme2();
   const styles = getSelectStyles(theme);
-  return <IconButton {...innerProps} name="times" size="sm" className={styles.multiValueRemove} />;
+  return <IconButton {...innerProps} name="times" size="sm" className={styles.multiValueRemove} tooltip="Remove" />;
 };
diff --git a/packages/grafana-ui/src/components/TabbedContainer/TabbedContainer.tsx b/packages/grafana-ui/src/components/TabbedContainer/TabbedContainer.tsx
index f4a14cfe11e..2f5059f0308 100644
--- a/packages/grafana-ui/src/components/TabbedContainer/TabbedContainer.tsx
+++ b/packages/grafana-ui/src/components/TabbedContainer/TabbedContainer.tsx
@@ -72,7 +72,7 @@ export function TabbedContainer(props: TabbedContainerProps) {
             icon={t.icon}
           />
         ))}
-        <IconButton className={styles.close} onClick={onClose} name="times" title={closeIconTooltip ?? 'Close'} />
+        <IconButton className={styles.close} onClick={onClose} name="times" tooltip={closeIconTooltip ?? 'Close'} />
       </TabsBar>
       <CustomScrollbar autoHeightMin="100%">
         <TabContent className={styles.tabContent}>{tabs.find((t) => t.value === activeTab)?.content}</TabContent>
diff --git a/packages/grafana-ui/src/components/TagsInput/TagItem.tsx b/packages/grafana-ui/src/components/TagsInput/TagItem.tsx
index ed06644eecf..97e0eba129c 100644
--- a/packages/grafana-ui/src/components/TagsInput/TagItem.tsx
+++ b/packages/grafana-ui/src/components/TagsInput/TagItem.tsx
@@ -29,8 +29,8 @@ export const TagItem = ({ name, disabled, onRemove }: Props) => {
         size="lg"
         disabled={disabled}
         ariaLabel={`Remove "${name}" tag`}
+        tooltip="Remove tag"
         onClick={() => onRemove(name)}
-        type="button"
         className={styles.buttonStyles}
       />
     </li>
diff --git a/packages/grafana-ui/src/components/Toggletip/Toggletip.tsx b/packages/grafana-ui/src/components/Toggletip/Toggletip.tsx
index fd5c50de7d6..ce94ce0822a 100644
--- a/packages/grafana-ui/src/components/Toggletip/Toggletip.tsx
+++ b/packages/grafana-ui/src/components/Toggletip/Toggletip.tsx
@@ -97,9 +97,8 @@ export const Toggletip = React.memo(
               {closeButton && (
                 <div className={style.headerClose}>
                   <IconButton
-                    aria-label="Close Toggletip"
+                    tooltip="Close"
                     name="times"
-                    size="md"
                     data-testid="toggletip-header-close"
                     onClick={closeToggletip}
                   />
diff --git a/packages/grafana-ui/src/options/builder/stacking.tsx b/packages/grafana-ui/src/options/builder/stacking.tsx
index f5f606867ef..e3728c5e8f0 100644
--- a/packages/grafana-ui/src/options/builder/stacking.tsx
+++ b/packages/grafana-ui/src/options/builder/stacking.tsx
@@ -8,15 +8,7 @@ import {
 } from '@grafana/data';
 import { StackingConfig, StackingMode } from '@grafana/schema';
 
-import {
-  GraphFieldConfig,
-  graphFieldOptions,
-  HorizontalGroup,
-  IconButton,
-  Input,
-  RadioButtonGroup,
-  Tooltip,
-} from '../..';
+import { GraphFieldConfig, graphFieldOptions, HorizontalGroup, IconButton, Input, RadioButtonGroup } from '../..';
 
 export const StackingEditor = ({ value, context, onChange, item }: FieldOverrideEditorProps<StackingConfig, any>) => {
   return (
@@ -35,11 +27,7 @@ export const StackingEditor = ({ value, context, onChange, item }: FieldOverride
         <Input
           type="text"
           placeholder="Group"
-          suffix={
-            <Tooltip content="Name of the stacking group" placement="top">
-              <IconButton name="question-circle" />
-            </Tooltip>
-          }
+          suffix={<IconButton name="question-circle" tooltip="Name of the stacking group" tooltipPlacement="top" />}
           defaultValue={value?.group}
           onChange={(v) => {
             onChange({
diff --git a/public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx b/public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx
index e09a76e0302..6879e4f1cda 100644
--- a/public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/NavBarMenu.tsx
@@ -67,6 +67,7 @@ export function NavBarMenu({ activeItem, navItems, searchBarHidden, onClose }: P
               <Icon name="bars" size="xl" />
               <IconButton
                 aria-label="Close navigation menu"
+                tooltip="Close menu"
                 name="times"
                 onClick={onMenuClose}
                 size="xl"
diff --git a/public/app/core/components/CloseButton/CloseButton.tsx b/public/app/core/components/CloseButton/CloseButton.tsx
index 8b26b6a7e74..f00aa961b6d 100644
--- a/public/app/core/components/CloseButton/CloseButton.tsx
+++ b/public/app/core/components/CloseButton/CloseButton.tsx
@@ -13,7 +13,14 @@ type Props = {
 export const CloseButton = ({ onClick, 'aria-label': ariaLabel, style }: Props) => {
   const styles = useStyles2(getStyles);
   return (
-    <IconButton aria-label={ariaLabel ?? 'Close'} className={styles} name="times" onClick={onClick} style={style} />
+    <IconButton
+      aria-label={ariaLabel ?? 'Close'}
+      className={styles}
+      name="times"
+      onClick={onClick}
+      style={style}
+      tooltip="Close"
+    />
   );
 };
 
diff --git a/public/app/core/components/Layers/LayerDragDropList.tsx b/public/app/core/components/Layers/LayerDragDropList.tsx
index 753b8092df6..232eafd040d 100644
--- a/public/app/core/components/Layers/LayerDragDropList.tsx
+++ b/public/app/core/components/Layers/LayerDragDropList.tsx
@@ -80,8 +80,8 @@ export const LayerDragDropList = <T extends LayerElement>({
                             {onDuplicate ? (
                               <IconButton
                                 name="copy"
-                                title={'Duplicate'}
-                                ariaLabel={'Duplicate button'}
+                                tooltip="Duplicate"
+                                ariaLabel="Duplicate button"
                                 className={style.actionIcon}
                                 onClick={() => onDuplicate(element)}
                               />
@@ -89,8 +89,8 @@ export const LayerDragDropList = <T extends LayerElement>({
 
                             <IconButton
                               name="trash-alt"
-                              title={'remove'}
-                              ariaLabel={'Remove button'}
+                              tooltip="Remove"
+                              ariaLabel="Remove button"
                               className={cx(style.actionIcon, style.dragIcon)}
                               onClick={() => onDelete(element)}
                             />
diff --git a/public/app/core/components/OptionsUI/color.tsx b/public/app/core/components/OptionsUI/color.tsx
index 8494e5f32a7..5611fbae74c 100644
--- a/public/app/core/components/OptionsUI/color.tsx
+++ b/public/app/core/components/OptionsUI/color.tsx
@@ -53,7 +53,9 @@ export const ColorValueEditor = ({ value, settings, onChange, details }: Props)
                     {settings?.placeholder ?? 'Select color'}
                   </span>
                 )}
-                {settings?.isClearable && value && <IconButton name="times" onClick={() => onChange(undefined)} />}
+                {settings?.isClearable && value && (
+                  <IconButton name="times" onClick={() => onChange(undefined)} tooltip="Clear settings" />
+                )}
               </>
             )}
           </div>
diff --git a/public/app/core/components/OptionsUI/units.tsx b/public/app/core/components/OptionsUI/units.tsx
index ebc62e0e47e..fb04e8d1957 100644
--- a/public/app/core/components/OptionsUI/units.tsx
+++ b/public/app/core/components/OptionsUI/units.tsx
@@ -14,7 +14,7 @@ export function UnitValueEditor({ value, onChange, item }: Props) {
         <span className={styles.first}>
           <UnitPicker value={value} onChange={onChange} />
         </span>
-        <IconButton ariaLabel="clear unit selection" name="times" onClick={() => onChange(undefined)} />
+        <IconButton name="times" onClick={() => onChange(undefined)} tooltip="Clear unit selection" />
       </div>
     );
   }
diff --git a/public/app/core/components/PasswordField/PasswordField.tsx b/public/app/core/components/PasswordField/PasswordField.tsx
index 03811be74a2..06a54869722 100644
--- a/public/app/core/components/PasswordField/PasswordField.tsx
+++ b/public/app/core/components/PasswordField/PasswordField.tsx
@@ -27,14 +27,13 @@ export const PasswordField = React.forwardRef<HTMLInputElement, Props>(
         suffix={
           <IconButton
             name={showPassword ? 'eye-slash' : 'eye'}
-            type="button"
             aria-controls={id}
             role="switch"
             aria-checked={showPassword}
-            aria-label="Show password"
             onClick={() => {
               setShowPassword(!showPassword);
             }}
+            tooltip={showPassword ? 'Hide password' : 'Show password'}
           />
         }
       />
diff --git a/public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx b/public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx
index 98d031cc0e6..1ccb4d481af 100644
--- a/public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx
+++ b/public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx
@@ -37,11 +37,10 @@ export const QueryOperationRowHeader = ({
       <div className={styles.column}>
         <IconButton
           name={isContentVisible ? 'angle-down' : 'angle-right'}
-          title="toggle collapse and expand"
           aria-label="toggle collapse and expand query row"
+          tooltip={isContentVisible ? 'Collapse query row' : 'Expand query row'}
           className={styles.collapseIcon}
           onClick={onRowToggle}
-          type="button"
           aria-expanded={isContentVisible}
           aria-controls={id}
         />
diff --git a/public/app/features/alerting/unified/RuleViewer.tsx b/public/app/features/alerting/unified/RuleViewer.tsx
index 1a8453475a0..aae84a79973 100644
--- a/public/app/features/alerting/unified/RuleViewer.tsx
+++ b/public/app/features/alerting/unified/RuleViewer.tsx
@@ -260,7 +260,7 @@ function GrafanaRuleUID({ rule }: { rule: GrafanaRuleDefinition }) {
 
   return (
     <DetailsField label="Rule UID" childrenWrapperClassName={styles.ruleUid}>
-      {rule.uid} <IconButton name="copy" onClick={copyUID} />
+      {rule.uid} <IconButton name="copy" onClick={copyUID} tooltip="Copy rule" />
     </DetailsField>
   );
 }
diff --git a/public/app/features/alerting/unified/components/AlertLabel.tsx b/public/app/features/alerting/unified/components/AlertLabel.tsx
index cfc5bcff686..8cfe5104449 100644
--- a/public/app/features/alerting/unified/components/AlertLabel.tsx
+++ b/public/app/features/alerting/unified/components/AlertLabel.tsx
@@ -19,7 +19,7 @@ export const AlertLabel = ({ labelKey, value, operator = '=', onRemoveLabel }: P
       {labelKey}
       {operator}
       {value}
-      {!!onRemoveLabel && <IconButton name="times" size="xs" onClick={onRemoveLabel} />}
+      {!!onRemoveLabel && <IconButton name="times" size="xs" onClick={onRemoveLabel} tooltip="Remove label" />}
     </div>
   );
 };
diff --git a/public/app/features/alerting/unified/components/DynamicTable.tsx b/public/app/features/alerting/unified/components/DynamicTable.tsx
index 3e99d226239..ba3033a73fb 100644
--- a/public/app/features/alerting/unified/components/DynamicTable.tsx
+++ b/public/app/features/alerting/unified/components/DynamicTable.tsx
@@ -124,12 +124,10 @@ export const DynamicTable = <T extends object>({
               {isExpandable && (
                 <div className={cx(styles.cell, styles.expandCell)}>
                   <IconButton
-                    aria-label={`${isItemExpanded ? 'Collapse' : 'Expand'} row`}
-                    size="md"
+                    tooltip={`${isItemExpanded ? 'Collapse' : 'Expand'} row`}
                     data-testid="collapse-toggle"
                     name={isItemExpanded ? 'angle-down' : 'angle-right'}
                     onClick={() => toggleExpanded(item)}
-                    type="button"
                   />
                 </div>
               )}
diff --git a/public/app/features/alerting/unified/components/expressions/Expression.tsx b/public/app/features/alerting/unified/components/expressions/Expression.tsx
index 4057a771ac8..eacf9ea26bf 100644
--- a/public/app/features/alerting/unified/components/expressions/Expression.tsx
+++ b/public/app/features/alerting/unified/components/expressions/Expression.tsx
@@ -216,7 +216,7 @@ const Header: FC<HeaderProps> = ({ refId, queryType, onUpdateRefId, onUpdateExpr
    * There are 3 edit modes:
    *
    * 1. "refId": Editing the refId (ie. A -> B)
-   * 2. "epressionType": Editing the type of the expression (ie. Reduce -> Math)
+   * 2. "expressionType": Editing the type of the expression (ie. Reduce -> Math)
    * 3. "false": This means we're not editing either of those
    */
   const [editMode, setEditMode] = useState<'refId' | 'expressionType' | false>(false);
@@ -281,11 +281,11 @@ const Header: FC<HeaderProps> = ({ refId, queryType, onUpdateRefId, onUpdateExpr
         </Stack>
         <Spacer />
         <IconButton
-          type="button"
           name="trash-alt"
           variant="secondary"
           className={styles.mutedIcon}
           onClick={onRemoveExpression}
+          tooltip="Remove expression"
         />
       </Stack>
     </header>
diff --git a/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeRange.tsx b/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeRange.tsx
index d80d69f5c78..1e5517b63cc 100644
--- a/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeRange.tsx
+++ b/public/app/features/alerting/unified/components/mute-timings/MuteTimingTimeRange.tsx
@@ -121,13 +121,13 @@ export const MuteTimingTimeRange = ({ intervalIndex }: Props) => {
                   </InlineField>
                   <IconButton
                     className={styles.deleteTimeRange}
-                    title={'Remove'}
-                    name={'trash-alt'}
-                    type="button"
+                    title="Remove"
+                    name="trash-alt"
                     onClick={(e) => {
                       e.preventDefault();
                       removeTimeRange(index);
                     }}
+                    tooltip="Remove time range"
                   />
                 </InlineFieldRow>
               </div>
@@ -139,7 +139,7 @@ export const MuteTimingTimeRange = ({ intervalIndex }: Props) => {
         className={styles.addTimeRange}
         variant="secondary"
         type="button"
-        icon={'plus'}
+        icon="plus"
         onClick={() => addTimeRange({ start_time: '', end_time: '' })}
       >
         Add another time range
diff --git a/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.tsx b/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.tsx
index 3ac67558f9b..e558abf2d5c 100644
--- a/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.tsx
+++ b/public/app/features/alerting/unified/components/mute-timings/MuteTimingsTable.tsx
@@ -150,7 +150,7 @@ function useColumns(alertManagerSourceName: string, hideActions = false, setMute
                     muteName: data.name,
                   })}
                 >
-                  <IconButton name="file-alt" title="View mute timing" />
+                  <IconButton name="file-alt" tooltip="View mute timing" />
                 </Link>
               </div>
             );
@@ -163,13 +163,13 @@ function useColumns(alertManagerSourceName: string, hideActions = false, setMute
                     muteName: data.name,
                   })}
                 >
-                  <IconButton name="edit" title="Edit mute timing" />
+                  <IconButton name="edit" tooltip="Edit mute timing" />
                 </Link>
               </Authorize>
               <Authorize actions={[permissions.delete]}>
                 <IconButton
-                  name={'trash-alt'}
-                  title="Delete mute timing"
+                  name="trash-alt"
+                  tooltip="Delete mute timing"
                   onClick={() => setMuteTimingName(data.name)}
                 />
               </Authorize>
diff --git a/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx b/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
index 2ec875a0fcf..5e905fea564 100644
--- a/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
@@ -137,12 +137,7 @@ export const AmRoutesExpandedForm = ({
                                 placeholder="value"
                               />
                             </Field>
-                            <IconButton
-                              type="button"
-                              tooltip="Remove matcher"
-                              name={'trash-alt'}
-                              onClick={() => remove(index)}
-                            >
+                            <IconButton tooltip="Remove matcher" name={'trash-alt'} onClick={() => remove(index)}>
                               Remove
                             </IconButton>
                           </Stack>
diff --git a/public/app/features/alerting/unified/components/silences/MatchersField.tsx b/public/app/features/alerting/unified/components/silences/MatchersField.tsx
index 6fb4883a048..2400274d5c8 100644
--- a/public/app/features/alerting/unified/components/silences/MatchersField.tsx
+++ b/public/app/features/alerting/unified/components/silences/MatchersField.tsx
@@ -79,7 +79,7 @@ const MatchersField = ({ className }: Props) => {
                     <IconButton
                       className={styles.removeButton}
                       tooltip="Remove matcher"
-                      name={'trash-alt'}
+                      name="trash-alt"
                       onClick={() => remove(index)}
                     >
                       Remove
diff --git a/public/app/features/correlations/Forms/TransformationsEditor.tsx b/public/app/features/correlations/Forms/TransformationsEditor.tsx
index a388bf55505..3f811738137 100644
--- a/public/app/features/correlations/Forms/TransformationsEditor.tsx
+++ b/public/app/features/correlations/Forms/TransformationsEditor.tsx
@@ -229,9 +229,8 @@ export const TransformationsEditor = (props: Props) => {
                         {!readOnly && (
                           <div className={styles.removeButton}>
                             <IconButton
-                              type="button"
                               tooltip="Remove transformation"
-                              name={'trash-alt'}
+                              name="trash-alt"
                               onClick={() => {
                                 remove(index);
                                 const keptValsCopy: Array<{ expression?: string; mapValue?: string } | undefined> = [
@@ -240,7 +239,6 @@ export const TransformationsEditor = (props: Props) => {
                                 keptValsCopy[index] = undefined;
                                 setKeptVals(compact(keptValsCopy));
                               }}
-                              ariaLabel="Remove transformation"
                             >
                               Remove
                             </IconButton>
diff --git a/public/app/features/dashboard/components/AddLibraryPanelWidget/AddLibraryPanelWidget.tsx b/public/app/features/dashboard/components/AddLibraryPanelWidget/AddLibraryPanelWidget.tsx
index 1f93101f57b..cda9bf63d9e 100644
--- a/public/app/features/dashboard/components/AddLibraryPanelWidget/AddLibraryPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddLibraryPanelWidget/AddLibraryPanelWidget.tsx
@@ -47,7 +47,12 @@ export const AddLibraryPanelWidget = ({ panel, dashboard }: Props) => {
             <Trans i18nKey="library-panel.add-widget.title">Add panel from panel library</Trans>
           </span>
           <div className="flex-grow-1" />
-          <IconButton aria-label="Close 'Add Panel' widget" name="times" onClick={onCancelAddPanel} />
+          <IconButton
+            aria-label="Close 'Add Panel' widget"
+            name="times"
+            onClick={onCancelAddPanel}
+            tooltip="Close widget"
+          />
         </div>
         <LibraryPanelsSearch onClick={onAddLibraryPanel} variant={LibraryPanelsSearchVariant.Tight} showPanelFilter />
       </div>
diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
index 06803d80127..4966670094d 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
@@ -213,7 +213,7 @@ const AddPanelWidgetHandle = ({ children, onBack, onCancel, styles }: AddPanelWi
     <div className={cx(styles.headerRow, 'grid-drag-handle')}>
       {onBack && (
         <div className={styles.backButton}>
-          <IconButton aria-label="Go back" name="arrow-left" onClick={onBack} size="xl" />
+          <IconButton name="arrow-left" onClick={onBack} size="xl" tooltip="Go back" />
         </div>
       )}
       {!onBack && (
@@ -223,7 +223,7 @@ const AddPanelWidgetHandle = ({ children, onBack, onCancel, styles }: AddPanelWi
       )}
       {children && <span>{children}</span>}
       <div className="flex-grow-1" />
-      <IconButton aria-label="Close 'Add Panel' widget" name="times" onClick={onCancel} />
+      <IconButton aria-label="Close 'Add Panel' widget" name="times" onClick={onCancel} tooltip="Close widget" />
     </div>
   );
 };
diff --git a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx
index 33abef06a5c..2799c59a324 100644
--- a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx
+++ b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsList.tsx
@@ -81,11 +81,11 @@ export const AnnotationSettingsList = ({ dashboard, onNew, onEdit }: Props) => {
                   {dataSourceSrv.getInstanceSettings(annotation.datasource)?.name || annotation.datasource?.uid}
                 </td>
                 <td role="gridcell" style={{ width: '1%' }}>
-                  {idx !== 0 && <IconButton name="arrow-up" aria-label="arrow-up" onClick={() => onMove(idx, -1)} />}
+                  {idx !== 0 && <IconButton name="arrow-up" onClick={() => onMove(idx, -1)} tooltip="Move up" />}
                 </td>
                 <td role="gridcell" style={{ width: '1%' }}>
                   {dashboard.annotations.list.length > 1 && idx !== dashboard.annotations.list.length - 1 ? (
-                    <IconButton name="arrow-down" aria-label="arrow-down" onClick={() => onMove(idx, 1)} />
+                    <IconButton name="arrow-down" onClick={() => onMove(idx, 1)} tooltip="Move down" />
                   ) : null}
                 </td>
                 <td role="gridcell" style={{ width: '1%' }}>
diff --git a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
index 7a7d1ede798..733f48f9c05 100644
--- a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
@@ -158,23 +158,23 @@ describe('AnnotationsSettings', () => {
     setup(dashboard);
 
     // Check that we have sorting buttons
-    expect(within(getTableBodyRows()[0]).queryByRole('button', { name: 'arrow-up' })).not.toBeInTheDocument();
-    expect(within(getTableBodyRows()[0]).queryByRole('button', { name: 'arrow-down' })).toBeInTheDocument();
+    expect(within(getTableBodyRows()[0]).queryByRole('button', { name: 'Move up' })).not.toBeInTheDocument();
+    expect(within(getTableBodyRows()[0]).queryByRole('button', { name: 'Move down' })).toBeInTheDocument();
 
-    expect(within(getTableBodyRows()[1]).queryByRole('button', { name: 'arrow-up' })).toBeInTheDocument();
-    expect(within(getTableBodyRows()[1]).queryByRole('button', { name: 'arrow-down' })).toBeInTheDocument();
+    expect(within(getTableBodyRows()[1]).queryByRole('button', { name: 'Move up' })).toBeInTheDocument();
+    expect(within(getTableBodyRows()[1]).queryByRole('button', { name: 'Move down' })).toBeInTheDocument();
 
-    expect(within(getTableBodyRows()[2]).queryByRole('button', { name: 'arrow-up' })).toBeInTheDocument();
-    expect(within(getTableBodyRows()[2]).queryByRole('button', { name: 'arrow-down' })).not.toBeInTheDocument();
+    expect(within(getTableBodyRows()[2]).queryByRole('button', { name: 'Move up' })).toBeInTheDocument();
+    expect(within(getTableBodyRows()[2]).queryByRole('button', { name: 'Move down' })).not.toBeInTheDocument();
 
     // Check the original order
     expect(within(getTableBodyRows()[0]).queryByText(/annotations & alerts/i)).toBeInTheDocument();
     expect(within(getTableBodyRows()[1]).queryByText(/annotation 2/i)).toBeInTheDocument();
     expect(within(getTableBodyRows()[2]).queryByText(/annotation 3/i)).toBeInTheDocument();
 
-    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'arrow-down' })[0]);
-    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'arrow-down' })[1]);
-    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'arrow-up' })[0]);
+    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'Move down' })[0]);
+    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'Move down' })[1]);
+    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'Move up' })[0]);
 
     // Checking if it has changed the sorting accordingly
     expect(within(getTableBodyRows()[0]).queryByText(/annotation 3/i)).toBeInTheDocument();
diff --git a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
index e97c4fb589f..4973e38beb2 100644
--- a/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
@@ -113,23 +113,23 @@ describe('LinksSettings', () => {
     setup(dashboard);
 
     // Check that we have sorting buttons
-    expect(within(getTableBodyRows()[0]).queryByRole('button', { name: 'arrow-up' })).not.toBeInTheDocument();
-    expect(within(getTableBodyRows()[0]).queryByRole('button', { name: 'arrow-down' })).toBeInTheDocument();
+    expect(within(getTableBodyRows()[0]).queryByRole('button', { name: 'Move link up' })).not.toBeInTheDocument();
+    expect(within(getTableBodyRows()[0]).queryByRole('button', { name: 'Move link down' })).toBeInTheDocument();
 
-    expect(within(getTableBodyRows()[1]).queryByRole('button', { name: 'arrow-up' })).toBeInTheDocument();
-    expect(within(getTableBodyRows()[1]).queryByRole('button', { name: 'arrow-down' })).toBeInTheDocument();
+    expect(within(getTableBodyRows()[1]).queryByRole('button', { name: 'Move link up' })).toBeInTheDocument();
+    expect(within(getTableBodyRows()[1]).queryByRole('button', { name: 'Move link down' })).toBeInTheDocument();
 
-    expect(within(getTableBodyRows()[2]).queryByRole('button', { name: 'arrow-up' })).toBeInTheDocument();
-    expect(within(getTableBodyRows()[2]).queryByRole('button', { name: 'arrow-down' })).not.toBeInTheDocument();
+    expect(within(getTableBodyRows()[2]).queryByRole('button', { name: 'Move link up' })).toBeInTheDocument();
+    expect(within(getTableBodyRows()[2]).queryByRole('button', { name: 'Move link down' })).not.toBeInTheDocument();
 
     // Checking the original order
     assertRowHasText(0, links[0].title);
     assertRowHasText(1, links[1].title);
     assertRowHasText(2, links[2].url);
 
-    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'arrow-down' })[0]);
-    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'arrow-down' })[1]);
-    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'arrow-up' })[0]);
+    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'Move link down' })[0]);
+    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'Move link down' })[1]);
+    await userEvent.click(within(getTableBody()).getAllByRole('button', { name: 'Move link up' })[0]);
 
     // Checking if it has changed the sorting accordingly
     assertRowHasText(0, links[2].url);
diff --git a/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx b/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
index d89a161b8ea..cd9388e84f4 100644
--- a/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
+++ b/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
@@ -75,15 +75,15 @@ export const LinkSettingsList = ({ dashboard, onNew, onEdit }: LinkSettingsListP
                 </HorizontalGroup>
               </td>
               <td style={{ width: '1%' }} role="gridcell">
-                {idx !== 0 && <IconButton name="arrow-up" aria-label="arrow-up" onClick={() => moveLink(idx, -1)} />}
+                {idx !== 0 && <IconButton name="arrow-up" onClick={() => moveLink(idx, -1)} tooltip="Move link up" />}
               </td>
               <td style={{ width: '1%' }} role="gridcell">
                 {links.length > 1 && idx !== links.length - 1 ? (
-                  <IconButton name="arrow-down" aria-label="arrow-down" onClick={() => moveLink(idx, 1)} />
+                  <IconButton name="arrow-down" onClick={() => moveLink(idx, 1)} tooltip="Move link down" />
                 ) : null}
               </td>
               <td style={{ width: '1%' }} role="gridcell">
-                <IconButton aria-label="copy" name="copy" onClick={() => duplicateLink(link, idx)} />
+                <IconButton name="copy" onClick={() => duplicateLink(link, idx)} tooltip="Copy link" />
               </td>
               <td style={{ width: '1%' }} role="gridcell">
                 <DeleteButton
diff --git a/public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx b/public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx
index ad666b77d01..efc37f2a0b8 100644
--- a/public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx
@@ -66,7 +66,7 @@ export const DynamicConfigValueEditor = ({
           </Label>
           {!isSystemOverride && (
             <div>
-              <IconButton name="times" onClick={onRemove} />
+              <IconButton name="times" onClick={onRemove} tooltip="Remove label" />
             </div>
           )}
         </HorizontalGroup>
diff --git a/public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx b/public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx
index 27ce86185b3..27e5c9768ec 100644
--- a/public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx
@@ -30,7 +30,7 @@ export const OverrideCategoryTitle = ({
     <div>
       <HorizontalGroup justify="space-between">
         <div>{overrideName}</div>
-        <IconButton name="trash-alt" onClick={onOverrideRemove} title="Remove override" />
+        <IconButton name="trash-alt" onClick={onOverrideRemove} tooltip="Remove override" />
       </HorizontalGroup>
       {!isExpanded && (
         <div className={styles.overrideDetails}>
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
index e4be969e233..4b9cdcb9bfd 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
@@ -249,6 +249,7 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
             onClick={() => {
               this.setState({ search: '' });
             }}
+            tooltip="Clear search"
           />
         </>
       );
@@ -266,6 +267,7 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
           onClick={() => {
             this.setState({ showPicker: false });
           }}
+          tooltip="Close picker"
         />
       );
     }
diff --git a/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx b/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx
index 46d458d1d25..1205e084f9d 100644
--- a/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx
+++ b/public/app/features/dashboard/components/VersionHistory/VersionHistoryHeader.tsx
@@ -22,7 +22,7 @@ export const VersionHistoryHeader = ({
 
   return (
     <h3 className={styles.header}>
-      <IconButton name="arrow-left" size="xl" onClick={onClick} />
+      <IconButton name="arrow-left" size="xl" onClick={onClick} tooltip="Reset version" />
       <span>
         Comparing {baseVersion} <Icon name="arrows-h" /> {newVersion}{' '}
         {isNewLatest && <cite className="muted">(Latest)</cite>}
diff --git a/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx b/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
index e5f8df86343..0d5578265fb 100644
--- a/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
+++ b/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
@@ -199,10 +199,10 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
         }
         suffix={
           <IconButton
-            aria-label={`Remove ${ariaLabel}`}
             className={styles.trashIcon}
             name="trash-alt"
             onClick={() => this.onRemoveThreshold(threshold)}
+            tooltip={`Remove ${ariaLabel}`}
           />
         }
       />
diff --git a/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingEditRow.tsx b/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingEditRow.tsx
index 498454c92c4..27120d7b56e 100644
--- a/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingEditRow.tsx
+++ b/public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingEditRow.tsx
@@ -220,8 +220,20 @@ export function ValueMappingEditRow({ mapping, index, onChange, onRemove, onDupl
           )}
           <td className={styles.textAlignCenter}>
             <HorizontalGroup spacing="sm">
-              <IconButton name="copy" onClick={() => onDuplicate(index)} data-testid="duplicate-value-mapping" />
-              <IconButton name="trash-alt" onClick={() => onRemove(index)} data-testid="remove-value-mapping" />
+              <IconButton
+                name="copy"
+                onClick={() => onDuplicate(index)}
+                data-testid="duplicate-value-mapping"
+                aria-label="Duplicate value mapping"
+                tooltip="Duplicate"
+              />
+              <IconButton
+                name="trash-alt"
+                onClick={() => onRemove(index)}
+                data-testid="remove-value-mapping"
+                aria-label="Delete value mapping"
+                tooltip="Delete"
+              />
             </HorizontalGroup>
           </td>
         </tr>
diff --git a/public/app/features/explore/ExploreQueryInspector.test.tsx b/public/app/features/explore/ExploreQueryInspector.test.tsx
index 096a797d903..7efbe215981 100644
--- a/public/app/features/explore/ExploreQueryInspector.test.tsx
+++ b/public/app/features/explore/ExploreQueryInspector.test.tsx
@@ -67,7 +67,7 @@ const setup = (propOverrides = {}) => {
 describe('ExploreQueryInspector', () => {
   it('should render closable drawer component', () => {
     setup();
-    expect(screen.getByTitle(/close query inspector/i)).toBeInTheDocument();
+    expect(screen.getByLabelText(/close query inspector/i)).toBeInTheDocument();
   });
   it('should render 4 Tabs if queryResponse has no error', () => {
     setup();
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
index 27a5808d8e7..a5502a6134a 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
@@ -384,28 +384,28 @@ describe('RichHistoryCard', () => {
     });
     it('should have title "Edit comment" at comment icon, if comment present', async () => {
       setup({ query: starredQueryWithComment });
-      const editComment = await screen.findByTitle('Edit comment');
+      const editComment = await screen.findByLabelText('Edit comment');
       const addComment = screen.queryByTitle('Add comment');
       expect(editComment).toBeInTheDocument();
       expect(addComment).not.toBeInTheDocument();
     });
     it('should have title "Add comment" at comment icon, if no comment present', async () => {
       setup();
-      const addComment = await screen.findByTitle('Add comment');
+      const addComment = await screen.findByLabelText('Add comment');
       const editComment = await screen.queryByTitle('Edit comment');
       expect(addComment).toBeInTheDocument();
       expect(editComment).not.toBeInTheDocument();
     });
     it('should open update comment form when edit comment button clicked', async () => {
       setup({ query: starredQueryWithComment });
-      const editComment = await screen.findByTitle('Edit comment');
+      const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
       expect(updateCommentForm).toBeInTheDocument();
     });
     it('should close update comment form when escape key pressed', async () => {
       setup({ query: starredQueryWithComment });
-      const editComment = await screen.findByTitle('Edit comment');
+      const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
       await userEvent.click(updateCommentForm);
@@ -417,7 +417,7 @@ describe('RichHistoryCard', () => {
     });
     it('should close update comment form when enter and shift keys pressed', async () => {
       setup({ query: starredQueryWithComment });
-      const editComment = await screen.findByTitle('Edit comment');
+      const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
       await userEvent.click(updateCommentForm);
@@ -430,7 +430,7 @@ describe('RichHistoryCard', () => {
     });
     it('should close update comment form when enter and ctrl keys pressed', async () => {
       setup({ query: starredQueryWithComment });
-      const editComment = await screen.findByTitle('Edit comment');
+      const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
       await userEvent.click(updateCommentForm);
@@ -443,7 +443,7 @@ describe('RichHistoryCard', () => {
     });
     it('should not close update comment form when enter key pressed', async () => {
       setup({ query: starredQueryWithComment });
-      const editComment = await screen.findByTitle('Edit comment');
+      const editComment = await screen.findByLabelText('Edit comment');
       await userEvent.click(editComment);
       const updateCommentForm = await screen.findByLabelText('Update comment form');
       await userEvent.click(updateCommentForm);
@@ -459,14 +459,14 @@ describe('RichHistoryCard', () => {
   describe('starring', () => {
     it('should have title "Star query", if not starred', async () => {
       setup();
-      const starButton = await screen.findByTitle('Star query');
+      const starButton = await screen.findByLabelText('Star query');
       expect(starButton).toBeInTheDocument();
       await userEvent.click(starButton);
       expect(starRichHistoryMock).toBeCalledWith(starredQueryWithComment.id, true);
     });
     it('should have title "Unstar query", if not starred', async () => {
       setup({ query: starredQueryWithComment });
-      const unstarButton = await screen.findByTitle('Unstar query');
+      const unstarButton = await screen.findByLabelText('Unstar query');
       expect(unstarButton).toBeInTheDocument();
       await userEvent.click(unstarButton);
       expect(starRichHistoryMock).toBeCalledWith(starredQueryWithComment.id, false);
@@ -476,14 +476,14 @@ describe('RichHistoryCard', () => {
   describe('deleting', () => {
     it('should delete if not starred', async () => {
       setup();
-      const deleteButton = await screen.findByTitle('Delete query');
+      const deleteButton = await screen.findByLabelText('Delete query');
       expect(deleteButton).toBeInTheDocument();
       await userEvent.click(deleteButton);
       expect(deleteRichHistoryMock).toBeCalledWith(starredQueryWithComment.id);
     });
     it('should display modal before deleting if starred', async () => {
       setup({ query: starredQueryWithComment });
-      const deleteButton = await screen.findByTitle('Delete query');
+      const deleteButton = await screen.findByLabelText('Delete query');
       await userEvent.click(deleteButton);
       expect(deleteRichHistoryMock).not.toBeCalled();
       expect(appEvents.publish).toHaveBeenCalledWith(new ShowConfirmModalEvent(expect.anything()));
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
index 54fc5214f0b..ee34d3ebe58 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
@@ -304,18 +304,18 @@ export function RichHistoryCard(props: Props) {
       <IconButton
         name="comment-alt"
         onClick={toggleActiveUpdateComment}
-        title={query.comment?.length > 0 ? 'Edit comment' : 'Add comment'}
+        tooltip={query.comment?.length > 0 ? 'Edit comment' : 'Add comment'}
       />
-      <IconButton name="copy" onClick={onCopyQuery} title="Copy query to clipboard" />
+      <IconButton name="copy" onClick={onCopyQuery} tooltip="Copy query to clipboard" />
       {value?.dsInstance && (
-        <IconButton name="share-alt" onClick={onCreateShortLink} title="Copy shortened link to clipboard" />
+        <IconButton name="share-alt" onClick={onCreateShortLink} tooltip="Copy shortened link to clipboard" />
       )}
-      <IconButton name="trash-alt" title={'Delete query'} onClick={onDeleteQuery} />
+      <IconButton name="trash-alt" title="Delete query" tooltip="Delete query" onClick={onDeleteQuery} />
       <IconButton
         name={query.starred ? 'favorite' : 'star'}
         iconType={query.starred ? 'mono' : 'default'}
         onClick={onStarrQuery}
-        title={query.starred ? 'Unstar query' : 'Star query'}
+        tooltip={query.starred ? 'Unstar query' : 'Star query'}
       />
     </div>
   );
diff --git a/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx b/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx
index 81bb386cac8..72b1f4fb84d 100644
--- a/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx
+++ b/public/app/features/explore/TraceView/components/common/SearchBarInput.tsx
@@ -44,7 +44,9 @@ export default class SearchBarInput extends React.PureComponent<Props> {
     const suffix = (
       <>
         {inputProps.suffix}
-        {allowClear && value && value.length && <IconButton name="times" onClick={this.clearUiFind} />}
+        {allowClear && value && value.length && (
+          <IconButton name="times" onClick={this.clearUiFind} tooltip="Clear input" />
+        )}
       </>
     );
 
diff --git a/public/app/features/logs/components/LogRowMessage.tsx b/public/app/features/logs/components/LogRowMessage.tsx
index 97de6c96a9e..e5014e1c365 100644
--- a/public/app/features/logs/components/LogRowMessage.tsx
+++ b/public/app/features/logs/components/LogRowMessage.tsx
@@ -103,11 +103,11 @@ export class LogRowMessage extends PureComponent<Props> {
           <span className={cx('log-row-menu', styles.rowMenu)} onClick={this.onLogRowClick}>
             {shouldShowContextToggle && (
               <IconButton
-                tooltip="Show context"
-                tooltipPlacement="top"
                 size="md"
                 name="gf-show-context"
                 onClick={this.onShowContextClick}
+                tooltip="Show context"
+                tooltipPlacement="top"
               />
             )}
             <ClipboardButton
diff --git a/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx b/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx
index 4c6171e8e73..6c44e233141 100644
--- a/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx
+++ b/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx
@@ -64,6 +64,7 @@ export const PanelTypeCard = ({
           }}
           className={styles.deleteButton}
           aria-label="Delete button on panel type card"
+          tooltip="Delete"
         />
       )}
     </div>
diff --git a/public/app/features/playlist/PlaylistTableRows.tsx b/public/app/features/playlist/PlaylistTableRows.tsx
index 0e2d2c01a84..e314706c476 100644
--- a/public/app/features/playlist/PlaylistTableRows.tsx
+++ b/public/app/features/playlist/PlaylistTableRows.tsx
@@ -80,8 +80,7 @@ export const PlaylistTableRows = ({ items, onDelete }: Props) => {
                   name="times"
                   size="md"
                   onClick={() => onDelete(index)}
-                  aria-label={selectors.pages.PlaylistForm.itemDelete}
-                  type="button"
+                  tooltip={selectors.pages.PlaylistForm.itemDelete}
                 />
                 <Icon title="Drag and drop to reorder" name="draggabledots" size="md" />
               </div>
diff --git a/public/app/features/search/page/components/ManageActions.tsx b/public/app/features/search/page/components/ManageActions.tsx
index 563343d0d30..2e68ac9b6cb 100644
--- a/public/app/features/search/page/components/ManageActions.tsx
+++ b/public/app/features/search/page/components/ManageActions.tsx
@@ -44,7 +44,7 @@ export function ManageActions({ items, folder, onChange, clearSelection }: Props
   return (
     <div className={styles.actionRow} data-testid="manage-actions">
       <HorizontalGroup spacing="md" width="auto">
-        <IconButton name="check-square" onClick={clearSelection} title="Uncheck everything" />
+        <IconButton name="check-square" onClick={clearSelection} tooltip="Uncheck everything" />
         <Button disabled={!canMove} onClick={onMove} icon="exchange-alt" variant="secondary">
           Move
         </Button>
diff --git a/public/app/features/search/page/components/columns.tsx b/public/app/features/search/page/components/columns.tsx
index 67c82fad45a..87153f2af91 100644
--- a/public/app/features/search/page/components/columns.tsx
+++ b/public/app/features/search/page/components/columns.tsx
@@ -65,7 +65,7 @@ export const generateColumns = (
         if (selection('*', '*')) {
           return (
             <div className={styles.checkboxHeader}>
-              <IconButton name="check-square" onClick={clearSelection} />
+              <IconButton name="check-square" onClick={clearSelection} tooltip="Clear selection" />
             </div>
           );
         }
diff --git a/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx b/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx
index b8cc616fe9a..be2be78b47b 100644
--- a/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx
+++ b/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx
@@ -133,6 +133,7 @@ const ServiceAccountListItem = memo(
                 size="md"
                 onClick={() => onRemoveButtonClick(serviceAccount)}
                 aria-label={`Delete service account ${serviceAccount.name}`}
+                tooltip="Delete account"
               />
             )}
           </HorizontalGroup>
diff --git a/public/app/features/support-bundles/SupportBundles.tsx b/public/app/features/support-bundles/SupportBundles.tsx
index 303185161b0..a3e2d4a62ab 100644
--- a/public/app/features/support-bundles/SupportBundles.tsx
+++ b/public/app/features/support-bundles/SupportBundles.tsx
@@ -93,7 +93,12 @@ const SupportBundlesUnconnected = ({ supportBundles, isLoading, loadBundles, rem
                 </th>
                 <th>
                   {hasDeleteAccess && (
-                    <IconButton onClick={() => removeBundle(bundle.uid)} name="trash-alt" variant="destructive" />
+                    <IconButton
+                      onClick={() => removeBundle(bundle.uid)}
+                      name="trash-alt"
+                      variant="destructive"
+                      tooltip="Remove bundle"
+                    />
                   )}
                 </th>
               </tr>
diff --git a/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx b/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
index dadcb2b61f5..60831bb1a20 100644
--- a/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
@@ -145,6 +145,7 @@ const DraggableFieldName = ({
                 size="md"
                 name={visible ? 'eye' : 'eye-slash'}
                 onClick={() => onToggleVisibility(fieldName, visible)}
+                tooltip={visible ? 'Disable' : 'Enable'}
               />
               <span className={styles.name} title={fieldName}>
                 {fieldName}
diff --git a/public/app/features/transformers/extractFields/components/JSONPathEditor.tsx b/public/app/features/transformers/extractFields/components/JSONPathEditor.tsx
index a48e954bea4..40bc775f32e 100644
--- a/public/app/features/transformers/extractFields/components/JSONPathEditor.tsx
+++ b/public/app/features/transformers/extractFields/components/JSONPathEditor.tsx
@@ -67,7 +67,7 @@ export function JSONPathEditor({ options, onChange }: Props) {
                 />
               </InlineField>
               <InlineField className={cx(style.removeIcon)}>
-                <IconButton onClick={() => removeJSONPath(key)} name={'trash-alt'} />
+                <IconButton onClick={() => removeJSONPath(key)} name={'trash-alt'} tooltip="Remove path" />
               </InlineField>
             </InlineFieldRow>
           </li>
diff --git a/public/app/features/variables/editor/VariableEditorListRow.tsx b/public/app/features/variables/editor/VariableEditorListRow.tsx
index d1a6d3987c9..5b378bb0afb 100644
--- a/public/app/features/variables/editor/VariableEditorListRow.tsx
+++ b/public/app/features/variables/editor/VariableEditorListRow.tsx
@@ -94,7 +94,7 @@ export function VariableEditorListRow({
                 propsOnDuplicate(identifier);
               }}
               name="copy"
-              title="Duplicate variable"
+              tooltip="Duplicate variable"
               aria-label={selectors.pages.Dashboard.Settings.Variables.List.tableRowDuplicateButtons(variable.name)}
             />
           </td>
@@ -107,7 +107,7 @@ export function VariableEditorListRow({
                 propsOnDelete(identifier);
               }}
               name="trash-alt"
-              title="Remove variable"
+              tooltip="Remove variable"
               aria-label={selectors.pages.Dashboard.Settings.Variables.List.tableRowRemoveButtons(variable.name)}
             />
           </td>
diff --git a/public/app/features/variables/inspect/VariableUsagesButton.tsx b/public/app/features/variables/inspect/VariableUsagesButton.tsx
index 66e1d945750..5ac6ebcdd6a 100644
--- a/public/app/features/variables/inspect/VariableUsagesButton.tsx
+++ b/public/app/features/variables/inspect/VariableUsagesButton.tsx
@@ -35,7 +35,7 @@ export const VariableUsagesButton = ({ id, usages, isAdhoc }: Props) => {
               showModal();
             }}
             name="code-branch"
-            title="Show usages"
+            tooltip="Show usages"
           />
         );
       }}
diff --git a/public/app/features/variables/inspect/VariablesUnknownButton.tsx b/public/app/features/variables/inspect/VariablesUnknownButton.tsx
index 47d7cb33cae..6a842225be3 100644
--- a/public/app/features/variables/inspect/VariablesUnknownButton.tsx
+++ b/public/app/features/variables/inspect/VariablesUnknownButton.tsx
@@ -31,7 +31,7 @@ export const VariablesUnknownButton = ({ id, usages }: Props) => {
           <IconButton
             onClick={() => showModal()}
             name="code-branch"
-            title="Show usages"
+            tooltip="Show usages"
             data-testid="VariablesUnknownButton"
           />
         );
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
index ce7aeac97e3..1152640cc61 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
@@ -33,9 +33,8 @@ export const QueryEditorRow = ({
                 onClick={onHideClick}
                 size="sm"
                 aria-pressed={hidden}
-                aria-label="hide metric"
                 className={styles.icon}
-                type="button"
+                tooltip="Hide metric"
               />
             )}
             <IconButton
@@ -44,8 +43,7 @@ export const QueryEditorRow = ({
               className={styles.icon}
               onClick={onRemoveClick || noop}
               disabled={!onRemoveClick}
-              aria-label="remove metric"
-              type="button"
+              tooltip="Remove metric"
             />
           </span>
         </InlineLabel>
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx
index fa7c54a532c..dd08f32be0b 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx
@@ -72,7 +72,7 @@ export const NestedQuery = React.memo<Props>(
             />
           </div>
           <FlexItem grow={1} />
-          <IconButton ariaLabel="Remove nested query" name="times" size="sm" onClick={() => onRemove(index)} />
+          <IconButton name="times" size="sm" onClick={() => onRemove(index)} tooltip="Remove nested query" />
         </div>
         <div className={styles.body}>
           <EditorRows>
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQuery.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQuery.tsx
index f9be626d4ad..039ba43b3f6 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQuery.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQuery.tsx
@@ -71,7 +71,7 @@ export const NestedQuery = React.memo<Props>((props) => {
           />
         </div>
         <FlexItem grow={1} />
-        <IconButton name="times" size="sm" onClick={() => onRemove(index)} />
+        <IconButton name="times" size="sm" onClick={() => onRemove(index)} tooltip="Remove match" />
       </div>
       <div className={styles.body}>
         <EditorRows>
diff --git a/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx b/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx
index 67c38976a40..d3bc421a698 100644
--- a/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx
+++ b/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx
@@ -65,45 +65,45 @@ export const QuickPositioning = ({ onPositionChange, element, settings }: Props)
   return (
     <div className={styles.buttonGroup}>
       <IconButton
-        name={'horizontal-align-left'}
+        name="horizontal-align-left"
         onClick={() => onQuickPositioningChange(QuickPlacement.Left)}
         className={styles.button}
-        size={'lg'}
-        tooltip={'Align left'}
+        size="lg"
+        tooltip="Align left"
       />
       <IconButton
-        name={'horizontal-align-center'}
+        name="horizontal-align-center"
         onClick={() => onQuickPositioningChange(QuickPlacement.HorizontalCenter)}
         className={styles.button}
-        size={'lg'}
-        tooltip={'Align horizontal centers'}
+        size="lg"
+        tooltip="Align horizontal centers"
       />
       <IconButton
-        name={'horizontal-align-right'}
+        name="horizontal-align-right"
         onClick={() => onQuickPositioningChange(QuickPlacement.Right)}
         className={styles.button}
-        size={'lg'}
-        tooltip={'Align right'}
+        size="lg"
+        tooltip="Align right"
       />
       <IconButton
-        name={'vertical-align-top'}
+        name="vertical-align-top"
         onClick={() => onQuickPositioningChange(QuickPlacement.Top)}
-        size={'lg'}
-        tooltip={'Align top'}
+        size="lg"
+        tooltip="Align top"
       />
       <IconButton
-        name={'vertical-align-center'}
+        name="vertical-align-center"
         onClick={() => onQuickPositioningChange(QuickPlacement.VerticalCenter)}
         className={styles.button}
-        size={'lg'}
-        tooltip={'Align vertical centers'}
+        size="lg"
+        tooltip="Align vertical centers"
       />
       <IconButton
-        name={'vertical-align-bottom'}
+        name="vertical-align-bottom"
         onClick={() => onQuickPositioningChange(QuickPlacement.Bottom)}
         className={styles.button}
-        size={'lg'}
-        tooltip={'Align bottom'}
+        size="lg"
+        tooltip="Align bottom"
       />
     </div>
   );
diff --git a/public/app/plugins/panel/canvas/editor/inline/InlineEdit.tsx b/public/app/plugins/panel/canvas/editor/inline/InlineEdit.tsx
index 666f555f753..a0b3ecc159a 100644
--- a/public/app/plugins/panel/canvas/editor/inline/InlineEdit.tsx
+++ b/public/app/plugins/panel/canvas/editor/inline/InlineEdit.tsx
@@ -84,7 +84,13 @@ export function InlineEdit({ onClose, id, scene }: Props) {
               <strong className={styles.inlineEditorHeader}>
                 <div className={styles.placeholder} />
                 <div>Canvas Inline Editor</div>
-                <IconButton name="times" size="xl" className={styles.inlineEditorClose} onClick={onClose} />
+                <IconButton
+                  name="times"
+                  size="xl"
+                  className={styles.inlineEditorClose}
+                  onClick={onClose}
+                  tooltip="Close inline editor"
+                />
               </strong>
               <div className={styles.inlineEditorContentWrapper}>
                 <div className={styles.inlineEditorContent}>
diff --git a/public/app/plugins/panel/canvas/editor/layer/TreeNodeTitle.tsx b/public/app/plugins/panel/canvas/editor/layer/TreeNodeTitle.tsx
index db67023f2cd..26018ec43bf 100644
--- a/public/app/plugins/panel/canvas/editor/layer/TreeNodeTitle.tsx
+++ b/public/app/plugins/panel/canvas/editor/layer/TreeNodeTitle.tsx
@@ -73,15 +73,17 @@ export const TreeNodeTitle = ({ settings, nodeData, setAllowSelection }: Props)
         <div className={styles.actionButtonsWrapper}>
           <IconButton
             name="copy"
-            title={'Duplicate'}
+            title="Duplicate"
             className={styles.actionIcon}
             onClick={() => onDuplicate(element)}
+            tooltip="Duplicate"
           />
           <IconButton
             name="trash-alt"
-            title={'remove'}
+            title="remove"
             className={styles.actionIcon}
             onClick={() => onDelete(element)}
+            tooltip="Remove"
           />
         </div>
       )}
diff --git a/public/app/plugins/panel/debug/RenderInfoViewer.tsx b/public/app/plugins/panel/debug/RenderInfoViewer.tsx
index d26ecd64408..a18fe4231f8 100644
--- a/public/app/plugins/panel/debug/RenderInfoViewer.tsx
+++ b/public/app/plugins/panel/debug/RenderInfoViewer.tsx
@@ -74,7 +74,7 @@ export class RenderInfoViewer extends Component<Props> {
     return (
       <div>
         <div>
-          <IconButton name="step-backward" title="reset counters" onClick={this.resetCounters} />
+          <IconButton name="step-backward" title="reset counters" onClick={this.resetCounters} tooltip="Step back" />
           <span>
             {showCounters.render && <span>Render: {this.counters.render}&nbsp;</span>}
             {showCounters.dataChanged && <span>Data: {this.counters.dataChanged}&nbsp;</span>}
diff --git a/public/app/plugins/panel/timeseries/LineStyleEditor.tsx b/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
index fba7f15f96c..8ac547d52a3 100644
--- a/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
+++ b/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
@@ -113,7 +113,7 @@ export const LineStyleEditor = ({ value, onChange }: Props) => {
               target="_blank"
               rel="noreferrer"
             >
-              <IconButton name="question-circle" />
+              <IconButton name="question-circle" tooltip="Help" />
             </a>
           </div>
         </>
diff --git a/public/app/plugins/panel/timeseries/TimezonesEditor.tsx b/public/app/plugins/panel/timeseries/TimezonesEditor.tsx
index 127a0cbd5fe..4e47a88b30d 100644
--- a/public/app/plugins/panel/timeseries/TimezonesEditor.tsx
+++ b/public/app/plugins/panel/timeseries/TimezonesEditor.tsx
@@ -46,9 +46,9 @@ export const TimezonesEditor = ({ value, onChange }: Props) => {
             />
           </span>
           {idx === value.length - 1 ? (
-            <IconButton ariaLabel="Add timezone" name="plus" onClick={addTimezone} />
+            <IconButton name="plus" onClick={addTimezone} tooltip="Add timezone" />
           ) : (
-            <IconButton ariaLabel="Remove timezone" name="times" onClick={() => removeTimezone(idx)} />
+            <IconButton name="times" onClick={() => removeTimezone(idx)} tooltip="Remove timezone" />
           )}
         </div>
       ))}
diff --git a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationTooltip.tsx b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationTooltip.tsx
index 6820d455b21..4654dabb986 100644
--- a/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationTooltip.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationTooltip.tsx
@@ -56,8 +56,8 @@ export const AnnotationTooltip = ({
   if (canEdit || canDelete) {
     editControls = (
       <div className={styles.editControls}>
-        {canEdit && <IconButton name={'pen'} size={'sm'} onClick={onEdit} />}
-        {canDelete && <IconButton name={'trash-alt'} size={'sm'} onClick={onDelete} />}
+        {canEdit && <IconButton name={'pen'} size={'sm'} onClick={onEdit} tooltip="Edit" />}
+        {canDelete && <IconButton name={'trash-alt'} size={'sm'} onClick={onDelete} tooltip="Delete" />}
       </div>
     );
   }
diff --git a/public/app/plugins/panel/xychart/AutoEditor.tsx b/public/app/plugins/panel/xychart/AutoEditor.tsx
index 3dbaae8a891..d5f4efe6f5a 100644
--- a/public/app/plugins/panel/xychart/AutoEditor.tsx
+++ b/public/app/plugins/panel/xychart/AutoEditor.tsx
@@ -132,6 +132,7 @@ export const AutoEditor = ({
                     exclude,
                   });
                 }}
+                tooltip={v.value ? 'Disable' : 'Enable'}
               />
               {v.label}
             </div>
diff --git a/public/app/plugins/panel/xychart/ManualEditor.tsx b/public/app/plugins/panel/xychart/ManualEditor.tsx
index d038f65bd01..93c772b5625 100644
--- a/public/app/plugins/panel/xychart/ManualEditor.tsx
+++ b/public/app/plugins/panel/xychart/ManualEditor.tsx
@@ -77,6 +77,7 @@ export const ManualEditor = ({
                 title={'remove'}
                 className={cx(style.actionIcon)}
                 onClick={() => onSeriesDelete(index)}
+                tooltip="Delete series"
               />
             </div>
           );