diff --git a/src/css/custom.css b/src/css/custom.css
index ac9c58653..0ddf3bdbe 100644
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -106,6 +106,18 @@ details > div > div > div > :last-child {
   background: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='white' d='M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12'/%3E%3C/svg%3E") no-repeat;
 }
 
+/* Edit this page button improvements */
+
+.theme-edit-this-page {
+  display: grid;
+  align-items: center;
+  column-gap: 0.5rem;
+  grid-template-columns: 0.875rem 1fr;
+  margin-block-start: 1.25rem;
+  color: var(--ifm-link-color);
+  margin-left: 0.1rem;
+}
+
 /* Highlight code blocks in well- and malformed- lines */
 .code-block-malformed-line {
   background-color: #ff000020;
diff --git a/src/theme/Icon/Edit.tsx b/src/theme/Icon/Edit.tsx
new file mode 100644
index 000000000..e2fd30e76
--- /dev/null
+++ b/src/theme/Icon/Edit.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import clsx from 'clsx';
+import type { Props } from '@theme/Icon/Edit';
+import styles from '@docusaurus/theme-classic/src/theme/Icon/Edit/styles.module.css';
+
+export default function IconEdit({ className, ...restProps }: Props): JSX.Element {
+	return (
+		<svg
+			fill="none"
+			width="14"
+			height="14"
+			viewBox="0 0 14 14"
+			className={clsx(styles.iconEdit, className)}
+			aria-hidden="true"
+			xmlns="http://www.w3.org/2000/svg"
+			{...restProps}>
+			<g>
+				<path
+				d="M7 0C3.13438 0 0 3.21563 0 7.17813C0 10.35 2.00625 13.0375 4.7875 13.9875C4.83125 13.9969 4.86875 14 4.90625 14C5.16563 14 5.26562 13.8094 5.26562 13.6438C5.26562 13.4719 5.25938 13.0219 5.25625 12.4219C4.99375 12.4812 4.75938 12.5063 4.55 12.5063C3.20313 12.5063 2.89687 11.4594 2.89687 11.4594C2.57812 10.6313 2.11875 10.4094 2.11875 10.4094C1.50938 9.98125 2.11562 9.96875 2.1625 9.96875H2.16563C2.86875 10.0312 3.2375 10.7125 3.2375 10.7125C3.5875 11.325 4.05625 11.4969 4.475 11.4969C4.80312 11.4969 5.1 11.3906 5.275 11.3094C5.3375 10.8469 5.51875 10.5312 5.71875 10.35C4.16563 10.1688 2.53125 9.55313 2.53125 6.80312C2.53125 6.01875 2.80312 5.37813 3.25 4.87813C3.17812 4.69688 2.9375 3.96563 3.31875 2.97813C3.31875 2.97813 3.36875 2.9625 3.475 2.9625C3.72812 2.9625 4.3 3.05937 5.24375 3.71562C5.80312 3.55625 6.4 3.47812 6.99687 3.475C7.59062 3.47812 8.19063 3.55625 8.75 3.71562C9.69375 3.05937 10.2656 2.9625 10.5188 2.9625C10.625 2.9625 10.675 2.97813 10.675 2.97813C11.0563 3.96563 10.8156 4.69688 10.7437 4.87813C11.1906 5.38125 11.4625 6.02187 11.4625 6.80312C11.4625 9.55937 9.825 10.1656 8.26562 10.3438C8.51562 10.5656 8.74063 11.0031 8.74063 11.6719C8.74063 12.6313 8.73125 13.4062 8.73125 13.6406C8.73125 13.8094 8.82812 14 9.0875 14C9.125 14 9.16875 13.9969 9.2125 13.9875C11.9969 13.0375 14 10.3469 14 7.17813C14 3.21563 10.8656 0 7 0Z"
+				fill="currentColor" />
+			</g>
+		</svg>
+	);
+}