diff --git a/Library/_res/BDFDB.raw.css b/Library/_res/BDFDB.raw.css
index 9d0d5366a6..8273d8fcf0 100644
--- a/Library/_res/BDFDB.raw.css
+++ b/Library/_res/BDFDB.raw.css
@@ -363,6 +363,9 @@ img:not([src]), img[src=""], img[src="null"] {
 [REPLACE_CLASS_hovercardhorizontal] {
 	flex-direction: row;
 }
+[REPLACE_CLASS_hovercardhorizontal] > [REPLACE_CLASS_flexchild] + [REPLACE_CLASS_flexchild] {
+	margin-left: 8px;
+}
 [REPLACE_CLASS_hovercarddisabled] {
 	opacity: 0.7;
 	filter: grayscale(0.2);
diff --git a/Plugins/ImageUtilities/ImageUtilities.plugin.js b/Plugins/ImageUtilities/ImageUtilities.plugin.js
index e05c8c064a..3eefc20b05 100644
--- a/Plugins/ImageUtilities/ImageUtilities.plugin.js
+++ b/Plugins/ImageUtilities/ImageUtilities.plugin.js
@@ -372,7 +372,6 @@ module.exports = (_ => {
 													placeholder: locationName,
 													size: BDFDB.LibraryComponents.TextInput.Sizes.MINI,
 													maxLength: 100000000000000000000,
-													style: {marginRight: 6},
 													disabled: !editable,
 													onChange: !editable ? null : value => {
 														ownLocations[value] = ownLocations[locationName];
@@ -388,7 +387,6 @@ module.exports = (_ => {
 													placeholder: ownLocations[locationName].location,
 													size: BDFDB.LibraryComponents.TextInput.Sizes.MINI,
 													maxLength: 100000000000000000000,
-													style: {marginRight: 10},
 													disabled: !editable,
 													onChange: !editable ? null : value => {
 														ownLocations[locationName].location = value;
diff --git a/Plugins/ServerFolders/ServerFolders.plugin.js b/Plugins/ServerFolders/ServerFolders.plugin.js
index 504f34ac8b..c4a184ccc2 100644
--- a/Plugins/ServerFolders/ServerFolders.plugin.js
+++ b/Plugins/ServerFolders/ServerFolders.plugin.js
@@ -137,14 +137,14 @@ module.exports = (_ => {
 											},
 											onMouseDown: (event, instance) => {
 												event = event.nativeEvent || event;
-												let mousemove = event2 => {
+												let mouseMove = event2 => {
 													if (Math.sqrt((event.pageX - event2.pageX)**2) > 20 || Math.sqrt((event.pageY - event2.pageY)**2) > 20) {
 														BDFDB.ListenerUtils.stopEvent(event);
 														this.draggedGuild = guildId;
 														let dragpreview = _this.createDragPreview(BDFDB.ReactUtils.findDOMNode(instance).cloneNode(true), event2);
 														BDFDB.ReactUtils.forceUpdate(this);
-														document.removeEventListener("mousemove", mousemove);
-														document.removeEventListener("mouseup", mouseup);
+														document.removeEventListener("mousemove", mouseMove);
+														document.removeEventListener("mouseup", mouseUp);
 														let dragging = event3 => {
 															_this.updateDragPreview(dragpreview, event3);
 															let placeholder = BDFDB.DOMUtils.getParent(BDFDB.dotCN._serverfoldersguildplaceholder, event3.target);
@@ -177,12 +177,12 @@ module.exports = (_ => {
 														document.addEventListener("mouseup", releasing);
 													}
 												};
-												let mouseup = _ => {
-													document.removeEventListener("mousemove", mousemove);
-													document.removeEventListener("mouseup", mouseup);
+												let mouseUp = _ => {
+													document.removeEventListener("mousemove", mouseMove);
+													document.removeEventListener("mouseup", mouseUp);
 												};
-												document.addEventListener("mousemove", mousemove);
-												document.addEventListener("mouseup", mouseup);
+												document.addEventListener("mousemove", mouseMove);
+												document.addEventListener("mouseup", mouseUp);
 											}
 										}),
 										this.hoveredGuild != guildId ? null : BDFDB.ReactUtils.createElement("div", {