diff --git a/changes/issue-8394-styling-tooltips-and-modals b/changes/issue-8394-styling-tooltips-and-modals
new file mode 100644
index 0000000000..026a10ffb0
--- /dev/null
+++ b/changes/issue-8394-styling-tooltips-and-modals
@@ -0,0 +1 @@
+* Update styling of tooltips and modals
\ No newline at end of file
diff --git a/frontend/components/DiskSpaceGraph/_styles.scss b/frontend/components/DiskSpaceGraph/_styles.scss
index 4b0e75eb76..c07aeba038 100644
--- a/frontend/components/DiskSpaceGraph/_styles.scss
+++ b/frontend/components/DiskSpaceGraph/_styles.scss
@@ -15,10 +15,6 @@
 
     &-wrapper {
       display: inline-block;
-
-      &:hover {
-        cursor: help;
-      }
     }
 
     &--green {
diff --git a/frontend/components/IconToolTip/IconToolTip.stories.tsx b/frontend/components/IconToolTip/IconToolTip.stories.tsx
deleted file mode 100644
index 71da373760..0000000000
--- a/frontend/components/IconToolTip/IconToolTip.stories.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from "react";
-import { Meta, Story } from "@storybook/react";
-
-import IconToolTip from ".";
-import { IIconToolTipProps } from "./IconToolTip";
-
-import "../../index.scss";
-
-export default {
-  component: IconToolTip,
-  title: "Components/IconToolTip",
-  args: {
-    text: "This is a tooltip",
-    isHtml: false,
-    issue: false,
-  },
-} as Meta;
-
-const Template: Story<IIconToolTipProps> = (props) => (
-  <IconToolTip {...props} />
-);
-
-export const Default = Template.bind({});
diff --git a/frontend/components/IconToolTip/IconToolTip.tsx b/frontend/components/IconToolTip/IconToolTip.tsx
deleted file mode 100644
index 124def8d59..0000000000
--- a/frontend/components/IconToolTip/IconToolTip.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React from "react";
-import ReactTooltip from "react-tooltip";
-
-export interface IIconToolTipProps {
-  text: string;
-  isHtml?: boolean;
-  issue?: boolean;
-}
-
-// TODO: handle html text better. possibly use 'children' prop for html
-const IconToolTip = ({
-  text,
-  isHtml,
-  issue,
-}: IIconToolTipProps): JSX.Element => {
-  let svgIcon = (
-    <svg
-      width="16"
-      height="17"
-      viewBox="0 0 16 17"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <circle cx="8" cy="8.59961" r="8" fill="#6A67FE" />
-      <path
-        d="M7.49605 10.1893V9.70927C7.49605 9.33327 7.56405 8.98527 7.70005 8.66527C7.84405 8.34527 8.08405 7.99727 8.42005 7.62127C8.67605 7.34127 8.85205 7.10127 8.94805 6.90127C9.05205 6.70127 9.10405 6.48927 9.10405 6.26527C9.10405 6.00127 9.00805 5.79327 8.81605 5.64127C8.62405 5.48927 8.35205 5.41326 8.00005 5.41326C7.21605 5.41326 6.49205 5.70127 5.82805 6.27727L5.32405 5.12527C5.66005 4.82127 6.07605 4.57727 6.57205 4.39327C7.07605 4.20927 7.58405 4.11727 8.09605 4.11727C8.60005 4.11727 9.04005 4.20127 9.41605 4.36927C9.80005 4.53727 10.096 4.76927 10.304 5.06527C10.52 5.36127 10.628 5.70927 10.628 6.10927C10.628 6.47727 10.544 6.82127 10.376 7.14127C10.216 7.46127 9.92805 7.80927 9.51205 8.18527C9.13605 8.52927 8.87605 8.82927 8.73205 9.08527C8.58805 9.34127 8.49605 9.59727 8.45605 9.85327L8.40805 10.1893H7.49605ZM7.11205 12.6973V11.0293H8.79205V12.6973H7.11205Z"
-        fill="white"
-      />
-    </svg>
-  );
-
-  if (issue) {
-    svgIcon = (
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="24"
-        height="24"
-        viewBox="0 -6.5 24 24"
-        fill="none"
-      >
-        <path
-          d="M0 8C0 12.4183 3.5817 16 8 16C12.4183 16 16 12.4183 16 8C16 3.5817 12.4183 0 8 0C3.5817 0 0 3.5817 0 8ZM14 8C14 11.3137 11.3137 14 8 14C4.6863 14 2 11.3137 2 8C2 4.6863 4.6863 2 8 2C11.3137 2 14 4.6863 14 8ZM7 12V10H9V12H7ZM7 4V9H9V4H7Z"
-          fill="#8B8FA2"
-        />
-      </svg>
-    );
-  }
-  return (
-    <div className="icon-tooltip">
-      <span data-tip={text} data-html={isHtml}>
-        {svgIcon}
-      </span>
-      {/* same colour as $core-fleet-blue */}
-      <ReactTooltip
-        effect={"solid"}
-        data-html={isHtml}
-        backgroundColor={"#3e4771"}
-      />
-    </div>
-  );
-};
-
-export default IconToolTip;
diff --git a/frontend/components/IconToolTip/_styles.scss b/frontend/components/IconToolTip/_styles.scss
deleted file mode 100644
index 5198bd1d71..0000000000
--- a/frontend/components/IconToolTip/_styles.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.icon-tooltip {
-  &:hover {
-    cursor: help;
-  }
-}
diff --git a/frontend/components/IconToolTip/index.ts b/frontend/components/IconToolTip/index.ts
deleted file mode 100644
index 9a55924c0d..0000000000
--- a/frontend/components/IconToolTip/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./IconToolTip";
diff --git a/frontend/components/Modal/_styles.scss b/frontend/components/Modal/_styles.scss
index ae6166c624..b1fb6d233c 100644
--- a/frontend/components/Modal/_styles.scss
+++ b/frontend/components/Modal/_styles.scss
@@ -66,7 +66,7 @@
   &__modal_container {
     @include position(absolute, 22px null null null);
     background-color: $core-white;
-    width: 658px;
+    width: 570px;
     padding: $pad-xxlarge;
     border-radius: 8px;
   }
diff --git a/frontend/components/TableContainer/DataTable/IconCell/IconCell.tsx b/frontend/components/TableContainer/DataTable/IconCell/IconCell.tsx
deleted file mode 100644
index 008ff7b390..0000000000
--- a/frontend/components/TableContainer/DataTable/IconCell/IconCell.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from "react";
-
-// @ts-ignore
-import FleetIcon from "components/icons/FleetIcon";
-
-interface IIconTooltipCellProps<T> {
-  value: string;
-}
-
-const IconTooltipCell = ({
-  value,
-}: IIconTooltipCellProps<any>): JSX.Element => {
-  // The value passed in must be a valid FleetIcon name
-  return <FleetIcon name={value} />;
-};
-
-export default IconTooltipCell;
diff --git a/frontend/components/TableContainer/DataTable/IconCell/index.ts b/frontend/components/TableContainer/DataTable/IconCell/index.ts
deleted file mode 100644
index 4406703d62..0000000000
--- a/frontend/components/TableContainer/DataTable/IconCell/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./IconCell";
diff --git a/frontend/components/TableContainer/DataTable/IconTooltipCell/IconTooltipCell.tsx b/frontend/components/TableContainer/DataTable/IconTooltipCell/IconTooltipCell.tsx
deleted file mode 100644
index 9c16f69731..0000000000
--- a/frontend/components/TableContainer/DataTable/IconTooltipCell/IconTooltipCell.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from "react";
-import { isEmpty } from "lodash";
-
-import IconToolTip from "components/IconToolTip";
-
-interface IIconTooltipCellProps<T> {
-  value: string;
-}
-
-const IconTooltipCell = ({
-  value,
-}: IIconTooltipCellProps<any>): JSX.Element => {
-  if (isEmpty(value)) {
-    return <></>;
-  }
-
-  return <IconToolTip text={value} issue isHtml />;
-};
-
-export default IconTooltipCell;
diff --git a/frontend/components/TableContainer/DataTable/IconTooltipCell/index.ts b/frontend/components/TableContainer/DataTable/IconTooltipCell/index.ts
deleted file mode 100644
index 167de3ed7b..0000000000
--- a/frontend/components/TableContainer/DataTable/IconTooltipCell/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./IconTooltipCell";
diff --git a/frontend/components/TableContainer/DataTable/TruncatedTextCell/_styles.scss b/frontend/components/TableContainer/DataTable/TruncatedTextCell/_styles.scss
index 827731ad7f..d3b868d87d 100644
--- a/frontend/components/TableContainer/DataTable/TruncatedTextCell/_styles.scss
+++ b/frontend/components/TableContainer/DataTable/TruncatedTextCell/_styles.scss
@@ -12,10 +12,6 @@
       display: inline-block;
       max-width: 100%;
 
-      &:hover {
-        cursor: help;
-      }
-
       // Removes secondary unstyled tooltip created by browser
       &::after {
         content: "";
diff --git a/frontend/components/TooltipWrapper/_styles.scss b/frontend/components/TooltipWrapper/_styles.scss
index 4b70e11d42..81fbdc6e2e 100644
--- a/frontend/components/TooltipWrapper/_styles.scss
+++ b/frontend/components/TooltipWrapper/_styles.scss
@@ -1,7 +1,6 @@
 .component__tooltip-wrapper {
   display: inline-flex;
   position: relative;
-  cursor: help;
 
   &:hover {
     .component__tooltip-wrapper__tip-text {
diff --git a/frontend/pages/admin/UserManagementPage/_styles.scss b/frontend/pages/admin/UserManagementPage/_styles.scss
index 02b62a2611..46a5063044 100644
--- a/frontend/pages/admin/UserManagementPage/_styles.scss
+++ b/frontend/pages/admin/UserManagementPage/_styles.scss
@@ -1,5 +1,4 @@
 .user-management {
-
   &__page-description {
     font-size: $x-small;
     color: $core-fleet-black;
@@ -9,9 +8,4 @@
   &__sandbox-demo-message {
     margin-top: 3.5rem;
   }
-
-  .Select-menu-outer {
-    position: absolute;
-    left: -50px !important; // Using !important to override react select styling
-  }
 }
diff --git a/frontend/styles/global/_global.scss b/frontend/styles/global/_global.scss
index 0cc185b7b6..213b56efea 100644
--- a/frontend/styles/global/_global.scss
+++ b/frontend/styles/global/_global.scss
@@ -23,19 +23,6 @@ body {
     opacity: 1; // Overrides 0.9 default opacity
     text-align: center;
   }
-
-  .tooltip {
-    &:hover {
-      cursor: help;
-    }
-
-    .button--disabled,
-    .fleet-checkbox__tick--disabled {
-      &:hover {
-        cursor: help;
-      }
-    }
-  }
 }
 
 h1,