diff --git a/template/chat.tpl b/template/chat.tpl
index d1c41b5..9b36180 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -141,8 +141,6 @@
 <body id="tpl{$templateName|ucfirst}">
 {capture assign='sidebar'}<aside class="sidebar">
 	<div id="sidebar">
-		<button title="{lang}wcf.chat.title{/lang}" value="{link controller="Chat"}{/link}">{lang}wcf.chat.title{/lang}</button>
-		<button title="{lang}wcf.chat.protocol{/lang}" value="{link controller="Chat" action="Log"}{/link}">{lang}wcf.chat.protocol{/lang}</button>
 		<h2>{lang}wcf.chat.users{/lang}</h2>
 			<ul id="chatUserList">
 			{section name=user start=1 loop=11}
diff --git a/template/chatNavigationInclude.tpl b/template/chatNavigationInclude.tpl
new file mode 100644
index 0000000..0202910
--- /dev/null
+++ b/template/chatNavigationInclude.tpl
@@ -0,0 +1,4 @@
+{if $templateName == 'chat'}
+<li><a href="{link controller="Chat" action="Log"}{/link}" title="{lang}wcf.chat.protocol{/lang}" class="balloonTooltip"><img src="{icon size='S'}chat1{/icon}" alt="" /> <span>{lang}wcf.chat.protocol{/lang}</span></a></li>
+<li><a href="{link controller="Chat"}{/link}"              title="{lang}wcf.chat.title{/lang}"    class="balloonTooltip"><img src="{icon size='S'}chat1{/icon}" alt="" /> <span>{lang}wcf.chat.title{/lang}</span></a></li>
+{/if}
\ No newline at end of file
diff --git a/templatelistener.xml b/templatelistener.xml
index 08d1c7e..03653e4 100644
--- a/templatelistener.xml
+++ b/templatelistener.xml
@@ -13,5 +13,11 @@
 			<eventname>copyright</eventname>
 			<templatecode><![CDATA[{include file='chatCopyright'}]]></templatecode>
 		</templatelistener>
+		<templatelistener name="chatHeaderNavigation">
+			<environment>user</environment>
+			<templatename>header</templatename>
+			<eventname>headerNavigation</eventname>
+			<templatecode><![CDATA[{include file='chatNavigationInclude'}]]></templatecode>
+		</templatelistener>
 	</import>
 </data>
\ No newline at end of file
