changing channel and user icons to # and @

client/stylesheets/base.less

@@ -462,22 +462,22 @@ label.required:after {
 }
 
 .status-offline,
-.icon-user.status-offline {
+.icon-at.status-offline {
 	color: @status-offline;
 }
 
 .status-online,
-.icon-user.status-online {
+.icon-at.status-online {
 	color: @status-online !important;
 }
 
 .status-busy,
-.icon-user.status-busy {
+.icon-at.status-busy {
 	color: @status-busy;
 }
 
 .status-away,
-.icon-user.status-away {
+.icon-at.status-away {
 	color: @status-away !important;
 }
 
@@ -551,14 +551,6 @@ label.required:after {
 		z-index: 1;
 		.transition(opacity .1s ease-out);
 	}
-	.fa {
-		text-align: center;
-		width: 20px;
-		font-size: 18px;
-		vertical-align: middle;
-		position: relative;
-		z-index: 2;
-	}
 	&:hover {
 		text-decoration: none;
 		color: #FFF;
@@ -1055,13 +1047,6 @@ a.github-fork {
 			position: relative;
 		}
 		margin-right: 20px;
-		.fa {
-			display: block;
-			position: absolute;
-			top: 10px;
-			left: 8px;
-			color: @secondary-font-color;
-		}
 	}
 	h3 {
 		&:extend(.small-title);
@@ -1804,9 +1789,6 @@ a.github-fork {
 			border-right: 2px;
 			border-radius: 2px;
 		}
-		.fa {
-			margin-right: 3px;
-		}
 	}
 	.box {
 		position: relative;
@@ -1833,9 +1815,6 @@ a.github-fork {
 			background-color: #CDCDCD;
 			border-right: 2px;
 		}
-		.fa {
-			margin-right: 3px;
-		}
 	}
 	.links {
 		i {
@@ -2428,12 +2407,6 @@ a.github-fork {
 			font-weight: 400;
 			padding: 16px 20px;
 			margin-top: 20px;
-			.fa {
-				width: 20px;
-				margin-right: 4px;
-				vertical-align: text-top;
-				margin-top: -3px;
-			}
 		}
 		h1 {
 			font-weight: 700;

client/views/app/asideNav/chatRoomItem.coffee

@@ -20,8 +20,8 @@ Template.chatRoomItem.helpers
 
 	roomIcon: ->
 		switch this.t
-			when 'd' then return 'icon-user'
-			when 'g' then return 'icon-users'
+			when 'd' then return 'icon-at'
+			when 'g' then return 'icon-hash'
 
 	active: ->
 		return 'active' if Router.current().params._id? and Router.current().params._id is this.rid

client/views/app/privateHistory.coffee

@@ -8,8 +8,8 @@ Template.privateHistory.helpers
 
 	type: ->
 		switch this.t
-			when 'd' then 'icon-user'
-			when 'g' then 'icon-users'
+			when 'd' then 'icon-at'
+			when 'g' then 'icon-hash'
 			when 'v' then 'icon-comment'
 
 	creation: ->

client/views/app/roomSearch.coffee

 Template.roomSearch.helpers
 	roomIcon: ->
-		return 'icon-user' if this.type is 'u'
+		return 'icon-at' if this.type is 'u'
 
 		if this.type is 'r'
 			switch this.t
-				when 'd' then return 'icon-user'
-				when 'g' then return 'icon-users'
+				when 'd' then return 'icon-at'
+				when 'g' then return 'icon-hash'
 
 	userStatus: ->
 		if this.type is 'u'