diff --git a/files/style/be.bastelstu.chat.scss b/files/style/be.bastelstu.chat.scss
index ace5417..d8358a7 100644
--- a/files/style/be.bastelstu.chat.scss
+++ b/files/style/be.bastelstu.chat.scss
@@ -57,6 +57,7 @@ #tpl_chat_log {
 		}
 
 		#content {
+			margin-left: 20px;
 			width: auto !important;
 		}
 
@@ -383,6 +384,20 @@ #tpl_chat_log {
 				flex-grow: 0;
 				flex-shrink: 0;
 				margin-right: 5px;
+
+				.icon16 {
+					display: none;
+				}
+
+				@include screen-lg {
+					.icon16 {
+						display: inline-block;
+					}
+
+					.icon24 {
+						display: none;
+					}
+				}
 			}
 
 			> div.chatInputWrapper {
diff --git a/files_wcf/js/Bastelstu.be/Chat/Ui/Settings/SmiliesButton.js b/files_wcf/js/Bastelstu.be/Chat/Ui/Settings/SmiliesButton.js
index 8293f8e..c277d89 100644
--- a/files_wcf/js/Bastelstu.be/Chat/Ui/Settings/SmiliesButton.js
+++ b/files_wcf/js/Bastelstu.be/Chat/Ui/Settings/SmiliesButton.js
@@ -63,7 +63,7 @@ define([ './ToggleButton'
 		 */
 		setupMobile() {
 			this.shadowToggleButton = document.createElement('span')
-			this.shadowToggleButton.classList.add('smiliesToggleMobileButton')
+			this.shadowToggleButton.classList.add('smiliesToggleMobileButton', 'button', 'small')
 			this.shadowToggleButton.innerHTML = '<span class="icon icon24 fa-smile-o"></span>'
 			this.shadowToggleButton.addEventListener('mousedown', this.onClick.bind(this))
 
diff --git a/templates/room.tpl b/templates/room.tpl
index 0c9e986..c9bf5c8 100644
--- a/templates/room.tpl
+++ b/templates/room.tpl
@@ -58,6 +58,7 @@
 			<div class="chatAttachButton">
 				<span id="chatAttachmentUploadButton" class="button small" title="{lang}wcf.attachment.attachments{/lang}">
 					<span class="icon icon16 fa-paperclip"></span>
+					<span class="icon icon24 fa-paperclip"></span>
 				</span>
 			</div>
 		{/if}