diff --git a/packages/grafana-ui/src/components/Button/Button.mdx b/packages/grafana-ui/src/components/Button/Button.mdx
index a355676e553..a2ba4801337 100644
--- a/packages/grafana-ui/src/components/Button/Button.mdx
+++ b/packages/grafana-ui/src/components/Button/Button.mdx
@@ -1,4 +1,4 @@
-import { Meta, Story, Preview, Props } from '@storybook/addon-docs/blocks';
+import { Meta, Preview, ArgsTable } from '@storybook/addon-docs/blocks';
 import { Button, LinkButton } from './Button';
 
 <Meta title="MDX|Button" component={Button} />
@@ -80,7 +80,7 @@ Used for triggering a removing or deleting action. Because of its dominant color
   </div>
 </Preview>
 
-<Props of={Button} />
+<ArgsTable of={Button} />
 
 ## Links
 
diff --git a/packages/grafana-ui/src/components/Button/Button.story.tsx b/packages/grafana-ui/src/components/Button/Button.story.tsx
index b61f3aded5b..5377116997b 100644
--- a/packages/grafana-ui/src/components/Button/Button.story.tsx
+++ b/packages/grafana-ui/src/components/Button/Button.story.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { Story, Meta } from '@storybook/react';
 import { allButtonVariants, allButtonFills, Button, ButtonProps } from './Button';
-import { iconOptions } from '../../utils/storybook/knobs';
 import mdx from './Button.mdx';
 import { HorizontalGroup, VerticalGroup } from '../Layout/Layout';
 import { ButtonGroup } from './ButtonGroup';
@@ -11,11 +10,6 @@ import { Card } from '../Card/Card';
 export default {
   title: 'Buttons/Button',
   component: Button,
-  argTypes: {
-    variant: { control: 'select' },
-    size: { control: 'select' },
-    icon: { control: { type: 'select', options: iconOptions } },
-  },
   parameters: {
     docs: {
       page: mdx,
@@ -23,13 +17,10 @@ export default {
     knobs: {
       disable: true,
     },
-    controls: {
-      exclude: ['css', 'className'],
-    },
   },
 } as Meta;
 
-export const Variants: Story<ButtonProps> = ({ children, ...args }) => {
+export const Variants: Story<ButtonProps> = () => {
   const sizes: ComponentSize[] = ['lg', 'md', 'sm'];
   return (
     <VerticalGroup>