diff --git a/new-lamassu-admin/src/components/Tooltip.js b/new-lamassu-admin/src/components/Tooltip.js
index 543bd215..108b71ca 100644
--- a/new-lamassu-admin/src/components/Tooltip.js
+++ b/new-lamassu-admin/src/components/Tooltip.js
@@ -11,9 +11,6 @@ const useStyles = makeStyles({
     marginTop: 4,
     cursor: 'pointer'
   },
-  preventDefaultTooltip: {
-    pointerEvents: 'none'
-  },
   popoverContent: ({ width }) => ({
     width,
     padding: [[10, 15]]
@@ -53,9 +50,7 @@ const Tooltip = memo(
             onPointerOver={event => enableOver && handleOpenHelpPopper(event)}
             onClick={event => enableClick && handleOpenHelpPopper(event)}
             {...props}>
-            {Button !== FeatureButton && (
-              <Icon className={classes.preventDefaultTooltip}></Icon>
-            )}
+            {Button !== FeatureButton && <Icon></Icon>}
           </Button>
           <Popper
             open={helpPopperOpen}
diff --git a/new-lamassu-admin/src/components/buttons/ActionButton.js b/new-lamassu-admin/src/components/buttons/ActionButton.js
index af739883..d5229b01 100644
--- a/new-lamassu-admin/src/components/buttons/ActionButton.js
+++ b/new-lamassu-admin/src/components/buttons/ActionButton.js
@@ -19,7 +19,7 @@ const ActionButton = memo(
       <button className={classnames(classNames, className)} {...props}>
         {Icon && (
           <div className={classes.actionButtonIcon}>
-            <Icon className={classes.preventDefaultTooltip} />
+            <Icon />
           </div>
         )}
         {InverseIcon && (
diff --git a/new-lamassu-admin/src/components/buttons/ActionButton.styles.js b/new-lamassu-admin/src/components/buttons/ActionButton.styles.js
index fa5c43cb..a775f811 100644
--- a/new-lamassu-admin/src/components/buttons/ActionButton.styles.js
+++ b/new-lamassu-admin/src/components/buttons/ActionButton.styles.js
@@ -23,9 +23,6 @@ const colors = (color1, color2, color3) => {
 }
 
 export default {
-  preventDefaultTooltip: {
-    pointerEvents: 'none'
-  },
   actionButton: {
     extend: p,
     cursor: 'pointer',
diff --git a/new-lamassu-admin/src/components/buttons/FeatureButton.js b/new-lamassu-admin/src/components/buttons/FeatureButton.js
index 139c1570..3fe97cd7 100644
--- a/new-lamassu-admin/src/components/buttons/FeatureButton.js
+++ b/new-lamassu-admin/src/components/buttons/FeatureButton.js
@@ -7,9 +7,6 @@ import baseButtonStyles from './BaseButton.styles'
 const { baseButton, primary } = baseButtonStyles
 
 const styles = {
-  preventDefaultTooltip: {
-    pointerEvents: 'none'
-  },
   featureButton: {
     extend: baseButton,
     width: baseButton.height,
@@ -47,7 +44,7 @@ const FeatureButton = memo(
       <button className={classnames(classNames, className)} {...props}>
         {Icon && (
           <div className={classes.buttonIcon}>
-            <Icon className={classes.preventDefaultTooltip} />
+            <Icon />
           </div>
         )}
         {InverseIcon && (
diff --git a/new-lamassu-admin/src/components/buttons/SimpleButton.js b/new-lamassu-admin/src/components/buttons/SimpleButton.js
index 9aece544..7e7bce12 100644
--- a/new-lamassu-admin/src/components/buttons/SimpleButton.js
+++ b/new-lamassu-admin/src/components/buttons/SimpleButton.js
@@ -7,9 +7,6 @@ import baseButtonStyles from './BaseButton.styles'
 const { baseButton, primary } = baseButtonStyles
 
 const styles = {
-  preventDefaultTooltip: {
-    pointerEvents: 'none'
-  },
   button: {
     extend: baseButton,
     borderRadius: baseButton.height / 2,
@@ -41,7 +38,7 @@ const SimpleButton = memo(
         {...props}>
         {Icon && (
           <div className={classes.buttonIcon}>
-            <Icon className={classes.preventDefaultTooltip} />
+            <Icon />
           </div>
         )}
         {InverseIcon && (
diff --git a/new-lamassu-admin/src/components/inputs/base/Select.js b/new-lamassu-admin/src/components/inputs/base/Select.js
index 1e23df99..15901774 100644
--- a/new-lamassu-admin/src/components/inputs/base/Select.js
+++ b/new-lamassu-admin/src/components/inputs/base/Select.js
@@ -39,7 +39,7 @@ function Select({ label, items, ...props }) {
       <label {...getLabelProps()}>{startCase(label)}</label>
       <button {...getToggleButtonProps()}>
         <span className={classes.selectedItem}>{startCase(selectedItem)}</span>
-        <Arrowdown className={classes.preventDefaultTooltip} />
+        <Arrowdown />
       </button>
       <ul {...getMenuProps()}>
         {isOpen &&
diff --git a/new-lamassu-admin/src/components/inputs/base/Select.styles.js b/new-lamassu-admin/src/components/inputs/base/Select.styles.js
index 24614781..bc9c8dde 100644
--- a/new-lamassu-admin/src/components/inputs/base/Select.styles.js
+++ b/new-lamassu-admin/src/components/inputs/base/Select.styles.js
@@ -6,9 +6,6 @@ const { p, label1 } = typographyStyles
 const WIDTH = 152
 
 export default {
-  preventDefaultTooltip: {
-    pointerEvents: 'none'
-  },
   selectedItem: {
     width: WIDTH - 41,
     display: 'block',