diff --git a/file/js/be.bastelstu.Chat.litcoffee b/file/js/be.bastelstu.Chat.litcoffee
index 3582a3f..3f98ca6 100644
--- a/file/js/be.bastelstu.Chat.litcoffee
+++ b/file/js/be.bastelstu.Chat.litcoffee
@@ -254,7 +254,15 @@ Handling toggling when a toggable button is `click`ed.
 						element.attr 'title', element.data 'disableMessage'
 						
 					$('#timsChatInput').focus()
-				
+
+Mark smilies as disabled.
+
+				$('#timsChatSmilies').click (event) ->
+					if $(@).data 'status'
+						$('#smilies').removeClass 'disabled'
+					else
+						$('#smilies').addClass 'disabled'
+
 Toggle fullscreen mode.
 
 				$('#timsChatFullscreen').click (event) ->
@@ -263,7 +271,7 @@ Toggle fullscreen mode.
 					else
 						$('html').removeClass 'fullscreen'
 				
-Scroll down when autoscrollis being activated.
+Scroll down when autoscroll is being activated.
 
 				$('#timsChatAutoscroll').click (event) ->
 					$(@).removeClass 'active'
diff --git a/file/style/be.bastelstu.wcf.chat.less b/file/style/be.bastelstu.wcf.chat.less
index 2faa16e..1891d04 100644
--- a/file/style/be.bastelstu.wcf.chat.less
+++ b/file/style/be.bastelstu.wcf.chat.less
@@ -11,8 +11,7 @@
 		text-align: left;
 		
 		#timsChatTopic {
-			padding: 5px;
-			margin-bottom: @wcfGapSmall;
+			padding: @wcfGapTiny;
 			.transition(height, .2s);
 			.transition(padding-top, .2s);
 			.transition(padding-bottom, .2s);
@@ -87,14 +86,8 @@
 		}
 	}
 	
-	#timsChatLog .timsChatMessageContainer {
-		height: auto;
-		overflow: visible;
-	}
-	
 	.sidebar {
-		margin-bottom: -20px !important;
-		padding: 0;
+		padding-top: 0;
 		
 		#sidebarContent {
 			padding-top: 0px;
@@ -241,10 +234,6 @@
 			}
 		}
 		
-		h2 {
-			margin: auto;
-		}
-		
 		ul {
 			li {
 				a {
@@ -256,26 +245,8 @@
 		}
 	}
 	
-	#timsChatForm {
-		white-space: nowrap;
-		margin-top: 10px;
-		// Fix to align chatInput in center
-		text-align: center;
-		
-		#timsChatInput {
-			position: relative;
-			z-index: 10;
-		}
-	}
-	
 	#timsChatControls {
-		position: relative;
-		.borderRadius(5px, 5px, 0, 5px);
-		
 		#smilies {
-			padding: 14px 21px 7px;
-			border-bottom-right-radius: 0px;
-			
 			li {
 				.transition(opacity, .2s);
 			}
diff --git a/template/chat.tpl b/template/chat.tpl
index 31ce164..ce9be01 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -97,7 +97,7 @@
 	<div>
 		<p id="timsChatTopic" class="container{if $room->topic|language === ''} empty{/if}">{$room->topic|language}</p>
 		
-		<div id="timsChatMessageContainer" class="timsChatMessageContainer container box shadow1">
+		<div id="timsChatMessageContainer" class="timsChatMessageContainer marginTop container">
 			<p class="error noJsOnly" style="display: none;">{lang}chat.general.noJs{/lang}</p>
 			<ul>
 			</ul>