diff --git a/src/renderer/component/common/tooltip.jsx b/src/renderer/component/common/tooltip.jsx
index ec6fa4f46..e0045d4a1 100644
--- a/src/renderer/component/common/tooltip.jsx
+++ b/src/renderer/component/common/tooltip.jsx
@@ -8,7 +8,7 @@ type Props = {
   children: ?React.Node,
   icon: ?boolean,
   direction: string,
-  noPadding?: boolean,
+  onFormField?: boolean,
 };
 
 class ToolTip extends React.PureComponent<Props> {
@@ -17,7 +17,7 @@ class ToolTip extends React.PureComponent<Props> {
   };
 
   render() {
-    const { children, label, body, icon, direction, noPadding } = this.props;
+    const { children, label, body, icon, direction, onFormField } = this.props;
 
     const tooltipContent = children || label;
 
@@ -30,7 +30,7 @@ class ToolTip extends React.PureComponent<Props> {
           'tooltip--right': direction === 'right',
           'tooltip--bottom': direction === 'bottom',
           'tooltip--left': direction === 'left',
-          'tooltip--no-padding': noPadding
+          'tooltip--on-formfield': onFormField,
         })}
       >
         {tooltipContent}
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index d1c359e81..b47ad5879 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -220,7 +220,7 @@ class FilePage extends React.Component<Props> {
                   onChange={this.onAutoplayChange}
                   postfix={
                     <ToolTip
-                      noPadding
+                      onFormField
                       label={__('Autoplay')}
                       body={__('Automatically download and play free content.')}
                     />
diff --git a/src/renderer/scss/component/_tooltip.scss b/src/renderer/scss/component/_tooltip.scss
index 2c34933e0..a85bdfc4a 100644
--- a/src/renderer/scss/component/_tooltip.scss
+++ b/src/renderer/scss/component/_tooltip.scss
@@ -4,7 +4,7 @@
 }
 
 // When there is a label for the tooltip and not just using a button or icon
-.tooltip.tooltip--label {
+.tooltip--label {
   font-size: 14px;
   padding-left: $spacing-vertical * 1/3;
 
@@ -13,11 +13,11 @@
   }
 }
 
-.tooltip.tooltip--no-padding {
+.tooltip--on-formfield {
   padding: 0;
 }
 
-.tooltip.tooltip--icon {
+.tooltip--icon {
   margin-top: 5px;
 }
 
@@ -46,7 +46,7 @@
   border-style: solid;
 }
 
-.tooltip.tooltip--top .tooltip__body {
+.tooltip--top .tooltip__body {
   bottom: 100%;
   left: 50%;
   margin-left: -100px;
@@ -59,7 +59,7 @@
   }
 }
 
-.tooltip.tooltip--right .tooltip__body {
+.tooltip--right .tooltip__body {
   margin-top: -5px;
   margin-left: 10px;
 
@@ -71,7 +71,7 @@
   }
 }
 
-.tooltip.tooltip--bottom .tooltip__body {
+.tooltip--bottom .tooltip__body {
   top: 90%;
   left: 50%;
   margin-left: -100px;
@@ -84,7 +84,7 @@
   }
 }
 
-.tooltip.tooltip--left .tooltip__body {
+.tooltip--left .tooltip__body {
   top: -5px;
   right: 105%;