diff --git a/.meteor/packages b/.meteor/packages
index 168c9df2733..1f6c35caf6a 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -63,7 +63,6 @@ rocketchat:livechat
 rocketchat:logger
 rocketchat:mailer
 rocketchat:markdown
-rocketchat:me
 rocketchat:mentions
 rocketchat:mentions-flextab
 rocketchat:message-attachments
@@ -79,7 +78,9 @@ rocketchat:slashcommands-invite
 rocketchat:slashcommands-join
 rocketchat:slashcommands-kick
 rocketchat:slashcommands-leave
+rocketchat:slashcommands-me
 rocketchat:slashcommands-mute
+rocketchat:slashcommands-shrug
 rocketchat:slashcommands-topic
 rocketchat:spotify
 rocketchat:statistics
diff --git a/.meteor/versions b/.meteor/versions
index ec1e969a990..2b2b883576f 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -160,7 +160,6 @@ rocketchat:livechat@0.0.1
 rocketchat:logger@0.0.1
 rocketchat:mailer@0.0.1
 rocketchat:markdown@0.0.1
-rocketchat:me@0.0.1
 rocketchat:mentions@0.0.1
 rocketchat:mentions-flextab@0.0.1
 rocketchat:message-attachments@0.0.1
@@ -177,8 +176,10 @@ rocketchat:slashcommands-invite@0.0.1
 rocketchat:slashcommands-join@0.0.1
 rocketchat:slashcommands-kick@0.0.1
 rocketchat:slashcommands-leave@0.0.1
+rocketchat:slashcommands-me@0.0.1
 rocketchat:slashcommands-mute@0.0.1
 rocketchat:slashcommands-topic@0.0.1
+rocketchat:slashcommands-shrug@0.0.1
 rocketchat:sms@0.0.1
 rocketchat:spotify@0.0.1
 rocketchat:statistics@0.0.1
diff --git a/packages/rocketchat-emojione/emojiPicker.html b/packages/rocketchat-emojione/emojiPicker.html
index 5854e69a2cc..3ae611e6b11 100644
--- a/packages/rocketchat-emojione/emojiPicker.html
+++ b/packages/rocketchat-emojione/emojiPicker.html
@@ -2,33 +2,11 @@
 	<div class="emoji-picker">
 		<div class="filter">
 			<ul>
-				<li class="{{activeCategory 'recent'}}" title="{{categoryName 'recent' }}">
-					<a href="#recent" class="category-link"><i class="icon-recent"></i></a>
-				</li>
-				<li class="{{activeCategory 'people'}}" title="{{categoryName 'people' }}">
-					<a href="#people" class="category-link"><i class="icon-people"></i></a>
-				</li>
-				<li class="{{activeCategory 'nature'}}" title="{{categoryName 'nature' }}">
-					<a href="#nature" class="category-link"><i class="icon-nature"></i></a>
-				</li>
-				<li class="{{activeCategory 'food'}}" title="{{categoryName 'food' }}">
-					<a href="#food" class="category-link"><i class="icon-foods"></i></a>
-				</li>
-				<li class="{{activeCategory 'activity'}}" title="{{categoryName 'activity' }}">
-					<a href="#activity" class="category-link"><i class="icon-activity"></i></a>
-				</li>
-				<li class="{{activeCategory 'travel'}}" title="{{categoryName 'travel' }}">
-					<a href="#travel" class="category-link"><i class="icon-travel"></i></a>
-				</li>
-				<li class="{{activeCategory 'objects'}}" title="{{categoryName 'objects' }}">
-					<a href="#objects" class="category-link"><i class="icon-objects"></i></a>
-				</li>
-				<li class="{{activeCategory 'symbols'}}" title="{{categoryName 'symbols' }}">
-					<a href="#symbols" class="category-link"><i class="icon-symbols"></i></a>
-				</li>
-				<li class="{{activeCategory 'flags'}}" title="{{categoryName 'flags' }}">
-					<a href="#flags" class="category-link"><i class="icon-flags"></i></a>
-				</li>
+				{{#each category}}
+					<li class="{{activeCategory .}}" title="{{categoryName .}}">
+						<a href="#{{.}}" class="category-link"><i class="icon-{{.}}"></i></a>
+					</li>
+				{{/each}}
 				<li class="change-tone">
 					<a href="#change-tone"><span class="current-tone {{currentTone}}"></span></a>
 					<ul class="tone-selector">
diff --git a/packages/rocketchat-lib/i18n/en.i18n.json b/packages/rocketchat-lib/i18n/en.i18n.json
index 17356fbce67..054e834a919 100644
--- a/packages/rocketchat-lib/i18n/en.i18n.json
+++ b/packages/rocketchat-lib/i18n/en.i18n.json
@@ -920,6 +920,7 @@
   "Skip" : "Skip",
   "Slash_Topic_Description" : "Set topic",
   "Slash_Topic_Params" : "Topic message",
+  "Slash_Shrug_Description" : "Displays ¯\\_(ツ)_/¯ after your message",
   "Smileys_and_People" : "Smileys & People",
   "SMS_Enabled" : "SMS Enabled",
   "SMTP" : "SMTP",
diff --git a/packages/rocketchat-me/me.coffee b/packages/rocketchat-slashcommands-me/me.coffee
similarity index 100%
rename from packages/rocketchat-me/me.coffee
rename to packages/rocketchat-slashcommands-me/me.coffee
diff --git a/packages/rocketchat-me/package.js b/packages/rocketchat-slashcommands-me/package.js
similarity index 88%
rename from packages/rocketchat-me/package.js
rename to packages/rocketchat-slashcommands-me/package.js
index 0985fb40317..beb74ad941b 100644
--- a/packages/rocketchat-me/package.js
+++ b/packages/rocketchat-slashcommands-me/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-	name: 'rocketchat:me',
+	name: 'rocketchat:slashcommands-me',
 	version: '0.0.1',
 	summary: 'Message pre-processor that will translate /me commands',
 	git: ''
diff --git a/packages/rocketchat-slashcommands-shrug/package.js b/packages/rocketchat-slashcommands-shrug/package.js
new file mode 100644
index 00000000000..69db7fafdd3
--- /dev/null
+++ b/packages/rocketchat-slashcommands-shrug/package.js
@@ -0,0 +1,18 @@
+Package.describe({
+	name: 'rocketchat:slashcommands-shrug',
+	version: '0.0.1',
+	summary: 'Message pre-processor that will translate /shrug commands',
+	git: ''
+});
+
+Package.onUse(function(api) {
+	api.versionsFrom('1.0');
+
+	api.use([
+		'rocketchat:lib'
+	]);
+
+	api.use('ecmascript');
+
+	api.addFiles('shrug.js', ['server', 'client']);
+});
diff --git a/packages/rocketchat-slashcommands-shrug/shrug.js b/packages/rocketchat-slashcommands-shrug/shrug.js
new file mode 100644
index 00000000000..1ed5ffbc069
--- /dev/null
+++ b/packages/rocketchat-slashcommands-shrug/shrug.js
@@ -0,0 +1,20 @@
+/*
+* Shrug is a named function that will replace /shrug commands
+* @param {Object} message - The message object
+*/
+
+
+function Shrug(command, params, item) {
+	if (command === 'shrug') {
+		var msg;
+
+		msg = item;
+		msg.msg = params + ' ¯\\_(ツ)_/¯';
+		Meteor.call('sendMessage', msg);
+	}
+}
+
+RocketChat.slashCommands.add('shrug', Shrug, {
+	description: 'Slash_Shrug_Description',
+	params: 'your message (optional)'
+});