diff --git a/Plugins/BDFDB.js b/Plugins/BDFDB.js
index 5deadbf568..82351ad44a 100644
--- a/Plugins/BDFDB.js
+++ b/Plugins/BDFDB.js
@@ -4404,7 +4404,6 @@
 	var DiscordClassModules = {};
 	DiscordClassModules.BDFDB = {
 		BDFDBundefined: "BDFDB_undefined",
-		avatarBadgeWrapper: "wrapper-hd42F_",
 		avatarStatusHovered: "statusHovered-gF2976",
 		cardInner: "inner-OP_8zd",
 		cardWrapper: "card-rT4Wbb",
@@ -4936,7 +4935,6 @@
 		autocompleteselected: ["Autocomplete", "selectorSelected"],
 		autocompleteselector: ["Autocomplete", "selector"],
 		avatar: ["Avatar", "avatar"],
-		avatarbadgewrapper: ["BDFDB", "avatarBadgeWrapper"],
 		avatarcursordefault: ["Avatar", "cursorDefault"],
 		avataricon: ["AvatarIcon", "icon"],
 		avatariconactivelarge: ["AvatarIcon", "iconActiveLarge"],
@@ -8436,6 +8434,11 @@
 			text-decoration: line-through;
 		}
 
+		${BDFDB.dotCN.avatarwrapper + BDFDB.dotCN.messageavatar} {
+			overflow: visible;
+			border-radius: 0;
+		}
+
 		${BDFDB.dotCN.favbuttoncontainer} {
 			display: flex;
 			position: relative;
@@ -9731,9 +9734,9 @@
 	InternalBDFDB._processAvatarRender = function (user, avatar) {
 		if (BDFDB.ReactUtils.isValidElement(avatar) && BDFDB.ObjectUtils.is(user)) {
 			let changed = false;
-			if (avatar.type == "img") avatar = BDFDB.ReactUtils.createElement("div", {
-				className: BDFDB.disCN.avatarbadgewrapper,
-				children: avatar
+			if (avatar.type == "img") avatar = BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Avatar, Object.assign({}, avatar.props, {
+				className: BDFDB.DOMUtils.formatClassName((avatar.props.className || "").replace(BDFDB.disCN.avatar, "")),
+				size: BDFDB.LibraryComponents.Avatar.Sizes.SIZE_40
 			});
 			avatar.props["user_by_BDFDB"] = user.id;
 			if (BDFDB_Patrons.includes(user.id) && BDFDB.DataUtils.get(BDFDB, "settings", "showSupportBadges")) {
diff --git a/Themes/SupporterBadge.css b/Themes/SupporterBadge.css
index cd91dcde36..395c17235b 100644
--- a/Themes/SupporterBadge.css
+++ b/Themes/SupporterBadge.css
@@ -70,7 +70,6 @@
 	left: 7px !important;
 }
 
-.wrapper-hd42F_.supporter-Z3FfwL:after,
 .wrapper-3t9DeA.supporter-Z3FfwL:after {
 	content: "" !important;
 	-webkit-mask: var(--supporterbadge) center/cover no-repeat !important;
@@ -88,7 +87,6 @@
 	left: -1px !important;
 	bottom: -1px !important;
 }
-.wrapper-hd42F_.supporter-Z3FfwL,
 .wrapper-3t9DeA.supporter-Z3FfwL [mask="url(#svg-mask-avatar-default)"] {
 	-webkit-mask: url('data:image/svg+xml; utf8, <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 1 1"><circle fill="white" cx="0.5" cy="0.5" r="0.5"></circle><rect fill="black" x="-0.15" y="0.6375" width="0.5" height="0.5" rx="0.13125" ry="0.13125"></rect></svg>');
 }
diff --git a/Themes/ThemeDevBadge.css b/Themes/ThemeDevBadge.css
index 111fe52ee0..f64f9a0f8b 100644
--- a/Themes/ThemeDevBadge.css
+++ b/Themes/ThemeDevBadge.css
@@ -70,7 +70,6 @@
 	left: 7px !important;
 }
 
-.wrapper-hd42F_.dev-A7f2Rx:after,
 .wrapper-3t9DeA.dev-A7f2Rx:after {
 	content: "" !important;
 	-webkit-mask: var(--themedevbadge) center/cover no-repeat !important;
@@ -88,7 +87,6 @@
 	left: -1px !important;
 	bottom: -1px !important;
 }
-.wrapper-hd42F_.dev-A7f2Rx,
 .wrapper-3t9DeA.dev-A7f2Rx [mask="url(#svg-mask-avatar-default)"] {
 	-webkit-mask: url('data:image/svg+xml; utf8, <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 1 1"><circle fill="white" cx="0.5" cy="0.5" r="0.5"></circle><rect fill="black" x="-0.15" y="0.6375" width="0.5" height="0.5" rx="0.13125" ry="0.13125"></rect></svg>');
 }