diff --git a/src/core/components/copy-to-clipboard-btn.jsx b/src/core/components/copy-to-clipboard-btn.jsx
deleted file mode 100644
index 2147b3ccccc..00000000000
--- a/src/core/components/copy-to-clipboard-btn.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from "react"
-import { CopyToClipboard } from "react-copy-to-clipboard"
-import PropTypes from "prop-types"
-
-const COPY_PATH_LABEL = "Copy path to clipboard"
-
-/**
- * @param {{ getComponent: func, textToCopy: string }} props
- * @returns {JSX.Element}
- * @constructor
- */
-export default class CopyToClipboardBtn extends React.Component {
-  render() {
-    let { getComponent } = this.props
-
-    const CopyIcon = getComponent("CopyIcon")
-
-    return (
-      <div
-        className="view-line-link copy-to-clipboard"
-        title={COPY_PATH_LABEL}
-        aria-label={COPY_PATH_LABEL}
-      >
-        <CopyToClipboard text={this.props.textToCopy}>
-          <button
-            aria-label={COPY_PATH_LABEL}
-            title={COPY_PATH_LABEL}
-            type="button"
-          >
-            <CopyIcon />
-          </button>
-        </CopyToClipboard>
-      </div>
-    )
-  }
-
-  static propTypes = {
-    getComponent: PropTypes.func.isRequired,
-    textToCopy: PropTypes.string.isRequired,
-  }
-}
diff --git a/src/core/components/copy-to-clipboard-btn.tsx b/src/core/components/copy-to-clipboard-btn.tsx
new file mode 100644
index 00000000000..e30dab749e5
--- /dev/null
+++ b/src/core/components/copy-to-clipboard-btn.tsx
@@ -0,0 +1,29 @@
+/**
+ * @prettier
+ */
+import React from "react"
+import { CopyToClipboard } from "react-copy-to-clipboard"
+
+const COPY_PATH_LABEL = "Copy path to clipboard"
+
+interface Props {
+  textToCopy: string
+}
+
+const CopyToClipboardBtn = ({ textToCopy }: Props) => (
+  <div
+    className="view-line-link copy-to-clipboard"
+    title={COPY_PATH_LABEL}
+    aria-label={COPY_PATH_LABEL}
+  >
+    <CopyToClipboard text={textToCopy}>
+      <button
+        aria-label={COPY_PATH_LABEL}
+        title={COPY_PATH_LABEL}
+        type="button"
+      />
+    </CopyToClipboard>
+  </div>
+)
+
+export default CopyToClipboardBtn
diff --git a/src/core/plugins/icons/components/copy.jsx b/src/core/plugins/icons/components/copy.jsx
deleted file mode 100644
index b4079d41bf3..00000000000
--- a/src/core/plugins/icons/components/copy.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @prettier
- */
-import React from "react"
-import PropTypes from "prop-types"
-
-const Copy = ({ className = null, width = 15, height = 16, ...rest }) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 15 16"
-    className={className}
-    width={width}
-    height={height}
-    aria-hidden="true"
-    focusable="false"
-    {...rest}
-  >
-    <g transform="translate(2, -1)">
-      <path
-        fill="#ffffff"
-        fillRule="evenodd"
-        d="M2 13h4v1H2v-1zm5-6H2v1h5V7zm2 3V8l-3 3 3 3v-2h5v-2H9zM4.5 9H2v1h2.5V9zM2 12h2.5v-1H2v1zm9 1h1v2c-.02.28-.11.52-.3.7-.19.18-.42.28-.7.3H1c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1h3c0-1.11.89-2 2-2 1.11 0 2 .89 2 2h3c.55 0 1 .45 1 1v5h-1V6H1v9h10v-2zM2 5h8c0-.55-.45-1-1-1H8c-.55 0-1-.45-1-1s-.45-1-1-1-1 .45-1 1-.45 1-1 1H3c-.55 0-1 .45-1 1z"
-      ></path>
-    </g>
-  </svg>
-)
-
-Copy.propTypes = {
-  className: PropTypes.string,
-  width: PropTypes.string,
-  height: PropTypes.string,
-}
-
-export default Copy
diff --git a/src/core/plugins/icons/index.js b/src/core/plugins/icons/index.js
index a70c8a889ea..5f94bba3888 100644
--- a/src/core/plugins/icons/index.js
+++ b/src/core/plugins/icons/index.js
@@ -5,7 +5,6 @@ import ArrowUpIcon from "./components/arrow-up"
 import ArrowDownIcon from "./components/arrow-down"
 import ArrowIcon from "./components/arrow"
 import CloseIcon from "./components/close"
-import CopyIcon from "./components/copy"
 import LockIcon from "./components/lock"
 import UnlockIcon from "./components/unlock"
 
@@ -15,7 +14,6 @@ const IconsPlugin = () => ({
     ArrowDownIcon,
     ArrowIcon,
     CloseIcon,
-    CopyIcon,
     LockIcon,
     UnlockIcon,
   },
diff --git a/src/style/_buttons.scss b/src/style/_buttons.scss
index 23f35eddbc3..dac4a22e91e 100644
--- a/src/style/_buttons.scss
+++ b/src/style/_buttons.scss
@@ -169,6 +169,7 @@ button {
     height: 25px;
     background: url("data:image/svg+xml, <svg xmlns='http://www.w3.org/2000/svg' width='16' height='15' aria-hidden='true'><g transform='translate(2, -1)'><path fill='#ffffff' fill-rule='evenodd' d='M2 13h4v1H2v-1zm5-6H2v1h5V7zm2 3V8l-3 3 3 3v-2h5v-2H9zM4.5 9H2v1h2.5V9zM2 12h2.5v-1H2v1zm9 1h1v2c-.02.28-.11.52-.3.7-.19.18-.42.28-.7.3H1c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1h3c0-1.11.89-2 2-2 1.11 0 2 .89 2 2h3c.55 0 1 .45 1 1v5h-1V6H1v9h10v-2zM2 5h8c0-.55-.45-1-1-1H8c-.55 0-1-.45-1-1s-.45-1-1-1-1 .45-1 1-.45 1-1 1H3c-.55 0-1 .45-1 1z'></path></g></svg>")
       center center no-repeat;
+    padding: 0;
 
     @media (forced-colors: active) {
       forced-color-adjust: none;