diff --git a/new-lamassu-admin/src/components/ConfirmDialog.js b/new-lamassu-admin/src/components/ConfirmDialog.js
index 7b52d139..7cbb62a8 100644
--- a/new-lamassu-admin/src/components/ConfirmDialog.js
+++ b/new-lamassu-admin/src/components/ConfirmDialog.js
@@ -10,6 +10,7 @@ import React, { useEffect, useState, memo } from 'react'
 import { Button, IconButton } from 'src/components/buttons'
 import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
 
+import Tooltip from './Tooltip'
 import { TextInput } from './inputs'
 import { H4, P } from './typography'
 
@@ -41,13 +42,16 @@ export const DialogTitle = ({ children, onClose }) => {
     <div className={classes.wrapper}>
       {children}
       {onClose && (
-        <IconButton
-          size={16}
-          aria-label="close"
+        <Tooltip
           className={classes.closeButton}
-          onClick={onClose}>
-          <CloseIcon />
-        </IconButton>
+          enableOver
+          element={
+            <IconButton size={16} aria-label="close" onClick={onClose}>
+              <CloseIcon />
+            </IconButton>
+          }>
+          <P>Close</P>
+        </Tooltip>
       )}
     </div>
   )
diff --git a/new-lamassu-admin/src/components/HelpTooltip.js b/new-lamassu-admin/src/components/HelpTooltip.js
deleted file mode 100644
index bcbf19df..00000000
--- a/new-lamassu-admin/src/components/HelpTooltip.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import { makeStyles, ClickAwayListener } from '@material-ui/core'
-import React, { useState, memo } from 'react'
-
-import Popper from 'src/components/Popper'
-import { P } from 'src/components/typography'
-import { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg'
-
-const useStyles = makeStyles({
-  transparentButton: {
-    border: 'none',
-    backgroundColor: 'transparent',
-    marginTop: 4,
-    cursor: 'pointer'
-  },
-  popoverContent: ({ width }) => ({
-    width,
-    padding: [[10, 15]]
-  })
-})
-
-const HelpTooltip = memo(({ children, width }) => {
-  const classes = useStyles({ width })
-  const [helpPopperAnchorEl, setHelpPopperAnchorEl] = useState(null)
-
-  const handleOpenHelpPopper = event => {
-    setHelpPopperAnchorEl(helpPopperAnchorEl ? null : event.currentTarget)
-  }
-
-  const handleCloseHelpPopper = () => {
-    setHelpPopperAnchorEl(null)
-  }
-
-  const helpPopperOpen = Boolean(helpPopperAnchorEl)
-
-  return (
-    <ClickAwayListener onClickAway={handleCloseHelpPopper}>
-      <button
-        className={classes.transparentButton}
-        onClick={handleOpenHelpPopper}>
-        <HelpIcon />
-        <Popper
-          open={helpPopperOpen}
-          anchorEl={helpPopperAnchorEl}
-          placement="bottom"
-          onClose={handleCloseHelpPopper}>
-          <div className={classes.popoverContent}>
-            <P>{children}</P>
-          </div>
-        </Popper>
-      </button>
-    </ClickAwayListener>
-  )
-})
-
-export default HelpTooltip
diff --git a/new-lamassu-admin/src/components/Modal.js b/new-lamassu-admin/src/components/Modal.js
index 98a5a362..8d9d150c 100644
--- a/new-lamassu-admin/src/components/Modal.js
+++ b/new-lamassu-admin/src/components/Modal.js
@@ -3,9 +3,11 @@ import classnames from 'classnames'
 import React from 'react'
 
 import { IconButton } from 'src/components/buttons'
-import { H1, H4 } from 'src/components/typography'
+import { H1, H4, P } from 'src/components/typography'
 import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
 
+import Tooltip from './Tooltip'
+
 const styles = {
   modal: {
     display: 'flex',
@@ -74,12 +76,16 @@ const Modal = ({
         <Paper className={classnames(classes.wrapper, className)}>
           <div className={classes.header}>
             {title && <TitleCase className={classes.title}>{title}</TitleCase>}
-            <IconButton
-              size={closeSize}
+            <Tooltip
+              enableOver
               className={classes.button}
-              onClick={() => handleClose()}>
-              <CloseIcon />
-            </IconButton>
+              element={
+                <IconButton size={closeSize} onClick={() => handleClose()}>
+                  <CloseIcon />
+                </IconButton>
+              }>
+              <P>Close</P>
+            </Tooltip>
           </div>
           <div className={classes.content}>{children}</div>
         </Paper>
diff --git a/new-lamassu-admin/src/components/Tooltip.js b/new-lamassu-admin/src/components/Tooltip.js
new file mode 100644
index 00000000..6a485111
--- /dev/null
+++ b/new-lamassu-admin/src/components/Tooltip.js
@@ -0,0 +1,82 @@
+import { makeStyles, ClickAwayListener } from '@material-ui/core'
+import classnames from 'classnames'
+import React, { useState, memo, cloneElement } from 'react'
+
+import Popper from 'src/components/Popper'
+import { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg'
+
+const useStyles = makeStyles({
+  transparentButton: {
+    border: 'none',
+    backgroundColor: 'transparent',
+    marginTop: 4,
+    cursor: 'pointer'
+  },
+  preventDefaultTooltip: {
+    pointerEvents: 'none'
+  },
+  popoverContent: ({ width }) => ({
+    width,
+    padding: [[10, 15]]
+  })
+})
+
+const Tooltip = memo(
+  ({
+    enableOver = false,
+    enableClick = false,
+    className,
+    element,
+    children,
+    width,
+    ...props
+  }) => {
+    const classes = useStyles({ width })
+    const [helpPopperAnchorEl, setHelpPopperAnchorEl] = useState(null)
+
+    const handleOpenHelpPopper = event => {
+      setHelpPopperAnchorEl(helpPopperAnchorEl ? null : event.currentTarget)
+    }
+
+    const handleCloseHelpPopper = () => {
+      setHelpPopperAnchorEl(null)
+    }
+
+    const helpPopperOpen = Boolean(helpPopperAnchorEl)
+
+    return (
+      <ClickAwayListener onClickAway={handleCloseHelpPopper}>
+        <button
+          type={'button'}
+          className={classnames(className, classes.transparentButton)}
+          onPointerOver={event => enableOver && handleOpenHelpPopper(event)}
+          onClick={
+            element?.props?.onClick
+              ? element.props.onClick
+              : event => enableClick && handleOpenHelpPopper(event)
+          }
+          {...props}>
+          {element &&
+            cloneElement(element, {
+              className: classnames(
+                element.props.className,
+                classes.preventDefaultTooltip
+              )
+            })}
+          {!element && (
+            <HelpIcon className={classes.preventDefaultTooltip}></HelpIcon>
+          )}
+          <Popper
+            open={helpPopperOpen}
+            anchorEl={helpPopperAnchorEl}
+            placement="bottom"
+            onClose={handleCloseHelpPopper}>
+            <div className={classes.popoverContent}>{children}</div>
+          </Popper>
+        </button>
+      </ClickAwayListener>
+    )
+  }
+)
+
+export default Tooltip
diff --git a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js
index 66045266..a6515047 100644
--- a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js
+++ b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js
@@ -2,14 +2,16 @@ import { makeStyles } from '@material-ui/core/styles'
 import classnames from 'classnames'
 import React, { useState, memo } from 'react'
 
-import { Link } from 'src/components/buttons'
+import { Link, IconButton } from 'src/components/buttons'
 import { RadioGroup } from 'src/components/inputs'
 import { Table, TableBody, TableRow, TableCell } from 'src/components/table'
 import BooleanCell from 'src/components/tables/BooleanCell'
-import { H4 } from 'src/components/typography'
+import { H4, P } from 'src/components/typography'
 import { ReactComponent as EditIconDisabled } from 'src/styling/icons/action/edit/disabled.svg'
 import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
 
+import Tooltip from '../Tooltip'
+
 import { booleanPropertiesTableStyles } from './BooleanPropertiesTable.styles'
 
 const useStyles = makeStyles(booleanPropertiesTableStyles)
@@ -69,11 +71,25 @@ const BooleanPropertiesTable = memo(
               </Link>
             </div>
           ) : (
-            <div className={classes.transparentButton}>
-              <button disabled={disabled} onClick={() => setEditing(true)}>
-                {disabled ? <EditIconDisabled /> : <EditIcon />}
-              </button>
-            </div>
+            <>
+              {disabled && (
+                <IconButton disabled>
+                  <EditIconDisabled />
+                </IconButton>
+              )}
+
+              {!disabled && (
+                <Tooltip
+                  enableOver
+                  element={
+                    <IconButton onClick={() => setEditing(true)}>
+                      <EditIcon />
+                    </IconButton>
+                  }>
+                  <P>Configure the following properties as desired</P>
+                </Tooltip>
+              )}
+            </>
           )}
         </div>
         <Table className={classes.fillColumn}>
diff --git a/new-lamassu-admin/src/components/buttons/ActionButton.js b/new-lamassu-admin/src/components/buttons/ActionButton.js
index d5229b01..af739883 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 />
+            <Icon className={classes.preventDefaultTooltip} />
           </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 a775f811..fa5c43cb 100644
--- a/new-lamassu-admin/src/components/buttons/ActionButton.styles.js
+++ b/new-lamassu-admin/src/components/buttons/ActionButton.styles.js
@@ -23,6 +23,9 @@ 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 3fe97cd7..139c1570 100644
--- a/new-lamassu-admin/src/components/buttons/FeatureButton.js
+++ b/new-lamassu-admin/src/components/buttons/FeatureButton.js
@@ -7,6 +7,9 @@ import baseButtonStyles from './BaseButton.styles'
 const { baseButton, primary } = baseButtonStyles
 
 const styles = {
+  preventDefaultTooltip: {
+    pointerEvents: 'none'
+  },
   featureButton: {
     extend: baseButton,
     width: baseButton.height,
@@ -44,7 +47,7 @@ const FeatureButton = memo(
       <button className={classnames(classNames, className)} {...props}>
         {Icon && (
           <div className={classes.buttonIcon}>
-            <Icon />
+            <Icon className={classes.preventDefaultTooltip} />
           </div>
         )}
         {InverseIcon && (
diff --git a/new-lamassu-admin/src/components/buttons/SimpleButton.js b/new-lamassu-admin/src/components/buttons/SimpleButton.js
index 7e7bce12..9aece544 100644
--- a/new-lamassu-admin/src/components/buttons/SimpleButton.js
+++ b/new-lamassu-admin/src/components/buttons/SimpleButton.js
@@ -7,6 +7,9 @@ import baseButtonStyles from './BaseButton.styles'
 const { baseButton, primary } = baseButtonStyles
 
 const styles = {
+  preventDefaultTooltip: {
+    pointerEvents: 'none'
+  },
   button: {
     extend: baseButton,
     borderRadius: baseButton.height / 2,
@@ -38,7 +41,7 @@ const SimpleButton = memo(
         {...props}>
         {Icon && (
           <div className={classes.buttonIcon}>
-            <Icon />
+            <Icon className={classes.preventDefaultTooltip} />
           </div>
         )}
         {InverseIcon && (
diff --git a/new-lamassu-admin/src/components/editableTable/Row.js b/new-lamassu-admin/src/components/editableTable/Row.js
index f365de97..c1e38b01 100644
--- a/new-lamassu-admin/src/components/editableTable/Row.js
+++ b/new-lamassu-admin/src/components/editableTable/Row.js
@@ -3,10 +3,11 @@ import { Field, useFormikContext } from 'formik'
 import * as R from 'ramda'
 import React, { useContext } from 'react'
 
+import Tooltip from 'src/components/Tooltip'
 import { Link, IconButton } from 'src/components/buttons'
 import { Td, Tr } from 'src/components/fake-table/Table'
 import { Switch } from 'src/components/inputs'
-import { TL2 } from 'src/components/typography'
+import { TL2, P } from 'src/components/typography'
 import { ReactComponent as DisabledDeleteIcon } from 'src/styling/icons/action/delete/disabled.svg'
 import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
 import { ReactComponent as DisabledEditIcon } from 'src/styling/icons/action/edit/disabled.svg'
@@ -54,19 +55,46 @@ const ActionCol = ({ disabled, editing }) => {
       )}
       {!editing && enableEdit && (
         <Td textAlign="center" width={editWidth}>
-          <IconButton
-            disabled={disableEdit}
-            className={classes.editButton}
-            onClick={() => onEdit && onEdit(values.id)}>
-            {disableEdit ? <DisabledEditIcon /> : <EditIcon />}
-          </IconButton>
+          {!disableEdit && (
+            <Tooltip
+              enableOver
+              element={
+                <IconButton
+                  className={classes.editButton}
+                  onClick={() => onEdit && onEdit(values.id)}>
+                  <EditIcon />
+                </IconButton>
+              }>
+              <P>Modify row contents</P>
+            </Tooltip>
+          )}
+
+          {disableEdit && (
+            <IconButton disabled className={classes.editButton}>
+              <DisabledEditIcon />
+            </IconButton>
+          )}
         </Td>
       )}
       {!editing && enableDelete && (
         <Td textAlign="center" width={deleteWidth}>
-          <IconButton disabled={disabled} onClick={() => onDelete(values.id)}>
-            {disabled ? <DisabledDeleteIcon /> : <DeleteIcon />}
-          </IconButton>
+          {!disabled && (
+            <Tooltip
+              enableOver
+              element={
+                <IconButton onClick={() => onDelete(values.id)}>
+                  <DeleteIcon />
+                </IconButton>
+              }>
+              <P>Delete row</P>
+            </Tooltip>
+          )}
+
+          {disabled && (
+            <IconButton disabled>
+              <DisabledDeleteIcon />
+            </IconButton>
+          )}
         </Td>
       )}
       {!editing && enableToggle && (
diff --git a/new-lamassu-admin/src/components/inputs/base/Select.js b/new-lamassu-admin/src/components/inputs/base/Select.js
index 15901774..2237dbfd 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 />
+        <Arrowdown className={classes.preventDefaultTooltip}/>
       </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 bc9c8dde..24614781 100644
--- a/new-lamassu-admin/src/components/inputs/base/Select.styles.js
+++ b/new-lamassu-admin/src/components/inputs/base/Select.styles.js
@@ -6,6 +6,9 @@ const { p, label1 } = typographyStyles
 const WIDTH = 152
 
 export default {
+  preventDefaultTooltip: {
+    pointerEvents: 'none'
+  },
   selectedItem: {
     width: WIDTH - 41,
     display: 'block',
diff --git a/new-lamassu-admin/src/components/single-row-table/SingleRowTable.js b/new-lamassu-admin/src/components/single-row-table/SingleRowTable.js
index 5df9bbfa..e536932d 100644
--- a/new-lamassu-admin/src/components/single-row-table/SingleRowTable.js
+++ b/new-lamassu-admin/src/components/single-row-table/SingleRowTable.js
@@ -2,6 +2,7 @@ import { makeStyles } from '@material-ui/core'
 import classnames from 'classnames'
 import React from 'react'
 
+import Tooltip from 'src/components/Tooltip'
 import { IconButton } from 'src/components/buttons'
 import {
   Table,
@@ -13,6 +14,8 @@ import {
 } from 'src/components/fake-table/Table'
 import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/white.svg'
 
+import { P } from '../typography'
+
 import styles from './SingleRowTable.styles'
 
 const useStyles = makeStyles(styles)
@@ -23,7 +26,8 @@ const SingleRowTable = ({
   title,
   items,
   onEdit,
-  className
+  className,
+  editMessage
 }) => {
   const classes = useStyles({ width, height })
 
@@ -33,9 +37,15 @@ const SingleRowTable = ({
         <THead>
           <Th className={classes.head}>
             {title}
-            <IconButton onClick={onEdit} className={classes.button}>
-              <EditIcon />
-            </IconButton>
+            <Tooltip
+              enableOver
+              element={
+                <IconButton onClick={onEdit} className={classes.button}>
+                  <EditIcon />
+                </IconButton>
+              }>
+              <P>{editMessage}</P>
+            </Tooltip>
           </Th>
         </THead>
         <TBody>
diff --git a/new-lamassu-admin/src/pages/Cashout/Cashout.js b/new-lamassu-admin/src/pages/Cashout/Cashout.js
index e2b1cf70..292b89c9 100644
--- a/new-lamassu-admin/src/pages/Cashout/Cashout.js
+++ b/new-lamassu-admin/src/pages/Cashout/Cashout.js
@@ -4,7 +4,7 @@ import gql from 'graphql-tag'
 import * as R from 'ramda'
 import React, { useState } from 'react'
 
-import HelpTooltip from 'src/components/HelpTooltip'
+import Tooltip from 'src/components/Tooltip'
 import { NamespacedTable as EditableTable } from 'src/components/editableTable'
 import { Switch } from 'src/components/inputs'
 import TitleSection from 'src/components/layout/TitleSection'
@@ -88,7 +88,7 @@ const CashOut = ({ name: SCREEN_KEY }) => {
           <Label2 className={classes.switchLabel}>
             {fudgeFactorActive ? 'On' : 'Off'}
           </Label2>
-          <HelpTooltip width={304}>
+          <Tooltip width={304} enableClick>
             <P>
               Automatically accept customer deposits as complete if their
               received amount is 10 crypto atoms or less.
@@ -97,7 +97,7 @@ const CashOut = ({ name: SCREEN_KEY }) => {
               (Crypto atoms are the smallest unit in each cryptocurrency. E.g.,
               satoshis in Bitcoin, or wei in Ethereum.)
             </P>
-          </HelpTooltip>
+          </Tooltip>
         </div>
       </TitleSection>
       <EditableTable
diff --git a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.js b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.js
index f293dfbf..247c0e92 100644
--- a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.js
+++ b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.js
@@ -1,8 +1,9 @@
 import { makeStyles } from '@material-ui/core'
 import React from 'react'
 
+import Tooltip from 'src/components/Tooltip'
 import { Link, IconButton } from 'src/components/buttons'
-import { H4 } from 'src/components/typography'
+import { H4, P } from 'src/components/typography'
 import { ReactComponent as DisabledEditIcon } from 'src/styling/icons/action/edit/disabled.svg'
 import { ReactComponent as EditIcon } from 'src/styling/icons/action/edit/enabled.svg'
 
@@ -16,14 +17,27 @@ const Header = ({ title, editing, disabled, setEditing }) => {
   return (
     <div className={classes.header}>
       <H4 className={classes.title}>{title}</H4>
-      {!editing && (
-        <IconButton
-          onClick={() => setEditing(true)}
-          className={classes.button}
-          disabled={disabled}>
-          {disabled ? <DisabledEditIcon /> : <EditIcon />}
+
+      {!editing && !disabled && (
+        <Tooltip
+          enableOver
+          element={
+            <IconButton
+              className={classes.button}
+              onClick={() => setEditing(true)}>
+              <EditIcon />
+            </IconButton>
+          }>
+          <P>Modify value</P>
+        </Tooltip>
+      )}
+
+      {!editing && disabled && (
+        <IconButton disabled className={classes.button}>
+          <DisabledEditIcon />
         </IconButton>
       )}
+
       {editing && (
         <div className={classes.editingButtons}>
           <Link color="primary" type="submit">
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js
index eabdf2d3..437b0f48 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js
+++ b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js
@@ -4,7 +4,7 @@ import gql from 'graphql-tag'
 import * as R from 'ramda'
 import React, { useState, memo } from 'react'
 
-import Popper from 'src/components/Popper'
+import Tooltip from 'src/components/Tooltip'
 import { Switch } from 'src/components/inputs'
 import { H4, P, Label2 } from 'src/components/typography'
 import { ReactComponent as HelpIcon } from 'src/styling/icons/action/help/zodiac.svg'
@@ -51,7 +51,6 @@ const Row = memo(({ title, disabled = false, checked, save, label }) => {
 })
 
 const CoinATMRadar = memo(() => {
-  const [helpPopperAnchorEl, setHelpPopperAnchorEl] = useState(null)
   const [coinAtmRadarConfig, setCoinAtmRadarConfig] = useState(null)
 
   const classes = useStyles()
@@ -82,16 +81,6 @@ const CoinATMRadar = memo(() => {
       variables: { config: toNamespace(namespaces.COIN_ATM_RADAR, it) }
     })
 
-  const handleOpenHelpPopper = event => {
-    setHelpPopperAnchorEl(helpPopperAnchorEl ? null : event.currentTarget)
-  }
-
-  const handleCloseHelpPopper = () => {
-    setHelpPopperAnchorEl(null)
-  }
-
-  const helpPopperOpen = Boolean(helpPopperAnchorEl)
-
   if (!coinAtmRadarConfig) return null
 
   return (
@@ -99,30 +88,19 @@ const CoinATMRadar = memo(() => {
       <div>
         <div className={classes.titleWrapper}>
           <H4>Coin ATM Radar share settings</H4>
-          <div className={classes.transparentButton}>
-            <button onClick={handleOpenHelpPopper}>
-              <HelpIcon />
-              <Popper
-                open={helpPopperOpen}
-                anchorEl={helpPopperAnchorEl}
-                placement="bottom"
-                onClose={handleCloseHelpPopper}>
-                <div className={classes.popoverContent}>
-                  <P>
-                    For details on configuring this panel, please read the
-                    relevant knowledgebase article{' '}
-                    <a
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      href="https://support.lamassu.is/hc/en-us/articles/360023720472-Coin-ATM-Radar">
-                      here
-                    </a>
-                    .
-                  </P>
-                </div>
-              </Popper>
-            </button>
-          </div>
+          <Tooltip enableClick width={304} element={<HelpIcon />}>
+            <P>
+              For details on configuring this panel, please read the relevant
+              knowledgebase article{' '}
+              <a
+                target="_blank"
+                rel="noopener noreferrer"
+                href="https://support.lamassu.is/hc/en-us/articles/360023720472-Coin-ATM-Radar">
+                here
+              </a>
+              .
+            </P>
+          </Tooltip>
         </div>
         <Row
           title={'Share information?'}
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js
index 3c864efc..a26ccd49 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js
+++ b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js
@@ -9,7 +9,8 @@ import React, { useState } from 'react'
 import * as Yup from 'yup'
 
 import ErrorMessage from 'src/components/ErrorMessage'
-import { Link } from 'src/components/buttons'
+import Tooltip from 'src/components/Tooltip'
+import { Link, IconButton } from 'src/components/buttons'
 import Switch from 'src/components/inputs/base/Switch'
 import { TextInput, NumberInput } from 'src/components/inputs/formik'
 import {
@@ -231,11 +232,15 @@ const ContactInfo = () => {
         <div className={classes.header}>
           <Info2>Info card</Info2>
           {!editing && (
-            <div className={classes.transparentButton}>
-              <button onClick={() => setEditing(true)}>
-                <EditIcon />
-              </button>
-            </div>
+            <Tooltip
+              enableOver
+              element={
+                <IconButton onClick={() => setEditing(true)}>
+                  <EditIcon />
+                </IconButton>
+              }>
+              <P>Configure info card settings</P>
+            </Tooltip>
           )}
         </div>
         <Formik
@@ -305,7 +310,11 @@ const ContactInfo = () => {
         </Formik>
       </div>
       <div className={classnames(classes.section, classes.infoMessage)}>
-        <WarningIcon />
+        <Tooltip width={304} enableOver element={<WarningIcon />}>
+          Sharing your information with your customers through your machines
+          allows them to contact you in case there's a problem with a machine in
+          your network or a transaction.
+        </Tooltip>
         <Label1>
           Sharing your information with your customers through your machines
           allows them to contact you in case there's a problem with a machine in
diff --git a/new-lamassu-admin/src/pages/Services/Services.js b/new-lamassu-admin/src/pages/Services/Services.js
index d2955744..651c14cf 100644
--- a/new-lamassu-admin/src/pages/Services/Services.js
+++ b/new-lamassu-admin/src/pages/Services/Services.js
@@ -63,6 +63,7 @@ const Services = () => {
         {R.values(schemas).map(schema => (
           <Grid item key={schema.code}>
             <SingleRowTable
+              editMessage={'Configure ' + schema.title}
               title={schema.title}
               onEdit={() => setEditingSchema(schema)}
               items={getItems(schema.code, schema.elements)}