diff --git a/file/icon/chat.svg b/file/icon/chat.svg
index ceaa23b..d9fd61b 100644
--- a/file/icon/chat.svg
+++ b/file/icon/chat.svg
@@ -25,11 +25,11 @@
 				}		
 				.Upper .bubble {
 					fill:none;
-					stroke:#336699;
+					stroke:#666666;
 					stroke-opacity:1;
 				}		
 				.Upper .leaderLine {
-					fill:#336699;
+					fill:#666666;
 					fill-opacity:1;
 					stroke:none;
 				}
diff --git a/file/icon/chat1.svg b/file/icon/chatColored.svg
similarity index 97%
rename from file/icon/chat1.svg
rename to file/icon/chatColored.svg
index d9fd61b..ceaa23b 100644
--- a/file/icon/chat1.svg
+++ b/file/icon/chatColored.svg
@@ -25,11 +25,11 @@
 				}		
 				.Upper .bubble {
 					fill:none;
-					stroke:#666666;
+					stroke:#336699;
 					stroke-opacity:1;
 				}		
 				.Upper .leaderLine {
-					fill:#666666;
+					fill:#336699;
 					fill-opacity:1;
 					stroke:none;
 				}
diff --git a/file/style/jCounter.scss b/file/style/jCounter.scss
index 1acc5e9..c7b5f76 100644
--- a/file/style/jCounter.scss
+++ b/file/style/jCounter.scss
@@ -1,42 +1,42 @@
-.jCounterContainer {
-	display: table;
-	
-	> div {
-		display: table-row;
-	}
-}
-
-.jCounterInput {
-	height: 16px;
-	width: 100%;
-	position: relative;
-	z-index: 9999;
-	box-sizing: content-box !important;
-}
-
-.jCounterInput, .jCounter {
-	display: table-cell;
-}
-
-.jCounter {
-	text-align: center;
-	background-color: rgba(0, 0, 0, 0.7);
-	padding: 0 5px 0 10px;
-	position: relative;
-	z-index: 0 !important;
-	border-radius: 0px 5px 5px 0px;
-	border: 1px solid rgba(255, 255, 255, 0.3);
-	width: 30px;
-	
-	&.color-1 {
-		color: #FFFFFF;
-	}
-	
-	&.color-2 {
-		color: rgba(255,255,255,0.5);
-	}
-	
-	&.color-3 {
-		color: #D40D12;
-	}
-}
\ No newline at end of file
+.jCounterContainer {
+	display: table;
+	
+	> div {
+		display: table-row;
+	}
+}
+
+.jCounterInput {
+	height: 16px;
+	width: 100%;
+	position: relative;
+	z-index: 9999;
+	box-sizing: content-box !important;
+}
+
+.jCounterInput, .jCounter {
+	display: table-cell;
+}
+
+.jCounter {
+	text-align: center;
+	background-color: rgba(0, 0, 0, 0.7);
+	padding: 0 5px 0 10px;
+	position: relative;
+	z-index: 0 !important;
+	border-radius: 0px 5px 5px 0px;
+	border: 1px solid rgba(255, 255, 255, 0.3);
+	width: 30px;
+	
+	&.color-1 {
+		color: #FFFFFF;
+	}
+	
+	&.color-2 {
+		color: rgba(255,255,255,0.5);
+	}
+	
+	&.color-3 {
+		color: #D40D12;
+	}
+}
diff --git a/template/chat.tpl b/template/chat.tpl
index d0ae7b2..59b1b06 100755
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -32,11 +32,11 @@
 		}
 		
 		.timsChatMessage{$type|concat:'JOIN'|constant} {
-			background-image: url({icon size='S'}toRight1{/icon});
+			background-image: url({icon size='S'}circleArrowRight{/icon});
 		}
 		
 		.timsChatMessage{$type|concat:'LEAVE'|constant} {
-			background-image: url({icon size='S'}toLeft1{/icon});
+			background-image: url({icon size='S'}circleArrowLeft{/icon});
 		}
 		
 		.timsChatMessage{$type|concat:'INFORMATION'|constant} {
@@ -48,7 +48,7 @@
 		}
 		
 		.ajaxLoad {
-			background-image: url({icon size='S'}spinner1{/icon});
+			background-image: url({icon size='S'}spinner{/icon});
 		}
 	</style>
 </head>
@@ -88,27 +88,27 @@
 			<ul class="smallButtons">
 				<li>
 					<a id="timsChatAutoscroll" href="javascript:;" class="timsChatToggle jsTooltip button" title="{lang}wcf.global.button.disable{/lang}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" data-status="1">
-						<img alt="" src="{icon size='S'}enabled1{/icon}" /> <span>{lang}wcf.chat.scroll{/lang}</span>
+						<img alt="" src="{icon size='S'}enabled{/icon}" /> <span>{lang}wcf.chat.scroll{/lang}</span>
 					</a>
 				</li>
 				<li>
 					<a id="timsChatNotify" href="javascript:;" class="timsChatToggle jsTooltip button" title="{lang}wcf.global.button.enable{/lang}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" data-status="0">
-						<img alt="" src="{icon size='S'}disabled1{/icon}" /> <span>{lang}wcf.chat.notify{/lang}</span>
+						<img alt="" src="{icon size='S'}disabled{/icon}" /> <span>{lang}wcf.chat.notify{/lang}</span>
 					</a>
 				</li>
 				<li{if !MODULE_SMILEY} style="display: none;"{/if}>
 					<a id="timsChatSmilies" href="javascript:;" class="timsChatToggle jsTooltip button" title="{lang}wcf.global.button.disable{/lang}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" data-status="1">
-						<img alt="" src="{icon size='S'}enabled1{/icon}" /> <span>{lang}wcf.chat.smilies{/lang}</span>
+						<img alt="" src="{icon size='S'}enabled{/icon}" /> <span>{lang}wcf.chat.smilies{/lang}</span>
 					</a>
 				</li>
 				<li>
 					<a id="timsChatClear" href="javascript:;" class="jsTooltip button" title="{lang}wcf.chat.clear.description{/lang}">
-						<img alt="" src="{icon size='S'}delete1{/icon}" /> <span>{lang}wcf.chat.clear{/lang}</span>
+						<img alt="" src="{icon size='S'}delete{/icon}" /> <span>{lang}wcf.chat.clear{/lang}</span>
 					</a>
 				</li>
 				<li>
 					<a id="timsChatMark" href="javascript:;" class="jsTooltip button" title="{lang}wcf.chat.mark.description{/lang}">
-						<img alt="" src="{icon size='S'}check1{/icon}" /> <span>{lang}wcf.chat.mark{/lang}</span>
+						<img alt="" src="{icon size='S'}check{/icon}" /> <span>{lang}wcf.chat.mark{/lang}</span>
 					</a>
 				</li>
 			</ul>
@@ -139,7 +139,7 @@
 				'wcf.chat.newMessages': '{lang}wcf.chat.newMessages{/lang}'
 			});
 			WCF.Icon.addObject({
-				'be.bastelstu.wcf.chat.chat': '{icon size='L'}chat1{/icon}'
+				'be.bastelstu.wcf.chat.chat': '{icon size='L'}chat{/icon}'
 			});
 			{event name='shouldInit'}
 			// Boot the chat
@@ -170,4 +170,4 @@
 
 {include file='footer' sandbox=false}
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/template/chatNavigationInclude.tpl b/template/chatNavigationInclude.tpl
index 5731038..a59843b 100644
--- a/template/chatNavigationInclude.tpl
+++ b/template/chatNavigationInclude.tpl
@@ -1,5 +1,5 @@
 <li>
 	<a href="{link controller="Chat" action="Log"}{/link}" title="{lang}wcf.chat.protocol{/lang}" class="jsTooltip">
-		<img src="{icon size='S'}session1{/icon}" alt="" /> <span>{lang}wcf.chat.protocol{/lang}</span>
+		<img src="{icon size='S'}eye{/icon}" alt="" /> <span>{lang}wcf.chat.protocol{/lang}</span>
 	</a>
-</li>
\ No newline at end of file
+</li>