diff --git a/docs/src/components/ComponentDoc/ComponentControls/ComponentControls.js b/docs/src/components/ComponentDoc/ComponentControls/ComponentControls.js
index 35769d0d74..dbfa5c6416 100644
--- a/docs/src/components/ComponentDoc/ComponentControls/ComponentControls.js
+++ b/docs/src/components/ComponentDoc/ComponentControls/ComponentControls.js
@@ -12,7 +12,7 @@ const ComponentControls = (props) => {
   const { anchorName, examplePath, showHTML, showCode, onCopyLink, onShowHTML, onShowCode } = props
 
   return (
-    <Menu color='green' compact icon size='small' text>
+    <Menu color='green' compact icon='labeled' size='tiny' text>
       <ComponentControlsCopyLink anchorName={anchorName} onClick={onCopyLink} />
       <ComponentControlsMaximize examplePath={examplePath} />
       <ComponentControlsShowHtml active={showHTML} onClick={onShowHTML} />
@@ -29,7 +29,6 @@ ComponentControls.propTypes = {
   onShowHTML: PropTypes.func,
   showCode: PropTypes.bool,
   showHTML: PropTypes.bool,
-  visible: PropTypes.bool,
 }
 
-export default updateForKeys(['showCode', 'showHTML', 'visible'])(ComponentControls)
+export default updateForKeys(['showCode', 'showHTML'])(ComponentControls)
diff --git a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsCopyLink.js b/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsCopyLink.js
index c31fa24a49..b0cd3916d4 100644
--- a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsCopyLink.js
+++ b/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsCopyLink.js
@@ -2,8 +2,6 @@ import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 import { Icon, Menu } from 'semantic-ui-react'
 
-import ComponentControlsToolTip from './ComponentControlsToolTip'
-
 export default class ComponentControlsCopyLink extends Component {
   state = {}
 
@@ -41,11 +39,10 @@ export default class ComponentControlsCopyLink extends Component {
     const { active } = this.state
 
     return (
-      <ComponentControlsToolTip content={active ? ' Copied Link!' : 'Direct link'}>
-        <Menu.Item href={`#${anchorName}`} onClick={this.handleClick}>
-          <Icon color={active ? 'green' : 'grey'} fitted name='linkify' size='large' />
-        </Menu.Item>
-      </ComponentControlsToolTip>
+      <Menu.Item href={`#${anchorName}`} onClick={this.handleClick}>
+        <Icon color={active ? 'green' : 'grey'} fitted name='linkify' size='large' />
+        {active ? ' Copied Link!' : 'Direct link'}
+      </Menu.Item>
     )
   }
 }
diff --git a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsEditCode.js b/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsEditCode.js
index f4a5d2c1ee..8f09425276 100644
--- a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsEditCode.js
+++ b/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsEditCode.js
@@ -2,15 +2,11 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import { Icon, Menu } from 'semantic-ui-react'
 
-import { updateForKeys } from 'docs/src/hoc'
-import ComponentControlsToolTip from './ComponentControlsToolTip'
-
 const ComponentControlsEditCode = ({ active, onClick }) => (
-  <ComponentControlsToolTip content='Edit Code'>
-    <Menu.Item active={active} onClick={onClick}>
-      <Icon color={active ? 'green' : 'grey'} fitted name='code' size='large' />
-    </Menu.Item>
-  </ComponentControlsToolTip>
+  <Menu.Item active={active} onClick={onClick}>
+    <Icon color={active ? 'green' : 'grey'} fitted name='code' size='large' />
+    Try it
+  </Menu.Item>
 )
 
 ComponentControlsEditCode.propTypes = {
@@ -18,4 +14,4 @@ ComponentControlsEditCode.propTypes = {
   onClick: PropTypes.func,
 }
 
-export default updateForKeys(['active'])(ComponentControlsEditCode)
+export default ComponentControlsEditCode
diff --git a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsMaximize.js b/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsMaximize.js
index f92a7b555c..e5c7ccd0eb 100644
--- a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsMaximize.js
+++ b/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsMaximize.js
@@ -3,22 +3,18 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import { Icon, Menu } from 'semantic-ui-react'
 
-import { neverUpdate } from 'docs/src/hoc'
-import ComponentControlsToolTip from './ComponentControlsToolTip'
-
 const ComponentControlsMaximize = ({ examplePath }) => {
   const href = `/maximize/${_.kebabCase(examplePath.split('/').slice(-1))}`
 
   return (
-    <ComponentControlsToolTip content='Full Screen'>
-      <Menu.Item href={href} target='_blank'>
-        <Icon color='grey' fitted name='window maximize' size='large' />
-      </Menu.Item>
-    </ComponentControlsToolTip>
+    <Menu.Item href={href} target='_blank'>
+      <Icon color='grey' fitted name='window maximize' size='large' />
+      Maximize
+    </Menu.Item>
   )
 }
 ComponentControlsMaximize.propTypes = {
   examplePath: PropTypes.string.isRequired,
 }
 
-export default neverUpdate(ComponentControlsMaximize)
+export default ComponentControlsMaximize
diff --git a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsShowHtml.js b/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsShowHtml.js
index fb0b5393f3..cfd8cd2660 100644
--- a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsShowHtml.js
+++ b/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsShowHtml.js
@@ -2,15 +2,11 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import { Icon, Menu } from 'semantic-ui-react'
 
-import { updateForKeys } from 'docs/src/hoc'
-import ComponentControlsToolTip from './ComponentControlsToolTip'
-
 const ComponentControlsShowHtml = ({ active, onClick }) => (
-  <ComponentControlsToolTip content='Show HTML'>
-    <Menu.Item active={active} onClick={onClick}>
-      <Icon color={active ? 'green' : 'grey'} size='large' name='html5' fitted />
-    </Menu.Item>
-  </ComponentControlsToolTip>
+  <Menu.Item active={active} onClick={onClick}>
+    <Icon color={active ? 'green' : 'grey'} size='large' name='html5' fitted />
+    Show HTML
+  </Menu.Item>
 )
 
 ComponentControlsShowHtml.propTypes = {
@@ -18,4 +14,4 @@ ComponentControlsShowHtml.propTypes = {
   onClick: PropTypes.func,
 }
 
-export default updateForKeys(['active'])(ComponentControlsShowHtml)
+export default ComponentControlsShowHtml
diff --git a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsToolTip.js b/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsToolTip.js
deleted file mode 100644
index bbaf350ac6..0000000000
--- a/docs/src/components/ComponentDoc/ComponentControls/ComponentControlsToolTip.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-import { Popup } from 'semantic-ui-react'
-
-const toolTipStyle = {
-  padding: '0.5em',
-  textAlign: 'center',
-  width: 100,
-}
-
-const ComponentControlsToolTip = ({ children, content }) => (
-  <Popup
-    content={content}
-    inverted
-    mouseEnterDelay={800}
-    position='top center'
-    size='tiny'
-    style={toolTipStyle}
-    trigger={children}
-  />
-)
-
-ComponentControlsToolTip.propTypes = {
-  children: PropTypes.node,
-  content: PropTypes.node,
-}
-
-export default ComponentControlsToolTip