diff --git a/files/templates/settings/common.html b/files/templates/settings/common.html
index 5e59d78076..bf7bc582c8 100644
--- a/files/templates/settings/common.html
+++ b/files/templates/settings/common.html
@@ -61,9 +61,7 @@
 				<input minlength={{minlength}} maxlength={{maxlength}} pattern="{{pattern}}" autocomplete="off" id="{{id}}-body" type="text" name="{{form_name}}" class="form-control" placeholder='{{placeholder_text}}' value="{% if contents %}{{contents}}{% endif %}" {% if disabled %}disabled{% endif %}>
 				<div class="d-flex mt-2">
 					{% if show_emojis %}
-						<div class="format-btns">
-							{{macros.emoji_btn(id ~ '-body')}}
-						</div>
+						{{macros.emoji_btn(id ~ '-body')}}
 					{% endif %}
 					<small class="ml-1">{{below_text}}</small>
 					<input autocomplete="off" class="btn btn-primary ml-auto" id="{{id}}-save" type="submit" value="{{button_text}}" {% if disabled %}disabled{% endif %}>
diff --git a/files/templates/submit.html b/files/templates/submit.html
index e2fb13edf4..19d85522c8 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -30,9 +30,7 @@
 												<label class='mt-4' for="title">Post Title</label>
 												<textarea autocomplete="off" class="form-control" id="post-title" type="text" name="title" placeholder="Required" value="{{title}}" minlength="1" maxlength="500" required data-nonce="{{g.nonce}}" data-oninput="checkForRequired();savetext()"></textarea>
 
-												<div class="format-btns">
-													{{macros.emoji_btn('post-title')}}
-												</diV>
+												{{macros.emoji_btn('post-title')}}
 								
 												<div id="urlblock">
 													<label for="URL" class="mt-3">URL</label>
diff --git a/files/templates/userpage/admintools.html b/files/templates/userpage/admintools.html
index d939896ebf..6e278be4d6 100644
--- a/files/templates/userpage/admintools.html
+++ b/files/templates/userpage/admintools.html
@@ -40,9 +40,7 @@
 							<input hidden name="formkey" value="{{v|formkey}}">
 							<input maxlength=100 autocomplete="off" id="flair_htmlbody-{{deviceType}}" type="text" name="title" class="form-control" placeholder='Enter a flair here' value="{% if u.flair %}{{u.flair}}{% endif %}">
 							<div class="d-flex">
-								<div class="format-btns">
-									{{macros.emoji_btn('flair_htmlbody-' ~ deviceType)}}
-								</div>
+								{{macros.emoji_btn('flair_htmlbody-' ~ deviceType)}}
 
 								<div class="custom-control custom-checkbox ml-2 mt-1">
 									<input autocomplete="off" type="checkbox" class="custom-control-input" id="locked-{{deviceType}}" name="locked" {% if u.flairchanged %}checked{% endif %}>
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index fb11273da6..1dca7ad7f5 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -339,10 +339,8 @@
 			<span id="loading-indicator" class="d-none"></span>
 		</div>
 
-		<div class="format-btns">
-			{{emoji_btn('input-text-chat')}}
-			{{file_btn('file', False, True)}}
-		</div>
+		{{emoji_btn('input-text-chat')}}
+		{{file_btn('file', False, True)}}
 
 		<textarea id="input-text-chat" minlength="1" maxlength="{% if SITE == 'rdrama.net' %}200{% else %}1000{% endif %}" {% if g.browser in ("iphone","mac") %}style="font-size:16px!important"{% endif %} class="file-ta form-control ml-2" placeholder="Message" autocomplete="off" autofocus rows="1"></textarea>