diff --git a/src/components/Icons.tsx b/src/components/Icons.tsx
index 16f1e2bcf..0aea2c5e0 100644
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@@ -797,3 +797,33 @@ export const ComponentsIcon = (props?: any) => {
         </Icon>
     );
 };
+
+export const LogsIcon = (props?: any) => {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fillRule="evenodd"
+                clipRule="evenodd"
+                fill={props.fill || "currentColor"}
+                d="M21 21.93V2.07a1 1 0 0 0-1.27-.97l-2.5.7a3 3 0 0 1-1.46.04l-3.12-.7a3 3 0 0 0-1.3 0l-3.12.7a3 3 0 0 1-1.45-.04l-2.51-.7A1 1 0 0 0 3 2.07v19.86a1 1 0 0 0 1.27.97l2.5-.7a3 3 0 0 1 1.46-.04l3.12.7a3 3 0 0 0 1.3 0l3.12-.7a3 3 0 0 1 1.45.04l2.51.7a1 1 0 0 0 1.27-.97ZM7 8a1 1 0 0 1 1-1h8a1 1 0 1 1 0 2H8a1 1 0 0 1-1-1Zm1 3a1 1 0 0 0 0 2h8a1 1 0 1 0 0-2H8Zm-1 5a1 1 0 0 1 1-1h3a1 1 0 0 1 0 2H8a1 1 0 0 1-1-1Zm8-1a1 1 0 0 0 0 2h1a1 1 0 1 0 0-2h-1Z"
+            />
+        </Icon>
+    );
+};
+
+export const BookmarkIcon = (props?: any) => {
+    return (
+        <Icon
+            {...props}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill={props.fill || "currentColor"}
+                d="M4 5a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v16a1 1 0 0 1-1.67.74l-5.66-5.13a1 1 0 0 0-1.34 0l-5.66 5.13A1 1 0 0 1 4 20.99V5Z"
+            />
+        </Icon>
+    );
+};
diff --git a/src/equicordplugins/holyNotes/components/modals/Notebook.tsx b/src/equicordplugins/holyNotes/components/modals/Notebook.tsx
index 011ccbf43..704a12f9b 100644
--- a/src/equicordplugins/holyNotes/components/modals/Notebook.tsx
+++ b/src/equicordplugins/holyNotes/components/modals/Notebook.tsx
@@ -8,7 +8,8 @@ import { BaseText } from "@components/BaseText";
 import { Button } from "@components/Button";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
-import { BookmarkIcon, CircleQuestionIcon, cl } from "@equicordplugins/holyNotes";
+import { BookmarkIcon } from "@components/Icons";
+import { CircleQuestionIcon, cl } from "@equicordplugins/holyNotes";
 import { noteHandler } from "@equicordplugins/holyNotes/NoteHandler";
 import { Note, Notebook } from "@equicordplugins/holyNotes/types";
 import { CloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
@@ -91,7 +92,7 @@ export function NoteModal({ onClose, transitionState }: ModalProps) {
             <ModalHeader separator={false} className={cl("header")}>
                 <div className={cl("header-content")}>
                     <Flex alignItems="center" style={{ gap: "12px" }}>
-                        <BookmarkIcon size="md" />
+                        <BookmarkIcon width="24" height="24" />
                         <BaseText tag="h2" size="lg" weight="semibold" className={cl("title")}>
                             Notebook
                         </BaseText>
diff --git a/src/equicordplugins/holyNotes/index.tsx b/src/equicordplugins/holyNotes/index.tsx
index e4a57e819..797f450d2 100644
--- a/src/equicordplugins/holyNotes/index.tsx
+++ b/src/equicordplugins/holyNotes/index.tsx
@@ -21,10 +21,11 @@ import "./style.css";
 import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { HeaderBarButton } from "@api/HeaderBar";
 import { DataStore } from "@api/index";
+import { BookmarkIcon } from "@components/Icons";
 import { EquicordDevs } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
 import { openModal } from "@utils/modal";
-import definePlugin, { IconComponent } from "@utils/types";
+import definePlugin from "@utils/types";
 import { Message } from "@vencord/discord-types";
 import { findByCodeLazy, findComponentByCodeLazy, findCssClassesLazy, findExportedComponentLazy } from "@webpack";
 import { ChannelStore, Menu } from "@webpack/common";
@@ -35,8 +36,6 @@ import { DataStoreToCache, HolyNoteStore } from "./utils";
 
 export const cl = classNameFactory("vc-notebook-");
 export const CircleQuestionIcon = findExportedComponentLazy("CircleQuestionIcon");
-export const BookmarkIconLazy = findExportedComponentLazy("BookmarkIcon");
-export const BookmarkIcon: IconComponent = props => <BookmarkIconLazy {...props} />;
 export const MessageRecord = findByCodeLazy("isEdited(){");
 export const messageClasses = findCssClassesLazy("message", "groupStart", "cozyMessage");
 export const resultsClasses = findCssClassesLazy("emptyResultsWrap", "emptyResultsContent", "errorImage", "emptyResultsText", "noResultsImage", "alt");
diff --git a/src/equicordplugins/messageLoggerEnhanced/components/LogsButton.tsx b/src/equicordplugins/messageLoggerEnhanced/components/LogsButton.tsx
index e6613a983..5efc7c1fc 100644
--- a/src/equicordplugins/messageLoggerEnhanced/components/LogsButton.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/components/LogsButton.tsx
@@ -17,22 +17,18 @@
 */
 
 import { HeaderBarButton } from "@api/HeaderBar";
+import { LogsIcon } from "@components/Icons";
 import { cl } from "@equicordplugins/messageLoggerEnhanced/index";
-import { findComponentByCodeLazy } from "@webpack";
 
 import { openLogModal } from "./LogsModal";
 
-const Icon = findComponentByCodeLazy("0-1.27-.97l-2.5.7a3");
-
 export function OpenLogsButton() {
     return (
         <HeaderBarButton
             className={cl("toolbox-btn")}
             onClick={() => openLogModal()}
             tooltip={"Open Logs"}
-            icon={Icon}
+            icon={LogsIcon}
         />
     );
 }
-
-export { Icon as LogsIcon };
diff --git a/src/equicordplugins/messageLoggerEnhanced/index.tsx b/src/equicordplugins/messageLoggerEnhanced/index.tsx
index 2abe5c7df..efaf59567 100644
--- a/src/equicordplugins/messageLoggerEnhanced/index.tsx
+++ b/src/equicordplugins/messageLoggerEnhanced/index.tsx
@@ -8,6 +8,7 @@ export const Native = getNative();
 
 import "./styles.css";
 
+import { LogsIcon } from "@components/Icons";
 import { Devs, EquicordDevs } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
 import { Logger } from "@utils/Logger";
@@ -15,7 +16,7 @@ import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { FluxDispatcher, MessageStore, SelectedChannelStore, UserStore } from "@webpack/common";
 
-import { LogsIcon, OpenLogsButton } from "./components/LogsButton";
+import { OpenLogsButton } from "./components/LogsButton";
 import { openLogModal } from "./components/LogsModal";
 import * as idb from "./db";
 import * as LoggedMessageManager from "./LoggedMessageManager";
diff --git a/src/plugins/mentionAvatars/index.tsx b/src/plugins/mentionAvatars/index.tsx
index 44b4ec12d..b5775da4d 100644
--- a/src/plugins/mentionAvatars/index.tsx
+++ b/src/plugins/mentionAvatars/index.tsx
@@ -69,7 +69,7 @@ export default definePlugin({
         // show avatar in the chat input box
         find: ".hasUniqueUsername()?null:`#",
         replacement: {
-            match: /(?<=,(\i)\).{0,55})`@\$\{(\i)\}`/,
+            match: /(?<=,(\i)\).{0,150})`@\$\{(\i)\}`/,
             replace: "$self.renderInputMention($2,$1)"
         }
     }],