diff --git a/other/icons/DDRace.icns b/other/icons/DDRace.icns
new file mode 100644
index 000000000..07e929c81
Binary files /dev/null and b/other/icons/DDRace.icns differ
diff --git a/other/icons/DDRace.ico b/other/icons/DDRace.ico
index 56f9091e5..f1ccac600 100644
Binary files a/other/icons/DDRace.ico and b/other/icons/DDRace.ico differ
diff --git a/other/icons/DDRace_srv.icns b/other/icons/DDRace_srv.icns
new file mode 100644
index 000000000..d4d762e70
Binary files /dev/null and b/other/icons/DDRace_srv.icns differ
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index f3de21575..fea8cb39e 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -1203,9 +1203,8 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
 		pPlayer->m_LastEmote = Server()->Tick();
 		
 		SendEmoticon(ClientID, pMsg->m_Emoticon);
-
-		SendEmoticon(ClientID, pMsg->m_Emoticon);
-		CCharacter* pChr = pPlayer->GetCharacter();
+		// TODO:DDRace GreYFoX Rework Emoticons
+		/*CCharacter* pChr = pPlayer->GetCharacter();
 		if(pChr && g_Config.m_SvEmotionalTees && pChr->m_EyeEmote)
 		{
 			switch(pMsg->m_Emoticon)
@@ -1237,7 +1236,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
 					break;
 			}
 			pChr->SetEmoteStop(Server()->Tick() + 2 * Server()->TickSpeed());
-		}
+		}*/
 	}
 	else if (MsgID == NETMSGTYPE_CL_KILL && !m_World.m_Paused)
 	{