diff --git a/client/css/style.css b/client/css/style.css
index ef9ccdd5..ee685587 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -221,22 +221,23 @@ kbd {
 #chat button.menu::before { content: "\f142"; /* http://fontawesome.io/icon/ellipsis-v/ */ }
 
 .context-menu-user::before { content: "\f007"; /* http://fontawesome.io/icon/user/ */ }
-.context-menu-chan::before { content: "\f292"; /* http://fontawesome.io/icon/hashtag/ */ }
 .context-menu-close::before { content: "\f00d"; /* http://fontawesome.io/icon/times/ */ }
 .context-menu-list::before { content: "\f03a"; /* http://fontawesome.io/icon/list/ */ }
 .context-menu-action-whois::before { content: "\f05a"; /* http://fontawesome.io/icon/info-circle/  */ }
-.context-menu-action-query::before { content: "\f0e6"; /* http://fontawesome.io/icon/comments-o/ */ }
 .context-menu-action-kick::before { content: "\f05e"; /* http://fontawesome.io/icon/ban/ */ }
 
 .context-menu-network::before,
 #sidebar .chan.lobby::before,
 #chat .lobby .title::before { content: "\f0a0"; /* http://fontawesome.io/icon/hdd-o/ */ }
 
+.context-menu-query::before,
+.context-menu-action-query::before,
 #sidebar .chan.query::before,
-#chat .query .title::before { content: "\f007"; /* http://fontawesome.io/icon/user/ */ }
+#chat .query .title::before { content: "\f0e5"; /* http://fontawesome.io/icon/comment-o/ */ }
 
+.context-menu-chan::before,
 #sidebar .chan.channel::before,
-#chat .channel .title::before { content: "\f292"; /* http://fontawesome.io/icon/hashtag/ */ }
+#chat .channel .title::before { content: "\f086"; /* http://fontawesome.io/icon/comments/ */ }
 
 #sidebar .chan.special::before,
 #chat .special .title::before { content: "\f03a"; /* http://fontawesome.io/icon/list/ */ }
diff --git a/client/js/lounge.js b/client/js/lounge.js
index dbfbe3fe..14dafae0 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -113,7 +113,7 @@ $(function() {
 			if (target.hasClass("lobby")) {
 				itemClass = "network";
 			} else if (target.hasClass("query")) {
-				itemClass = "user";
+				itemClass = "query";
 			} else {
 				itemClass = "chan";
 			}