diff --git a/.eslintignore b/.eslintignore
index cc014c8b92..5e8b92a1c9 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,7 +1,5 @@
 app/assets/javascripts/env.js
-app/assets/javascripts/main_include.js
 app/assets/javascripts/main_include_admin.js
-app/assets/javascripts/pagedown_custom.js
 app/assets/javascripts/vendor.js
 app/assets/javascripts/locales/i18n.js
 app/assets/javascripts/ember-addons/
@@ -11,11 +9,9 @@ lib/javascripts/messageformat.js
 lib/javascripts/moment.js
 lib/javascripts/moment_locale/
 lib/highlight_js/
+plugins/**/lib/javascripts/locale
 public/javascripts/
-spec/phantom_js/smoke_test.js
 vendor/
 test/javascripts/test_helper.js
-test/javascripts/test_helper.js
 test/javascripts/fixtures
 test/javascripts/helpers/assertions.js
-app/assets/javascripts/ember-addons/
diff --git a/.gitignore b/.gitignore
index 8a1f8652b9..fbaaa54386 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,9 +117,12 @@ bundler_stubs/*
 vendor/bundle/*
 *.db
 
-#ignore jetbrains ide file
+# ignore jetbrains ide file
 *.iml
 
+# vim swap
+*.swn
+
 # ignore nodejs files
 /node_modules
 /package-lock.json
diff --git a/.travis.yml b/.travis.yml
index 73ae46e5b0..a62d28ebc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,6 @@ addons:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - rvm: 2.5.0
 
 rvm:
   - 2.5.0
diff --git a/Gemfile b/Gemfile
index e558ffb47c..a513adb80e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,12 +36,12 @@ gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
-gem 'onebox', '1.8.33'
+gem 'onebox', '1.8.36'
 
 gem 'http_accept_language', '~>2.0.5', require: false
 
 gem 'ember-rails', '0.18.5'
-gem 'ember-source'
+gem 'ember-source', '2.13.3'
 gem 'ember-handlebars-template', '0.7.5'
 gem 'barber'
 
@@ -53,14 +53,13 @@ gem 'fast_xs'
 
 gem 'fast_xor'
 
-# Forked until https://github.com/sdsykes/fastimage/pull/93 is merged
-gem 'discourse_fastimage', require: 'fastimage'
+gem 'fastimage'
 
 gem 'aws-sdk-s3', require: false
 gem 'excon', require: false
 gem 'unf', require: false
 
-gem 'email_reply_trimmer', '0.1.8'
+gem 'email_reply_trimmer', '0.1.9'
 
 # Forked until https://github.com/toy/image_optim/pull/149 is merged
 gem 'discourse_image_optim', require: 'image_optim'
@@ -83,7 +82,7 @@ gem 'omniauth-oauth2', require: false
 
 gem 'omniauth-google-oauth2'
 gem 'oj'
-gem 'pg'
+gem 'pg', '~> 0.21.0'
 gem 'pry-rails', require: false
 gem 'r2', '~> 0.2.5', require: false
 gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
index 529aa37e43..b2397688ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ GEM
       uniform_notifier (~> 1.10.0)
     byebug (9.0.6)
     certified (1.0.0)
-    coderay (1.1.1)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     cppjieba_rb (0.3.0)
@@ -85,14 +85,13 @@ GEM
     diff-lcs (1.3)
     discourse-qunit-rails (0.0.11)
       railties
-    discourse_fastimage (2.1.0)
     discourse_image_optim (0.24.5)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    email_reply_trimmer (0.1.8)
+    email_reply_trimmer (0.1.9)
     ember-data-source (2.2.1)
       ember-source (>= 1.8, < 3.0)
     ember-handlebars-template (0.7.5)
@@ -120,6 +119,7 @@ GEM
       rake
       rake-compiler
     fast_xs (0.8.0)
+    fastimage (2.1.1)
     ffi (1.9.18)
     flamegraph (0.9.5)
     foreman (0.84.0)
@@ -144,8 +144,8 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jwt (1.5.6)
-    kgio (2.11.0)
-    libv8 (5.9.211.38.1)
+    kgio (2.11.1)
+    libv8 (6.3.292.48.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -166,7 +166,7 @@ GEM
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
     memory_profiler (0.9.8)
-    message_bus (2.1.1)
+    message_bus (2.1.2)
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.8.2)
@@ -175,8 +175,8 @@ GEM
     mime-types-data (3.2016.0521)
     mini_mime (0.1.3)
     mini_portile2 (2.3.0)
-    mini_racer (0.1.11)
-      libv8 (~> 5.7)
+    mini_racer (0.1.15)
+      libv8 (~> 6.3)
     mini_suffix (0.3.0)
       ffi (~> 1.9)
     minitest (5.10.3)
@@ -232,7 +232,7 @@ GEM
     omniauth-twitter (1.3.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.8.33)
+    onebox (1.8.36)
       fast_blank (>= 1.0.0)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
@@ -246,7 +246,7 @@ GEM
     parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.20.0)
+    pg (0.21.0)
     powerpack (0.1.1)
     progress (3.3.1)
     pry (0.10.4)
@@ -275,7 +275,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails_multisite (1.1.2)
+    rails_multisite (2.0.2)
       activerecord (> 4.2, < 6)
       railties (> 4.2, < 6)
     railties (5.1.4)
@@ -293,7 +293,7 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rbtrace (0.4.8)
+    rbtrace (0.4.10)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
@@ -389,7 +389,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
-    unicorn (5.3.1)
+    unicorn (5.4.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.10.0)
@@ -420,12 +420,11 @@ DEPENDENCIES
   certified
   cppjieba_rb
   discourse-qunit-rails
-  discourse_fastimage
   discourse_image_optim
-  email_reply_trimmer (= 0.1.8)
+  email_reply_trimmer (= 0.1.9)
   ember-handlebars-template (= 0.7.5)
   ember-rails (= 0.18.5)
-  ember-source
+  ember-source (= 2.13.3)
   excon
   execjs
   fabrication (= 2.9.8)
@@ -433,6 +432,7 @@ DEPENDENCIES
   fast_blank
   fast_xor
   fast_xs
+  fastimage
   flamegraph
   foreman
   gc_tracer
@@ -469,9 +469,9 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter
-  onebox (= 1.8.33)
+  onebox (= 1.8.36)
   openid-redis-store
-  pg
+  pg (~> 0.21.0)
   pry-nav
   pry-rails
   puma
@@ -509,4 +509,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/app/assets/javascripts/admin/components/flag-user-lists.js.es6 b/app/assets/javascripts/admin/components/flag-user-lists.js.es6
new file mode 100644
index 0000000000..cd843ff7ab
--- /dev/null
+++ b/app/assets/javascripts/admin/components/flag-user-lists.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ['flag-user-lists']
+});
diff --git a/app/assets/javascripts/admin/components/flagged-post-title.js.es6 b/app/assets/javascripts/admin/components/flagged-post-title.js.es6
new file mode 100644
index 0000000000..7c1c013375
--- /dev/null
+++ b/app/assets/javascripts/admin/components/flagged-post-title.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: 'h3'
+});
diff --git a/app/assets/javascripts/admin/components/flagged-post.js.es6 b/app/assets/javascripts/admin/components/flagged-post.js.es6
index 0754952a01..aaa4759e82 100644
--- a/app/assets/javascripts/admin/components/flagged-post.js.es6
+++ b/app/assets/javascripts/admin/components/flagged-post.js.es6
@@ -13,15 +13,18 @@ export default Ember.Component.extend({
     'flaggedPost.deleted'
   ],
 
+  canAct: Ember.computed.alias('actableFilter'),
+
   @computed('filter')
-  canAct(filter) {
+  actableFilter(filter) {
     return filter === 'active';
   },
 
   removeAfter(promise) {
     return promise.then(() => {
       this.attrs.removePost();
-    }).catch(() => {
+    }).catch(error => {
+      if (error._discourse_displayed) { return; }
       bootbox.alert(I18n.t("admin.flags.error"));
     });
   },
diff --git a/app/assets/javascripts/admin/components/silence-details.js.es6 b/app/assets/javascripts/admin/components/silence-details.js.es6
new file mode 100644
index 0000000000..9250c1ae73
--- /dev/null
+++ b/app/assets/javascripts/admin/components/silence-details.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: ''
+});
diff --git a/app/assets/javascripts/admin/components/suspension-details.js.es6 b/app/assets/javascripts/admin/components/suspension-details.js.es6
new file mode 100644
index 0000000000..9250c1ae73
--- /dev/null
+++ b/app/assets/javascripts/admin/components/suspension-details.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: ''
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
index 98d061e060..9204541656 100644
--- a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
@@ -1,7 +1,7 @@
 export default Ember.Controller.extend({
   loading: false,
   term: null,
-  period: "yearly",
+  period: "quarterly",
   searchType: "all",
 
   searchTypeOptions: [
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
index a2b7c94f17..346bc273c1 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
@@ -1,8 +1,10 @@
-import UserBadge from 'discourse/models/user-badge';
+import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 
-export default Ember.Controller.extend({
+export default Ember.Controller.extend(GrantBadgeController, {
   adminUser: Ember.inject.controller(),
   user: Ember.computed.alias('adminUser.model'),
+  userBadges: Ember.computed.alias('model'),
+  allBadges: Ember.computed.alias('badges'),
 
   sortedBadges: Ember.computed.sort('model', 'badgeSortOrder'),
   badgeSortOrder: ['granted_at:desc'],
@@ -41,36 +43,6 @@ export default Ember.Controller.extend({
     return _(expanded).sortBy(group => group.granted_at).reverse().value();
   }.property('model', 'model.[]', 'model.expandedBadges.[]'),
 
-  /**
-    Array of badges that have not been granted to this user.
-
-    @property grantableBadges
-    @type {Boolean}
-  **/
-  grantableBadges: function() {
-    var granted = {};
-    this.get('model').forEach(function(userBadge) {
-      granted[userBadge.get('badge_id')] = true;
-    });
-
-    var badges = [];
-    this.get('badges').forEach(function(badge) {
-      if (badge.get('enabled') && (badge.get('multiple_grant') || !granted[badge.get('id')])) {
-        badges.push(badge);
-      }
-    });
-
-    return _.sortBy(badges, badge => badge.get('name'));
-  }.property('badges.[]', 'model.[]'),
-
-  /**
-    Whether there are any badges that can be granted.
-
-    @property noBadges
-    @type {Boolean}
-  **/
-  noBadges: Em.computed.empty('grantableBadges'),
-
   actions: {
 
     expandGroup: function(userBadge){
@@ -79,21 +51,21 @@ export default Ember.Controller.extend({
       model.get('expandedBadges').pushObject(userBadge.badge.id);
     },
 
-    grantBadge(badgeId) {
-      UserBadge.grant(badgeId, this.get('user.username'), this.get('badgeReason')).then(userBadge => {
-        this.set('badgeReason', '');
-        this.get('model').pushObject(userBadge);
-        Ember.run.next(() => {
-          // Update the selected badge ID after the combobox has re-rendered.
-          const newSelectedBadge = this.get('grantableBadges')[0];
-          if (newSelectedBadge) {
-            this.set('selectedBadgeId', newSelectedBadge.get('id'));
-          }
+    grantBadge() {
+      this.grantBadge(this.get('selectedBadgeId'), this.get('user.username'), this.get('badgeReason'))
+        .then(() => {
+          this.set('badgeReason', '');
+          Ember.run.next(() => {
+            // Update the selected badge ID after the combobox has re-rendered.
+            const newSelectedBadge = this.get('grantableBadges')[0];
+            if (newSelectedBadge) {
+              this.set('selectedBadgeId', newSelectedBadge.get('id'));
+            }
+          });
+        }, function() {
+          // Failure
+          bootbox.alert(I18n.t('generic_error'));
         });
-      }, function() {
-        // Failure
-        bootbox.alert(I18n.t('generic_error'));
-      });
     },
 
     revokeBadge(userBadge) {
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 266fdbd02c..41869d976e 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -64,6 +64,15 @@ export default Ember.Controller.extend(CanCheckEmails, {
     anonymize() { return this.get('model').anonymize(); },
     destroy() { return this.get('model').destroy(); },
 
+    viewActionLogs() {
+      this.get('adminTools').showActionLogs(this, {
+        target_user: this.get('model.username'),
+      });
+    },
+
+    showFlagsReceived() {
+      this.get('adminTools').showFlagsReceived(this.get('model'));
+    },
     showSuspendModal() {
       this.get('adminTools').showSuspendModal(this.get('model'));
     },
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
index fe0416bc30..4c53ba68d8 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
@@ -1,5 +1,7 @@
 import { ajax } from 'discourse/lib/ajax';
-export default Ember.Controller.extend({
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+
+export default Ember.Controller.extend(ModalFunctionality, {
 
   modelChanged: function(){
     const model = this.get('model');
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6
new file mode 100644
index 0000000000..bf47fb4ae3
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-flags-received.js.es6
@@ -0,0 +1,17 @@
+export default Ember.Controller.extend({
+  loadingFlags: null,
+  user: null,
+
+  onShow() {
+    this.set('loadingFlags', true);
+    this.store.findAll('flagged-post', {
+      filter: 'without_custom',
+      user_id: this.get('model.id')
+    }).then(result => {
+      this.set('loadingFlags', false);
+      console.log(result);
+      this.set('flaggedPosts', result);
+    });
+  }
+
+});
diff --git a/app/assets/javascripts/admin/models/flagged-post.js.es6 b/app/assets/javascripts/admin/models/flagged-post.js.es6
index acd3a0e0df..c33f3d3c49 100644
--- a/app/assets/javascripts/admin/models/flagged-post.js.es6
+++ b/app/assets/javascripts/admin/models/flagged-post.js.es6
@@ -22,6 +22,11 @@ export default Post.extend({
     });
   },
 
+  @computed('post_actions')
+  hasDisposedBy() {
+    return this.get('post_actions').some(action => action.disposed_by);
+  },
+
   @computed('post_actions.@each.name_key')
   flaggedForSpam() {
     return this.get('post_actions').every(action => action.name_key === 'spam');
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index 03e3888f97..af078528b7 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -1,6 +1,7 @@
 import { ajax } from 'discourse/lib/ajax';
 import round from "discourse/lib/round";
 import { fmt } from 'discourse/lib/computed';
+import { fillMissingDates } from 'discourse/lib/utilities';
 
 const Report = Discourse.Model.extend({
   reportUrl: fmt("type", "/admin/reports/%@"),
@@ -142,14 +143,13 @@ Report.reopenClass({
         group_id: groupId
       }
     }).then(json => {
-      // Add a percent field to each tuple
-      let maxY = 0;
-      json.report.data.forEach(row => {
-        if (row.y > maxY) maxY = row.y;
-      });
-      if (maxY > 0) {
-        json.report.data.forEach(row => row.percentage = Math.round((row.y / maxY) * 100));
+      // Add zero values for missing dates
+      if (json.report.data.length > 0) {
+        const startDateFormatted = moment(json.report.start_date).format('YYYY-MM-DD');
+        const endDateFormatted = moment(json.report.end_date).format('YYYY-MM-DD');
+        json.report.data = fillMissingDates(json.report.data, startDateFormatted, endDateFormatted);
       }
+
       const model = Report.create({ type: type });
       model.setProperties(json.report);
       return model;
diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
index fce0b126d3..8c77fdd1ae 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-index.js.es6
@@ -1,7 +1,15 @@
 import Backup from 'admin/models/backup';
 
 export default Ember.Route.extend({
+  activate() {
+    this.messageBus.subscribe("/admin/backups", backups => this.controller.set("model", backups));
+  },
+
   model() {
     return Backup.find();
+  },
+
+  deactivate() {
+    this.messageBus.unsubscribe("/admin/backups");
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index 92ac4652fa..f992b5fc93 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -9,26 +9,24 @@ const LOG_CHANNEL = "/admin/backups/logs";
 export default Discourse.Route.extend({
 
   activate() {
-    this.messageBus.subscribe(LOG_CHANNEL, this._processLogMessage.bind(this));
-  },
-
-  _processLogMessage(log) {
-    if (log.message === "[STARTED]") {
-      this.controllerFor("adminBackups").set("model.isOperationRunning", true);
-      this.controllerFor("adminBackupsLogs").get('logs').clear();
-    } else if (log.message === "[FAILED]") {
-      this.controllerFor("adminBackups").set("model.isOperationRunning", false);
-      bootbox.alert(I18n.t("admin.backups.operations.failed", { operation: log.operation }));
-    } else if (log.message === "[SUCCESS]") {
-      Discourse.User.currentProp("hideReadOnlyAlert", false);
-      this.controllerFor("adminBackups").set("model.isOperationRunning", false);
-      if (log.operation === "restore") {
-        // redirect to homepage when the restore is done (session might be lost)
-        window.location.pathname = Discourse.getURL("/");
+    this.messageBus.subscribe(LOG_CHANNEL, (log) => {
+      if (log.message === "[STARTED]") {
+        this.controllerFor("adminBackups").set("model.isOperationRunning", true);
+        this.controllerFor("adminBackupsLogs").get('logs').clear();
+      } else if (log.message === "[FAILED]") {
+        this.controllerFor("adminBackups").set("model.isOperationRunning", false);
+        bootbox.alert(I18n.t("admin.backups.operations.failed", { operation: log.operation }));
+      } else if (log.message === "[SUCCESS]") {
+        Discourse.User.currentProp("hideReadOnlyAlert", false);
+        this.controllerFor("adminBackups").set("model.isOperationRunning", false);
+        if (log.operation === "restore") {
+          // redirect to homepage when the restore is done (session might be lost)
+          window.location.pathname = Discourse.getURL("/");
+        }
+      } else {
+        this.controllerFor("adminBackupsLogs").get('logs').pushObject(Em.Object.create(log));
       }
-    } else {
-      this.controllerFor("adminBackupsLogs").get('logs').pushObject(Em.Object.create(log));
-    }
+    });
   },
 
   model() {
@@ -122,12 +120,7 @@ export default Discourse.Route.extend({
     },
 
     uploadSuccess(filename) {
-      const self = this;
-      bootbox.alert(I18n.t("admin.backups.upload.success", { filename: filename }), function() {
-        Backup.find().then(function (backups) {
-          self.controllerFor("adminBackupsIndex").set("model", backups);
-        });
-      });
+      bootbox.alert(I18n.t("admin.backups.upload.success", { filename: filename }));
     },
 
     uploadError(filename, message) {
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
index 775fec62c5..80c5117dc4 100644
--- a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
@@ -1,4 +1,6 @@
 import { ajax } from 'discourse/lib/ajax';
+import { fillMissingDates } from 'discourse/lib/utilities';
+import { translateResults } from "discourse/lib/search";
 
 export default Discourse.Route.extend({
   queryParams: {
@@ -15,6 +17,16 @@ export default Discourse.Route.extend({
         search_type: params.searchType
       }
     }).then(json => {
+      // Add zero values for missing dates
+      if (json.term.data.length > 0) {
+        const startDate = (json.term.period === "all") ? moment(json.term.data[0].x).format('YYYY-MM-DD') : moment(json.term.start_date).format('YYYY-MM-DD');
+        const endDate = moment(json.term.end_date).format('YYYY-MM-DD');
+        json.term.data = fillMissingDates(json.term.data, startDate, endDate);
+      }
+      if (json.term.search_result) {
+        json.term.search_result = translateResults(json.term.search_result);
+      }
+
       const model = Ember.Object.create({ type: "search_log_term" });
       model.setProperties(json.term);
       return model;
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
index 36d1d8cedd..930b45c8b1 100644
--- a/app/assets/javascripts/admin/routes/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
@@ -21,15 +21,5 @@ export default Discourse.Route.extend({
       availableGroups: this._availableGroups,
       model
     });
-  },
-
-  actions: {
-    viewActionLogs(username) {
-      const controller = this.controllerFor('adminLogs.staffActionLogs');
-      this.transitionTo('adminLogs.staffActionLogs').then(() => {
-        controller.set('filters', Ember.Object.create());
-        controller._changeFilters({ target_user: username });
-      });
-    }
   }
 });
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js.es6
index 439b85cd42..a6a56d0f14 100644
--- a/app/assets/javascripts/admin/services/admin-tools.js.es6
+++ b/app/assets/javascripts/admin/services/admin-tools.js.es6
@@ -17,10 +17,26 @@ export default Ember.Service.extend({
     this.siteSettings = getOwner(this).lookup('site-settings:main');
   },
 
+  showActionLogs(target, filters) {
+    const controller = getOwner(target).lookup('controller:adminLogs.staffActionLogs');
+    target.transitionToRoute('adminLogs.staffActionLogs').then(() => {
+      controller.set('filters', Ember.Object.create());
+      controller._changeFilters(filters);
+    });
+  },
+
+  showFlagsReceived(user) {
+    showModal(`admin-flags-received`, { admin: true, model: user });
+  },
+
   checkSpammer(userId) {
     return AdminUser.find(userId).then(au => this.spammerDetails(au));
   },
 
+  deleteUser(id) {
+    AdminUser.find(id).then(user => user.destroy({ deletePosts: true }));
+  },
+
   spammerDetails(adminUser) {
     return {
       deleteUser: () => this._deleteSpammer(adminUser),
@@ -39,11 +55,10 @@ export default Ember.Service.extend({
       controller.set('post', opts.post);
     }
 
-    let promise = user.adminUserView ?
+    return (user.adminUserView ?
       Ember.RSVP.resolve(user) :
-      AdminUser.find(user.get('id'));
-
-    promise.then(loadedUser => {
+      AdminUser.find(user.get('id'))
+    ).then(loadedUser => {
       controller.setProperties({
         user: loadedUser,
         loadingUser: false,
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 419ef0b69c..99f1de8ce2 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -4,11 +4,11 @@
   {{/admin-form-row}}
 
   {{#admin-form-row label="admin.user_fields.name"}}
-    {{input value=buffered.name class="user-field-name"}}
+    {{input value=buffered.name class="user-field-name" maxlength="255"}}
   {{/admin-form-row}}
 
   {{#admin-form-row label="admin.user_fields.description"}}
-    {{input value=buffered.description class="user-field-desc"}}
+    {{input value=buffered.description class="user-field-desc" maxlength="255"}}
   {{/admin-form-row}}
 
   {{#if bufferedFieldType.hasOptions}}
diff --git a/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs b/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
new file mode 100644
index 0000000000..7c793b98bc
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs
@@ -0,0 +1,32 @@
+<div class='flagged-by'>
+  <div class='user-list-title'>
+    {{i18n "admin.flags.flagged_by"}}
+  </div>
+  <div class='flag-users'>
+    {{#each flaggedPost.post_actions as |postAction|}}
+      {{#flag-user user=postAction.user date=postAction.created_at}}
+        <div class='flagger-flag-type'>
+          {{post-action-title postAction.post_action_type_id postAction.name_key}}
+        </div>
+      {{/flag-user}}
+    {{/each}}
+  </div>
+</div>
+
+{{#if showResolvedBy}}
+  <div class='flagged-post-resolved-by'>
+    <div class='user-list-title'>
+      {{i18n "admin.flags.resolved_by"}}
+    </div>
+    <div class='flag-users'>
+      {{#each flaggedPost.post_actions as |postAction|}}
+        {{#flag-user user=postAction.disposed_by date=postAction.disposed_at}}
+          {{disposition-icon postAction.disposition}}
+          {{#if postAction.staff_took_action}}
+            {{d-icon "gavel" title="admin.flags.took_action"}}
+          {{/if}}
+        {{/flag-user}}
+      {{/each}}
+    </div>
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs b/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs
new file mode 100644
index 0000000000..161a8f9f92
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/flagged-post-title.hbs
@@ -0,0 +1,5 @@
+{{#if flaggedPost.topic.isPrivateMessage}}
+  <span class="private-message-glyph">{{d-icon "envelope"}}</span>
+{{/if}}
+{{topic-status topic=flaggedPost.topic}}
+<a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
index 2b7f03940f..04b953c451 100644
--- a/app/assets/javascripts/admin/templates/components/flagged-post.hbs
+++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
@@ -22,17 +22,15 @@
   <div class="flagged-post-contents">
     <div class='flagged-post-user-details'>
       <a class='username' href={{user.path}} data-user-card={{flaggedPost.user.username}}>{{format-username flaggedPost.user.username}}</a>
+      {{plugin-outlet
+        name="flagged-post-controls"
+        tagName=""
+        args=(hash flaggedPost=flaggedPost actableFilter=actableFilter topic=topic)}}
     </div>
 
     <div class='flagged-post-excerpt'>
       {{#unless hideTitle}}
-        <h3>
-          {{#if flaggedPost.topic.isPrivateMessage}}
-            <span class="private-message-glyph">{{d-icon "envelope"}}</span>
-          {{/if}}
-          {{topic-status topic=flaggedPost.topic}}
-          <a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
-        </h3>
+        {{flagged-post-title flaggedPost=flaggedPost}}
       {{/unless}}
       {{#if flaggedPost.postAuthorFlagged}}
         {{#if expanded}}
@@ -68,44 +66,11 @@
       </div>
     {{/each}}
 
-    <div class='flag-user-lists'>
-      <div class='flagged-by'>
-        <div class='user-list-title'>
-          {{i18n "admin.flags.flagged_by"}}
-        </div>
-        <div class='flag-users'>
-          {{#each flaggedPost.post_actions as |postAction|}}
-            {{#flag-user user=postAction.user date=postAction.created_at}}
-              <div class='flagger-flag-type'>
-                {{post-action-title postAction.post_action_type_id postAction.name_key}}
-              </div>
-            {{/flag-user}}
-          {{/each}}
-        </div>
-      </div>
-
-      {{#if showResolvedBy}}
-        <div class='flagged-post-resolved-by'>
-          <div class='user-list-title'>
-            {{i18n "admin.flags.resolved_by"}}
-          </div>
-          <div class='flag-users'>
-            {{#each flaggedPost.post_actions as |postAction|}}
-              {{#flag-user user=postAction.disposed_by date=postAction.disposed_at}}
-                {{disposition-icon postAction.disposition}}
-                {{#if postAction.staff_took_action}}
-                  {{d-icon "gavel" title="admin.flags.took_action"}}
-                {{/if}}
-              {{/flag-user}}
-            {{/each}}
-          </div>
-        </div>
-      {{/if}}
-    </div>
+    {{flag-user-lists flaggedPost=flaggedPost showResolvedBy=showResolvedBy}}
 
     {{#if suspended}}
       <div class='suspended-message'>
-        The user was suspended for this post.
+        {{i18n "admin.flags.suspended_for_post"}}
       </div>
     {{/if}}
 
@@ -133,12 +98,14 @@
 
         {{d-button
           class="defer-flag"
-          title="admin.flags.defer_flag_title"
+          title="admin.flags.ignore_flag_title"
           action="defer"
           icon="external-link"
-          label="admin.flags.defer_flag"}}
+          label="admin.flags.ignore_flag"}}
 
-        {{admin-delete-flag-dropdown post=flaggedPost removeAfter=(action "removeAfter")}}
+        {{admin-delete-flag-dropdown
+          post=flaggedPost
+          removeAfter=(action "removeAfter")}}
 
         {{#unless suspended}}
           {{d-button
@@ -158,6 +125,6 @@
     {{plugin-outlet
       name="flagged-post-below-controls"
       tagName=""
-      args=(hash flaggedPost=flaggedPost canAct=canAct)}}
+      args=(hash flaggedPost=flaggedPost canAct=canAct actableFilter=actableFilter)}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/flagged-posts.hbs b/app/assets/javascripts/admin/templates/components/flagged-posts.hbs
index a2f60c2587..5f1aab3a86 100644
--- a/app/assets/javascripts/admin/templates/components/flagged-posts.hbs
+++ b/app/assets/javascripts/admin/templates/components/flagged-posts.hbs
@@ -5,6 +5,7 @@
         {{flagged-post
           flaggedPost=flaggedPost
           filter=filter
+          topic=topic
           showResolvedBy=showResolvedBy
           removePost=(action "removePost" flaggedPost)
           hideTitle=topic}}
diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/templates/components/silence-details.hbs
new file mode 100644
index 0000000000..3f7c19d5ba
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/silence-details.hbs
@@ -0,0 +1,21 @@
+<div class='reason-controls'>
+  <label>
+    <div class='silence-reason-label'>
+      {{{i18n 'admin.user.silence_reason_label'}}}
+    </div>
+    </label>
+    {{text-field
+      value=reason
+      class="silence-reason"
+      placeholderKey="admin.user.silence_reason_placeholder"}}
+</div>
+
+<label>
+  <div class='silence-message-label'>
+    {{i18n "admin.user.silence_message"}}
+  </div>
+</label>
+{{textarea
+  value=message
+  class="silence-message"
+  placeholder=(i18n "admin.user.silence_message_placeholder")}}
diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
new file mode 100644
index 0000000000..0f2aa0fc84
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/suspension-details.hbs
@@ -0,0 +1,25 @@
+<div class='reason-controls'>
+  <label>
+    <div class='suspend-reason-label'>
+      {{#if siteSettings.hide_suspension_reasons}}
+        {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
+      {{else}}
+        {{{i18n 'admin.user.suspend_reason_label'}}}
+      {{/if}}
+    </div>
+  </label>
+  {{text-field
+    value=reason
+    class="suspend-reason"
+    placeholderKey="admin.user.suspend_reason_placeholder"}}
+</div>
+
+<label>
+  <div class='suspend-message-label'>
+    {{i18n "admin.user.suspend_message"}}
+  </div>
+</label>
+{{textarea
+  value=message
+  class="suspend-message"
+  placeholder=(i18n "admin.user.suspend_message_placeholder")}}
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 6b4dc88584..a761b4990c 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -224,7 +224,7 @@
               <td class="title">
                 <div class="referred-topic-title">
                   <div class="overflow-ellipsis">
-                    <a href="/t/{{unbound data.topic_slug}}/{{unbound data.topic_id}}">{{data.topic_title}}</a>
+                    <a href="{{unbound data.topic_url}}">{{data.topic_title}}</a>
                   </div>
                 </div>
               </td>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-flags-received.hbs b/app/assets/javascripts/admin/templates/modal/admin-flags-received.hbs
new file mode 100644
index 0000000000..9f05993cf9
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-flags-received.hbs
@@ -0,0 +1,14 @@
+{{#d-modal-body rawTitle=(i18n "admin.user.flags_received_by" username=model.username)}}
+  {{#conditional-loading-spinner condition=loadingFlags}}
+    {{#each flaggedPosts as |flaggedPost|}}
+      <div class='received-flag flagged-post'>
+        <div class='flagged-post-excerpt'>
+          {{flagged-post-title flaggedPost=flaggedPost}}
+        </div>
+        {{flag-user-lists flaggedPost=flaggedPost showResolvedBy=flaggedPost.hasDisposedBy}}
+      </div>
+    {{else}}
+      {{i18n "admin.user.flags_received_none"}}
+    {{/each}}
+  {{/conditional-loading-spinner}}
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
index 0abe77544c..6b3b899ac8 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
@@ -11,28 +11,7 @@
       </label>
     </div>
 
-    <div class='reason-controls'>
-      <label>
-        <div class='silence-reason-label'>
-          {{{i18n 'admin.user.silence_reason_label'}}}
-        </div>
-        </label>
-        {{text-field
-          value=reason
-          class="silence-reason"
-          placeholderKey="admin.user.silence_reason_placeholder"}}
-    </div>
-
-    <label>
-      <div class='silence-message-label'>
-        {{i18n "admin.user.silence_message"}}
-      </div>
-    </label>
-    {{textarea
-      value=message
-      class="silence-message"
-      placeholder=(i18n "admin.user.silence_message_placeholder")}}
-
+    {{silence-details reason=reason message=message}}
 
   {{/conditional-loading-spinner}}
 
@@ -47,4 +26,4 @@
     label="admin.user.silence"}}
   {{d-modal-cancel close=(action "closeModal")}}
   {{conditional-loading-spinner condition=loading size="small"}}
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index fc6025a6a6..4c0af11512 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -11,32 +11,8 @@
             input=suspendUntil}}
         </label>
       </div>
+      {{suspension-details reason=reason message=message}}
 
-      <div class='reason-controls'>
-        <label>
-          <div class='suspend-reason-label'>
-            {{#if siteSettings.hide_suspension_reasons}}
-              {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
-            {{else}}
-              {{{i18n 'admin.user.suspend_reason_label'}}}
-            {{/if}}
-          </div>
-        </label>
-        {{text-field
-          value=reason
-          class="suspend-reason"
-          placeholderKey="admin.user.suspend_reason_placeholder"}}
-      </div>
-
-      <label>
-        <div class='suspend-message-label'>
-          {{i18n "admin.user.suspend_message"}}
-        </div>
-      </label>
-      {{textarea
-          value=message
-          class="suspend-message"
-          placeholder=(i18n "admin.user.suspend_message_placeholder")}}
     {{else}}
       <div class='cant-suspend'>
         {{i18n "admin.user.cant_suspend"}}
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
index c405a86d35..5e640039c3 100644
--- a/app/assets/javascripts/admin/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -10,4 +10,53 @@
 
 {{#conditional-loading-spinner condition=refreshing}}
   {{admin-graph model=model}}
+
+  <br><br>
+  <h2> {{i18n "admin.logs.search_logs.header_search_results"}} </h2>
+  <br>
+
+  <div class='header-search-results'>
+  {{#each model.search_result.posts as |result|}}
+    <div class='fps-result'>
+      <div class='author'>
+        <a href={{result.userPath}} data-user-card="{{unbound result.username}}">
+          {{avatar result imageSize="large"}}
+        </a>
+      </div>
+
+      <div class='fps-topic'>
+        <div class='topic'>
+          <a class='search-link' href='{{unbound result.url}}'>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=term}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
+          </a>
+
+          <div class='search-category'>
+            {{#if result.topic.category.parentCategory}}
+              {{category-link result.topic.category.parentCategory}}
+            {{/if}}
+            {{category-link result.topic.category hideParent=true}}
+            {{#each result.topic.tags as |tag|}}
+              {{discourse-tag tag}}
+            {{/each}}
+          </div>
+        </div>
+
+        <div class='blurb container'>
+          <span class='date'>
+            {{format-age result.created_at}}
+            {{#if result.blurb}}
+              -
+            {{/if}}
+          </span>
+
+          {{#if result.blurb}}
+            {{#highlight-text highlight=term}}
+              {{{unbound result.blurb}}}
+            {{/highlight-text}}
+          {{/if}}
+        </div>
+      </div>
+    </div>
+  {{/each}}
+  </div>
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 1f6bae617c..167f4ffa1d 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -10,7 +10,7 @@
   <div class='admin-container user-badges'>
     <h2>{{i18n 'admin.badges.grant_badge'}}</h2>
     <br>
-    {{#if noBadges}}
+    {{#if noGrantableBadges}}
       <p>{{i18n 'admin.badges.no_badges'}}</p>
     {{else}}
     <form class="form-horizontal">
@@ -22,7 +22,7 @@
       <label>{{i18n 'admin.badges.reason'}}</label>
       {{input type="text" value=badgeReason}}<br><small>{{i18n 'admin.badges.reason_help'}}</small>
       </label>
-      <button class='btn btn-primary' {{action "grantBadge" selectedBadgeId}}>{{i18n 'admin.badges.grant'}}</button>
+      <button class='btn btn-primary' {{action "grantBadge"}}>{{i18n 'admin.badges.grant'}}</button>
     </form>
     {{/if}}
 
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 96f962a0b5..24122f3877 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -6,6 +6,7 @@
         {{i18n 'admin.user.show_public_profile'}}
       {{/link-to}}
     {{/if}}
+
     {{#if model.can_view_action_logs}}
       {{d-button action="viewActionLogs" actionParam=model.username icon="list-alt" label="admin.user.action_logs"}}
     {{/if}}
@@ -466,7 +467,18 @@
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'admin.user.flags_given_received_count'}}</div>
-    <div class='value'>{{model.flags_given_count}} / {{model.flags_received_count}}</div>
+    <div class='value'>
+      {{model.flags_given_count}} / {{model.flags_received_count}}
+    </div>
+    <div class='controls'>
+      {{#if model.flags_received_count}}
+        {{d-button
+          action=(action "showFlagsReceived")
+          label="admin.user.show_flags_received"
+          icon="flag"
+        }}
+      {{/if}}
+    </div>
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'admin.user.private_topics_count'}}</div>
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6b0d64be84..02bc257b12 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -60,9 +60,9 @@
 //= require ./discourse/models/user-action
 //= require ./discourse/models/draft
 //= require ./discourse/models/composer
+//= require ./discourse/models/user-badge
 //= require_tree ./discourse/mixins
 //= require ./discourse/models/invite
-//= require ./discourse/models/user-badge
 //= require ./discourse/controllers/discovery-sortable
 //= require ./discourse/controllers/navigation/default
 //= require ./discourse/components/edit-category-panel
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
index 4c2dec2f0b..569fb3a0a2 100644
--- a/app/assets/javascripts/discourse-common/resolver.js.es6
+++ b/app/assets/javascripts/discourse-common/resolver.js.es6
@@ -195,7 +195,8 @@ export function buildResolver(baseName) {
     findAdminTemplate(parsedName) {
       var decamelized = parsedName.fullNameWithoutType.decamelize();
       if (decamelized.indexOf('components') === 0) {
-        const compTemplate = Ember.TEMPLATES['admin/templates/' + decamelized];
+        let comPath = `admin/templates/${decamelized}`;
+        const compTemplate = Ember.TEMPLATES[`javascripts/${comPath}`] || Ember.TEMPLATES[comPath];
         if (compTemplate) { return compTemplate; }
       }
 
diff --git a/app/assets/javascripts/discourse/components/category-drop.js.es6 b/app/assets/javascripts/discourse/components/category-drop.js.es6
deleted file mode 100644
index 379e326ac8..0000000000
--- a/app/assets/javascripts/discourse/components/category-drop.js.es6
+++ /dev/null
@@ -1,152 +0,0 @@
-import { setting } from 'discourse/lib/computed';
-import computed from 'ember-addons/ember-computed-decorators';
-
-var get = Ember.get;
-
-export default Ember.Component.extend({
-  classNameBindings: ['category::no-category', 'categories:has-drop', 'categoryStyle'],
-  categoryStyle: setting('category_style'),
-  expanded: false,
-
-  tagName: 'li',
-
-  @computed('expanded')
-  expandIcon(expanded) {
-    return expanded ? 'd-drop-expanded' : 'd-drop-collapsed';
-  },
-
-  allCategoriesUrl: function() {
-    if (this.get('subCategory')) {
-      return this.get('parentCategory.url') || "/";
-    } else {
-      return "/";
-    }
-  }.property('parentCategory.url', 'subCategory'),
-
-  noCategoriesUrl: function() {
-    return this.get('parentCategory.url') + "/none";
-  }.property('parentCategory.url'),
-
-  allCategoriesLabel: function() {
-    if (this.get('subCategory')) {
-      return I18n.t('categories.all_subcategories', {categoryName: this.get('parentCategory.name')});
-    }
-    return I18n.t('categories.all');
-  }.property('category'),
-
-  dropdownButtonClass: function() {
-    let result = 'dropdown-header category-dropdown-button';
-    if (Em.isNone(this.get('category'))) {
-      result += ' home';
-    }
-    return result;
-  }.property('category'),
-
-  categoryColor: function() {
-    var category = this.get('category');
-
-    if (category) {
-      var color = get(category, 'color');
-
-      if (color) {
-        var style = "";
-        if (color) { style += "background-color: #" + color + ";"; }
-        return style.htmlSafe();
-      }
-    }
-
-    return "background-color: #eee;".htmlSafe();
-  }.property('category'),
-
-  badgeStyle: function() {
-    let category = this.get('category');
-
-    const categoryStyle = this.siteSettings.category_style;
-    if (categoryStyle === 'bullet') {
-      return;
-    }
-
-    if (category) {
-      let color = get(category, 'color');
-      let textColor = get(category, 'text_color');
-
-      if (color || textColor) {
-        let style = "";
-        if (color) {
-          if (categoryStyle === "bar") {
-            style += `border-color: #${color};`;
-          } else if (categoryStyle === "box") {
-            style += `background-color: #${color};`;
-            if (textColor) { style += "color: #" + textColor + "; "; }
-          }
-        }
-
-        return style.htmlSafe();
-      }
-    }
-
-    if (categoryStyle === 'box') {
-      return "background-color: #eee; color: #333".htmlSafe();
-    }
-  }.property('category'),
-
-  clickEventName: function() {
-    return "click.category-drop-" + (this.get('category.id') || "all");
-  }.property('category.id'),
-
-  actions: {
-    expand: function() {
-      var self = this;
-
-      if(!this.get('renderCategories')){
-        this.set('renderCategories',true);
-        Em.run.next(function(){
-          self.send('expand');
-        });
-        return;
-      }
-
-      if (this.get('expanded')) {
-        this.close();
-        return;
-      }
-
-      if (this.get('categories')) {
-        this.set('expanded', true);
-      }
-      var $dropdown = this.$()[0];
-
-      this.$('a[data-drop-close]').on('click.category-drop', function() {
-        self.close();
-      });
-
-      Em.run.next(function(){
-        self.$('.cat a').add('html').on(self.get('clickEventName'), function(e) {
-          var $target = $(e.target),
-              closest = $target.closest($dropdown);
-
-          if ($(e.currentTarget).hasClass('badge-wrapper')){
-            self.close();
-          }
-
-          return ($(e.currentTarget).hasClass('badge-category') || (closest.length && closest[0] === $dropdown)) ? true : self.close();
-        });
-      });
-    }
-  },
-
-  removeEvents: function(){
-    $('html').off(this.get('clickEventName'));
-    this.$('a[data-drop-close]').off('click.category-drop');
-  },
-
-  close: function() {
-    this.removeEvents();
-    this.set('expanded', false);
-  },
-
-  willDestroyElement: function() {
-    this.removeEvents();
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 968e1ade9a..6b3ca5b400 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -13,6 +13,7 @@ import { tinyAvatar,
          displayErrorForUpload,
          getUploadMarkdown,
          validateUploadedFiles,
+         authorizesOneOrMoreImageExtensions,
          formatUsername,
          clipboardData
 } from 'discourse/lib/utilities';
@@ -36,6 +37,12 @@ export default Ember.Component.extend({
     return `[${I18n.t('uploading')}]() `;
   },
 
+  @computed()
+  replyPlaceholder() {
+    const key = authorizesOneOrMoreImageExtensions() ? "reply_placeholder" : "reply_placeholder_no_images";
+    return `composer.${key}`;
+  },
+
   @observes('composer.uploadCancelled')
   _cancelUpload() {
     if (!this.get('composer.uploadCancelled')) { return; }
@@ -662,13 +669,15 @@ export default Ember.Component.extend({
         unshift: true
       });
 
-      toolbar.addButton({
-        id: 'upload',
-        group: 'insertions',
-        icon: 'upload',
-        title: 'upload',
-        sendAction: 'showUploadModal'
-      });
+      if (this.get('allowUpload')) {
+        toolbar.addButton({
+          id: 'upload',
+          group: 'insertions',
+          icon: 'upload',
+          title: 'upload',
+          sendAction: 'showUploadModal'
+        });
+      }
 
       toolbar.addButton({
         id: 'options',
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 6f791315ab..25cbad063b 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -1,5 +1,7 @@
 import LinkLookup from 'discourse/lib/link-lookup';
 
+let _messagesCache = {};
+
 export default Ember.Component.extend({
   classNameBindings: [':composer-popup-container', 'hidden'],
   checkedMessages: false,
@@ -165,7 +167,9 @@ export default Ember.Component.extend({
     if (topicId) { args.topic_id = topicId; }
     if (postId)  { args.post_id = postId; }
 
-    composer.store.find('composer-message', args).then(messages => {
+    const cacheKey = `${args.composer_action}${args.topic_id}${args.post_id}`;
+
+    const processMessages = messages => {
       if (this.isDestroying || this.isDestroyed) { return; }
 
       // Checking composer messages on replies can give us a list of links to check for
@@ -177,6 +181,15 @@ export default Ember.Component.extend({
       this.set('checkedMessages', true);
       const queuedForTyping = this.get('queuedForTyping');
       messages.forEach(msg => msg.wait_for_typing ? queuedForTyping.addObject(msg) : this.send('popup', msg));
-    });
+    };
+
+    if (_messagesCache.cacheKey === cacheKey) {
+      processMessages(_messagesCache.messages);
+    } else {
+      composer.store.find('composer-message', args).then(messages => {
+        _messagesCache = {messages, cacheKey};
+        processMessages(messages);
+      });
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/custom-html.js.es6 b/app/assets/javascripts/discourse/components/custom-html.js.es6
index c5df7fb51e..f6114745f5 100644
--- a/app/assets/javascripts/discourse/components/custom-html.js.es6
+++ b/app/assets/javascripts/discourse/components/custom-html.js.es6
@@ -2,6 +2,8 @@ import { getCustomHTML } from 'discourse/helpers/custom-html';
 import { getOwner } from 'discourse-common/lib/get-owner';
 
 export default Ember.Component.extend({
+  triggerAppEvent: null,
+
   init() {
     this._super();
     const name = this.get('name');
@@ -16,5 +18,19 @@ export default Ember.Component.extend({
         this.set('layoutName', name);
       }
     }
+  },
+
+  didInsertElement() {
+    this._super();
+    if (this.get('triggerAppEvent') === 'true') {
+      this.appEvents.trigger(`inserted-custom-html:${this.get('name')}`);
+    }
+  },
+
+  willDestroyElement() {
+    this._super();
+    if (this.get('triggerAppEvent') === 'true') {
+      this.appEvents.trigger(`destroyed-custom-html:${this.get('name')}`);
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 3d357ec225..c70f0b3bc9 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -254,6 +254,7 @@ export default Ember.Component.extend({
   @on('willDestroyElement')
   _shutDown() {
     if (this.get('composerEvents')) {
+      this.appEvents.off('composer:insert-block');
       this.appEvents.off('composer:insert-text');
       this.appEvents.off('composer:replace-text');
     }
@@ -734,6 +735,11 @@ export default Ember.Component.extend({
 
     showLinkModal() {
       this._lastSel = this._getSelected();
+
+      if (this._lastSel) {
+        this.set("linkText", this._lastSel.value.trim());
+      }
+
       this.set('insertLinkHidden', false);
     },
 
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 03efe27a53..4e1222a649 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -4,6 +4,7 @@ import { emojiUrlFor } from "discourse/lib/text";
 import KeyValueStore from "discourse/lib/key-value-store";
 import { emojis } from "pretty-text/emoji/data";
 import { extendedEmojiList, isSkinTonableEmoji } from "pretty-text/emoji";
+const { run } = Ember;
 
 const keyValueStore = new KeyValueStore("discourse_emojis_");
 const EMOJI_USAGE = "emojiUsage";
@@ -44,7 +45,7 @@ export default Ember.Component.extend({
     this.set("selectedDiversity", keyValueStore.getObject(EMOJI_SELECTED_DIVERSITY) || 1);
     this.set("recentEmojis", keyValueStore.getObject(EMOJI_USAGE) || []);
 
-    Ember.run.scheduleOnce("afterRender", this, function() {
+    run.scheduleOnce("afterRender", this, function() {
       this._bindEvents();
       this._sectionLoadingCheck();
       this._loadCategoriesEmojis();
@@ -83,13 +84,14 @@ export default Ember.Component.extend({
 
   @on("didUpdateAttrs")
   _setState() {
-    this.get("active") === true ? this.show() : this.close();
+    this.get("active") ? this.show() : this.close();
   },
 
   @observes("filter")
   filterChanged() {
     this.$filter.find(".clear-filter").toggle(!_.isEmpty(this.get("filter")));
-    Ember.run.debounce(this, this._filterEmojisList, 250);
+    const filterDelay = this.site.isMobileDevice ? 400 : 250;
+    run.debounce(this, this._filterEmojisList, filterDelay);
   },
 
   @observes("selectedDiversity")
@@ -148,7 +150,7 @@ export default Ember.Component.extend({
 
   _sectionLoadingCheck() {
     this._checkTimeout = setTimeout(() => { this._sectionLoadingCheck(); }, 500);
-    Ember.run.throttle(this, this._checkVisibleSection, 100);
+    run.throttle(this, this._checkVisibleSection, 100);
   },
 
   _loadCategoriesEmojis() {
@@ -200,7 +202,7 @@ export default Ember.Component.extend({
     if (this.get("filter") === "") {
       this.$filter.find("input[name='filter']").val("");
       this.$results.empty().hide();
-      this.$list.show();
+      this.$list.css("visibility", "visible");
     } else {
       const lowerCaseFilter = this.get("filter").toLowerCase();
       const filterableEmojis = emojis.concat(_.keys(extendedEmojiList()));
@@ -217,7 +219,7 @@ export default Ember.Component.extend({
       ).show();
       this._bindHover(this.$results);
       this._bindEmojiClick(this.$results);
-      this.$list.hide();
+      this.$list.css("visibility", "hidden");
     }
   },
 
@@ -239,7 +241,7 @@ export default Ember.Component.extend({
     this.$picker.find(".category-icon").on("click", "button.emoji", (event) => {
       this.set("filter", "");
       this.$results.empty();
-      this.$list.show();
+      this.$list.css("visibility", "visible");
 
       const section = $(event.currentTarget).data("section");
       const $section = this.$list.find(`.section[data-section="${section}"]`);
@@ -264,11 +266,11 @@ export default Ember.Component.extend({
 
   _bindResizing() {
     this.$(window).on("resize", () => {
-      Ember.run.throttle(this, this._positionPicker, 16);
+      run.throttle(this, this._positionPicker, 16);
     });
 
     $("#reply-control").on("div-resizing", () => {
-      Ember.run.throttle(this, this._positionPicker, 16);
+      run.throttle(this, this._positionPicker, 16);
     });
   },
 
@@ -320,7 +322,7 @@ export default Ember.Component.extend({
   _bindSectionsScroll() {
     this.$list.on("scroll", () => {
       this.scrollPosition = this.$list.scrollTop();
-      Ember.run.throttle(this, this._checkVisibleSection, 150);
+      run.throttle(this, this._checkVisibleSection, 150);
     });
   },
 
@@ -415,12 +417,12 @@ export default Ember.Component.extend({
 
     const mobilePositioning = options => {
       let attributes = {
-        width: windowWidth - 12,
-        marginLeft: 5,
-        marginTop: -130,
+        width: windowWidth,
+        marginLeft: 0,
+        marginTop: "auto",
         left: 0,
         bottom: "",
-        top: "50%",
+        top: 0,
         display: "flex"
       };
 
@@ -445,7 +447,7 @@ export default Ember.Component.extend({
       this.$picker.css(_.merge(attributes, options));
     };
 
-    if(Ember.testing || this.get("automaticPositioning") === false) {
+    if(Ember.testing || !this.get("automaticPositioning")) {
       desktopPositioning();
       return;
     }
@@ -510,7 +512,7 @@ export default Ember.Component.extend({
     this.$list.scrollTop(yPosition);
 
     // if we don’t actually scroll we need to force it
-    if(yPosition === 0) {
+    if (yPosition === 0) {
       this.$list.scroll();
     }
   },
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6 b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
index f5b2468408..6967a502a8 100644
--- a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
@@ -7,11 +7,13 @@ export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['order', 'desc'],
 
   buildBuffer(buffer) {
+    buffer.push("<span class='header-contents'>");
     buffer.push(I18n.t(this.get('i18nKey')));
 
     if (this.get('field') === this.get('order')) {
       buffer.push(iconHTML(this.get('desc') ? 'chevron-down' : 'chevron-up'));
     }
+    buffer.push("</span>");
   },
 
   click() {
diff --git a/app/assets/javascripts/discourse/components/period-chooser.js.es6 b/app/assets/javascripts/discourse/components/period-chooser.js.es6
deleted file mode 100644
index e3bc67fb5f..0000000000
--- a/app/assets/javascripts/discourse/components/period-chooser.js.es6
+++ /dev/null
@@ -1,46 +0,0 @@
-import CleansUp from 'discourse/mixins/cleans-up';
-
-export default Ember.Component.extend(CleansUp, {
-  classNames: 'period-chooser',
-  showPeriods: false,
-
-  cleanUp: function() {
-    this.set('showPeriods', false);
-    $('html').off('mousedown.top-period');
-  },
-
-  _clickToClose: function() {
-    const self = this;
-    $('html').off('mousedown.top-period').on('mousedown.top-period', function(e) {
-      const $target = $(e.target);
-      if (($target.prop('id') === 'topic-entrance') || (self.$().has($target).length !== 0)) {
-        return;
-      }
-      self.cleanUp();
-    });
-  },
-
-  click(e) {
-    if ($(e.target).closest('.period-popup').length) { return; }
-
-    if (!this.get('showPeriods')) {
-      if (!this.site.mobileView) {
-        const $chevron = this.$('.d-icon-caret-down');
-        this.$('#period-popup').css($chevron.position());
-      } else {
-        this.$('#period-popup').css({top: this.$().height()});
-      }
-      this.set('showPeriods', true);
-      this._clickToClose();
-    }
-  },
-
-  actions: {
-    changePeriod(p) {
-      this.cleanUp();
-      this.set('period', p);
-      this.sendAction('action', p);
-    }
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index 56731c96df..4d7166e11d 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -139,7 +139,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
         if ($panelBody.height() !== contentHeight) {
           $panelBody.height(contentHeight);
         }
-        $('body').addClass('drop-down-visible');
+        $('body').addClass('drop-down-mode');
       } else {
         const menuTop = headerHeight();
 
@@ -157,7 +157,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
         if (style.top !== menuTop + "px" || style.height !== height) {
           $panel.css({ top: menuTop + "px", height });
         }
-        $('body').removeClass('drop-down-visible');
+        $('body').removeClass('drop-down-mode');
       }
 
       $panel.width(width);
diff --git a/app/assets/javascripts/discourse/components/tag-drop.js.es6 b/app/assets/javascripts/discourse/components/tag-drop.js.es6
deleted file mode 100644
index 201d9a134d..0000000000
--- a/app/assets/javascripts/discourse/components/tag-drop.js.es6
+++ /dev/null
@@ -1,139 +0,0 @@
-import { setting } from 'discourse/lib/computed';
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Component.extend({
-  classNameBindings: [':tag-drop', 'tag::no-category', 'tags:has-drop','categoryStyle','tagClass'],
-  categoryStyle: setting('category_style'), // match the category-drop style
-  currentCategory: Em.computed.or('secondCategory', 'firstCategory'),
-  showFilterByTag: setting('show_filter_by_tag'),
-  showTagDropdown: Em.computed.and('showFilterByTag', 'tags'),
-  tagId: null,
-
-  tagName: 'li',
-
-  @computed('site.top_tags')
-  tags(topTags) {
-    if (this.siteSettings.tags_sort_alphabetically && topTags) {
-      return topTags.sort();
-    } else {
-      return topTags;
-    }
-  },
-
-  @computed('expanded')
-  expandedIcon(expanded) {
-    return expanded ? 'd-drop-expanded' : 'd-drop-collapsed';
-  },
-
-  @computed('tagId')
-  tagClass() {
-    if (this.get('tagId')) {
-      return "tag-" + this.get('tagId');
-    } else {
-      return "tag_all";
-    }
-  },
-
-  @computed('firstCategory', 'secondCategory')
-  allTagsUrl() {
-    if (this.get('currentCategory')) {
-      return this.get('currentCategory.url') + "?allTags=1";
-    } else {
-      return "/";
-    }
-  },
-
-  @computed('tag')
-  allTagsLabel() {
-    return I18n.t("tagging.selector_all_tags");
-  },
-
-  @computed('tagId')
-  noTagsSelected() {
-    return this.get('tagId') === 'none';
-  },
-
-  @computed('firstCategory', 'secondCategory')
-  noTagsUrl() {
-    var url = '/tags';
-    if (this.get('currentCategory')) {
-      url += this.get('currentCategory.url');
-    }
-    return url + '/none';
-  },
-
-  @computed('tag')
-  noTagsLabel() {
-    return I18n.t("tagging.selector_no_tags");
-  },
-
-  @computed('tag')
-  dropdownButtonClass() {
-    let result = 'dropdown-header category-dropdown-button';
-    if (Em.isNone(this.get('tag'))) {
-      result += ' home';
-    }
-    return result;
-  },
-
-  @computed('tag')
-  clickEventName() {
-    return "click.tag-drop-" + (this.get('tag') || "all");
-  },
-
-  actions: {
-    expand: function() {
-      var self = this;
-
-      if(!this.get('renderTags')){
-        this.set('renderTags',true);
-        Em.run.next(function(){
-          self.send('expand');
-        });
-        return;
-      }
-
-      if (this.get('expanded')) {
-        this.close();
-        return;
-      }
-
-      if (this.get('tags')) {
-        this.set('expanded', true);
-      }
-      var $dropdown = this.$()[0];
-
-      this.$('a[data-drop-close]').on('click.tag-drop', function() {
-        self.close();
-      });
-
-      Em.run.next(function(){
-        self.$('.cat a').add('html').on(self.get('clickEventName'), function(e) {
-          var $target = $(e.target),
-              closest = $target.closest($dropdown);
-
-          if ($(e.currentTarget).hasClass('badge-wrapper')){
-            self.close();
-          }
-
-          return ($(e.currentTarget).hasClass('badge-category') || (closest.length && closest[0] === $dropdown)) ? true : self.close();
-        });
-      });
-    }
-  },
-
-  removeEvents: function(){
-    $('html').off(this.get('clickEventName'));
-    this.$('a[data-drop-close]').off('click.tag-drop');
-  },
-
-  close: function() {
-    this.removeEvents();
-    this.set('expanded', false);
-  },
-
-  willDestroyElement: function() {
-    this.removeEvents();
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
index e370f0d337..d5ae0f8b0a 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
@@ -6,6 +6,16 @@ export default Ember.Component.extend({
   // Allow us to extend it
   layoutName: 'components/topic-footer-buttons',
 
+  @computed('topic.isPrivateMessage')
+  canArchive(isPM) {
+    return this.siteSettings.enable_private_messages && isPM;
+  },
+
+  @computed('topic.isPrivateMessage')
+  showNotificationsButton(isPM) {
+    return (!isPM) || this.siteSettings.enable_private_messages;
+  },
+
   @computed('topic.details.can_invite_to')
   canInviteTo(result) {
     return !this.site.mobileView && result;
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js.es6
index 8931501e3e..933f11a11b 100644
--- a/app/assets/javascripts/discourse/components/user-stat.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stat.js.es6
@@ -1,5 +1,6 @@
 export default Ember.Component.extend({
   classNames: ['user-stat'],
   type: 'number',
-  isNumber: Ember.computed.equal('type', 'number')
+  isNumber: Ember.computed.equal('type', 'number'),
+  isDuration: Ember.computed.equal('type', 'duration')
 });
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index d08f59c9f4..68b5a75bac 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -5,7 +5,7 @@ import Composer from 'discourse/models/composer';
 import { default as computed, observes, on } from 'ember-addons/ember-computed-decorators';
 import InputValidation from 'discourse/models/input-validation';
 import { getOwner } from 'discourse-common/lib/get-owner';
-import { escapeExpression } from 'discourse/lib/utilities';
+import { escapeExpression, authorizesOneOrMoreExtensions } from 'discourse/lib/utilities';
 import { emojiUnescape } from 'discourse/lib/text';
 import { shortDate } from 'discourse/lib/formatter';
 
@@ -70,6 +70,7 @@ export default Ember.Controller.extend({
   scopedCategoryId: null,
   lastValidatedAt: null,
   isUploading: false,
+  allowUpload: false,
   topic: null,
   linkLookup: null,
   showPreview: true,
@@ -223,6 +224,11 @@ export default Ember.Controller.extend({
     return emojiUnescape(escapeExpression(topic.get('title')));
   },
 
+  @computed
+  allowUpload() {
+    return authorizesOneOrMoreExtensions();
+  },
+
   actions: {
     cancelUpload() {
       this.set('model.uploadCancelled', true);
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index 741e74a897..2045b6daa6 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -169,7 +169,7 @@ export default Ember.Controller.extend({
 
   @computed('expanded', 'model.grouped_search_result.can_create_topic')
   canCreateTopic(expanded, userCanCreateTopic) {
-    return this.currentUser && userCanCreateTopic && !this.site.mobileView && !expanded;
+    return this.currentUser && userCanCreateTopic && !expanded;
   },
 
   @computed('expanded')
@@ -231,6 +231,7 @@ export default Ember.Controller.extend({
         }
       }else{
         setTransient('lastSearch', { searchKey, model }, 5);
+        model.grouped_search_result = results.grouped_search_result;
         this.set("model", model);
       }
     }).finally(() => {
diff --git a/app/assets/javascripts/discourse/controllers/grant-badge.js.es6 b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
new file mode 100644
index 0000000000..8a33d053ff
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/grant-badge.js.es6
@@ -0,0 +1,63 @@
+import computed from "ember-addons/ember-computed-decorators";
+import { extractError } from 'discourse/lib/ajax-error';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import GrantBadgeController from "discourse/mixins/grant-badge-controller";
+import Badge from 'discourse/models/badge';
+import UserBadge from 'discourse/models/user-badge';
+
+export default Ember.Controller.extend(ModalFunctionality, GrantBadgeController, {
+  topicController: Ember.inject.controller("topic"),
+  loading: true,
+  saving: false,
+  selectedBadgeId: null,
+  allBadges: [],
+  userBadges: [],
+
+  @computed('topicController.selectedPosts')
+  post() {
+    return this.get('topicController.selectedPosts')[0];
+  },
+
+  @computed('post')
+  badgeReason(post) {
+    const url = post.get('url');
+    const protocolAndHost = window.location.protocol + '//' + window.location.host;
+
+    return url.indexOf('/') === 0 ? protocolAndHost + url : url;
+  },
+
+  @computed("saving", "selectedBadgeGrantable")
+  buttonDisabled(saving, selectedBadgeGrantable) {
+    return saving || !selectedBadgeGrantable;
+  },
+
+  onShow() {
+    this.set('loading', true);
+
+    Ember.RSVP.all([Badge.findAll(), UserBadge.findByUsername(this.get('post.username'))])
+      .then(([allBadges, userBadges]) => {
+        this.setProperties({
+          'allBadges': allBadges,
+          'userBadges': userBadges,
+          'loading': false,
+        });
+      });
+  },
+
+  actions: {
+    grantBadge() {
+      this.set('saving', true);
+
+      this.grantBadge(this.get('selectedBadgeId'), this.get('post.username'), this.get('badgeReason'))
+        .then(newBadge => {
+          this.set('selectedBadgeId', null);
+          this.flash(I18n.t(
+            'badges.successfully_granted', { username: this.get('post.username'), badge: newBadge.get('badge.name') }
+          ), 'success');
+        }, error => {
+          this.flash(extractError(error), 'error');
+        })
+        .finally(() => this.set('saving', false));
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
index 4047450a1c..f0b6b757f7 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -24,7 +24,7 @@ export default Ember.Controller.extend({
 
         group.findPosts(opts).then(newPosts => {
           posts.addObjects(newPosts);
-          if(newPosts.length === 0) {
+          if (newPosts.length === 0) {
             this.set('canLoadMore', false);
           }
         }).finally(() => {
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index c524939435..6eb266d98f 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -217,7 +217,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
     // Reload the page if we're authenticated
     if (options.authenticated) {
-      const destinationUrl = $.cookie('destination_url');
+      const destinationUrl = $.cookie('destination_url') || options.destination_url;
       if (destinationUrl) {
         // redirect client to the original URL
         $.cookie('destination_url', null);
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
index 07a9da7cfe..545bf7b21e 100644
--- a/app/assets/javascripts/discourse/controllers/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
@@ -1,7 +1,20 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
 export default Ember.Controller.extend({
   sortProperties: ['count:desc', 'id'],
 
   canAdminTags: Ember.computed.alias("currentUser.staff"),
+  groupedByCategory: Ember.computed.notEmpty('model.extras.categories'),
+  groupedByTagGroup: Ember.computed.notEmpty('model.extras.tag_groups'),
+
+  @computed('groupedByCategory', 'groupedByTagGroup')
+  otherTagsTitleKey(groupedByCategory, groupedByTagGroup) {
+    if (!groupedByCategory && !groupedByTagGroup) {
+      return 'tagging.all_tags';
+    } else {
+      return 'tagging.other_tags';
+    }
+  },
 
   actions: {
     sortByCount() {
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index d1a292c2e8..dbf9251736 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -119,8 +119,8 @@ export default Ember.Controller.extend(BulkTopicSelection, {
 
     deleteTag() {
       const self = this;
-      const topicsLength = this.get('list.topic_list.topics.length');
-      const confirmText = topicsLength === 0 ? I18n.t("tagging.delete_confirm_no_topics") : I18n.t("tagging.delete_confirm", {count: topicsLength});
+      const numTopics = this.get('list.topic_list.tags.firstObject.topic_count') || 0;
+      const confirmText = numTopics === 0 ? I18n.t("tagging.delete_confirm_no_topics") : I18n.t("tagging.delete_confirm", {count: numTopics});
       bootbox.confirm(confirmText, function(result) {
         if (!result) { return; }
 
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 80209d7b73..49110ce83b 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -518,6 +518,19 @@ export default Ember.Controller.extend(BufferedContent, {
       this.send('changeOwner');
     },
 
+    lockPost(post) {
+      return post.updatePostField('locked', true);
+    },
+
+    unlockPost(post) {
+      return post.updatePostField('locked', false);
+    },
+
+    grantBadge(post) {
+      this.set("selectedPostIds", [post.id]);
+      this.send('showGrantBadgeModal');
+    },
+
     toggleParticipant(user) {
       this.get("model.postStream")
           .toggleParticipant(user.get("username"))
@@ -767,9 +780,12 @@ export default Ember.Controller.extend(BufferedContent, {
     return selectedPostsCount > 0 && (selectedAllPosts || selectedPosts.every(p => p.can_delete));
   },
 
-  @computed('canMergeTopic', 'selectedAllPosts')
-  canSplitTopic(canMergeTopic, selectedAllPosts) {
-    return canMergeTopic && !selectedAllPosts;
+  @computed('canMergeTopic', 'selectedAllPosts', 'selectedPosts', 'selectedPosts.[]')
+  canSplitTopic(canMergeTopic, selectedAllPosts, selectedPosts) {
+    return canMergeTopic &&
+           !selectedAllPosts &&
+           selectedPosts.length > 0 &&
+           selectedPosts.sort((a, b) => a.post_number - b.post_number)[0].post_type === 1;
   },
 
   @computed('model.details.can_move_posts', 'selectedPostsCount')
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 37e88e21ac..c11210ee8b 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,12 +1,14 @@
 import CanCheckEmails from 'discourse/mixins/can-check-emails';
 import computed from 'ember-addons/ember-computed-decorators';
 import User from 'discourse/models/user';
+import optionalService from 'discourse/lib/optional-service';
 
 export default Ember.Controller.extend(CanCheckEmails, {
   indexStream: false,
   application: Ember.inject.controller(),
   userNotifications: Ember.inject.controller('user-notifications'),
   currentPath: Ember.computed.alias('application.currentPath'),
+  adminTools: optionalService(),
 
   @computed("content.username")
   viewingSelf(username) {
@@ -93,11 +95,15 @@ export default Ember.Controller.extend(CanCheckEmails, {
       this.set('forceExpand', true);
     },
 
-    adminDelete() {
-      // I really want this deferred, don't want to bring in all this code till used
-      const AdminUser = requirejs('admin/models/admin-user').default;
-      AdminUser.find(this.get('model.id')).then(user => user.destroy({deletePosts: true}));
+    showSuspensions() {
+      this.get('adminTools').showActionLogs(this, {
+        target_user: this.get('model.username'),
+        action_name: 'suspend_user'
+      });
     },
 
+    adminDelete() {
+      this.get('adminTools').deleteUser(this.get('model.id'));
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index d02254e31c..336e25314e 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -67,9 +67,9 @@ export function categoryBadgeHTML(category, opts) {
   let categoryName = escapeExpression(get(category, 'name'));
 
   if (restricted) {
-    html += iconHTML('lock') + " " + categoryName;
+    html += `${iconHTML('lock')}<span>${categoryName}</span>`;
   } else {
-    html += categoryName;
+    html += `<span>${categoryName}</span>`;
   }
   html += "</span>";
 
diff --git a/app/assets/javascripts/discourse/initializers/localization.js.es6 b/app/assets/javascripts/discourse/initializers/localization.js.es6
index 2603ddaf4b..e4403e0489 100644
--- a/app/assets/javascripts/discourse/initializers/localization.js.es6
+++ b/app/assets/javascripts/discourse/initializers/localization.js.es6
@@ -4,31 +4,21 @@ export default {
   name: 'localization',
   after: 'inject-objects',
 
-  enableVerboseLocalization() {
-    let counter = 0;
-    let keys = {};
-    let t = I18n.t;
 
-    I18n.noFallbacks = true;
+  isVerboseLocalizationEnabled(container) {
+    const siteSettings = container.lookup('site-settings:main');
+    if (siteSettings.verbose_localization) return true;
 
-    I18n.t = I18n.translate = function(scope, value){
-      let current = keys[scope];
-      if (!current) {
-        current = keys[scope] = ++counter;
-        let message = "Translation #" + current + ": " + scope;
-        if (!_.isEmpty(value)) {
-          message += ", parameters: " + JSON.stringify(value);
-        }
-        Em.Logger.info(message);
-      }
-      return t.apply(I18n, [scope, value]) + " (#" + current + ")";
-    };
+    try {
+      return sessionStorage && sessionStorage.getItem("verbose_localization");
+    } catch (e) {
+      return false;
+    }
   },
 
   initialize(container) {
-    const siteSettings = container.lookup('site-settings:main');
-    if (siteSettings.verbose_localization) {
-      this.enableVerboseLocalization();
+    if (this.isVerboseLocalizationEnabled(container)) {
+      I18n.enableVerboseLocalization();
     }
 
     // Merge any overrides into our object
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
index ec1f3a446d..acc8573d20 100644
--- a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
+++ b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
@@ -1,5 +1,5 @@
 import { cleanDOM } from 'discourse/lib/clean-dom';
-import { startPageTracking } from 'discourse/lib/page-tracker';
+import { startPageTracking, googleTagManagerPageChanged } from 'discourse/lib/page-tracker';
 import { viewTrackingRequired } from 'discourse/lib/ajax';
 
 export default {
@@ -35,15 +35,7 @@ export default {
 
     // And Google Tag Manager too
     if (typeof window.dataLayer !== 'undefined') {
-      appEvents.on('page:changed', data => {
-        window.dataLayer.push({
-          'event': 'virtualPageView',
-          'page': {
-            'title': data.title,
-            'url': data.url
-          }
-        });
-      });
+      appEvents.on('page:changed', googleTagManagerPageChanged);
     }
   }
 };
diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
index bb2a915727..cb155ec258 100644
--- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
@@ -55,4 +55,8 @@ export function throwAjaxError(undoCallback) {
 
 export function popupAjaxError(error) {
   bootbox.alert(extractError(error));
+
+  error._discourse_displayed = true;
+  // We re-throw in a catch to not swallow the exception
+  throw error;
 }
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 15cb6d5d93..cf0a9a01d6 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -276,7 +276,6 @@ export default function(options) {
       }
 
       if (Discourse.Site.currentProp('mobileView')) {
-        div.css('width', 'auto');
 
         if ((me.height() / 2) >= pos.top) { vOffset = -23; }
         if ((me.width() / 2) <= pos.left) { hOffset = -div.width(); }
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6
index 6247973d45..13845062a4 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/click-track.js.es6
@@ -129,7 +129,8 @@ export default {
     }
 
     // Otherwise, use a custom URL with a redirect
-    if (Discourse.User.currentProp('external_links_in_new_tab')) {
+    // consider CTRL+mouse-left-click / CMD+mouse-left-click or mouse-middle-click as well
+    if (Discourse.User.currentProp('external_links_in_new_tab') || ((e.ctrlKey || e.metaKey) && (e.which === 1)) || (e.which === 2)) {
       window.open(destUrl, '_blank').focus();
     } else {
       DiscourseURL.redirectTo(destUrl);
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index c3a7ecd27c..367e6aa304 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -12,6 +12,7 @@ const bindings = {
   '.':               {click: '.alert.alert-info.clickable', anonymous: true}, // show incoming/updated topics
   'b':               {handler: 'toggleBookmark'},
   'c':               {handler: 'createTopic'},
+  'C':               {handler: 'focusComposer'},
   'ctrl+f':          {handler: 'showPageSearch', anonymous: true},
   'command+f':       {handler: 'showPageSearch', anonymous: true},
   'ctrl+p':          {handler: 'printTopic', anonymous: true},
@@ -67,6 +68,12 @@ export default {
     this.searchService = this.container.lookup('search-service:main');
     this.appEvents = this.container.lookup('app-events:main');
     this.currentUser = this.container.lookup('current-user:main');
+    let siteSettings = this.container.lookup('site-settings:main');
+
+    // Disable the shortcut if private messages are disabled
+    if (!siteSettings.enable_private_messages) {
+      delete bindings['g m'];
+    }
 
     Object.keys(bindings).forEach(key => {
       const binding = bindings[key];
@@ -174,6 +181,15 @@ export default {
     }
   },
 
+  focusComposer() {
+    const composer = this.container.lookup('controller:composer');
+    if (composer.get('model.viewOpen')) {
+      setTimeout(() => $('textarea.d-editor-input').focus(), 0);
+    } else {
+      composer.send('openIfDraft');
+    }
+  },
+
   pinUnpinTopic() {
     this.container.lookup('controller:topic').togglePinnedState();
   },
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
index e6bd2c79e1..77daeedce1 100644
--- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6
+++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
@@ -38,3 +38,23 @@ export function startPageTracking(router, appEvents) {
   });
   _started = true;
 }
+
+const _gtmPageChangedCallbacks = [];
+
+export function addGTMPageChangedCallback(callback) {
+  _gtmPageChangedCallbacks.push(callback);
+}
+
+export function googleTagManagerPageChanged(data) {
+  let gtmData = {
+    'event': 'virtualPageView',
+    'page': {
+      'title': data.title,
+      'url': data.url
+    }
+  };
+
+  _.each(_gtmPageChangedCallbacks, callback => callback(gtmData));
+
+  window.dataLayer.push(gtmData);
+}
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 68cc7eb8e6..60fc1233a5 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -22,9 +22,10 @@ import { registerIconRenderer, replaceIcon } from 'discourse-common/lib/icon-lib
 import { addNavItem } from 'discourse/models/nav-item';
 import { replaceFormatter } from 'discourse/lib/utilities';
 import { modifySelectKit } from "select-kit/mixins/plugin-api";
+import { addGTMPageChangedCallback } from 'discourse/lib/page-tracker';
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = '0.8.13';
+const PLUGIN_API_VERSION = '0.8.17';
 
 class PluginApi {
   constructor(version, container) {
@@ -350,10 +351,24 @@ class PluginApi {
     ```
   **/
   onPageChange(fn) {
-    let appEvents = this.container.lookup('app-events:main');
-    appEvents.on('page:changed', data => fn(data.url, data.title));
+    this.onAppEvent('page:changed', data => fn(data.url, data.title));
   }
 
+  /**
+    Listen for a triggered `AppEvent` from Discourse.
+
+    ```javascript
+      api.onAppEvent('inserted-custom-html', () => {
+        console.log('a custom footer was rendered');
+      });
+    ```
+  **/
+  onAppEvent(name, fn) {
+    let appEvents = this.container.lookup('app-events:main');
+    appEvents.on(name, fn);
+  }
+
+
   /**
    * Changes a setting associated with a widget. For example, if
    * you wanted small avatars in the post stream:
@@ -605,6 +620,20 @@ class PluginApi {
   modifySelectKit(pluginApiKey) {
     return modifySelectKit(pluginApiKey);
   }
+
+  /**
+  *
+  * Registers a function that can inspect and modify the data that
+  * will be sent to Google Tag Manager when a page changed event is triggered.
+  *
+  * Example:
+  *
+  * addGTMPageChangedCallback( gtmData => gtmData.locale = I18n.currentLocale() )
+  *
+  */
+  addGTMPageChangedCallback(fn) {
+    addGTMPageChangedCallback(fn);
+  }
 }
 
 let _pluginv01;
diff --git a/app/assets/javascripts/discourse/lib/screen-track.js.es6 b/app/assets/javascripts/discourse/lib/screen-track.js.es6
index af4c46a04c..1d43bf667e 100644
--- a/app/assets/javascripts/discourse/lib/screen-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/screen-track.js.es6
@@ -66,6 +66,7 @@ export default class {
     this._totalTimings = {};
     this._topicTime = 0;
     this._onscreen = [];
+    this._inProgress = false;
   }
 
   scrolled() {
@@ -108,6 +109,7 @@ export default class {
 
     if (!$.isEmptyObject(newTimings)) {
       if (this.currentUser) {
+        this._inProgress = true;
         ajax('/topics/timings', {
           data: {
             timings: newTimings,
@@ -128,6 +130,9 @@ export default class {
         }).catch(e => {
           const error = e.jqXHR;
           if (error.status === 405 && error.responseJSON.error_type === "read_only") return;
+        }).finally(() => {
+          this._inProgress = false;
+          this._lastFlush = 0;
         });
       } else if (this._anonCallback) {
         // Anonymous viewer - save to localStorage
@@ -182,7 +187,7 @@ export default class {
       return timings[postNumber] > 0 && !totalTimings[postNumber];
     });
 
-    if (this._lastFlush > nextFlush || rush) {
+    if (!this._inProgress && (this._lastFlush > nextFlush || rush)) {
       this.flush();
     }
 
diff --git a/app/assets/javascripts/discourse/lib/to-markdown.js.es6 b/app/assets/javascripts/discourse/lib/to-markdown.js.es6
index 2fd90c59e0..3a4ff590dc 100644
--- a/app/assets/javascripts/discourse/lib/to-markdown.js.es6
+++ b/app/assets/javascripts/discourse/lib/to-markdown.js.es6
@@ -2,7 +2,7 @@ import parseHTML from 'discourse/helpers/parse-html';
 
 const trimLeft = text => text.replace(/^\s+/,"");
 const trimRight = text => text.replace(/\s+$/,"");
-const countPipes = text => text.replace(/\\\|/,"").match(/\|/g).length;
+const countPipes = text => (text.replace(/\\\|/,"").match(/\|/g) || []).length;
 
 class Tag {
   constructor(name, prefix = "", suffix = "", inline = false) {
@@ -189,8 +189,14 @@ class Tag {
       toMarkdown() {
         const text = this.element.innerMarkdown().trim();
 
-        if (text.includes("\n")) {
-          throw "Unsupported format inside Markdown table cells";
+        if(text.includes("\n")) {  // Unsupported format inside Markdown table cells
+          let e = this.element;
+          while(e = e.parent) {
+            if (e.name === "table") {
+              e.tag().invalid();
+              break;
+            }
+          }
         }
 
         return this.decorate(text);
@@ -242,21 +248,38 @@ class Tag {
 
   static table() {
     return class extends Tag.block("table") {
+      constructor() {
+        super();
+        this.isValid = true;
+      }
+
+      invalid() {
+        this.isValid = false;
+        if (this.element.parentNames.includes("table")) {
+          let e = this.element;
+          while(e = e.parent) {
+            if (e.name === "table") {
+              e.tag().invalid();
+              break;
+            }
+          }
+        }
+      }
+
       decorate(text) {
         text = super.decorate(text).replace(/\|\n{2,}\|/g, "|\n|");
         const rows = text.trim().split("\n");
         const pipeCount = countPipes(rows[0]);
-        const isValid = rows.length > 1 &&
-                        pipeCount > 2 &&
-                        rows.reduce((a, c) => a && countPipes(c) <= pipeCount);
+        this.isValid =  this.isValid && rows.length > 1 && pipeCount > 2 && rows.reduce((a, c) => a && countPipes(c) <= pipeCount);  // Unsupported table format for Markdown conversion
 
-        if (!isValid) {
-          throw "Unsupported table format for Markdown conversion";
+        if (this.isValid) {
+          const splitterRow = [...Array(pipeCount-1)].map(() => "| --- ").join("") + "|\n";
+          text = text.replace("|\n", "|\n" + splitterRow);
+        } else {
+          text = text.replace(/\|/g, " ");
+          this.invalid();
         }
 
-        const splitterRow = [...Array(pipeCount-1)].map(() => "| --- ").join("") + "|\n";
-        text = text.replace("|\n", "|\n" + splitterRow);
-
         return text;
       }
     };
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index ac81e64e68..03ac928c1f 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -77,6 +77,7 @@ export function transformBasicPost(post) {
     cooked_hidden: !!post.cooked_hidden,
     expandablePost: false,
     replyCount: post.reply_count,
+    locked: post.locked
   };
 
   _additionalAttributes.forEach(a => postAtts[a] = post[a]);
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index 33558befac..1d24485e0f 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -193,6 +193,8 @@ export function validateUploadedFiles(files, opts) {
 }
 
 export function validateUploadedFile(file, opts) {
+  if (!authorizesOneOrMoreExtensions()) return false;
+
   opts = opts || {};
 
   const name = file && file.name;
@@ -277,6 +279,21 @@ export function authorizesAllExtensions() {
   return Discourse.SiteSettings.authorized_extensions.indexOf("*") >= 0;
 }
 
+export function authorizesOneOrMoreExtensions() {
+  if (authorizesAllExtensions()) return true;
+
+  return Discourse.SiteSettings.authorized_extensions
+          .split("|")
+          .filter(ext => ext)
+          .length > 0;
+}
+
+export function authorizesOneOrMoreImageExtensions() {
+  if (authorizesAllExtensions()) return true;
+
+  return imagesExtensions().length > 0;
+}
+
 export function isAnImage(path) {
   return (/\.(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)$/i).test(path);
 }
@@ -291,13 +308,13 @@ function isGUID(value) {
 
 function imageNameFromFileName(fileName) {
   const split = fileName.split('.');
-  const name = split[split.length-2];
+  let name = split[split.length - 2];
 
   if (exports.isAppleDevice() && isGUID(name)) {
-    return I18n.t('upload_selector.default_image_alt_text');
+    name = I18n.t('upload_selector.default_image_alt_text');
   }
 
-  return name;
+  return encodeURIComponent(name);
 }
 
 export function allowsImages() {
@@ -450,5 +467,25 @@ export function clipboardData(e, canUpload) {
   return { clipboard, types, canUpload, canPasteHtml };
 }
 
+export function fillMissingDates(data, startDate, endDate) {
+  const startMoment = moment(startDate, "YYYY-MM-DD");
+  const endMoment = moment(endDate, "YYYY-MM-DD");
+  const countDays = endMoment.diff(startMoment, 'days');
+  let currentMoment = startMoment;
+
+  for (let i = 0; i <= countDays; i++) {
+    let date = (data[i]) ? moment(data[i].x, "YYYY-MM-DD") : null;
+    if (i === 0 && date.isAfter(startMoment)) {
+      data.splice(i, 0, { "x" : startMoment.format("YYYY-MM-DD"), 'y': 0 });
+    } else {
+      if (!date || date.isAfter(moment(currentMoment))) {
+        data.splice(i, 0, { "x" : currentMoment, 'y': 0 });
+      }
+    }
+    currentMoment = moment(currentMoment).add(1, "day").format("YYYY-MM-DD");
+  }
+  return data;
+}
+
 // This prevents a mini racer crash
 export default {};
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
new file mode 100644
index 0000000000..6000f04191
--- /dev/null
+++ b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
@@ -0,0 +1,38 @@
+import computed from "ember-addons/ember-computed-decorators";
+import UserBadge from 'discourse/models/user-badge';
+
+export default Ember.Mixin.create({
+  @computed('allBadges.[]', 'userBadges.[]')
+  grantableBadges(allBadges, userBadges) {
+    const granted = userBadges.reduce((map, badge) => {
+      map[badge.get('badge_id')] = true;
+      return map;
+    }, {});
+
+    return allBadges
+      .filter(badge => {
+        return badge.get('enabled')
+          && badge.get('manually_grantable')
+          && (!granted[badge.get('id')] || badge.get('multiple_grant'));
+      })
+      .sort((a, b) => a.get('name').localeCompare(b.get('name')));
+  },
+
+  noGrantableBadges: Ember.computed.empty('grantableBadges'),
+
+  @computed('selectedBadgeId', 'grantableBadges')
+  selectedBadgeGrantable(selectedBadgeId, grantableBadges) {
+    return grantableBadges && grantableBadges.find(badge => badge.get('id') === selectedBadgeId);
+  },
+
+  grantBadge(selectedBadgeId, username, badgeReason) {
+    return UserBadge.grant(selectedBadgeId, username, badgeReason)
+      .then(newBadge => {
+        this.get('userBadges').pushObject(newBadge);
+        return newBadge;
+      }, error => {
+        throw error;
+      });
+  }
+});
+
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
index 8b6af94cbb..cf9f81cc0c 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
@@ -53,7 +53,7 @@ export default Ember.Object.extend({
 
     results.forEach(result => {
       result.title = I18n.t(`topic_statuses.${result.key}.help`);
-      if (!self.disableActions && (result.key === "pinned" ||result.key === "unpinned")) {
+      if (this.currentUser && (result.key === "pinned" || result.key === "unpinned")) {
         result.openTag = 'a href';
         result.closeTag = 'a';
       } else {
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js.es6
index e5d1aae23c..16e166c6b5 100644
--- a/app/assets/javascripts/discourse/routes/badges-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6
@@ -30,20 +30,9 @@ export default Discourse.Route.extend({
   afterModel(model, transition) {
     const username = transition.queryParams && transition.queryParams.username;
 
-    const userBadgesGrant = UserBadge.findByBadgeId(model.get("id"), {username}).then(userBadges => {
+    return UserBadge.findByBadgeId(model.get("id"), {username}).then(userBadges => {
       this.userBadgesGrant = userBadges;
     });
-
-    const userBadgesAll = UserBadge.findByUsername(username).then(userBadges => {
-      this.userBadgesAll = userBadges;
-    });
-
-    const promises = {
-      userBadgesGrant,
-      userBadgesAll,
-    };
-
-    return Ember.RSVP.hash(promises);
   },
 
   titleToken() {
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index d7a2116bee..14dd5e3d20 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -54,8 +54,8 @@ function findTopicList(store, tracking, filter, filterParams, extras) {
       tracking.trackIncoming(list.filter);
     }
     Discourse.Session.currentProp('topicList', list);
-    if (list.topic_list && list.topic_list.tags) {
-      Discourse.Site.currentProp('top_tags', list.topic_list.tags);
+    if (list.topic_list && list.topic_list.top_tags) {
+      Discourse.Site.currentProp('top_tags', list.topic_list.top_tags);
     }
     return list;
   });
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 73598c948e..3d981720ac 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -36,7 +36,8 @@ export default Discourse.Route.extend({
         return null;
       }
     }).then(results => {
-      const model = (results && translateResults(results)) || {};
+      const grouped_search_result = results ? results.grouped_search_result : {};
+      const model = (results && translateResults(results)) || { grouped_search_result };
       setTransient('lastSearch', { searchKey, model }, 5);
       return model;
     });
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
index 827c8c468b..bc0e3d2ccf 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
@@ -12,8 +12,13 @@ export function buildGroupPage(type) {
     },
 
     setupController(controller, model) {
-      this.controllerFor('group-activity-posts').setProperties({ model, type, canLoadMore: true });
-      this.controllerFor("group").set("showing", type);
+      let loadedAll = model.length < 20;
+      this.controllerFor('group-activity-posts').setProperties({
+        model,
+        type,
+        canLoadMore: !loadedAll,
+      });
+      this.controllerFor('application').set('showFooter', loadedAll);
     },
 
     renderTemplate() {
diff --git a/app/assets/javascripts/discourse/routes/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index 91269c4a5b..bbae55b1ac 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -4,10 +4,11 @@ import Group from 'discourse/models/group';
 export default Discourse.Route.extend({
 
   beforeModel(transition) {
+    const self = this;
     const params = transition.queryParams;
 
-    if (this.currentUser) {
-      this.replaceWith("discovery.latest").then(e => {
+    if (self.currentUser) {
+      self.replaceWith("discovery.latest").then(e => {
         if (params.username) {
           // send a message to a user
           User.findByUsername(params.username).then(user => {
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 9cc709d197..281adb45ff 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -85,6 +85,10 @@ const TopicRoute = Discourse.Route.extend({
       this.controllerFor('modal').set('modalClass', 'history-modal');
     },
 
+    showGrantBadgeModal() {
+      showModal('grant-badge', { model: this.modelFor('topic'), title: 'admin.badges.grant_badge' });
+    },
+
     showRawEmail(model) {
       showModal('raw-email', { model });
       this.controllerFor('raw_email').loadRawEmail(model.get("id"));
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index dfe8853dce..6063284f8e 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -23,7 +23,7 @@
 
 {{plugin-outlet name="above-footer" args=(hash showFooter=showFooter)}}
 {{#if showFooter}}
-  {{custom-html name="footer"}}
+  {{custom-html name="footer" triggerAppEvent="true"}}
 {{/if}}
 {{plugin-outlet name="below-footer" args=(hash showFooter=showFooter)}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
index 8101829c4d..0ac803fdad 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
@@ -10,7 +10,10 @@
     <div class="control-group">
       <label class="control-label"></label>
       <div class="controls">
-        {{combo-box value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
+        {{combo-box
+          value=selectedUserBadgeId
+          nameProperty="badge.name"
+          content=selectableUserBadges}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
index bbf8ef4cab..ce6613330e 100644
--- a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
+++ b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs
@@ -1,7 +1,14 @@
-{{category-drop category=firstCategory categories=parentCategories}}
+{{category-drop
+  category=firstCategory
+  categories=parentCategories}}
 
 {{#if childCategories}}
-  {{category-drop category=secondCategory parentCategory=firstCategory categories=childCategories subCategory="true" noSubcategories=noSubcategories}}
+  {{category-drop
+    category=secondCategory
+    parentCategory=firstCategory
+    categories=childCategories
+    subCategory="true"
+    noSubcategories=noSubcategories}}
 {{/if}}
 
 {{#if siteSettings.tagging_enabled}}
diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
index f2db677862..f10712bb61 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs
@@ -2,14 +2,14 @@
   <table class="category-list {{if showTopics 'with-topics'}}">
     <thead>
       <tr>
-        <th class="category">{{i18n 'categories.category'}}</th>
+        <th class="category"><span aria-role="heading" aria-level="2" id="categories-only-category">{{i18n 'categories.category'}}</span></th>
         <th class="topics">{{i18n 'categories.topics'}}</th>
         {{#if showTopics}}
           <th class="latest">{{i18n 'categories.latest'}}</th>
         {{/if}}
       </tr>
     </thead>
-    <tbody>
+    <tbody aria-labelledby="categories-only-category">
       {{#each categories as |c|}}
         <tr data-category-id={{c.id}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
           <td class="category" style={{border-color c.color}}>
diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.hbs b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
deleted file mode 100644
index ba5062a429..0000000000
--- a/app/assets/javascripts/discourse/templates/components/category-drop.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-{{#if category}}
-  <a href {{action "expand"}} class="dropdown-header" style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>
-    <span class="badge-category-bg" style={{categoryColor}}></span>
-    {{#if category.read_restricted}}
-      {{d-icon "lock"}}
-    {{/if}}
-    <span class='d-label'>{{category.name}}</span>
-  </a>
-{{else}}
-  {{#if noSubcategories}}
-    <a href {{action "expand"}} class='dropdown-header home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{i18n 'categories.no_subcategory'}}</a>
-  {{else}}
-    <a href {{action "expand"}} class='dropdown-header home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{allCategoriesLabel}}</a>
-  {{/if}}
-{{/if}}
-
-{{#if categories}}
-  <a href {{action "expand"}} class={{dropdownButtonClass}} style={{badgeStyle}}>
-    {{d-icon expandIcon}}
-  </a>
-  <section class="{{unless expanded 'hidden'}} category-dropdown-menu chooser">
-    <div class='cat'><a href={{allCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{allCategoriesLabel}}</a></div>
-    {{#if subCategory}}
-      <div class='cat'><a href={{noCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{i18n 'categories.no_subcategory'}}</a></div>
-    {{/if}}
-    {{#if renderCategories}}
-      {{#each categories as |c|}}<div class='cat'>{{category-link c allowUncategorized=true hideParent=subCategory}}</div>{{/each}}
-    {{/if}}
-  </section>
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
new file mode 100644
index 0000000000..e0766f4828
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/category-name-fields.hbs
@@ -0,0 +1,10 @@
+<section class='field'>
+  <section class="field-item">
+    <label>{{i18n 'category.name'}}</label>
+    {{text-field value=category.name placeholderKey="category.name_placeholder" maxlength="50"}}
+  </section>
+  <section class="field-item">
+    <label>{{i18n 'category.slug'}}</label>
+    {{text-field value=category.slug placeholderKey="category.slug_placeholder" maxlength="255"}}
+  </section>
+</section>
diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
index 006cd5eddc..037ee5440f 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
@@ -1,20 +1,22 @@
-{{d-editor tabindex="4"
-           value=composer.reply
-           placeholder="composer.reply_placeholder"
-           previewUpdated="previewUpdated"
-           markdownOptions=markdownOptions
-           extraButtons="extraButtons"
-           importQuote="importQuote"
-           showUploadModal="showUploadModal"
-           togglePreview="togglePreview"
-           validation=validation
-           loading=composer.loading
-           forcePreview=forcePreview
-           composerEvents=true
-           onExpandPopupMenuOptions="onExpandPopupMenuOptions"
-           onPopupMenuAction=onPopupMenuAction
-           popupMenuOptions=popupMenuOptions}}
+{{d-editor
+  tabindex="4"
+  value=composer.reply
+  placeholder=replyPlaceholder
+  previewUpdated="previewUpdated"
+  markdownOptions=markdownOptions
+  extraButtons="extraButtons"
+  importQuote="importQuote"
+  showUploadModal="showUploadModal"
+  togglePreview="togglePreview"
+  validation=validation
+  loading=composer.loading
+  forcePreview=forcePreview
+  composerEvents=true
+  onExpandPopupMenuOptions="onExpandPopupMenuOptions"
+  onPopupMenuAction=onPopupMenuAction
+  popupMenuOptions=popupMenuOptions
+  outletArgs=(hash composer=composer editorType="composer")}}
 
 {{#if site.mobileView}}
-    <input type="file" id="mobile-uploader" multiple />
+  <input type="file" id="mobile-uploader" multiple>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 6133b28f8f..06c636c2b7 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -41,13 +41,14 @@
     {{conditional-loading-spinner condition=loading}}
     {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated}}
     {{popup-input-tip validation=validation}}
+    {{plugin-outlet name="after-d-editor" tagName="" args=outletArgs}}
   </div>
 
   <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
     <div class="d-editor-preview">
       {{{preview}}}
     </div>
-      {{plugin-outlet name="editor-preview" classNames="d-editor-plugin"}}
+    {{plugin-outlet name="editor-preview" classNames="d-editor-plugin"}}
   </div>
 </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index c31406819a..2e498f77c3 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -1,14 +1,5 @@
 <form>
-  <section class='field'>
-    <section class="field-item">
-      <label>{{i18n 'category.name'}}</label>
-      {{text-field value=category.name placeholderKey="category.name_placeholder" maxlength="50"}}
-    </section>
-    <section class="field-item">
-      <label>{{i18n 'category.slug'}}</label>
-      {{text-field value=category.slug placeholderKey="category.slug_placeholder" maxlength="255"}}
-    </section>
-  </section>
+  {{category-name-fields category=category tagName=""}}
 
   {{#if canSelectParentCategory}}
     <section class='field'>
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs
index 2390a154ab..4b339c3f3f 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs
@@ -1,4 +1,4 @@
-<div class='table-heading'>
+<div class='table-heading' aria-role="heading" aria-level="2">
   {{i18n "filters.latest.title"}}
 </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
deleted file mode 100644
index ce4d6066c5..0000000000
--- a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<h2>{{period-title period showDateRange=true}}</h2>
-<button>{{d-icon "caret-down"}}</button>
-
-<div id='period-popup' class="{{unless showPeriods 'hidden'}} period-popup">
-  <ul>
-    {{#each site.periods as |p|}}
-      <li><a href {{action "changePeriod" p}}>{{period-title p showDateRange=true}}</a></li>
-    {{/each}}
-  </ul>
-</div>
-<div class='clearfix'></div>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
deleted file mode 100644
index 8dc8869f6f..0000000000
--- a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-{{#if showTagDropdown}}
-  {{#if tagId}}
-    {{#if noTagsSelected}}
-      <a href {{action "expand"}} class="dropdown-header {{tagClass}} home">{{noTagsLabel}}</a>
-    {{else}}
-      <a href {{action "expand"}} class="dropdown-header {{tagClass}}">{{tagId}}</a>
-    {{/if}}
-  {{else}}
-    <a href {{action "expand"}} class="dropdown-header {{tagClass}} home">{{allTagsLabel}}</a>
-  {{/if}}
-
-  {{#if tags}}
-    <a href {{action "expand"}} class={{dropdownButtonClass}}>
-      {{d-icon expandedIcon}}
-    </a>
-    <section class="{{unless expanded 'hidden'}} category-dropdown-menu chooser">
-      <div class='cat'><a href={{allTagsUrl}} data-drop-close="true" class='dropdown-header home'>{{allTagsLabel}}</a></div>
-      <div class='cat'><a href={{noTagsUrl}}  data-drop-close="true" class='dropdown-header home'>{{noTagsLabel}}</a></div>
-      {{#if renderTags}}
-        {{#each tags as |t|}}
-          <div class='cat'>
-            {{tag-drop-link tagId=t category=currentCategory}}
-          </div>
-        {{/each}}
-      {{/if}}
-    </section>
-  {{/if}}
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/templates/components/tag-list.hbs
index a3e912d26c..9c791cf25d 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-list.hbs
@@ -4,6 +4,9 @@
 {{#if category}}
   {{category-title-link category=category}}
 {{/if}}
+{{#if tagGroupName}}
+  <h3>{{tagGroupName}}</h3>
+{{/if}}
 {{#each sortedTags as |tag|}}
   <div class='tag-box'>
     {{#if tag.count}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
index 3af1dba017..b38900977f 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -50,8 +50,8 @@
                disabled=inviteDisabled}}
   {{/if}}
 
-  {{#if topic.isPrivateMessage}}
-    {{d-button class="standard"
+  {{#if canArchive}}
+    {{d-button class="standard archive-topic"
                title=archiveTitle
                label=archiveLabel
                icon=archiveIcon
@@ -79,7 +79,9 @@
   {{pinned-button pinned=topic.pinned topic=topic}}
 </div>
 
-{{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}
+{{#if showNotificationsButton}}
+  {{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}
+{{/if}}
 
 {{plugin-outlet name="after-topic-footer-buttons"
                 args=(hash topic=topic)
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index ad7f851e2c..2158ccb1ef 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,3 +1,4 @@
+<label class="control-label">{{{field.name}}}</label>
 <div class='controls'>
   <label class="control-label checkbox-label">{{input checked=value type="checkbox"}} {{{field.description}}}</label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 19c62e09d9..87b1a220e1 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -1,6 +1,8 @@
 <span class='value'>
   {{#if isNumber}}
     {{number value}}
+  {{else if isDuration}}
+    {{format-duration value}}
   {{else}}
     {{value}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 93864a0863..ed0b8c4028 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -85,6 +85,7 @@
                             popupMenuOptions=popupMenuOptions
                             draftStatus=model.draftStatus
                             isUploading=isUploading
+                            allowUpload=allowUpload
                             isCancellable=isCancellable
                             uploadProgress=uploadProgress
                             groupsMentioned="groupsMentioned"
@@ -131,7 +132,9 @@
 
             <div class="composer-bottom-right">
               {{#if site.mobileView}}
-                <a class="mobile-file-upload {{if isUploading 'hidden'}}">{{i18n 'upload'}}</a>
+                {{#if allowUpload}}
+                  <a class="mobile-file-upload {{if isUploading 'hidden'}}">{{i18n 'upload'}}</a>
+                {{/if}}
 
                 {{#if showPreview}}
                   {{d-button action='togglePreview' class='hide-preview' label='composer.hide_preview'}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index 3ad017f622..020e32ecf4 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -1,5 +1,5 @@
 {{#if bulkSelectEnabled}}
-  <td class='star'>
+  <td class="bulk-select">
     <input type="checkbox" class="bulk-select">
   </td>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs b/app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs
index cf592623fe..f55fd6e569 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/directory-item.hbs
@@ -7,5 +7,5 @@
 {{user-stat value=item.posts_read label="directory.posts_read"}}
 {{user-stat value=item.days_visited label="directory.days_visited"}}
 {{#if showTimeRead}}
-  <div class='time-read'>{{unbound item.time_read}}</div>
+  {{user-stat value=item.time_read label="directory.time_read" type="duration"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
new file mode 100644
index 0000000000..eadced1c9c
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/grant-badge.hbs
@@ -0,0 +1,15 @@
+{{#d-modal-body class='grant-badge'}}
+  {{#conditional-loading-spinner condition=loading}}
+    {{#if noGrantableBadges}}
+      <p>{{i18n 'admin.badges.no_badges'}}</p>
+    {{else}}
+      <p>{{combo-box filterable=true value=selectedBadgeId content=grantableBadges none="badges.none"}}</p>
+    {{/if}}
+  {{/conditional-loading-spinner}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  <button class='btn btn-primary' disabled={{buttonDisabled}} {{action "grantBadge"}}>
+    {{i18n 'admin.badges.grant'}}
+  </button>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 7b83a8961f..0b2ca23a23 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body title="history" maxHeight="80%"}}
+{{#d-modal-body title="history" maxHeight="70%"}}
   <div id="revision">
     <div id="revision-controls">
       {{d-button action="loadFirstVersion" icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
@@ -119,9 +119,9 @@
     {{#links-redirect class="row"}}
       {{{bodyDiff}}}
     {{/links-redirect}}
-
-    <hr>
-
+  </div>
+{{/d-modal-body}}
+<div class="modal-footer">
     {{#if displayRevert}}
       {{d-button action="revertToVersion" icon="undo" label="post.revisions.controls.revert" class="btn-danger" disabled=loading}}
     {{/if}}
@@ -139,5 +139,4 @@
           icon="pencil"
           label=editButtonLabel}}
     {{/if}}
-  </div>
-{{/d-modal-body}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 1ffb3e2c33..9dceda5cf8 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -11,7 +11,9 @@
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.top'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.bookmarks'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.profile'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}</li>
+        {{#if siteSettings.enable_private_messages}}
+          <li>{{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}</li>
+        {{/if}}
       </ul>
       <h4>{{i18n 'keyboard_shortcuts_help.navigation.title'}}</h4>
       <ul>
@@ -25,7 +27,6 @@
     <div class="span6">
       <h4>{{i18n 'keyboard_shortcuts_help.application.title'}}</h4>
       <ul>
-        <li>{{{i18n 'keyboard_shortcuts_help.application.create'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.hamburger_menu'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.user_profile_menu'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.show_incoming_updated_topics'}}}</li>
@@ -35,6 +36,15 @@
         <li>{{{i18n 'keyboard_shortcuts_help.application.dismiss_topics'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.application.log_out'}}}</li>
       </ul>
+      <h4>{{i18n 'keyboard_shortcuts_help.composing.title'}}</h4>
+      <ul>
+        <li>{{{i18n 'keyboard_shortcuts_help.composing.return'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.create'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_as_new_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_post'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}</li>
+      </ul>
     </div>
     <div class="span6">
       <h4>{{i18n 'keyboard_shortcuts_help.actions.title'}}</h4>
@@ -43,10 +53,6 @@
         <li>{{{i18n 'keyboard_shortcuts_help.actions.pin_unpin_topic'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.share_topic'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.share_post'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_as_new_topic'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_topic'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_post'}}}</li>
-        <li>{{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.like'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.flag'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.bookmark'}}}</li>
diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/templates/tags/index.hbs
index 1cf1beb970..1036b77bc7 100644
--- a/app/assets/javascripts/discourse/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/index.hbs
@@ -23,4 +23,8 @@
   {{tag-list tags=category.tags sortProperties=sortProperties categoryId=category.id}}
 {{/each}}
 
-{{tag-list tags=model sortProperties=sortProperties titleKey="tagging.all_tags"}}
+{{#each model.extras.tag_groups as |tagGroup|}}
+  {{tag-list tags=tagGroup.tags sortProperties=sortProperties tagGroupName=tagGroup.name}}
+{{/each}}
+
+{{tag-list tags=model sortProperties=sortProperties titleKey=otherTagsTitleKey}}
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
index 9f4646b3ad..9b530b0b69 100644
--- a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
@@ -1,5 +1,5 @@
 {{#if bulkSelectEnabled}}
-  <th class='star'>
+  <th class="bulk-select">
     {{#if canBulkSelect}}
       {{raw "flat-button" class="bulk-select" icon="list" title="topics.bulk.toggle"}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 28a0cf5fdc..1c9678a69c 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -42,9 +42,13 @@
         {{else}}
           <h1>
             {{#unless model.is_warning}}
-              <a href={{pmPath}}>
+              {{#if siteSettings.enable_private_messages}}
+                <a href={{pmPath}}>
+                  <span class="private-message-glyph">{{d-icon "envelope"}}</span>
+                </a>
+              {{else}}
                 <span class="private-message-glyph">{{d-icon "envelope"}}</span>
-              </a>
+              {{/if}}
             {{/unless}}
 
             {{#if model.details.loaded}}
@@ -170,6 +174,9 @@
                 togglePostType=(action "togglePostType")
                 rebakePost=(action "rebakePost")
                 changePostOwner=(action "changePostOwner")
+                grantBadge=(action "grantBadge")
+                lockPost=(action "lockPost")
+                unlockPost=(action "unlockPost")
                 unhidePost=(action "unhidePost")
                 replyToPost=(action "replyToPost")
                 toggleWiki=(action "toggleWiki")
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index e97ab3cefb..882b312c80 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -23,7 +23,11 @@
             </div>
           {{/if}}
           {{#if model.number_of_suspensions}}
-            <div><span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}</div>
+            <div>
+              <a {{action "showSuspensions"}}>
+                <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}
+              </a>
+            </div>
           {{/if}}
           {{#if model.warnings_received_count}}
             <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
diff --git a/app/assets/javascripts/discourse/templates/user/badge-title.hbs b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
index f51fbd234b..305593c49a 100644
--- a/app/assets/javascripts/discourse/templates/user/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
@@ -1 +1,4 @@
-{{badge-title selectableUserBadges=selectableUserBadges user=user}}
+{{badge-title
+  selectedUserBadgeId=selectedUserBadgeId
+  selectableUserBadges=selectableUserBadges
+  user=user}}
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6
index ebc7b56149..aa65deae5e 100644
--- a/app/assets/javascripts/discourse/widgets/button.js.es6
+++ b/app/assets/javascripts/discourse/widgets/button.js.es6
@@ -71,7 +71,7 @@ export const ButtonClass = {
     if (attrs.sendActionEvent) {
       return this.sendWidgetAction(attrs.action, e);
     }
-    return this.sendWidgetAction(attrs.action);
+    return this.sendWidgetAction(attrs.action, attrs.actionParam);
   }
 };
 
diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
index c226d944eb..0c4c7bcf25 100644
--- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6
+++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
@@ -38,7 +38,7 @@ export default createWidget('home-logo', {
     } else if (logoUrl.length) {
       return h('img#site-logo.logo-big', { key: 'logo-big', attributes: { src: logoUrl, alt: title } });
     } else {
-      return h('h2#site-text-logo.text-logo', { key: 'logo-text' }, title);
+      return h('h1#site-text-logo.text-logo', { key: 'logo-text' }, title);
     }
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index 484935a7a9..d79580ae45 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -66,6 +66,24 @@ export function buildManageButtons(attrs, currentUser) {
     });
   }
 
+  if (currentUser.staff) {
+    contents.push({
+      icon: 'certificate',
+      label: 'post.controls.grant_badge',
+      action: 'grantBadge',
+      className: 'grant-badge'
+    });
+
+    const action = attrs.locked ? "unlock" : "lock";
+    contents.push({
+      icon: action,
+      label: `post.controls.${action}_post`,
+      action: `${action}Post`,
+      title: `post.controls.${action}_post_description`,
+      className: `${action}-post`
+    });
+  }
+
   if (attrs.canManage || attrs.canWiki) {
     if (attrs.wiki) {
       contents.push({
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 6186ae4e72..46b9819457 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -194,7 +194,7 @@ registerButton('bookmark', attrs => {
   }
 
   return {
-    id: attrs.bookmarked ? 'bookmark' : 'unbookmark',
+    id: attrs.bookmarked ? 'unbookmark' : 'bookmark',
     action: 'toggleBookmark',
     title: attrs.bookmarked ? "bookmarks.created" : "bookmarks.not_bookmarked",
     className,
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index 427b7c3bae..29618627e6 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -7,6 +7,7 @@ import { h } from 'virtual-dom';
 import DiscourseURL from 'discourse/lib/url';
 import { dateNode } from 'discourse/helpers/node';
 import { translateSize, avatarUrl, formatUsername } from 'discourse/lib/utilities';
+import hbs from 'discourse/widgets/hbs-compiler';
 
 export function avatarImg(wanted, attrs) {
   const size = translateSize(wanted);
@@ -139,6 +140,12 @@ createWidget('post-avatar', {
   }
 });
 
+createWidget('post-locked-indicator', {
+  tagName: 'div.post-info.post-locked',
+  template: hbs`{{d-icon "lock"}}`,
+  title: () => I18n.t("post.locked")
+});
+
 createWidget('post-email-indicator', {
   tagName: 'div.post-info.via-email',
 
@@ -201,12 +208,16 @@ createWidget('post-meta-data', {
       attributes["class"] += " last-wiki-edit";
     }
 
-    result.push(h('div.post-info', h('a', { attributes }, date)));
+    result.push(h('div.post-info.post-date', h('a', { attributes }, date)));
 
     if (attrs.via_email) {
       result.push(this.attach('post-email-indicator', attrs));
     }
 
+    if (attrs.locked) {
+      result.push(this.attach('post-locked-indicator', attrs));
+    }
+
     if (attrs.version > 1 || attrs.wiki) {
       result.push(this.attach('post-edits-indicator', attrs));
     }
@@ -299,17 +310,29 @@ createWidget('post-contents', {
 
     const repliesBelow = state.repliesBelow;
     if (repliesBelow.length) {
-      result.push(h('section.embedded-posts.bottom', repliesBelow.map(p => {
-        return this.attach('embedded-post', p, { model: this.store.createRecord('post', p) });
-      })));
+      result.push(h('section.embedded-posts.bottom', [
+        repliesBelow.map(p => {
+          return this.attach('embedded-post', p, { model: this.store.createRecord('post', p) });
+        }),
+        this.attach('button', {
+          title: 'post.collapse',
+          icon: 'chevron-up',
+          action: 'toggleRepliesBelow',
+          actionParam: 'true',
+          className: 'btn collapse-up'
+        })
+      ]));
     }
 
     return result;
   },
 
-  toggleRepliesBelow() {
+  toggleRepliesBelow(goToPost = 'false') {
     if (this.state.repliesBelow.length) {
       this.state.repliesBelow = [];
+      if (goToPost === 'true') {
+        DiscourseURL.routeTo(`${this.attrs.topicUrl}/${this.attrs.post_number}`);
+      }
       return;
     }
 
@@ -332,10 +355,11 @@ createWidget('post-contents', {
 createWidget('post-body', {
   tagName: 'div.topic-body.clearfix',
 
-  html(attrs) {
+  html(attrs, state) {
     const postContents = this.attach('post-contents', attrs);
-    const result = [this.attach('post-meta-data', attrs), postContents];
-
+    let result = [this.attach('post-meta-data', attrs)];
+    result = result.concat(applyDecorators(this, 'after-meta-data', attrs, state));
+    result.push(postContents);
     result.push(this.attach('actions-summary', attrs));
     result.push(this.attach('post-links', attrs));
     if (attrs.showTopicMap) {
@@ -376,7 +400,16 @@ createWidget('post-article', {
         return this.attach('embedded-post', p, { model: this.store.createRecord('post', p), state: { above: true } });
       });
 
-      rows.push(h('div.row', h('section.embedded-posts.top.topic-body.offset2', replies)));
+      rows.push(h('div.row', h('section.embedded-posts.top.topic-body.offset2', [
+        this.attach('button', {
+          title: 'post.collapse',
+          icon: 'chevron-down',
+          action: 'toggleReplyAbove',
+          actionParam: 'true',
+          className: 'btn collapse-down'
+        }),
+        replies
+      ])));
     }
 
     rows.push(h('div.row', [this.attach('post-avatar', attrs), this.attach('post-body', attrs)]));
@@ -388,7 +421,7 @@ createWidget('post-article', {
     return post ? post.get('topic.url') : null;
   },
 
-  toggleReplyAbove() {
+  toggleReplyAbove(goToPost = 'false') {
     const replyPostNumber = this.attrs.reply_to_post_number;
 
     // jump directly on mobile
@@ -402,6 +435,9 @@ createWidget('post-article', {
 
     if (this.state.repliesAbove.length) {
       this.state.repliesAbove = [];
+      if (goToPost === 'true') {
+        DiscourseURL.routeTo(`${this.attrs.topicUrl}/${this.attrs.post_number}`);
+      }
       return Ember.RSVP.Promise.resolve();
     } else {
       const topicUrl = this._getTopicUrl();
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
index 363f769101..5a93ab9fd1 100644
--- a/app/assets/javascripts/discourse/widgets/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
@@ -7,9 +7,27 @@ function sanitizeName(name){
   return name.toLowerCase().replace(/[\s_-]/g,'');
 }
 
+createWidget('poster-name-title', {
+  tagName: 'span.user-title',
+
+  html(attrs) {
+    let titleContents = attrs.title;
+    if (attrs.primaryGroupName) {
+      const href = Discourse.getURL(`/groups/${attrs.primaryGroupName}`);
+      titleContents = h('a.user-group', { className: attrs.extraClasses, attributes: { href } }, attrs.title);
+    }
+    return titleContents;
+  }
+});
+
 export default createWidget('poster-name', {
   tagName: 'div.names.trigger-user-card',
 
+  settings: {
+    showNameAndGroup: true,
+    showGlyph: true
+  },
+
   // TODO: Allow extensibility
   posterGlyph(attrs) {
     if (attrs.moderator) {
@@ -41,22 +59,26 @@ export default createWidget('poster-name', {
       classNames.push(primaryGroupName);
     }
     const nameContents = [ this.userLink(attrs, nameFirst ? name : username) ];
-    const glyph = this.posterGlyph(attrs);
-    if (glyph) { nameContents.push(glyph); }
+
+    if (this.settings.showGlyph) {
+      const glyph = this.posterGlyph(attrs);
+      if (glyph) { nameContents.push(glyph); }
+    }
 
     const contents = [h('span', { className: classNames.join(' ') }, nameContents)];
+
+    if (!this.settings.showNameAndGroup) {
+      return contents;
+    }
+
     if (name && this.siteSettings.display_name_on_posts && sanitizeName(name) !== sanitizeName(username)) {
       contents.push(h('span.second.' + (nameFirst ? "username" : "full-name"),
             this.userLink(attrs, nameFirst ? username : name)));
     }
+
     const title = attrs.user_title;
     if (title && title.length) {
-      let titleContents = title;
-      if (primaryGroupName) {
-        const href = Discourse.getURL(`/groups/${primaryGroupName}`);
-        titleContents = h('a.user-group', { attributes: { href } }, title);
-      }
-      contents.push(h('span.user-title', titleContents));
+      contents.push(this.attach('poster-name-title', { title, primaryGroupName }));
     }
 
     return contents;
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
index bd24b59840..2e04ab2ab3 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -63,9 +63,14 @@ createWidget('topic-admin-menu-button', {
 
     const $button = $(e.target).closest('button');
     const position = $button.position();
+    const rtl = $('html').hasClass('rtl');
     position.left = position.left;
     position.outerHeight = $button.outerHeight();
 
+    if (rtl) {
+        position.left -= 217 - $button.outerWidth();
+    }
+
     if (this.attrs.fixed) {
       position.left += $button.width() - 203;
     }
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
index 302264c07e..115c3deb34 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -1,7 +1,7 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { formatUsername } from 'discourse/lib/utilities';
-import { ajax } from 'discourse/lib/ajax';
+import hbs from 'discourse/widgets/hbs-compiler';
 
 let extraGlyphs;
 
@@ -90,65 +90,82 @@ createWidget('user-menu-links', {
 
 createWidget('user-menu-dismiss-link', {
   tagName: 'div.dismiss-link',
-  buildKey: () => 'user-menu-dismiss-link',
 
-  html() {
-    if (userNotifications.state.notifications.filterBy("read", false).length > 0) {
-      return h('ul.menu-links',
-        h('li',
-          this.attach('link', {
-            action: 'dismissNotifications',
-            className: 'dismiss',
-            icon: 'check',
-            label: 'user.dismiss',
-            title: 'user.dismiss_notifications_tooltip'
-          })
-        )
-      );
-    } else {
-      return '';
-    }
-  },
-
-  dismissNotifications() {
-    ajax('/notifications/mark-read', { method: 'PUT' }).then(() => {
-      userNotifications.notificationsChanged();
-    });
-  }
+  template: hbs`
+    <ul class='menu-links'>
+      <li>
+        {{attach
+          widget="link"
+          attrs=(hash
+            action="dismissNotifications"
+            className="dismiss"
+            icon="check"
+            label="user.dismiss"
+            title="user.dismiss_notifications_tooltip")}}
+      </li>
+    </ul>
+  `,
 });
 
-let userNotifications = null,
-  dismissLink = null;
-
 export default createWidget('user-menu', {
   tagName: 'div.user-menu',
+  buildKey: () => 'user-menu',
 
   settings: {
-    maxWidth: 300
+    maxWidth: 300,
+    showLogoutButton: true
+  },
+
+  defaultState() {
+    return {
+      hasUnread: false,
+      markUnread: null
+    };
   },
 
   panelContents() {
     const path = this.currentUser.get('path');
-    userNotifications = this.attach('user-notifications', { path });
-    dismissLink = this.attach('user-menu-dismiss-link');
 
-    return [
+    let result = [
       this.attach('user-menu-links', { path }),
-      userNotifications,
-      h('div.logout-link', [
-        h('ul.menu-links',
-          h('li',
-            this.attach('link', {
-              action: 'logout',
-              className: 'logout',
-              icon: 'sign-out',
-              label: 'user.log_out'
-            })
-          )
-        )
-      ]),
-      dismissLink
+      this.attach('user-notifications', { path })
     ];
+
+    if (this.settings.showLogoutButton || this.state.hasUnread) {
+      result.push(h('hr.bottom-area'));
+    }
+
+    if (this.settings.showLogoutButton) {
+      result.push(
+        h('div.logout-link', [
+          h('ul.menu-links',
+            h('li',
+              this.attach('link', {
+                action: 'logout',
+                className: 'logout',
+                icon: 'sign-out',
+                label: 'user.log_out'
+              })
+            )
+          )
+        ]),
+      );
+    }
+
+    if (this.state.hasUnread) {
+      result.push(this.attach('user-menu-dismiss-link'));
+    }
+
+    return result;
+  },
+
+  dismissNotifications() {
+    return this.state.markRead();
+  },
+
+  notificationsLoaded({ notifications, markRead }) {
+    this.state.hasUnread = notifications.filterBy("read", false).length > 0;
+    this.state.markRead = markRead;
   },
 
   html() {
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
index a6353a995f..2082b53fcc 100644
--- a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
@@ -2,6 +2,7 @@ import { createWidget } from 'discourse/widgets/widget';
 import { headerHeight } from 'discourse/components/site-header';
 import { h } from 'virtual-dom';
 import DiscourseURL from 'discourse/lib/url';
+import { ajax } from 'discourse/lib/ajax';
 
 export default createWidget('user-notifications', {
   tagName: 'div.notifications',
@@ -11,8 +12,10 @@ export default createWidget('user-notifications', {
     return { notifications: [], loading: false, loaded: false };
   },
 
-  notificationsChanged() {
-    this.refreshNotifications(this.state);
+  markRead() {
+    ajax('/notifications/mark-read', { method: 'PUT' }).then(() => {
+      this.refreshNotifications(this.state);
+    });
   },
 
   refreshNotifications(state) {
@@ -51,6 +54,10 @@ export default createWidget('user-notifications', {
     }).finally(() => {
       state.loading = false;
       state.loaded = true;
+      this.sendWidgetAction('notificationsLoaded', {
+        notifications: state.notifications,
+        markRead: () => this.markRead()
+      });
       this.scheduleRerender();
     });
   },
@@ -79,8 +86,7 @@ export default createWidget('user-notifications', {
               icon: 'chevron-down',
               action: 'showAllNotifications',
               className: 'btn'
-            })),
-          h('hr')
+            }))
         );
       }
 
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index ba56bc3a80..0d27ee2fca 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -15,6 +15,7 @@ I18n.pluralizationRules = {
 
 // Set current locale to null
 I18n.locale = null;
+I18n.fallbackLocale = null;
 
 // Set the placeholder format. Accepts `{{placeholder}}` and `%{placeholder}`.
 I18n.PLACEHOLDER = /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm;
@@ -143,6 +144,10 @@ I18n.translate = function(scope, options) {
   var translation = this.lookup(scope, options);
 
   if (!this.noFallbacks) {
+    if (!translation && this.fallbackLocale) {
+      options.locale = this.fallbackLocale;
+      translation = this.lookup(scope, options);
+    }
     if (!translation && this.currentLocale() !== this.defaultLocale) {
       options.locale = this.defaultLocale;
       translation = this.lookup(scope, options);
@@ -287,5 +292,33 @@ I18n.currentLocale = function() {
   return I18n.locale || I18n.defaultLocale;
 };
 
+I18n.enableVerboseLocalization = function() {
+  var counter = 0;
+  var keys = {};
+  var t = I18n.t;
+
+  I18n.noFallbacks = true;
+
+  I18n.t = I18n.translate = function(scope, value){
+    var current = keys[scope];
+    if (!current) {
+      current = keys[scope] = ++counter;
+      var message = "Translation #" + current + ": " + scope;
+      if (!_.isEmpty(value)) {
+        message += ", parameters: " + JSON.stringify(value);
+      }
+      Em.Logger.info(message);
+    }
+    return t.apply(I18n, [scope, value]) + " (#" + current + ")";
+  };
+};
+
+I18n.enableVerboseLocalizationSession = function() {
+  sessionStorage.setItem("verbose_localization", "true");
+  I18n.enableVerboseLocalization();
+
+  return 'Verbose localization is enabled. Close the browser tab to turn it off. Reload the page to see the translation keys.';
+};
+
 // shortcuts
 I18n.t = I18n.translate;
diff --git a/app/assets/javascripts/pretty-text/censored-words.js.es6 b/app/assets/javascripts/pretty-text/censored-words.js.es6
index 58900460bc..9eac5ad68d 100644
--- a/app/assets/javascripts/pretty-text/censored-words.js.es6
+++ b/app/assets/javascripts/pretty-text/censored-words.js.es6
@@ -1,15 +1,18 @@
 function escapeRegexp(text) {
-  return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+  return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&').replace(/\*/g, "\S*");
 }
 
-export function censorFn(censoredWords, censoredPattern, replacementLetter) {
+export function censorFn(censoredWords, censoredPattern, replacementLetter, watchedWordsRegularExpressions) {
 
   let patterns = [];
 
   replacementLetter = replacementLetter || "&#9632;";
 
   if (censoredWords && censoredWords.length) {
-    patterns = censoredWords.split("|").map(t => `(${escapeRegexp(t)})`);
+    patterns = censoredWords.split("|");
+    if (!watchedWordsRegularExpressions) {
+      patterns = patterns.map(t => `(${escapeRegexp(t)})`);
+    }
   }
 
   if (censoredPattern && censoredPattern.length > 0) {
@@ -20,7 +23,11 @@ export function censorFn(censoredWords, censoredPattern, replacementLetter) {
     let censorRegexp;
 
     try {
-      censorRegexp = new RegExp("(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))", "ig");
+      if (watchedWordsRegularExpressions) {
+        censorRegexp = new RegExp("((?:" + patterns.join("|") + "))(?![^\\(]*\\))", "ig");
+      } else {
+        censorRegexp = new RegExp("(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))", "ig");
+      }
 
       if (censorRegexp) {
 
@@ -29,11 +36,16 @@ export function censorFn(censoredWords, censoredPattern, replacementLetter) {
 
           try {
             let m = censorRegexp.exec(text);
+            const fourCharReplacement = new Array(5).join(replacementLetter);
 
             while (m && m[0]) {
               if (m[0].length > original.length) { return original; } // regex is dangerous
-              const replacement = new Array(m[0].length+1).join(replacementLetter);
-              text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
+              if (watchedWordsRegularExpressions) {
+                text = text.replace(censorRegexp, fourCharReplacement);
+              } else {
+                const replacement = new Array(m[0].length+1).join(replacementLetter);
+                text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
+              }
               m = censorRegexp.exec(text);
             }
 
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
index 91a0d297ba..b9a993b8bf 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
@@ -25,6 +25,7 @@ function censorTree(state, censor) {
 export function setup(helper) {
   helper.registerOptions((opts, siteSettings) => {
     opts.censoredPattern = siteSettings.censored_pattern;
+    opts.watchedWordsRegularExpressions = siteSettings.watched_words_regular_expressions;
   });
 
   helper.registerPlugin(md => {
@@ -33,7 +34,7 @@ export function setup(helper) {
 
     if ((words && words.length > 0) || (patterns && patterns.length > 0)) {
       const replacement = String.fromCharCode(9632);
-      const censor = censorFn(words, patterns, replacement);
+      const censor = censorFn(words, patterns, replacement, md.options.discourse.watchedWordsRegularExpressions);
       md.core.ruler.push('censored', state => censorTree(state, censor));
     }
   });
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
index 522edbe766..dd45e3f54c 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
@@ -170,7 +170,7 @@ function getEmojiTokenByTranslation(content, pos, state) {
   }
 }
 
-function applyEmoji(content, state, emojiUnicodeReplacer) {
+function applyEmoji(content, state, emojiUnicodeReplacer, enableShortcuts) {
   let i;
   let result = null;
   let contentToken = null;
@@ -195,7 +195,7 @@ function applyEmoji(content, state, emojiUnicodeReplacer) {
       }
     }
 
-    if (!token) {
+    if (enableShortcuts && !token) {
       // handle aliases (note: we can't do this in inline cause ; is not a split point)
       //
       let info = getEmojiTokenByTranslation(content, i, state);
@@ -231,13 +231,19 @@ function applyEmoji(content, state, emojiUnicodeReplacer) {
 export function setup(helper) {
   helper.registerOptions((opts, siteSettings, state)=>{
     opts.features.emoji = !!siteSettings.enable_emoji;
+    opts.features.emojiShortcuts = !!siteSettings.enable_emoji_shortcuts;
     opts.emojiSet = siteSettings.emoji_set || "";
     opts.customEmoji = state.customEmoji;
   });
 
   helper.registerPlugin((md)=>{
     md.core.ruler.push('emoji', state => md.options.discourse.helpers.textReplace(
-      state, (c,s)=>applyEmoji(c,s,md.options.discourse.emojiUnicodeReplacer))
+      state, (c,s)=>applyEmoji(
+        c,
+        s,
+        md.options.discourse.emojiUnicodeReplacer,
+        md.options.discourse.features.emojiShortcuts
+      ))
     );
   });
 
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
index 2ff5c2a120..d229837d4c 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
@@ -96,15 +96,15 @@ function applyOnebox(state, silent) {
 
             if (!isTopLevel(href)) {
               let onebox = cachedInlineOnebox(href);
-
               let options = state.md.options.discourse;
+
               if (options.lookupInlineOnebox) {
                 onebox = options.lookupInlineOnebox(href);
               }
 
-              if (onebox) {
+              if (onebox && onebox.title) {
                 text.content = onebox.title;
-              } else if (state.md.options.discourse.previewing) {
+              } else if (state.md.options.discourse.previewing && !onebox) {
                 attrs.push(["class", "inline-onebox-loading"]);
               }
             }
diff --git a/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6 b/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
index b8be79f60e..171611506a 100644
--- a/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
@@ -1,6 +1,12 @@
 let _cache = {};
 
 export function applyInlineOneboxes(inline, ajax) {
+
+  Object.keys(inline).forEach(url => {
+    // cache a blank locally, so we never trigger a lookup
+    _cache[url] = {};
+  });
+
   return ajax("/inline-onebox", {
     data: { urls: Object.keys(inline) },
   }).then(result => {
diff --git a/app/assets/javascripts/pretty-text/sanitizer.js.es6 b/app/assets/javascripts/pretty-text/sanitizer.js.es6
index 512e332846..3729dfa6e9 100644
--- a/app/assets/javascripts/pretty-text/sanitizer.js.es6
+++ b/app/assets/javascripts/pretty-text/sanitizer.js.es6
@@ -73,6 +73,9 @@ export function sanitize(text, whiteLister) {
 
   if (allowedHrefSchemes && allowedHrefSchemes.length > 0) {
     extraHrefMatchers = [new RegExp('^(' + allowedHrefSchemes.join('|') + '):\/\/[\\w\\.\\-]+','i')];
+    if (allowedHrefSchemes.includes('tel')) {
+      extraHrefMatchers.push(new RegExp('^tel:\/\/\\+?[\\w\\.\\-]+','i'));
+    }
   }
 
   let result = xss(text, {
diff --git a/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
index 2144a1512a..a6f87d2606 100644
--- a/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
@@ -9,7 +9,7 @@ export default DropdownSelectBox.extend({
 
   computeHeaderContent() {
     let content = this.baseHeaderComputedContent();
-    content.name = I18n.t("admin.flags.delete");
+    content.name = `${I18n.t("admin.flags.delete")}...`;
     return content;
   },
 
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
index 47a319e066..65030131c7 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
@@ -14,6 +14,15 @@ export default ComboBoxComponent.extend({
   rowComponent: "category-row",
   noneRowComponent: "none-category-row",
   allowSubCategories: true,
+  permissionType: PermissionType.FULL,
+
+  init() {
+    this._super();
+
+    this.get("rowComponentOptions").setProperties({
+      allowUncategorized: this.get("allowUncategorized"),
+    });
+  },
 
   filterComputedContent(computedContent, computedValue, filter) {
     if (isEmpty(filter)) { return computedContent; }
@@ -86,7 +95,11 @@ export default ComboBoxComponent.extend({
         return false;
       }
 
-      return get(c, "permission") === PermissionType.FULL;
+      if (this.get("permissionType")) {
+        return this.get("permissionType") === get(c, "permission");
+      }
+
+      return true;
     });
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
new file mode 100644
index 0000000000..89a8d485f0
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -0,0 +1,107 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+import DiscourseURL from "discourse/lib/url";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+import Category from "discourse/models/category";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+
+export default ComboBoxComponent.extend({
+  pluginApiIdentifiers: ["category-drop"],
+  classNameBindings: ["categoryStyle"],
+  classNames: "category-drop",
+  verticalOffset: 3,
+  collectionHeight: "200",
+  content: Ember.computed.alias("categories"),
+  rowComponent: "category-row",
+  headerComponent: "category-drop/category-drop-header",
+  allowAutoSelectFirst: false,
+  tagName: "li",
+  categoryStyle: Ember.computed.alias("siteSettings.category_style"),
+  noCategoriesLabel: I18n.t("categories.no_subcategory"),
+  mutateAttributes() {},
+  fullWidthOnMobile: true,
+
+  init() {
+    this._super();
+
+    if (this.get("category")) {
+      this.set("value", this.get("category.id"));
+    } else {
+      this.set("value", null);
+    }
+    if (!this.get("categories")) this.set("categories", []);
+
+    this.get("rowComponentOptions").setProperties({
+      hideParentCategory: this.get("subCategory"),
+      allowUncategorized: true,
+      displayCategoryDescription: true
+    });
+  },
+
+  @computed("allCategoriesUrl", "allCategoriesLabel", "noCategoriesUrl", "noCategoriesLabel")
+  collectionHeader(allCategoriesUrl, allCategoriesLabel, noCategoriesUrl, noCategoriesLabel) {
+    let shortcuts = "";
+
+    shortcuts += `
+      <a href="${allCategoriesUrl}" class="category-filter">
+        ${allCategoriesLabel}
+      </a>
+    `;
+
+    if (this.get("subCategory")) {
+      shortcuts += `
+        <a href="${noCategoriesUrl}" class="category-filter">
+          ${noCategoriesLabel}
+        </a>
+      `;
+    }
+
+    return shortcuts.htmlSafe();
+  },
+
+  computeHeaderContent() {
+    let content = this.baseHeaderComputedContent();
+
+    if (this.get("hasSelection")) {
+      const category = Category.findById(content.value);
+      content.label = categoryBadgeHTML(category, {
+        link: false,
+        allowUncategorized: true,
+        hideParent: true
+      }).htmlSafe();
+    } else {
+      if (this.get("noSubcategories")) {
+        content.label = this.get("noCategoriesLabel");
+      } else {
+        content.label = this.get("allCategoriesLabel");
+      }
+    }
+
+    return content;
+  },
+
+  @computed("parentCategory.name", "subCategory")
+  allCategoriesLabel(categoryName, subCategory) {
+    if (subCategory) {
+      return I18n.t("categories.all_subcategories", { categoryName });
+    }
+    return I18n.t("categories.all");
+  },
+
+  @computed("parentCategory.url", "subCategory")
+  allCategoriesUrl(parentCategoryUrl, subCategory) {
+    return subCategory ? ( parentCategoryUrl || "/" ) : "/";
+  },
+
+  @computed("parentCategory.url")
+  noCategoriesUrl(parentCategoryUrl) {
+    return `${parentCategoryUrl}/none`;
+  },
+
+  actions: {
+    onSelect(categoryId) {
+      const category = Category.findById(parseInt(categoryId, 10));
+      const categoryURL = Discourse.getURL("/c/") + Discourse.Category.slugFor(category);
+      DiscourseURL.routeTo(categoryURL);
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
new file mode 100644
index 0000000000..84dec7d4d9
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/category-drop/category-drop-header.js.es6
@@ -0,0 +1,67 @@
+import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
+import computed from "ember-addons/ember-computed-decorators";
+import Category from "discourse/models/category";
+
+export default ComboBoxSelectBoxHeaderComponent.extend({
+  layoutName: "select-kit/templates/components/category-drop/category-drop-header",
+  classNames: "category-drop-header",
+
+  classNameBindings: ['categoryStyleClass'],
+  categoryStyleClass: Ember.computed.alias('site.category_style'),
+
+  @computed("computedContent.value", "computedContent.name")
+  category(value, name) {
+    if (Ember.isEmpty(value)) {
+      const uncat = Category.findUncategorized();
+      if (uncat && uncat.get("name") === name) {
+        return uncat;
+      }
+    } else {
+      return Category.findById(parseInt(value, 10));
+    }
+  },
+
+  @computed("category.color")
+  categoryBackgroundColor(categoryColor) {
+    return categoryColor || "#e9e9e9";
+  },
+
+  @computed("category.text_color")
+  categoryTextColor(categoryTextColor) {
+    return categoryTextColor || "#333";
+  },
+
+  @computed("category", "categoryBackgroundColor", "categoryTextColor")
+  categoryStyle(category, categoryBackgroundColor, categoryTextColor) {
+    const categoryStyle = this.siteSettings.category_style;
+
+    if (categoryStyle === "bullet") return;
+
+    if (category) {
+      if (categoryBackgroundColor || categoryTextColor) {
+        let style = "";
+        if (categoryBackgroundColor) {
+          if (categoryStyle === "bar") {
+            style += `border-color: #${categoryBackgroundColor};`;
+          } else if (categoryStyle === "box") {
+            style += `background-color: #${categoryBackgroundColor};`;
+            if (categoryTextColor) { style += `color: #${categoryTextColor};`; }
+          }
+        }
+
+        return style.htmlSafe();
+      }
+    }
+
+    if (categoryStyle === "box") {
+      return `background-color: ${categoryBackgroundColor}; color: ${categoryTextColor}`.htmlSafe();
+    }
+  },
+
+  didRender() {
+    this._super();
+
+    this.$().attr("style", this.get("categoryStyle"));
+    this.$(".caret-icon").attr("style", this.get("categoryStyle"));
+  },
+});
diff --git a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
index f84c0ba4c2..0115add4d3 100644
--- a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
@@ -15,6 +15,6 @@ export default NotificationOptionsComponent.extend({
 
   @computed("iconForSelectedDetails")
   headerIcon(iconForSelectedDetails) {
-    return [iconForSelectedDetails, "caret-down"];
+    return [iconForSelectedDetails];
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js.es6
index da59a4cfe9..ccd131c75d 100644
--- a/app/assets/javascripts/select-kit/components/category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-row.js.es6
@@ -7,6 +7,10 @@ export default SelectKitRowComponent.extend({
   layoutName: "select-kit/templates/components/category-row",
   classNames: "category-row",
 
+  hideParentCategory: Ember.computed.bool("options.hideParentCategory"),
+  allowUncategorized: Ember.computed.bool("options.allowUncategorized"),
+  categoryLink: Ember.computed.bool("options.categoryLink"),
+
   @computed("options.displayCategoryDescription")
   displayCategoryDescription(displayCategoryDescription) {
     if (Ember.isNone(displayCategoryDescription)) {
@@ -31,9 +35,9 @@ export default SelectKitRowComponent.extend({
   @computed("category")
   badgeForCategory(category) {
     return categoryBadgeHTML(category, {
-      link: false,
-      allowUncategorized: true,
-      hideParent: true
+      link: this.get("categoryLink"),
+      allowUncategorized: this.get("allowUncategorized"),
+      hideParent: this.get("hideParentCategory")
     }).htmlSafe();
   },
 
@@ -57,7 +61,10 @@ export default SelectKitRowComponent.extend({
     return category.get("parent_category_id");
   },
 
-  topicCount: Ember.computed.alias("category.topic_count"),
+  @computed("category.topic_count")
+  topicCount(topicCount) {
+    return `&times; ${topicCount}`.htmlSafe();
+  },
 
   @computed("displayCategoryDescription", "category.description")
   shouldDisplayDescription(displayCategoryDescription, description) {
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js.es6
index 9484e13844..58ec15c0f6 100644
--- a/app/assets/javascripts/select-kit/components/category-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6
@@ -9,6 +9,7 @@ export default MultiSelectComponent.extend({
   rowComponent: "category-row",
   categories: null,
   blacklist: null,
+  allowUncategorized: true,
 
   init() {
     this._super();
@@ -21,6 +22,7 @@ export default MultiSelectComponent.extend({
     });
 
     this.get("rowComponentOptions").setProperties({
+      allowUncategorized: this.get("allowUncategorized"),
       displayCategoryDescription: false
     });
   },
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js.es6
index 2929584f81..beec884459 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -45,7 +45,8 @@ export default SelectKitComponent.extend({
       values = this.willComputeValues(values);
       values = this.computeValues(values);
       values = this._beforeDidComputeValues(values);
-      this.set("headerComputedContent", this.computeHeaderContent());
+      this._setHeaderComputedContent();
+      this._setCollectionHeaderComputedContent();
       this.didComputeContent(content);
       this.didComputeValues(values);
       this.didComputeAttributes();
@@ -85,8 +86,8 @@ export default SelectKitComponent.extend({
     Ember.run.next(() => {
       this.mutateContent(this.get("computedContent"));
       this.mutateValues(this.get("computedValues"));
-      applyOnSelectPluginApiCallbacks(this.get("pluginApiIdentifiers"), this.get("computedValues"), this);
-      this.set("headerComputedContent", this.computeHeaderContent());
+      this._setCollectionHeaderComputedContent();
+      this._setHeaderComputedContent();
     });
   },
   mutateValues(computedValues) {
@@ -107,11 +108,15 @@ export default SelectKitComponent.extend({
       return !computedValues.includes(get(c, "value"));
     });
 
-    if (this.get("shouldFilter") === true) {
+    if (this.get("shouldFilter")) {
       computedContent = this.filterComputedContent(computedContent, computedValues, filter);
     }
 
-    return computedContent.slice(0, this.get("limitMatches"));
+    if (this.get("limitMatches")) {
+      return computedContent.slice(0, this.get("limitMatches"));
+    }
+
+    return computedContent;
   },
 
   baseHeaderComputedContent() {
@@ -162,7 +167,7 @@ export default SelectKitComponent.extend({
         const computedContent = this._findComputedContentItemByGuid($(el).attr("data-guid"));
         if (!Ember.isNone(computedContent)) { highlightedComputedContents.push(computedContent); }
       });
-      this.send("onDeselect", highlightedComputedContents);
+      this.send("deselect", highlightedComputedContents);
       return;
     }
 
@@ -208,18 +213,18 @@ export default SelectKitComponent.extend({
 
   autoHighlight() {
     Ember.run.schedule("afterRender", () => {
-      if (this.get("isExpanded") === false) { return; }
-      if (this.get("renderedBodyOnce") === false) { return; }
-      if (!isNone(this.get("highlightedValue"))) { return; }
+      if (!this.get("isExpanded")) return;
+      if (!this.get("renderedBodyOnce")) return;
+      if (!isNone(this.get("highlightedValue"))) return;
 
       if (isEmpty(this.get("filteredComputedContent"))) {
         if (this.get("createRowComputedContent")) {
-          this.send("onHighlight", this.get("createRowComputedContent"));
-        } else if (this.get("noneRowComputedContent") && this.get("hasSelection") === true) {
-          this.send("onHighlight", this.get("noneRowComputedContent"));
+          this.send("highlight", this.get("createRowComputedContent"));
+        } else if (this.get("noneRowComputedContent") && this.get("hasSelection")) {
+          this.send("highlight", this.get("noneRowComputedContent"));
         }
       } else {
-        this.send("onHighlight", this.get("filteredComputedContent.firstObject"));
+        this.send("highlight", this.get("filteredComputedContent.firstObject"));
       }
     });
   },
@@ -227,6 +232,19 @@ export default SelectKitComponent.extend({
   didSelect() {
     this.focusFilterOrHeader();
     this.autoHighlight();
+
+    applyOnSelectPluginApiCallbacks(
+      this.get("pluginApiIdentifiers"),
+      this.get("computedValue"),
+      this
+    );
+
+    this._boundaryActionHandler("onSelect", this.get("computedValue"));
+  },
+
+  willDeselect() {
+    this.clearFilter();
+    this.set("highlightedValue", null);
   },
 
   didDeselect() {
@@ -239,27 +257,29 @@ export default SelectKitComponent.extend({
   },
 
   actions: {
-    onClear() {
-      this.get("selectedComputedContents").forEach(selectedComputedContent => {
-        this.send("onDeselect", selectedComputedContent);
-      });
+    clearSelection() {
+      this.send("deselect", this.get("selectedComputedContents"));
+      this._boundaryActionHandler("onClearSelection");
     },
 
-    onCreate(computedContentItem) {
+    create(computedContentItem) {
       if (this.validateComputedContentItem(computedContentItem)) {
         this.get("computedContent").pushObject(computedContentItem);
-        this.send("onSelect", computedContentItem);
+        this._boundaryActionHandler("onCreate");
+        this.send("select", computedContentItem);
+      } else {
+        this._boundaryActionHandler("onCreateFailure");
       }
     },
 
-    onSelect(computedContentItem) {
+    select(computedContentItem) {
       this.willSelect(computedContentItem);
       this.get("computedValues").pushObject(computedContentItem.value);
       Ember.run.next(() => this.mutateAttributes());
       Ember.run.schedule("afterRender", () => this.didSelect(computedContentItem));
     },
 
-    onDeselect(rowComputedContentItems) {
+    deselect(rowComputedContentItems) {
       rowComputedContentItems = Ember.makeArray(rowComputedContentItems);
       const generatedComputedContents = this._filterRemovableComputedContents(makeArray(rowComputedContentItems));
       this.willDeselect(rowComputedContentItems);
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
index 7e835e8439..f75e7a708f 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
@@ -1,11 +1,11 @@
 import SelectedNameComponent from "select-kit/components/multi-select/selected-name";
+import computed from "ember-addons/ember-computed-decorators";
 
 export default SelectedNameComponent.extend({
   classNames: "selected-color",
-  layoutName: "select-kit/templates/components/multi-select/selected-color",
 
-  didRender() {
-    const name = this.get("name");
-    this.$(".color-preview").css("background", `#${name}`.htmlSafe());
+  @computed("name")
+  footerContent(name) {
+    return `<span class="color-preview" style="background:#${name}"></span>`.htmlSafe();
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/none-category-row.js.es6 b/app/assets/javascripts/select-kit/components/none-category-row.js.es6
index 60b932920e..13636aa770 100644
--- a/app/assets/javascripts/select-kit/components/none-category-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/none-category-row.js.es6
@@ -5,6 +5,6 @@ export default CategoryRowComponent.extend({
   classNames: "none category-row",
 
   click() {
-    this.sendAction("onClear");
+    this.sendAction("clearSelection");
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/period-chooser.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
new file mode 100644
index 0000000000..02bb13c907
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
@@ -0,0 +1,17 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: ["period-chooser"],
+  rowComponent: "period-chooser/period-chooser-row",
+  headerComponent: "period-chooser/period-chooser-header",
+  collectionHeight: "auto",
+  content: Ember.computed.alias("site.periods"),
+  value: Ember.computed.alias("period"),
+  isHidden: Ember.computed.alias("showPeriods"),
+
+  actions: {
+    onSelect() {
+      this.sendAction("action", this.get("computedValue"));
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6
new file mode 100644
index 0000000000..2c9c927992
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-header.js.es6
@@ -0,0 +1,12 @@
+import DropdownSelectBoxHeaderomponent from "select-kit/components/dropdown-select-box/dropdown-select-box-header";
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default DropdownSelectBoxHeaderomponent.extend({
+  layoutName: "select-kit/templates/components/period-chooser/period-chooser-header",
+  classNames: "period-chooser-header",
+
+  @computed("isExpanded")
+  caretIcon(isExpanded) {
+    return isExpanded ? "caret-up" : "caret-down";
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
new file mode 100644
index 0000000000..0a31c0a7c7
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/period-chooser/period-chooser-row.js.es6
@@ -0,0 +1,6 @@
+import DropdownSelectBoxRowComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
+
+export default DropdownSelectBoxRowComponent.extend({
+  layoutName: "select-kit/templates/components/period-chooser/period-chooser-row",
+  classNames: "period-chooser-row"
+});
diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
index ca4c65289c..860e017601 100644
--- a/app/assets/javascripts/select-kit/components/pinned-options.js.es6
+++ b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
@@ -44,13 +44,15 @@ export default DropdownSelectBoxComponent.extend({
     ]);
   },
 
-  mutateValue(value) {
-    const topic = this.get("topic");
+  actions: {
+    onSelect() {
+      const topic = this.get("topic");
 
-    if (value === "unpinned") {
-      topic.clearPin();
-    } else {
-      topic.rePin();
+      if (this.get("computedValue") === "unpinned") {
+        topic.clearPin();
+      } else {
+        topic.rePin();
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
index 7ed95af14a..652ee3fce9 100644
--- a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
@@ -8,6 +8,7 @@ export default CategoryChooserComponent.extend({
   rootNoneLabel: "category.all",
   allowUncategorized: true,
   clearable: true,
+  permissionType: null,
 
   init() {
     this._super();
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index 0e7546bae8..e08b74e32f 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,11 +1,14 @@
-const { isNone } = Ember;
+const { isNone, run } = Ember;
 import computed from "ember-addons/ember-computed-decorators";
 import UtilsMixin from "select-kit/mixins/utils";
 import DomHelpersMixin from "select-kit/mixins/dom-helpers";
 import EventsMixin from "select-kit/mixins/events";
 import PluginApiMixin from "select-kit/mixins/plugin-api";
 import {
-  applyContentPluginApiCallbacks
+  applyContentPluginApiCallbacks,
+  applyHeaderContentPluginApiCallbacks,
+  applyOnSelectPluginApiCallbacks,
+  applyCollectionHeaderCallbacks
 } from "select-kit/mixins/plugin-api";
 
 export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixin, EventsMixin, {
@@ -20,7 +23,8 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     "isAbove",
     "isBelow",
     "isLeftAligned",
-    "isRightAligned"
+    "isRightAligned",
+    "hasSelection",
   ],
   isDisabled: false,
   isExpanded: false,
@@ -48,6 +52,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   headerComponent: "select-kit/select-kit-header",
   headerComponentOptions: null,
   headerComputedContent: null,
+  collectionHeaderComputedContent: null,
   collectionComponent: "select-kit/select-kit-collection",
   collectionHeight: 200,
   verticalOffset: 0,
@@ -58,10 +63,11 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   allowInitialValueMutation: false,
   content: null,
   computedContent: null,
-  limitMatches: 100,
+  limitMatches: null,
   nameChanges: false,
   allowContentReplacement: false,
   collectionHeader: null,
+  allowAutoSelectFirst: true,
 
   init() {
     this._super();
@@ -137,8 +143,8 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
 
   @computed("shouldFilter", "allowAny", "filter")
   shouldDisplayFilter(shouldFilter, allowAny, filter) {
-    if (shouldFilter === true) return true;
-    if (allowAny === true && filter.length > 0) return true;
+    if (shouldFilter) return true;
+    if (allowAny && filter.length > 0) return true;
     return false;
   },
 
@@ -149,22 +155,22 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
 
   @computed("filter", "filterable", "autoFilterable", "renderedFilterOnce")
   shouldFilter(filter, filterable, autoFilterable, renderedFilterOnce) {
-    if (renderedFilterOnce === true && filterable === true) return true;
-    if (filterable === true) return true;
-    if (autoFilterable === true && filter.length > 0) return true;
+    if (renderedFilterOnce && filterable) return true;
+    if (filterable) return true;
+    if (autoFilterable && filter.length > 0) return true;
     return false;
   },
 
   @computed("filter", "computedContent")
   shouldDisplayCreateRow(filter, computedContent) {
     if (computedContent.map(c => c.value).includes(filter)) return false;
-    if (this.get("allowAny") === true && filter.length > 0) return true;
+    if (this.get("allowAny") && filter.length > 0) return true;
     return false;
   },
 
   @computed("filter", "shouldDisplayCreateRow")
   createRowComputedContent(filter, shouldDisplayCreateRow) {
-    if (shouldDisplayCreateRow === true) {
+    if (shouldDisplayCreateRow) {
       let content = this.createContentFromInput(filter);
       return this.computeContentItem(content, { created: true });
     }
@@ -192,7 +198,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     switch (typeof none) {
     case "string":
       return this.computeContentItem(this.noneValue, {
-        name: I18n.t(none).htmlSafe()
+        name: (I18n.t(none) || "").htmlSafe()
       });
     default:
       return this.computeContentItem(none);
@@ -208,15 +214,24 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   didSelect() {
     this.collapse();
     this.focus();
+
+    applyOnSelectPluginApiCallbacks(
+      this.get("pluginApiIdentifiers"),
+      this.get("computedValue"),
+      this
+    );
+
+    this._boundaryActionHandler("onSelect", this.get("computedValue"));
   },
 
   willDeselect() {
     this.clearFilter();
     this.set("highlightedValue", null);
   },
-  didDeselect() {
+  didDeselect(rowComputedContentItem) {
     this.collapse();
     this.focus();
+    this._boundaryActionHandler("onDeselect", rowComputedContentItem);
   },
 
   clearFilter() {
@@ -224,26 +239,58 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
     this.setProperties({ filter: "" });
   },
 
+  _setCollectionHeaderComputedContent() {
+    const collectionHeaderComputedContent = applyCollectionHeaderCallbacks(
+      this.get("pluginApiIdentifiers"),
+      this.get("collectionHeader"),
+      this
+    );
+    this.set("collectionHeaderComputedContent", collectionHeaderComputedContent);
+  },
+
+  _setHeaderComputedContent() {
+    const headerComputedContent = applyHeaderContentPluginApiCallbacks(
+      this.get("pluginApiIdentifiers"),
+      this.computeHeaderContent(),
+      this
+    );
+    this.set("headerComputedContent", headerComputedContent);
+  },
+
+  _boundaryActionHandler(actionName, ...params) {
+    if (Ember.get(this.actions, actionName)) {
+      run.next(() => this.send(actionName, ...params));
+    } else if (this.get(actionName)) {
+      run.next(() => this.get(actionName)());
+    }
+  },
+
   actions: {
-    onToggle() {
-      if (this.get("onToggle")) this.sendAction("onToggle");
-      if (this.get("onCollapse") && this.get("isExpanded") === true) this.sendAction("onCollapse");
-      if (this.get("onExpand") && this.get("isExpanded") === false) this.sendAction("onExpand");
+    toggle() {
+      this._boundaryActionHandler("onToggle", this);
 
-      this.get("isExpanded") === true ? this.collapse() : this.expand();
+      if (this.get("isExpanded")) {
+        this._boundaryActionHandler("onCollapse", this);
+        this.collapse();
+      } else {
+        this._boundaryActionHandler("onExpand", this);
+        this.expand();
+      }
     },
 
-    onHighlight(rowComputedContent) {
+    highlight(rowComputedContent) {
       this.set("highlightedValue", rowComputedContent.value);
+      this._boundaryActionHandler("onHighlight", rowComputedContent);
     },
 
-    onFilter(filter) {
+    filterComputedContent(filter) {
       this.setProperties({
         highlightedValue: null,
         renderedFilterOnce: true,
         filter
       });
       this.autoHighlight();
+      this._boundaryActionHandler("onFilter", filter);
     }
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
index 390408349b..4ab476091c 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
@@ -2,9 +2,5 @@ import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-r
 
 export default SelectKitRowComponent.extend({
   layoutName: "select-kit/templates/components/select-kit/select-kit-row",
-  classNames: "create",
-
-  click() {
-    this.sendAction("onCreate", this.get("computedContent"));
-  },
+  classNames: "create"
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
index b7705fa999..3ae115399f 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
@@ -37,6 +37,6 @@ export default Ember.Component.extend({
   },
 
   click() {
-    this.sendAction("onToggle");
+    this.sendAction("toggle");
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
index 542b9472c4..b2d488f499 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
@@ -5,6 +5,6 @@ export default SelectKitRowComponent.extend({
   classNames: "none",
 
   click() {
-    this.sendAction("onClear");
+    this.sendAction("clearSelection");
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
index d4638a9386..493b7a32bb 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
@@ -57,14 +57,14 @@ export default Ember.Component.extend(UtilsMixin, {
   },
 
   mouseEnter() {
-    this.set("hoverDebounce", run.debounce(this, this._sendOnHighlightAction, 32));
+    this.set("hoverDebounce", run.debounce(this, this._sendHighlightAction, 32));
   },
 
   click() {
-    this.sendAction("onSelect", this.get("computedContent"));
+    this.sendAction("select", this.get("computedContent"));
   },
 
-  _sendOnHighlightAction() {
-    this.sendAction("onHighlight", this.get("computedContent"));
+  _sendHighlightAction() {
+    this.sendAction("highlight", this.get("computedContent"));
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js.es6
index 8e2a35a5ef..af7c1e035a 100644
--- a/app/assets/javascripts/select-kit/components/single-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/single-select.js.es6
@@ -1,10 +1,6 @@
 import SelectKitComponent from "select-kit/components/select-kit";
-import { on } from "ember-addons/ember-computed-decorators";
-import computed from "ember-addons/ember-computed-decorators";
+import { default as computed, on } from 'ember-addons/ember-computed-decorators';
 const { get, isNone, isEmpty, isPresent, run } = Ember;
-import {
-  applyOnSelectPluginApiCallbacks
-} from "select-kit/mixins/plugin-api";
 
 export default SelectKitComponent.extend({
   pluginApiIdentifiers: ["single-select"],
@@ -26,10 +22,12 @@ export default SelectKitComponent.extend({
       value = this._beforeDidComputeValue(value);
       this.didComputeContent(content);
       this.didComputeValue(value);
-      this.set("headerComputedContent", this.computeHeaderContent());
       this.didComputeAttributes();
 
       if (this.get("allowInitialValueMutation")) this.mutateAttributes();
+
+      this._setCollectionHeaderComputedContent();
+      this._setHeaderComputedContent();
     });
   },
 
@@ -39,8 +37,8 @@ export default SelectKitComponent.extend({
     run.next(() => {
       this.mutateContent(this.get("computedContent"));
       this.mutateValue(this.get("computedValue"));
-      applyOnSelectPluginApiCallbacks(this.get("pluginApiIdentifiers"), this.get("computedValue"), this);
-      this.set("headerComputedContent", this.computeHeaderContent());
+      this._setCollectionHeaderComputedContent();
+      this._setHeaderComputedContent();
     });
   },
   mutateContent() {},
@@ -49,8 +47,11 @@ export default SelectKitComponent.extend({
   },
 
   _beforeWillComputeValue(value) {
-    if (!isEmpty(this.get("content")) && isEmpty(value) && isNone(this.get("none"))) {
-      value = this.valueForContentItem(get(this.get("content"), "firstObject"));
+    if (!isEmpty(this.get("content")) &&
+      isEmpty(value) &&
+      isNone(this.get("none")) &&
+      this.get("allowAutoSelectFirst")) {
+        value = this.valueForContentItem(get(this.get("content"), "firstObject"));
     }
 
     switch (typeof value) {
@@ -87,11 +88,15 @@ export default SelectKitComponent.extend({
 
   @computed("computedContent.[]", "computedValue", "filter", "shouldFilter")
   filteredComputedContent(computedContent, computedValue, filter, shouldFilter) {
-    if (shouldFilter === true) {
+    if (shouldFilter) {
       computedContent = this.filterComputedContent(computedContent, computedValue, filter);
     }
 
-    return computedContent.slice(0, this.get("limitMatches"));
+    if (this.get("limitMatches")) {
+      return computedContent.slice(0, this.get("limitMatches"));
+    }
+
+    return computedContent;
   },
 
   @computed("computedValue", "computedContent.[]")
@@ -112,30 +117,30 @@ export default SelectKitComponent.extend({
 
   autoHighlight() {
     run.schedule("afterRender", () => {
-      if (!isNone(this.get("highlightedValue"))) { return; }
+      if (!isNone(this.get("highlightedValue"))) return;
 
       const filteredComputedContent = this.get("filteredComputedContent");
       const displayCreateRow = this.get("shouldDisplayCreateRow");
       const none = this.get("noneRowComputedContent");
 
       if (this.get("hasSelection") && isEmpty(this.get("filter"))) {
-        this.send("onHighlight", this.get("selectedComputedContent"));
+        this.send("highlight", this.get("selectedComputedContent"));
         return;
       }
 
       if (isNone(this.get("highlightedValue")) && !isEmpty(filteredComputedContent)) {
-        this.send("onHighlight", get(filteredComputedContent, "firstObject"));
+        this.send("highlight", get(filteredComputedContent, "firstObject"));
         return;
       }
 
-      if (displayCreateRow === true && isEmpty(filteredComputedContent)) {
-        this.send("onHighlight", this.get("createRowComputedContent"));
+      if (displayCreateRow && isEmpty(filteredComputedContent)) {
+        this.send("highlight", this.get("createRowComputedContent"));
       }
       else if (!isEmpty(filteredComputedContent)) {
-        this.send("onHighlight", get(filteredComputedContent, "firstObject"));
+        this.send("highlight", get(filteredComputedContent, "firstObject"));
       }
-      else if (isEmpty(filteredComputedContent) && isPresent(none) && displayCreateRow === false) {
-        this.send("onHighlight", none);
+      else if (isEmpty(filteredComputedContent) && isPresent(none) && !displayCreateRow) {
+        this.send("highlight", none);
       }
     });
   },
@@ -145,25 +150,29 @@ export default SelectKitComponent.extend({
   },
 
   actions: {
-    onClear() {
-      this.send("onDeselect", this.get("selectedComputedContent"));
+    clearSelection() {
+      this.send("deselect", this.get("selectedComputedContent"));
+      this._boundaryActionHandler("onClearSelection");
     },
 
-    onCreate(computedContentItem) {
+    create(computedContentItem) {
       if (this.validateComputedContentItem(computedContentItem)) {
         this.get("computedContent").pushObject(computedContentItem);
-        this.send("onSelect", computedContentItem);
+        this._boundaryActionHandler("onCreate");
+        this.send("select", computedContentItem);
+      } else {
+        this._boundaryActionHandler("onCreateFailure");
       }
     },
 
-    onSelect(rowComputedContentItem) {
+    select(rowComputedContentItem) {
       this.willSelect(rowComputedContentItem);
       this.set("computedValue", rowComputedContentItem.value);
       this.mutateAttributes();
       run.schedule("afterRender", () => this.didSelect(rowComputedContentItem));
     },
 
-    onDeselect(rowComputedContentItem) {
+    deselect(rowComputedContentItem) {
       this.willDeselect(rowComputedContentItem);
       this.set("computedValue", null);
       this.mutateAttributes();
diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
new file mode 100644
index 0000000000..1ebcd1e9ba
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6
@@ -0,0 +1,113 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+import DiscourseURL from "discourse/lib/url";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+const { isEmpty } = Ember;
+
+export default ComboBoxComponent.extend({
+  pluginApiIdentifiers: ["tag-drop"],
+  classNameBindings: ["categoryStyle", "tagClass"],
+  classNames: "tag-drop",
+  verticalOffset: 3,
+  collectionHeight: "200",
+  value: Ember.computed.alias("tagId"),
+  headerComponent: "tag-drop/tag-drop-header",
+  rowComponent: "tag-drop/tag-drop-row",
+  allowAutoSelectFirst: false,
+  tagName: "li",
+  showFilterByTag: Ember.computed.alias("siteSettings.show_filter_by_tag"),
+  currentCategory: Ember.computed.or("secondCategory", "firstCategory"),
+  tagId: null,
+  categoryStyle: Ember.computed.alias("siteSettings.category_style"),
+  mutateAttributes() {},
+  fullWidthOnMobile: true,
+
+  @computed("tagId")
+  noTagsSelected() {
+    return this.get("tagId") === "none";
+  },
+
+  @computed("showFilterByTag", "content")
+  isHidden(showFilterByTag, content) {
+    if (showFilterByTag && !isEmpty(content)) return false;
+    return true;
+  },
+
+  computeHeaderContent() {
+    let content = this.baseHeaderComputedContent();
+
+    if (!content.value) {
+      if (this.get("noTagsSelected")) {
+        content.label = this.get("noTagsLabel");
+      } else {
+        content.label = this.get("allTagsLabel");
+      }
+    }
+
+    return content;
+  },
+
+  @computed("tagId")
+  tagClass(tagId) {
+    return tagId ? `tag-${tagId}` : "tag_all";
+  },
+
+  @computed("firstCategory", "secondCategory")
+  allTagsUrl() {
+    if (this.get("currentCategory")) {
+      return this.get("currentCategory.url") + "?allTags=1";
+    } else {
+      return "/";
+    }
+  },
+
+  @computed("firstCategory", "secondCategory")
+  noTagsUrl() {
+    var url = "/tags";
+    if (this.get("currentCategory")) {
+      url += this.get("currentCategory.url");
+    }
+    return `${url}/none`;
+  },
+
+  @computed("allTagsUrl", "allTagsLabel", "noTagsUrl", "noTagsLabel")
+  collectionHeader(allTagsUrl, allTagsLabel, noTagsUrl, noTagsLabel) {
+    return `
+      <a href="${allTagsUrl}" class="tag-filter">
+        ${allTagsLabel}
+      </a>
+      <a href="${noTagsUrl}" class="tag-filter">
+        ${noTagsLabel}
+      </a>
+    `;
+  },
+
+  @computed("tag")
+  allTagsLabel() {
+    return I18n.t("tagging.selector_all_tags");
+  },
+
+  @computed("tag")
+  noTagsLabel() {
+    return I18n.t("tagging.selector_no_tags");
+  },
+
+  @computed("site.top_tags")
+  content(topTags) {
+    if (this.siteSettings.tags_sort_alphabetically && topTags) {
+      return topTags.sort();
+    } else {
+      return topTags;
+    }
+  },
+
+  actions: {
+    onSelect(tagId) {
+      let url = "/tags";
+      if (this.get("currentCategory")) {
+        url += this.get("currentCategory.url");
+      }
+      url = `${url}/${tagId}`;
+      DiscourseURL.routeTo(url);
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6
new file mode 100644
index 0000000000..4b243f4580
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-header.js.es6
@@ -0,0 +1,6 @@
+import ComboBoxSelectBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
+
+export default ComboBoxSelectBoxHeaderComponent.extend({
+  layoutName: "select-kit/templates/components/tag-drop/tag-drop-header",
+  classNames: "tag-drop-header",
+});
diff --git a/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6
new file mode 100644
index 0000000000..cb87469d91
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/tag-drop/tag-drop-row.js.es6
@@ -0,0 +1,8 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+
+export default SelectKitRowComponent.extend({
+  layoutName: "select-kit/templates/components/tag-drop/tag-drop-row",
+  classNames: "tag-drop-row",
+
+  tagId: Ember.computed.alias("computedContent.value")
+});
diff --git a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
index ccdf3af489..8bde260f5b 100644
--- a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
@@ -45,7 +45,7 @@ export default ComboBoxComponent.extend({
       return;
     }
 
-    const refresh = () => this.send("onDeselect", value);
+    const refresh = () => this.send("deselect", value);
 
     switch(value) {
       case "invite":
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
index 6f9e7f556b..eb7e93715f 100644
--- a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -80,11 +80,14 @@ export default Ember.Mixin.create({
     this.setProperties({ isExpanded: true, renderedBodyOnce: true, isFocused: true });
     this.focusFilterOrHeader();
     this.autoHighlight();
+    this._setCollectionHeaderComputedContent();
+    this._setHeaderComputedContent();
   },
 
   collapse() {
     this.set("isExpanded", false);
     Ember.run.schedule("afterRender", () => this._removeFixedPosition() );
+    this._setHeaderComputedContent();
   },
 
   // lose focus of the component in two steps
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
index 8490293e4a..87d4df2561 100644
--- a/app/assets/javascripts/select-kit/mixins/events.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -38,14 +38,19 @@ export default Ember.Mixin.create({
 
     $(document)
       .on("mousedown.select-kit", event => {
-        event.stopPropagation();
+        if (!this.element || this.isDestroying || this.isDestroyed) {
+          return true;
+        }
 
-        if (!this.get("renderedBodyOnce")) return;
-        if (!this.get("isFocused")) return;
-        if (Ember.isNone(this.get("element"))) return;
-        if (Ember.$.contains(this.get("element"), event.target)) return;
+        if (Ember.$.contains(this.element, event.target)) {
+          event.stopPropagation();
+          if (!this.get("renderedBodyOnce")) return;
+          if (!this.get("isFocused")) return;
+        } else {
+          this.didClickOutside(event);
+        }
 
-        this.didClickOutside(event);
+        return true;
     });
 
     this.$header()
@@ -95,7 +100,7 @@ export default Ember.Mixin.create({
 
     this.$filterInput()
       .on("change.select-kit", (event) => {
-        this.send("onFilter", $(event.target).val());
+        this.send("filterComputedContent", $(event.target).val());
       })
       .on("keypress.select-kit", (event) => {
         event.stopPropagation();
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6 b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
index 5fd32fcd1d..579795911f 100644
--- a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
+++ b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
@@ -25,6 +25,24 @@ function modifyContent(pluginApiIdentifiers, contentFunction) {
   _modifyContentCallbacks[pluginApiIdentifiers].push(contentFunction);
 }
 
+let _modifyHeaderComputedContentCallbacks = {};
+function modifyHeaderComputedContent(pluginApiIdentifiers, contentFunction) {
+  if (Ember.isNone(_modifyHeaderComputedContentCallbacks[pluginApiIdentifiers])) {
+    _modifyHeaderComputedContentCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _modifyHeaderComputedContentCallbacks[pluginApiIdentifiers].push(contentFunction);
+}
+
+let _modifyCollectionHeaderCallbacks = {};
+function modifyCollectionHeader(pluginApiIdentifiers, contentFunction) {
+  if (Ember.isNone(_modifyCollectionHeaderCallbacks[pluginApiIdentifiers])) {
+    _modifyCollectionHeaderCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _modifyCollectionHeaderCallbacks[pluginApiIdentifiers].push(contentFunction);
+}
+
 let _onSelectCallbacks = {};
 function onSelect(pluginApiIdentifiers, mutationFunction) {
   if (Ember.isNone(_onSelectCallbacks[pluginApiIdentifiers])) {
@@ -50,6 +68,26 @@ export function applyContentPluginApiCallbacks(identifiers, content, context) {
   return content;
 }
 
+export function applyHeaderContentPluginApiCallbacks(identifiers, content, context) {
+  identifiers.forEach((key) => {
+    (_modifyHeaderComputedContentCallbacks[key] || []).forEach((c) => {
+      content = c(context, content);
+    });
+  });
+
+  return content;
+}
+
+export function applyCollectionHeaderCallbacks(identifiers, content, context) {
+  identifiers.forEach((key) => {
+    (_modifyCollectionHeaderCallbacks[key] || []).forEach((c) => {
+      content = c(context, content);
+    });
+  });
+
+  return content;
+}
+
 export function applyOnSelectPluginApiCallbacks(identifiers, val, context) {
   identifiers.forEach((key) => {
     (_onSelectCallbacks[key] || []).forEach((c) => c(context, val));
@@ -70,6 +108,14 @@ export function modifySelectKit(pluginApiIdentifiers) {
       modifyContent(pluginApiIdentifiers, callback);
       return modifySelectKit(pluginApiIdentifiers);
     },
+    modifyHeaderComputedContent: (callback) => {
+      modifyHeaderComputedContent(pluginApiIdentifiers, callback);
+      return modifySelectKit(pluginApiIdentifiers);
+    },
+    modifyCollectionHeader: (callback) => {
+      modifyCollectionHeader(pluginApiIdentifiers, callback);
+      return modifySelectKit(pluginApiIdentifiers);
+    },
     onSelect: (callback) => {
       onSelect(pluginApiIdentifiers, callback);
       return modifySelectKit(pluginApiIdentifiers);
@@ -81,6 +127,8 @@ export function clearCallbacks() {
   _appendContentCallbacks = {};
   _prependContentCallbacks = {};
   _modifyContentCallbacks = {};
+  _modifyHeaderComputedContentCallbacks = {};
+  _modifyCollectionHeaderCallbacks = {};
   _onSelectCallbacks = {};
 }
 
diff --git a/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
new file mode 100644
index 0000000000..7928a3b94b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/category-drop/category-drop-header.hbs
@@ -0,0 +1,5 @@
+<span class="selected-name">
+  {{{label}}}
+</span>
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index 6ea0bf428c..985fe9cd74 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -1,13 +1,16 @@
 {{#if category}}
     {{#if hasParentCategory}}
       <div class="category-status">
-        {{badgeForParentCategory}}&nbsp;{{badgeForCategory}}
-        &nbsp;<span class="topic-count">&times; {{topicCount}}</span>
+        {{#unless hideParentCategory}}
+          {{badgeForParentCategory}}
+        {{/unless}}
+        {{badgeForCategory}}
+        <span class="topic-count">{{topicCount}}</span>
       </div>
     {{else}}
       <div class="category-status">
         {{badgeForCategory}}
-        &nbsp;<span class="topic-count">&times; {{topicCount}}</span>
+        <span class="topic-count">{{topicCount}}</span>
       </div>
     {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
index 97a66905a9..622baaaf02 100644
--- a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
@@ -5,7 +5,7 @@
 </span>
 
 {{#if shouldDisplayClearableButton}}
-  <button class="btn-clear" {{action onClear bubbles=false}}>
+  <button class="btn-clear" {{action clearSelection bubbles=false}}>
     {{d-icon 'times'}}
   </button>
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
index caa167199e..c419312c69 100644
--- a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
@@ -15,7 +15,7 @@
 {{/if}}
 
 {{#if shouldDisplayClearableButton}}
-  <button class="btn-clear" {{action onClear bubbles=false}}>
+  <button class="btn-clear" {{action clearSelection bubbles=false}}>
     {{d-icon 'times'}}
   </button>
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs
index 5cfd580279..eb4aba3f06 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs
@@ -1,10 +1,12 @@
 <div class="choices">
   {{#each computedContent.selectedComputedContents as |selectedComputedContent|}}
-    {{component selectedNameComponent onDeselect=onDeselect computedContent=selectedComputedContent}}
+    {{component selectedNameComponent
+      deselect=deselect
+      computedContent=selectedComputedContent}}
   {{/each}}
   <span class="filter choice" tabindex="-1">
     {{component "select-kit/select-kit-filter"
-      onFilter=onFilter
+      filterComputedContent=filterComputedContent
       shouldDisplayFilter=shouldDisplayFilter
       isFocused=isFocused
       filter=filter
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
index d96b31245b..6e2b1b362f 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
@@ -1,7 +1,7 @@
-<span class="name">
-  <span class="delete-icon" {{action onDeselect computedContent bubbles=false}}>
+<div class="body">
+  <span class="delete-icon" {{action deselect computedContent bubbles=false}}>
     {{d-icon "times"}}
   </span>
 
   {{badge}}
-</span>
+</div>
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-color.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-color.hbs
deleted file mode 100644
index 2d70a3d7df..0000000000
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-color.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="selected-color-wrapper">
-  <span class="name">
-    {{#unless isLocked}}
-      <span class="delete-icon" {{action onDeselect computedContent bubbles=false}}>
-        {{d-icon "times"}}
-      </span>
-    {{/unless}}
-
-    #{{{label}}}
-  </span>
-
-  <span class="color-preview"></span>
-</div>
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs
index a48a160ccc..e4167b47b4 100644
--- a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs
@@ -1,13 +1,19 @@
-{{#if isLocked}}
-  <span class="delete-icon">
-    {{d-icon "lock"}}
-  </span>
-{{else}}
-  <span class="locked-icon" {{action onDeselect computedContent bubbles=false}}>
-    {{d-icon "times"}}
-  </span>
-{{/if}}
+{{#if headerContent}}<div class="header">{{headerContent}}</div>{{/if}}
 
-<span class="name">
-  {{{label}}}
-</span>
+<div class="body">
+  {{#if isLocked}}
+    <span class="delete-icon">
+      {{d-icon "lock"}}
+    </span>
+  {{else}}
+    <span class="locked-icon" {{action deselect computedContent bubbles=false}}>
+      {{d-icon "times"}}
+    </span>
+  {{/if}}
+
+  <span class="name">
+    {{{label}}}
+  </span>
+</div>
+
+{{#if footerContent}}<div class="footer">{{footerContent}}</div>{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-header.hbs b/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-header.hbs
new file mode 100644
index 0000000000..2f0f825d00
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-header.hbs
@@ -0,0 +1,5 @@
+<h2 class="selected-name" title={{title}}>
+  {{period-title value showDateRange=true}}
+</h2>
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-row.hbs b/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-row.hbs
new file mode 100644
index 0000000000..549bf27335
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/period-chooser/period-chooser-row.hbs
@@ -0,0 +1,5 @@
+<span class="selection-indicator"></span>
+
+<span class="period-title">
+  {{period-title value showDateRange=true}}
+</span>
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit.hbs
index 576cab2248..20bc4ca19f 100644
--- a/app/assets/javascripts/select-kit/templates/components/select-kit.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit.hbs
@@ -1,29 +1,29 @@
 {{component headerComponent
   tabindex=tabindex
+  shouldDisplayFilter=shouldDisplayFilter
   isFocused=isFocused
   isExpanded=isExpanded
   computedContent=headerComputedContent
-  onDeselect=(action "onDeselect")
-  onToggle=(action "onToggle")
-  onFilter=(action "onFilter")
-  onClear=(action "onClear")
+  deselect=(action "deselect")
+  toggle=(action "toggle")
+  filterComputedContent=(action "filterComputedContent")
+  clearSelection=(action "clearSelection")
   options=headerComponentOptions
-  shouldDisplayFilter=shouldDisplayFilter
 }}
 
 <div class="select-kit-body">
   {{component filterComponent
-    onFilter=(action "onFilter")
+    filter=filter
     icon=filterIcon
     shouldDisplayFilter=shouldDisplayFilter
-    isFocused=isFocused
     placeholder=(i18n filterPlaceholder)
-    filter=filter
+    isFocused=isFocused
+    filterComputedContent=(action "filterComputedContent")
   }}
 
   {{#if renderedBodyOnce}}
     {{component collectionComponent
-      collectionHeader=collectionHeader
+      collectionHeaderComputedContent=collectionHeaderComputedContent
       hasSelection=hasSelection
       noneRowComputedContent=noneRowComputedContent
       createRowComputedContent=createRowComputedContent
@@ -34,10 +34,10 @@
       templateForRow=templateForRow
       templateForNoneRow=templateForNoneRow
       templateForCreateRow=templateForCreateRow
-      onClear=(action "onClear")
-      onSelect=(action "onSelect")
-      onHighlight=(action "onHighlight")
-      onCreate=(action "onCreate")
+      clearSelection=(action "clearSelection")
+      select=(action "select")
+      highlight=(action "highlight")
+      create=(action "create")
       noContentLabel=noContentLabel
       highlightedValue=highlightedValue
       computedValue=computedValue
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
index f6cd9cf1a6..bb02559029 100644
--- a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
@@ -1,6 +1,6 @@
-{{#if collectionHeader}}
+{{#if collectionHeaderComputedContent}}
   <div class="collection-header">
-    {{{collectionHeader}}}
+    {{{collectionHeaderComputedContent}}}
   </div>
 {{/if}}
 
@@ -10,8 +10,8 @@
       computedContent=noneRowComputedContent
       templateForRow=templateForNoneRow
       highlightedValue=highlightedValue
-      onClear=onClear
-      onHighlight=onHighlight
+      clearSelection=clearSelection
+      highlight=highlight
       computedValue=computedValue
       options=rowComponentOptions
     }}
@@ -21,11 +21,11 @@
 {{#if createRowComputedContent}}
   {{component createRowComponent
     computedContent=createRowComputedContent
-    templateForRow=templateForCreateRow
     highlightedValue=highlightedValue
-    onHighlight=onHighlight
-    onCreate=onCreate
     computedValue=computedValue
+    templateForRow=templateForCreateRow
+    highlight=highlight
+    select=create
     options=rowComponentOptions
   }}
 {{/if}}
@@ -33,11 +33,11 @@
 {{#each filteredComputedContent as |computedContent|}}
   {{component rowComponent
     computedContent=computedContent
-    templateForRow=templateForRow
     highlightedValue=highlightedValue
-    onSelect=onSelect
-    onHighlight=onHighlight
     computedValue=computedValue
+    templateForRow=templateForRow
+    select=select
+    highlight=highlight
     options=rowComponentOptions
   }}
 {{/each}}
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs
index dd62fca94a..6815973db3 100644
--- a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs
@@ -2,7 +2,7 @@
   tabindex=-1
   class="filter-input"
   placeholder=placeholder
-  key-up=onFilter
+  key-up=filterComputedContent
   autocomplete="off"
   autocorrect="off"
   autocapitalize="off"
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
new file mode 100644
index 0000000000..7928a3b94b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-header.hbs
@@ -0,0 +1,5 @@
+<span class="selected-name">
+  {{{label}}}
+</span>
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs
new file mode 100644
index 0000000000..e8adb89fe4
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/tag-drop/tag-drop-row.hbs
@@ -0,0 +1 @@
+{{tagId}}
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index e66c539e39..4fb3d28771 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -74,7 +74,7 @@ $mobile-breakpoint: 700px;
 
     .site-text-search {
       padding: 0.5em;
-      font-size: 1em;
+      font-size: $font-0;
       width: 50%;
     }
 
@@ -101,7 +101,7 @@ $mobile-breakpoint: 700px;
 
     h3 {
       font-weight: normal;
-      font-size: 1em;
+      font-size: $font-0;
     }
 
     button.edit {
@@ -131,7 +131,7 @@ $mobile-breakpoint: 700px;
 }
 
 .content-list li a span.count {
-  font-size: 0.857em;
+  font-size: $font-down-1;
   float: right;
   margin-right: 10px;
   background-color: $primary-low;
@@ -194,15 +194,15 @@ $mobile-breakpoint: 700px;
   .location-box {
     position: absolute;
     width: 460px;
-    right: 0px;
-    z-index: 990;
+    right: 0;
+    z-index: z("dropdown");
     box-shadow: 0 2px 6px rgba(0,0,0, .8);
     margin-top: -2px;
     background-color: $secondary;
     padding: 12px 12px 5px;
 
     .powered-by {
-      font-size: 0.857em;
+      font-size: $font-down-1;
       position: absolute;
       bottom: -10px;
       left: 10px;
@@ -237,6 +237,10 @@ $mobile-breakpoint: 700px;
     width: 200px;
     float: right;
   }
+  .header-search-results {
+    clear: both;
+    padding: 4px;
+  }
 }
 
 .admin-container .controls {
@@ -267,8 +271,8 @@ $mobile-breakpoint: 700px;
     }
   }
   h1 {
-    font-size: 1.429em;
-    line-height: 25px;
+    font-size: $font-up-3;
+    line-height: $line-height-medium;
     color: $primary;
   }
   .controls {
@@ -368,7 +372,7 @@ $mobile-breakpoint: 700px;
     }
 
     .d-editor-textarea-wrapper {
-      max-width: 60%; 
+      max-width: 60%;
       .d-editor-button-bar {
         overflow: hidden;
       }
@@ -403,7 +407,7 @@ $mobile-breakpoint: 700px;
   // The admin-nav becomes a slide-out menu at the mobile-nav breakpoint
   @media (max-width: $mobile-breakpoint) {
     position: absolute;
-    z-index: 0;
+    z-index: z("base") - 1;
     width: 50%;
   }
 }
@@ -411,7 +415,7 @@ $mobile-breakpoint: 700px;
 .admin-detail {
   width: 76.5765%;
   @media (max-width: $mobile-breakpoint) {
-    z-index: 10;
+    z-index: z("base");
     width: 100%;
   }
   background-color: $secondary;
@@ -514,9 +518,9 @@ $mobile-breakpoint: 700px;
 
       li.sortable-placeholder {
         padding: 3px 5px 3px 18px;
-        margin: 3px 0px 3px 5px;
+        margin: 3px 0 3px 5px;
         position: relative;
-        line-height: 13px;
+        line-height: $line-height-small;
         cursor: default;
         border: 1px dashed #AAA;
         border-radius: 3px;
@@ -531,8 +535,8 @@ $mobile-breakpoint: 700px;
 
     .desc, .validation-error {
       padding-top: 3px;
-      font-size: .857em;
-      line-height: 1.4em;
+      font-size: $font-down-1;
+      line-height: $line-height-large;
     }
 
     .validation-error {
@@ -544,7 +548,7 @@ $mobile-breakpoint: 700px;
     }
 
     h3 {
-      font-size: 1em;
+      font-size: $font-0;
       font-weight: normal;
     }
   }
@@ -564,7 +568,7 @@ $mobile-breakpoint: 700px;
 
 section.details {
   h1 {
-    font-size: 1.429em;
+    font-size: $font-up-3;
     color: $primary;
     padding: 5px 10px;
     margin: 30px 0 5px 0;
@@ -603,8 +607,9 @@ section.details {
 }
 
 .display-row {
-  line-height: 30px;
-  padding: 5px;
+  display: flex;
+  align-items: center;
+  padding: 10px 5px;
   &:nth-of-type(1) {
     border-top: 0;
   }
@@ -626,7 +631,7 @@ section.details {
     margin-left: 12px;
     @media (max-width: $mobile-breakpoint) {
       margin-left: 0;
-      line-height: 20px;
+      line-height: $line-height-large;
       margin-top: 5px;
     }
   }
@@ -649,7 +654,7 @@ section.details {
     width: 800px;
     float: left;
     margin-left: 12px;
-    font-size: 0.857em;
+    font-size: $font-down-1;
 
     button {
       margin-left: 10px;
@@ -679,7 +684,7 @@ section.details {
 
     .list-badge {
       float: right;
-      font-size: .857em;
+      font-size: $font-down-1;
       font-weight: normal;
       padding: 0 6px;
       color: $secondary;
@@ -694,7 +699,7 @@ section.details {
     p.help {
       margin: 0;
       color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 0.857em;
+      font-size: $font-down-1;
     }
   }
 
@@ -765,15 +770,15 @@ section.details {
   }
 
   .badge-errors {
-    font-size: 1em;
-    line-height: 16px;
+    font-size: $font-0;
+    line-height: $line-height-medium;
     padding: 4px;
     background-color: $primary-low;
   }
 
   .badge-query-plan {
-    font-size: 0.857em;
-    line-height: 13px;
+    font-size: $font-down-1;
+    line-height: $line-height-medium;
     padding: 4px;
     background-color: $primary-low;
   }
@@ -850,8 +855,9 @@ section.details {
   }
 
   .version-number {
-    font-size: 1.429em;
+    font-size: $font-up-3;
     font-weight: bold;
+    line-height: $line-height-medium;
   }
 
   .face {
@@ -870,7 +876,7 @@ section.details {
   }
 
   .fa {
-    font-size: 1.857em;
+    font-size: $font-up-4;
   }
 
   .up-to-date {
@@ -886,7 +892,7 @@ section.details {
 
 .update-nag {
   .d-icon {
-    font-size: 1.429em;
+    font-size: $font-up-3;
   }
 }
 
@@ -904,7 +910,7 @@ table.api-keys {
   }
 
   td.key {
-    font-size: 0.857em;
+    font-size: $font-down-1;
   }
 }
 
@@ -989,7 +995,7 @@ table.api-keys {
       margin: 20px 10px 0 10px;
 
       .fa {
-        font-size: 2.286em;
+        font-size: $font-up-5;
         vertical-align: middle;
         color: $primary
       }
@@ -1612,7 +1618,7 @@ table#user-badges {
   }
   .reply-key {
     display: block;
-    font-size: .857em;
+    font-size: $font-down-1;
     color: dark-light-choose($primary-medium, $secondary-high);
   }
   .username div {
@@ -1642,7 +1648,7 @@ table#user-badges {
   }
   .error-description {
     color: #919191;
-    font-size: .857em;
+    font-size: $font-down-1;
   }
   hr {
     margin: 0;
@@ -1744,7 +1750,7 @@ table#user-badges {
     margin-top: 10px;
   }
   label {
-    font-size: 1em;
+    font-size: $font-0;
   }
 }
 
@@ -1801,7 +1807,7 @@ table#user-badges {
   float: right;
   text-align: right;
   .instructions {
-    font-size: .857em;
+    font-size: $font-down-1;
   }
 }
 .watched-words-detail {
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index d39b9ababe..9a23fb7d73 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -4,10 +4,10 @@
     margin-bottom: 10px;
     input {
       margin-bottom: 0;
-      font-size: 1rem;
+      font-size: $font-down-2;
     }
     .btn-small {
-      font-size: 1rem;
+      font-size: $font-down-2;
     }
   }
 
@@ -61,7 +61,7 @@
     bottom: 0;
     left: 0;
     right: 0;
-    z-index: 100000;
+    z-index: z("fullscreen");
     background-color: white;
     width: 100%;
     padding: 0;
@@ -111,7 +111,7 @@
       .d-icon-mobile {
         position: relative;
         top: -3px;
-        font-size: 1.5em;
+        font-size: $font-up-3;
         max-height: 20px;
       }
     }
@@ -194,7 +194,7 @@
 
   .status-message {
     display: block;
-    font-size: 0.857em;
+    font-size:  $font-down-1;
     margin-top: 8px;
   }
 
diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss
index 4574540c2a..298826baad 100644
--- a/app/assets/stylesheets/common/admin/flagging.scss
+++ b/app/assets/stylesheets/common/admin/flagging.scss
@@ -43,6 +43,9 @@
       word-wrap: break-word;
 
       .flagged-post-user-details {
+        display: flex;
+        justify-content: space-between;
+
         .username {
           font-weight: bold;
           color: $primary;
@@ -167,7 +170,7 @@
 
   .type-count {
     color: $primary-medium;
-    font-size: 0.857em;
+    font-size: $font-down-1;
   }
 }
 
diff --git a/app/assets/stylesheets/common/admin/moderation_history.scss b/app/assets/stylesheets/common/admin/moderation_history.scss
index aac258b92e..37ca38e545 100644
--- a/app/assets/stylesheets/common/admin/moderation_history.scss
+++ b/app/assets/stylesheets/common/admin/moderation_history.scss
@@ -15,7 +15,7 @@
       margin: 1em 0;
       color: $primary-medium;
       white-space: pre-wrap;
-      line-height: 1em;
+      line-height: $line-height-small;
       width: 300px;
     }
   }
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 57121a834b..b35977b652 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -1,6 +1,6 @@
 .show-more {
   width: 100%;
-  z-index: 1;
+  z-index: z("base");
   &.has-topics {
     position: absolute;
     top: 7px;
@@ -24,7 +24,7 @@
 }
 
 .topic-list-main-link {
-  font-size: 1.143em;
+  font-size: $font-up-1;
   a.title {
     padding: 15px 0;
     word-break: break-word;
@@ -68,15 +68,15 @@
     td {
       border-bottom: 1px solid $danger-low;
       line-height: 0.1em;
-      padding: 0px;
+      padding: 0;
       text-align: center;
     }
 
     td span {
       background-color: $secondary;
       color: $danger-low;
-      padding: 0px 8px;
-      font-size: 0.929em;
+      padding: 0 8px;
+      font-size: $font-down-1;
     }
   }
 
@@ -86,7 +86,7 @@
 
   th,
   td {
-    line-height: 1.25;
+    line-height: $line-height-large;
     text-align: left;
     vertical-align: middle;
 
@@ -94,13 +94,13 @@
   th {
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
-    font-size: 1em;
+    font-size: $font-0;
     button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium);}
 
   }
   td {
     color: dark-light-choose($primary-medium, $secondary-medium);
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   .main-link {
@@ -112,11 +112,11 @@
   }
 
   .topic-excerpt {
-    font-size: 0.929em;
-    margin-top: 8px;
-    color: dark-light-choose($primary-medium, $secondary-medium);
+    font-size: $font-down-1;
+    margin-top: 5px;
+    color: dark-light-choose($primary-high, $secondary-high);
     word-wrap: break-word;
-    line-height: 1.4;
+    line-height: $line-height-large;
     padding-right: 20px;
   }
   .topic-statuses:empty {
@@ -174,7 +174,7 @@
   }
   td.stats {
     .unit {
-      font-size: .857em;
+      font-size: $font-down-1;
     }
   }
 
@@ -182,8 +182,8 @@
       td {
         padding: 2px;
         vertical-align: bottom;
-        line-height: 24px;
-        &.value { text-align: right; font-size: 1.429em; }
+        line-height: $line-height-large;
+        &.value { text-align: right; font-size: $font-up-3; }
         &.unit  { text-align: left; }
       }
     }
@@ -199,11 +199,6 @@
 }
 
 .list-controls {
-  .category-dropdown-menu .home {
-    color: $primary;
-    margin-left: 8px;
-  }
-
   clear: both;
 }
 
@@ -217,7 +212,7 @@
     padding: 0;
     border: 0;
     color: $danger-medium;
-    font-size: 1em;
+    font-size: $font-0;
     cursor: default;
   }
 }
@@ -225,7 +220,7 @@
 .topic-list {
   .alert {
     margin-bottom: 0;
-    font-size: 1em;
+    font-size: $font-0;
   }
   .spinner {
     margin-top: 40px;
@@ -253,29 +248,6 @@ ol.category-breadcrumb {
   }
 }
 
-.list-controls .category-dropdown-menu {
-  overflow-x: hidden;
-  overflow-y: auto;
-  position: absolute;
-  border: 1px solid $primary-low;
-  background-color: $secondary;
-  z-index: 100;
-
-  a.badge-category, a.badge-category-parent {
-    line-height: 19px;
-    overflow:hidden;
-    margin-bottom: 0;
-  }
-  a.badge-category, .dropdown-header {
-    font-size: 0.857em;
-    font-weight: bold;
-    float: none;
-    text-transform: none;
-    max-width:200px;
-    text-overflow:ellipsis;
-  }
-}
-
 .d-icon-thumb-tack.unpinned {
   @include fa-icon-rotate(180deg, 1);
   color: $primary;
@@ -288,70 +260,6 @@ ol.category-breadcrumb {
   padding-right: 3px;
 }
 
-.period-chooser {
-  display: inline-block;
-  @include unselectable;
-
-  h2 {
-    float: left;
-    margin: 5px 0 10px;
-    .top-date-string {
-      font-size: 0.857em;
-    }
-  }
-
-  .top-date-string {
-    color: dark-light-choose($primary-medium, $secondary-high);
-    font-weight: normal;
-    text-transform: uppercase;
-  }
-
-  button {
-    outline: 0;
-    background: transparent;
-    border: 0;
-    font-size: 1.429em;
-    padding: 5px 10px 0 10px;
-  }
-
-  #period-popup {
-
-    @include unselectable;
-
-    font-size: 1.143em;
-    border: 1px solid $primary-low;
-    padding: 5px;
-    background: $secondary;
-    position: absolute;
-    z-index: 999;
-    box-shadow: 0 2px 2px rgba(0,0,0, .4);
-
-    ul {
-      list-style: none;
-      margin: 0;
-      padding: 0;
-
-      li {
-        margin: 0;
-        padding: 0;
-        font-weight: bold;
-        a, a:visited {
-          display: block;
-          padding: 5px;
-          color: $primary;
-        }
-        .top-date-string {
-          font-weight: normal;
-          font-size: 0.857em;
-        }
-        &:hover {
-          background-color: $highlight-medium;
-        }
-      }
-    }
-  }
-}
-
 .top-title-buttons {
   display: inline;
 
diff --git a/app/assets/stylesheets/common/base/about.scss b/app/assets/stylesheets/common/base/about.scss
index 596f3f1a71..5debc06741 100644
--- a/app/assets/stylesheets/common/base/about.scss
+++ b/app/assets/stylesheets/common/base/about.scss
@@ -21,7 +21,7 @@ section.about {
     td, th {
       padding: 10px 5px 5px 5px;
       border-bottom: 1px solid lighten($primary, 70%);
-      line-height: 1.0em;
+      line-height: $line-height-small;
     }
 
     td.title {
diff --git a/app/assets/stylesheets/common/base/activation.scss b/app/assets/stylesheets/common/base/activation.scss
index b6f45361d8..ba0aa79df0 100644
--- a/app/assets/stylesheets/common/base/activation.scss
+++ b/app/assets/stylesheets/common/base/activation.scss
@@ -10,8 +10,8 @@
 
   .account-created {
     .ac-message {
-      font-size: 1.143em;
-      line-height: 24px;
+      font-size: $font-up-1;
+      line-height: $line-height-large;
     }
 
     .activation-controls {
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 397c7c9da8..3d93a7be47 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -7,9 +7,9 @@
     position: relative;
     top: -2px;
     right: -21px;
-    line-height: 18px;
+    line-height: $line-height-small;
     float: right;
-    font-size: 1.429em;
+    font-size: $font-up-3;
     font-weight: bold;
     color: $primary;
     opacity: 0.2;
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 1e01b6268d..62faa65cfe 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -75,7 +75,7 @@
   .description {
     padding: 0 1em 1em 1em;
     text-align: center;
-    font-size: 1em;
+    font-size: $font-0;
     color: dark-light-choose($primary-medium, $secondary-high);
     .overflow {
       max-height: 6em;
@@ -85,10 +85,10 @@
   }
 
   h3 {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     margin-bottom: 0.5em;
     margin-top: 0.25em;
-    line-height: 1.1em;
+    line-height: $line-height-medium;
     text-align: center;
     color: $primary;
   }
@@ -102,7 +102,7 @@
   }
 
   h3 {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     text-align: center;
   }
 
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index a5fe8a86ee..bd343963b3 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -16,7 +16,7 @@
   @media screen and (max-width: 1200px) {
     min-width: 0;
   }
-  z-index: 999;
+  z-index: z("composer","content");
   transition: height 250ms ease, background 250ms ease, transform 250ms ease, max-width 250ms ease;
   background-color: $secondary;
   box-shadow: 0 -1px 40px rgba(0,0,0, .12);
@@ -88,12 +88,12 @@
   }
 
   .reply-to {
-    color: $primary-medium;
+    color: $primary-high;
     margin: 5px 0 10px 0;
     display: flex;
     align-items: center;
     i {
-      color: $primary-medium;
+      color: $primary-high;
     }
     .reply-details {
       overflow: hidden;
@@ -179,7 +179,6 @@
   }
 
   #reply-title {
-    padding: 6px 10px;
     margin: 0 0 5px 0;
     flex-basis: 50%;
   }
@@ -187,15 +186,12 @@
   .tag-chooser {
     flex: 1 1 25%;
     margin: 0 0 5px 10px;
-    border: 1px solid $primary-medium;
     background: $secondary;
     @media all and (max-width: 900px) {
       margin: 0;
       flex: 1 1 100%;
     }
-    .select2-choices {
-      border: none;
-    }
+
     &.select2-dropdown-open, &.select2-container-active {
       border-color: $tertiary;
     }
@@ -240,7 +236,7 @@
       display: flex;
       a {
         margin-left: 5px;
-        color: $primary-medium;
+        color: $primary-high;
       }
       .spinner {
         margin-right: 5px;
@@ -262,7 +258,7 @@
   }
 
   #draft-status, #file-uploading {
-    color: $primary-medium;
+    color: $primary-high;
   }
 }
 
@@ -271,7 +267,7 @@
 }
 
 .autocomplete {
-  z-index: 999999;
+  z-index: z("dropdown");
   position: absolute;
   width: 240px;
   background-color: $secondary;
@@ -300,7 +296,7 @@
           color: $primary;
         }
         span.name {
-          font-size: .857em;
+          font-size: $font-down-1;
           vertical-align: middle;
         }
         &.selected {
@@ -326,12 +322,11 @@ div.ac-wrap.disabled {
 
 div.ac-wrap div.item a.remove, .remove-link {
   margin-left: 4px;
-  font-size: .857em;
-  line-height: 10px;
-  padding: 1.5px 1.5px 1.5px 2.5px;
+  font-size: $font-down-1;
+  line-height: $line-height-small;
+  padding: 1px 3.5px;
   border-radius: 12px;
-  width: 10px;
-  display: inline-block;
+  box-sizing: border-box;
   border: 1px solid $primary-low;
   &:hover {
     background-color: $danger-low;
@@ -344,17 +339,17 @@ div.ac-wrap div.item a.remove, .remove-link {
 div.ac-wrap {
   overflow: auto;
   max-height: 150px;
+  display: flex;
+  flex-wrap: wrap;
   background-color: $secondary;
   border: 1px solid $primary-medium;
-  padding: 5px 4px 1px 10px;
   div.item {
     float: left;
-    margin-bottom: 4px;
-    margin-right: 10px;
+    padding: 4px 10px;
+    line-height: $line-height-large;
     span {
-      height: 24px;
       display: inline-block;
-      line-height: 20px;
+      line-height: $line-height-medium;
     }
   }
 
@@ -368,12 +363,10 @@ div.ac-wrap {
 
   input[type="text"] {
     float: left;
-    margin-bottom: 4px;
-    height: 24px;
     display: block;
-    border: 0;
-    padding: 0;
     box-shadow: none;
+    border: 0;
+    margin: 0;
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/crawler_layout.scss b/app/assets/stylesheets/common/base/crawler_layout.scss
index beb3208c46..615d5b080f 100644
--- a/app/assets/stylesheets/common/base/crawler_layout.scss
+++ b/app/assets/stylesheets/common/base/crawler_layout.scss
@@ -3,16 +3,16 @@ body.crawler {
     width: 100%;
     position: absolute;
     top: 0;
-    z-index: 1001;
+    z-index: z("max");
     background-color: #fff;
     padding: 10px;
     box-shadow: 0 2px 4px -1px rgba(0,0,0,0.25);
   }
   div.topic-list div[itemprop='itemListElement'] {
-    padding: 10px 0px;
+    padding: 10px 0;
     border-bottom: 1px solid #e9e9e9;
     .page-links a {
-      padding: 0px 4px;
+      padding: 0 4px;
     }
   }
   div#main-outlet {
@@ -23,7 +23,7 @@ body.crawler {
     }
   }
   footer nav {
-    margin: 50px 0px;
+    margin: 50px 0;
     a {
       padding: 15px;
     }
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index c9092a03b7..0a03b20871 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -29,9 +29,12 @@
       border-bottom: 1px solid $primary-low; 
 
       .number, .time-read {
-        font-size: 1.429em;
+        font-size: $font-up-3;
         color: $primary-medium; 
       }
+      .time-read {
+        white-space: nowrap;
+      }
     }
 
     tr.me {
@@ -39,7 +42,7 @@
         background-color: dark-light-choose($highlight-low, $highlight-medium);
 
         .username a, .name, .title, .number, .time-read {
-          color: $primary-medium;           
+          color: $primary-medium;
         }
       }
     }
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index ce410bfb13..613fa8301e 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -46,15 +46,14 @@ body {
   @include clearfix;
 }
 
+// setting a static limit on big and small prevents nesting abuse
 big {
-  font-size: 2.286em;
+  font-size: $font-up-5;
 }
-
 small {
-  font-size: .786em;
+  font-size: $font-down-2;
 }
 
-//setting a static limit on big and small prevents nesting abuse
 blockquote {
   @include post-aside;
   clear: both;
@@ -120,7 +119,7 @@ input {
   &[type="radio"],
   &[type="checkbox"] {
     margin: 3px 0;
-    line-height: normal;
+    line-height: $line-height-medium;
     cursor: pointer;
   }
   &[type="submit"],
@@ -187,18 +186,17 @@ input {
   &[type="color"] {
     @include appearance-none;
     display: inline-block;
-    height: 18px;
     padding: 4px 10px;
     margin-bottom: 9px;
-    font-size:  1em;
-    line-height: 1.25;
+    font-size:  $font-0;
+    line-height: $line-height-large;
     color: $primary;
     background-color: $secondary;
     border: 1px solid $primary-medium;
     border-radius: 0;
     &:focus {
       border-color: $tertiary;
-      box-shadow: $tertiary 0px 0px 6px 0px;
+      box-shadow: $tertiary 0 0 6px 0px;
       outline: 0;
     }
   }
@@ -210,13 +208,13 @@ textarea {
   border: 1px solid $primary-medium;
   &:focus {
     border-color: $tertiary;
-    box-shadow: $tertiary 0px 0px 6px 0px;    
+    box-shadow: $tertiary 0 0 6px 0px;
     outline: 0;
   }
 }
 
 select {
-  border: 1px solid $primary-low;  
+  border: 1px solid $primary-low;
 }
 
 // Common Classes
@@ -353,7 +351,7 @@ select {
   top: -18px !important;
   right: -18px !important;
   box-shadow: 0 0 0 9999px rgba($primary, 0.85);
-  z-index: 1040;
+  z-index: z("modal","overlay");
 }
 
 .ring-first-notification {
@@ -363,7 +361,7 @@ select {
   right: 70px;
   top: 60px;
   width: 230px;
-  line-height: 30px;
+  line-height: $line-height-medium;
 }
 
 .ring {
@@ -423,7 +421,7 @@ select {
 .content-list {
   h3 {
     color: $primary-medium;
-    font-size: 1.143em;
+    font-size: $font-up-1;
     padding-left: 5px;
     margin-bottom: 10px;
   }
@@ -474,8 +472,8 @@ select {
 
   .control-label {
     font-weight: bold;
-    font-size: 1.286em;
-    line-height: 2;
+    font-size: $font-up-2;
+    line-height: $line-height-large;
   }
 
   .controls {
@@ -517,7 +515,7 @@ select {
 
 #loading-message {
   position: absolute;
-  font-size: 2.286em;
+  font-size: $font-up-5;
   text-align: center;
   top: 120px;
   left: 500px;
diff --git a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
index c842e1f711..ba989a4f0d 100644
--- a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
+++ b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
@@ -49,7 +49,7 @@
 
       h3 {
         font-weight: normal;
-        font-size: 1.143em;
+        font-size: $font-up-1;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 78595461bf..f1a18dd556 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -7,7 +7,7 @@ img.emoji {
 .emoji-picker {
   box-shadow: 0 1px 5px rgba(0,0,0,0.4);
   background-clip: padding-box;
-  z-index: 10000;
+  z-index: z("modal","content"); 
   position: fixed;
   display: none;
   flex-direction: row;
@@ -54,7 +54,7 @@ img.emoji {
 .emoji-picker .list {
   overflow-y: scroll;
   -webkit-overflow-scrolling: touch;
-  padding: 0px;
+  padding: 0;
   flex: 1;
   flex-direction: column;
 }
@@ -100,7 +100,6 @@ img.emoji {
 
 .emoji-picker .info {
   text-overflow: ellipsis;
-  max-width: 232px;
   padding-left: 8px;
   white-space: nowrap;
   overflow: hidden;
@@ -142,7 +141,7 @@ img.emoji {
 
 .emoji-picker .diversity-picker .d-icon {
   color: #fff;
-  font-size: 1em;
+  font-size: $font-0;
   text-shadow: 0.5px 1.5px 0 rgba(0,0,0,0.3);
 }
 
@@ -155,8 +154,6 @@ img.emoji {
   -moz-box-sizing: content-box;
   box-sizing: content-box;
   height: 20px;
-  margin: 0;
-  padding: 0;
   border: 0;
   vertical-align: top;
   width: 20px;
@@ -177,7 +174,7 @@ img.emoji {
 }
 
 .emoji-picker-modal.fadeIn {
-  z-index: 9999;
+  z-index: z("modal","overlay");
   position: fixed;
   left: 0;
   top: 0;
@@ -202,7 +199,7 @@ img.emoji {
 
 .emoji-picker .filter .d-icon-search {
   color: dark-light-choose($header_primary-medium, $header_primary);
-  font-size: 1.143em;
+  font-size: $font-up-1;
   margin-left: 5px;
   margin-right: 5px;
 }
diff --git a/app/assets/stylesheets/common/base/exception.scss b/app/assets/stylesheets/common/base/exception.scss
index 346a833432..122b1605ed 100644
--- a/app/assets/stylesheets/common/base/exception.scss
+++ b/app/assets/stylesheets/common/base/exception.scss
@@ -4,15 +4,13 @@
 
   .face {
     font-size: 4.286em;
-    height: 60px;
   }
   .reason {
-    font-size: 1.857em;
-    height: 24px;
+    font-size: $font-up-4;
   }
   .url {
     font-style: italic;
-    font-size: .857em;
+    font-size: $font-down-1;
   }
   .desc {
     margin-top: 16px;
diff --git a/app/assets/stylesheets/common/base/faqs.scss b/app/assets/stylesheets/common/base/faqs.scss
index b652ff58ea..5cdb93c116 100644
--- a/app/assets/stylesheets/common/base/faqs.scss
+++ b/app/assets/stylesheets/common/base/faqs.scss
@@ -12,8 +12,8 @@
   ol,
   table {
     margin: 0 0 20px;
-    font-size: 1.143em;
-    line-height: 22px;
+    font-size: $font-up-1;
+    line-height: $line-height-large;
   }
 
   li {
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 3f04c28bf1..6b4586ad7d 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -15,7 +15,7 @@
     .time,
     .delete-info {
       color: lighten($primary, 40%);
-      font-size: 0.857em;
+      font-size: $font-down-1;
     }
 
     .group-member-info {
@@ -29,7 +29,7 @@
     width: 100%;
     justify-content: space-between;
     .group-post-title {
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
   }
 
@@ -47,13 +47,13 @@
   width: 100%;
 
   .group-info-name {
-    font-size: 1.429em;
+    font-size: $font-up-3;
     font-weight: bold;
     color: $primary;
   }
 
   .group-info-full-name {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     color: dark-light-choose($primary-high, $secondary-low);
   }
 
@@ -95,11 +95,11 @@ table.group-logs {
 
   th {
     text-align: left;
-    padding: 5px 0px;
+    padding: 5px 0;
   }
 
   td {
-    padding: 10px 0px;
+    padding: 10px 0;
   }
 
   .group-logs-expand-details {
@@ -131,7 +131,7 @@ table.group-members {
   th {
     border-bottom: 3px solid $primary-low;
     text-align: center;
-    padding: 5px 0px 5px 5px;
+    padding: 5px 0 5px 5px;
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
   }
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index 6ea6a1a8c9..138510f28b 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -1,6 +1,6 @@
 .groups-page {
   h1 {
-    margin: 20px 0px;
+    margin: 20px 0;
   }
 }
 
@@ -9,7 +9,7 @@
 
   th {
     border-bottom: 1px solid $primary-low;
-    padding: 5px 0px;
+    padding: 5px 0;
     text-align: left;
   }
 
@@ -22,7 +22,7 @@
     }
 
     td.groups-user-count {
-      font-size: 1.286em;
+      font-size: $font-up-2
     }
   }
 
@@ -38,7 +38,7 @@
     }
 
     .groups-info-title {
-      font-size: 0.857em;
+      font-size: $font-down-1;
       color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 79a23a404c..b28652565f 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -2,7 +2,7 @@
   width: 100%;
   position: absolute;
   top: 0;
-  z-index: 1001;
+  z-index: z("header");
   background-color: $header_background;
   box-shadow: 0 2px 4px -1px rgba(0,0,0, .25);
 
@@ -91,7 +91,7 @@
       background-color: $primary-low;
     }
   }
-  .drop-down-visible & {
+  .drop-down-mode & {
     .active .icon {
       position: relative;
       color: #7b7b7b;
@@ -101,16 +101,12 @@
       border-left: 1px solid $primary-low;
       border-right: 1px solid $primary-low;
 
-      .flagged-posts {
-        right: 24px;
-      }
-
       &:after {
         display: block;
         position: absolute;
         top: 100%;
         left: 0;
-        z-index: 1101;
+        z-index: z("header") + 1; // Higher than .menu-panel
         width: 100%;
         height: 0;
         content: "";
@@ -125,8 +121,8 @@
   .d-icon {
     width: 32px;
     height: 32px;
-    font-size: 1.714em;
-    line-height: 32px;
+    font-size: $font-up-4;
+    line-height: $line-height-large;
     display: inline-block;
   }
   .notifications {
@@ -135,7 +131,7 @@
   .ring {
     position: absolute;
     top: -9px;
-    z-index: 1;
+    z-index: z("base");
     margin-left: 0;
   }
   .header-dropdown-toggle {
@@ -143,14 +139,14 @@
   }
   .badge-notification {
     position: absolute;
-    z-index: 1;
+    z-index: z("base");
     left: 0;
-    top: -9px;
+    top: -4px;
     min-width: 6px;
   }
   .unread-notifications {
     left: auto;
-    right: 0;
+    right: -3px;
     background-color: dark-light-choose($tertiary-medium, $tertiary);
   }
   .unread-private-messages, .ring {
diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss
index 138784a737..07f659a6eb 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -15,6 +15,14 @@
     display: inline-block;
   }
 
+  .revision-content {
+    width: 47.5%;
+    float: left;
+    &:nth-of-type(2) {
+      margin-left: 5%;
+    }
+  }
+
   #revisions .row:first-of-type {
     margin-top: 10px;
   }
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index 2570034d60..b880a78bbe 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -43,7 +43,7 @@
     margin: 6px;
     padding-right: 20px;
     color: blend-primary-secondary(50%);
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   .expand {
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index d774ad0fed..1c471da2f8 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -1,6 +1,6 @@
 .caps-lock-warning {
   color: $danger;
-  font-size: 0.857em;
+  font-size: $font-down-1;
   font-weight: bold;
 }
 
@@ -28,7 +28,7 @@ $input-width: 220px;
   }
 
   .disclaimer {
-    font-size: 0.857em;
+    font-size: $font-down-1;
     color: dark-light-choose($primary-medium, $secondary-medium);
     clear: both;
   }
@@ -38,7 +38,7 @@ $input-width: 220px;
   }
 
   .user-field {
-    label {
+    > label {
       width: $label-width;
       float: left;
     }
@@ -58,9 +58,9 @@ $input-width: 220px;
       .instructions {
         color: dark-light-choose($primary-medium, $secondary-medium);
         margin: 0;
-        font-size: 0.857em;
+        font-size: $font-down-1;
         font-weight: normal;
-        line-height: 18px;
+        line-height: $line-height-medium;
       }
     }
     clear: both;
@@ -100,9 +100,9 @@ $input-width: 220px;
     .instructions {
       color: dark-light-choose($primary-medium, $secondary-medium);
       margin: 0;
-      font-size: 0.857em;
+      font-size: $font-down-1;
       font-weight: normal;
-      line-height: 18px;
+      line-height: $line-height-medium;
     }
   }
 }
diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss
index c1dfab230b..078a8cf37b 100644
--- a/app/assets/stylesheets/common/base/magnific-popup.scss
+++ b/app/assets/stylesheets/common/base/magnific-popup.scss
@@ -272,8 +272,7 @@ button {
 .mfp-close {
   width: 44px;
   height: 44px;
-  line-height: 44px;
-
+  line-height: $line-height-large;
   position: absolute;
   right: 0;
   top: 0;
@@ -286,7 +285,7 @@ button {
   padding: 0 0 18px 10px;
   color: $controls-color;
   font-style: normal;
-  font-size: 2em;
+  font-size: $font-up-5;
   font-family: Arial, Baskerville, monospace;
 
   &:hover,
@@ -324,8 +323,8 @@ button {
   top: 0;
   right: 0;
   color: $controls-text-color;
-  font-size: 0.857em;
-  line-height: 18px;
+  font-size: $font-down-1;
+  line-height: $line-height-medium;
 }
 
 // Navigation arrows
@@ -489,8 +488,8 @@ button {
     small {
       color: $caption-subtitle-color;
       display: block;
-      font-size: 0.857em;
-      line-height: 14px;
+      font-size: $font-down-1;
+      line-height: $line-height-medium;
     }
     figure {
       margin: 0;
@@ -506,7 +505,7 @@ button {
   }
   .mfp-title {
     text-align: left;
-    line-height: 18px;
+    line-height: $line-height-medium;
     color: $caption-title-color;
     word-wrap: break-word;
     padding-right: 36px; // leave some space for counter at right side
@@ -583,7 +582,7 @@ button {
           right: 0;
           width: 35px;
           height: 35px;
-          line-height: 35px;
+          line-height: $line-height-large;
           background: rgba(0, 0, 0, 0.6);
           position: fixed;
           text-align: center;
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 4c4fe1279b..e54693bbce 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -21,7 +21,7 @@
   border: 1px solid $primary-low;
   box-shadow: 0 2px 2px rgba(0,0,0, .25);
   background-color: $secondary;
-  z-index: 1100;
+  z-index: z("header");
   padding: 0.5em;
   width: 300px;
 
@@ -65,7 +65,7 @@
     }
 
     .new {
-      font-size: 0.857em;
+      font-size: $font-down-1;
       margin-left: 0.5em;
       color: dark-light-choose($primary-medium, $secondary-medium);
     }
@@ -90,7 +90,7 @@
   b.topics-count {
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
-    font-size: .786em;
+    font-size: $font-down-2;
   }
 
   span.badge-category {
@@ -123,7 +123,6 @@
     box-sizing: border-box;
     width: calc(100% - 6px);
     height: 32px;
-    padding: 5px;
   }
 
   .search-context {
@@ -156,7 +155,7 @@
 
   .search-link {
     .badge-category-parent {
-      line-height: 0.8em;
+      line-height: $line-height-small;
     }
     .topic-title {
       margin-right: 6px;
@@ -174,8 +173,8 @@
   }
 
   li:not(.category):not(.heading) {
-    font-size: 1em;
-    line-height: 16px;
+    font-size: $font-0;
+    line-height: $line-height-medium;
 
     .fa {
       font-size: inherit;
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 30d2fc27e0..c47c9d4c2d 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -1,16 +1,26 @@
 .modal-open {
   .dropdown-menu {
-     z-index: 2050;
+     z-index: z("modal","dropdown");
   }
   .popover {
-    z-index: 2060;
+    z-index: z("modal","popover");
   }
   .tooltip {
-    z-index: 2070;
+    z-index: z("modal","tooltip");
   }
 
 }
 
+.bootbox.modal {
+  position: fixed;
+  z-index: z("modal","content");
+  overflow: auto;
+  height: auto;
+  background-color: $secondary;
+  box-shadow: 0 2px 2px rgba(0,0,0, .25);
+  background-clip: padding-box;
+}
+
 .input-hint-text {
   margin-left: 0.5em;
   color: $secondary-high;
@@ -26,7 +36,7 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1040;
+  z-index: z("modal","overlay");
   background-color: #111;
   &.fade {
     opacity: 0;
@@ -98,15 +108,18 @@
   top: 0;
   width: 100%;
   height: 100%;
-  z-index: 1050;
+  z-index: z("modal","content");
   overflow: auto;
 }
 .modal-form {
   margin-bottom: 0;
 }
 .modal-footer {
-  padding: 14px 15px 15px;
+  padding: 14px 15px 10px;
   border-top: 1px solid $primary-low;
+  .btn {
+  margin: 0 5px 5px 0;
+  }
 }
 .modal-footer:before,
 .modal-footer:after {
@@ -130,7 +143,7 @@
     padding: 10px 30px 10px 15px;
     background-color: $secondary;
     li > a {
-      font-size: 1em;
+      font-size: $font-0;
     }
     border-bottom: 1px solid $primary-low;
 
@@ -141,6 +154,8 @@
   }
 
   .modal-body {
+    box-sizing: border-box;
+    width: 100%;
     &.full-height-modal {
       max-height: calc(100vh - 150px);
     }
@@ -153,7 +168,7 @@
     }
     p {
       color: darken($primary, 40%);
-      font-size: 1em;
+      font-size: $font-0;
     }
     .archetype-option {
       margin-bottom: 20px;
@@ -169,7 +184,7 @@
         position: relative;
       }
       .jsfu-shade {
-        z-index: 1;
+        z-index: z("base");
         position: absolute;
         top: 0;
         left: 0;
@@ -180,9 +195,9 @@
           color: rgb(255,255,255);
           position: absolute;
           top: 40%;
-          font-size: 2.571em;
+          font-size: $font-up-6;
           text-align: center;
-          line-height: 38px;
+          line-height: $line-height-medium;
           margin-left: auto;
           margin-right: auto;
           left: 0;
@@ -225,7 +240,7 @@
 
   // password reset modal
   .modal-body.forgot-password-modal p {
-    font-size: 1em;
+    font-size: $font-0;
   }
 }
 
@@ -239,15 +254,15 @@
     }
     .btn {
       text-align: left;
-      font-size: 1.286em;
-      line-height: 20px;
+      font-size: $font-up-2;
+      line-height: $line-height-medium;
       width: auto;
       margin-bottom: 10px;
       display: block;
       margin-left: 0 !important; // override needed
       font-weight: bold;
       .topic-title {
-        font-size: 1em;
+        font-size: $font-0;
         font-weight: normal;
       }
       &.btn-reply-here {
@@ -259,7 +274,7 @@
   }
 }
 .d-modal-cancel {
-  margin-left: 5px;
+  margin-left: 1em;
   color: $primary-medium;
 }
 
@@ -268,8 +283,8 @@
     .btn {
       font-weight: normal;
       text-align: left;
-      font-size: 1em;
-      line-height: 20px;
+      font-size: $font-0;
+      line-height: $line-height-large;
       margin-bottom: 10px;
       display: inline-block;
       margin-left: 0;
@@ -379,7 +394,7 @@
     textarea {
       font-family: monospace;
       resize: none;
-      border-radius: 0px;
+      border-radius: 0;
       box-shadow: none;
     }
     .incoming-email-html-part {
diff --git a/app/assets/stylesheets/common/base/not-found.scss b/app/assets/stylesheets/common/base/not-found.scss
index 2229548007..4f58cc362b 100644
--- a/app/assets/stylesheets/common/base/not-found.scss
+++ b/app/assets/stylesheets/common/base/not-found.scss
@@ -1,8 +1,8 @@
 // Page not found styles 
 
 h1.page-not-found {
-  font-size: 2.286em;
-  line-height: 1.25;
+  font-size: $font-up-5;
+  line-height: $line-height-medium;
 }
 
 .page-not-found {
@@ -43,7 +43,7 @@ h1.page-not-found {
       display: none;
     }
   }
-  .badge-wrapper {
+  a:not(.badge-wrapper) {
     flex-basis: 100%;
   }
 }
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 8251835934..61d92687fe 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -15,7 +15,7 @@ a.loading-onebox {
 
   margin-top: 15px;
   padding: 12px;
-  font-size: 1em;
+  font-size: $font-0;
   > .source {
     margin-bottom: 12px;
     margin-right: 10px;
@@ -30,7 +30,7 @@ a.loading-onebox {
         padding-right: 10px;
       }
       position: absolute;
-      font-size: 1em;
+      font-size: $font-0;
       img.favicon {
         margin-right: 3px;
       }
@@ -90,9 +90,9 @@ a.loading-onebox {
 
 aside.onebox {
   border: 5px solid $primary-low;
-
+  margin-bottom: 1em;
   padding: 12px 25px 12px 12px;
-  font-size: 1em;
+  font-size: $font-0;
 
   header {
     margin-bottom: 8px;
@@ -118,7 +118,7 @@ aside.onebox {
     clear: both;
 
     h3, h4 {
-      font-size: 1.143em;
+      font-size: $font-up-1;
       margin: 0 0 10px 0;
     }
 
@@ -212,6 +212,16 @@ aside.onebox {
       }
     }
 
+    &.user-onebox {
+      .fa {
+        margin-right: 5px;
+      }
+      .full-name,
+      .location {
+        margin-right: 10px;
+      }
+    }
+
   }
 }
 
@@ -270,16 +280,16 @@ pre.onebox code ol.lines li:before {
   color:#AFAFAF;
   text-align:right;
   padding-right:5px;
-  font-size:.857em;
-  line-height: 1.9em;
+  font-size: $font-down-1;
+  line-height: $line-height-large;
   content: counter(li-counter);
   counter-increment: li-counter;
 }
 
 
 pre.onebox code ol{
-	margin-left:0px;
-	line-height:1.5em;
+	margin-left:0;
+	line-height: $line-height-large;
 }
 pre.onebox code {
   background-color: dark-light-choose(#fff, #000);
@@ -296,7 +306,7 @@ pre.onebox code ol.lines{
 pre.onebox code ol.lines li {
 	list-style-type: none;
 	padding-left: 5px;
-	margin-left: 0px;
+	margin-left: 0;
 	border-left: 1px solid #CFCFCF;
 	min-height: 1.5em; //show empty li lines
   white-space: pre;
@@ -314,7 +324,7 @@ pre.onebox code {
 .onebox-body .github-commit-status {
   background: #F5F5F5;
   border-radius: 5px;
-  margin:0px 0px 5px 100px;
+  margin:0 0 5px 100px;
   padding: 10px;
 }
 
@@ -331,7 +341,7 @@ pre.onebox code {
 .onebox-body .build_status
 {
   padding: 2px;
-  font-size:.857em;
+  font-size: $font-down-1;
 }
 
 .onebox-body .status_tag.open {
@@ -376,14 +386,14 @@ aside.onebox.twitterstatus .onebox-body {
 .onebox.imgur-album {
   .outer-box {
     position: absolute;
-    z-index: 935;
-    height: 30px;
+    z-index: z("base");
     overflow: hidden;
-    font-size: .857em;
+    font-size: $font-down-1;
     color: #fff;
     background-color: rgba(0, 0, 0, 0.6);
     text-overflow: ellipsis;
     max-width: 100%;
+    padding: 5px 0;
 
     .inner-box {
       padding-left: 10px;
@@ -395,8 +405,8 @@ aside.onebox.twitterstatus .onebox-body {
 
       .album-title {
         width: 100%;
-        font-size: 1.143em;
-        line-height: 30px;
+        font-size: $font-up-1;
+        line-height: $line-height-large;
         color: #ccc;
         text-decoration: none;
       }
diff --git a/app/assets/stylesheets/common/base/request_access.scss b/app/assets/stylesheets/common/base/request_access.scss
index 77fd99202a..069511ce00 100644
--- a/app/assets/stylesheets/common/base/request_access.scss
+++ b/app/assets/stylesheets/common/base/request_access.scss
@@ -4,10 +4,10 @@
   input[type=text] {
     width: 320px;
     height: 30px;
-    font-size: 1.429em;
+    font-size: $font-up-3;
   }
   input[type=submit] {
-    font-size: 1.429em;
+    font-size: $font-up-3;
     padding: 10px;
   }
 }
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index ad7e5c4af7..298f458f3e 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -2,9 +2,9 @@
 // *** These styles are all going to be flipped by the r2 gem ***
 // Adding the !important declaration to a rule prevents it from being flipped.
 
-// Keep the topic admin menu on the page
-.rtl .popup-menu {
-  right: 0 !important;
+.rtl #topic-progress-wrapper .topic-admin-popup-menu.right-side,
+.rtl #topic-progress-wrapper.docked .topic-admin-popup-menu.right-side {
+  right: 80px;
 }
 
 // This is used to flip the .d-icon-caret-right
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index e4a18b18ae..cf5b0e4b9a 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -11,7 +11,7 @@
 
   .like-count {
     color: dark-light-choose($primary-medium, $secondary-medium);
-    .fa { color: $love; font-size: .857em; }
+    .fa { color: $love; font-size: $font-down-1; }
   }
 
   .badge-wrapper span.badge-category {
@@ -36,20 +36,20 @@
   }
   .search-link {
     .topic-statuses, .topic-title {
-      font-size: 1.286em;
-      line-height: 25px;
+      font-size: $font-up-2;
+      line-height: $line-height-large;
     }
 
     .topic-statuses {
       float: none;
       display: inline-block;
       color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 1.0em;
+      font-size: $font-0;
     }
   }
   .blurb {
-    font-size: 1.0em;
-    line-height: 20px;
+    font-size: $font-0;
+    line-height: $line-height-large;
     word-wrap: break-word;
     max-width: 640px;
     color: dark-light-choose($primary-medium, $secondary-medium);
@@ -63,7 +63,7 @@
   }
 
   .discourse-tag {
-    font-size: 0.857em;
+    font-size: $font-down-1;
   }
 }
 
@@ -80,17 +80,21 @@
   }
   a {
     margin-right: 15px;
-    font-size: .857em;
+    font-size: $font-down-1;
     padding: 2px 5px;
   }
 }
 
 .search.row {
   margin-bottom: 15px;
+  .input-xxlarge {
+    width: 100%;
+  }
 
   .search-bar {
     display: flex; 
     margin-bottom: 10px;
+    max-width: 780px;
     input {
       height: 22px;
       padding-left: 6px;
@@ -103,30 +107,6 @@
   }
 }
 
-.search-advanced {
-  margin-bottom: 15px;
-
-  .search-advanced-btn {
-    padding: 8px 10px;
-    width: 100%;
-    text-align: left;
-    font-weight: bold;
-  }
-
-  .search-advanced-options {
-    border: 1px solid $primary-low;
-    padding: 10px;
-
-    .control-group.pull-left {
-      width: 50%;
-    }
-
-    input[type="checkbox"] {
-      height: auto;
-    }
-  }
-}
-
 .no-results-suggestion {
   margin-top: 30px;
 }
@@ -139,26 +119,28 @@
 }
 
 .search-title {
-
-  .term {
-    font-weight: bold;
-  }
-
   position: relative;
-  .result-count {
-    float: left;
-    span {
-      line-height: 28px;
-      height: 28px;
-      display: inline-block;
-    }
-    margin-bottom: 4px;
-  }
   margin: 10px 0 15px;
   max-width: 780px;
   border-bottom: 3px solid $primary-low; 
   width: 100%;
+  .term {
+    font-weight: bold;
+  }
+
+  .result-count {
+    float: left;
+    margin-bottom: 4px;    
+    span {
+      line-height: $line-height-large;
+      height: 28px;
+      display: inline-block;
+    }
+  }
+
   .sort-by {
+    float: right;
+    margin-bottom: 4px;
     .desc {
       margin-right: 5px;
     }
@@ -167,11 +149,61 @@
       width: auto;
       min-width: 150px;
     }
-    float: right;
-    margin-bottom: 4px;
   }
 }
 
 .google-search-form {
   margin-top: 2em;
 }
+
+.search-advanced {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 20px;
+  max-width: 780px;
+  .search-advanced-options {
+    border: 1px solid $primary-low;
+    padding: 0 20px;    
+    width: 100%;
+    .date-picker-wrapper {
+      vertical-align: top;
+    }
+    @media screen and (max-width: 715px) {
+      padding: 0 10px;
+      #postTime {
+        margin: 0 0 5px 0;
+      }
+    }
+  }
+
+  .search-advanced-btn {
+    flex: 1 1 100%;
+    width: 100%;
+    text-align: left;
+    font-weight: bold;
+  }
+
+  .container {
+    display: flex;
+    flex: 1 1 100%;
+    padding: 15px 0 10px 0;
+    .all-tags {
+      margin-bottom: 0;
+    }
+    @media screen and (max-width: 600px) {
+      flex-wrap: wrap;
+    }
+    &:not(:first-of-type) {
+      border-top: 1px solid $primary-low;
+    }
+    .control-group {
+      flex: 1 1 100%;
+      @media screen and (max-width: 600px) {
+        margin: 0;
+        &:nth-of-type(2) {
+          margin-top: 5px;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index b9c3694119..8a5f9145ca 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -3,7 +3,7 @@
 #share-link {
   position: absolute;
   left: 20px;
-  z-index: 1200;
+  z-index: z("dropdown");
   box-shadow: 0 1px 5px rgba(0,0,0, .4);
   background-color: $secondary;
   padding: 6px 10px 10px 10px;
@@ -22,7 +22,7 @@
     margin: 14px 0;
   }
   h3 {
-    font-size: 1em;
+    font-size: $font-0;
   }
   .copy-text {
     display: inline-block;
@@ -31,7 +31,7 @@
     color: $success;
     opacity: 1;
     transition: opacity 0.25s;
-    font-size: 1em;
+    font-size: $font-0;
     &:not(.success) {
       opacity: 0;
     }
@@ -40,12 +40,13 @@
     margin-left: 2px;
     margin-right: 8px;
     float: left;
-    font-size: 1.857em;
+    font-size: $font-up-4;
   }
   .reply-as-new-topic {
     float: left;
-    line-height: 22px;
+    line-height: $line-height-large;
     margin-left: 8px;
+    margin-top: .5em;
     .fa {
       margin-right: 5px;
     }
@@ -53,7 +54,7 @@
   .link {
     margin-right: 2px;
     float: right;
-    font-size: 1.429em;
+    font-size: $font-up-3;
     a {
       color: dark-light-choose($primary-medium, $secondary-medium);
     }
@@ -71,7 +72,7 @@
   }
 
   input[type=text] {
-    font-size: 1.143em;
+    font-size: $font-up-1;
     margin-bottom: 10px;
   }
 }
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 46a363c53a..d87997dc27 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -17,13 +17,16 @@
   width: 300px;
   margin-bottom: 1em;
   float: left;
+  vertical-align: middle;
 
   .discourse-tag {
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   .tag-count {
-    font-size: 0.857em;
+    font-size: $font-down-1;
+    vertical-align: middle;   
+    line-height: $line-height-small; 
   }
 }
 
@@ -34,33 +37,21 @@
 
 .bullet + .topic-header-extra {
   display: block;
-  line-height: 15px;
-  font-size: .857em;
-  .list-tags { font-size: 1em; }
-}
-
-.bar + .topic-header-extra {
-  line-height: 1.25;
 }
 
 .box + .topic-header-extra {
   display: inline-block;
-  margin: 0 0 0 5px;
-  padding-top: 5px;
 }
 
 .topic-category {
   margin-top: 5px;
 
   .topic-header-extra {
-    display: inline;
+    display: inline-block;
     vertical-align: baseline;
-    margin: 0;
   }
 
   .badge-wrapper {
-    display: inline-block;
-    vertical-align: baseline;
     margin-top: 0;
 
     &.bullet .badge-category {
@@ -70,7 +61,7 @@
     &.box, &.bullet {
       vertical-align: middle;
     }
-
+    
     &.box + .topic-header-extra,
     &.bullet + .topic-header-extra,
     &.bar + .topic-header-extra {
@@ -86,18 +77,27 @@
 $tag-color: $primary-medium;
 
 .discourse-tag-count {
-  font-size: 0.857em;
+  font-size: $font-down-1;
   color: $tag-color;
+  line-height: $line-height-small;
+  vertical-align: middle;  
 }
 
 .select2-result-label .discourse-tag {
   margin-right: 0;
 }
 
+.discourse-tag {
+  max-width: 14em; 
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  vertical-align: middle;
+}
 
 .discourse-tag {
-  padding: 0;
-  margin: 0 5px 0 0;
+  margin: 0;
   color: $tag-color;
 
   &:visited, &:hover {
@@ -119,7 +119,7 @@ $tag-color: $primary-medium;
   }
 
   &.simple, &.simple:visited, &.simple:hover {
-    margin-right: 0px;
+    margin-right: 0;
     color: $primary-high;
   }
 }
@@ -132,18 +132,26 @@ $tag-color: $primary-medium;
 }
 
 .d-header .topic-header-extra {
-  display: inline-block;
-  .discourse-tags { display: inline-block; }
+  .discourse-tags { 
+    display: inline-block; 
+    font-size: $font-down-1;        
+  }
   .topic-featured-link { margin-left: 8px; }
 }
 
 .select2-container-multi .select2-choices .select2-search-choice.discourse-tag-select2 {
-  padding-top: 5px;
   -webkit-box-shadow: none;
   box-shadow: none;
   border: 0;
   border-radius: 0;
   background-color: transparent;
+  .discourse-tag {
+    padding: 4px;
+    &.box {
+      padding: 1px 8px;
+      margin: 3px 5px;
+    }
+  }
 }
 
 
@@ -153,10 +161,9 @@ $tag-color: $primary-medium;
 
 .topic-list-item .discourse-tags {
   display: block;
-  font-size: 0.786em;
+  font-size: $font-down-2;
   font-weight: normal;
   clear: both;
-  margin-top: 5px;
 
   .discourse-tag.box {
     position:relative;
@@ -170,7 +177,7 @@ $tag-color: $primary-medium;
 
 .mobile-view .topic-list-item .discourse-tags {
   display: inline-block;
-  font-size: 0.857em;
+  font-size: $font-down-1;
   margin-top: 0;
   .discourse-tag.box {
     position:relative;
@@ -179,23 +186,23 @@ $tag-color: $primary-medium;
 }
 
 
-
-.discourse-tag.bullet:before {
-  content: "\f04d";
-  font-family: FontAwesome;
-  color: $primary-low-mid;
-  margin-right: 5px;
-  font-size: 0.786em;
-  position:relative;
-  top: -0.1em;
+.discourse-tag.bullet {
+  margin-right: .25em;
+  &:before {
+    content: "\f04d";
+    font-family: FontAwesome;
+    color: $primary-low-mid;
+    margin-right: 5px;
+    font-size: $font-down-2;
+    position:relative;
+  }
 }
 
 header .discourse-tag {color: $tag-color }
 
 .list-tags {
   margin-right: 3px;
-  display: inline;
-  font-size: 0.857em;
+  font-size: $font-down-1;
 }
 
 .tag-chooser {
@@ -204,6 +211,7 @@ header .discourse-tag {color: $tag-color }
   margin: 5px 0;
   ul.select2-choices {
     max-height: 30px;
+    padding-left: 10px;    
     overflow-y: auto;
   }
 }
@@ -260,7 +268,7 @@ header .discourse-tag {color: $tag-color }
       margin-bottom: 20px;
     }
     label {
-      font-size: 1em;
+      font-size: $font-0;
       display: inline-block;
       margin-right: 10px;
     }
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index 7816086dc9..56f5ba16e6 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -4,7 +4,7 @@
   position: fixed;
   top: 120px;
   right: 10px;
-  z-index: 999;
+  z-index: z("dropdown");
   height: 35px;
 }
 
@@ -13,7 +13,7 @@
   width: 205px;
   padding: 10px;
   border: 1px solid $primary-low; 
-  z-index: 999;
+  z-index: z("dropdown");
 
   ul {
     list-style: none;
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 9197ebfa73..b10b4d1833 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -22,7 +22,7 @@
  }
 
  span {
-   font-size: 0.929em;
+   font-size: $font-0;
    margin-right: 8px;
    display: inline-block;
    max-width: 280px;
@@ -34,7 +34,7 @@
    }
  }
  .fa {
-   font-size: .786em;
+   font-size: $font-down-1;
    margin-left: 3px;
    color: dark-light-choose($primary-medium, $secondary-medium);
  }
@@ -46,14 +46,46 @@
 // global styles for the cooked HTML content in posts (and preview)
 .cooked, .d-editor-preview {
   word-wrap: break-word;
-  h1, h2, h3, h4, h5, h6 { 
-    margin: 30px 0 10px; 
-    line-height: 1.25; 
+  line-height: $line-height-large;
+  h1, h2, h3, h4, h5, h6 {
+    margin: 30px 0 10px;
+    line-height: $line-height-medium;
   }
-  
+
+  h1 {
+    font-size: $font-up-4;
+  }
+
+  h2 {
+    font-size: $font-up-3;
+  }
+
+  h3 {
+    font-size: $font-up-2;
+  }
+
+  h4 {
+    font-size: $font-up-1;
+  }
+
+  h5 {
+    font-size: $font-0;
+  }
+
+  h6 {
+    font-size: $font-down-1;
+  }
+
   a { word-wrap: break-word; }
   ins { background-color: dark-light-choose($success-low, scale-color($success, $lightness: -60%)); }
   del { background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%)); }
+  // Prevents users from breaking posts with tag nesting
+  big { font-size: 2rem; }
+  small { font-size: 0.75rem; }
+  small small { font-size: .75em; }
+  big big { font-size: 1em; } 
+  sub sub sub {bottom: 0;}
+  sup sup sup {top: 0;}
 }
 
 .cooked, .d-editor-preview {
@@ -149,7 +181,7 @@ aside.quote {
   background-color: blend-primary-secondary(50%);
   color: dark-light-choose($secondary, $primary);
   padding: 10px;
-  z-index: 401;
+  z-index: z("dropdown");
   opacity: 0.9;
 
   .d-icon {
@@ -166,6 +198,33 @@ aside.quote {
   position: relative;
 }
 
+.topic-map {
+
+  .avatars {
+    > div {
+      float: left;
+      position: relative;
+      margin: 3px 0;
+    }
+    .post-count {
+      position: absolute;
+      right: 0;
+      border-radius: 100px;
+      padding: 3px 5px;
+      text-align: center;
+      font-weight: normal;
+      font-size: $font-down-2;
+      line-height: $line-height-small;
+    }
+  }
+
+  .avatar {
+    float: left;
+    margin-right: 4px;
+  }
+
+}
+
 .topic-avatar, .avatar-flair-preview, .user-card-avatar, .topic-map .poster {
   .avatar-flair {
     display: flex;
@@ -204,7 +263,7 @@ aside.quote {
     right: -4px;
   }
   .fa {
-    font-size: 1.714em;
+    font-size: $font-up-4;
   }
 }
 .topic-map .poster .avatar-flair {
@@ -222,13 +281,26 @@ aside.quote {
     right: 0;
   }
   .fa {
-    font-size: 1em;
+    font-size: $font-0;
   }
 }
 .topic-avatar .poster-avatar-extra {
   display: none;
 }
 
+.map {
+  &:first-of-type {
+    display: flex;
+    .buttons {
+      margin-left: auto;
+      order: 15;
+      .btn {
+        height: 100%;
+      }
+    }
+  }
+}
+
 .topic-body {
   // this is necessary for ANYTHING that extends past the right edge of
   // the post body, such as an image in a deeply nested list, image in
@@ -248,10 +320,14 @@ aside.quote {
 }
 
 .post-info {
+
   &.via-email, &.whisper {
+    line-height: $line-height-medium;
+  }
+  &.via-email, &.whisper, &.post-locked {
     margin-right: 5px;
     .d-icon {
-      font-size: 1em;
+      font-size: $font-0;
     }
   }
 
@@ -287,8 +363,8 @@ kbd
   box-shadow: 0 1px 0 rgba(0,0,0, .8);
   color: $primary;
   display: inline-block;
-  font-size: 0.857em;
-  line-height: 1.4;
+  font-size: $font-down-1;
+  line-height: $line-height-large;
   margin: 0 .1em;
   padding: .1em .6em;
 
@@ -314,7 +390,7 @@ blockquote > *:last-child {
   cursor: pointer;
   text-transform: uppercase;
   font-weight: bold;
-  font-size: 0.9em;
+  font-size: $font-down-1;
 }
 
 .who-liked {
@@ -347,11 +423,11 @@ blockquote > *:last-child {
   max-width: 755px;
   border-top: 1px solid $primary-low;
   .topic-avatar {
-    padding: 5px 0 3px;
+    padding: .67em 0;
     border-top: none;
     float: left;
     i {
-      font-size: 2.500em;
+      font-size: 2em;
       width: 45px;
       text-align: center;
       color: dark-light-choose($primary-low-mid, $secondary-high);
@@ -367,20 +443,20 @@ blockquote > *:last-child {
   }
 
   .small-action-desc {
-    padding: 0.25em 0 0.5em 4.3em;
-    margin-top: 6px;
+    padding: 1em;
     text-transform: uppercase;
     font-weight: bold;
-    font-size: 0.857em;
+    font-size: $font-down-1;
     color: dark-light-choose($primary-low-mid, $secondary-high);
 
     .custom-message {
       text-transform: none;
-      margin: 15px 0px 5px;
+      margin: 15px 0 5px;
       font-weight: normal;
-      font-size: 1.143em;
+      font-size: $font-up-1;
       p {
         margin: 5px 0;
+        line-height: $line-height-large;
       }
     }
 
@@ -399,6 +475,7 @@ blockquote > *:last-child {
     background: transparent;
     border: 0;
     float: right;
+    margin-top: -2px;
   }
 
   clear: both;
@@ -449,8 +526,8 @@ a.mention, a.mention-group {
     > i.fa {
       color: dark-light-choose($primary-medium, $secondary-medium);
       margin-right: 6px;
-      font-size: $base-font-size;
-      line-height: $base-line-height;
+      font-size: $font-0;
+      line-height: $line-height-large;
     }
 
     > span.url {
@@ -464,9 +541,9 @@ a.mention, a.mention-group {
     > span.help {
       display: inline-block;
       color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 0.857em;
+      font-size: $font-down-1;
       font-style: italic;
-      line-height: $base-line-height;
+      line-height: $line-height-large;
       margin-bottom: 1px;
     }
 
@@ -479,7 +556,7 @@ a.mention, a.mention-group {
 .broken-image, .large-image {
   color: dark-light-choose($primary-low-mid, $secondary-high);
   border: 1px solid $primary-low;
-  font-size: 2.286em;
+  font-size: $font-up-5;
   padding: 16px;
 }
 
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 9efde29e8d..f23249d122 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -9,8 +9,8 @@
 .progress-back-container {
   position: fixed;
   bottom: 40px;
-  z-index: 950;
-  margin-right: 0px;
+  z-index: z("dropdown");
+  margin-right: 0;
   animation-duration: 0.5s;
   animation-name: button-jump-up;
   width: 145px;
@@ -120,9 +120,6 @@
 .extra-info-wrapper {
   .badge-wrapper {
     float: left;
-    &.bullet {
-      margin-top: 5px;
-    }
   }
 
 }
@@ -147,7 +144,7 @@
 #suggested-topics h3 .badge-wrapper.bullet span.badge-category {
   // Override vertical-align: text-top from `badges.css.scss`
   vertical-align: baseline;
-  line-height: 1.2;
+  line-height: $line-height-medium;
 }
 
 #suggested-topics h3 .badge-wrapper.bullet,
@@ -166,7 +163,7 @@
   .notifications-button {
     display: inline-block;
     float: none;
-    line-height: 2em;
+    line-height: $line-height-large;
     .dropdown-toggle {
       float: none;
     }
@@ -210,7 +207,7 @@
       }
       i {
         float: left;
-        font-size: 0.857em;
+        font-size: $font-down-2;
         margin: 0.3em 0.5em 0 0;
       }
     }
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 7deaf44cff..bc426d3e0a 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -3,7 +3,7 @@
   padding: 3px 8px;
   color: $primary;
   border: 1px solid $primary-low;
-  line-height: 19px;
+  line-height: $line-height-large;
   display: inline-block;
   background-color: $secondary;
   margin: 0 0 3px;
@@ -68,7 +68,7 @@
 
 .show-badge .badge-user-info {
   .earned {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     margin-bottom: 1em;
   }
 }
@@ -79,7 +79,7 @@
   .load-more {
     padding-top: 30px;
     display: block;
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 }
 
@@ -94,11 +94,11 @@
   }
   .date {
     display: inline-block;
-    font-size: 1.143em;
+    font-size: $font-up-1;
     margin-left: 10px;
   }
   .post-link {
-    font-size: 1.286em;
+    font-size: $font-up-2;
     width: 500px;
     margin: 0;
     padding: 0;
@@ -138,7 +138,7 @@
     top: 5px;
     font-weight: bold;
     color: $primary-medium;
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 
   .badge-contents {
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 1d4373cc96..5efd7ed9ca 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -60,13 +60,13 @@
       }
 
       h1 {
-        font-size: 2.286em;
+        font-size: $font-up-5;
         font-weight: normal;
         i {font-size: .8em;}
       }
 
       h2 {
-        font-size: 1.286em;
+        font-size: $font-up-2;
         font-weight: normal;
         margin-top: 10px;
         max-width: 100%;
@@ -77,7 +77,7 @@
 
       h3 {
         font-weight: normal;
-        font-size: 1em;
+        font-size: $font-0;
         margin: 5px 0;
 
         .d-icon:not(:first-of-type) {
@@ -163,11 +163,11 @@
           }
 
           h1 {
-            font-size: 1.429em;
+            font-size: $font-up-3;
           }
 
           h2 {
-            font-size: 1.143em;
+            font-size: $font-up-1;
             margin-top: 4px;
           }
 
@@ -212,7 +212,7 @@
     width: 30px;
     text-align: center;
     vertical-align: middle;
-    line-height: 30px;
+    line-height: $line-height-large;
   }
 
   .helpful-flags {
@@ -255,8 +255,8 @@
       color: dark-light-choose($primary-medium, $secondary-medium);
         margin-top: 5px;
         margin-bottom: 10px;
-        font-size: .857em;
-        line-height: 1.4em;
+        font-size: $font-down-1;
+        line-height: $line-height-large;
       }
     }
   }
@@ -267,7 +267,7 @@
     text-align: top;
     color: $danger;
     font-weight: bold;
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 }
 
@@ -306,7 +306,7 @@
 
   h2 {
     a {
-      font-size: 1em;
+      font-size: $font-0;
       color: scale-color($tertiary, $lightness: -10%);
       cursor: pointer;
     }
@@ -348,7 +348,7 @@
 }
 
 .user-nav {
-  margin: 5px 0px;
+  margin: 5px 0;
   padding-top: 10px;
 
   li a {
@@ -402,7 +402,7 @@
 
   .value {
     font-weight: bold;
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 
   .label {
@@ -449,7 +449,7 @@
 
 .links-section {
   .domain {
-    font-size: 0.786em;
+    font-size: $font-down-1;
     color: dark-light-choose($primary-medium, $secondary-high);
   }
 }
@@ -479,8 +479,8 @@
   .instructions {
     color: dark-light-choose($primary-medium, $secondary-medium);
     margin-bottom: 10px;
-    font-size: .857em;
-    line-height: 1.4em;
+    font-size: $font-down-1;
+    line-height: $line-height-large;
 
     a[href] {
       color: $tertiary;
diff --git a/app/assets/stylesheets/common/base/username_tagsinput.scss b/app/assets/stylesheets/common/base/username_tagsinput.scss
index 66e5b32ea1..41fd3fa5d0 100644
--- a/app/assets/stylesheets/common/base/username_tagsinput.scss
+++ b/app/assets/stylesheets/common/base/username_tagsinput.scss
@@ -20,20 +20,20 @@ div.tagsinput span.tag {
   margin-right: 5px;
   margin-bottom:5px;
   font-family: helvetica;
-  font-size: .929em;
+  font-size: $font-down-1;
 }
 
-div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: .786em;  }
+div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: $font-down-2; }
 div.tagsinput input {
   width:80px;
   font-family: helvetica;
-  font-size: 0.929em;
+  font-size: $font-down-1;
   border:1px solid transparent;
   padding:2px 5px;
   background: transparent;
   color: #000;
-  outline:0px;
-  margin: 0px 5px 5px 0px;
+  outline:0;
+  margin: 0 5px 5px 0;
 }
 div.tagsinput div { display:block; float: left; }
 .tags_clear { clear: both; width: 100%; height: 0; }
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index b988ed4094..940351824e 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -16,25 +16,31 @@
 // --------------------------------------------------
 
 .badge-wrapper {
-  font-size: 0.857em;
+  font-size: $font-down-1;
   font-weight: bold;
   white-space: nowrap;
-  display: inline-block;
   position: relative;
+  display: inline-flex;
+  align-items: center;
+
+  .badge-category {
+    .d-icon {
+      margin-right: 3px;
+    }
+  }
 
   &.bar { //bar category style
-    line-height: 1.25;
+    line-height: $line-height-medium;
     margin-right: 5px;
-    display: inline-flex;
 
     span.badge-category {
       color: $primary;
       padding: 3px;
-      vertical-align: text-top;
-      margin-top: -2px; //vertical alignment fix
-      display: inline-block;
       overflow: hidden;
       text-overflow: ellipsis;
+      display: inline-flex;
+      align-items: center;
+      justify-content: space-between;
 
       .extra-info-wrapper & {
         color: $header-primary;
@@ -58,16 +64,18 @@
 
   &.bullet { //bullet category style
     display: inline-flex;
-    align-items: baseline;
-    margin-right: 5px;
-    font-size: .857em;
-    line-height: 15px;
+    align-items: center;
+    margin-right: 12px;
+
+    .extra-info-wrapper & {
+      margin-top: .25em;
+    }
 
     span.badge-category {
       color: $primary;
-      display: inline-block;
       overflow: hidden;
       text-overflow: ellipsis;
+      line-height: $line-height-medium;
 
       #search-dropdown & {
         margin-top: -2px;
@@ -83,7 +91,7 @@
     height: 10px;
     margin-right: 5px;
     display: inline-block;
-    line-height: 1;
+    line-height: $line-height-small;
 
     &:before {
       content: "\a0";
@@ -103,19 +111,19 @@
 
 
   &.box {  //box category style (apply custom widths to the wrapper, not the children)
-    line-height: 1.5;
-    margin-top: 5px;
+    line-height: $line-height-large;
     margin-right: 5px;
 
     span {
-      display: block;
       overflow: hidden;
       text-overflow: ellipsis;
 
       &.badge-category-bg, &.badge-category-parent-bg {
         position: absolute;
-        width: 100%;
-        height: 100%;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
       }
 
       &.badge-category-parent-bg { //subcategory style
@@ -132,16 +140,12 @@
       &.badge-category {
         position: relative;
         padding: 0 5px;
-        margin-top: 2px;
+        margin: 2px 0;
       }
     }
   }
 }
 
-.extra-info-wrapper .title-wrapper .badge-wrapper.bar {
-  margin-top: 6px;
-}
-
 .autocomplete, td.category {
   .badge-wrapper {
     max-width: 230px;
@@ -154,105 +158,25 @@
 
 .list-controls {
   .category-breadcrumb {
-    a.badge-category, .dropdown-header {
+    a.badge-category {
       display: inline-block;
-      padding: 5px 8px;
-      line-height: 20px;
-
-      &.category-dropdown-button {
-        margin-left: -4px;
-        padding: 5px;
-        width: 13px;
-
-        .d-icon-caret-right {
-          margin-left: 2px;
-        }
-      }
-    }
-
-    li.bar>.dropdown-header:not(.home):first-child {
-      border-left: 5px solid;
-      font-size: 1em;
-    }
-
-    li.bar>.dropdown-header {
-      background: $primary-low;
-      color: $primary;
-    }
-
-    li.bullet>.dropdown-header {
-      background: $primary-low;
-      color: $primary;
-
-      .badge-category-bg {
-        width: 10px;
-        height: 10px;
-        display: inline-block;
-        margin: 0 2px;
-      }
+      padding: 6px 8px;
+      line-height: $line-height-medium;
     }
   }
-
-  .category-dropdown-menu {
-    .dropdown-header {
-      &.home {
-        margin-left: 4px;
-        padding-left: 0;
-      }
-    }
-    .cat {
-        line-height: 1;
-      }
-    .badge-wrapper {
-      box-sizing: border-box;
-
-      &.bar {
-        padding: 5px 0;
-        width: 100%;
-        .badge-category {
-          max-width: 100px;
-        }
-      }
-      &.none {
-        padding: 5px;
-      }
-      &.bullet {
-        padding: 5px;
-        width: 100%;
-        .badge-category {
-          max-width: 100px;
-        }
-      }
-      &.box {
-        margin-top: 0;
-        width: 100%;
-        line-height: 1;
-        vertical-align: text-top;
-        span.badge-category {
-          max-width: 100px;
-          padding: 5px;
-        }
-      }
-
-    }
-
-  }
-
 }
 
-
-
-
 // Notification badge
 // --------------------------------------------------
 
 .badge-notification {
   @extend %badge;
-  padding: 4px 5px 2px 5px;
+  padding: 3px 5px;
+  min-width: 8px;
   vertical-align: middle;
   color: $secondary;
-  font-size: .786em;
-  line-height: 1;
+  font-size: $font-down-2;
+  line-height: $line-height-small;
   text-align: center;
   background-color: dark-light-choose($primary-low-mid, $secondary-low);
   &[href] {
@@ -275,7 +199,7 @@
     background-color: transparent;
     color: $tertiary-high;
     font-weight: normal;
-    font-size: 0.929em;
+    font-size: $font-down-1;
   }
 
   &.new-topic::before {
@@ -301,8 +225,8 @@
 
 .badge-posts {
   font-weight: normal;
-  font-size: 1em;
-  line-height: 1;
+  font-size: $font-0;
+  line-height: $line-height-small;
   &[href] {
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
@@ -318,6 +242,6 @@
   text-shadow: 0 1px 0 rgba($primary, 0.1);
   background-color: $primary-low;
   border-color: $primary-low;
-  font-size: 0.857em;
+  font-size: $font-down-1;
   box-shadow: inset 0 1px 0 rgba(0,0,0, 0.22);
 }
diff --git a/app/assets/stylesheets/common/components/banner.scss b/app/assets/stylesheets/common/components/banner.scss
index 096c01e02a..47e09f43f3 100644
--- a/app/assets/stylesheets/common/components/banner.scss
+++ b/app/assets/stylesheets/common/components/banner.scss
@@ -7,7 +7,7 @@
   background: $tertiary-low;
   box-shadow: 0 2px 4px -1px rgba(0,0,0, .25);
   color: $primary;
-  z-index: 1001;
+  z-index: z("base") + 1;
   overflow: auto;
 
   &.overlay {
@@ -15,7 +15,7 @@
   }
 
   .close {
-    font-size: 1.786em;
+    font-size: $font-up-4;
     margin-top: -5px;
     color: dark-light-choose($primary-low-mid, $secondary-medium);
     padding-left: 5px;
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index a3ce89e5c9..059f09d740 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -10,8 +10,8 @@
   margin: 0;
   padding: 6px 12px;
   font-weight: 500;
-  font-size: 1em;
-  line-height: 18px;
+  font-size: $font-0;
+  line-height: $line-height-medium;
   text-align: center;
   cursor: pointer;
   transition: all .25s;
@@ -29,7 +29,6 @@
   &.no-text {
     .fa {
       margin-right: 0;
-      line-height: 10px;
     }
   }
 }
@@ -62,6 +61,7 @@
 
   .d-icon {
     opacity: 0.7;
+    line-height: $line-height-medium; // Match button text line-height 
   }
   &.btn-primary .d-icon {
     opacity: 1;
@@ -118,9 +118,12 @@
 // --------------------------------------------------
 
 .btn-social {
-  color: $secondary;
+  color: #fff;
   text-shadow: 0 1px 0 rgba($primary, 0.2);
   box-shadow: inset 0 1px 0 rgba(0,0,0, 0.1);
+  &:hover {
+    color: #fff;
+  }
   &[href] {
     color: $secondary;
   }
@@ -177,22 +180,22 @@
 
 .btn-small {
   padding: 3px 6px;
-  font-size: 0.857em;
-  line-height: 16px;
+  font-size: $font-down-1;
 }
 
 // Large
 
 .btn-large {
   padding: 9px 18px;
-  font-size: 1.143em;
-  line-height: 20px;
+  font-size: $font-up-1;
+  line-height: $line-height-small;
 }
 
 .btn-flat {
   background: transparent;
   border: 0;
   outline: 0;
+  line-height: $line-height-small;
   .d-icon {
     opacity: 0.7;
   }
diff --git a/app/assets/stylesheets/common/components/date-picker.scss b/app/assets/stylesheets/common/components/date-picker.scss
index edf976fa7f..350927e4b5 100644
--- a/app/assets/stylesheets/common/components/date-picker.scss
+++ b/app/assets/stylesheets/common/components/date-picker.scss
@@ -7,8 +7,8 @@
 }
 
 .date-picker-wrapper {
-  display: inline-block;
   position: relative;
+  display: inline-block;
 }
 
 .date-picker {
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 55477793a0..6bdc0b3961 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -27,10 +27,10 @@
 
     > a {
       border: none;
-      padding: 5px 12px;
+      padding: 6px 12px;
       color: $primary;
-      font-size: 1.143em;
-      line-height: 20px;
+      font-size: $font-up-1;
+      line-height: $line-height-medium;
       transition: background .15s;
 
       .d-icon {
@@ -81,8 +81,8 @@
   a {
     margin: 0;
     padding: 13px;
-    font-size: 1.143em;
-    line-height: 20px;
+    font-size: $font-up-1;
+    line-height: $line-height-small;
     cursor: pointer;
     color: $primary;
 
@@ -102,15 +102,15 @@
   }
 
   .count {
-    font-size: 0.857em;
-    line-height: 16px;
+    font-size: $font-down-1;
+    line-height: $line-height-large;
   }
 
   .glyph {
-    font-size: 0.857em;
+    font-size: $font-down-1;
     width: 1.25em;
     text-align: center;
     margin-right: .5em;
-    line-height: 20px;
+    line-height: $line-height-large;
   }
 }
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
index b6e0b71ad1..c9884f5604 100644
--- a/app/assets/stylesheets/common/components/user-info.scss
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -13,7 +13,7 @@
     float: left;
     width: 70%;
     padding-left: 5px;
-    font-size: .929em;
+    font-size: $font-down-1;
 
     .name-line {
       white-space: nowrap;
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index 5c98eff7d2..5c34d2c5bc 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -36,16 +36,17 @@
     display: block;
     float: right;
     color: lighten($primary, 40%);
-    font-size: .786em;
+    font-size: $font-down-2;
   }
 
   .delete-info i {
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   .expand-item, .collapse-item {
     float: right;
     margin-right: 0.5em;
+    line-height: $line-height-small;
     color: lighten($primary, 40%);
   }
 
@@ -62,7 +63,7 @@
   }
 
   .name {
-    font-size: 1em;
+    font-size: $font-0;
     max-width: 400px;
     white-space: nowrap;
     overflow: hidden;
@@ -101,13 +102,13 @@
     // common/base/header.scss
     .fa, .icon {
       color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 1.714em;
+      font-size: $font-up-4;
     }
   }
 
   .excerpt {
     margin: 5px 0;
-    font-size: 0.929em;
+    font-size: $font-0;
     word-wrap: break-word;
     color: $primary;
 
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 046338d39d..a8e1541d60 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -8,12 +8,12 @@
   position: absolute;
   background-color: black;
   opacity: 0.8;
-  z-index: 1000;
+  z-index: z("modal","overlay");
 }
 
 .d-editor-modals {
   position: absolute;
-  z-index: 1001;
+  z-index: z("modal","content");
 }
 
 .d-editor {
@@ -80,7 +80,7 @@
   }
 
   .btn:not(.no-text) {
-    font-size: 1.2em;
+    font-size: $font-up-1;
   }
 
   .btn.bold {
@@ -164,6 +164,7 @@
   }
   .d-editor-textarea-wrapper {
     border: 1px solid $primary-low;
+    min-height: 14em;
   }
   .d-editor-button-bar .btn {
     padding: 6px 8px;
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index bf08280bb1..67522095aa 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -9,7 +9,7 @@ html {
   color: $primary;
   font-family: $base-font-family;
   font-size: $base-font-size;
-  line-height: $base-line-height;
+  line-height: $line-height-large;
   background-color: $secondary;
   overflow-y: scroll;
   direction: ltr;
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index e0cd65a646..59d0dfb0bc 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -20,20 +20,91 @@ $twitter: #00bced !default;
 $yahoo: #810293 !default;
 $github: #6d6d6d !default;
 
-
 // Fonts
 // --------------------------------------------------
 
 $base-font-size: 14px !default;
-$base-line-height: 19px !default;
 $base-font-family: Helvetica, Arial, sans-serif !default;
 
-/* These files don't actually exist. They're injected by Stylesheet::Compiler. */
+// Font-size defintions, multiplier ^ (step / interval) 
+$font-up-6: 2.296em;
+$font-up-5: 2em;
+$font-up-4: 1.7511em;
+$font-up-3: 1.5157em;
+$font-up-2: 1.3195em;
+$font-up-1: 1.1487em; // 2^(1/5) 
+$font-0: 1em;
+$font-down-1: .8706em; // 2^(-1/5)
+$font-down-2: .7579em; // Smallest size we use based on the 1em base
+$font-down-3: .6599em;
+$font-down-4: .5745em;
+$font-down-5: .5em;
+$font-down-6: .4355em;
+
+// Common line-heights
+$line-height-small: 1;
+$line-height-medium: 1.2; // Headings or large text
+$line-height-large: 1.4; // Normal or small text
+
+// These files don't actually exist. They're injected by Stylesheet::Compiler. 
+// --------------------------------------------------
+
 @import "theme_variables";
 @import "plugins_variables";
 @import "common/foundation/math";
 
-// Color Utilities
+// Z-index
+// --------------------------------------------------
+
+$z-layers: (
+  "max":              9999, 
+  "fullscreen":       1700,
+  "modal": (
+    "tooltip":        1600,   
+    "popover":        1500,
+    "dropdown":       1400,
+    "content":        1300,
+    "overlay":        1200,
+  ),
+  "mobile-composer":  1100,
+  "header":           1000,
+  "tooltip":          600,
+  "composer": (
+      "popover":      500,
+      "content":      400,
+  ),
+  "dropdown":         300,  
+  "usercard":         200,
+  "timeline":         100,
+  "base":             1
+  );
+
+@function map-has-nested-keys($map, $keys...) {
+  @each $key in $keys {
+    @if not map-has-key($map, $key) {
+      @return false;
+    }
+    $map: map-get($map, $key);
+  }
+  @return true;
+}
+
+@function map-deep-get($map, $keys...) {
+  @each $key in $keys {
+    $map: map-get($map, $key);
+  }
+  @return $map;
+}
+
+@function z($layers...) {
+  @if not map-has-nested-keys($z-layers, $layers...) {
+    @warn "No layer defined for `#{inspect($layers...)}` in $z-layers map. Check variables.scss, property omitted.";
+  }
+  @return map-deep-get($z-layers, $layers...);
+}
+
+// Color utilities
+// --------------------------------------------------
 
 // w3c definition of color brightness https://www.w3.org/TR/AERT#color-contrast
 @function dc-color-brightness($color) {
@@ -93,7 +164,6 @@ $header_primary-low: dark-light-diff($header_primary, $secondary, 90%, -65%);
 $header_primary-medium: dark-light-diff($header_primary, $secondary, 50%, -20%);
 $header_primary-high: dark-light-diff($header_primary, $secondary, 20%, 20%);
 
-
 //secondary
 $secondary-low: dark-light-diff($secondary, $primary, 70%, -70%);
 $secondary-medium: dark-light-diff($secondary, $primary, 50%, -50%);
diff --git a/app/assets/stylesheets/common/input_tip.scss b/app/assets/stylesheets/common/input_tip.scss
index 5f02aeb111..0d5de0c8ab 100644
--- a/app/assets/stylesheets/common/input_tip.scss
+++ b/app/assets/stylesheets/common/input_tip.scss
@@ -5,7 +5,7 @@
   position: absolute;
   display: block;
   padding: 5px 10px;
-  z-index: 101;
+  z-index: z("tooltip");
   &.bad {
     background: $danger-medium;
     color: white;
@@ -18,7 +18,7 @@
     float: right;
     color: $primary;
     opacity: 0.5;
-    font-size: 1.071em;
+    font-size: $font-0;
     margin: 0 0 0 4px;
     cursor: pointer;
   }
diff --git a/app/assets/stylesheets/common/select-kit/category-chooser.scss b/app/assets/stylesheets/common/select-kit/category-chooser.scss
index 62da15be23..503a9bd275 100644
--- a/app/assets/stylesheets/common/select-kit/category-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/category-chooser.scss
@@ -21,12 +21,14 @@
         }
 
         .topic-count {
-          font-size: .786em;
+          font-size: $font-down-2;
           color: $primary;
+          white-space: nowrap;
         }
 
         .category-status {
           color: $primary;
+          line-height: $line-height-large;
           -webkit-box-flex: 0;
               -ms-flex: 1 1 auto;
                   flex: 1 1 auto;
@@ -37,8 +39,8 @@
               -ms-flex: 1 1 auto;
                   flex: 1 1 auto;
           color: #919191;
-          font-size: 0.857em;
-          line-height: 16px;
+          font-size: $font-down-1;
+          line-height: $line-height-large;
         }
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
new file mode 100644
index 0000000000..6fe2e3595a
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -0,0 +1,153 @@
+.select-kit {
+  &.combo-box {
+    &.category-drop {
+      min-width: auto;
+
+      .badge-wrapper {
+        font-size: $font-0;
+        font-weight: normal;
+        line-height: $line-height-large;
+
+        &.box {
+          margin: 0;
+
+          span.badge-category {
+            margin: 0;
+          }
+        }
+      }
+
+      .category-drop-header {
+        padding: 6px 10px;
+      }
+
+      &.bar.has-selection .category-drop-header {
+        padding: 1.5px 10px;
+      }
+
+      &.bullet.has-selection .category-drop-header {
+        padding: 3.5px 10px;
+        span.badge-category {
+          line-height: $line-height-large;
+        }
+      }
+
+      &.box.has-selection .category-drop-header {
+        padding: 4.5px 10px;
+      }
+
+      &.none.has-selection .category-drop-header {
+        padding: 4.5px 10px;
+      }
+
+      .category-drop-header {
+        background: $primary-low;
+        color: $primary;
+        border: none;
+        padding: 6px 10px;
+        font-size: $font-up-1;
+        line-height: $line-height-medium;
+        transition: none;
+
+        .badge-category {
+          display: flex;
+          align-items: center;
+        }
+
+        .badge-wrapper {
+          margin-right: 0;
+        }
+
+        .fa {
+          font-size: $font-up-1;
+        }
+
+        .caret-icon {
+          opacity: 1;
+        }
+      }
+
+      .select-kit-collection {
+        display: flex;
+        flex-direction: column;
+        padding: 0;
+        min-width: 100px;
+        max-height: 300px;
+        max-width: 30em;
+
+        .collection-header {
+          .category-filter {
+            white-space: nowrap;
+            color: $primary;
+            font-size: $font-down-1;
+            line-height: $line-height-medium;
+            font-weight: bold;
+            display: block;
+            padding: 10px 5px;
+
+            &:hover {
+              text-decoration: underline;
+            }
+          }
+        }
+      }
+
+      .select-kit-body {
+        width: auto;
+        min-width: 300px;
+        border-radius: 0;
+        -webkit-box-shadow: 0 2px 2px rgba(0,0,0,0.4);
+                box-shadow: 0 2px 2px rgba(0,0,0,0.4);
+      }
+
+      .select-kit-row {
+        margin: 0;
+        font-size: $font-down-1;
+        font-weight: bold;
+        flex-direction: column;
+        align-items: flex-start;
+        padding: 5px;
+
+        .category-desc {
+          font-weight: normal;
+          color: $primary-medium;
+        }
+
+        .category-status {
+          align-items: center;
+        }
+
+        &.no-content {
+          font-weight: normal;
+        }
+
+        &:not(.no-content) {
+          padding: 5px;
+        }
+
+        .topic-count {
+          margin-left: 5px;
+          font-weight: normal;
+        }
+
+        .badge-wrapper {
+          margin: 0;
+          display: flex;
+          flex: 1 1 auto;
+        }
+      }
+
+      .select-kit-row .badge-wrapper.box {
+        padding: 2.5px 0;
+      }
+
+      .select-kit-row .badge-wrapper.bullet, .select-kit-row .badge-wrapper.none {
+        margin: 2.5px;
+      }
+
+      &.is-expanded .select-kit-wrapper, .select-kit-wrapper {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/category-row.scss b/app/assets/stylesheets/common/select-kit/category-row.scss
new file mode 100644
index 0000000000..47d4d2d920
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/category-row.scss
@@ -0,0 +1,24 @@
+.select-kit {
+  .category-row {
+    .category-status, .category-desc {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      max-width: 100%;      
+      -webkit-box-flex: 0;
+          -ms-flex: 1 1 auto;
+              flex: 1 1 auto;
+    }
+
+    .category-status {
+      .badge-wrapper.box {
+        margin-bottom: 1px;
+        margin-top: 1px;
+      }
+    }
+
+    .topic-count {
+      white-space: nowrap;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/category-selector.scss b/app/assets/stylesheets/common/select-kit/category-selector.scss
index 9dc274553e..2da4ad182d 100644
--- a/app/assets/stylesheets/common/select-kit/category-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/category-selector.scss
@@ -1,9 +1,12 @@
 .select-kit, .select-kit-box {
-  .selected-name  {
-    .badge-wrapper {
-      display: inline-flex;
-      align-items: center;
-      line-height: inherit;
+  &.category-selector {
+    .selected-name  {
+      .badge-wrapper {
+        &.box {
+          margin: 2px;
+          padding: 0;
+        }
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index f1f73828c5..59db74d3b0 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -12,7 +12,7 @@
     }
 
     .select-box-kit-filter, .select-kit-filter {
-      line-height: 18px;
+      line-height: $line-height-medium;
       padding: 6px 10px;
       border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
       border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
@@ -25,15 +25,15 @@
     .select-box-kit-header, .select-kit-header {
       background: $secondary;
       border: 1px solid $primary-medium;
-      padding: 6px 10px;
+      padding: 4px 10px;
       font-weight: 500;
-      font-size: 1em;
-      line-height: 18px;
+      font-size: $font-0;
+      line-height: $line-height-large;
 
       &.is-focused {
         border: 1px solid $tertiary;
-        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
-                box-shadow: $tertiary 0px 0px 6px 0px;
+        -webkit-box-shadow: $tertiary 0 0 6px 0px;
+                box-shadow: $tertiary 0 0 6px 0px;
       }
     }
 
@@ -47,8 +47,8 @@
     &.is-highlighted {
       .select-kit-header {
         border: 1px solid $tertiary;
-        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
-                box-shadow: $tertiary 0px 0px 6px 0px;
+        -webkit-box-shadow: $tertiary 0 0 6px 0px;
+                box-shadow: $tertiary 0 0 6px 0px;
       }
     }
 
@@ -56,8 +56,8 @@
       .select-kit-wrapper {
         display: block;
         border: 1px solid $tertiary;
-        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
-                box-shadow: $tertiary 0px 0px 6px 0px;
+        -webkit-box-shadow: $tertiary 0 0 6px 0px;
+                box-shadow: $tertiary 0 0 6px 0px;
       }
 
       .select-kit-header {
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index a79b5909c0..dca3847436 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -18,8 +18,8 @@
     .select-box-kit-body, .select-kit-body {
       border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
       background-clip: padding-box;
-      -webkit-box-shadow: 0 1px 5px rgba(0,0,0,0.4);
-              box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+      -webkit-box-shadow: 0 2px 2px rgba(0,0,0,0.4);
+              box-shadow: 0 2px 2px rgba(0,0,0,0.4);
       max-width: 300px;
       width: 300px;
     }
@@ -45,7 +45,7 @@
         width: 30px;
 
         .d-icon {
-          font-size: 1.286em;
+          font-size: $font-up-2;
           -ms-flex-item-align: center;
               align-self: center;
           margin-right: 0;
@@ -54,7 +54,7 @@
       }
 
       .texts {
-        line-height: 18px;
+        line-height: $line-height-large;
         -webkit-box-flex: 1;
             -ms-flex: 1;
                 flex: 1;
@@ -76,7 +76,7 @@
               -ms-flex: 1;
                   flex: 1;
           font-weight: bold;
-          font-size: 1em;
+          font-size: $font-0;
           color: $primary;
           padding: 0;
         }
@@ -85,7 +85,7 @@
           -webkit-box-flex: 1;
               -ms-flex: 1;
                   flex: 1;
-          font-size: 0.857em;
+          font-size: $font-down-1;
           font-weight: normal;
           color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));;
           white-space: normal;
@@ -102,7 +102,6 @@
          -moz-box-sizing: border-box;
               box-sizing: border-box;
       border: 0;
-      height: 30px;
 
       -webkit-box-align: center;
           -ms-flex-align: center;
diff --git a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
index 333b21d060..ea78ae0690 100644
--- a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
+++ b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
@@ -5,7 +5,7 @@
 
       .future-date-input-selector-datetime {
         color: lighten($primary, 40%);
-        font-size: .929em;
+        font-size: $font-down-1;
       }
 
       .future-date-input-selector-icons {
diff --git a/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss b/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss
index 4f8aeb70bd..3ba9f7ad94 100644
--- a/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss
@@ -10,7 +10,7 @@
     display: inline-block;
   }
   .topic-count {
-    font-size: .786em;
+    font-size: $font-down-2;
     color: $primary;
     display: inline-block;
   }
@@ -19,7 +19,7 @@
   }
   .category-desc {
     color: $primary;
-    font-size: 0.857em;
+    font-size: $font-down-1;
     line-height: 16px;
   }
 }
@@ -79,10 +79,10 @@
 }
 
 .select2-container-active {
-  box-shadow:  $tertiary 0px 0px 6px 0px;
+  box-shadow:  $tertiary 0 0 6px 0px;
 }
 
 .select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-selection-limit {
   background: $secondary;
   color: $primary;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
index f841e4644f..61ca932379 100644
--- a/app/assets/stylesheets/common/select-kit/multi-select.scss
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -24,7 +24,7 @@
       border: 1px solid $primary-medium;
 
       &.is-focused {
-        box-shadow: $tertiary 0px 0px 6px 0px;
+        box-shadow: $tertiary 0 0 6px 0px;
         border-radius: 0;
       }
     }
@@ -40,7 +40,7 @@
       .multi-select-header {
         border-radius: 0;
         border-bottom: 1px solid transparent;
-        box-shadow: $tertiary 0px 0px 6px 0px;
+        box-shadow: $tertiary 0 0 6px 0px;
       }
     }
 
@@ -48,7 +48,7 @@
       .select-box-kit-wrapper, .select-kit-wrapper {
         display: block;
         border: 1px solid $tertiary;
-        box-shadow: $tertiary 0px 0px 6px 0px;
+        box-shadow: $tertiary 0 0 6px 0px;
         border-radius: 0;
       }
 
@@ -119,14 +119,13 @@
           height: 5px;
           margin: 0 2px 2px 2px;
           border-radius: 5px;
+          display: flex;
+          width: 100%;
         }
       }
 
       .selected-name {
-        align-items: center;
-        justify-content: flex-start;
         color: $primary;
-        cursor: default;
         border: 1px solid $primary-medium;
         border-radius: 3px;
         box-shadow: 0 0 2px $secondary inset, 0 1px 0 rgba(0,0,0,0.05);
@@ -136,14 +135,47 @@
         background-color: $primary-low;
         cursor: pointer;
         outline: none;
-        line-height: normal;
+        line-height: $line-height-medium;
         overflow: hidden;
         flex: 0 1 auto;
         flex-wrap: nowrap;
+        padding: 0;
+        display: flex;
+        flex-direction: column;
+
+        .footer {
+          display: flex;
+          width: 100%;
+        }
+
+        .body {
+          width: 100%;
+          display: inline-flex;
+          align-items: center;
+
+          .locked-icon, .delete-icon {
+            justify-content: center;
+            align-items: center;
+            display: inline-flex;
+            height: 21px;
+            width: 21px;
+
+            .d-icon {
+              color: $primary-medium;
+              cursor: pointer;
+              font-size: 1em;
+              margin: 0;
+
+              &:hover {
+                color: $primary;
+              }
+            }
+          }
+        }
 
         .name {
           padding: 0 5px;
-          line-height: 18px;
+          line-height: $line-height-medium;
         }
 
         &.is-highlighted {
@@ -159,7 +191,7 @@
           .d-icon {
             color: $primary-medium;
             cursor: pointer;
-            font-size: 1em;
+            font-size: $font-0;
 
             &:hover {
               color: $primary;
diff --git a/app/assets/stylesheets/common/select-kit/period-chooser.scss b/app/assets/stylesheets/common/select-kit/period-chooser.scss
new file mode 100644
index 0000000000..3994057f83
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/period-chooser.scss
@@ -0,0 +1,69 @@
+.select-kit {
+  &.dropdown-select-box {
+    &.period-chooser {
+      display: inline-flex;
+      position: relative;
+
+      .select-kit-collection {
+        padding: 5px;
+      }
+
+      .period-chooser-header {
+        background: none;
+        border: none;
+        justify-content: flex-start;
+        width: auto;
+        height: auto;
+        padding: 0;
+
+        h2.selected-name {
+          overflow: auto;
+          color: black;
+          display: inline-block;
+          box-sizing: border-box;
+
+          .top-date-string {
+            font-size: $font-down-1;
+            color: dark-light-choose($primary-medium, $secondary-high);
+            font-weight: normal;
+            text-transform: uppercase;
+          }
+        }
+
+        .d-icon {
+          color: black;
+          opacity: 1;
+          margin: 5px 0 10px 5px;
+          font-size: $font-up-3;
+        }
+
+        &.is-focused, &:hover {
+          background: none;
+          border: none;
+          outline: none;
+        }
+      }
+
+      .period-chooser-row {
+        font-weight: bold;
+        padding: 5px;
+        color: #222;
+        font-size: $font-up-1;
+        align-items: center;
+        display: flex;
+
+        .period-title {
+          flex: 1;
+        }
+
+        .top-date-string {
+          font-weight: normal;
+          font-size: $font-down-1;
+          color: dark-light-choose($primary-medium, $secondary-high);
+          text-transform: uppercase;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss
index c96365a0e6..5428e7ef57 100644
--- a/app/assets/stylesheets/common/select-kit/pinned-button.scss
+++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss
@@ -12,7 +12,7 @@
     }
 
     .reason {
-      line-height: 16px;
+      line-height: $line-height-medium;
       margin: 0 0 0 10px;
     }
   }
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 2f467745bd..26e4ba8242 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -1,5 +1,5 @@
 .mobile-view .select-kit.is-expanded {
-  z-index: 1000;
+  z-index: z("dropdown");
 }
 
 .select-box-kit, .select-kit {
@@ -30,7 +30,7 @@
   }
 
   &.is-expanded {
-    z-index: 999;
+    z-index: z("dropdown");
 
     .select-kit-body {
       display: -webkit-box;
@@ -45,7 +45,7 @@
       top: 0;
     }
 
-    .select-kit-collection, {
+    .select-kit-collection {
       border-radius: inherit;
     }
   }
@@ -91,13 +91,12 @@
             flex-direction: row;
     -webkit-box-pack: justify;
         -ms-flex-pack: justify;
-            justify-content: space-between;
 
     .selected-name {
       text-align: left;
-      -webkit-box-flex: 10;
-          -ms-flex: 10;
-              flex: 10;
+      -webkit-box-flex: 1 1 auto;
+              -ms-flex: 1 1 auto;
+                  flex: 1 1 auto;
       -o-text-overflow: ellipsis;
          text-overflow: ellipsis;
       white-space: nowrap;
@@ -106,7 +105,7 @@
     }
 
     .btn-clear {
-      padding: 0px 10px;
+      padding: 0 10px;
       border: 0;
       background: none;
     }
@@ -129,6 +128,7 @@
               align-items: center;
       white-space: nowrap;
       overflow: hidden;
+      line-height: $line-height-medium;
 
       .d-icon {
         margin-left: 5px;
@@ -146,11 +146,12 @@
 
   .select-box-kit-row, .select-kit-row {
     cursor: pointer;
-    line-height: normal;
+    line-height: $line-height-medium;
     outline: none;
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
+    flex: 1 0 auto;
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
     -webkit-box-align: center;
@@ -160,6 +161,10 @@
         -ms-flex-pack: start;
             justify-content: flex-start;
 
+    &.no-content {
+      white-space: nowrap;
+    }
+
     .name {
       margin: 0;
       overflow: hidden;
@@ -255,8 +260,8 @@
       overflow: hidden;
       position: fixed;
       outline: 0;
-      left: 0px;
-      top: 0px;
+      left: 0;
+      top: 0;
     }
   }
 
diff --git a/app/assets/stylesheets/common/select-kit/tag-drop.scss b/app/assets/stylesheets/common/select-kit/tag-drop.scss
new file mode 100644
index 0000000000..24f08ebc06
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/tag-drop.scss
@@ -0,0 +1,67 @@
+.select-kit {
+  &.combo-box {
+    &.tag-drop {
+      min-width: auto;
+
+      .tag-drop-header {
+        background: $primary-low;
+        color: $primary;
+        border: none;
+        padding: 4.5px 10px;
+        font-size: $font-up-1;
+        line-height: $line-height-large;
+
+        .d-icon {
+          opacity: 1;
+          font-size: $font-0;
+        }
+      }
+
+      .select-kit-collection {
+        display: flex;
+        flex-direction: column;
+        padding: 0;
+        max-height: 300px;
+
+        .collection-header {
+          .tag-filter {
+            white-space: nowrap;
+            color: $primary;
+            font-size: $font-down-1;
+            line-height: $line-height-medium;
+            font-weight: bold;
+            display: block;
+            padding: 5px;
+
+            &:hover {
+              text-decoration: underline;
+            }
+          }
+        }
+      }
+
+      .select-kit-body {
+        width: auto;
+        min-width: 150px;
+        border-radius: 0;
+        -webkit-box-shadow: 0 2px 2px rgba(0,0,0,0.4);
+                box-shadow: 0 2px 2px rgba(0,0,0,0.4);
+      }
+
+      .select-kit-row {
+        margin: 0;
+        font-size: $font-down-1;
+        font-weight: bold;
+        color: $tertiary;
+
+        &.no-content {
+          font-weight: normal;
+        }
+      }
+
+      &.is-expanded .select-kit-wrapper, .select-kit-wrapper {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
index 7323b6d815..d36e04e118 100644
--- a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
+++ b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
@@ -20,7 +20,7 @@
         transition: all .25s;
 
         .name, .d-icon {
-          font-size: 1em;
+          font-size: $font-0;
           font-weight: normal;
           color: $primary;
         }
@@ -34,7 +34,6 @@
 
           .name, .d-icon {
             color: $secondary;
-            color: $secondary;
           }
         }
 
diff --git a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
index c9a994089b..9910a3bf5f 100644
--- a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
+++ b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
@@ -8,7 +8,7 @@
     }
 
     .reason {
-      line-height: 16px;
+      line-height: $line-height-medium;
       margin: 0 0 0 10px;
     }
   }
diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss
index 6e9e1aa209..03caf20de5 100644
--- a/app/assets/stylesheets/common/topic-entrance.scss
+++ b/app/assets/stylesheets/common/topic-entrance.scss
@@ -3,8 +3,8 @@
   border: 1px solid $primary-low; 
   padding: 5px;
   background: $secondary;
-  box-shadow: 0 0px 2px rgba(0,0,0, .2);
-  z-index: 100;
+  box-shadow: 0 0 2px rgba(0,0,0, .2);
+  z-index: z("dropdown");
 
   position: absolute;
   width: 133px;
@@ -18,7 +18,7 @@
       display: block;
       margin-top: 2px;
       margin-bottom: 2px;
-      font-size: 1.286em;
+      font-size: $font-up-2;
     }
   }
   button.btn.jump-bottom {
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index 3f5deb9df9..b3d84c056e 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -4,7 +4,7 @@
 
 .timeline-container {
   box-sizing: border-box;
-  z-index: 499;
+  z-index: z("timeline");
   margin-left: 757px;
 
   @media all and (min-width: 1140px) {
@@ -51,7 +51,7 @@
     border-top: 1px solid dark-light-choose($primary-low, $secondary-low);
     box-shadow: 0px -2px 4px -1px rgba(0,0,0,.25);
     padding-top: 20px;
-    z-index: 100000;
+    z-index: z("fullscreen");
     .back-button {
       display: none;
     }
@@ -66,12 +66,11 @@
       .timeline-date-wrapper {
         float: right;
         text-align: right;
-        font-size: 1.1em;
       }
       .post-excerpt {
         max-width: 650px;
-        max-height: 155px;
-        line-height: 1.4em;
+        max-height: 165px;
+        line-height: $line-height-large;
         overflow: hidden;
         word-wrap: break-word;
         text-overflow: ellipsis;
@@ -98,18 +97,18 @@
           -webkit-line-clamp: 4;
           -webkit-box-orient: vertical;
           max-height: 110px;
-          line-height: 1.3em;
+          line-height: $line-height-medium;
           word-wrap: break-word;
           text-overflow: ellipsis;
           overflow: hidden;
-          font-size: 1.3em;
+          font-size: $font-up-2;
         }
         a {
           color: $primary;
         }
       }
       .timeline-last-read {
-        right: 0px;
+        right: 0;
         margin-left: 0;
         i.progress {
           display: none
@@ -186,8 +185,7 @@
     }
 
     .timeline-footer-controls {
-      margin-top: 1em;
-      line-height: 2.5em;
+      margin-top: 1.5em;
       transition: opacity 0.2s ease-in;
 
       button {
@@ -227,7 +225,7 @@
       background-color: dark-light-choose($tertiary-low, $tertiary-high);
       height: 100%;
       float: left;
-      z-index: 501;
+      z-index: z("base") + 1;
     }
 
     .timeline-scroller-content {
@@ -263,7 +261,7 @@
         color: $tertiary;
         margin-right: 1em;
       }
-      z-index: 502;
+      z-index: z("base") + 2; // above timeline-handle
     }
 
     .back-button {
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 520ad06fa0..1ebf438378 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -35,10 +35,10 @@
     text-align: right;
 
     .value {
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
     .unit {
-      font-size: .857em;
+      font-size: $font-down-1;
     }
     .badge-notification {
       display: block;
@@ -48,11 +48,6 @@
     }
   }
 
-  .category-description,
-  .subcategories {
-    margin-top: 10px;
-  }
-
   .subcategories {
     .badge-notification.new-posts {
       padding: 0;
@@ -69,7 +64,7 @@
 
     a.last-posted-at,
     a.last-posted-at:visited {
-      font-size: 0.857em;
+      font-size: $font-down-1;
       color: dark-light-choose($primary-medium, $secondary-high);
     }
 
@@ -98,7 +93,8 @@
     .category {
       border-left: 6px solid;
       h3 {
-        font-size: 1.286em;
+        font-size: $font-up-2;
+        line-height: $line-height-medium;
         a[href] {
           color: $primary;
         }
@@ -137,7 +133,7 @@
   }
 
   .discourse-tag {
-    font-size: 0.786em;
+    font-size: $font-down-2;
   }
 
   .topic-featured-link {
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 1e2b0af89c..5ecc5d7fea 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -47,7 +47,7 @@
 .open {
   .grippie {
     cursor: row-resize;
-    padding: 4px 0px;
+    padding: 4px 0;
     background: $tertiary;
     &:before {
       content: '';
@@ -73,7 +73,7 @@
   bottom: 10px;
   left: 51%;
   overflow-y: auto;
-  z-index: 110;
+  z-index: z("composer","popover");
   padding: 10px 10px 35px 10px;
   box-shadow: 3px 3px 3px rgba(0,0,0, 0.34);
   background: $highlight-medium;
@@ -100,10 +100,10 @@
     bottom: 10px;
     color: $primary;
     opacity: 0.5;
-    font-size: 1.143em;
+    font-size: $font-up-1;
     &:before {
       content: 'esc';
-      font-size: 0.857em;
+      font-size: $font-down-1;
       margin-right: 0.5em;
     }
   }
@@ -142,7 +142,7 @@
   background-color: $tertiary-low;
 
   a[href] {
-    color: $primary-medium;
+    color: $primary;
   }
 
   .posts-count {
@@ -158,9 +158,13 @@
     .fa, .blurb {
       color: dark-light-choose($primary-high, $secondary-medium);
     }
+    span.topic {
+      display: flex;
+      flex-wrap: wrap;
+    }
   }
   .badge-wrapper {
-    padding-left: 5px;
+    margin-left: 5px;
   }
 }
 
@@ -171,7 +175,7 @@
 
 .composer-bottom-right {
   a {
-    color: $primary-medium;
+    color: $primary-high;
     &:hover {
       color: $tertiary;
     }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index d4e53b65c8..5f718e9502 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -24,9 +24,10 @@ header {
   .topic-status {
     padding: 0 2px 0 0;
     margin: 0;
+    line-height: $line-height-small;
 
     i {
-        font-size: 1.071em;
+        font-size: $font-down-1;
       }
   }
 
@@ -59,7 +60,7 @@ h4,
 h5,
 h6 {
   + p {
-    margin-top:0px;
+    margin-top:0;
   }
 }
 
@@ -72,9 +73,9 @@ input,
 button,
 select,
 textarea {
-  font-size: 1em;
+  font-size: $font-0;
   font-weight: normal;
-  line-height: 18px;
+  line-height: $line-height-medium;
 }
 
 select,
@@ -82,8 +83,8 @@ textarea {
   display: inline-block;
   padding: 4px;
   margin-bottom: 9px;
-  font-size: 1em;
-  line-height: 18px;
+  font-size: $font-0;
+  line-height: $line-height-large;
   color: $primary;
 }
 
@@ -93,7 +94,7 @@ input, textarea {
 
 select,
 input[type="file"] {
-  line-height: 28px;
+  line-height: $line-height-large;
 }
 
 select {
@@ -139,7 +140,7 @@ input {
       vertical-align: middle;
 
       &:focus {
-        z-index: 2;
+        z-index: z("base") + 1;
       }
     }
 
@@ -150,7 +151,7 @@ input {
       min-width: 16px;
       padding: 4px 5px;
       font-weight: normal;
-      line-height: 18px;
+      line-height: $line-height-medium;
       text-align: center;
       vertical-align: middle;
       background-color: $secondary;
@@ -400,25 +401,7 @@ input {
   }
 }
 
-// Special elements
-#main {
-  a.star {
-    color: $secondary-medium;
 
-    &:before {
-      font-family: "FontAwesome";
-      content: "\f005";
-    }
-
-    @include hover {
-      opacity: 0.6;
-    }
-
-    &:active {
-      opacity: 1;
-    }
-  }
-}
 
 // Media Queries
 @media all
diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss
index 9a7f7ce4ab..ad83f6d2c2 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -8,7 +8,7 @@
   height: 60px;
   .d-icon-home {
     padding:8px;
-    font-size: 2.1em;
+    font-size: $font-up-5;
   }
 
   .site-text-logo {
@@ -34,8 +34,8 @@ and (max-width : 570px) {
   color: dark-light-choose($primary-high, $secondary-medium);
   display: block;
   word-wrap: break-word;
-  font-size: .786em;
-  line-height: 1.3em;
+  font-size: $font-down-2;
+  line-height: $line-height-large;
   .search-highlight {
     color: dark-light-choose($primary-high, $secondary-low);
   }
@@ -43,6 +43,8 @@ and (max-width : 570px) {
 
 header {
   #site-text-logo {
-    line-height: 40px;
+    font-size: $font-up-3;
+    margin-top: .4em;
+    line-height: $line-height-medium;
   }
 }
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 4519450e1a..81241cb8b4 100644
--- a/app/assets/stylesheets/desktop/history.scss
+++ b/app/assets/stylesheets/desktop/history.scss
@@ -52,7 +52,7 @@
   }
   .markdown {
     font-family: monospace;
-    font-size: 0.857em;
+    font-size: $font-down-1;
     width: 100%;
     border-collapse: collapse;
     border-spacing: 0;
@@ -64,9 +64,10 @@
       white-space: pre-wrap;
     }
   }
-  .span8, .markdown {
+  .revision-content, .markdown {
     img {
-      max-width: 400px;
+      max-width: 100%;
+      box-sizing: border-box;
     }
   }
   .modal-header {
diff --git a/app/assets/stylesheets/desktop/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
index 8b17c33cf1..b19c016475 100644
--- a/app/assets/stylesheets/desktop/latest-topic-list.scss
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -24,11 +24,11 @@
   .main-link {
     @extend .topic-list-main-link;
     flex: 15;
-    font-size: 1em;
+    font-size: $font-0;
 
     .top-row {
       margin-bottom: 0.1em;
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
   }
   .topic-stats {
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index e7d00fba8f..d950497110 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -7,20 +7,13 @@
 
 // Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
 .bootbox.modal {
-  position: fixed;
   top: 50%;
   left: 50%;
-  z-index: 1050;
-  overflow: auto;
   width: 610px;
-  height: auto;
   margin: -250px 0 0 -305px;
-  background-color: $secondary;
-  border: 1px solid $primary-low;
-
-  box-shadow: 0 3px 7px rgba(0,0,0, .8);
-  background-clip: padding-box;
-
+  .cancel {
+    margin-left: 1em;
+  }
 }
 
 .modal.in {
@@ -34,10 +27,6 @@
   padding: 15px;
 }
 
-.modal-footer .btn + .btn {
-  margin-left: 5px;
-  margin-bottom: 0;
-}
 .modal-footer .btn.right {
   float: right;
 }
@@ -55,12 +44,12 @@
 .modal-header {
   h3 {
     display: inline-block;;
-    font-size: 1.429em;
+    font-size: $font-up-3;
     padding: 10px 15px 7px;
   }
 }
 .close {
-  font-size: 1.429em;
+  font-size: $font-up-3;
   text-decoration: none;
   color: dark-light-choose($primary-high, $secondary-low);
   cursor: pointer;
@@ -89,11 +78,14 @@
 
 .flag-modal {
   max-height: 450px;
+  .flag-action-type-details {
+    line-height: $line-height-large;
+  }
 }
 
 .custom-message-length {
   color: dark-light-choose($primary-low-mid, $secondary-high);
-  font-size: .857em;
+  font-size: $font-down-1;
 }
 
 .flag-message {
diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss
index 38f48442b7..79cfb1f630 100644
--- a/app/assets/stylesheets/desktop/queued-posts.scss
+++ b/app/assets/stylesheets/desktop/queued-posts.scss
@@ -9,7 +9,7 @@
      .post-info  {
        display: inline-block;
        float: right;
-       font-size: 0.929em;
+       font-size: $font-down-1;
        margin-top: 1px;
        span {color: dark-light-choose($primary-medium, $secondary-medium); }
      }
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index d8135d7412..347988a558 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -1,366 +1,359 @@
-// --------------------------------------------------
-// Topic lists
-// --------------------------------------------------
+  // --------------------------------------------------
+  // Topic lists
+  // --------------------------------------------------
 
-// List controls
-// --------------------------------------------------
+  // List controls
+  // --------------------------------------------------
 
-.list-controls {
-  .nav {
-    float: left;
-    margin-bottom: 18px;
-  }
-
-  .btn {
-    float: right;
-    margin-left: 8px;
-    margin-bottom: 10px;
-    font-size: 1.143em;
-    font-weight: normal;
-  }
-
-  .search .btn {
-    float: none;
-  }
-
-  a.badge-category, .dropdown-header {
-    padding: 3px 12px;
-    font-size: 1.143em;
-  }
-
-}
-
-// Base list
-// --------------------------------------------------
-
-.topic-list-icons {
-  .d-icon-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
-  .d-icon-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
-  a.title {color: $primary;}
-  .d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
-}
-
-.topic-list {
-  @extend .topic-list-icons;
-
-  margin: 0 0 10px;
-  th,
-  td {
-    padding: 12px 5px;
-    &:first-of-type {
-      padding-left: 10px;
-    }
-    &:last-of-type {
-      padding-right: 10px;
-    }
-  }
-  th {
-    button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium); }
-  }
-
-  > tbody > tr {
-    &.highlighted {
-      animation: background-fade-highlight 2.5s ease-out;
-    }
-  }
-  button.bulk-select {
-    padding: 0;
-    margin-right: 0.3em;
-  }
-
-  .star {
-    width: 20px;
-    padding-right: 0;
-    .d-icon-star {
-      position: relative;
-    }
-    + .main-link {
-      padding-left: 5px;
-    }
-  }
-
-  .badge-notification {
-    position: relative;
-    top: -2px;
-    &.new-topic {
-      top: -1px;
-      padding-left: 5px;
-    }
-  }
-
-  .posters {
-    // we know there are up to 5 avatars of fixed size
-    // will be overridden by media width queries on narrow displays to 1 avatar's width
-    width: 146px;
-    min-width: 146px;
-  }
-  .posters {
-    > a {
+  .list-controls {
+    .nav {
       float: left;
-      margin-right: 4px;
-      &:last-of-type {
-        margin-right: 0;
-      }
+      margin-bottom: 18px;
     }
-  }
 
-  .posters a:first-child .avatar.latest:not(.single) {
-     box-shadow: 0 0 3px 1px desaturate($tertiary-medium, 35%);
-     border: 2px solid desaturate($tertiary-medium, 40%);
-     position: relative;
-     top: -2px;
-     left: -2px;
-  }
-
-
-  .sortable {
-    cursor: pointer;
-    &:hover {
-      background-color: $primary-low;
+    .btn {
+      float: right;
+      margin-left: 8px;
+      margin-bottom: 10px;
+      font-size: $font-up-1;
+      font-weight: normal;
     }
-    @include unselectable;
-  }
-  .likes {
-    width: 65px;
-  }
-  .views {
-    width: 65px;
-  }
-  .posts {
-    width: 65px;
-  }
 
-  .post-actions {
-    clear: both;
-    width: auto;
-    color: dark-light-choose($primary-medium, $secondary-medium);
-    text-align: left;
-    font-size: .857em;
-    margin-top: 5px;
-    .fa {
-      margin-right: 2px;
+    .search .btn {
+      float: none;
     }
-    a {
-      color: dark-light-choose($primary-medium, $secondary-medium);
-      margin-right: 3px;
-      line-height: 20px;
+
+    a.badge-category {
+      padding: 3px 12px;
+      font-size: $font-up-1;
     }
-  }
-  .activity {
-    width: 60px;
-    &:lang(zh_CN) {
-      width: 80px;
-    }
-    span {
-      cursor: pointer;
-    }
-  }
-  .age {
-    width: 60px;
-  }
-  .with-year {
-    white-space: nowrap;
-  }
-}
 
-.topic-list tbody tr.has-excerpt .star {
-  vertical-align: top;
-  margin-top: 3px;
-}
-
-.topic-list.categories {
-  a.title {
-    color: $tertiary;
   }
 
-  th.posts {
-    position: relative;
-  }
-  th.stats {
-    width: 90px;
-  }
-  td.latest {
-    vertical-align: top;
-    padding: 0 8px 8px;
-  }
-  .last-user-info {
-    font-size: 0.857em;
-  }
-  .has-description {
-    td.category {
-      padding-top: 15px;
-    }
-  }
-  .category{
-    h3 {
-      display: inline-block;
-      font-size: 1.286em;
-      i {
-        margin-right: 5px;
-      }
-      a[href] {
-        color: $primary;
-      }
-    }
-    .subcategories {
-      margin-top: 10px;
-    }
-    .category-description {
-      margin-top: 10px;
-    }
-    .clear-badge {
-      color: $primary;
-    }
-  }
+  // Base list
+  // --------------------------------------------------
 
-  .featured-topic {
-    margin: 10px 0 0;
-    /* topic status glyphs */
-    i {
-      color: dark-light-choose($primary-medium, $secondary-medium) !important;
-      font-size: 0.929em;
-    }
-    a.last-posted-at, a.last-posted-at:visited {
-      color: dark-light-choose($primary-medium, $secondary-medium);
-      font-size: 0.857em;
-    }
-    .badge {
-      font-size: 0.857em;
-      top: -1px;
-    }
-  }
-}
-
-.topic-list-bottom {
-  margin: 20px 0;
-}
-
-// Misc. stuff
-// --------------------------------------------------
-
-#list-area .top-lists h2 {
-  cursor: pointer;
-  margin: 5px 0 10px;
-}
-
-#list-area {
-  h2 {
-    margin: 20px 0 10px;
-  }
-  .show-more.has-topics {
-    top: 0;
-    .alert {
-      padding: 12px 35px 12px 14px;
-    }
-  }
-}
-
-.category-dropdown-menu {
-  max-height: 350px;
-  min-width: 131px;
-}
-
-#bulk-select {
-  position: fixed;
-  right: 20px;
-  top: 130px;
-  padding: 5px;
-  background-color: $secondary;
-  z-index: 99999;
-}
-
-button.dismiss-read {
-  float: right;
-  margin-bottom: 5px;
-  margin-left: 10px;
-}
-
-.tags-admin-menu {
-  .dropdown-menu {
-    right: 0;
-    top: 30px;
-    bottom: auto;
-    left: auto;
-  }
-}
-
-.category-heading {
-  clear: both;
-  p {
-    line-height: 1.5em;
-    font-size: 1.429em;
-  }
-}
-
-.category-navigation {
-  clear: both;
-}
-
-.category-logo {
-  max-height: 150px;
-  float: left;
-  margin-bottom: 15px;
-  margin-right: 15px;
-}
-
-/* Tablet (portrait) ----------- */
-
-@media all
-and (max-width : 850px) {
-
-  // slightly smaller font, tighten spacing on nav pills
-  .nav-pills {
-    > li > a {
-      font-size: 1em;
-      padding: 5px 10px;
-      }
-  }
-
-  // new topic just a "+" no text
-  button#create-topic {
-    span {
-      display: none;
-    }
-    i {
-      margin-right: 0;
-    }
+  .topic-list-icons {
+    .d-icon-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
+    .d-icon-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
+    a.title {color: $primary;}
+    .d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
   }
 
   .topic-list {
+    @extend .topic-list-icons;
 
-    // tighter table header spacing
-   th:first-of-type {
-     padding: 12px 5px;
-     }
-   // smaller table cell font and cell spacing
-   th, td {
-      padding: 12px 2px;
-      font-size: 1em;
-     }
-    .main-link {
-      font-size: 1em;
+    margin: 0 0 10px;
+    th,
+    td {
+      padding: 12px 5px;
+      &:first-of-type {
+        padding-left: 10px;
       }
-    .category {
-      min-width: 0;
+      &:last-of-type {
+        padding-right: 10px;
+      }
+    }
+    th {
+      button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium); }
+    }
+
+    > tbody > tr {
+      &.highlighted {
+        animation: background-fade-highlight 2.5s ease-out;
+      }
+    }
+    button.bulk-select {
       padding: 0;
+    }
+
+    td.bulk-select {
+      padding: 10px;
+      + .main-link {
+        padding-left: 0;
       }
-    // suppress views column
-    th.views {
-      display: none;
     }
-    td.views {
-      display: none;
+    
+    .badge-notification {
+      position: relative;
+      top: -2px;
+      &.new-topic {
+        top: -1px;
+        padding-left: 5px;
+      }
     }
-    // show only the first poster
+    td.category {
+      line-height: $line-height-small;
+    }
+
     .posters {
-       min-width: 0;
-       width: 50px;
-       a:not(.latest) {
-         display: none;
-         }
-       a.latest {
-         padding: 0 8px;
-         }
+    // we know there are up to 5 avatars of fixed size
+    // will be overridden by media width queries on narrow displays to 1 avatar's width
+    width: 146px;    
+      > a {
+        float: left;
+        margin-right: 4px;
+        &:last-of-type {
+          margin-right: 0;
+        }
+      }
+    }
+    td.posters {
+      height: 29px; // min-height of td with avatar glow
+    }
+    .posters a:first-child .avatar.latest:not(.single) {
+      box-shadow: 0 0 3px 1px desaturate($tertiary-medium, 35%);
+      border: 2px solid desaturate($tertiary-medium, 40%);
+      position: relative;
+      top: -2px;
+      left: -2px;
+    }
+
+
+    .sortable {
+      cursor: pointer;
+      &:hover {
+        background-color: $primary-low;
+      }
+      @include unselectable;
+    }
+    .likes {
+      width: 65px;
+    }
+    .views {
+      width: 65px;
+    }
+    .posts {
+      width: 65px;
+    }
+
+    .post-actions {
+      clear: both;
+      width: auto;
+      color: dark-light-choose($primary-medium, $secondary-medium);
+      text-align: left;
+      font-size: $font-down-1;
+      margin-top: 5px;
+      .fa {
+        margin-right: 2px;
+      }
+      a {
+        color: dark-light-choose($primary-medium, $secondary-medium);
+        margin-right: 3px;
+        line-height: $line-height-large;
+      }
+    }
+    .activity {
+      width: 60px;
+      &:lang(zh_CN) {
+        width: 80px;
+      }
+      span {
+        cursor: pointer;
+      }
+    }
+    .age {
+      width: 60px;
+    }
+    .with-year {
+      white-space: nowrap;
+    }
+  }
+
+  .topic-list.categories {
+    a.title {
+      color: $tertiary;
+    }
+
+    th.posts {
+      position: relative;
+    }
+    th.stats {
+      width: 90px;
+    }
+    td.latest {
+      vertical-align: top;
+      padding: 0 8px 8px;
+    }
+    .last-user-info {
+      font-size: $font-down-1;
+    }
+    .has-description {
+      td.category {
+        padding-top: 15px;
+      }
+    }
+    .category{
+      h3 {
+        display: inline-block;
+        font-size: $font-up-2;
+        i {
+          margin-right: 5px;
+        }
+        a[href] {
+          color: $primary;
+        }
+      }
+      .subcategories {
+        margin-top: 10px;
+      }
+      .category-description {
+        margin-top: 10px;
+      }
+      .clear-badge {
+        color: $primary;
+      }
+    }
+
+    .featured-topic {
+      margin: 10px 0 0;
+      /* topic status glyphs */
+      i {
+        color: dark-light-choose($primary-medium, $secondary-medium) !important;
+        font-size: 0.929em;
+      }
+      a.last-posted-at, a.last-posted-at:visited {
+        color: dark-light-choose($primary-medium, $secondary-medium);
+        font-size: $font-down-1;
+      }
+      .badge {
+        font-size: $font-down-1;
+        top: -1px;
+      }
+    }
+  }
+
+  .topic-list-bottom {
+    margin: 20px 0;
+  }
+
+  // Misc. stuff
+  // --------------------------------------------------
+
+  #list-area .top-lists h2 {
+    cursor: pointer;
+    margin: 5px 0 10px;
+  }
+
+  #list-area {
+    h2 {
+      margin: 20px 0 10px;
+    }
+    .show-more.has-topics {
+      top: 0;
+      .alert {
+        padding: 12px 35px 12px 14px;
+      }
+    }
+  }
+
+  #bulk-select {
+    position: fixed;
+    right: 20px;
+    top: 130px;
+    padding: 5px;
+    background-color: $secondary;
+    z-index: z("dropdown");
+  }
+
+  button.dismiss-read {
+    float: right;
+    margin-bottom: 5px;
+    margin-left: 10px;
+  }
+
+  .tags-admin-menu {
+    .dropdown-menu {
+      right: 0;
+      top: 30px;
+      bottom: auto;
+      left: auto;
+    }
+  }
+
+  .category-heading {
+    clear: both;
+    p {
+      line-height: $line-height-large;
+      font-size: $font-up-3;
+    }
+  }
+
+  .category-navigation {
+    clear: both;
+  }
+
+  .category-logo {
+    max-height: 150px;
+    float: left;
+    margin-bottom: 15px;
+    margin-right: 15px;
+  }
+
+  /* Tablet (portrait) ----------- */
+
+  @media all
+  and (max-width : 850px) {
+
+    // slightly smaller font, tighten spacing on nav pills
+    .nav-pills {
+      > li > a {
+        font-size: $font-0;
+        padding: 7px 10px;
+        }
+    }
+
+    // new topic just a "+" no text
+    button#create-topic {
+      span {
+        display: none;
+      }
+      i {
+        margin-right: 0;
+      }
+    }
+
+    .topic-list {
+
+      // tighter table header spacing
+    th:first-of-type {
+      padding: 12px 5px;
+      }
+    // smaller table cell spacing
+    th, td {
+        padding: 10px;
+        font-size: $font-0;
+      }
+      .category {
+        min-width: 0;
+        padding: 0;
+        }
+      // suppress views column
+      th.views {
+        display: none;
+      }
+      td.views {
+        display: none;
+      }
+      // reduce width for more title space
+      .posts {
+        width: 50px;
+      }
+      .posters {
+        width: 30px;  
+        text-align: center;      
+      }
+      // show only the first poster
+      td.posters {
+        a:not(.latest) {
+          display: none;
+          }
+        a.latest {
+          width: 100%;
+          img {
+            margin: 0 auto;
+          }
+        }
+      }
     }
   }
-}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 40ac5cb3d5..e869ad4dfd 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -27,10 +27,9 @@ h1 .topic-statuses .topic-status i {
   }
 
   .reply-to-tab {
-    z-index: 400;
-    font-size: 0.929em;
+    z-index: z("base") + 1;
     float: right;
-    margin: 1px 25px 0 0;
+    margin: -2px 25px 0 0;
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
@@ -105,7 +104,7 @@ nav.post-controls {
     }
     i {
       margin-left: 5px;
-      font-size: .857em;
+      font-size: $font-down-1;
     }
   }
 
@@ -120,7 +119,7 @@ nav.post-controls {
   }
 
   button {
-    font-size: 1.143em;
+    font-size: $font-up-1;
     padding: 8px 10px;
     vertical-align: top;
     background: transparent;
@@ -178,12 +177,12 @@ nav.post-controls {
     text-align: left;
     bottom: -2px;
     right: 15px;
-    z-index: 1000;
+    z-index: z("dropdown");
 
     h3 {
       margin-top: 0;
       color: $primary;
-      font-size: 1em;
+      font-size: $font-0;
     }
 
     ul {
@@ -205,14 +204,15 @@ nav.post-controls {
 
 .embedded-posts {
   h1, h2, h3 { margin: 10px 0; }
-
+  border:  1px solid $primary-low;
+  
   .topic-body {
     box-sizing: border-box;
-    width: calc(100% - 60px); // [100% - .topic-avatar width]
+    width: calc(100% - 70px); // [100% - .topic-avatar width]
     // WARNING: overflow hide is required for quoted / embedded images
     // which expect "normal" post width, but expansions are narrower
     overflow: hidden;
-    padding: 15px 15px 0 15px;
+    padding: 15px 25px 0 15px;
   }
 
   // this is covered by .topic-body .regular on a normal post
@@ -222,27 +222,58 @@ nav.post-controls {
   }
 
   .topic-avatar {
-    padding-left: 15px;
+    padding-left: 25px;
     padding-top: 15px;
   }
 
+  .collapse-down, .collapse-up {
+    position: absolute;
+    color: $primary-medium;
+    background: $secondary;
+    border:  1px solid $primary-low;
+    padding: 6px 9px 8px;
+    z-index: 99; // Needs to be higher than topic-avatar
+    &:hover {
+      background: $primary-low;
+      color: $primary;
+    }
+  }
+
   // bottom means "reply expansion" below a post
   &.bottom {
+    border-top: none;
+    margin-bottom: 20px;
     &.hidden {
       display: block;
       opacity: 0;
     }
   }
   &.bottom {
+    .collapse-up {
+      transform: translate(-50%, -164%);
+    }
     .row {
-      padding-top: 7px;
+      padding-bottom: .5em;
+      .topic-avatar, .topic-body {
+        border-top: 1px solid $primary-low;
+      }
     }
   }
 
   // top means "in reply to expansion" above a post
   &.top {
+    border-bottom: none;
+    .collapse-down {
+      transform: translate(-50%, 55%);
+    }
     margin-left: 56px;
-    width: 701px;
+    width: 699px;
+    .row {
+      border-bottom: none;
+      .topic-avatar, .topic-body {
+        border-top: 1px solid $primary-low;
+      }
+    }
   }
   &.top.topic-body {
     padding: 0;
@@ -257,8 +288,8 @@ nav.post-controls {
   }
   .topic-meta-data h5 {
     position: absolute;
-    z-index: 1;
-    font-size: 0.929em;
+    z-index: z("base");
+    font-size: $font-down-1;
     a {
       font-weight: bold;
       color: dark-light-choose($primary-low-mid, $secondary-high);
@@ -274,13 +305,8 @@ nav.post-controls {
   .avatar { margin-right: 2px; }
 }
 
-a.star {
-  display: inline-block;
-  float: left;
-}
-
 .topic-map {
-  margin: 20px 0 0 0;
+  margin: 20px 0;
   background: blend-primary-secondary(5%);
   border: 1px solid $primary-low;
   border-top: none; // would cause double top border
@@ -292,17 +318,17 @@ a.star {
   h3 {
     margin-bottom: 4px;
     color: dark-light-choose($primary-high, $secondary-low);
-    line-height: 23px;
+    line-height: $line-height-large;
     font-weight: normal;
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   h4 {
     margin: 1px 0 2px 0;
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
-    font-size: 0.857em;
-    line-height: 15px;
+    font-size: $font-down-1;
+    line-height: $line-height-small;
   }
 
   ul {
@@ -311,33 +337,10 @@ a.star {
   }
 
   span.domain {
-    font-size: 0.786em;
+    font-size: $font-down-2;
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
-  .avatars {
-    > div {
-      float: left;
-      position: relative;
-      margin: 3px 0;
-    }
-    .post-count {
-      position: absolute;
-      right: 0;
-      border-radius: 100px;
-      padding: 4px 5px 2px 5px;
-      text-align: center;
-      font-weight: normal;
-      font-size: .786em;
-      line-height: 1;
-    }
-  }
-
-  .avatar {
-    float: left;
-    margin-right: 4px;
-  }
-
   .map {
     .secondary {text-align: center;}
     li {
@@ -349,15 +352,19 @@ a.star {
       &:nth-child(3) { text-align:center; }
     }
     a, .number {
-      line-height: 20px;
+      line-height: $line-height-large;
     }
     .number, i {
       color: dark-light-choose($primary-high, $secondary-low);
-      font-size: 1.286em;
+      font-size: $font-up-2;
+      line-height: $line-height-medium;
     }
     .avatar  a {
       float: left;
     }
+    .topic-map-post {
+      margin-top: 6px;
+    }
   }
   .avatars,
   .links,
@@ -371,7 +378,7 @@ a.star {
     .user a {
       color: dark-light-choose($primary-high, $secondary-low);
       font-weight: bold;
-      font-size: 0.929em;
+      font-size: $font-down-1;
     }
     .d-icon-times {
       color: dark-light-choose($primary-medium, $secondary-high);
@@ -397,7 +404,7 @@ a.star {
       color: dark-light-choose($primary-medium, $secondary-high);
       background: blend-primary-secondary(5%);
       border-left: 1px solid $primary-low;
-      border-top: 1px solid $primary-low;
+      border-top: 1px solid transparent;
       &:hover {
         color: $primary;
         background: $primary-low;
@@ -408,7 +415,7 @@ a.star {
       }
       .fa {
         margin: 0;
-        font-size: 1.286em;
+        font-size: $font-up-2;
         line-height: 52px;
       }
     }
@@ -425,11 +432,6 @@ a.star {
   }
 }
 
-@mixin topic-footer-buttons-text {
-  line-height: 32px;
-  color: dark-light-choose($primary-medium, $secondary-medium);
-}
-
 @mixin topic-footer-button {
   margin-bottom: 5px;
   margin-right: 10px;
@@ -439,7 +441,7 @@ a.star {
   padding: 10px 10px 0 0;
   float: left;
   p {
-    @include topic-footer-buttons-text;
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
   .btn {
     @include topic-footer-button;
@@ -520,6 +522,7 @@ video {
   .topic-statuses {
     i { color: $header_primary; }
     .d-icon-envelope { color: $danger; }
+    .d-icon-lock {padding-top: .15em;}
     .unpinned { color: $header_primary; }
   }
 
@@ -533,7 +536,6 @@ video {
 
   .topic-header-extra {
     margin: 0 0 0 5px;
-    padding-top: 5px;
   }
 }
 
@@ -541,8 +543,8 @@ video {
 .extra-info {
   h1 {
     margin: 5px 0 0 0;
-    font-size: 1.429em;
-    line-height: 1.3em;
+    font-size: $font-up-3;
+    line-height: $line-height-large;
   }
 
   .topic-statuses {
@@ -553,7 +555,7 @@ video {
 /* override docked header CSS for topics with categories */
 .extra-info.two-rows {
   h1 {
-    line-height: 1.1em;
+    line-height: $line-height-medium;
     margin: 0;
   }
 }
@@ -591,7 +593,7 @@ video {
 }
 
 .deleted-user-avatar {
-  font-size: 2.571em;
+  font-size: $font-up-6;
 }
 
 .info-line {
@@ -638,9 +640,9 @@ $topic-avatar-width: 45px;
   width: $topic-body-width;
   float: left;
   position: relative;
-  z-index: 2;
+  z-index: z("base");
   border-top: 1px solid $primary-low;
-  padding: 12px $topic-body-width-padding 15px $topic-body-width-padding;
+  padding: 12px $topic-body-width-padding 0 $topic-body-width-padding;
 }
 
 .topic-avatar {
@@ -648,7 +650,7 @@ $topic-avatar-width: 45px;
   padding-top: 15px;
   width: $topic-avatar-width;
   float: left;
-  z-index: 3;
+  z-index: z("base") + 1;
 }
 
 .gap {
@@ -661,6 +663,11 @@ $topic-avatar-width: 45px;
   border-top: none;
 }
 
+.time-gap + .topic-post .embedded-posts.top {
+  border-bottom: 1px solid $primary-low;
+} 
+
+
 .posts-wrapper {
   position: relative;
   -webkit-font-smoothing: subpixel-antialiased;
@@ -684,7 +691,7 @@ $topic-avatar-width: 45px;
   position: absolute;
   bottom: 115%;
   left: 0;
-  z-index: 999;
+  z-index: z("dropdown");
   display: none;
   float: left;
   width: 550px;
@@ -695,13 +702,13 @@ $topic-avatar-width: 45px;
   box-shadow: 0 1px 5px rgba(0,0,0, .4);
   background-clip: padding-box;
   span {
-    font-size: 0.857em;
+    font-size: $font-down-1;
     color: dark-light-choose($primary-medium, $secondary-medium);
   }
   span.title {
     font-weight: bold;
     display: block;
-    font-size: 1em;
+    font-size: $font-0;
     color: $primary;
   }
 }
@@ -710,7 +717,7 @@ $topic-avatar-width: 45px;
   padding: 9px;
   clear: both;
   font-weight: normal;
-  line-height: 18px;
+  line-height: $line-height-medium;
   color: $primary;
   transition: all linear .15s;
 
@@ -738,7 +745,7 @@ $topic-avatar-width: 45px;
 .dropdown-menu .icon {
   margin-top: 3px;
   float: left;
-  font-size: 1.286em;
+  font-size: $font-up-2;
 }
 
 .open > .dropdown-menu {
@@ -749,7 +756,7 @@ $topic-avatar-width: 45px;
 .selected-posts {
   width: 200px;
   position: fixed;
-  z-index: 1000;
+  z-index: z("dropdown");
   background-color: $tertiary-low;
   border: 1px solid $tertiary;
   padding: 5px;
@@ -776,14 +783,14 @@ $topic-avatar-width: 45px;
     margin-top: 10px;
   }
   p {
-    font-size: 0.929em;
+    font-size: $font-down-1;
     margin: 0 0 10px 0;
   }
   p.cancel {
     margin: 10px 0 0 0;
   }
   h3 {
-    font-size: 1.857em;
+    font-size: $font-up-4;
     color: $primary;
     margin-bottom: 5px;
     i {
@@ -840,7 +847,7 @@ $topic-avatar-width: 45px;
     .select-posts {
       position: absolute;
       right: 0;
-      z-index: 490;
+      z-index: z("base") + 1;
       top: 3em;
       height: 100px;
 
@@ -872,7 +879,7 @@ a.attachment:before {
   color: rgba($primary-low, .8);
   font: 6.429em/1 FontAwesome;
   content: "\f014";
-  z-index: -5;
+  z-index: z("base");
 }
 
 .topic-meta-data {
@@ -889,8 +896,6 @@ a.attachment:before {
  .post-info  {
    display: inline-block;
    float: right;
-   font-size: 0.929em;
-   margin-top: 1px;
    a {color: dark-light-choose($primary-medium, $secondary-medium); }
  }
 
@@ -898,7 +903,7 @@ a.attachment:before {
 
 .who-liked {
   margin-top: 20px;
-  margin-bottom: 0px;
+  margin-bottom: 0;
   width: 100%;
   text-align: right;
 }
@@ -914,8 +919,8 @@ span.highlighted {
 .read-state {
   color: $tertiary-medium;
   position: absolute;
-  right: 0px;
-  top: 13px;
+  right: 0;
+  top: 2em;
   font-size: 0.571em;
 }
 
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index d95273c0af..6f0e876dfb 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -2,6 +2,7 @@
   @include unselectable;
   clear: both;
   text-align: right;
+  margin-bottom: 10px;
   .post-action {
     display: inline-block;
     margin-left: 10px;
@@ -10,14 +11,13 @@
 }
 
 .post-menu-area {
-  margin-bottom: 10px;
-  margin-top: 20px;
+  margin: 20px 0;
 }
 
 .edits {margin-right: 5px;}
 
 #topic-title {
-  z-index: 1000;
+  z-index: z("base");
   padding-top: 14px;
   margin-bottom: 10px;
 
@@ -25,8 +25,8 @@
     width: 500px;
   }
   h1 {
-    font-size: 1.857em;
-    line-height: 1.25em;
+    font-size: $font-up-4;
+    line-height: $line-height-medium;
     overflow: hidden;
     a {color: $primary;}
   }
@@ -57,9 +57,9 @@
   width: 60%;
   margin-left: auto;
   margin-right: auto;
-  font-size: 1.857em;
+  font-size: $font-up-4;
   text-align: center;
-  line-height: 1.1em;
+  line-height: $line-height-medium;
 
   .topic-retry {
     display: block;
@@ -71,7 +71,7 @@
 
 .topic-status-info {
   border-top: 1px solid $primary-low;
-  padding: 10px 0px;
+  padding: 10px 0;
   height: 20px;
   max-width: 757px;
 }
@@ -81,7 +81,7 @@
   right: 50%;
   width: 0;
   bottom: 0;
-  z-index: 500;
+  z-index: z("timeline");
   &.docked {
     position: absolute;
     bottom: -70px;
@@ -96,7 +96,6 @@
   position: relative;
   left: 340px;
   width: 135px;
-  padding: 5px;
 
   button.full {
     width: 100%;
@@ -105,7 +104,7 @@
       display: block;
       margin-top: 2px;
       margin-bottom: 2px;
-      font-size: 1.286em;
+      font-size: $font-up-2;
     }
   }
   .jump-form {
@@ -115,7 +114,7 @@
       height: 20px;
       text-align: center;
       margin-bottom: 0;
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
     button.btn {
       float: right;
@@ -155,18 +154,18 @@
     top: 9px;
     width: 100%;
     text-align: center;
-    z-index: 1;
+    z-index: z("base");
   }
   .d-icon {
     position: absolute;
     right: 8px;
     bottom: 9px;
-    z-index: 1;
+    z-index: z("base");
   }
   h4 {
     display: inline;
-    font-size: 1.286em;
-    line-height: 15px;
+    font-size: $font-up-2;
+    line-height: $line-height-small;
   }
   .bg {
     position: absolute;
@@ -194,8 +193,8 @@
   bottom: 0;
   position: fixed;
   width: 100%;
-  font-size: 1em;
-  z-index: 495
+  font-size: $font-0;
+  z-index: z("dropdown");
 }
 
 @media all
diff --git a/app/assets/stylesheets/desktop/upload.scss b/app/assets/stylesheets/desktop/upload.scss
index 07f68b1598..20e53afa92 100644
--- a/app/assets/stylesheets/desktop/upload.scss
+++ b/app/assets/stylesheets/desktop/upload.scss
@@ -13,8 +13,8 @@
         margin: 0 0 5px 0;
       }
       input[type="file"] {
-        font-size: 1em;
-        line-height: 18px;
+        font-size: $font-0;
+        line-height: $line-height-medium;
       }
       .description, .hint {
         color: dark-light-choose($primary-medium, $secondary-medium);
@@ -38,6 +38,6 @@
 .image-upload-controls {
   padding: 10px;
   label.btn {
-    padding: 6px 10px;
+    padding: 5px 10px;
   }
 }
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index 2a73394fb7..e55a5acea5 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -9,7 +9,7 @@ $user_card_background: $secondary;
   width: 500px;
   left: -9999px;
   top: -9999px;
-  z-index: 990;
+  z-index: z("usercard");
   box-shadow: 1px 2px 6px rgba(0,0,0, .25);
   margin-top: -2px;
   color: $user_card_primary;
@@ -63,8 +63,8 @@ $user_card_background: $secondary;
 
   h1 {
     min-width: 120px;
-    font-size: 1.857em;
-    line-height: 1.25;
+    font-size: $font-up-4;
+    line-height: $line-height-medium;
     display: block;
     max-width: 250px;
     white-space: nowrap;
@@ -74,14 +74,14 @@ $user_card_background: $secondary;
       color: $user_card_primary;
     }
     i {
-      font-size: .857em;
+      font-size: $font-down-1;
       color: $user_card_primary;
     }
   }
 
   h2 {
-    font-size: 1.143em;
-    line-height: 1.25;
+    font-size: $font-up-1;
+    line-height: $line-height-medium;
     font-weight: normal;
     display: block;
     max-width: 250px;
@@ -94,7 +94,7 @@ $user_card_background: $secondary;
   }
 
   h3 {
-    font-size: 0.929em;
+    font-size: $font-0;
     font-weight: normal;
     margin-top: 0;
     color: scale-color($user_card_primary, $lightness: 20%);
@@ -106,7 +106,7 @@ $user_card_background: $secondary;
   }
 
   .groups {
-    font-size: 0.929em;
+    font-size: $font-down-1;
     font-weight: normal;
     margin-top: 0;
     color: $user_card_background;
@@ -230,7 +230,7 @@ $user_card_background: $secondary;
 
       h3 {
         color: $user_card_background;
-        font-size: 1em;
+        font-size: $font-0;
         margin-bottom: -8px;
       }
     }
@@ -255,7 +255,7 @@ $user_card_background: $secondary;
     position: absolute;
     right: 12px;
     bottom: 12px;
-    font-size: 2.286em;
+    font-size: $font-up-5;
     i {color: $user_card_primary;}
   }
 
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index c3fec738e9..52611d69be 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -111,7 +111,7 @@
 
 .user-invite-controls {
   background-color: $primary-low;
-  padding: 5px 10px 0px 0;
+  padding: 5px 10px 0 0;
   height: 35px;
 }
 
@@ -134,7 +134,7 @@
 
     &.group {
       .details {
-        padding: 15px 0px;
+        padding: 15px 0;
         margin: 0;
         color: dark-light-choose(lighten($primary, 10%), $secondary);
       }
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 0f48544c04..45b0bf9ca8 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -42,7 +42,7 @@ article.post {
   .post-date {
     float: right;
     color: #aaa;
-    font-size: 0.857em;
+    font-size: $font-down-1;
     margin: 10px 4px 0 0;
   }
 
@@ -76,7 +76,7 @@ article.post {
 }
 
 .username {
-  font-size: 0.929em;
+  font-size: $font-down-1;
   margin: 0 0 10px 0;
 
   a {
@@ -102,7 +102,7 @@ img.emoji {
 }
 
 .in-reply-to {
-  font-size: 0.929em;
+  font-size: $font-down-1;
   text-align: center;
   margin: 10px 20px 6px 0;
   display: inline-block;
@@ -111,7 +111,7 @@ img.emoji {
 }
 
 .replies {
-  font-size: 1.071em;
+  font-size: $font-0;
   color: #999;
 }
 
@@ -124,7 +124,7 @@ header.discourse {
   padding-left: 10px;
   padding-right: 10px;
   padding-bottom: 8px;
-  font-size: 1.286em;
+  font-size: $font-up-2;
   border-bottom: 3px solid #ddd;
 
   display: flex;
@@ -134,7 +134,7 @@ header.discourse {
 
   h3 {
     margin: 0 auto 0 0;
-    font-size: 1.0em;
+    font-size: $font-0;
   }
 }
 
@@ -143,7 +143,7 @@ header.discourse {
 }
 
 footer {
-  font-size: 1.286em;
+  font-size: $font-up-2;
   margin-top: 0.5em;
   .button {
     color: white;
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index 3924296243..08abaaf2ae 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -27,6 +27,8 @@
 // Import all component-specific files
 @import "mobile/components/*";
 
+@import "mobile/select-kit/*";
+
 /* These files doesn't actually exist, they are injected by Stylesheet::Compiler. */
 
 @import "plugins";
diff --git a/app/assets/stylesheets/mobile/alert.scss b/app/assets/stylesheets/mobile/alert.scss
index 0e91f6f71d..ac71f845a9 100644
--- a/app/assets/stylesheets/mobile/alert.scss
+++ b/app/assets/stylesheets/mobile/alert.scss
@@ -8,5 +8,5 @@
     margin-bottom: -3px;
     margin-top: -5px;
     padding: 15px;
-    font-size: 1em;
+    font-size: $font-0;
 }
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 0afe0dcb05..05a71110da 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -7,7 +7,7 @@
 }
 
 #reply-control {
-  z-index: 1002; //d-header is 1001
+  z-index: z("mobile-composer");
     .reply-area {
       padding: 0 10px;
       @media screen and (max-width: 374px) {
@@ -81,7 +81,7 @@
     &.show-preview {
       .d-editor-preview-wrapper {
         position: fixed;
-        z-index: 1000000;
+        z-index: z("base") + 1;
         top: 0;
         bottom: 0;
         left: 0;
@@ -99,7 +99,7 @@
         position: fixed;
         right: 5px;
         bottom: 5px;
-        z-index: 1000001;
+        z-index: z("base") + 2;
       }
     }
 
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index d6cc24df05..472345a79e 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -1,14 +1,3 @@
-.directory {
-  .period-chooser button {
-    margin: 0;
-  }
-  .period-chooser {
-    li {
-      text-align: left;
-    }
-  }
-}
-
 .user-controls {
   padding: 1em;
 }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 110663e05e..d978a12789 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -4,6 +4,11 @@
 // throughout the Discourse application
 
 // Base Elements
+html {
+  font-size: 15px; // Increasing overall font-size on mobile by 1px
+}
+
+
 body {
   background-color: $secondary;
 }
@@ -74,8 +79,8 @@ blockquote {
   &.activity-nav,
   &.preferences-nav {
     position: absolute;
-    right: 0px;
-    top: -55px;
+    right: 0;
+    top: -57px;
   }
 
   a {
@@ -84,6 +89,7 @@ blockquote {
     .fa {
       margin-right: 8px;
       color: dark-light-choose($primary-medium, $secondary-medium);
+      line-height: $line-height-medium;
     }
   }
 
@@ -97,7 +103,7 @@ blockquote {
 
   .d-icon-caret-down {
     position: absolute;
-    right: 0px;
+    right: 0;
   }
 
   .drop {
@@ -106,7 +112,7 @@ blockquote {
       left: 0;
       display: block;
       position: absolute;
-      z-index: 10000000;
+      z-index: z("dropdown");
       background-color: $secondary;
       width: 100%;
       list-style: none;
@@ -148,6 +154,6 @@ blockquote {
 
 // somehow the image logo assumption inherits margins from earlier in the CSS
 // stack we must remove margins for text site titles
-h2#site-text-logo {
+h1#site-text-logo {
   margin: 0 0 0 10px;
 }
diff --git a/app/assets/stylesheets/mobile/emoji.scss b/app/assets/stylesheets/mobile/emoji.scss
index e69de29bb2..34d67e4c01 100644
--- a/app/assets/stylesheets/mobile/emoji.scss
+++ b/app/assets/stylesheets/mobile/emoji.scss
@@ -0,0 +1,6 @@
+.emoji-picker {
+  box-shadow: none;
+  height: 250px;
+  border-radius: 0;
+  border: none;
+}
diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss
index ded66e7184..626f33b889 100644
--- a/app/assets/stylesheets/mobile/group.scss
+++ b/app/assets/stylesheets/mobile/group.scss
@@ -3,11 +3,11 @@
 }
 
 .group-header {
-  margin: 0px;
+  margin: 0;
 }
 
 .group-name {
-  margin: 5px 0px 0px 0px;
+  margin: 5px 0 0 0;
 }
 
 .group-nav {
@@ -29,7 +29,7 @@
 
 .group-activity-nav.mobile-nav {
   position: absolute;
-  right: 0px;
+  right: 0;
   top: -55px;
 }
 
@@ -44,7 +44,7 @@
 
   .group-flair-inputs {
     .group-flair-right {
-      margin: 0px
+      margin: 0
     }
   }
 }
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index e33cbf3c35..30f480f94b 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -2,9 +2,12 @@
 // Discourse header
 // --------------------------------------------------
 
+#site-text-logo {
+  font-size: $font-up-3;
+}
 @media only screen and (max-width: 320px) {
   #site-text-logo {
-    font-size: 1.286em;
+    font-size: $font-up-2;
   }
 }
 
@@ -34,10 +37,9 @@
 }
 
 .d-header-icons {
-  .badge-notification {
-    top: -5px;
+  .d-icon {
+    line-height: $line-height-medium;
   }
-
   .active .icon {
     &:after { margin-top: -1px; }
   }
@@ -52,5 +54,5 @@
 }
 
 .search-link .topic-statuses .topic-status i {
-  font-size: 1em;
+  font-size: $font-0;
 }
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index 395f8ca956..aa2413b644 100644
--- a/app/assets/stylesheets/mobile/history.scss
+++ b/app/assets/stylesheets/mobile/history.scss
@@ -6,7 +6,7 @@
     display: none;
   }
   #revision-numbers {
-    line-height: 2em;
+    line-height: $line-height-large;
   }
   #revision-details {
     background-color: $primary-low; 
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index 7079f65604..53d8e7b41a 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -2,7 +2,7 @@
 
 .btn-social {
   width: 150px;
-  font-size: 1.143em;
+  font-size: $font-up-1;
   overflow: hidden;
   white-space: nowrap;
 }
@@ -20,7 +20,7 @@
   }
   label { float: left; display: block; }
   textarea, input, select {
-    font-size: 1.143em;
+    font-size: $font-up-1;
     clear: left;
     margin-top: 0;
     }
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 7c4e4305c3..2eb136e07f 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -10,18 +10,8 @@
 
 // Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
 .bootbox.modal {
-  position: fixed;
   top: 10%;
-  z-index: 1050;
-  overflow: auto;
   width: 100%;
-  height: auto;
-  background-color: $secondary;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-
-  @include border-radius-all (6px);
-  box-shadow: 0 3px 7px rgba(0,0,0, 0.3);
-  background-clip: padding-box;
 }
 
 .modal.fade {
@@ -40,13 +30,7 @@
 // we need a little extra room on mobile for the
 // stuff inside the footer to fit
 .modal-footer {
-  padding-left: 7px;
-  padding-right: 7px;
-}
-
-.modal-footer .btn + .btn {
-  margin-left: 5px;
-  margin-bottom: 0;
+  padding: 15px 7px 10px 7px;
 }
 
 .modal-close {
@@ -55,16 +39,16 @@
 }
 
 .modal-header {
-  padding: 10px 0px 10px 10px;
+  padding: 10px 0 10px 10px;
 
   h3 {
     display: inline;
-    font-size: 1.286em;
-    margin: 0px;
+    font-size: $font-up-2;
+    margin: 0;
   }
 }
 .close {
-  font-size: 1.857em;
+  font-size: $font-up-4;
   padding: 10px 15px 5px 5px;
   color: $primary;
 }
@@ -106,7 +90,7 @@
 .custom-message-length {
   margin: -4px 0 10px 20px;
   color: dark-light-choose($primary-high, $secondary-low);
-  font-size: .857em;
+  font-size: $font-down-1;
 }
 
 .flag-message {
diff --git a/app/assets/stylesheets/mobile/search.scss b/app/assets/stylesheets/mobile/search.scss
index bb4ea638c3..c9903295ec 100644
--- a/app/assets/stylesheets/mobile/search.scss
+++ b/app/assets/stylesheets/mobile/search.scss
@@ -5,19 +5,8 @@
 .search-advanced {
   .search-advanced-options {
     .control-group {
-      padding-bottom: 10px;
-
-      &.pull-left {
-        float: none;
-        width: auto;
-      }
-
+      margin-bottom: 10px;
       .controls {
-        label {
-          display: block;
-          margin-bottom: 5px;
-        }
-
         input:not([type="checkbox"]),select {
           width: 75%;
         }
@@ -26,13 +15,23 @@
   }
 }
 
+.search-title {
+  .sort-by {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    .select-kit {
+      flex: 1 1 auto;
+    }
+  }
+}
+
 .search.row {
-  margin-top: 5px;
+  margin-top: 10px;
 }
 
 .search.row input.search {
   height: 25px;
-  width: 69%;
 }
 
 .fps-search-context {
diff --git a/app/assets/stylesheets/mobile/select-kit/category-drop.scss b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
new file mode 100644
index 0000000000..6205494dea
--- /dev/null
+++ b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
@@ -0,0 +1,17 @@
+.select-kit {
+  &.combo-box {
+    &.category-drop {
+      .category-drop-header {
+        font-size: $font-0;
+
+        .d-icon {
+          font-size: $font-0;
+        }
+      }
+
+      .select-kit-row {
+        font-weight: normal;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/select-kit/tag-drop.scss b/app/assets/stylesheets/mobile/select-kit/tag-drop.scss
new file mode 100644
index 0000000000..9f2dfbd55f
--- /dev/null
+++ b/app/assets/stylesheets/mobile/select-kit/tag-drop.scss
@@ -0,0 +1,17 @@
+.select-kit {
+  &.combo-box {
+    &.tag-drop {
+      .tag-drop-header {
+        font-size: $font-0;
+
+        .d-icon {
+          font-size: $font-0;
+        }
+      }
+
+      .select-kit-row {
+        font-weight: normal;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 2fe9e9bb30..8e7022e8e5 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -28,7 +28,7 @@
   .nav-pills .drop {
     border: 1px solid $primary-low;
     position: absolute;
-    z-index: 1000;
+    z-index: z("dropdown");
     background-color: $secondary;
     padding: 0 10px 10px 10px;
     width: 150px;
@@ -48,6 +48,7 @@
   }
   .nav-pills > li {
     background: $primary-low;
+    font-size: $font-down-1;
     .d-icon-caret-down {
       margin-left: 8px;
     }
@@ -85,7 +86,7 @@
   .badge-notification, .category-topic-link td.num .badge-notification {
     position: relative;
     top: -1px;
-    font-size: 1em;
+    font-size: $font-down-1;
     padding: 4px 6px 3px 6px;
     i {color: $secondary;}
 
@@ -105,7 +106,6 @@
   }
 
   .topic-item-stats {
-    margin-top: 8px;
     .category, .num, .last-poster {
       float: left;
     }
@@ -222,7 +222,7 @@ tr.category-topic-link {
 
   h3 {
     display: inline-block;
-    font-size: 1.286em;
+    font-size: $font-up-2;
     margin: 0 0 0 10px;
     i {
       margin-right: 5px;
@@ -237,7 +237,7 @@ tr.category-topic-link {
   }
 
   .category-topic-link .main-link .age {
-    font-size: 0.857em;
+    font-size: $font-down-1;
   }
 
   .category-description td {
@@ -283,7 +283,7 @@ tr.category-topic-link {
       margin: 3px 7px 0 0;
       color: dark-light-choose($primary, $secondary-low);
       font-weight: bold;
-      font-size: 0.857em;
+      font-size: $font-down-1;
     }
     figcaption {
       display: inline;
@@ -309,12 +309,6 @@ tr.category-topic-link {
 
 // Misc. stuff
 // --------------------------------------------------
-.list-controls {
-  .category-dropdown-button {
-    padding: 4px 10px 4px 8px;
-  }
-}
-
 .btn-group .dropdown-toggle:active,
 .btn-group.open .dropdown-toggle {
   outline: 0;
@@ -342,7 +336,7 @@ tr.category-topic-link {
   position: relative;
   top: 100%;
   left: 0;
-  z-index: 1000;
+  z-index: z("dropdown");
   display: none;
   float: left;
   width: 280px;
@@ -361,7 +355,7 @@ tr.category-topic-link {
   padding: 3px 15px;
   clear: both;
   font-weight: normal;
-  line-height: 18px;
+  line-height: $line-height-medium;
   color: $primary;
 }
 .dropdown-menu li > a:hover,
@@ -387,15 +381,6 @@ ol.category-breadcrumb {
   margin: 5px 10px 0 0;
 }
 
-.category-dropdown-menu {
-  height: 200px;
-
-  a.badge-category {
-    line-height: 26px !important;
-    margin-bottom: 0 !important;
-  }
-}
-
 .top-lists {
   h2 { margin-left: 10px; }
   .topic-list { padding-bottom: 10px; }
@@ -434,7 +419,7 @@ td .main-link {
 }
 .topic-list {
   .posts-map {
-    font-size: 1.143em;
+    font-size: $font-up-1;
   }
   // so the topic excerpt is full width
   // as the containing div is 80%
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 49ec7ce78e..e507b59fcd 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -5,7 +5,7 @@
 
 .topic-post article {
   border-top: 1px solid $primary-low;
-  padding: 8px 0;
+  padding: 15px 0 8px 0;
 }
 
 .post-stream {
@@ -20,10 +20,6 @@ span.badge-posts {
   display: none;
 }
 
-.who-liked {
-  margin-left: 10px;
-}
-
 .topic-post {
   nav.post-controls {
     clear: both;
@@ -33,9 +29,9 @@ span.badge-posts {
     }
     button {
       border: none;
-      font-size: 1.286em;
+      font-size: $font-up-1;
       padding: 8px 10px;
-      vertical-align: top;
+      vertical-align: middle;
       background: transparent;
       float: left;
       &.hidden {
@@ -60,7 +56,7 @@ span.badge-posts {
     }
 
     button.like-count {
-      font-size: 1em;
+      font-size: $font-0;
       padding: 8px 4px;
     }
   }
@@ -83,12 +79,12 @@ span.badge-posts {
   text-align: left;
   bottom: 0;
   left: 135px;
-  z-index: 1000;
+  z-index: z("dropdown");
 
   h3 {
     margin-top: 0;
     color: $primary;
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   ul {
@@ -129,10 +125,11 @@ span.badge-posts {
 }
 
 a.reply-to-tab {
-  position: absolute;
-  z-index: 400;
+  z-index: z("base") + 1;
   right: 80px;
   color: dark-light-choose($primary-medium, $secondary-medium);
+  margin: -3px 10px 0 0;
+  float: right;
 }
 
 .topic-post .boxed .contents {
@@ -154,17 +151,17 @@ a.reply-to-tab {
     margin-bottom: 4px;
     margin-top: 0;
     color: dark-light-choose($primary-medium, $secondary-medium);
-    line-height: 23px;
+    line-height: $line-height-large;
     font-weight: normal;
-    font-size: 1em;
+    font-size: $font-0;
   }
 
   h4 {
     margin: 0 0 3px 0;
     color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
-    font-size: 0.857em;
-    line-height: 15px;
+    font-size: $font-down-1;
+    line-height: $line-height-medium;
   }
 
   .user {
@@ -177,29 +174,6 @@ a.reply-to-tab {
     list-style: none;
   }
 
-  .avatars {
-    > div {
-      float: left;
-      position: relative;
-      margin: 3px 0;
-    }
-    .post-count {
-      position: absolute;
-      right: 0;
-      border-radius: 100px;
-      padding: 4px 5px 2px 5px;
-      text-align: center;
-      font-weight: normal;
-      font-size: .857em;
-      line-height: 1;
-    }
-  }
-
-  .avatar {
-    float: left;
-    margin-right: 4px;
-  }
-
   .map-collapsed {
     .secondary {
       display: none;
@@ -215,11 +189,11 @@ a.reply-to-tab {
       }
     }
     a, .number {
-      line-height: 20px;
+      line-height: $line-height-large;
     }
     .number, i {
       color: dark-light-choose($primary-high, $secondary-low);
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
 
     .avatar + a {
@@ -231,11 +205,17 @@ a.reply-to-tab {
   }
 
   .links, .information, .avatars {
-    padding: 7px 10px;
+    padding: 10px;
     color: $primary;
     overflow: auto;
   }
 
+  .information {
+    p {
+      margin: 0 0 10px 0;
+    }
+  }
+
   .participants { // PMs //
     .user {float: left; margin: 0 10px 10px 0;}
   }
@@ -256,17 +236,15 @@ a.reply-to-tab {
   }
 
   .buttons {
-    float: right;
     .btn {
       border: 0;
       padding: 0 15px;
       color: dark-light-choose($primary-medium, $secondary-high);
       background: blend-primary-secondary(5%);
       border-left: 1px solid $primary-low;
-      border-top: 1px solid $primary-low;
       .fa {
         margin: 0;
-        font-size: 1.286em;
+        font-size: $font-up-2;
         line-height: 52px;
       }
     }
@@ -312,7 +290,7 @@ a.reply-to-tab {
     }
 
    a.badge-category, a.badge-category-parent {
-    font-size: 0.857em;
+    font-size: $font-down-1;
     vertical-align: top;
     }
 }
@@ -328,12 +306,11 @@ span.post-count {
   .btn {
     margin-bottom: 5px;
     margin-right: 10px;
-    .d-icon-star {margin-right: 5px;}
   }
 }
 
 #topic-title {
-  z-index: 1000;
+  z-index: z("base") + 1;
   margin: 0 0 0 0 !important;
   padding: 15px 0;
 }
@@ -347,13 +324,11 @@ span.post-count {
 // this prevents image overflow on deeply nested blockquotes, lists, etc
 .cooked {
   overflow: hidden;
-  font-size: $base-font-size + 1; /* let's bump post body font size on mobile slightly */
-  line-height: $base-line-height + 2; /* bump up line height to match increased font */
 }
 
 .quote-button.visible {
   display: block;
-  z-index: 936;
+  z-index: z("tooltip");
 }
 
 iframe {
@@ -421,7 +396,7 @@ iframe {
 button.select-post {
   display: inline-block;
   position: absolute;
-  z-index: 401; // 400 is the reply-to tab
+  z-index: z("base") + 1;
   left: 200px;
   background-color: srgb-scale($tertiary, $secondary, 60%);
   color: $secondary;
@@ -444,7 +419,7 @@ button.select-post {
 }
 
 .deleted-user-avatar {
-  font-size: 2.286em;
+  font-size: $font-up-5;
 }
 
 span.btn-text {display: none;}
@@ -466,15 +441,15 @@ span.highlighted {
 
 .topic-avatar {
   float: left;
-  padding-top: 5px;
-  z-index:999; /* must render on top of topic-body + topic-meta-data, otherwise not tappable */
+  margin-right: 10px;
+  z-index: z("base") + 1; /* must render on top of topic-body + topic-meta-data, otherwise not tappable */
 }
 
 .topic-meta-data {
   margin-left: 50px;
+  font-size: $font-down-1;
   .names {
-    margin: 5px 0 0 5px;
-    line-height: 17px;
+    line-height: $line-height-medium;
 
     .poster-icon {
       float: right;
@@ -482,7 +457,6 @@ span.highlighted {
   }
   .post-info {
     float: right;
-    margin: 4px 10px 0 0;
     .edits { margin-right: 5px; }
   }
 }
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index d5f302d179..c87355ccfd 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -17,8 +17,8 @@
   //margin-bottom: 20px;
   margin: 0 60px 10px 0;
   h1 {
-    font-size: 1.429em;
-    line-height: 1.25;
+    font-size: $font-up-3;
+    line-height: $line-height-medium;
     a {
       color: $primary;
       vertical-align: middle;
@@ -38,7 +38,7 @@
 /* both blocks that appear under the standard post control buttons */
 .notification-options, .pinned-options {
   float: left;
-  margin-top: 0px;
+  margin-top: 0;
   padding-top: 1px;
   clear: both;
 }
@@ -61,7 +61,7 @@
   width: 0;
   right: 0;
   bottom: 0;
-  z-index: 950;
+  z-index: z("timeline");
   margin-right: 148px;
 }
 
@@ -81,7 +81,7 @@
       display: block;
       margin-top: 2px;
       margin-bottom: 2px;
-      font-size: 1.286em;
+      font-size: $font-up-2;
     }
   }
   .jump-form {
@@ -90,7 +90,7 @@
       width: 45px;
       height: 20px;
       text-align: center;
-      font-size: 1.143em;
+      font-size: $font-up-1;
     }
     button.btn {
       float: right !important;
@@ -126,18 +126,18 @@
     top: 9px;
     width: 100%;
     text-align: center;
-    z-index: 1;
+    z-index: z("base");
   }
   h4 {
     display: inline;
-    font-size: 1.286em;
-    line-height: 15px;
+    font-size: $font-up-2;
+    line-height: $line-height-small;
   }
   .d-icon {
     position: absolute;
     right: 8px;
     bottom: 9px;
-    z-index: 1;
+    z-index: z("base");
   }
   .bg {
     position: absolute;
@@ -155,8 +155,8 @@
   width: 90%;
   margin-left: auto;
   margin-right: auto;
-  font-size: 1.857em;
-  line-height: 1.25;
+  font-size: $font-up-4;
+  line-height: $line-height-medium;
 
   .topic-retry {
     display: block;
@@ -195,7 +195,7 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
     width: 100% !important;
   }
   .btn-small {
-    padding: 8px 12px;
+    padding: 6px 12px;
     margin: 6px 6px 0 0;
   }
 
@@ -208,7 +208,7 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
 // make mobile timeline top and bottom dates easier to select
 .topic-timeline {
   .start-date, .now-date { 
-    font-size: 1.143em; 
+    font-size: $font-up-1; 
     padding: 5px; 
   }
 }
@@ -223,4 +223,4 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
   .btn.pull-right {
     margin-right: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/mobile/upload.scss b/app/assets/stylesheets/mobile/upload.scss
index b9fb058267..ce8135103b 100644
--- a/app/assets/stylesheets/mobile/upload.scss
+++ b/app/assets/stylesheets/mobile/upload.scss
@@ -3,8 +3,8 @@
     width: 520px;
   }
   input[type="file"] {
-    font-size: 1em;
-    line-height: 18px;
+    font-size: $font-0;
+    line-height: $line-height-medium;
   }
   .description {
     color: dark-light-choose($primary-medium, $secondary-medium);
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 390d5ce468..fccb2542ef 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -97,11 +97,11 @@
 
       h1 {
         margin: 0;
-        line-height: 1;
+        line-height: $line-height-small;
       }
 
       h2 {
-        line-height: normal;
+        line-height: $line-height-medium;
       }
 
       .primary {
diff --git a/app/assets/stylesheets/vendor/bootstrap.scss b/app/assets/stylesheets/vendor/bootstrap.scss
index df21cf6c8a..6ca0caca0c 100644
--- a/app/assets/stylesheets/vendor/bootstrap.scss
+++ b/app/assets/stylesheets/vendor/bootstrap.scss
@@ -129,7 +129,6 @@ input[type="submit"].btn::-moz-focus-inner {
   margin: 1px 0 0;
   list-style: none;
   background-color: #ffffff;
-  border: 1px solid #ccc;
   border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 5px;
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
@@ -190,11 +189,11 @@ body {
     line-height: 36px;
   }
   h2 {
-    font-size: 1.714em;
+    font-size: 1.7511em;
     line-height: 36px;
   }
   h3 {
-    font-size: 1.286em;
+    font-size: 1.3195em;
     line-height: 27px;
   }
   h4, h5, h6 {
@@ -213,7 +212,7 @@ body {
 
   // this removes the unwanted top margin on a paragraph under a heading
   h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
-    margin-top:0px;
+    margin-top:0;
   }
 
   blockquote {
@@ -228,7 +227,6 @@ body {
   label, input, button, select, textarea {
     font-size: 0.929em;
     font-weight: normal;
-    line-height: 18px;
   }
   input, button, select, textarea {
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/app/assets/stylesheets/vendor/normalize.scss b/app/assets/stylesheets/vendor/normalize.scss
index 22ed7c3794..b694193cd7 100644
--- a/app/assets/stylesheets/vendor/normalize.scss
+++ b/app/assets/stylesheets/vendor/normalize.scss
@@ -132,7 +132,7 @@ dfn {
  */
 
 h1 {
-  font-size: 1.6em;
+  font-size: 1.7511em;
   margin: 0.67em 0;
 }
 
diff --git a/app/assets/stylesheets/vendor/select2.scss b/app/assets/stylesheets/vendor/select2.scss
index 2e2e4a5a07..0981475b45 100644
--- a/app/assets/stylesheets/vendor/select2.scss
+++ b/app/assets/stylesheets/vendor/select2.scss
@@ -402,7 +402,6 @@ disabled look for disabled choices in the results dropdown
 
 .select2-container-multi .select2-choices {
     height: auto !important;
-    height: 1%;
     margin: 0;
     padding: 0 5px 0 0;
     position: relative;
@@ -440,14 +439,13 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
 }
 
 .select2-container-multi .select2-choices .select2-search-field input {
-    padding: 5px 10px;
-    margin: 1px 0;
-
+    padding-left: 0;
     font-family: sans-serif;
     font-size: 1em;
     color: #666;
     outline: 0;
     border: 0;
+    margin-bottom: 0;
     -webkit-box-shadow: none;
             box-shadow: none;
     background: transparent !important;
@@ -462,11 +460,10 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
 }
 
 .select2-container-multi .select2-choices .select2-search-choice {
-    padding: 3px 5px 3px 18px;
-    margin: 3px 0 3px 5px;
+    padding: 0 0 0 12px;
+    margin: 0;
     position: relative;
 
-    line-height: 13px;
     color: #333;
     cursor: default;
     border: 1px solid #aaaaaa;
@@ -504,7 +501,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
     height: 13px;
     position: absolute;
     right: 3px;
-    top: 4px;
+    top: 8px;
 
     font-size: 1px;
     outline: none;
@@ -560,8 +557,8 @@ html[dir="rtl"] .select2-search-choice-close {
     overflow: hidden !important;
     position: absolute !important;
     outline: 0 !important;
-    left: 0px !important;
-    top: 0px !important;
+    left: 0 !important;
+    top: 0 !important;
 }
 
 .select2-display-none {
diff --git a/app/assets/stylesheets/vendor/sweetalert.scss b/app/assets/stylesheets/vendor/sweetalert.scss
index 76f159d7f0..b384cf53a3 100644
--- a/app/assets/stylesheets/vendor/sweetalert.scss
+++ b/app/assets/stylesheets/vendor/sweetalert.scss
@@ -52,7 +52,6 @@ body.stop-scrolling {
   .sweet-alert p {
     color: #797979;
     font-size: 16px;
-    text-align: center;
     font-weight: 300;
     position: relative;
     text-align: inherit;
@@ -132,14 +131,14 @@ body.stop-scrolling {
     margin-top: 10px;
     margin-bottom: 17px;
     font-size: 18px;
-    box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.06);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.06);
     padding: 0 12px;
     display: none;
     -webkit-transition: all 0.3s;
     transition: all 0.3s; }
     .sweet-alert input:focus {
       outline: none;
-      box-shadow: 0px 0px 3px #c4e6f5;
+      box-shadow: 0 0 3px #c4e6f5;
       border: 1px solid #b4dbed; }
       .sweet-alert input:focus::-moz-placeholder {
         transition: opacity 0.3s 0.03s ease;
@@ -195,7 +194,7 @@ body.stop-scrolling {
       .sweet-alert button.cancel:active {
         background-color: #a8a8a8; }
       .sweet-alert button.cancel:focus {
-        box-shadow: rgba(197, 205, 211, 0.8) 0px 0px 2px, rgba(0, 0, 0, 0.0470588) 0px 0px 0px 1px inset !important; }
+        box-shadow: rgba(197, 205, 211, 0.8) 0 0 2px, rgba(0, 0, 0, 0.0470588) 0 0 0 1px inset !important; }
     .sweet-alert button[disabled] {
       opacity: .6;
       cursor: default; }
@@ -216,7 +215,6 @@ body.stop-scrolling {
     height: 80px;
     border: 4px solid gray;
     -webkit-border-radius: 40px;
-    border-radius: 40px;
     border-radius: 50%;
     margin: 20px auto;
     padding: 0;
@@ -291,7 +289,6 @@ body.stop-scrolling {
       .sweet-alert .sa-icon.sa-success::before, .sweet-alert .sa-icon.sa-success::after {
         content: '';
         -webkit-border-radius: 40px;
-        border-radius: 40px;
         border-radius: 50%;
         position: absolute;
         width: 60px;
@@ -315,14 +312,13 @@ body.stop-scrolling {
         left: 30px;
         -webkit-transform: rotate(-45deg);
         transform: rotate(-45deg);
-        -webkit-transform-origin: 0px 60px;
-        transform-origin: 0px 60px; }
+        -webkit-transform-origin: 0 60px;
+        transform-origin: 0 60px; }
       .sweet-alert .sa-icon.sa-success .sa-placeholder {
         width: 80px;
         height: 80px;
         border: 4px solid rgba(165, 220, 134, 0.2);
         -webkit-border-radius: 40px;
-        border-radius: 40px;
         border-radius: 50%;
         box-sizing: content-box;
         position: absolute;
@@ -414,13 +410,13 @@ body.stop-scrolling {
 
 @-webkit-keyframes slideFromTop {
   0% {
-    top: 0%; }
+    top: 0; }
   100% {
     top: 50%; } }
 
 @keyframes slideFromTop {
   0% {
-    top: 0%; }
+    top: 0; }
   100% {
     top: 50%; } }
 
@@ -428,13 +424,13 @@ body.stop-scrolling {
   0% {
     top: 50%; }
   100% {
-    top: 0%; } }
+    top: 0; } }
 
 @keyframes slideToTop {
   0% {
     top: 50%; }
   100% {
-    top: 0%; } }
+    top: 0; } }
 
 @-webkit-keyframes slideFromBottom {
   0% {
@@ -547,7 +543,7 @@ body.stop-scrolling {
     top: 54px; }
   84% {
     width: 55px;
-    right: 0px;
+    right: 0;
     top: 35px; }
   100% {
     width: 47px;
@@ -565,7 +561,7 @@ body.stop-scrolling {
     top: 54px; }
   84% {
     width: 55px;
-    right: 0px;
+    right: 0;
     top: 35px; }
   100% {
     width: 47px;
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 656b5006a9..821c8e8689 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -14,7 +14,7 @@ body.wizard {
 
   color: #444;
 
-  line-height: 1.4em;
+  line-height: $line-height-large;
 }
 
 .finish-installation {
@@ -171,12 +171,11 @@ body.wizard {
 
     span {
       position: absolute;
-      font-size: 1.071em;
+      font-size: $font-0;
       mix-blend-mode: difference;
       color: white;
       z-index: 13;
-      font-size: 0.8em;
-      left: 2em;
+      left: 1.5em;
     }
 
     .screen {
@@ -195,8 +194,8 @@ body.wizard {
 
   .wizard-btn {
     border-radius: 2px;
-    font-size: 1.0em;
-    border: 0px;
+    font-size: $font-0;
+    border: 0;
     padding: 0.5em;
     transition: background-color .3s;
     margin-right: 0.5em;
@@ -208,7 +207,7 @@ body.wizard {
 
     &.small {
       padding: 0.25em 0.5em;
-      font-size: 0.9em;
+      font-size: $font-down-1;
     }
 
     &:hover {
@@ -408,7 +407,7 @@ body.wizard {
 .text-field {
   input {
     width: 100%;
-    font-size: 1.2em;
+    font-size: $font-up-1;
     padding: 6px;
     border: 1px solid #ccc;
     transition: border-color .5s;
@@ -481,7 +480,7 @@ body.wizard {
 
 /* fix wizard for mobile -- iPhone 5 default width */
 @media only screen and (max-device-width: 568px) {
-  h1 { font-size: 1.3em !important; }
+  h1 { font-size: $font-up-2 !important; }
   .wizard-column { margin: auto !important; }
   .wizard-step-contents { min-height: auto !important; }
   .wizard-step-banner { width: 100% !important; margin-bottom: 1em !important; }
diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb
index 52b8403cdd..9fd0f9c9bb 100644
--- a/app/controllers/admin/backups_controller.rb
+++ b/app/controllers/admin/backups_controller.rb
@@ -70,7 +70,7 @@ class Admin::BackupsController < Admin::AdminController
       send_file backup.path
     else
       if @error
-        render layout: 'no_ember', status: 422
+        render template: 'admin/backups/show.html.erb', layout: 'no_ember', status: 422
       else
         render body: nil, status: 404
       end
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index ed021d9158..51be59fcde 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -9,6 +9,6 @@ class Admin::DashboardController < Admin::AdminController
   end
 
   def problems
-    render_json_dump(problems: AdminDashboardData.fetch_problems)
+    render_json_dump(problems: AdminDashboardData.fetch_problems(check_force_https: request.ssl?))
   end
 end
diff --git a/app/controllers/admin/flags_controller.rb b/app/controllers/admin/flags_controller.rb
index 702479e82a..23096ae963 100644
--- a/app/controllers/admin/flags_controller.rb
+++ b/app/controllers/admin/flags_controller.rb
@@ -16,6 +16,7 @@ class Admin::FlagsController < Admin::AdminController
     posts, topics, users, post_actions, total_rows = FlagQuery.flagged_posts_report(
       current_user,
       filter: params[:filter],
+      user_id: params[:user_id],
       offset: offset,
       topic_id: params[:topic_id],
       per_page: per_page,
diff --git a/app/controllers/admin/search_logs_controller.rb b/app/controllers/admin/search_logs_controller.rb
index 515839b1b5..280121e9c8 100644
--- a/app/controllers/admin/search_logs_controller.rb
+++ b/app/controllers/admin/search_logs_controller.rb
@@ -10,12 +10,14 @@ class Admin::SearchLogsController < Admin::AdminController
     params.require(:term)
 
     term = params[:term]
-    period = params[:period] || "yearly"
+    period = params[:period] || "quarterly"
     search_type = params[:search_type] || "all"
 
     details = SearchLog.term_details(term, period&.to_sym, search_type&.to_sym)
     raise Discourse::NotFound if details.blank?
 
+    result = Search.execute(params[:term], guardian: guardian)
+    details[:search_result] = serialize_data(result, GroupedSearchResultSerializer, result: result)
     render_json_dump(term: details)
   end
 
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 457b049d0d..2095903ab6 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -82,10 +82,22 @@ class Admin::UsersController < Admin::AdminController
       )
     end
 
+    DiscourseEvent.trigger(
+      :user_suspended,
+      user: @user,
+      reason: params[:reason],
+      message: message,
+      user_history: user_history,
+      post_id: params[:post_id],
+      suspended_till: params[:suspend_until],
+      suspended_at: DateTime.now
+    )
+
     render_json_dump(
       suspension: {
         suspended: true,
         suspend_reason: params[:reason],
+        full_suspend_reason: user_history.try(:details),
         suspended_till: @user.suspended_till,
         suspended_at: @user.suspended_at
       }
@@ -289,7 +301,7 @@ class Admin::UsersController < Admin::AdminController
     render_json_dump(
       silence: {
         silenced: true,
-        silence_reason: params[:reason],
+        silence_reason: silencer.user_history.try(:details),
         silenced_till: @user.silenced_till,
         suspended_at: @user.silenced_at
       }
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f91baa9c22..479082fc6a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'current_user'
 require_dependency 'canonical_url'
 require_dependency 'discourse'
@@ -60,7 +62,11 @@ class ApplicationController < ActionController::Base
   end
 
   def use_crawler_layout?
-    @use_crawler_layout ||= (has_escaped_fragment? || CrawlerDetection.crawler?(request.user_agent) || params.key?("print"))
+    @use_crawler_layout ||=
+      request.user_agent &&
+      (request.content_type.blank? || request.content_type.include?('html')) &&
+      !['json', 'rss'].include?(params[:format]) &&
+      (has_escaped_fragment? || CrawlerDetection.crawler?(request.user_agent) || params.key?("print"))
   end
 
   def add_readonly_header
@@ -115,7 +121,6 @@ class ApplicationController < ActionController::Base
   end
 
   rescue_from Discourse::NotLoggedIn do |e|
-    raise e if Rails.env.test?
     if (request.format && request.format.json?) || request.xhr? || !request.get?
       rescue_discourse_actions(:not_logged_in, 403, include_ember: true)
     else
@@ -123,6 +128,15 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  rescue_from Discourse::InvalidParameters do |e|
+    message = I18n.t('invalid_params', message: e.message)
+    if (request.format && request.format.json?) || request.xhr? || !request.get?
+      rescue_discourse_actions(:invalid_parameters, 400, include_ember: true, custom_message_translated: message)
+    else
+      rescue_discourse_actions(:not_found, 400, custom_message_translated: message)
+    end
+  end
+
   rescue_from ActiveRecord::StatementInvalid do |e|
     Discourse.reset_active_record_cache_if_needed(e)
     raise e
@@ -139,7 +153,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  rescue_from Discourse::NotFound, PluginDisabled  do
+  rescue_from Discourse::NotFound, PluginDisabled, ActionController::RoutingError  do
     rescue_discourse_actions(:not_found, 404)
   end
 
@@ -162,18 +176,20 @@ class ApplicationController < ActionController::Base
                        (request.xhr?) ||
                        ((params[:external_id] || '').ends_with? '.json')
 
+    message = opts[:custom_message_translated] || I18n.t(opts[:custom_message] || type)
+
     if show_json_errors
       # HACK: do not use render_json_error for topics#show
       if request.params[:controller] == 'topics' && request.params[:action] == 'show'
-        return render status: status_code, layout: false, plain: (status_code == 404 || status_code == 410) ? build_not_found_page(status_code) : I18n.t(type)
+        return render status: status_code, layout: false, plain: (status_code == 404 || status_code == 410) ? build_not_found_page(status_code) : message
       end
 
-      render_json_error I18n.t(opts[:custom_message] || type), type: type, status: status_code
+      render_json_error message, type: type, status: status_code
     else
       begin
         current_user
       rescue Discourse::InvalidAccess
-        return render plain: I18n.t(opts[:custom_message] || type), status: status_code
+        return render plain: message, status: status_code
       end
 
       render html: build_not_found_page(status_code, opts[:include_ember] ? 'application' : 'no_ember')
@@ -199,12 +215,12 @@ class ApplicationController < ActionController::Base
   def clear_notifications
     if current_user && !@readonly_mode
 
-      cookie_notifications = cookies['cn'.freeze]
-      notifications = request.headers['Discourse-Clear-Notifications'.freeze]
+      cookie_notifications = cookies['cn']
+      notifications = request.headers['Discourse-Clear-Notifications']
 
       if cookie_notifications
         if notifications.present?
-          notifications += "," << cookie_notifications
+          notifications += ",#{cookie_notifications}"
         else
           notifications = cookie_notifications
         end
@@ -221,13 +237,15 @@ class ApplicationController < ActionController::Base
   def set_locale
     if !current_user
       if SiteSetting.set_locale_from_accept_language_header
-        I18n.locale = locale_from_header
+        locale = locale_from_header
       else
-        I18n.locale = SiteSetting.default_locale
+        locale = SiteSetting.default_locale
       end
     else
-      I18n.locale = current_user.effective_locale
+      locale = current_user.effective_locale
     end
+
+    I18n.locale = I18n.locale_available?(locale) ? locale : :en
     I18n.ensure_all_loaded!
   end
 
@@ -260,10 +278,10 @@ class ApplicationController < ActionController::Base
     session[:mobile_view] = params[:mobile_view] if params.has_key?(:mobile_view)
   end
 
-  NO_CUSTOM = "no_custom".freeze
-  NO_PLUGINS = "no_plugins".freeze
-  ONLY_OFFICIAL = "only_official".freeze
-  SAFE_MODE = "safe_mode".freeze
+  NO_CUSTOM = "no_custom"
+  NO_PLUGINS = "no_plugins"
+  ONLY_OFFICIAL = "only_official"
+  SAFE_MODE = "safe_mode"
 
   def resolve_safe_mode
     safe_mode = params[SAFE_MODE]
@@ -276,7 +294,7 @@ class ApplicationController < ActionController::Base
 
   def handle_theme
 
-    return if request.xhr? || request.format.json?
+    return if request.xhr? || request.format == "json" || request.format == "js"
     return if request.method != "GET"
 
     resolve_safe_mode
@@ -377,10 +395,8 @@ class ApplicationController < ActionController::Base
   end
 
   def post_ids_including_replies
-    post_ids = params[:post_ids].map { |p| p.to_i }
-    if params[:reply_post_ids]
-      post_ids |= PostReply.where(post_id: params[:reply_post_ids].map { |p| p.to_i }).pluck(:reply_id)
-    end
+    post_ids  = params[:post_ids].map(&:to_i)
+    post_ids |= PostReply.where(post_id: params[:reply_post_ids]).pluck(:reply_id) if params[:reply_post_ids]
     post_ids
   end
 
diff --git a/app/controllers/extra_locales_controller.rb b/app/controllers/extra_locales_controller.rb
index bc8cf8c475..d0e4884fcc 100644
--- a/app/controllers/extra_locales_controller.rb
+++ b/app/controllers/extra_locales_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ExtraLocalesController < ApplicationController
 
   layout :false
@@ -6,7 +8,29 @@ class ExtraLocalesController < ApplicationController
   def show
     bundle = params[:bundle]
     raise Discourse::InvalidAccess.new unless bundle =~ /^(admin|wizard)$/
+    if params[:v] && params[:v].length == 32
+      hash = ExtraLocalesController.bundle_js_hash(bundle)
+      if hash == params[:v]
+        immutable_for 24.hours
+      end
+    end
+    render plain: ExtraLocalesController.bundle_js(bundle), content_type: "application/javascript"
+  end
 
+  def self.bundle_js_hash(bundle)
+    @bundle_js_hash ||= {}
+    @bundle_js_hash[bundle] = Digest::MD5.hexdigest(bundle_js(bundle))
+  end
+
+  def self.url(bundle)
+    if Rails.env == "production"
+      "#{Discourse.base_uri}/extra-locales/#{bundle}?v=#{bundle_js_hash(bundle)}"
+    else
+      "#{Discourse.base_uri}/extra-locales/#{bundle}"
+    end
+  end
+
+  def self.bundle_js(bundle)
     locale_str = I18n.locale.to_s
     bundle_str = "#{bundle}_js"
 
@@ -32,6 +56,6 @@ class ExtraLocalesController < ApplicationController
       JS
     end
 
-    render plain: js, content_type: "application/javascript"
+    js
   end
 end
diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 00b1936628..ec02d4e5a1 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ForumsController < ApplicationController
 
   skip_before_action :preload_json, :check_xhr
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index a091e7e69d..639ee168c2 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -4,12 +4,34 @@ require_dependency 'post_destroyer'
 require_dependency 'post_merger'
 require_dependency 'distributed_memoizer'
 require_dependency 'new_post_result_serializer'
+require_dependency 'post_locker'
 
 class PostsController < ApplicationController
 
-  before_action :ensure_logged_in, except: [:show, :replies, :by_number, :short_link, :reply_history, :replyIids, :revisions, :latest_revision, :expand_embed, :markdown_id, :markdown_num, :cooked, :latest, :user_posts_feed]
+  before_action :ensure_logged_in, except: [
+    :show,
+    :replies,
+    :by_number,
+    :short_link,
+    :reply_history,
+    :replyIids,
+    :revisions,
+    :latest_revision,
+    :expand_embed,
+    :markdown_id,
+    :markdown_num,
+    :cooked,
+    :latest,
+    :user_posts_feed
+  ]
 
-  skip_before_action :preload_json, :check_xhr, only: [:markdown_id, :markdown_num, :short_link, :latest, :user_posts_feed]
+  skip_before_action :preload_json, :check_xhr, only: [
+    :markdown_id,
+    :markdown_num,
+    :short_link,
+    :latest,
+    :user_posts_feed
+  ]
 
   def markdown_id
     markdown Post.find(params[:id].to_i)
@@ -381,6 +403,13 @@ class PostsController < ApplicationController
     render_json_dump(result)
   end
 
+  def locked
+    post = find_post_from_params
+    locker = PostLocker.new(post, current_user)
+    params[:locked] === "true" ? locker.lock : locker.unlock
+    render_json_dump(locked: post.locked?)
+  end
+
   def bookmark
     if params[:bookmarked] == "true"
       post = find_post_from_params
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 993200edb3..03a88119c4 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -6,6 +6,7 @@ class StaticController < ApplicationController
   skip_before_action :check_xhr, :redirect_to_login_if_required
   skip_before_action :verify_authenticity_token, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
   skip_before_action :preload_json, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
+  skip_before_action :handle_theme, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
 
   PAGES_WITH_EMAIL_PARAM = ['login', 'password_reset', 'signup']
 
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 54115945e0..a73416d04f 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -19,30 +19,43 @@ class TagsController < ::ApplicationController
   before_action :set_category_from_params, except: [:index, :update, :destroy, :tag_feed, :search, :notifications, :update_notifications]
 
   def index
-    categories = Category.where("id in (select category_id from category_tags)")
-      .where("id in (?)", guardian.allowed_category_ids)
-      .preload(:tags)
-    category_tag_counts = categories.map do |c|
-      h = Tag.category_tags_by_count_query(c, limit: 300).count(Tag::COUNT_ARG)
-      h.merge!(c.tags.where.not(name: h.keys).inject({}) { |sum, t| sum[t.name] = 0; sum }) # unused tags
-      { id: c.id, tags: self.class.tag_counts_json(h) }
-    end
-
-    tag_counts = self.class.tags_by_count(guardian, limit: 300).count(Tag::COUNT_ARG)
-    @tags = self.class.tag_counts_json(tag_counts)
-
     @description_meta = I18n.t("tags.title")
     @title = @description_meta
 
     respond_to do |format|
+
       format.html do
         render :index
       end
+
       format.json do
-        render json: {
-          tags: @tags,
-          extras: { categories: category_tag_counts }
-        }
+        if SiteSetting.tags_listed_by_group
+          grouped_tag_counts = TagGroup.allowed(guardian).order('name ASC').includes(:tags).map do |tag_group|
+            { id: tag_group.id, name: tag_group.name, tags: self.class.tag_counts_json(tag_group.tags) }
+          end
+
+          ungrouped_tags = Tag.where("tags.id NOT IN (select tag_id from tag_group_memberships)")
+
+          render json: {
+            tags: self.class.tag_counts_json(ungrouped_tags), # tags that don't belong to a group
+            extras: { tag_groups: grouped_tag_counts }
+          }
+        else
+          unrestricted_tags = Tag.where("tags.id NOT IN (select tag_id from category_tags)")
+
+          categories = Category.where("id in (select category_id from category_tags)")
+            .where("id in (?)", guardian.allowed_category_ids)
+            .includes(:tags)
+
+          category_tag_counts = categories.map do |c|
+            { id: c.id, tags: self.class.tag_counts_json(c.tags) }
+          end
+
+          render json: {
+            tags: self.class.tag_counts_json(unrestricted_tags),
+            extras: { categories: category_tag_counts }
+          }
+        end
       end
     end
   end
@@ -130,7 +143,7 @@ class TagsController < ::ApplicationController
     category = params[:categoryId] ? Category.find_by_id(params[:categoryId]) : nil
 
     tags_with_counts = DiscourseTagging.filter_allowed_tags(
-      Tag.tags_by_count_query(params.slice(:limit)),
+      Tag.order('topic_count DESC').limit(params[:limit]),
       guardian,
       for_input: params[:filterForInput],
       term: params[:q],
@@ -138,7 +151,7 @@ class TagsController < ::ApplicationController
       selected_tags: params[:selected_tags]
     )
 
-    tags = tags_with_counts.count(Tag::COUNT_ARG).map { |t, c| { id: t, text: t, count: c } }
+    tags = self.class.tag_counts_json(tags_with_counts)
 
     json_response = { results: tags }
 
@@ -181,12 +194,8 @@ class TagsController < ::ApplicationController
       raise Discourse::NotFound unless SiteSetting.tagging_enabled?
     end
 
-    def self.tags_by_count(guardian, opts = {})
-      guardian.filter_allowed_categories(Tag.tags_by_count_query(opts))
-    end
-
-    def self.tag_counts_json(tag_counts)
-      tag_counts.map { |t, c| { id: t, text: t, count: c } }
+    def self.tag_counts_json(tags)
+      tags.map { |t| { id: t.name, text: t.name, count: t.topic_count } }
     end
 
     def set_category_from_params
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index fa241cb543..439c568343 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -521,13 +521,18 @@ class TopicsController < ApplicationController
   end
 
   def move_posts
-    params.require(:post_ids)
-    params.require(:topic_id)
+    post_ids = params.require(:post_ids)
+    topic_id = params.require(:topic_id)
     params.permit(:category_id)
 
-    topic = Topic.with_deleted.find_by(id: params[:topic_id])
+    topic = Topic.with_deleted.find_by(id: topic_id)
     guardian.ensure_can_move_posts!(topic)
 
+    # when creating a new topic, ensure the 1st post is a regular post
+    if params[:title].present? && Post.where(topic: topic, id: post_ids).order(:post_number).pluck(:post_type).first != Post.types[:regular]
+      return render_json_error("When moving posts to a new topic, the first post must be a regular post.")
+    end
+
     dest_topic = move_posts_to_destination(topic)
     render_topic_changes(dest_topic)
   rescue ActiveRecord::RecordInvalid => ex
@@ -585,14 +590,22 @@ class TopicsController < ApplicationController
   end
 
   def timings
-    PostTiming.process_timings(
-      current_user,
-      topic_params[:topic_id].to_i,
-      topic_params[:topic_time].to_i,
-      (topic_params[:timings].to_h || {}).map { |post_number, t| [post_number.to_i, t.to_i] },
-      mobile: view_context.mobile_view?
-    )
-    render body: nil
+    allowed_params = topic_params
+
+    topic_id = allowed_params[:topic_id].to_i
+    topic_time = allowed_params[:topic_time].to_i
+    timings = allowed_params[:timings].to_h || {}
+
+    hijack do
+      PostTiming.process_timings(
+        current_user,
+        topic_id,
+        topic_time,
+        timings.map { |post_number, t| [post_number.to_i, t.to_i] },
+        mobile: view_context.mobile_view?
+      )
+      render body: nil
+    end
   end
 
   def feed
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 04ccf5fdf0..afebf58eb8 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -41,6 +41,7 @@ class Users::OmniauthCallbacksController < ApplicationController
     @auth_result = authenticator.after_authenticate(auth)
 
     origin = request.env['omniauth.origin']
+
     if cookies[:destination_url].present?
       origin = cookies[:destination_url]
       cookies.delete(:destination_url)
@@ -53,8 +54,10 @@ class Users::OmniauthCallbacksController < ApplicationController
       end
     end
 
-    unless @origin.present?
+    if @origin.blank?
       @origin = Discourse.base_uri("/")
+    else
+      @auth_result.destination_url = origin
     end
 
     if @auth_result.failed?
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c81c28dc84..f4706ed858 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -107,6 +107,9 @@ class UsersController < ApplicationController
     guardian.ensure_can_edit!(user)
     attributes = user_params.merge!(custom_fields: params[:custom_fields])
 
+    # We can't update the username via this route. Use the username route
+    attributes.delete(:username)
+
     if params[:user_fields].present?
       attributes[:custom_fields] = {} unless params[:custom_fields].present?
 
@@ -178,7 +181,7 @@ class UsersController < ApplicationController
 
     user_badge = UserBadge.find_by(id: params[:user_badge_id])
     if user_badge && user_badge.user == user && user_badge.badge.allow_title?
-      user.title = user_badge.badge.name
+      user.title = user_badge.badge.display_name
       user.user_profile.badge_granted_title = true
       user.save!
       user.user_profile.save!
@@ -312,8 +315,6 @@ class UsersController < ApplicationController
     params[:for_user_id] ? User.find(params[:for_user_id]) : current_user
   end
 
-  FROM_STAGED = "from_staged".freeze
-
   def create
     params.require(:email)
     params.permit(:user_fields)
@@ -334,14 +335,9 @@ class UsersController < ApplicationController
       return fail_with("login.reserved_username")
     end
 
-    if user = User.where(staged: true).with_email(params[:email].strip.downcase).first
-      user_params.each { |k, v| user.send("#{k}=", v) }
-      user.staged = false
-      user.active = false
-      user.custom_fields[FROM_STAGED] = true
-    else
-      user = User.new(user_params)
-    end
+    new_user_params = user_params
+    user = User.unstage(new_user_params)
+    user = User.new(new_user_params) if user.nil?
 
     # Handle API approval
     if user.approved
@@ -504,8 +500,8 @@ class UsersController < ApplicationController
               success: false,
               message: @error,
               errors: @user&.errors&.to_hash,
-              is_developer: UsernameCheckerService.is_developer?(@user.email),
-              admin: @user.admin?
+              is_developer: UsernameCheckerService.is_developer?(@user&.email),
+              admin: @user&.admin?
             }
           else
             render json: {
@@ -543,35 +539,30 @@ class UsersController < ApplicationController
   end
 
   def admin_login
-    if current_user
-      return redirect_to path("/")
-    end
+    return redirect_to(path("/")) if current_user
 
     if request.put?
       RateLimiter.new(nil, "admin-login-hr-#{request.remote_ip}", 6, 1.hour).performed!
       RateLimiter.new(nil, "admin-login-min-#{request.remote_ip}", 3, 1.minute).performed!
 
-      user = User.with_email(params[:email]).where(admin: true).human_users.first
-      if user
+      if user = User.with_email(params[:email]).admins.human_users.first
         email_token = user.email_tokens.create(email: user.email)
         Jobs.enqueue(:critical_user_email, type: :admin_login, user_id: user.id, email_token: email_token.token)
         @message = I18n.t("admin_login.success")
       else
-        @message = I18n.t("admin_login.error")
+        @message = I18n.t("admin_login.errors.unknown_email_address")
       end
     elsif params[:token].present?
-      # token recieved, try to login
       if EmailToken.valid_token_format?(params[:token])
         @user = EmailToken.confirm(params[:token])
-        if @user && @user.admin?
-          # Log in user
+        if @user&.admin?
           log_on_user(@user)
           return redirect_to path("/")
         else
-          @message = I18n.t("admin_login.error")
+          @message = I18n.t("admin_login.errors.unknown_email_address")
         end
       else
-        @message = I18n.t("admin_login.error")
+        @message = I18n.t("admin_login.errors.invalid_token")
       end
     end
 
@@ -607,7 +598,7 @@ class UsersController < ApplicationController
       if user = User.where(id: session_user_id.to_i).first
         @account_created[:username] = user.username
         @account_created[:email] = user.email
-        @account_created[:show_controls] = !user.custom_fields[FROM_STAGED]
+        @account_created[:show_controls] = !user.from_staged?
       end
     end
 
@@ -661,11 +652,7 @@ class UsersController < ApplicationController
       @user = User.where(id: user_key.to_i).first
     end
 
-    if @user.blank? || @user.active? || current_user.present?
-      raise Discourse::InvalidAccess.new
-    end
-
-    if @user.custom_fields[FROM_STAGED]
+    if @user.blank? || @user.active? || current_user.present? || @user.from_staged?
       raise Discourse::InvalidAccess.new
     end
 
diff --git a/app/jobs/regular/backup_chunks_merger.rb b/app/jobs/regular/backup_chunks_merger.rb
index 97846fd476..23cda4d264 100644
--- a/app/jobs/regular/backup_chunks_merger.rb
+++ b/app/jobs/regular/backup_chunks_merger.rb
@@ -1,7 +1,7 @@
 module Jobs
 
   class BackupChunksMerger < Jobs::Base
-    sidekiq_options retry: false
+    sidekiq_options queue: 'critical', retry: false
 
     def execute(args)
       filename   = args[:filename]
@@ -19,6 +19,10 @@ module Jobs
 
       # merge all chunks
       HandleChunkUpload.merge_chunks(chunks, upload_path: backup_path, tmp_upload_path: tmp_backup_path, model: Backup, identifier: identifier, filename: filename, tmp_directory: tmp_directory)
+
+      # push an updated list to the clients
+      data = ActiveModel::ArraySerializer.new(Backup.all, each_serializer: BackupSerializer).as_json
+      MessageBus.publish("/admin/backups", data, user_ids: User.staff.pluck(:id))
     end
 
   end
diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb
index dbb195a5cd..5aa29987be 100644
--- a/app/jobs/regular/bulk_invite.rb
+++ b/app/jobs/regular/bulk_invite.rb
@@ -29,7 +29,8 @@ module Jobs
     end
 
     def read_csv_file(csv_path)
-      CSV.foreach(csv_path, encoding: "bom|utf-8") do |csv_info|
+      file = File.open(csv_path, encoding: 'bom|utf-8')
+      CSV.new(file).each do |csv_info|
         if csv_info[0]
           if (EmailValidator.email_regex =~ csv_info[0])
             # email is valid
@@ -45,6 +46,8 @@ module Jobs
     rescue Exception => e
       log "Bulk Invite Process Failed -- '#{e.message}'"
       @failed += 1
+    ensure
+      file.close
     end
 
     def get_group_ids(group_names, csv_line_number)
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index f58b558ebb..82832d946d 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -56,7 +56,6 @@ module Jobs
 
     def build_web_hook_body(args, web_hook)
       body = {}
-      guardian = Guardian.new(Discourse.system_user)
       event_type = args[:event_type].to_s
 
       if ping_event?(event_type)
diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb
index c86e5c3199..a482631621 100644
--- a/app/jobs/scheduled/ensure_db_consistency.rb
+++ b/app/jobs/scheduled/ensure_db_consistency.rb
@@ -15,6 +15,7 @@ module Jobs
       Badge.ensure_consistency!
       CategoryUser.ensure_consistency!
       UserOption.ensure_consistency!
+      Tag.ensure_consistency!
     end
   end
 end
diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
index c3db40fbf0..86d3a3a1d9 100644
--- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
+++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
@@ -33,8 +33,6 @@ module Jobs
     end
 
     def scores
-      scores = {}
-
       current_owners = UserBadge.where(badge_id: Badge::NewUserOfTheMonth).pluck(:user_id)
       current_owners = [-1] if current_owners.blank?
 
@@ -44,49 +42,43 @@ module Jobs
       sql = <<~SQL
         SELECT u.id,
           SUM(CASE
-               WHEN pa.id IS NOT NULL THEN
-                 CASE
-                   WHEN liked_by.id <= 0 THEN 0.0
-                   WHEN liked_by.admin OR liked_by.moderator THEN 2.0
-                   WHEN liked_by.trust_level = 0 THEN 0.1
-                   WHEN liked_by.trust_level = 1 THEN 0.25
-                   WHEN liked_by.trust_level = 2 THEN 1.0
-                   WHEN liked_by.trust_level = 3 THEN 1.5
-                   WHEN liked_by.trust_level = 4 THEN 2.0
-                   ELSE 1.0
-                 END
-               ELSE 0
-              END) / COUNT(DISTINCT p.id) AS score
+              WHEN pa.id IS NOT NULL THEN
+                CASE
+                WHEN liked_by.id <= 0         THEN 0.0
+                WHEN liked_by.admin           THEN 3.0
+                WHEN liked_by.moderator       THEN 3.0
+                WHEN liked_by.trust_level = 4 THEN 2.0
+                WHEN liked_by.trust_level = 3 THEN 1.5
+                WHEN liked_by.trust_level = 2 THEN 1.0
+                WHEN liked_by.trust_level = 1 THEN 0.25
+                WHEN liked_by.trust_level = 0 THEN 0.1
+                ELSE 1.0
+                END
+              ELSE 0
+              END) / (5 + COUNT(DISTINCT p.id)) AS score
         FROM users AS u
-        INNER JOIN user_stats AS us ON u.id = us.user_id
-        LEFT OUTER JOIN posts AS p ON p.user_id = u.id
-        LEFT OUTER JOIN post_actions AS pa ON
-          pa.post_id = p.id AND pa.post_action_type_id = :like
-        LEFT OUTER JOIN users AS liked_by ON liked_by.id = pa.user_id
-        LEFT OUTER JOIN topics AS t ON t.id = p.topic_id
-        WHERE u.active AND
-          u.id > 0 AND
-          NOT(u.admin) AND
-          NOT(u.moderator) AND
-          t.archetype <> '#{Archetype.private_message}' AND
-          u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL AND
-          u.id NOT IN (#{current_owners.join(',')})
+        INNER JOIN user_stats        AS us       ON u.id = us.user_id
+        LEFT OUTER JOIN posts        AS p        ON p.user_id = u.id
+        LEFT OUTER JOIN post_actions AS pa       ON pa.post_id = p.id AND pa.post_action_type_id = #{PostActionType.types[:like]}
+        LEFT OUTER JOIN users        AS liked_by ON liked_by.id = pa.user_id
+        LEFT OUTER JOIN topics       AS t        ON t.id = p.topic_id
+        WHERE u.active
+          AND u.id > 0
+          AND NOT u.staged
+          AND NOT u.admin
+          AND NOT u.moderator
+          AND t.archetype <> '#{Archetype.private_message}'
+          AND u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL
+          AND u.id NOT IN (#{current_owners.join(',')})
         GROUP BY u.id
         HAVING COUNT(DISTINCT p.id) > 1
-          AND COUNT(DISTINCT p.topic_id) > 1
-          AND COUNT(pa.id) > 1
+           AND COUNT(DISTINCT p.topic_id) > 1
+           AND COUNT(pa.id) > 1
         ORDER BY score DESC
-        LIMIT :max_awarded
+        LIMIT #{MAX_AWARDED}
       SQL
 
-      User.exec_sql(
-        sql,
-        like: PostActionType.types[:like],
-        max_awarded: MAX_AWARDED
-      ).each do |row|
-        scores[row['id'].to_i] = row['score'].to_f
-      end
-      scores
+      User.exec_sql(sql).map { |r| [r['id'].to_i, r['score'].to_f] }.to_h
     end
 
   end
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 57a4394c27..8ba294d424 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -39,6 +39,10 @@ class AdminDashboardData
   end
   class << self; attr_reader :problem_syms, :problem_blocks, :problem_messages; end
 
+  def initialize(opts = {})
+    @opts = opts
+  end
+
   def problems
     problems = []
     AdminDashboardData.problem_syms.each do |sym|
@@ -90,7 +94,7 @@ class AdminDashboardData
       'dashboard.poll_pop3_auth_error'
     ]
 
-    add_problem_check :rails_env_check, :host_names_check,
+    add_problem_check :rails_env_check, :host_names_check, :force_https_check,
                       :ram_check, :google_oauth2_config_check,
                       :facebook_config_check, :twitter_config_check,
                       :github_config_check, :s3_config_check, :image_magick_check,
@@ -112,8 +116,8 @@ class AdminDashboardData
     'dash-stats'
   end
 
-  def self.fetch_problems
-    AdminDashboardData.new.problems
+  def self.fetch_problems(opts = {})
+    AdminDashboardData.new(opts).problems
   end
 
   def self.problem_message_check(i18n_key)
@@ -234,4 +238,9 @@ class AdminDashboardData
     I18n.t('dashboard.missing_mailgun_api_key')
   end
 
+  def force_https_check
+    return unless @opts[:check_force_https]
+    I18n.t('dashboard.force_https_warning') unless SiteSetting.force_https
+  end
+
 end
diff --git a/app/models/badge.rb b/app/models/badge.rb
index a2f17409a7..abb618cc78 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -219,6 +219,10 @@ class Badge < ActiveRecord::Base
     Slug.for(self.display_name, '-')
   end
 
+  def manually_grantable?
+    query.blank? && !system?
+  end
+
   protected
 
     def ensure_not_system
diff --git a/app/models/incoming_links_report.rb b/app/models/incoming_links_report.rb
index cf28011b8d..5e817e18b2 100644
--- a/app/models/incoming_links_report.rb
+++ b/app/models/incoming_links_report.rb
@@ -102,7 +102,7 @@ class IncomingLinksReport
     num_clicks.each do |topic_id, num_clicks_element|
       topic = topics.find { |t| t.id == topic_id }
       if topic
-        report.data << { topic_id: topic_id, topic_title: topic.title, topic_slug: topic.slug, num_clicks: num_clicks_element }
+        report.data << { topic_id: topic_id, topic_title: topic.title, topic_url: topic.relative_url, num_clicks: num_clicks_element }
       end
     end
     report.data
diff --git a/app/models/invite.rb b/app/models/invite.rb
index b9fcb44e24..5a57084a07 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -32,7 +32,7 @@ class Invite < ActiveRecord::Base
   def user_doesnt_already_exist
     @email_already_exists = false
     return if email.blank?
-    user = User.find_by_email(email)
+    user = Invite.find_user_by_email(email)
 
     if user && user.id != self.user_id
       @email_already_exists = true
@@ -102,7 +102,7 @@ class Invite < ActiveRecord::Base
     custom_message = opts[:custom_message]
     lower_email = Email.downcase(email)
 
-    if user = User.find_by_email(lower_email)
+    if user = find_user_by_email(lower_email)
       extend_permissions(topic, user, invited_by) if topic
       raise UserExists.new I18n.t("invite.user_exists", email: lower_email, username: user.username)
     end
@@ -150,6 +150,10 @@ class Invite < ActiveRecord::Base
     invite
   end
 
+  def self.find_user_by_email(email)
+    User.with_email(email).where(staged: false).first
+  end
+
   def self.get_group_ids(group_names)
     group_ids = []
     if group_names
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 37a37a978c..157e28b5ad 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -26,7 +26,16 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
     end
     available_name = name || available_username
 
-    user = User.new(email: invite.email, username: available_username, name: available_name, active: true, trust_level: SiteSetting.default_invitee_trust_level)
+    user_params = {
+      email: invite.email,
+      username: available_username,
+      name: available_name,
+      active: true,
+      trust_level: SiteSetting.default_invitee_trust_level
+    }
+
+    user = User.unstage(user_params)
+    user = User.new(user_params) if user.nil?
 
     if !SiteSetting.must_approve_users? || (SiteSetting.must_approve_users? && invite.invited_by.staff?)
       user.approved = true
@@ -91,7 +100,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   end
 
   def get_existing_user
-    User.where(admin: false).find_by_email(invite.email)
+    User.where(admin: false, staged: false).find_by_email(invite.email)
   end
 
   def add_to_private_topics_if_invited
diff --git a/app/models/locale_site_setting.rb b/app/models/locale_site_setting.rb
index b38b5f85ac..ae3c02d3cc 100644
--- a/app/models/locale_site_setting.rb
+++ b/app/models/locale_site_setting.rb
@@ -7,9 +7,12 @@ class LocaleSiteSetting < EnumSiteSetting
   end
 
   def self.values
-    supported_locales.map do |l|
-      lang = language_names[l] || language_names[l[0..1]]
-      { name: lang ? lang['nativeName'] : l, value: l }
+    @values ||= supported_locales.map do |locale|
+      lang = language_names[locale] || language_names[locale.split("_")[0]]
+      {
+        name: lang ? lang['nativeName'] : locale,
+        value: locale
+      }
     end
   end
 
@@ -19,43 +22,41 @@ class LocaleSiteSetting < EnumSiteSetting
     return @language_names if @language_names
 
     @lock.synchronize do
-      @language_names ||= YAML.load(File.read(File.join(Rails.root, 'config', 'locales', 'names.yml')))
+      @language_names ||= begin
+        names = YAML.load(File.read(File.join(Rails.root, 'config', 'locales', 'names.yml')))
+
+        DiscoursePluginRegistry.locales.each do |locale, options|
+          if !names.key?(locale) && options[:name] && options[:nativeName]
+            names[locale] = { "name" => options[:name], "nativeName" => options[:nativeName] }
+          end
+        end
+
+        names
+      end
     end
   end
 
   def self.supported_locales
     @lock.synchronize do
       @supported_locales ||= begin
-        app_client_files = Dir.glob(
+        locales = Dir.glob(
           File.join(Rails.root, 'config', 'locales', 'client.*.yml')
-        )
+        ).map { |x| x.split('.')[-2] }
 
-        unless ignore_plugins?
-          app_client_files += Dir.glob(
-            File.join(Rails.root, 'plugins', '*', 'config', 'locales', 'client.*.yml')
-          )
-        end
-
-        app_client_files.map { |x| x.split('.')[-2] }
-          .uniq
-          .select { |locale| valid_locale?(locale) }
-          .sort
+        locales += DiscoursePluginRegistry.locales.keys
+        locales.uniq.sort
       end
     end
   end
 
-  def self.valid_locale?(locale)
-    assets = Rails.configuration.assets
-
-    assets.precompile.grep(/locales\/#{locale}(?:\.js)?/).present? &&
-      (Dir.glob(File.join(Rails.root, 'app', 'assets', 'javascripts', 'locales', "#{locale}.js.erb")).present? ||
-        Dir.glob(File.join(Rails.root, 'plugins', '*', 'assets', 'locales', "#{locale}.js.erb")).present?)
+  def self.reset!
+    @lock.synchronize do
+      @values = @language_names = @supported_locales = nil
+    end
   end
 
-  def self.ignore_plugins?
-    Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
+  def self.fallback_locale(locale)
+    plugin_locale = DiscoursePluginRegistry.locales[locale.to_s]
+    plugin_locale ? plugin_locale[:fallbackLocale]&.to_sym : nil
   end
-
-  private_class_method :valid_locale?
-  private_class_method :ignore_plugins?
 end
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index addf554b0f..82b6479725 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -9,11 +9,22 @@ class OptimizedImage < ActiveRecord::Base
   # BUMP UP if optimized image algorithm changes
   VERSION = 1
 
+  def self.lock(upload_id, width, height)
+    @hostname ||= `hostname`.strip rescue "unknown"
+    # note, the extra lock here ensures we only optimize one image per machine
+    # this can very easily lead to runaway CPU so slowing it down is beneficial
+    DistributedMutex.synchronize("optimized_image_host_#{@hostname}") do
+      DistributedMutex.synchronize("optimized_image_#{upload_id}_#{width}_#{height}") do
+        yield
+      end
+    end
+  end
+
   def self.create_for(upload, width, height, opts = {})
     return unless width > 0 && height > 0
     return if upload.try(:sha1).blank?
 
-    DistributedMutex.synchronize("optimized_image_#{upload.id}_#{width}_#{height}") do
+    lock(upload.id, width, height) do
       # do we already have that thumbnail?
       thumbnail = find_by(upload_id: upload.id, width: width, height: height)
 
diff --git a/app/models/post.rb b/app/models/post.rb
index 8312129479..7a8ce9a573 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -475,20 +475,21 @@ class Post < ActiveRecord::Base
     problems = []
     Post.where('baked_version IS NULL OR baked_version < ?', BAKED_VERSION)
       .order('id desc')
-      .limit(limit).each do |p|
+      .limit(limit).pluck(:id).each do |id|
       begin
-        p.rebake!
+        post = Post.find(id)
+        post.rebake!
       rescue => e
-        problems << { post: p, ex: e }
+        problems << { post: post, ex: e }
 
-        attempts = p.custom_fields["rebake_attempts"].to_i
+        attempts = post.custom_fields["rebake_attempts"].to_i
 
         if attempts > 3
-          p.update_columns(baked_version: BAKED_VERSION)
+          post.update_columns(baked_version: BAKED_VERSION)
           Discourse.warn_exception(e, message: "Can not rebake post# #{p.id} after 3 attempts, giving up")
         else
-          p.custom_fields["rebake_attempts"] = attempts + 1
-          p.save_custom_fields
+          post.custom_fields["rebake_attempts"] = attempts + 1
+          post.save_custom_fields
         end
 
       end
@@ -734,6 +735,10 @@ class Post < ActiveRecord::Base
     UserActionCreator.log_post(self)
   end
 
+  def locked?
+    locked_by_id.present?
+  end
+
   private
 
   def parse_quote_into_arguments(quote)
diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb
index b32c80ccfc..54ed9bbefc 100644
--- a/app/models/post_timing.rb
+++ b/app/models/post_timing.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 require_dependency 'archetype'
 
 class PostTiming < ActiveRecord::Base
@@ -76,7 +78,7 @@ class PostTiming < ActiveRecord::Base
   MAX_READ_TIME_PER_BATCH = 60 * 1000.0
 
   def self.process_timings(current_user, topic_id, topic_time, timings, opts = {})
-    current_user.user_stat.update_time_read!
+    UserStat.update_time_read!(current_user.id)
 
     max_time_per_post = ((Time.now - current_user.created_at) * 1000.0)
     max_time_per_post = MAX_READ_TIME_PER_BATCH if max_time_per_post > MAX_READ_TIME_PER_BATCH
@@ -103,8 +105,7 @@ class PostTiming < ActiveRecord::Base
     end
 
     if join_table.length > 0
-      sql = <<SQL
-
+      sql = <<~SQL
       UPDATE post_timings t
       SET msecs = t.msecs + x.msecs
       FROM (#{join_table.join(" UNION ALL ")}) x
@@ -117,7 +118,16 @@ SQL
       result = exec_sql(sql)
       result.type_map = SqlBuilder.pg_type_map
       existing = Set.new(result.column_values(0))
-      new_posts_read = timings.size - existing.size if Topic.where(id: topic_id, archetype: Archetype.default).exists?
+
+      sql = <<~SQL
+      SELECT 1 FROM topics
+      WHERE deleted_at IS NULL AND
+        archetype = 'regular' AND
+        id = :topic_id
+      SQL
+
+      is_regular = Post.exec_sql(sql, topic_id: topic_id).cmd_tuples == 1
+      new_posts_read = timings.size - existing.size if is_regular
 
       timings.each_with_index do |(post_number, time), index|
         unless existing.include?(index)
diff --git a/app/models/search_log.rb b/app/models/search_log.rb
index d91b1ae7a1..87e66af034 100644
--- a/app/models/search_log.rb
+++ b/app/models/search_log.rb
@@ -19,42 +19,56 @@ class SearchLog < ActiveRecord::Base
     )
   end
 
+  def self.redis_key(ip_address:, user_id: nil)
+    if user_id
+      "__SEARCH__LOG_#{user_id}"
+    else
+      "__SEARCH__LOG_#{ip_address}"
+    end
+  end
+
+  # for testing
+  def self.clear_debounce_cache!
+    $redis.keys("__SEARCH__LOG_*").each do |k|
+      $redis.del(k)
+    end
+  end
+
   def self.log(term:, search_type:, ip_address:, user_id: nil)
 
+    return [:error] if term.blank?
+
     search_type = search_types[search_type]
     return [:error] unless search_type.present? && ip_address.present?
 
-    update_sql = <<~SQL
-      UPDATE search_logs
-      SET term = :term,
-        created_at = :created_at
-      WHERE created_at > :timeframe AND
-        position(term IN :term) = 1 AND
-        ((:user_id IS NULL AND ip_address = :ip_address) OR
-          (user_id = :user_id))
-      RETURNING id
-    SQL
+    key = redis_key(user_id: user_id, ip_address: ip_address)
 
-    rows = exec_sql(
-      update_sql,
-      term: term,
-      created_at: Time.zone.now,
-      timeframe: 5.seconds.ago,
-      user_id: user_id,
-      ip_address: ip_address
-    )
+    result = nil
 
-    if rows.cmd_tuples == 0
-      result = create(
+    if existing = $redis.get(key)
+      id, old_term = existing.split(",", 2)
+      if term.start_with?(old_term)
+        where(id: id.to_i).update_all(
+          created_at: Time.zone.now,
+          term: term
+        )
+        result = [:updated, id.to_i]
+      end
+    end
+
+    if !result
+      log = create(
         term: term,
         search_type: search_type,
         ip_address: ip_address,
         user_id: user_id
       )
-      [:created, result.id]
-    else
-      [:updated, rows[0]['id'].to_i]
+      result = [:created, log.id]
     end
+
+    $redis.setex(key, 5, "#{result[1]},#{term}")
+
+    result
   end
 
   def self.term_details(term, period = :weekly, search_type = :all)
@@ -77,7 +91,10 @@ class SearchLog < ActiveRecord::Base
     return {
       type: "search_log_term",
       title: I18n.t("search_logs.graph_title"),
-      data: details
+      start_date: start_of(period),
+      end_date: Time.zone.now,
+      data: details,
+      period: period.to_s
     }
   end
 
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 7d5b4f4139..2e8a2c6694 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -31,9 +31,24 @@ class Tag < ActiveRecord::Base
     q
   end
 
-  def self.category_tags_by_count_query(category, opts = {})
-    tags_by_count_query(opts).where("tags.id in (select tag_id from category_tags where category_id = ?)", category.id)
-      .where("topics.category_id = ?", category.id)
+  def self.ensure_consistency!
+    update_topic_counts # topic_count counter cache can miscount
+  end
+
+  def self.update_topic_counts
+    Category.exec_sql <<~SQL
+      UPDATE tags t
+      SET topic_count = x.topic_count
+      FROM (
+        SELECT COUNT(topics.id) AS topic_count, tags.id AS tag_id
+        FROM tags
+        LEFT JOIN topic_tags ON tags.id = topic_tags.tag_id
+        LEFT JOIN topics ON topics.id = topic_tags.topic_id AND topics.deleted_at IS NULL
+        GROUP BY tags.id
+      ) x
+      WHERE x.tag_id = t.id
+        AND x.topic_count <> t.topic_count
+    SQL
   end
 
   def self.top_tags(limit_arg: nil, category: nil, guardian: nil)
diff --git a/app/models/tag_group.rb b/app/models/tag_group.rb
index 772d903627..ccc97798d0 100644
--- a/app/models/tag_group.rb
+++ b/app/models/tag_group.rb
@@ -21,6 +21,19 @@ class TagGroup < ActiveRecord::Base
       end
     end
   end
+
+  def self.allowed(guardian)
+    if guardian.is_staff?
+      TagGroup
+    else
+      category_permissions_filter = <<~SQL
+        id IN ( SELECT tag_group_id FROM category_tag_groups WHERE category_id IN (?))
+        OR id NOT IN (SELECT tag_group_id FROM category_tag_groups)
+      SQL
+
+      TagGroup.where(category_permissions_filter, guardian.allowed_category_ids)
+    end
+  end
 end
 
 # == Schema Information
diff --git a/app/models/topic.rb b/app/models/topic.rb
index b6138ac975..3561ffbc5b 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1273,7 +1273,7 @@ SQL
   end
 
   def featured_link_root_domain
-    MiniSuffix.domain(URI.parse(self.featured_link).hostname)
+    MiniSuffix.domain(URI.parse(URI.encode(self.featured_link)).hostname)
   end
 
   private
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 1692b1a727..8e3071ea4c 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -182,8 +182,8 @@ class TopicEmbed < ActiveRecord::Base
   end
 
   def self.topic_id_for_embed(embed_url)
-    embed_url = normalize_url(embed_url)
-    TopicEmbed.where("lower(embed_url) = ?", embed_url).pluck(:topic_id).first
+    embed_url = normalize_url(embed_url).sub(/^https?\:\/\//, '')
+    TopicEmbed.where("embed_url ~* '^https?://#{embed_url}$'").pluck(:topic_id).first
   end
 
   def self.first_paragraph_from(html)
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index 375659dc5c..dbb468cb48 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -34,8 +34,9 @@ class TopicList
                 :filter,
                 :for_period,
                 :per_page,
-                :tags,
-                :current_user
+                :top_tags,
+                :current_user,
+                :tags
 
   def initialize(filter, current_user, topics, opts = nil)
     @filter = filter
@@ -46,9 +47,13 @@ class TopicList
     if @opts[:category]
       @category = Category.find_by(id: @opts[:category_id])
     end
+
+    if @opts[:tags]
+      @tags = Tag.where(id: @opts[:tags]).all
+    end
   end
 
-  def tags
+  def top_tags
     opts = @category ? { category: @category } : {}
     opts[:guardian] = Guardian.new(@current_user)
     Tag.top_tags(opts)
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index 4c2ac9b82c..ea3859930c 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -21,7 +21,8 @@ class TranslationOverride < ActiveRecord::Base
 
     data = { value: value }
     if key.end_with?('_MF')
-      data[:compiled_js] = JsLocaleHelper.compile_message_format(locale, value)
+      _, filename = JsLocaleHelper.find_message_format_locale(['en'], false)
+      data[:compiled_js] = JsLocaleHelper.compile_message_format(filename, locale, value)
     end
 
     translation_override = find_or_initialize_by(params)
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 4d2e396a06..0e776d5267 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -77,7 +77,7 @@ class Upload < ActiveRecord::Base
   def self.get_from_url(url)
     return if url.blank?
     # we store relative urls, so we need to remove any host/cdn
-    url = url.sub(Discourse.asset_host, "") if Discourse.asset_host.present?
+    url = url.sub(Discourse.asset_host, "") if Discourse.asset_host.present? && Discourse.asset_host != SiteSetting.Upload.s3_cdn_url
     # when using s3, we need to replace with the absolute base url
     url = url.sub(SiteSetting.Upload.s3_cdn_url, Discourse.store.absolute_base_url) if SiteSetting.Upload.s3_cdn_url.present?
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 28dc1e8552..1d4283659e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -218,6 +218,7 @@ class User < ActiveRecord::Base
   end
 
   EMAIL = %r{([^@]+)@([^\.]+)}
+  FROM_STAGED = "from_staged".freeze
 
   def self.new_from_params(params)
     user = User.new
@@ -228,6 +229,19 @@ class User < ActiveRecord::Base
     user
   end
 
+  def self.unstage(params)
+    if user = User.where(staged: true).with_email(params[:email].strip.downcase).first
+      params.each { |k, v| user.send("#{k}=", v) }
+      user.staged = false
+      user.active = false
+      user.custom_fields[FROM_STAGED] = true
+      user.notifications.destroy_all
+
+      DiscourseEvent.trigger(:user_unstaged, user)
+    end
+    user
+  end
+
   def self.suggest_name(email)
     return "" if email.blank?
     email[/\A[^@]+/].tr(".", " ").titleize
@@ -372,7 +386,7 @@ class User < ActiveRecord::Base
 
   def read_first_notification?
     if (trust_level > TrustLevel[1] ||
-        created_at < TRACK_FIRST_NOTIFICATION_READ_DURATION.seconds.ago)
+        (first_seen_at.present? && first_seen_at < TRACK_FIRST_NOTIFICATION_READ_DURATION.seconds.ago))
 
       return true
     end
@@ -987,6 +1001,10 @@ class User < ActiveRecord::Base
       self.user_stat&.time_read
   end
 
+  def from_staged?
+    custom_fields[User::FROM_STAGED]
+  end
+
   protected
 
   def badge_grant
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index 426d2fe828..7ddbf73602 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -12,6 +12,8 @@ class UserEmail < ActiveRecord::Base
   validates :email, email: true, format: { with: EmailValidator.email_regex },
                     if: :validate_email?
 
+  validate :user_id_not_changed, if: :primary
+
   validates :primary, uniqueness: { scope: [:user_id] }
 
   private
@@ -27,6 +29,14 @@ class UserEmail < ActiveRecord::Base
     return false if self.skip_validate_email
     email_changed?
   end
+
+  def user_id_not_changed
+    if self.will_save_change_to_user_id? && self.persisted?
+      self.errors.add(:user_id, I18n.t(
+        'active_record.errors.model.user_email.attributes.user_id.reassigning_primary_email')
+      )
+    end
+  end
 end
 
 # == Schema Information
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index d2f7f25a94..7bd0f68587 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -63,7 +63,10 @@ class UserHistory < ActiveRecord::Base
                           backup_download: 45,
                           backup_destroy: 46,
                           notified_about_get_a_room: 47,
-                          change_name: 48)
+                          change_name: 48,
+                          post_locked: 49,
+                          post_unlocked: 50,
+                          check_personal_message: 51)
   end
 
   # Staff actions is a subset of all actions, used to audit actions taken by staff users.
@@ -104,7 +107,10 @@ class UserHistory < ActiveRecord::Base
                         :activate_user,
                         :change_readonly_mode,
                         :backup_download,
-                        :backup_destroy]
+                        :backup_destroy,
+                        :post_locked,
+                        :post_unlocked,
+                        :check_personal_message]
   end
 
   def self.staff_action_ids
diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb
index 8e7b3da43b..cf9ab05e2c 100644
--- a/app/models/user_stat.rb
+++ b/app/models/user_stat.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class UserStat < ActiveRecord::Base
 
   belongs_to :user
@@ -68,42 +69,44 @@ class UserStat < ActiveRecord::Base
 
   MAX_TIME_READ_DIFF = 100
   # attempt to add total read time to user based on previous time this was called
-  def update_time_read!
-    if last_seen = last_seen_cached
+  def self.update_time_read!(id)
+    if last_seen = last_seen_cached(id)
       diff = (Time.now.to_f - last_seen.to_f).round
       if diff > 0 && diff < MAX_TIME_READ_DIFF
         update_args = ["time_read = time_read + ?", diff]
-        UserStat.where(user_id: id, time_read: time_read).update_all(update_args)
+        UserStat.where(user_id: id).update_all(update_args)
         UserVisit.where(user_id: id, visited_at: Time.zone.now.to_date).update_all(update_args)
       end
     end
-    cache_last_seen(Time.now.to_f)
+    cache_last_seen(id, Time.now.to_f)
+  end
+
+  def update_time_read!
+    UserStat.update_time_read!(id)
   end
 
   def reset_bounce_score!
     update_columns(reset_bounce_score_after: nil, bounce_score: 0)
   end
 
+  def self.last_seen_key(id)
+    # frozen
+    -"user-last-seen:#{id}"
+  end
+
+  def self.last_seen_cached(id)
+    $redis.get(last_seen_key(id))
+  end
+
+  def self.cache_last_seen(id, val)
+    $redis.set(last_seen_key(id), val)
+  end
+
   protected
 
   def trigger_badges
     BadgeGranter.queue_badge_grant(Badge::Trigger::UserChange, user: self.user)
   end
-
-  private
-
-  def last_seen_key
-    @last_seen_key ||= "user-last-seen:#{id}"
-  end
-
-  def last_seen_cached
-    $redis.get(last_seen_key)
-  end
-
-  def cache_last_seen(val)
-    $redis.set(last_seen_key, val)
-  end
-
 end
 
 # == Schema Information
diff --git a/app/models/watched_word.rb b/app/models/watched_word.rb
index d9af0071de..0861fb3a22 100644
--- a/app/models/watched_word.rb
+++ b/app/models/watched_word.rb
@@ -31,11 +31,12 @@ class WatchedWord < ActiveRecord::Base
   scope :by_action, -> { order("action ASC, word ASC") }
 
   def self.normalize_word(w)
-    w.strip.downcase.squeeze('*')
+    w.strip.squeeze('*')
   end
 
   def self.create_or_update_word(params)
-    w = find_or_initialize_by(word: normalize_word(params[:word]))
+    new_word = normalize_word(params[:word])
+    w = WatchedWord.where("word ILIKE ?", new_word).first || WatchedWord.new(word: new_word)
     w.action_key = params[:action_key] if params[:action_key]
     w.action = params[:action] if params[:action]
     w.save
diff --git a/app/serializers/badge_serializer.rb b/app/serializers/badge_serializer.rb
index d3bbd87339..3f7929b328 100644
--- a/app/serializers/badge_serializer.rb
+++ b/app/serializers/badge_serializer.rb
@@ -1,7 +1,7 @@
 class BadgeSerializer < ApplicationSerializer
   attributes :id, :name, :description, :grant_count, :allow_title,
              :multiple_grant, :icon, :image, :listable, :enabled, :badge_grouping_id,
-             :system, :long_description, :slug, :has_badge
+             :system, :long_description, :slug, :has_badge, :manually_grantable?
 
   has_one :badge_type
 
diff --git a/app/serializers/incoming_email_details_serializer.rb b/app/serializers/incoming_email_details_serializer.rb
index d147215a39..f67f9fcb1e 100644
--- a/app/serializers/incoming_email_details_serializer.rb
+++ b/app/serializers/incoming_email_details_serializer.rb
@@ -33,14 +33,19 @@ class IncomingEmailDetailsSerializer < ApplicationSerializer
   end
 
   def subject
-    @mail.subject.presence || "(no subject)"
+    @mail.subject.presence || I18n.t("emails.incoming.no_subject")
   end
 
   def body
     body   = @mail.text_part.decoded rescue nil
     body ||= @mail.html_part.decoded rescue nil
     body ||= @mail.body.decoded      rescue nil
-    body.strip.truncate_words(100, escape: false)
+
+    return I18n.t("emails.incoming.no_body") if body.blank?
+
+    body.encode("utf-8", invalid: :replace, undef: :replace, replace: "")
+      .strip
+      .truncate_words(100, escape: false)
   end
 
 end
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index d756ee1dd3..3f1b2a7254 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -69,7 +69,8 @@ class PostSerializer < BasicPostSerializer
              :is_auto_generated,
              :action_code,
              :action_code_who,
-             :last_wiki_edit
+             :last_wiki_edit,
+             :locked
 
   def initialize(object, opts)
     super(object, opts)
@@ -354,6 +355,15 @@ class PostSerializer < BasicPostSerializer
     include_action_code? && action_code_who.present?
   end
 
+  def locked
+    true
+  end
+
+  # Only show locked posts to the users who made the post and staff
+  def include_locked?
+    object.locked? && (yours || scope.is_staff?)
+  end
+
   def last_wiki_edit
     object.revisions.last.updated_at
   end
diff --git a/app/serializers/suggested_topic_serializer.rb b/app/serializers/suggested_topic_serializer.rb
index a0817917f5..85eeea9499 100644
--- a/app/serializers/suggested_topic_serializer.rb
+++ b/app/serializers/suggested_topic_serializer.rb
@@ -7,7 +7,7 @@ class SuggestedTopicSerializer < ListableTopicSerializer
     has_one :user, serializer: BasicUserSerializer, embed: :objects
   end
 
-  attributes :archetype, :like_count, :views, :category_id, :tags, :featured_link
+  attributes :archetype, :like_count, :views, :category_id, :tags, :featured_link, :featured_link_root_domain
   has_many :posters, serializer: SuggestedPosterSerializer, embed: :objects
 
   def posters
@@ -29,4 +29,8 @@ class SuggestedTopicSerializer < ListableTopicSerializer
   def featured_link
     object.featured_link
   end
+
+  def include_featured_link_root_domain?
+    SiteSetting.topic_featured_link_enabled && object.featured_link
+  end
 end
diff --git a/app/serializers/tag_serializer.rb b/app/serializers/tag_serializer.rb
index 206a0256fa..9f05080029 100644
--- a/app/serializers/tag_serializer.rb
+++ b/app/serializers/tag_serializer.rb
@@ -1,3 +1,3 @@
 class TagSerializer < ApplicationSerializer
-  attributes :id, :name
+  attributes :id, :name, :topic_count
 end
diff --git a/app/serializers/topic_list_serializer.rb b/app/serializers/topic_list_serializer.rb
index 039a15342b..994ea84950 100644
--- a/app/serializers/topic_list_serializer.rb
+++ b/app/serializers/topic_list_serializer.rb
@@ -7,9 +7,11 @@ class TopicListSerializer < ApplicationSerializer
              :draft_sequence,
              :for_period,
              :per_page,
+             :top_tags,
              :tags
 
   has_many :topics, serializer: TopicListItemSerializer, embed: :objects
+  has_many :tags, serializer: TagSerializer, embed: :objects
 
   def can_create_topic
     scope.can_create?(Topic)
@@ -23,7 +25,11 @@ class TopicListSerializer < ApplicationSerializer
     object.more_topics_url.present? && (object.topics.size == object.per_page)
   end
 
-  def include_tags?
+  def include_top_tags?
     Tag.include_tags?
   end
+
+  def include_tags?
+    SiteSetting.tagging_enabled && object.tags.present?
+  end
 end
diff --git a/app/serializers/web_hook_post_serializer.rb b/app/serializers/web_hook_post_serializer.rb
index 5d79ef5f48..31e214cecc 100644
--- a/app/serializers/web_hook_post_serializer.rb
+++ b/app/serializers/web_hook_post_serializer.rb
@@ -1,4 +1,7 @@
 class WebHookPostSerializer < PostSerializer
+
+  attributes :topic_posts_count
+
   def include_topic_title?
     true
   end
@@ -14,4 +17,9 @@ class WebHookPostSerializer < PostSerializer
       false
     end
   end
+
+  def topic_posts_count
+    object.topic ? object.topic.posts_count : 0
+  end
+
 end
diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb
index 8ddd71c8e6..e964174bad 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -1,4 +1,6 @@
 class WebHookUserSerializer < UserSerializer
+  attributes :external_id
+
   # remove staff attributes
   def staff_attributes(*attrs)
   end
@@ -6,4 +8,13 @@ class WebHookUserSerializer < UserSerializer
   def include_email?
     scope.is_admin?
   end
+
+  def include_external_id?
+    scope.is_admin? && object.single_sign_on_record
+  end
+
+  def external_id
+    object.single_sign_on_record.external_id
+  end
+
 end
diff --git a/app/services/notification_emailer.rb b/app/services/notification_emailer.rb
index 9b593f3a17..4a6b56f2a2 100644
--- a/app/services/notification_emailer.rb
+++ b/app/services/notification_emailer.rb
@@ -72,6 +72,14 @@ class NotificationEmailer
     end
 
     def enqueue_private(type, delay = private_delay)
+
+      if notification.user.user_option.nil?
+        # this can happen if we roll back user creation really early
+        # or delete user
+        # bypass this pm
+        return
+      end
+
       return unless notification.user.user_option.email_private_messages?
       perform_enqueue(type, delay)
     end
diff --git a/app/services/post_action_notifier.rb b/app/services/post_action_notifier.rb
index 345e6aa735..f5e5a7f2a4 100644
--- a/app/services/post_action_notifier.rb
+++ b/app/services/post_action_notifier.rb
@@ -13,7 +13,7 @@ class PostActionNotifier
   end
 
   def self.refresh_like_notification(post, read)
-    return unless post && post.user_id
+    return unless post && post.user_id && post.topic
 
     usernames = post.post_actions.where(post_action_type_id: PostActionType.types[:like])
       .joins(:user)
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 63e33aa67b..40bafa40b7 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -155,8 +155,10 @@ class PostAlerter
     user_ids -= [post.user_id]
 
     users = User.where(id: user_ids)
+
     DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
-    users.each do |u|
+    user_ids.each do |id|
+      u = User.find_by(id: id)
       create_notification(u, Notification.types[:watching_first_post], post)
     end
   end
@@ -402,18 +404,20 @@ class PostAlerter
     end
 
     # Create the notification
-    user.notifications.create(notification_type: type,
-                              topic_id: post.topic_id,
-                              post_number: post.post_number,
-                              post_action_id: opts[:post_action_id],
-                              data: notification_data.to_json,
-                              skip_send_email: skip_send_email)
+    created = user.notifications.create(
+      notification_type: type,
+      topic_id: post.topic_id,
+      post_number: post.post_number,
+      post_action_id: opts[:post_action_id],
+      data: notification_data.to_json,
+      skip_send_email: skip_send_email
+    )
 
-   if !existing_notification && NOTIFIABLE_TYPES.include?(type) && !user.suspended?
-     # we may have an invalid post somehow, dont blow up
-     post_url = original_post.url rescue nil
-     if post_url
-       payload = {
+    if created.id && !existing_notification && NOTIFIABLE_TYPES.include?(type) && !user.suspended?
+      # we may have an invalid post somehow, dont blow up
+      post_url = original_post.url rescue nil
+      if post_url
+        payload = {
          notification_type: type,
          post_number: original_post.post_number,
          topic_title: original_post.topic.title,
@@ -421,14 +425,14 @@ class PostAlerter
          excerpt: original_post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
          username: original_username,
          post_url: post_url
-       }
+        }
 
         MessageBus.publish("/notification-alert/#{user.id}", payload, user_ids: [user.id])
         push_notification(user, payload)
         DiscourseEvent.trigger(:post_notification_alert, user, payload)
-     end
-   end
-
+      end
+    end
+    created.id ? created : nil
   end
 
   def contains_email_address?(addresses, user)
@@ -547,7 +551,9 @@ SQL
     notify = notify.where("id NOT IN (?)", exclude_user_ids) if exclude_user_ids.present?
 
     DiscourseEvent.trigger(:before_create_notifications_for_users, notify, post)
-    notify.each do |user|
+
+    notify.pluck(:id).each do |user_id|
+      user = User.find_by(id: user_id)
       create_notification(user, Notification.types[:posted], post)
     end
   end
diff --git a/app/services/random_topic_selector.rb b/app/services/random_topic_selector.rb
index 4aaa7d3343..1ac2d8500a 100644
--- a/app/services/random_topic_selector.rb
+++ b/app/services/random_topic_selector.rb
@@ -6,9 +6,6 @@ class RandomTopicSelector
   def self.backfill(category = nil)
     exclude = category&.topic_id
 
-    # don't leak private categories into the "everything" group
-    user = category ? CategoryFeaturedTopic.fake_admin : nil
-
     options = {
       per_page: category ? category.num_featured_topics : 3,
       visible: true,
@@ -16,9 +13,20 @@ class RandomTopicSelector
     }
 
     options[:except_topic_ids] = [category.topic_id] if exclude
-    options[:category] = category.id if category
 
-    query = TopicQuery.new(user, options)
+    if category
+      options[:category] = category.id
+      # NOTE: at the moment this site setting scopes tightly to a category (excluding subcats)
+      # this is done so we don't populate a junk cache
+      if SiteSetting.limit_suggested_to_category
+        options[:no_subcategories] = true
+      end
+
+      # don't leak private categories into the "everything" group
+      options[:guardian] = Guardian.new(CategoryFeaturedTopic.fake_admin)
+    end
+
+    query = TopicQuery.new(nil, options)
 
     results = query.latest_results.order('RANDOM()')
       .where(closed: false, archived: false)
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 924bed26ef..6261e65580 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -1,3 +1,5 @@
+require_dependency 'staff_message_format'
+
 # Responsible for logging the actions of admins and moderators.
 class StaffActionLogger
 
@@ -93,6 +95,14 @@ class StaffActionLogger
                                            target_user_id: user.id))
   end
 
+  def log_post_lock(post, opts = {})
+    raise Discourse::InvalidParameters.new(:post) unless post && post.is_a?(Post)
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[opts[:locked] ? :post_locked : :post_unlocked],
+      post_id: post.id)
+    )
+  end
+
   def log_site_setting_change(setting_name, previous_value, new_value, opts = {})
     raise Discourse::InvalidParameters.new(:setting_name) unless setting_name.present? && SiteSetting.respond_to?(setting_name)
     UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_site_setting],
@@ -170,8 +180,7 @@ class StaffActionLogger
   def log_user_suspend(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
 
-    details = (reason || '').dup
-    details << "\n\n#{opts[:message]}" if opts[:message].present?
+    details = StaffMessageFormat.new(:suspend, reason, opts[:message]).format
 
     args = params(opts).merge(
       action: UserHistory.actions[:suspend_user],
@@ -370,6 +379,13 @@ class StaffActionLogger
                                     new_value: state))
   end
 
+  def log_check_personal_message(topic, opts = {})
+    raise Discourse::InvalidParameters.new(:topic) unless topic && topic.is_a?(Topic)
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:check_personal_message],
+                                          topic_id: topic.id,
+                                          context: topic.relative_url))
+  end
+
   private
 
     def params(opts = nil)
diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rb
index 9858c75f9d..5db360637b 100644
--- a/app/services/user_silencer.rb
+++ b/app/services/user_silencer.rb
@@ -1,3 +1,5 @@
+require_dependency 'staff_message_format'
+
 class UserSilencer
 
   attr_reader :user_history
@@ -21,8 +23,11 @@ class UserSilencer
       if @user.save
         message_type = @opts[:message] || :silenced_by_staff
 
-        details = (@opts[:reason] || '').dup
-        details << "\n\n#{@opts[:message_body]}" if @opts[:message_body].present?
+        details = StaffMessageFormat.new(
+          :silence,
+          @opts[:reason],
+          @opts[:message_body]
+        ).format
 
         context = "#{message_type}: '#{post.topic&.title rescue ''}' #{@opts[:reason]}"
         SystemMessage.create(@user, message_type)
@@ -34,6 +39,17 @@ class UserSilencer
             details: details
           )
         end
+
+        DiscourseEvent.trigger(
+          :user_silenced,
+          user: @user,
+          reason: @opts[:reason],
+          message: @opts[:message_body],
+          user_history: @user_history,
+          post_id: @opts[:post_id],
+          silenced_till: @user.silenced_till,
+          silenced_at: DateTime.now
+        )
         return true
       end
     else
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 4eb4c3f275..b597a3217c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -36,7 +36,7 @@
     <%- end %>
 
     <%- if staff? %>
-      <script src="<%= Discourse.base_uri %>/extra-locales/admin"></script>
+      <script src="<%= ExtraLocalesController.url('admin') %>"></script>
       <%= preload_script "admin" %>
     <%- end %>
 
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 41f18eeb7b..cc250d4684 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -1,24 +1,3 @@
-<% if crawler_layout? %>
-
-<% content_for :title do %><%=t "tags.title" %> - <%= SiteSetting.title %><% end %>
-
-<h1><%=t "tags.title" %></h1>
-
-<div class='tags-list' itemscope itemtype='http://schema.org/ItemList'>
-  <% @tags.each do |tag| %>
-    <div itemprop='itemListElement' itemscope itemtype='http://schema.org/ListItem'>
-      <meta itemprop='url' content='<%= "#{Discourse.base_url}/tags/#{tag[:id]}" %>'>
-      <a href='<%= "#{Discourse.base_url}/tags/#{tag[:id]}" %>' itemprop='item'>
-        <span itemprop='name'>
-          <%= tag[:text] %>
-        </span>
-      </a>
-    </div>
-  <% end %>
-</div>
-
-<% end %>
-
 <% content_for :head do %>
   <%= raw crawlable_meta_data(title: @title, description: @description_meta) %>
 <% end %>
diff --git a/app/views/wizard/qunit.html.erb b/app/views/wizard/qunit.html.erb
index 4e6e7a3a59..561a2ade04 100644
--- a/app/views/wizard/qunit.html.erb
+++ b/app/views/wizard/qunit.html.erb
@@ -8,7 +8,7 @@
     <%= javascript_include_tag "qunit" %>
     <%= javascript_include_tag "wizard/test/test_helper" %>
     <%= csrf_meta_tags %>
-    <script src="/extra-locales/wizard"></script>
+    <script src="<%= ExtraLocalesController.url("wizard") %>"></script>
   </head>
   <body>
     <div id="qunit"></div>
diff --git a/config/application.rb b/config/application.rb
index 7ca36a951a..eb2b23be4d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
@@ -153,13 +155,16 @@ module Discourse
     # for some reason still seeing it in Rails 4
     config.middleware.delete Rack::Lock
 
+    # wrong place in middleware stack AND request tracker handles it
+    config.middleware.delete Rack::Runtime
+
     # ETags are pointless, we are dynamically compressing
     # so nginx strips etags, may revisit when mainline nginx
     # supports etags (post 1.7)
     config.middleware.delete Rack::ETag
 
-    # route all exceptions via our router
-    config.exceptions_app = self.routes
+    require 'middleware/discourse_public_exceptions'
+    config.exceptions_app = Middleware::DiscoursePublicExceptions.new(Rails.public_path)
 
     # Our templates shouldn't start with 'discourse/templates'
     config.handlebars.templates_root = 'discourse/templates'
@@ -183,12 +188,19 @@ module Discourse
     config.ember.handlebars_location = "#{Rails.root}/vendor/assets/javascripts/handlebars.js"
 
     require 'auth'
-    Discourse.activate_plugins! unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
 
     if GlobalSetting.relative_url_root.present?
       config.relative_url_root = GlobalSetting.relative_url_root
     end
 
+    if Rails.env == "test"
+      if ENV['LOAD_PLUGINS'] == "1"
+        Discourse.activate_plugins!
+      end
+    else
+      Discourse.activate_plugins!
+    end
+
     require_dependency 'stylesheet/manager'
 
     config.after_initialize do
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 2945e77236..fe949ee810 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -176,7 +176,10 @@ max_user_api_reqs_per_day = 2880
 
 max_admin_api_reqs_per_key_per_minute = 60
 
-max_requests_per_ip_per_minute = 200
-max_requests_per_ip_per_10_seconds = 50
-# global rate limiter will simply warn if the limit is exceeded, can be warn, block or none
-max_requests_per_ip_mode = none
+max_reqs_per_ip_per_minute = 200
+max_reqs_per_ip_per_10_seconds = 50
+# global rate limiter will simply warn if the limit is exceeded, can be warn+block, warn, block or none
+max_reqs_per_ip_mode = none
+
+# bypass rate limiting any IP resolved as a private IP
+max_reqs_rate_limit_on_private = false
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 2397915f3a..6143f0004a 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -10,12 +10,15 @@ Discourse::Application.configure do
   # Configure static asset server for tests with Cache-Control for performance
   config.public_file_server.enabled = true
 
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
+  # don't consider reqs local so we can properly handle exceptions like we do in prd
+  config.consider_all_requests_local       = false
+
+  # disable caching
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
+  # production has "show exceptions" on so we better have it
+  # in test as well
+  config.action_dispatch.show_exceptions = true
 
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection = false
diff --git a/config/initializers/006-mini_profiler.rb b/config/initializers/006-mini_profiler.rb
index 8a0ceb8a1a..737e3bbb0d 100644
--- a/config/initializers/006-mini_profiler.rb
+++ b/config/initializers/006-mini_profiler.rb
@@ -25,6 +25,7 @@ if defined?(Rack::MiniProfiler)
 
   skip = [
     /^\/message-bus/,
+    /^\/extra-locales/,
     /topics\/timings/,
     /assets/,
     /\/user_avatar\//,
diff --git a/config/initializers/009-omniauth.rb b/config/initializers/009-omniauth.rb
index 90feb34426..0e58b14b8c 100644
--- a/config/initializers/009-omniauth.rb
+++ b/config/initializers/009-omniauth.rb
@@ -1,14 +1,7 @@
 require "openssl"
 require "openid_redis_store"
 
-# if you need to test this and are having ssl issues see:
-#  http://stackoverflow.com/questions/6756460/openssl-error-using-omniauth-specified-ssl-path-but-didnt-work
-# OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if Rails.env.development?
-
-Rails.application.config.middleware.use OmniAuth::Builder do
-  Discourse.authenticators.each do |authenticator|
-    authenticator.register_middleware(self)
-  end
-end
+require "middleware/omniauth_bypass_middleware"
+Rails.application.config.middleware.use Middleware::OmniauthBypassMiddleware
 
 OmniAuth.config.logger = Rails.logger
diff --git a/config/initializers/014-rails_multisite.rb b/config/initializers/014-rails_multisite.rb
index fba7ec79da..630b07ff80 100644
--- a/config/initializers/014-rails_multisite.rb
+++ b/config/initializers/014-rails_multisite.rb
@@ -12,8 +12,8 @@ end
 
 if Rails.configuration.multisite
   Rails.configuration.middleware.swap(
-    RailsMultisite::ConnectionManagement,
-    RailsMultisite::ConnectionManagement,
+    RailsMultisite::Middleware,
+    RailsMultisite::Middleware,
     RailsMultisite::DiscoursePatches.config
   )
 end
diff --git a/config/initializers/100-i18n.rb b/config/initializers/100-i18n.rb
index 37a0dd050c..0f5df274ee 100644
--- a/config/initializers/100-i18n.rb
+++ b/config/initializers/100-i18n.rb
@@ -1,7 +1,10 @@
 # order: after 02-freedom_patches.rb
 
 require 'i18n/backend/discourse_i18n'
+require 'i18n/backend/fallback_locale_list'
+
 I18n.backend = I18n::Backend::DiscourseI18n.new
+I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
 I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) }
 I18n.init_accelerator!
 
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index e6ac8182f4..dfe5b65c70 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -560,7 +560,6 @@ ar:
       '14': "قيد الانتظار"
     categories:
       all: "كل الأقسام"
-      all_subcategories: "الكل"
       no_subcategory: "لا شيء"
       category: "قسم"
       category_list: "أعرض قائمة الأقسام"
@@ -648,7 +647,6 @@ ar:
       disable_jump_reply: "لا تنتقل إلى منشوري بعد النشر"
       dynamic_favicon: "أظهر عدد الموضوعات الجديدة/المحدّثة في أيقونة المتصفح"
       theme_default_on_all_devices: "اجعل هذة الواجهة افتراضية على جميع اجهزتي"
-      allow_private_messages: "السماح للأعضاء الاخرين بإرسال رسالة خاصة لي"
       external_links_in_new_tab: "فتح الروابط الخارجية في تبويب جديد"
       enable_quoting: "فعل خاصية إقتباس النصوص المظللة"
       change: "غيّر"
@@ -872,7 +870,6 @@ ar:
         title: "الدّعوات"
         user: "المستخدمين المدعويين"
         sent: "تم الإرسال"
-        none: "لا توجد دعوات معلقة لعرضها."
         truncated:
           zero: "لا يوجد دعوات لعرضها."
           one: "عرض الدعوة الأولى."
@@ -1335,8 +1332,6 @@ ar:
         posted: "منشور من"
         edited: "تم تعديل منشورك من"
         liked: "أُعجب بمنشورك"
-        private_message: "رسالة خاصة من"
-        invited_to_private_message: "تمت دعوتك لرسالة خاصة من "
         invited_to_topic: "تمت دعوتك لموضوع من "
         invitee_accepted: "قبلت دعوتك من"
         moved_post: "منشورك نقل بواسطة"
@@ -1350,7 +1345,6 @@ ar:
         quoted: 'اقتبس {{username}} كلامك في "{{topic}}" - {{site_title}}'
         replied: 'ردّ {{username}} عليك في "{{topic}}" - {{site_title}}'
         posted: 'نشر {{username}} في "{{topic}}" - {{site_title}}'
-        private_message: 'أرسل {{username}} إليك رسالة خاصة في "{{topic}}" - {{site_title}}'
         linked: '{{username}} وضع رابطا لمنشورك في "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "أضف صورة"
@@ -1705,7 +1699,6 @@ ar:
         visible: "إضاف إلي القائمة"
         reset_read: "تصفير بيانات القراءة"
         make_public: "اجعل الموضوع للعموم"
-        make_private: "اجعل الرسالة خاصة"
       feature:
         pin: "تثبيت الموضوع"
         unpin: "إلغاء تثبيت الموضوع"
@@ -2577,7 +2570,6 @@ ar:
         many: "%{count} ممنوح."
         other: "%{count} ممنوح."
       select_badge_for_title: اختر شارة لتستخدمها كلقب لك.
-      none: "لا شئ"
       badge_grouping:
         getting_started:
           name: الاساسية
@@ -2744,7 +2736,6 @@ ar:
         topics: "الموشوعات المبلغ عنها "
         agree: "أوافق"
         agree_title: "أكد هذا البلاغ كونه صحيح وصالح"
-        defer_flag_title: "ازل هذا البلاغ، لا يتطلب منك إجراء في الوقت الحالي."
         delete: "احذف"
         delete_title: "احذف المنشور المرتبط بهذا البلاغ"
         delete_post_defer_flag_title: "احذف المنشور. اذا كان المنشور الاول, احذف الموضوع"
@@ -2926,7 +2917,6 @@ ar:
           label: "رفع"
           title: "رفع نسخة احتياطية لهذه الحالة."
           uploading: "يرفع..."
-          success: "تم رفع '{{filename}}' بنجاح."
           error: "حصلت مشكلة أثناء رفع '{{filename}}': {{message}}"
         operations:
           is_running: "هناك عمليّة تجري حاليًّا..."
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 2658bab513..713b0cd14e 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -428,7 +428,6 @@ bs_BA:
       '14': "Na čekanju."
     categories:
       all: "Sve kategorije"
-      all_subcategories: "sve"
       no_subcategory: "nijedna"
       category: "Kategorija"
       category_list: "Prikaži listu kategorija"
@@ -705,7 +704,6 @@ bs_BA:
         title: "Pozivnice"
         user: "Pozvan Korisnik"
         sent: "poslano"
-        none: "Nema poziva na čekanju"
         redeemed: "Redeemed Invites"
         redeemed_tab: "Iskorišteno"
         redeemed_tab_with_count: "Iskorišteno ({{count}})"
@@ -1025,8 +1023,6 @@ bs_BA:
         posted: "Post od"
         edited: "Editujte vaš post"
         liked: "Vole vaš post"
-        private_message: "Privatna poruka od"
-        invited_to_private_message: "Pozvani na privatnu poruku od "
         invited_to_topic: "Pozvani na temu od"
         invitee_accepted: "Pozivnica prihvaćena od"
         moved_post: "Vaša objava je premještena od strane "
@@ -1039,7 +1035,6 @@ bs_BA:
         quoted: '{{username}} vas je citirao/la u "{{topic}}" - {{site_title}}'
         replied: '{{username}} vam je odgovorio/la u "{{topic}}" - {{site_title}}'
         posted: '{{username}} je objavio/la "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} vam je poslao/la privatnu poruku u "{{topic}}" - {{site_title}}'
         linked: '{{username}} je linkao/la vašu objavu "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Dodaj sliku"
@@ -1277,7 +1272,6 @@ bs_BA:
         visible: "Make Listed"
         reset_read: "Reset Read Data"
         make_public: "Napiši temu javno"
-        make_private: "Napiši privatnu poruku"
       feature:
         pin: "Prikači temu"
         unpin: "Otkači temu"
@@ -1677,7 +1671,6 @@ bs_BA:
         title: "Opomene"
         agree: "Slažem se"
         agree_title: "Confirm this flag as valid and correct"
-        defer_flag_title: "Remove this flag; it requires no action at this time."
         delete: "Delete"
         delete_title: "Delete the post this flag refers to."
         delete_post_defer_flag_title: "Delete post; if the first post, delete the topic"
@@ -1760,7 +1753,6 @@ bs_BA:
           size: "Size"
         upload:
           uploading: "Uploading..."
-          success: "'{{filename}}' has successfully been uploaded."
           error: "There has been an error while uploading '{{filename}}': {{message}}"
         operations:
           is_running: "An operation is currently running..."
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 39c9005649..bd1bb04b05 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -27,13 +27,13 @@ ca:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      timeline_date: "MMM AAAA"
+      timeline_date: "MMM YYYY"
       long_no_year: "MMM D h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
-      long_with_year: "MMM D, AAAA h:mm a"
-      long_with_year_no_time: "MMM D, AAAA"
-      full_with_year_no_time: "MMMM Do, AAAA"
+      long_with_year: "MMM D, YYYY h:mm a"
+      long_with_year_no_time: "MMM D, YYYY"
+      full_with_year_no_time: "MMMM Do, YYYY"
       long_date_with_year: "MMM D, 'YY LT"
       long_date_without_year: "MMM D, LT"
       long_date_with_year_without_time: "MMM D, 'YY"
@@ -73,7 +73,7 @@ ca:
           one: "1a"
           other: "%{count}a"
         date_month: "MMM D"
-        date_year: "MMM 'AA"
+        date_year: "MMM 'YY"
       medium:
         x_minutes:
           one: "1 min"
@@ -84,7 +84,7 @@ ca:
         x_days:
           one: "1 dia"
           other: "%{count} dies"
-        date_year: "MMM D, 'AA"
+        date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
           one: "fa 1 min"
@@ -445,7 +445,6 @@ ca:
       '14': "Pendents"
     categories:
       all: "totes les categories"
-      all_subcategories: "tot"
       no_subcategory: "cap"
       category: "Categoria"
       category_list: "Mostra la llista de categories"
@@ -737,7 +736,6 @@ ca:
         title: "Invitacions"
         user: "Persona usuària convidada"
         sent: "Enviat"
-        none: "No hi ha invitacions pendents per mostrar"
         truncated:
           one: "Mostrant la primera invitació."
           other: "Mostrant les primeres {{count}} invitacions."
@@ -1106,8 +1104,6 @@ ca:
         posted: "Publicat per"
         edited: "Edita la teva publicació per"
         liked: "Ha agradat la teva publicació"
-        private_message: "Missatge privat de"
-        invited_to_private_message: "Ha convidat a un missatge privat de"
         invited_to_topic: "Ha convidat a un tema de"
         invitee_accepted: "Invitació acceptada per"
         moved_post: "La teva publicació ha estat moguda per"
@@ -1120,7 +1116,6 @@ ca:
         quoted: '{{username}} t''ha citat a "{{topic}}" - {{site_title}}'
         replied: '{{username}} t''ha respost a "{{topic}}" - {{site_title}}'
         posted: '{{username}} publicat a "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} t''ha enviat un missatge privat a "{{topic}}" - {{site_title}}'
         linked: 'A {{username}} li ha agradat la teva publicació de "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Afegeix una imatge"
@@ -1306,6 +1301,11 @@ ca:
       jump_reply_up: salta a la resposta anterior
       jump_reply_down: salta a la darrera resposta
       deleted: "El tema ha estat esborrat"
+      auto_update_input:
+        next_month: "El mes següent"
+        three_months: "Tres mesos"
+        six_months: "Sis mesos"
+        one_year: "Un any"
       auto_close_title: 'Configuració del tancament automàtic'
       auto_close_immediate:
         one: "La darrera publicació al tema ja té 1 hora, per això el tema es tancarà immediatament."
@@ -1379,7 +1379,6 @@ ca:
         visible: "Fes llistats"
         reset_read: "Reinicia la lectura de dades"
         make_public: "Fes públic el tema"
-        make_private: "Fes un missatge privat"
       feature:
         pin: "Clava tema"
         unpin: "Desclava tema"
@@ -2021,7 +2020,6 @@ ca:
         one: "1 concedit"
         other: "%{count} concedits"
       select_badge_for_title: Tria un distintiu per fer-lo servir com al teu títol
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Començant
@@ -2177,7 +2175,6 @@ ca:
         title: "Avisos"
         agree: "D'acord"
         agree_title: "Confirma aquesta bandera com a vàlida i correcta"
-        defer_flag_title: "Esborra aquesta bandera; no necessita cap acció hores d'ara."
         delete: "Esborra"
         delete_title: "Esborra la publicació a la qual es refereix aquesta bandera."
         delete_post_defer_flag_title: "Esborra la publicació; si és la primera publicació, esborra el tema"
@@ -2352,7 +2349,6 @@ ca:
           label: "Carrega"
           title: "Carrega una còpia de seguretat a aquesta instància"
           uploading: "Carregant..."
-          success: "S'ha carregat '{{filename}}' amb èxit."
           error: "S'ha produït un error en carregar '{{filename}}': {{message}}"
         operations:
           is_running: "Ara hi ha una operació en marxa..."
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 2681c52dfc..b4aff06758 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -51,6 +51,10 @@ cs:
           one: "1s"
           few: "%{count}s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          few: "< %{count}m"
+          other: "< %{count}m"
         x_minutes:
           one: "1m"
           few: "%{count}m"
@@ -119,6 +123,7 @@ cs:
           other: "za %{count} let"
       previous_month: 'Předchozí měsíc'
       next_month: 'Další měsíc'
+      placeholder: datum
     share:
       topic: 'sdílet odkaz na toto téma'
       post: 'příspěvek #%{postNumber}'
@@ -378,6 +383,7 @@ cs:
       join: "Přidat se ke skupině"
       leave: "Opustit skupinu"
       request: "Požádat o členství ve skupině"
+      message: "Zpráva"
       automatic_group: Automatická skupina
       closed_group: Uzavřená skupina
       is_group_user: "Jsi členem této skupiny"
@@ -420,7 +426,7 @@ cs:
           title: "Sledování"
           description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek a zobrazí se vám počet nových odpovědí."
         regular:
-          title: "Normalní"
+          title: "Normální"
           description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek."
         muted:
           title: "Ztišený"
@@ -442,7 +448,6 @@ cs:
       '14': "Čeká na schválení"
     categories:
       all: "všechny kategorie"
-      all_subcategories: "vše"
       no_subcategory: "žádné"
       category: "Kategorie"
       category_list: "Zobrazit seznam kategorií"
@@ -476,7 +481,7 @@ cs:
       organisation: Organizace
       phone: Telefon
       other_accounts: "Další účty s touto IP adresou:"
-      delete_other_accounts: "Smazat"
+      delete_other_accounts: "Smazat %{count}"
       username: "uživatelské jméno"
       trust_level: "Důvěra"
       read_time: "čas k přečtení"
@@ -529,7 +534,9 @@ cs:
       admin: "{{user}} je administrátor"
       moderator_tooltip: "Tento uživatel je moderátor"
       admin_tooltip: "Tento uživatel je admi"
+      silenced_tooltip: "Tento uživatel je ztišen."
       suspended_notice: "Uživatel je suspendován do {{date}}."
+      suspended_permanently: "Tento uživatel je suspendován."
       suspended_reason: "Důvod: "
       github_profile: "Github"
       email_activity_summary: "Souhrn aktivit"
@@ -642,6 +649,7 @@ cs:
         instructions: "Obrázky pozadí jsou zarovnány a mají výchozí šířku 590px. "
       email:
         title: "Emailová adresa"
+        instructions: "není veřejný"
         ok: "Pro potvrzení vám pošleme email."
         invalid: "Zadejte prosím správnou emailovou adresu"
         authenticated: "Vaše emailová adresa byla autorizována přes službu {{provider}}."
@@ -735,7 +743,6 @@ cs:
         title: "Pozvánky"
         user: "Pozvaný uživatel"
         sent: "Odeslané"
-        none: "Nemáte žádně nevyřízené pozvánky na zobrazení."
         truncated:
           one: "Zobrazena první pozvánka."
           few: "Zobrazeno prvních {{count}} pozvánek."
@@ -879,6 +886,8 @@ cs:
     first_post: První příspěvek
     mute: Ignorovat
     unmute: Zrušit ignorování
+    last_post: Přidáno
+    time_read: Přečteno
     last_reply_lowercase: poslední odpověď
     replies_lowercase:
       one: odpověď
@@ -905,6 +914,7 @@ cs:
     private_message_info:
       title: "Zpráva"
       invite: "pozvat účastníka"
+      leave_message: "Opravdu chcete opustit tuto zprávu?"
       remove_allowed_user: "Určitě chcete odstranit {{name}} z této zprávy?"
       remove_allowed_group: "Opravdu chcete odstranit {{name}} z této zprávy?"
     email: 'Email'
@@ -915,6 +925,7 @@ cs:
     trust_level: 'Důvěryhodnost'
     search_hint: 'uživatelské jméno, email nebo IP adresa'
     create_account:
+      disclaimer: "Registrací souhlasíš s <a href='{{privacy_link}}'>podmínkami soukromí</a> a <a href='{{tos_link}}'>podmínkami užívání</a>."
       title: "Vytvořit nový účet"
       failed: "Něco se nepovedlo, možná je tato e-mailová adresa již použita. Zkuste použít formulář pro obnovení hesla."
     forgot_password:
@@ -949,6 +960,8 @@ cs:
       not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit."
       admin_not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit jako administrátor."
       resend_activation_email: "Klikněte sem pro zaslání aktivačního emailu."
+      resend_title: "Znovu odeslat aktivační email"
+      change_email: "Změnit emailovou adresu"
       submit_new_email: "Aktualizovat emailovou adresu"
       sent_activation_email_again: "Zaslali jsme vám další aktivační email na <b>{{currentEmail}}</b>. Může trvat několik minut, než vám dorazí. Zkontrolujte také vaši složku s nevyžádanou pošlou."
       to_continue: "Přihlaš se, prosím"
@@ -1001,6 +1014,12 @@ cs:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      filter_placeholder: Hledat...
+    emoji_picker:
+      nature: Příroda
+      travel: Cestování
+      recent: Nedávno použité
     composer:
       emoji: "Smajlíky :)"
       more_emoji: "více..."
@@ -1036,6 +1055,7 @@ cs:
       cancel: "Zrušit"
       create_topic: "Vytvořit téma"
       create_pm: "Zpráva"
+      create_whisper: "Šeptat"
       title: "Nebo zmáčkněte Ctrl+Enter"
       users_placeholder: "Přidat uživatele"
       title_placeholder: "O čem je ve zkratce tato diskuze?"
@@ -1093,21 +1113,19 @@ cs:
         posted: "Příspěvek od"
         edited: "Editovat váš příspěvek od"
         liked: "Líbil se tvůj příspěvek"
-        private_message: "Soukromá zpráva od"
-        invited_to_private_message: "Pozván k soukromé zprávě od"
         invited_to_topic: "Pozván k tématu od"
         invitee_accepted: "Pozvánka přijata od"
         moved_post: "Tvůj příspěvek přesunul"
         linked: "Odkaz na tvůj příspěvek"
         granted_badge: "Odznak přidělen"
         group_message_summary: "Zprávy ve skupinové schránce"
+        topic_reminder: "Připomenutí"
       popup:
         mentioned: '{{username}} vás zmínil v "{{topic}}" - {{site_title}}'
         group_mentioned: 'Uživatel {{username}} vás zmínil v "{{topic}}" - {{site_title}}'
         quoted: '{{username}} vás citoval v "{{topic}}" - {{site_title}}'
         replied: '{{username}} vám odpověděl v "{{topic}}" - {{site_title}}'
         posted: '{{username}} přispěl do "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} vám poslal soukromou zprávu v "{{topic}}" - {{site_title}}'
         linked: '{{username}} odkázal na vás příspěvek v "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Vložit obrázek"
@@ -1123,6 +1141,7 @@ cs:
       uploading: "Nahrávám"
       select_file: "Vyberte soubor"
       image_link: "adresa na kterou má váš obrázek odkazovat"
+      default_image_alt_text: obrázek
     search:
       sort_by: "Seřadil"
       relevance: "Relevance"
@@ -1138,6 +1157,9 @@ cs:
       no_more_results: "Nenalezeny žádné další výsledky."
       searching: "Hledám ..."
       post_format: "#{{post_number}} od {{username}}"
+      cant_find: "Nemůžete najít, co hledáte?"
+      start_new_topic: "Možná vytvořte nové téma?"
+      search_google_button: "Google"
       context:
         user: "Vyhledat příspěvky od @{{username}}"
         category: "Hledat v kategorii #{{category}}"
@@ -1147,10 +1169,14 @@ cs:
         title: Pokročilé hledání
         posted_by:
           label: Zaslal
+        in_category:
+          label: V kategorii
         in_group:
           label: Ve skupině
         with_badge:
           label: S odznakem
+        with_tags:
+          label: Se štítkem
         filters:
           likes: líbí se mi
           posted: Přidal jsem příspěvek
@@ -1375,7 +1401,6 @@ cs:
         visible: "Zviditelnit"
         reset_read: "Vynulovat počet čtení"
         make_public: "Vytvořit Veřejné Téma"
-        make_private: "Vytvořit Soukromou zprávu"
       feature:
         pin: "Připevnit téma"
         unpin: "Odstranit připevnění"
@@ -1499,6 +1524,15 @@ cs:
       multi_select:
         select: 'vybrat'
         selected: 'vybráno ({{count}})'
+        select_post:
+          label: 'označit'
+          title: 'Přidat příspěvek do výběru'
+        selected_post:
+          label: 'vybrané'
+          title: 'Kliknutím odstraníte příspěvek z výběru'
+        select_replies:
+          label: 'vybrat +odpovědi'
+          title: 'Přidej příspěvek a všechny jeho odpovědi do výběru'
         delete: smazat označené
         cancel: zrušit označování
         select_all: vybrat vše
@@ -1908,6 +1942,7 @@ cs:
     history: "Historie"
     changed_by: "od uživatele {{author}}"
     raw_email:
+      title: "Příchozí email"
       not_available: "Není k dispozici!"
     categories_list: "Seznam kategorií"
     filters:
@@ -2065,7 +2100,6 @@ cs:
         few: "%{count} přidělen"
         other: "%{count} přidělen"
       select_badge_for_title: Vyberte odznak, který chcete použít jako svůj titul
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Jak začít?
@@ -2092,6 +2126,7 @@ cs:
       selector_no_tags: "bez štítků"
       changed: "změněné štítky:"
       tags: "Štítky"
+      choose_for_topic: "volitelné štítky"
       delete_tag: "Smaž štítek"
       rename_tag: "Přejmenovat štítek"
       rename_instructions: "Vyber název nového štítku:"
@@ -2214,7 +2249,6 @@ cs:
         title: "Nahlášení"
         agree: "Schválit"
         agree_title: "Potvrdit toto hlášení jako právoplatné a korektní"
-        defer_flag_title: "Odstranit nahlášení; teď nevyžaduje žádné opatření."
         delete: "Smazat"
         delete_title: "Smazat příspěvek, na který toto hlášení odkazuje."
         delete_post_defer_flag_title: "Smazat příspěvek; pokud je to první příspěvek, tak smazat téma"
@@ -2229,6 +2263,7 @@ cs:
         clear_topic_flags: "Hotovo"
         clear_topic_flags_title: "The topic has been investigated and issues have been resolved. Click Done to remove the flags."
         more: "(více odpovědí...)"
+        suspend_user: "Zakázat uživatele"
         dispositions:
           agreed: "schváleno"
           disagreed: "neschváleno"
@@ -2239,9 +2274,15 @@ cs:
         error: "Něco se pokazilo"
         reply_message: "Odpovědět"
         topic_flagged: "Tohle <strong>téma</strong> bylo označeno."
+        show_full: "Zobrazit celý příspěvek"
         visit_topic: "Zobrazit téma pro přijmutí opatření."
         was_edited: "Příspěvek byl upraven po prvním nahlášení"
         previous_flags_count: "Tento příspěvek byl již nahlášen {{count}} krát."
+        details: "podrobnosti"
+        flagged_topics:
+          topic: "Téma"
+          type: "Typ"
+          users: "Uživatelé"
       groups:
         primary: "Hlavní skupina"
         no_primary: "(žádná hlavní skupina)"
@@ -2352,7 +2393,6 @@ cs:
           label: "Nahrát"
           title: "Nahrát zálohu do téhle instance"
           uploading: "Nahrávání..."
-          success: "'{{filename}}' has successfully been uploaded."
           error: "There has been an error while uploading '{{filename}}': {{message}}"
         operations:
           is_running: "An operation is currently running..."
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index a2e70cf9a9..a48aaee063 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -448,7 +448,6 @@ da:
       '14': "Afventer"
     categories:
       all: "alle kategorier"
-      all_subcategories: "Alle"
       no_subcategory: "ingen"
       category: "Kategori"
       category_list: "Vis liste over kategorier"
@@ -527,7 +526,6 @@ da:
       disable_jump_reply: "Ikke hop til mit indlæg efter jeg svarer"
       dynamic_favicon: "Vis nyt / opdateret emnetal på browserikon"
       theme_default_on_all_devices: "Gør dette til mit standard design på alle mine enheder"
-      allow_private_messages: "Tillad andre brugere at sende mig private beskeder"
       external_links_in_new_tab: "Åbn alle eksterne links i en ny fane"
       enable_quoting: "Tillad citering af markeret tekst"
       change: "skift"
@@ -748,7 +746,6 @@ da:
         title: "Invitationer"
         user: "Inviteret bruger"
         sent: "Sendt"
-        none: "Der er ingen afventende invitationer."
         truncated:
           one: "Viser den første invitation."
           other: "Viser de første {{count}} invitationer."
@@ -1109,8 +1106,6 @@ da:
         posted: "Indlæg af"
         edited: "Rediger dit indlæg af"
         liked: "Likede dit indlæg"
-        private_message: "Privat besked fra"
-        invited_to_private_message: "Inviteret til en privat besked fra"
         invited_to_topic: "Inviteret til et indlæg fra"
         invitee_accepted: "Invitation accepteret af"
         moved_post: "Dit indlæg blev flyttet af"
@@ -1123,7 +1118,6 @@ da:
         quoted: '{{username}} citerede dig i "{{topic}}" - {{site_title}}'
         replied: '{{username}} svarede dig i "{{topic}}" - {{site_title}}'
         posted: '{{username}} skrev i "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} sendte dig en privat besked i "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkede til dit indlæg fra "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Indsæt billede"
@@ -1419,7 +1413,6 @@ da:
         visible: "Går listet"
         reset_read: "Glem hvilke emner jeg har læst"
         make_public: "Gør til offentligt emne"
-        make_private: "Gør til privat besked"
       feature:
         pin: "Fastgør Emne"
         unpin: "Fjern Fastgøring af Emne"
@@ -2085,7 +2078,6 @@ da:
         one: "1 tildelt"
         other: "%{count} tildelt"
       select_badge_for_title: Vælg en badge, du vil bruge som din titel
-      none: "<ingen>"
       badge_grouping:
         getting_started:
           name: Sådan kommer du i gang
@@ -2241,7 +2233,6 @@ da:
         title: "Flag"
         agree: "Enig"
         agree_title: "Bekræft dette flag er gyldigt og korrekt"
-        defer_flag_title: "Fjern dette flag; Det kræver ingen handling på nuværende tidspunkt."
         delete: "Slet"
         delete_title: "Slet det indlæg, som flaget refererer til."
         delete_post_defer_flag_title: "Slet indlægget; hvis det er det første, så slet hele emnet"
@@ -2419,7 +2410,6 @@ da:
           label: "Upload"
           title: "Upload en backup til denne instans"
           uploading: "Uploader..."
-          success: "'{{filename}}' er blevet uploaded."
           error: "Der skete en fejl da filen '{{filename}}' blev forsøgt uploaded: {{message}}"
         operations:
           is_running: "Der kører allerede en operation..."
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 34969a65be..16fc0a2d61 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -411,7 +411,7 @@ de:
         owners: "Gruppenbesitzer und Admins"
       alias_levels:
         mentionable: "Wer kann diese Gruppe @erwähnen?"
-        messageable: "Wer cann dieser Gruppe eine Nachricht schicken?"
+        messageable: "Wer kann dieser Gruppe eine Nachricht schicken?"
         nobody: "Niemand"
         only_admins: "Nur Administratoren"
         mods_and_admins: "Nur Moderatoren und Administratoren"
@@ -460,7 +460,6 @@ de:
       '14': "Ausstehend"
     categories:
       all: "Alle Kategorien"
-      all_subcategories: "alle"
       no_subcategory: "keine"
       category: "Kategorie"
       category_list: "Kategorieliste anzeigen"
@@ -540,7 +539,6 @@ de:
       disable_jump_reply: "Springe nicht zu meinem Beitrag, nachdem ich geantwortet habe"
       dynamic_favicon: "Zeige die Anzahl der neuen und geänderten Themen im Browser-Symbol an"
       theme_default_on_all_devices: "Übernehme dieses Theme für alle meine Geräte."
-      allow_private_messages: "Erlaube anderen Benutzern, mir Nachrichten zu schicken"
       external_links_in_new_tab: "Öffne alle externen Links in einem neuen Tab"
       enable_quoting: "Aktiviere Zitatantwort mit dem hervorgehobenen Text"
       change: "ändern"
@@ -764,7 +762,6 @@ de:
         title: "Einladungen"
         user: "Eingeladener Benutzer"
         sent: "Gesendet"
-        none: "Es gibt keine ausstehenden Einladungen."
         truncated:
           one: "Zeige die erste Einladung."
           other: "Zeige die ersten {{count}} Einladungen."
@@ -1209,8 +1206,6 @@ de:
         posted: "Beitrag von"
         edited: "Beitrag bearbeitet von"
         liked: "Gefällt dein Beitrag"
-        private_message: "Nachricht von"
-        invited_to_private_message: "Zu Unterhaltung eingeladen von"
         invited_to_topic: "Zu Thema eingeladen von"
         invitee_accepted: "Einladung angenommen von"
         moved_post: "Dein Beitrag wurde verschoben von"
@@ -1224,7 +1219,6 @@ de:
         quoted: '{{username}} hat dich in "{{topic}}" - {{site_title}} zitiert'
         replied: '{{username}} hat dir in "{{topic}}" - {{site_title}} geantwortet'
         posted: '{{username}} hat in "{{topic}}" - {{site_title}} einen Beitrag verfasst'
-        private_message: '{{username}} hat dir in "{{topic}}" - {{site_title}} eine Nachricht geschickt'
         linked: '{{username}} hat in "{{topic}}" - {{site_title}} einen Beitrag von dir verlinkt'
     upload_selector:
       title: "Ein Bild hinzufügen"
@@ -1561,7 +1555,6 @@ de:
         visible: "Sichtbar machen"
         reset_read: "„Gelesen“ zurücksetzen"
         make_public: "Umwandeln in öffentliches Thema"
-        make_private: "Umwandeln in Nachricht"
       feature:
         pin: "Thema anheften"
         unpin: "Thema loslösen"
@@ -2267,7 +2260,7 @@ de:
         one: "1-mal verliehen"
         other: "%{count}-mal verliehen"
       select_badge_for_title: Wähle ein Abzeichen als deinen Titel aus
-      none: "<keines>"
+      none: "(keine)"
       badge_grouping:
         getting_started:
           name: Erste Schritte
@@ -2439,8 +2432,6 @@ de:
         agree_flag_restore_post_title: "Beitrag wiederherstellen, sodass alle Benutzer/-innen ihn sehen können."
         agree_flag: "Zustimmen und Beitrag behalten"
         agree_flag_title: "Meldung zustimmen und den Beitrag unbearbeitet lassen."
-        defer_flag: "Ignorieren"
-        defer_flag_title: "Entferne diese Meldung. Derzeit besteht kein Handlungsbedarf."
         delete: "Löschen"
         delete_title: "Lösche den Beitrag, auf den diese Meldung verweist."
         delete_post_defer_flag: "Beitrag löschen und Meldung ignorieren"
@@ -2640,7 +2631,6 @@ de:
           label: "Hochladen"
           title: "Eine Sicherung zu dieser Instanz hochladen"
           uploading: "Wird hochgeladen…"
-          success: "'{{filename}}' wurde erfolgreich hochgeladen."
           error: "Beim Hochladen der Datei '{{filename}}' ist ein Fehler aufgetreten: {{message}}"
         operations:
           is_running: "Ein Vorgang läuft gerade…"
@@ -2996,7 +2986,7 @@ de:
             text: "Zusammenfassen"
             title: "Erzeugt neue Einträge zum Blockieren von Subnetzen, wenn mindestens 'min_ban_entries_for_roll_up' Einträge vorhanden sind."
         search_logs:
-          title: "Protokolle durchsuchen"
+          title: "Suchprotokolle"
           term: "Suchbegriff"
           searches: "Suchen"
           click_through: "Durchklicken"
@@ -3025,7 +3015,7 @@ de:
         action_descriptions:
           block: 'Verhindert, dass Beiträge mit diesen Wörtern abgeschickt werden. Benutzer werden eine Fehlermeldung sehen, wenn sie ihren Beitrag abschicken.'
           censor: 'Erlaube Beiträge mit diesen Wörtern, aber ersetze sie mit Zeichen, die die zensierten Wörter verstecken.'
-          require_approval: 'Beitärge mit diesen Wörtern werden eine Genehmigung vom Team erfordern, bevor sie sichtbar sind.'
+          require_approval: 'Beiträge mit diesen Wörtern werden eine Genehmigung vom Team erfordern, bevor sie sichtbar sind.'
           flag: 'Erlaube Beiträge mit diesen Wörtern, aber markiere sie als unangemessen, damit Moderatoren sie überprüfen können.'
         form:
           label: 'Neues Wort:'
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 0e4da15cb9..51d9a38c54 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -458,7 +458,6 @@ el:
       '14': "Εκκρεμή"
     categories:
       all: "όλες οι κατηγορίες"
-      all_subcategories: "όλα"
       no_subcategory: "κανένα"
       category: "Κατηγορία"
       category_list: "Εμφάνισε τη λίστα κατηγοριών"
@@ -538,7 +537,6 @@ el:
       disable_jump_reply: "Να μην εστιάζεται η ανάρτηση μου αφού απαντήσω"
       dynamic_favicon: "Δείξε τον αριθμό νέων/ενημερωμένων νημάτων στο εικονίδιο του προγράμματος περιήγησης"
       theme_default_on_all_devices: "Αυτό να γίνει το προεπιλεγμένο θέμα σε όλες μου τις συσκευές"
-      allow_private_messages: "Επίτρεψε στους χρήστες να μου στέλνουν προσωπικά μηνύματα"
       external_links_in_new_tab: "Άνοιγε όλους τους εξωτερικούς συνδέσμους σε νέα καρτέλα"
       enable_quoting: "Το κείμενο που επισημαίνεται να παρατίθεται στην απάντηση "
       change: "αλλαγή"
@@ -651,6 +649,7 @@ el:
         title: "Αλλαγή της φωτογραφίας του προφίλ σου"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, που βασίζεται σε"
         gravatar_title: "Άλλαξε το άβατάρ σου στην ιστοσελίδα Gravatar "
+        gravatar_failed: "Δεν μπόρεσε να ληφθεί το Gravatar. Υπάρχει κάποιο συνδεδεμένο με αυτό το email;"
         refresh_gravatar_title: "Ανανέωσε το Gravatar σου"
         letter_based: "Εικόνα προφίλ που ανέθεσε το σύστημα"
         uploaded_avatar: "Προσαρμοσμένη εικόνα"
@@ -760,7 +759,6 @@ el:
         title: "Προσκλήσεις"
         user: "Προσκεκλημένος Χρήστης"
         sent: "Απεσταλμένα"
-        none: "Δεν υπάρχουν προσκλήσεις σε εκκρεμότητα για προβολή."
         truncated:
           one: "Δείχνοντας την πρώτη πρόσκληση."
           other: "Προβάλονται οι πρώτες {{count}} προσκλήσεις."
@@ -1194,8 +1192,6 @@ el:
         posted: "Ανάρτηση από"
         edited: "Επεξεργασία της ανάρτησής σου από"
         liked: "Η ανάρτησή σου έχει \"μου αρέσει\""
-        private_message: "Προσωπικό μήνυμα από"
-        invited_to_private_message: "Προσκλήθηκε σε προσωπικό μήνυμα από"
         invited_to_topic: "Προσκλήθηκε στο νήμα από"
         invitee_accepted: "Η πρόσκληση έγινε δεκτή από"
         moved_post: "Η ανάρτησή σου μετακινήθηκε από"
@@ -1208,7 +1204,6 @@ el:
         quoted: '{{username}} σε παράθεσε στο "{{topic}}" - {{site_title}}'
         replied: '{{username}} σου απάντησε στο "{{topic}}" - {{site_title}}'
         posted: '{{username}} ανάρτησε στο "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} σου έστειλε ένα προσωπικό μήνυμα στο "{{topic}}" - {{site_title}}'
         linked: '{{username}} έκανε μια σύνδεση στην ανάρτηση που έκανες στο νήμα "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Προσθήκη εικόνας"
@@ -1531,7 +1526,6 @@ el:
         visible: "Εμφάνιση Νήματος"
         reset_read: "Μηδενισμός Διαβασμένων"
         make_public: "Κάνε Δημόσιο το Νήμα"
-        make_private: "Κάνε Προσωπικό Μήνυμα"
       feature:
         pin: "Καρφίτσωμα Νήματος"
         unpin: "Ξεκαρφίτσωμα Νήματος"
@@ -2214,7 +2208,6 @@ el:
         one: "1 χορηγήθηκε"
         other: "%{count} χορηγήθηκε"
       select_badge_for_title: Επίλεξε ένα παράσημο για να χρησιμοποιήσεις ως τίτλο
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Ξεκινώντας
@@ -2384,8 +2377,6 @@ el:
         agree_flag_restore_post_title: "Επαναφορά της ανάρτησης ώστε όλοι οι χρήστες να μπορούν να το δουν."
         agree_flag: "Αποδοχή και διατήρηση της ανάρτησης"
         agree_flag_title: "Αποδοχή επισήμανσης και διατήρηση της ανάρτησης αμετάβλητης."
-        defer_flag: "Αγνόηση"
-        defer_flag_title: "Αφαίρεσε αυτή την επισήμανση. Δεν χρειάζεται να γίνει κάποια ενέργεια αυτή τη στιγμή"
         delete: "Διαγραφή"
         delete_title: "Διέγραψε την ανάρτηση στην οποία αναφέρεται αυτή η επισήμανση."
         delete_post_defer_flag: "Διαγραφή ανάρτησης και αγνόηση επισήμανσης"
@@ -2584,7 +2575,6 @@ el:
           label: "Ανέβασμα"
           title: "Ανέβασε ένα αντίγραφο ασφαλείας για αυτό το στιγμιότυπο"
           uploading: "Ανεβαίνει..."
-          success: "Το '{{filename}}' ανέβηκε επιτυχώς."
           error: "Παρουσιάστηκε ένα σφάλμα κατά το ανέβασμα του '{{filename}}': {{message}}"
         operations:
           is_running: "Αυτή τη στιγμή εκτελείται μια λειτουργία..."
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 88c4b93c1e..0f71614128 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -520,7 +520,7 @@ en:
 
     categories:
       all: "all categories"
-      all_subcategories: "all"
+      all_subcategories: "all in %{categoryName}"
       no_subcategory: "none"
       category: "Category"
       category_list: "Display category list"
@@ -605,7 +605,7 @@ en:
       disable_jump_reply: "Don't jump to my post after I reply"
       dynamic_favicon: "Show new / updated topic count on browser icon"
       theme_default_on_all_devices: "Make this my default theme on all my devices"
-      allow_private_messages: "Allow other users to send me private messages"
+      allow_private_messages: "Allow other users to send me personal messages"
       external_links_in_new_tab: "Open all external links in a new tab"
       enable_quoting: "Enable quote reply for highlighted text"
       change: "change"
@@ -852,7 +852,7 @@ en:
         title: "Invites"
         user: "Invited User"
         sent: "Sent"
-        none: "There are no pending invites to display."
+        none: "No invites to display."
         truncated:
           one: "Showing the first invite."
           other: "Showing the first {{count}} invites."
@@ -1247,6 +1247,7 @@ en:
       topic_featured_link_placeholder: "Enter link shown with title."
       remove_featured_link: "Remove link from topic."
       reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images."
+      reply_placeholder_no_images: "Type here. Use Markdown, BBCode, or HTML to format."
       view_new_post: "View your new post."
       saving: "Saving"
       saved: "Saved!"
@@ -1334,8 +1335,8 @@ en:
         posted: "Post by"
         edited: "Edit your post by"
         liked: "Liked your post"
-        private_message: "Private message from"
-        invited_to_private_message: "Invited to a private message from"
+        private_message: "Personal message from"
+        invited_to_private_message: "Invited to a personal message from"
         invited_to_topic: "Invited to a topic from"
         invitee_accepted: "Invite accepted by"
         moved_post: "Your post was moved by"
@@ -1350,7 +1351,7 @@ en:
         quoted: '{{username}} quoted you in "{{topic}}" - {{site_title}}'
         replied: '{{username}} replied to you in "{{topic}}" - {{site_title}}'
         posted: '{{username}} posted in "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} sent you a private message in "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} sent you a personal message in "{{topic}}" - {{site_title}}'
         linked: '{{username}} linked to your post from "{{topic}}" - {{site_title}}'
 
     upload_selector:
@@ -1718,7 +1719,7 @@ en:
         visible: "Make Listed"
         reset_read: "Reset Read Data"
         make_public: "Make Public Topic"
-        make_private: "Make Private Message"
+        make_private: "Make Personal Message"
 
       feature:
         pin: "Pin Topic"
@@ -1897,7 +1898,9 @@ en:
       deleted_by_author:
         one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
         other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"
+      collapse: "collapse"
       expand_collapse: "expand/collapse"
+      locked: "a staff member has locked this post from being edited"
       gap:
         one: "view 1 hidden reply"
         other: "view {{count}} hidden replies"
@@ -1978,6 +1981,11 @@ en:
         rebake: "Rebuild HTML"
         unhide: "Unhide"
         change_owner: "Change Ownership"
+        grant_badge: "Grant Badge"
+        lock_post: "Lock Post"
+        lock_post_description: "prevent the poster from editing this post"
+        unlock_post: "Unlock Post"
+        unlock_post_description: "allow the poster to edit this post"
 
       actions:
         flag: 'Flag'
@@ -2442,6 +2450,9 @@ en:
         dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
         dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Log Out'
+      composing:
+        title: 'Composing'
+        return: '<b>shift</b>+<b>c</b> Return to composer'
       actions:
         title: 'Actions'
         bookmark_topic: '<b>f</b> Toggle bookmark topic'
@@ -2482,7 +2493,8 @@ en:
         one:   "1 granted"
         other: "%{count} granted"
       select_badge_for_title: Select a badge to use as your title
-      none: "<none>"
+      none: "(none)"
+      successfully_granted: "Successfully granted %{badge} to %{username}"
       badge_grouping:
         getting_started:
           name: Getting Started
@@ -2507,6 +2519,7 @@ en:
 
     tagging:
       all_tags: "All Tags"
+      other_tags: "Other Tags"
       selector_all_tags: "all tags"
       selector_no_tags: "no tags"
       changed: "tags changed:"
@@ -2671,8 +2684,8 @@ en:
         agree_flag_restore_post_title: "Restore the post so that all users can see it."
         agree_flag: "Agree and Keep Post"
         agree_flag_title: "Agree with flag and keep the post unchanged."
-        defer_flag: "Ignore"
-        defer_flag_title: "Remove this flag; it requires no action at this time."
+        ignore_flag: "Ignore"
+        ignore_flag_title: "Remove this flag; it requires no action at this time."
         delete: "Delete"
         delete_title: "Delete the post this flag refers to."
         delete_post_defer_flag: "Delete Post and Ignore flag"
@@ -2703,6 +2716,7 @@ en:
         system: "System"
         error: "Something went wrong"
         reply_message: "Reply"
+        suspended_for_post: "The user was suspended for this post."
         no_results: "There are no flagged posts."
         topic_flagged: "This <strong>topic</strong> has been flagged."
         show_full: "show full post"
@@ -2880,7 +2894,7 @@ en:
           label: "Upload"
           title: "Upload a backup to this instance"
           uploading: "Uploading..."
-          success: "'{{filename}}' has successfully been uploaded."
+          success: "'{{filename}}' has successfully been uploaded. The file is now being processed and will take up to a minute to show up in the list."
           error: "There has been an error while uploading '{{filename}}': {{message}}"
         operations:
           is_running: "An operation is currently running..."
@@ -3212,6 +3226,9 @@ en:
             backup_destroy: "destroy backup"
             reviewed_post: "reviewed post"
             custom_staff: "plugin custom action"
+            post_locked: "post locked"
+            post_unlocked: "post unlocked"
+            check_personal_message: "check personal message"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
@@ -3254,6 +3271,7 @@ en:
             header: "Header"
             full_page: "Full Page"
             click_through_only: "All (click through only)"
+          header_search_results: "Header Search Results"
         logster:
           title: "Error Logs"
 
@@ -3387,6 +3405,9 @@ en:
         grant_moderation: 'Grant Moderation'
         unsuspend: 'Unsuspend'
         suspend: 'Suspend'
+        show_flags_received: "Show Flags Received"
+        flags_received_by: "Flags Received by %{username}"
+        flags_received_none: "This user has not received any flags."
         reputation: Reputation
         permissions: Permissions
         activity: Activity
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index f38923daae..7d90c9c29d 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -106,7 +106,7 @@ es:
           one: "%{count} año después"
           other: "%{count} años después"
       previous_month: 'Mes anterior'
-      next_month: 'Próximo mes'
+      next_month: 'Mes siguiente'
       placeholder: fecha
     share:
       topic: 'comparte un enlace a este tema'
@@ -144,7 +144,7 @@ es:
         enabled: 'listado %{when}'
         disabled: 'quitado de la lista, invisible %{when}'
       banner:
-        enabled: 'hazlo un banner %{when}. Aparecerá arriba en cada página hasta que el usuario lo deje de destacar.'
+        enabled: 'hizo este tema un banner %{when}. Aparecerá arriba en cada página hasta que el usuario lo deje de destacar.'
         disabled: 'eliminar este banner %{when}. Ya no aparecerá en la parte superior de cada página.'
     topic_admin_menu: "acciones de administrador para el tema"
     wizard_required: "¡Bienvenido a tu nuevo Discourse! Empezaremos con <a href='%{url}' data-auto-route='true'>el asistente de configuración</a>  ✨"
@@ -460,7 +460,7 @@ es:
       '14': "Pendiente"
     categories:
       all: "Categorías"
-      all_subcategories: "todas"
+      all_subcategories: "todo en %{categoryName}"
       no_subcategory: "ninguna"
       category: "Categoría"
       category_list: "Mostrar lista de categorías"
@@ -540,7 +540,7 @@ es:
       disable_jump_reply: "No dirigirme a mi post cuando responda"
       dynamic_favicon: "Mostrar contador de temas nuevos/actualizados en el favicon"
       theme_default_on_all_devices: "Hacer éste mi theme por defecto en todos mis dispositivos"
-      allow_private_messages: "Permitir a otros usuarios enviarme mensajes privados"
+      allow_private_messages: "Permitir a otros usuarios enviarme mensajes personales"
       external_links_in_new_tab: "Abrir todos los enlaces externos en una nueva pestaña"
       enable_quoting: "Activar respuesta citando el texto resaltado"
       change: "cambio"
@@ -764,7 +764,6 @@ es:
         title: "Invitaciones"
         user: "Invitar Usuario"
         sent: "Enviadas"
-        none: "No hay ninguna invitación pendiente que mostrar."
         truncated:
           one: "Mostrando la primera invitación."
           other: "Mostrando las primeras {{count}} invitaciones."
@@ -1127,6 +1126,7 @@ es:
       topic_featured_link_placeholder: "Introduce el enlace mostrado con el título."
       remove_featured_link: "Eliminar enlace del tema."
       reply_placeholder: "Escribe aquí. Usa Markdown, BBCode o HTML para darle formato. Arrastra o pega imágenes."
+      reply_placeholder_no_images: "Escribe aquí. Usa Markdown, BBCode o HTML para dar formato."
       view_new_post: "Ver tu nuevo post."
       saving: "Guardando"
       saved: "¡Guardado!"
@@ -1209,8 +1209,8 @@ es:
         posted: "Publicado por"
         edited: "Editado tu post por"
         liked: "Gustado tu post"
-        private_message: "Mensaje privado de"
-        invited_to_private_message: "Invitado a un mensaje privado de"
+        private_message: "Mensaje personal de"
+        invited_to_private_message: "Invitado a un mensaje personal de"
         invited_to_topic: "Invitado a un tema de"
         invitee_accepted: "Invitación aceptada por"
         moved_post: "Tu post fue eliminado por"
@@ -1224,7 +1224,7 @@ es:
         quoted: '{{username}} te citó en "{{topic}}" - {{site_title}}'
         replied: '{{username}} te respondió en "{{topic}}" - {{site_title}}'
         posted: '{{username}} publicó en "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} te envió un mensaje privado en "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} te ha enviado un mensaje personal en "{{topic}}" - {{site_title}}'
         linked: '{{username}} enlazó tu publicación desde "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Añadir imagen"
@@ -1561,7 +1561,7 @@ es:
         visible: "Hacer visible"
         reset_read: "Restablecer datos de lectura"
         make_public: "Convertir en tema público"
-        make_private: "Convertir en Mensaje Privado"
+        make_private: "Redactar mensaje personal"
       feature:
         pin: "Destacar tema"
         unpin: "Dejar de destacar tema"
@@ -1719,7 +1719,9 @@ es:
       deleted_by_author:
         one: "(post retirado por el autor. Será borrado automáticamente en %{count} hora si no es reportado)"
         other: "(post retirado por el autor. Será borrado automáticamente en %{count} horas si no es reportado)"
+      collapse: "colapsar"
       expand_collapse: "expandir/contraer"
+      locked: "un miembro del staff ha bloqueado este mensaje y no se puede editar"
       gap:
         one: "ver 1 post oculto"
         other: "ver {{count}} posts ocultos"
@@ -1790,6 +1792,11 @@ es:
         rebake: "Reconstruir HTML"
         unhide: "Deshacer ocultar"
         change_owner: "Cambiar dueño"
+        grant_badge: "Conceder distintivo"
+        lock_post: "Bloquear mensaje"
+        lock_post_description: "evitar que el autor edite este mensaje"
+        unlock_post: "Desbloquear mensaje"
+        unlock_post_description: "permitir al autor editar este mensaje"
       actions:
         flag: 'Reportar'
         defer_flags:
@@ -2232,6 +2239,8 @@ es:
         dismiss_new_posts: '<b>x</b>, <b>r</b> Descartar Nuevos/Posts'
         dismiss_topics: '<b>x</b>, <b>t</b> Descartar temas'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Cerrar sesión'
+      composing:
+        return: '<b>shift</b>+<b>c</b> Volver al editor'
       actions:
         title: 'Acciones'
         bookmark_topic: '<b>f</b> Guardar/Quitar el tema de marcadores'
@@ -2271,7 +2280,7 @@ es:
         one: "1 concedido"
         other: "%{count} concedidos"
       select_badge_for_title: Seleccionar una distinción para utilizar como tu título
-      none: "<none>"
+      none: "(ninguno)"
       badge_grouping:
         getting_started:
           name: Primeros pasos
@@ -2294,6 +2303,7 @@ es:
       </p>
     tagging:
       all_tags: "Etiquetas"
+      other_tags: "Otras etiquetas"
       selector_all_tags: "etiquetas"
       selector_no_tags: "sin etiquetas"
       changed: "etiquetas cambiadas:"
@@ -2443,8 +2453,8 @@ es:
         agree_flag_restore_post_title: "Restaurar el post para que todos los usuarios puedan verlo."
         agree_flag: "Estar de acuerdo y mantener post"
         agree_flag_title: "Estar de acuerdo con el reporte y mantener la publicación intacta."
-        defer_flag: "Ignorar"
-        defer_flag_title: "Eliminar este indicador; no es necesaria ninguna acción en este momento."
+        ignore_flag: "Ignorar"
+        ignore_flag_title: "Quitar este reporte; no requiere tomar medidas en este momento."
         delete: "Eliminar"
         delete_title: "Eliminar el post referido por este indicador."
         delete_post_defer_flag: "Eliminar post e ignorar reporte"
@@ -2644,7 +2654,6 @@ es:
           label: "Subir"
           title: "Subir un backup a esta instancia"
           uploading: "Subiendo..."
-          success: "El archivo '{{filename}}' se ha subido correctamente."
           error: "Ha ocurrido un error al subir el archivo '{{filename}}': {{message}}"
         operations:
           is_running: "Actualmente una operación se está procesando..."
@@ -2969,6 +2978,9 @@ es:
             backup_destroy: "destruir copia de seguridad"
             reviewed_post: "posts revisados"
             custom_staff: "acción personalizada por plugin"
+            post_locked: "mensaje bloqueado"
+            post_unlocked: "mensaje desbloqueado"
+            check_personal_message: "comprobar mensaje personal"
         screened_emails:
           title: "Correos bloqueados"
           description: "Cuando alguien trata de crear una cuenta nueva, los siguientes correos serán revisados y el registro será bloqueado, o alguna otra acción será realizada."
@@ -3138,6 +3150,9 @@ es:
         grant_moderation: 'Conceder moderación'
         unsuspend: 'Quitar suspensión'
         suspend: 'Suspender'
+        show_flags_received: "Mostrar reportes recibidos"
+        flags_received_by: "Reportes recibidos por %{username}"
+        flags_received_none: "Este usuario no ha recibido ningún reporte."
         reputation: Reputación
         permissions: Permisos
         activity: Actividad
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 1a5134206b..b5af341632 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -48,6 +48,9 @@ et:
         x_seconds:
           one: "1s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -57,6 +60,9 @@ et:
         x_days:
           one: "1p"
           other: "%{count}p"
+        x_months:
+          one: "1kuu"
+          other: "%{count}kuud"
         about_x_years:
           one: "1a"
           other: "%{count}a"
@@ -101,6 +107,7 @@ et:
           other: "%{count} aastat hiljem"
       previous_month: 'Eelmine Kuu'
       next_month: 'Järgmine Kuu'
+      placeholder: kuupäev
     share:
       topic: 'jaga teema viidet'
       post: 'post nr%{postNumber}'
@@ -139,6 +146,8 @@ et:
     emails_are_disabled: "Kõik väljuvad meilid on administraatori poolt blokeeritud. Ühtegi teavitust meili teel ei saadeta."
     bootstrap_mode_enabled: "Oma uue saidi lansseerimise hõlbustamiseks oled käivitusrežiimil. Kõik uued kasutajad saavad usaldustaseme 1 ja nende igapäevased kokkuvõtvad teavitused meili teel on aktiveeritud. See lülitub automaatselt välja kui kasutajate koguarv ületab %{min_users} piiri."
     bootstrap_mode_disabled: "Käivitusrežiim lülitub välja järgmise 24 tunni jooksul."
+    themes:
+      default_description: "Vaikimisi"
     s3:
       regions:
         ap_northeast_1: "Aasia ja Vaikne ookean (Tokyo)"
@@ -149,8 +158,10 @@ et:
         cn_north_1: "Hiina (Beijing)"
         eu_central_1: "EL (Frankfurt)"
         eu_west_1: "EL (Iirimaa)"
+        eu_west_2: "EU (London)"
         sa_east_1: "Lõuna-Ameerika (Sao Paulo)"
         us_east_1: "US Ida (N. Virginia)"
+        us_east_2: "US Ida (Ohio)"
         us_gov_west_1: "AWS GovCloud (US)"
         us_west_1: "US Lääs (N. California)"
         us_west_2: "US Lääs (Oregon)"
@@ -249,6 +260,7 @@ et:
     uploading: "Laen üles..."
     uploading_filename: "Laen üles {{filename}}..."
     uploaded: "Üles laetud!"
+    pasting: "Asetamine..."
     enable: "Võimalda"
     disable: "Tõkesta"
     undo: "Ennista"
@@ -355,9 +367,12 @@ et:
       join: "Liitu grupiga"
       leave: "Lahku grupist"
       request: "Taotle liitumist grupiga"
+      message: "Sõnum"
       automatic_group: Automaatne grupp
       closed_group: Suletud grupp
       is_group_user: "Oled selle grupi liige"
+      membership_request:
+        submit: "Saada päring"
       membership: "Liikmelisus"
       name: "Nimi"
       user_count: "Liikmete arv"
@@ -367,13 +382,23 @@ et:
       index:
         title: "Grupid"
         empty: "Ühtegi nähtavat gruppi pole."
+      title:
+        one: "Grupp"
+        other: "Grupid"
       activity: "Tegevused"
       members: "Liikmed"
       topics: "Teemat"
       posts: "Postitused"
       mentions: "Mainimisi"
       messages: "Sõnumid"
+      visibility_levels:
+        title: "Kes näevad seda gruppi?"
+        public: "Kõik"
+        members: "Grupi omanikud, liikmed ja adminid"
+        staff: "Grupi omanikud ja töötajad"
+        owners: "Grupi omanikud ja adminid"
       alias_levels:
+        messageable: "Kes saab sellele grupile sõnumeid saata?"
         nobody: "Mitte keegi"
         only_admins: "Vaid adminid"
         mods_and_admins: "Vaid moderaatorid ja adminnid"
@@ -422,7 +447,6 @@ et:
       '14': "Ootel"
     categories:
       all: "kõik foorumid"
-      all_subcategories: "kõik"
       no_subcategory: "mitte ükski"
       category: "Foorum"
       category_list: "Kuva foorumid"
@@ -469,6 +493,7 @@ et:
       mute: "Vaigista"
       edit: "Muuda Eelistusi"
       download_archive:
+        button_text: "Laadi kõik alla"
         confirm: "Oled kindel, et soovid enda postitused alla laadida?"
         success: "Allalaadimine käivitatud. Protsessi lõppemisel saadetakse Sulle teade."
         rate_limit_error: "Postitusi saab alla laadida üks kord ööpäevas. Palun proovi homme uuesti."
@@ -493,11 +518,14 @@ et:
         disable: "Keela teavitused"
         enable: "Luba teavitused"
         each_browser_note: "Märkus: see säte tuleb muuta igas kasutusel olevas brauseris."
+      dismiss: 'Ignoreeri'
       dismiss_notifications: "Ignoreeri kõiki"
       dismiss_notifications_tooltip: "Märgi kõik lugemata teavitused loetuks"
       first_notification: "Sinu esimene teavitus! Vali see et alustada."
       disable_jump_reply: "Ära hüppa minu postitusse peale vastamist"
       dynamic_favicon: "Kuva uute / muudetud teemade arvu brauseri ikoonil"
+      theme_default_on_all_devices: "Tee see minu vaikimisi kujunduseks kõigil seadmetel"
+      allow_private_messages: "Luba teistel kasutajatel mulle privaatsõnumeid saata"
       external_links_in_new_tab: "Ava kõik välisviited uuel sakil"
       enable_quoting: "Luba esiletõstetud tekstile tsitaadiga vastata"
       change: "muuda"
@@ -505,7 +533,9 @@ et:
       admin: "{{user}} on admin"
       moderator_tooltip: "See kasutaja on moderaator"
       admin_tooltip: "See kasutaja on admin"
+      silenced_tooltip: "See kasutaja on vaigistatud"
       suspended_notice: "Selle kasutaja ligipääs on ajutiselt peatatud kuni {{date}}."
+      suspended_permanently: "Selle kasutaja konto on peatatud."
       suspended_reason: "Põhjus:"
       github_profile: "Github"
       email_activity_summary: "Tegevuste kokkuvõte"
@@ -547,11 +577,14 @@ et:
       muted_users_instructions: "Summuta kõik teavitused nendelt kasutajatelt."
       muted_topics_link: "Näita vaigistatud teemasid"
       watched_topics_link: "Näita vaatlusaluseid teemasid"
+      tracked_topics_link: "Näita jälgitud teemasid"
       automatically_unpin_topics: "Eemalda lõppu jõudmisel teemadelt automaatselt esiletõstmise märgistus."
       apps: "Äpid"
       revoke_access: "Tühista ligipääs"
       undo_revoke_access: "Tühista ligipääsu tühistamine"
       api_approved: "Heakskiidetud:"
+      theme: "Teema"
+      home: "aikimisi avaleht"
       staff_counters:
         flags_given: "kasulikud tähised"
         flagged_posts: "tähistatud postitused"
@@ -569,6 +602,15 @@ et:
         move_to_archive: "Arhiiv"
         failed_to_move: "Valitud sõnumite teisaldamine ebaõnnestus (võrguühendus võib olla häiritud)"
         select_all: "Vali kõik"
+      preferences_nav:
+        account: "Konto"
+        profile: "Profiil"
+        emails: "E-post"
+        notifications: "Teavitused"
+        categories: "Kategooriad"
+        tags: "Sildid"
+        interface: "Kasutajaliides"
+        apps: "Äpid"
       change_password:
         success: "(meil saadetud)"
         in_progress: "(saadan meili)"
@@ -703,7 +745,6 @@ et:
         title: "kutsed"
         user: "Kutsutud kasutaja"
         sent: "Saadetud"
-        none: "Ühtegi ootel kutset ei ole kuvada"
         truncated:
           one: "Näitan esimest kutset."
           other: "Näitan esimest {{count}} kutset."
@@ -719,8 +760,12 @@ et:
         expired: "See kutse on aegunud."
         rescind: "Eemalda"
         rescinded: "Kutse eemaldatud"
+        rescind_all: "Eemalda kõik kutsed"
+        rescinded_all: "Kõik kutsed on eemaldatud!"
+        rescind_all_confirm: "Oled sa kindel, et soovid kõiki kutseid eemaldada?"
         reinvite: "Saada kutse uuesti"
         reinvite_all: "Saada kõik kutsed uuesti"
+        reinvite_all_confirm: "Oled sa kindel, et soovid kõik kutsed uuesti saata?"
         reinvited: "Kutse uuesti saadetud"
         reinvited_all: "Kõik kutsed uuesti saadetud"
         time_read: "Lugemise aeg"
@@ -844,6 +889,7 @@ et:
     first_post: Esimene postitus
     mute: Vaigista
     unmute: Tühista vaigistus
+    last_post: Postitatud
     last_reply_lowercase: viimane vastus
     replies_lowercase:
       one: vastus
@@ -893,6 +939,8 @@ et:
       complete_email_found: "Leidsime konto, mille omaniku meiliaadress on <b>%{email}</b>, peaksid varsti saama meili koos parooli uuendamise juhistega."
       complete_username_not_found: "Kasutajanimele <b>%{username}</b> ei vasta ükski konto"
       complete_email_not_found: "Meiliaadressile <b>%{email}</b> ei vasta ükski konto"
+      button_ok: "OK"
+      button_help: "Abi"
     login:
       title: "Logi sisse"
       username: "Kasutaja"
@@ -912,6 +960,8 @@ et:
       not_allowed_from_ip_address: "Sellelt IP-aadressilt ei saa sisse logida."
       admin_not_allowed_from_ip_address: "Sellelt IP-aadressilt ei saa adminina sisse logida."
       resend_activation_email: "Selleks, et aktiveerimise meili uuesti saata, klikka siia."
+      change_email: "Muuda e-posti aadressi"
+      submit_new_email: "Uuenda e-posti aadressi"
       sent_activation_email_again: "Saatsime sulle aktiveerimise meili aadressile <b>{{currentEmail}}</b>. Selle kohalejõudmine võib võtta mõne minuti; kontrolli kindlasti ka spämmikausta."
       to_continue: "Palun logi sisse"
       preferences: "Oma kasutajaeelistuste muutmiseks pead olema sisse logitud."
@@ -946,6 +996,9 @@ et:
       your_email: "Teie konto meiliaadress on <b>%{email}</b>."
       accept_invite: "Võta kutse vastu"
       success: "Teie konto on loodud ning olete nüüd sisse logitud."
+      name_label: "Nimi"
+      password_label: "Määra parool"
+      optional_description: "(valikuline)"
     password_reset:
       continue: "Edasi saidile %{site_name}"
     emoji_set:
@@ -954,6 +1007,8 @@ et:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google klassikaline"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Ainult foorumid"
       categories_with_featured_topics: "Foorumid esiletõstetud teemadega"
@@ -962,12 +1017,35 @@ et:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Vali...
+      no_content: Midagi ei leitud
+      filter_placeholder: Otsi...
+      create: "Loo {{content}}"
+    emoji_picker:
+      filter_placeholder: Otsi emojit
+      people: Inimesed
+      nature: Loodus
+      food: Toit
+      activity: Tegevused
+      travel: Reisimine
+      objects: Objektid
+      celebration: Tähistamine
+      custom: Kohandatud emoji
+      recent: Viimati kasutatud
+      default_tone: Nahatooni pole
+      light_tone: Hele nahatoon
+      medium_light_tone: Keskmiselt hele nahatoon
+      medium_tone: Keskmine nahatoon
+      medium_dark_tone: Keskmiselt tume nahatoon
+      dark_tone: Tume nahatoon
     composer:
       emoji: "Emoji :)"
       more_emoji: "veel..."
       options: "Võimalused"
       whisper: "sosista"
       unlist: "eemaldatud"
+      blockquote_text: "Tsitaat"
       add_warning: "See on ametlik hoiatus."
       toggle_whisper: "Lülita sosistamine ümber"
       toggle_unlisted: "Lülita eemaldamine ümber"
@@ -998,6 +1076,7 @@ et:
       cancel: "Tühista"
       create_topic: "Loo teema"
       create_pm: "Sõnum"
+      create_whisper: "Sosistamine"
       title: "Või vajuta Ctrl+Enter"
       users_placeholder: "Lisa kasutaja"
       title_placeholder: "Kuidas seda vestlust ühe lausega kirjeldada?"
@@ -1005,6 +1084,7 @@ et:
       edit_reason_placeholder: "miks sa seda muudad?"
       show_edit_reason: "(lisa muutmise põhjus)"
       topic_featured_link_placeholder: "Järgi pealkirjas näidatud viidet."
+      remove_featured_link: "Eemalda teemast link."
       reply_placeholder: "Kirjuta siia. Kujundamiseks kasuta Markdown, BBCode, või HTML-i. Pildid võid siia lohistada või kleepida."
       view_new_post: "Vaata oma uut postitust."
       saving: "Salvestan"
@@ -1044,11 +1124,34 @@ et:
         body: "Hetkel saadetakse see sõnum vaid sulle endale!"
       admin_options_title: "Meeskonna valikulised sätted selle teema jaoks"
     notifications:
+      tooltip:
+        regular:
+          one: "1 nägemata teavitus"
+          other: "{{count}} nägemata teavitust"
+        message:
+          one: "1 lugemata sõnum"
+          other: "{{count}} lugemata sõnumit"
       title: "teavitused @name mainimiste, oma postitustele ja teemadele vastamiste, sõnumite, jne kohta"
       none: "Hetkel ei saa teavitusi laadida."
       empty: "Teavitusi ei leitud."
       more: "vaata vanemaid teavitusi"
       total_flagged: "tähistatud postitusi kokku"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> võttis su kutse vastu"
+      moved_post: "<span>{{username}}</span> moved {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>New Topic</span> {{description}}"
       alt:
         mentioned: "Mainis"
         quoted: "Tsiteeris"
@@ -1056,21 +1159,20 @@ et:
         posted: "Postitas"
         edited: "Muuda oma postitust"
         liked: "Sinu postitus meeldis"
-        private_message: "Privaatsõnum"
-        invited_to_private_message: "Privaatsõnumit kutsus lugema"
+        private_message: "Privaatsõnum kasutajalt"
         invited_to_topic: "Teemasse kutsus"
         invitee_accepted: "Kutse võttis vastu"
         moved_post: "Sinu postituse liigutas"
         linked: "Viide sinu postitusele"
         granted_badge: "Märgis antud"
         group_message_summary: "Sõnumeid grupi postkastis"
+        topic_reminder: "Meelespea"
       popup:
         mentioned: '{{username}} mainis Sind teemas "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mainis Sind teemas "{{topic}}" - {{site_title}}'
         quoted: '{{username}} tsiteeris Sind teemas "{{topic}}" - {{site_title}}'
         replied: '{{username}} vastas Sulle teemas "{{topic}}" - {{site_title}}'
         posted: '{{username}} postitas teemasse "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} saatis Sulle privaatsõnumi teemas "{{topic}}" - {{site_title}}'
         linked: '{{username}} viitas Sinu postitusele teemas "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Lisa pilt"
@@ -1086,10 +1188,12 @@ et:
       uploading: "Laen üles"
       select_file: "Vali fail"
       image_link: "viide millele Su pilt hakkab osutama"
+      default_image_alt_text: pilt
     search:
       sort_by: "Järjesta"
       relevance: "Asjakohasus"
       latest_post: "Viimane postitus"
+      latest_topic: "Vimanse teema"
       most_viewed: "Enim vaadatud"
       most_liked: "Enim meeldinud"
       select_all: "Vali kõik"
@@ -1100,6 +1204,8 @@ et:
       no_more_results: "Rohkem vasteid pole."
       searching: "Otsin..."
       post_format: "postituse nr{{post_number}} tegi {{username}}"
+      search_google_button: "Google"
+      search_google_title: "Otsi sellelt saidilt"
       context:
         user: "Otsi kasutaja @{{username}} postitusi"
         category: "Otsi #{{category}} foorumist"
@@ -1109,19 +1215,28 @@ et:
         title: Täpsem otsing
         posted_by:
           label: Postitaja
+        in_category:
+          label: Liigitatud
         in_group:
           label: Grupis
         with_badge:
           label: Märgisega
+        with_tags:
+          label: Sildistatud
         filters:
           likes: mulle meeldisid
           posted: sisaldavad minu postitust
           watching: on minu vaatlemise nimekirjas
           tracking: on minu jälgimise nimekirjas
+          private: Minu sõnumites
+          bookmarks: Minu järjehoidjates
           first: on teema esimesed postitused
           pinned: on esile tõstetud
           unpinned: ei ole esile tõstetud
+          seen: Minu loetud
+          unseen: Minu poolt lugemata
           wiki: on wiki
+          all_tags: Kõik ülevalolevad sildid
         statuses:
           label: Kus teemad
           open: on avatud
@@ -1157,8 +1272,10 @@ et:
         dismiss_new: "Ignoreeri uusi"
         toggle: "lülita teemade massiline ära märkimine ümber"
         actions: "Masstoimingud"
+        change_category: "Määra kategooria"
         close_topics: "Sulge Teemad"
         archive_topics: "Arhiveeri Teemad"
+        notification_level: "Teavitus"
         choose_new_category: "Vali teemadele uus foorum:"
         selected:
           one: "Märkisid ära <b>1</b> teema."
@@ -1254,6 +1371,31 @@ et:
       jump_reply_up: hüppa varasema vastuse juurde
       jump_reply_down: hüppa hilisema vastuse juurde
       deleted: "See teema on kustutatud"
+      topic_status_update:
+        title: "Teema taimer"
+        save: "Määra taimer"
+        num_of_hours: "Tundide arv:"
+        remove: "Eemalda taimer"
+        publish_to: "Avalda:"
+        when: "Millal:"
+        public_timer_types: Teemade taimerid
+        private_timer_types: Kasutaja teema taimer
+      auto_update_input:
+        none: "Vali ajavahemik"
+        later_today: "Täna hiljem"
+        tomorrow: "Homme"
+        later_this_week: "iljem sel nädalal"
+        this_weekend: "Sellel nädalavahetusel"
+        next_week: "Järgmisel nädalal"
+        two_weeks: "Kahe nädala pärast"
+        next_month: "Järgmisel kuul"
+        three_months: "Kolme kuu pärast"
+        six_months: "Kuue kuu pärast"
+        one_year: "Aasta pärast"
+        forever: "Igavesti"
+        pick_date_and_time: "Vali kuupäev ja kellaaeg"
+      reminder:
+        title: "Tuleta mulle meelde"
       auto_close_title: 'Automaatse sulgumise sätted'
       auto_close_immediate:
         one: "Viimane postitus selles teemas on juba 1 tund aega vana, seega sulgub see teema nüüd."
@@ -1327,7 +1469,6 @@ et:
         visible: "Avalda teemade nimekirjas"
         reset_read: "Nulli andmed teema lugemise kohta"
         make_public: "Loo avalik teema"
-        make_private: "Loo privaatsõnum"
       feature:
         pin: "Tõsta teema esile"
         unpin: "Eemalda teema esiletõstmine"
@@ -1446,6 +1587,10 @@ et:
       multi_select:
         select: 'vali'
         selected: 'valitud ({{count}})'
+        select_post:
+          label: 'vali'
+        selected_post:
+          label: 'valitud'
         delete: kustuta valitud
         cancel: tühista valimine
         select_all: vali kõik
@@ -1517,12 +1662,15 @@ et:
         has_liked: "oled sellele postitusele oma meeldimise andnud"
         undo_like: "tühista meeldimise andmine"
         edit: "muuda seda postitust"
+        edit_action: "Muuda"
         edit_anonymous: "Vabandame, kuid selle postituse muutmiseks pead olema sisse logitud."
         flag: "tähista see postitus privaatselt kui tähelepanu vajav või saada selle kohta privaatne teavitus"
         delete: "kustuta see postitus"
         undelete: "ennista see postitus"
         share: "jaga viidet sellele postitusele"
         more: "Veel"
+        delete_replies:
+          just_the_post: "Ei, ainult see postitus"
         admin: "postituse administreerimise tegevused"
         wiki: "Loo Wiki"
         unwiki: "Eemalda Wiki"
@@ -1630,6 +1778,12 @@ et:
           side_by_side_markdown:
             title: "Näita töötlemata lähteandmete erinevusi kõrvuti"
             button: 'Töötlemata'
+      raw_email:
+        displays:
+          text_part:
+            button: 'Tekst'
+          html_part:
+            button: 'HTML'
     category:
       can: 'saab&hellip; '
       none: '(foorum puudub)'
@@ -1971,7 +2125,7 @@ et:
         one: "1 lubatud"
         other: "%{count} lubatud"
       select_badge_for_title: Vali märgis, mida kasutada oma pealkirjana
-      none: "<pole ühtegi>"
+      none: "(pole)"
       badge_grouping:
         getting_started:
           name: Alustamine
@@ -1998,6 +2152,7 @@ et:
       selector_no_tags: "sildid puuduvad"
       changed: "muudetud sildid:"
       tags: "Sildid"
+      choose_for_topic: "valikulised sildid"
       delete_tag: "Kustuta silt"
       rename_tag: "Nimeta silt ümber"
       rename_instructions: "Vali sildile uus nimi:"
@@ -2093,6 +2248,7 @@ et:
         no_problems: "Probleeme ei tuvastatud."
         moderators: 'Moderaatorid:'
         admins: 'Adminnid:'
+        silenced: 'Vaigistatud:'
         suspended: 'Peatatud:'
         private_messages_short: "Sõnumid"
         private_messages_title: "Sõnumid"
@@ -2125,9 +2281,10 @@ et:
         by: "autor"
       flags:
         title: "Lipud"
+        active_posts: "Tähistatud postitused"
+        old_posts: "Vanad tähistatud postitused"
         agree: "Nõustun"
         agree_title: "Kinnita see tähis kui korrektne ja kehtiv"
-        defer_flag_title: "Eemalda see tähis: praegu ei ole vaja sekkuda."
         delete: "Kustuta"
         delete_title: "Kustuta postitus, millele see tähis viitab."
         delete_post_defer_flag_title: "Kustuta postitus; kui on ainus, kustuta teema"
@@ -2155,6 +2312,18 @@ et:
         visit_topic: "Reageerimiseks külasta teemat"
         was_edited: "Postitust on peale esimest tähist muudetud"
         previous_flags_count: "Seda postitust on tähistatud juba {{count}} korda."
+        details: "üksikasjad"
+        flagged_topics:
+          topic: "Teema"
+          type: "Tüüp"
+          users: "Kasutajad"
+          last_flagged: "Hiljuti tähistatud"
+        short_names:
+          off_topic: "teemaväline"
+          inappropriate: "kohatu"
+          spam: "spämm"
+          notify_user: "kohandatud"
+          notify_moderators: "kohandatud"
       groups:
         primary: "Peamine grupp"
         no_primary: "(peamine grupp puudub)"
@@ -2185,6 +2354,8 @@ et:
         add_owners: Lisa omanikke
         incoming_email: "Individuaalne sissetuleva meili aadress"
         incoming_email_placeholder: "sisesta meiliaadress"
+        none_selected: "Vali alustamiseks grupp"
+        no_custom_groups: "Loo uus kohandatud grupp"
       api:
         generate_master: "Genereeri API peavõti"
         none: "Hetkel aktiivsed API võtmed puuduvad."
@@ -2302,7 +2473,6 @@ et:
           label: "Lae üles"
           title: "Lae varukoopia üles sellesse instantsi"
           uploading: "Laen üles..."
-          success: "'{{filename}}' üleslaadimine õnnestus."
           error: "Faili '{{filename}}' üleslaadimisel tekkis viga: {{message}}"
         operations:
           is_running: "Toiming on hetkel pooleli..."
@@ -2354,10 +2524,13 @@ et:
         new_style: "Uus stiil"
         import: "Impordi"
         delete: "Kustuta"
+        delete_confirm: "Kustutan selle teema?"
         about: "Muuda saidi CSS laadilehed ja HTML päised. Alustamiseks lisa kohandus."
         color: "Värv"
         opacity: "Läbipaistvus"
         copy: "Kopeeri"
+        copy_to_clipboard: "Kopeeri lõikelauale"
+        copied_to_clipboard: "Kopeeritud lõikelauale"
         email_templates:
           title: "Meilimallid"
           subject: "Teema"
@@ -2366,6 +2539,37 @@ et:
           none_selected: "Redigeerimise alustamiseks vali meili mall."
           revert: "Loobu muudatustest"
           revert_confirm: "Oled kindel, et soovid oma muudatustest loobuda?"
+        theme:
+          import_theme: "Impordi teema"
+          customize_desc: "Kohanda:"
+          title: "Kujundused"
+          edit: "Muuda"
+          common: "Tavaline"
+          desktop: "Töölaud"
+          mobile: "Mobiil"
+          preview: "Eelvaade"
+          is_default: "Kujundus on vaikimisi sisse lülitatud"
+          color_scheme: "Värvid"
+          theme_components: "Kujunduse osad"
+          uploads: "Üleslaadimised"
+          add_upload: "Lisa üleslaadimine"
+          upload: "Laadi üles"
+          about_theme: "Kujunduse info"
+          license: "Litsents"
+          updating: "Uuendamine..."
+          add: "Lisa"
+          scss:
+            text: "CSS"
+          header:
+            text: "Päis"
+          after_header:
+            text: "Pärast päist"
+          footer:
+            text: "Jalus"
+          head_tag:
+            text: "</head>"
+          body_tag:
+            text: "</body>"
         colors:
           title: "Värvid"
           long_title: "Värvistikud"
@@ -2469,6 +2673,13 @@ et:
             type_placeholder: "ülevaade, registreerimine..."
             reply_key_placeholder: "vastuse võti"
             skipped_reason_placeholder: "põhjus"
+      moderation_history:
+        actions:
+          delete_user: "Kasutaja on kustutatud"
+          suspend_user: "Kasutaja konto on peatatud"
+          silence_user: "Kasutaja on vaigistatud"
+          delete_post: "Postitus on kustutatud"
+          delete_topic: "Teema on kustutatud"
       logs:
         title: "Logid"
         action: "Tegevus"
@@ -2486,6 +2697,8 @@ et:
           block: "blokeeri"
           do_nothing: "ära tee midagi"
         staff_actions:
+          all: "kõik"
+          filter: "Filter:"
           title: "Tiimi tegevused"
           clear_filters: "Näita kõike"
           staff_user: "Meeskonnaliige"
@@ -2506,6 +2719,8 @@ et:
             change_trust_level: "muuda usaldustaset"
             change_username: "muuda kasutajanime"
             change_site_setting: "muuda saidi sätet"
+            change_theme: "muuda kujundust"
+            delete_theme: "kustuta kujundus"
             change_site_text: "muuda saidi teksti"
             suspend_user: "peata kasutaja"
             unsuspend_user: "taasluba kasutaja"
@@ -2520,6 +2735,8 @@ et:
             change_category_settings: "muuda foorumi sätteid"
             delete_category: "kustuta foorum"
             create_category: "loo foorum"
+            silence_user: "vaigista kasutaja"
+            unsilence_user: "eemalda kasutajalt vaigistus"
             grant_admin: "anna admin-õigus"
             revoke_admin: "võta admin-õigus ära"
             grant_moderation: "anna modereerimisõigus"
@@ -2565,8 +2782,32 @@ et:
           roll_up:
             text: "Koonda kokku"
             title: "Loob uue bännitud alamvõrgu koondsissekande kui on kogunenud vähemalt 'min_ban_entries_for_roll_up' aadressi."
+        search_logs:
+          title: "Otsingu logid"
+          term: "Termin"
+          searches: "Otsingud"
+          click_through: "Kliki läbi"
+          unique: "Unikaalne"
+          types:
+            all_search_types: "Kõik otsinguliigid"
+            header: "Päis"
         logster:
           title: "Vealogid"
+      watched_words:
+        title: "Vaadatud sõnad"
+        search: "otsi"
+        clear_filter: "Tühjenda"
+        actions:
+          block: 'Blokeeri'
+          censor: 'Tsenseeri'
+          require_approval: 'Nõua heakskiitu'
+          flag: 'Tähista'
+        form:
+          label: 'Uus sõna:'
+          placeholder_regexp: "regulaaravaldis"
+          add: 'isa'
+          success: 'Korras'
+          upload: "Laadi üles"
       impersonate:
         title: "Kehasta"
         help: "Kasuta seda töövahendit kasutajakonto ülevõtmiseks silumise eesmärgil. Tühistamiseks pead välja logima."
@@ -2586,6 +2827,7 @@ et:
           pending: "Ootel"
           staff: 'Meeskond'
           suspended: 'Peatatud'
+          silenced: 'Vaigistatud'
           suspect: 'Kahtlane'
         approved: "Heakskiidetud?"
         approved_selected:
@@ -2606,6 +2848,7 @@ et:
           staff: "Meeskond"
           admins: 'Admin-kasutajad'
           moderators: 'Moderaatorid'
+          silenced: 'Vaigistatud kasutajad'
           suspended: 'Peatatud kasutajad'
           suspect: 'Kahtlased kasutajad'
         reject_successful:
@@ -2624,9 +2867,17 @@ et:
         suspend_duration: "Kauaks see kasutaja peatatakse?"
         suspend_reason_label: "Peatamise põhjus? See tekst <b>on nähtav kõigile</b> selle kasutaja profiililehel, samuti kuvatakse kasutajale, kui ta üritab sisse logida. Tee lühidalt."
         suspend_reason: "Põhjus"
+        suspend_reason_placeholder: "Peatamise põhjus"
         suspended_by: "Peatati kasutaja poolt"
+        silence_reason: "Põhjus"
+        silenced_by: "Vaigistaja"
+        silence_modal_title: "Vaigista kasutaja"
+        silence_reason_placeholder: "Vaigistamise põhjus"
         delete_all_posts: "Kustuta kõik postitused"
         delete_all_posts_confirm_MF: "Sa oled kustutamas {POSTS, plural, one {1 post} other {# posts}} and {TOPICS, plural, one {1 topic} other {# topics}}. Oled Sa kindel?"
+        silence: "Vaigista"
+        unsilence: "Eemalda vaigistud"
+        silenced: "Vaigistatud?"
         moderator: "Moderaator?"
         admin: "Admin?"
         suspended: "Peatatud?"
@@ -2815,6 +3066,7 @@ et:
           developer: 'Arendaja'
           embedding: "Manustamised"
           legal: "Õiguslik"
+          api: 'API'
           user_api: 'Kasutaja API'
           uncategorized: 'Muu'
           backups: "Varukoopiad"
@@ -2905,6 +3157,7 @@ et:
         sample: "Kasuta järgnevat HTML koodi oma saidil, et luua ja lisada/sängitada discourse teemad oma saidile. Asenda <b>REPLACE_ME</b> kanoonilise lehe URL-viitega, kuhu Sa seda lisad."
         title: "Sängitamine"
         host: "Lubatud hostid"
+        class_name: "Klassi nimi"
         path_whitelist: "Lubatud aadressiosad"
         edit: "muuda"
         category: "Postita foorumisse"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 7db29db301..7324b3d6e5 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -418,7 +418,6 @@ fa_IR:
       '14': "در انتظار"
     categories:
       all: "همه‌ی دسته‌بندی‌ها"
-      all_subcategories: "همه"
       no_subcategory: "هیچی"
       category: "دسته‌بندی"
       category_list: "نمایش فهرست دسته‌بندی"
@@ -710,7 +709,6 @@ fa_IR:
         title: "دعوت‌ها"
         user: "کاربر دعوت شده"
         sent: "ارسال شده"
-        none: "هیچ دعوت در انتظاری برای نمایش موجود نیست."
         truncated:
           other: "نمایش {{count}} دعوت اول."
         redeemed: "دعوت‌نامه‌های استفاده شده"
@@ -1027,6 +1025,7 @@ fa_IR:
       edit_reason_placeholder: "چرا ویرایش می‌کنید؟"
       show_edit_reason: "(افزودن دلیل ویرایش)"
       topic_featured_link_placeholder: "پیوندی که با عنوان نمایش داده می‌شود را وارد کنید."
+      remove_featured_link: "حذف لینک از موضوع"
       reply_placeholder: "اینجا بنویسید. از Markdown, BBCode و یا HTML برای قالب‌بندی متن استفاده کنید. عکس ها را بکشید و یا بچسبانید کنید."
       view_new_post: "نوشته جدیدتان را ببینید."
       saving: "در‌حال ذخیره"
@@ -1058,6 +1057,8 @@ fa_IR:
       ulist_title: "فهرست نقطه‌ای"
       list_item: "فهرست موارد"
       help: "راهنمای ویرایش با Markdown"
+      collapse: "کوچک سازی پنل نوشتن"
+      abandon: "پنل نوشتن را ببند و پیش‌نویس را حذف کن"
       modal_ok: "تایید"
       modal_cancel: "لغو"
       cant_send_pm: "متاسفانه , شما نمیتوانید به %{username}  پیام بفرستید."
@@ -1066,6 +1067,11 @@ fa_IR:
         body: "در حال حاضر این پیام فقط به خود شما ارسال می‌شود!"
       admin_options_title: "تنظیمات اختیاری مدیران برای این موضوع"
     notifications:
+      tooltip:
+        regular:
+          other: "{{count}} اعلان دیده نشده"
+        message:
+          other: "{{count}} خوانده نشده"
       title: "اطلاع رسانی با اشاره به @نام، پاسخ ها به نوشته‌های شما و موضوعات شما، پیام‌های شما و ..."
       none: "قادر به بارگیری اعلان‌ها در این زمان نیستیم."
       empty: "اعلانی پیدا نشد."
@@ -1078,8 +1084,6 @@ fa_IR:
         posted: "نوشته شده توسط"
         edited: "نوشته‌تان را ویرایش کنید توسط"
         liked: "ارسال شما را پسندید"
-        private_message: "پیام خصوصی از"
-        invited_to_private_message: "دعوت شد به یک پیام خصوصی توسط"
         invited_to_topic: "دعوت شده به یک موضوع توسط"
         invitee_accepted: "دعوت قبول شد توسط"
         moved_post: "نوشته‌ی شما منتقل شد توسط"
@@ -1092,7 +1096,6 @@ fa_IR:
         quoted: '{{username}} از شما در "{{topic}}" - {{site_title}} نقل قول کرد '
         replied: '{{username}} در "{{topic}}" - {{site_title}} به شما پاسخ داد'
         posted: '{{username}} در "{{topic}}" - {{site_title}} مطلبی نوشت'
-        private_message: '{{username}} یک پیام خصوصی در "{{topic}}" - {{site_title}} به شما فرستاد'
         linked: '{{username}} در "{{topic}}" - {{site_title}} به نوشته‌ی شما پیوندی قرار داد'
     upload_selector:
       title: "افزودن تصویر"
@@ -1389,7 +1392,6 @@ fa_IR:
         visible: "وارد کردن به فهرست"
         reset_read: "تنظیم مجدد خواندن داده ها"
         make_public: "ایجاد موضوع عمومی"
-        make_private: "ایجاد پیام خصوصی"
       feature:
         pin: "سنجاق زدن موضوع"
         unpin: "برداشتن سنجاق موضوع"
@@ -2009,7 +2011,6 @@ fa_IR:
       granted:
         other: "%{count} اعطا شده"
       select_badge_for_title: انتخاب یک نشان برای استفاده در عنوان خود
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: شروع
@@ -2165,8 +2166,6 @@ fa_IR:
         title: "پرچم‌ها"
         agree: "موافقت کردن"
         agree_title: "تایید این پرچم به عنوان معتبر و صحیح"
-        defer_flag: "چشم پوشی"
-        defer_flag_title: "حذف این پرچم; بدون نیاز به اقدام در این زمان"
         delete: "حذف"
         delete_title: "نوشته‌ای که پرچم به آن اشاره دارد حذف کن."
         delete_post_defer_flag_title: "حذف نوشته; اگر اولین نوشته است، موضوع را حذف نمایید."
@@ -2343,7 +2342,6 @@ fa_IR:
           label: "بار گذاری"
           title: "آپلود یک نسخه پشتیبان برای نمونه"
           uploading: "در حال بار گذاری ..."
-          success: "'{{filename}}' با موفقیت بارگذاری شد."
           error: "هنگام آپلود خطایی رخ می دهد '{{filename}}': {{message}}"
         operations:
           is_running: "عملیاتی در جریان است..."
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index ef7000ef8a..80ff33b64e 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -460,7 +460,6 @@ fi:
       '14': "Odottaa"
     categories:
       all: "kaikki alueet"
-      all_subcategories: "kaikki"
       no_subcategory: "vain pääalue"
       category: "Alue"
       category_list: "Näytä alueet"
@@ -540,7 +539,7 @@ fi:
       disable_jump_reply: "Älä siirry uuteen viestiini lähetettyäni sen"
       dynamic_favicon: "Näytä uusien / päivittyneiden ketjujen määrä selaimen ikonissa"
       theme_default_on_all_devices: "Tee tästä oletusteema kaikille laitteilleni"
-      allow_private_messages: "Salli muiden lähettää minulle yksityisviestejä"
+      allow_private_messages: "Salli toisten käyttäjien lähettää minulle yksityisviestejä"
       external_links_in_new_tab: "Avaa sivuston ulkopuoliset linkit uudessa välilehdessä"
       enable_quoting: "Ota käyttöön viestin lainaaminen tekstiä valitsemalla"
       change: "vaihda"
@@ -765,7 +764,6 @@ fi:
         title: "Kutsut"
         user: "Kutsuttu käyttäjä"
         sent: "Lähetetty"
-        none: "Avoimia kutsuja ei ole."
         truncated:
           one: "Näytetään ensimmäinen kutsu."
           other: "Näytetään ensimmäiset {{count}} kutsua."
@@ -1095,6 +1093,7 @@ fi:
       saved_local_draft_tip: "tallennettu omalla koneella"
       similar_topics: "Tämä ketju vaikuttaa samalta kuin.."
       drafts_offline: "offline luonnokset"
+      group_mentioned_limit: "<b>Varoitus!</b> Mainitsit ryhmän <a href='{{group_link}}'>{{group}}</a>, mutta ylläpitäjä on määrittänyt mainintojen enimmäismääräksi {{max}} käyttäjää, minkä tämän ryhmän jäsenmäärä ylittää. Kukaan ei saa ilmoitusta. "
       group_mentioned:
         one: "Jos mainitset ryhmän {{group}},  <a href='{{group_link}}'>1 käyttäjä</a> saa ilmoituksen – oletko varma?"
         other: "Jos mainitset ryhmän {{group}}, <a href='{{group_link}}'>{{count}} käyttäjää</a> saa ilmoituksen – oletko varma?"
@@ -1209,8 +1208,7 @@ fi:
         posted: "Kirjoittaja"
         edited: "Viestieäsi muokkasi"
         liked: "Viestistäsi tykkäsi"
-        private_message: "Yksityisviesti lähettäjältä"
-        invited_to_private_message: "Kutsu yksityisviestiin käyttäjältä"
+        private_message: "Yksityisviesti käyttäjältä"
         invited_to_topic: "Kutsu ketjuun käyttäjältä"
         invitee_accepted: "Kutsun hyväksyi"
         moved_post: "Viestisi siirsi"
@@ -1224,7 +1222,6 @@ fi:
         quoted: '{{username}} lainasi sinua ketjussa "{{topic}}" - {{site_title}}'
         replied: '{{username}} vastasi sinulle ketjussa "{{topic}}" - {{site_title}}'
         posted: '{{username}} vastasi ketjuun "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} lähetti sinulle yksityisviestin ketjussa "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkitti viestiisi ketjusta "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Lisää kuva"
@@ -1251,6 +1248,9 @@ fi:
       select_all: "Valitse kaikki"
       clear_all: "Tyhjennä kaikki"
       too_short: "Hakusana on liian lyhyt."
+      result_count:
+        one: "Yksi tulos haulle <span class='term'>{{term}}</span>"
+        other: "{{count}}{{plus}} tulosta haulle <span class='term'>{{term}}</span>"
       title: "etsi ketjuja, viestejä, käyttäjiä tai alueita"
       no_results: "Ei tuloksia."
       no_more_results: "Enempää tuloksia ei löytynyt."
@@ -1558,7 +1558,7 @@ fi:
         visible: "Näytä listauksissa"
         reset_read: "Poista tieto lukemisista"
         make_public: "Tee ketjusta julkinen"
-        make_private: "Tee ketjusta yksityinen"
+        make_private: "Muuta yksityiskeskusteluksi"
       feature:
         pin: "Kiinnitä ketju"
         unpin: "Poista ketjun kiinnitys"
@@ -1716,6 +1716,7 @@ fi:
       deleted_by_author:
         one: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti tunnin kuluttua, paitsi jos se liputetaan)"
         other: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos se liputetaan)"
+      collapse: "kutista"
       expand_collapse: "laajenna/pienennä"
       gap:
         one: "näytä 1 piilotettu vastaus"
@@ -1787,6 +1788,7 @@ fi:
         rebake: "Tee HTML uudelleen"
         unhide: "Poista piilotus"
         change_owner: "Vaihda omistajuutta"
+        grant_badge: "Myönnä ansiomerkki"
       actions:
         flag: 'Liputa'
         defer_flags:
@@ -2224,11 +2226,14 @@ fi:
         hamburger_menu: '<b>=</b> Avaa hampurilaisvalikko'
         user_profile_menu: '<b>p</b> Avaa käyttäjävalikko'
         show_incoming_updated_topics: '<b>.</b> Näytä päivttyneet ketjut'
-        search: '<b>/</b> or <b>ctrl</b>+<b>alt</b>+<b>f</b> Haku'
+        search: '<b>/</b> tai <b>ctrl</b>+<b>alt</b>+<b>f</b> Haku'
         help: '<b>?</b> Näytä näppäimistöoikotiet'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Unohda Uudet/Viestit'
         dismiss_topics: '<b>x</b>, <b>t</b> Unohda ketjut'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Kirjaudu ulos'
+      composing:
+        title: 'Kirjoittaminen'
+        return: '<b>shift</b>+<b>c</b> Palaa viestikenttään'
       actions:
         title: 'Toiminnot'
         bookmark_topic: '<b>f</b> Aseta kirjanmerkkeihin/poista'
@@ -2268,7 +2273,7 @@ fi:
         one: "1 myönnetty"
         other: "%{count} myönnettyä"
       select_badge_for_title: Valitse tittelisi ansiomerkeistä
-      none: "<ei mitään>"
+      successfully_granted: "Ansiomerkin %{badge} myöntäminen käyttäjälle %{username} onnistui"
       badge_grouping:
         getting_started:
           name: Ensiaskeleet
@@ -2291,6 +2296,7 @@ fi:
       </p>
     tagging:
       all_tags: "Kaikki tunnisteet"
+      other_tags: "Muut tunnisteet"
       selector_all_tags: "kaikki tunnisteet"
       selector_no_tags: "ei tunnisteita"
       changed: "muutetut tunnisteet"
@@ -2440,8 +2446,8 @@ fi:
         agree_flag_restore_post_title: "Palauta viesti niin että kaikki käyttäjät näkevät sen."
         agree_flag: "Ole samaa mieltä ja säilytä viesti"
         agree_flag_title: "Ole samaa mieltä lipun kanssa ja pidä viesti ennallaan"
-        defer_flag: "Sivuuta"
-        defer_flag_title: "Poista lippu; se ei vaadi toimenpiteitä tällä hetkellä."
+        ignore_flag: "Sivuuta"
+        ignore_flag_title: "Poista tämä lippu; toimenpiteitä ei tarvita juuri nyt."
         delete: "Poista"
         delete_title: "Poista viesti, johon lippu viittaa."
         delete_post_defer_flag: "Poista viesti ja sivuuta lippu"
@@ -2576,6 +2582,7 @@ fi:
           details: "Luodaan uusi vastaus, muokataan, poistetaan tai palautetaan."
         user_event:
           name: "Käyttäjätapahtuma"
+          details: "Kun käyttäjä kirjautuu sisään tai ulos, tai käyttäjä luodaan, hyväksytään tai päivittyy."
         delivery_status:
           title: "Toimituksen tila"
           inactive: "Ei toiminnassa"
@@ -2640,7 +2647,6 @@ fi:
           label: "Lähetä"
           title: "Lataa varmuuskopio tälle koneelle"
           uploading: "Lähettää..."
-          success: "Tiedosto '{{filename}}' on lähetetty onnistuneesti."
           error: "Tiedoston '{{filename}}' lähetyksen aikana tapahtui virhe: {{message}}"
         operations:
           is_running: "Operaatiota suoritetaan parhaillaan..."
@@ -3121,7 +3127,7 @@ fi:
         show_public_profile: "Näytä julkinen profiili"
         impersonate: 'Esiinny käyttäjänä'
         action_logs: "Toimintaloki"
-        ip_lookup: "IP haku"
+        ip_lookup: "IP-haku"
         log_out: "Kirjaa ulos"
         logged_out: "Käyttäjä on kirjautunut ulos kaikilla laitteilla"
         revoke_admin: 'Peru ylläpitäjän oikeudet'
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index b91eda1c6e..fb23784f14 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -460,7 +460,6 @@ fr:
       '14': "En attente"
     categories:
       all: "toutes les catégories"
-      all_subcategories: "toutes"
       no_subcategory: "aucune"
       category: "Catégorie"
       category_list: "Afficher la liste des catégories"
@@ -540,7 +539,6 @@ fr:
       disable_jump_reply: "Ne pas aller à mon nouveau message après avoir répondu"
       dynamic_favicon: "Faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur"
       theme_default_on_all_devices: "En faire mon thème par défaut sur tous mes périphériques"
-      allow_private_messages: "Autoriser les autres utilisateurs à m'envoyer des messages privés"
       external_links_in_new_tab: "Ouvrir tous les liens externes dans un nouvel onglet"
       enable_quoting: "Proposer de citer le texte sélectionné"
       change: "modifier"
@@ -764,7 +762,6 @@ fr:
         title: "Invitations"
         user: "Utilisateurs"
         sent: "Envoyé"
-        none: "Il n'y a pas d'invitations en attente à afficher."
         truncated:
           one: "Afficher la première invitation."
           other: "Afficher les {{count}} premières invitations."
@@ -1209,8 +1206,6 @@ fr:
         posted: "Message par"
         edited: "Modifier votre message par"
         liked: "A aimé votre message"
-        private_message: "Message privé de"
-        invited_to_private_message: "Invité pour un message privé par"
         invited_to_topic: "Invité à un sujet par"
         invitee_accepted: "Invitation acceptée par"
         moved_post: "Votre message a été déplacé par"
@@ -1224,7 +1219,6 @@ fr:
         quoted: '{{username}} vous a cité dans « {{topic}} » - {{site_title}}'
         replied: '{{username}} vous a répondu dans « {{topic}} » - {{site_title}}'
         posted: '{{username}} a posté dans « {{topic}} » - {{site_title}}'
-        private_message: '{{username}} vous a envoyé un message privé dans « {{topic}} » - {{site_title}}'
         linked: '{{username}} a créé un lien vers votre message posté dans « {{topic}} » - {{site_title}}'
     upload_selector:
       title: "Ajouter une image"
@@ -1561,7 +1555,6 @@ fr:
         visible: "Rendre visible"
         reset_read: "Réinitialiser les données de lecture"
         make_public: "Rendre le sujet public"
-        make_private: "Rendre le sujet privé"
       feature:
         pin: "Épingler le sujet"
         unpin: "Désépingler le sujet"
@@ -2271,7 +2264,6 @@ fr:
         one: "1 décerné"
         other: "%{count} décernés"
       select_badge_for_title: Sélectionner un badge comme titre
-      none: "<aucun>"
       badge_grouping:
         getting_started:
           name: Initiation
@@ -2443,8 +2435,6 @@ fr:
         agree_flag_restore_post_title: "Rétablir le message afin que tous les utilisateurs puissent le voir."
         agree_flag: "Accepter et conserver le message"
         agree_flag_title: "Accepter le signalement et conserver le message tel quel."
-        defer_flag: "Ignorer"
-        defer_flag_title: "Retirer le signalement ; il ne nécessite aucune action pour le moment."
         delete: "Supprimer"
         delete_title: "Supprimer le message signalé."
         delete_post_defer_flag: "Supprimer le message et ignorer le signalement"
@@ -2644,7 +2634,6 @@ fr:
           label: "Envoyer"
           title: "Envoyer une sauvegarde à cette instance"
           uploading: "Envoi en cours…"
-          success: "« {{filename}} » a été envoyé avec succès."
           error: "Il y a eu une erreur lors de l'envoi de « {{filename}} » : {{message}}"
         operations:
           is_running: "Une opération est en cours d'exécution…"
@@ -3000,7 +2989,7 @@ fr:
             text: "Consolider"
             title: "Créer de nouvelles plages de sous réseaux à bannir s'il y a au moins 'min_ban_entries_for_roll_up' entrées."
         search_logs:
-          title: "Rechercher dans les journaux"
+          title: "Journaux de recherche"
           term: "Terme"
           searches: "Recherches"
           click_through: "Taux de clics"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 737fec2810..b982402aba 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -363,7 +363,6 @@ gl:
       '14': "Pendente"
     categories:
       all: "todas as categorías"
-      all_subcategories: "todo"
       no_subcategory: "ningunha"
       category: "Categoría"
       category_list: "Amosar a lista de categorías"
@@ -594,7 +593,6 @@ gl:
         title: "Convites"
         user: "Usuario convidado"
         sent: "Enviado"
-        none: "Non hai convites pendentes de ver."
         truncated:
           one: "Amosando o primeiro convite."
           other: "Amosando os primeiros {{count}} convites."
@@ -866,8 +864,6 @@ gl:
         posted: "Publicado por"
         edited: "A túa publicación ediotuna"
         liked: "Gustoulles a túa publicación"
-        private_message: "Mensaxe privada de"
-        invited_to_private_message: "Convidado a unha mensaxe privada de"
         invited_to_topic: "Convidado a un tema de"
         invitee_accepted: "Convite aceptado por"
         moved_post: "A túa publicación foi movida por"
@@ -880,7 +876,6 @@ gl:
         quoted: '{{username}} citoute en "{{topic}}" - {{site_title}}'
         replied: '{{username}} respondeute en "{{topic}}" - {{site_title}}'
         posted: '{{username}} publicou en "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} enviouche unha mensaxe privada en "{{topic}}" - {{site_title}}'
         linked: '{{username}} ligou a túa publicación desde "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Engadir unha imaxe"
@@ -1634,7 +1629,6 @@ gl:
         title: "Denuncias"
         agree: "Aceptar"
         agree_title: "Confirmar esta denuncia como válida"
-        defer_flag_title: "Eliminar esta denuncia; non precisa medidas neste momento."
         delete: "Eliminar"
         delete_title: "Eliminar a publicación á que se refire esta denuncia."
         delete_post_defer_flag_title: "Eliminar publicación. Se é a inicial, eliminar tamén o tema"
@@ -1733,7 +1727,6 @@ gl:
           label: "Enviar"
           title: "Subir unha copia de seguranza a esta instancia"
           uploading: "Enviando..."
-          success: "«{{filename}}» subiuse correctamente."
           error: "Produciuse un erro durante o envío de «{{filename}}»: {{message}}"
         operations:
           is_running: "Estase executando unha operación..."
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 575aba48d9..3e7e7ddf0c 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -441,7 +441,6 @@ he:
       '14': "ממתין"
     categories:
       all: "כל הקטגוריות"
-      all_subcategories: "הכל"
       no_subcategory: "ללא"
       category: "קטגוריה"
       category_list: "הצגת גשימת קטגוריות"
@@ -736,7 +735,6 @@ he:
         title: "הזמנות"
         user: "משתמשים שהוזמנו"
         sent: "נשלח"
-        none: "אין הזמנות ממתינות להציג."
         truncated:
           one: "מראה את ההזמנה הראשונה."
           other: "מראה את {{count}} ההזמנות הראשונות."
@@ -1117,8 +1115,6 @@ he:
         posted: "פורסם על ידי"
         edited: "ערוך את הפוסט שלך על ידי"
         liked: "אהב את הפוסט שלך"
-        private_message: "הודעה פרטית מ"
-        invited_to_private_message: "הזמנה להודעה פרטית מ"
         invited_to_topic: "הוזמנת לנושא חדש מ"
         invitee_accepted: "הזמנה התקבלה על ידי"
         moved_post: "הפוסט שלך הוזז על ידי"
@@ -1131,7 +1127,6 @@ he:
         quoted: '{{username}} ציטט/ה אותך ב"{{topic}}" - {{site_title}}'
         replied: '{{username}} הגיב/ה לך ב"{{topic}}" - {{site_title}}'
         posted: '{{username}} הגיב/ה ב"{{topic}}" - {{site_title}}'
-        private_message: '{{username}} שלח/ה לך הודעה פרטית ב"{{topic}}" - {{site_title}}'
         linked: '{{username}} קישרו לפוסט שלכם מ"{{topic}}" - {{site_title}}'
     upload_selector:
       title: "הוספת תמונה"
@@ -1439,7 +1434,6 @@ he:
         visible: "גילוי"
         reset_read: "אפס מידע שנקרא"
         make_public: "הפיכת הנושא לפומבי"
-        make_private: "הפיכה להודעה פרטית"
       feature:
         pin: "נעיצת נושא"
         unpin: "שחרור נעיצת נושא"
@@ -2113,7 +2107,6 @@ he:
         one: "הוענק"
         other: "%{count} הוענקו"
       select_badge_for_title: בחרו בעיטור לשימוש בכותרת שלכם
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: מתחילים
@@ -2269,7 +2262,6 @@ he:
         title: "דגלים"
         agree: "הסכמה"
         agree_title: "אישור דגל זה כתקין ונכון"
-        defer_flag_title: "הסרה של דגל זה; הוא אינו דורש פעולה כעת."
         delete: "מחיקה"
         delete_title: "מחיקת הפוסט שהדגל מצביע עליו."
         delete_post_defer_flag_title: "מחיקת הפוסט; אם זהו הפוסט הראשון, מחיקת הנושא"
@@ -2448,7 +2440,6 @@ he:
           label: "העלה"
           title: "טען גיבוי לinstance הזה"
           uploading: "מעלה..."
-          success: "'{{filename}}' הועלה בהצלחה."
           error: "הייתה שגיאה במהלך העלאת '{{filename}}': {{message}}"
         operations:
           is_running: "פעולה רצה כרגע..."
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 8c6c91ca12..e36c3001fd 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -370,7 +370,6 @@ id:
       '14': "tertunda"
     categories:
       all: "Semua kategori"
-      all_subcategories: "Semua"
       no_subcategory: "Tak ada"
       category: "Kategori"
       category_list: "Tampilan daftar kategori"
@@ -807,8 +806,6 @@ id:
         mentioned: "Disebut oleh"
         replied: "Telah dibalas"
         posted: "Tulisan oleh"
-        private_message: "Pesan pribadi dari"
-        invited_to_private_message: "Diundang untuk pesan pribadi dari"
         linked: "Tautkan pada tulisan anda"
         group_message_summary: "Pesan di kotak pesan grup"
     new_item: "baru"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 3b0f445512..a646603399 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -50,7 +50,7 @@ it:
           other: "%{count}s"
         less_than_x_minutes:
           one: "< 1m"
-          other: "< %{count}m"
+          other: "< %{count}min"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -61,7 +61,7 @@ it:
           one: "1g"
           other: "%{count}gg"
         x_months:
-          one: "1mese"
+          one: "1 mese"
           other: "%{count}mesi"
         about_x_years:
           one: "1a"
@@ -121,6 +121,7 @@ it:
       split_topic: "ha separato questo argomento %{when}"
       invited_user: "Invitato %{who} %{when}"
       invited_group: "invitato %{who} %{when}"
+      user_left: "%{who}ha rimosso se stesso da questo messaggio %{when} "
       removed_user: "rimosso %{who} %{when}"
       removed_group: "cancellato %{who} %{when}"
       autoclosed:
@@ -457,7 +458,6 @@ it:
       '14': "In Attesa"
     categories:
       all: "tutte le categorie"
-      all_subcategories: "tutte"
       no_subcategory: "nessuno"
       category: "Categoria"
       category_list: "Visualizza l'elenco delle categorie"
@@ -537,7 +537,6 @@ it:
       disable_jump_reply: "Non saltare al mio messaggio dopo la mia risposta"
       dynamic_favicon: "Visualizza il conteggio degli argomenti nuovi / aggiornati sull'icona del browser"
       theme_default_on_all_devices: "Rendi questo il mio tema di default su tutti i miei dispositivi"
-      allow_private_messages: "Consenti agli altri utenti di inviarmi messaggi privati"
       external_links_in_new_tab: "Apri tutti i link esterni in nuove schede"
       enable_quoting: "Abilita \"rispondi quotando\" per il testo evidenziato"
       change: "cambia"
@@ -651,6 +650,7 @@ it:
         title: "Cambia l'immagine del tuo profilo"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basato su"
         gravatar_title: "Cambia il tuo avatar sul sito Gravatar"
+        gravatar_failed: "Impossibile recuperare il Gravatar. Ce n'è uno associato a questo indirizzo email?"
         refresh_gravatar_title: "Ricarica il tuo Gravatar"
         letter_based: "Immagine del profilo assegnata dal sistema"
         uploaded_avatar: "Immagine personalizzata"
@@ -760,7 +760,6 @@ it:
         title: "Inviti"
         user: "Utente Invitato"
         sent: "Spedito"
-        none: "Non ci sono inviti in sospeso da visualizzare."
         truncated:
           one: "Mostro il primo invito."
           other: "Mostro i primi {{count}} inviti."
@@ -1090,6 +1089,7 @@ it:
       saved_local_draft_tip: "salvato in locale"
       similar_topics: "Il tuo argomento è simile a..."
       drafts_offline: "bozze offline"
+      group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='{{group_link}}'>{{group}}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni configurato dagli amministratori di {{max}} utenti. Nessuna notifica verrà inviata. "
       group_mentioned:
         one: "Menzionando {{group}}, verrà notificata <a href='{{group_link}}'>1 persona</a> – sei sicuro?"
         other: "Menzionando {{group}}, verranno notificate <a href='{{group_link}}'>{{count}} persone</a> – sei sicuro?"
@@ -1152,6 +1152,8 @@ it:
       ulist_title: "Elenco Puntato"
       list_item: "Elemento lista"
       help: "Aiuto Inserimento Markdown"
+      collapse: "minimizza il pannello del composer"
+      abandon: "chiudi il composer e scarta la bozza"
       modal_ok: "OK"
       modal_cancel: "Annulla"
       cant_send_pm: "Spiacenti, non puoi inviare un messaggio a %{username}."
@@ -1160,6 +1162,13 @@ it:
         body: "Per ora il messaggio sarà inviato solo a te stesso!"
       admin_options_title: "Impostazioni dello staff opzionali per l'argomento"
     notifications:
+      tooltip:
+        regular:
+          one: "1 notifica non visualizzata"
+          other: "{{count}} notifiche non visualizzate"
+        message:
+          one: "1 messaggio non letto"
+          other: "{{count}} messaggi non letti"
       title: "notifiche di menzioni @nome, risposte ai tuoi messaggi e argomenti ecc."
       none: "Impossibile caricare le notifiche al momento."
       empty: "Nessuna notifica trovata."
@@ -1195,21 +1204,19 @@ it:
         posted: "Messaggio da"
         edited: "Modifica il tuo messaggio da"
         liked: "Ha assegnato un \"Mi piace\" al tuo messaggio"
-        private_message: "Messaggio privato da"
-        invited_to_private_message: "Invitato a un messaggio privato da"
         invited_to_topic: "Invitato a un argomento da"
         invitee_accepted: "Invito accettato da"
         moved_post: "Il tuo messaggio è stato spostato da"
         linked: "Collegamento al tuo messaggio"
         granted_badge: "Distintivo assegnato"
         group_message_summary: "Messaggi nel gruppo in arrivo"
+        topic_reminder: "Un promemoria"
       popup:
         mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
         quoted: '{{username}} ti ha citato in "{{topic}}" - {{site_title}}'
         replied: '{{username}} ti ha risposto in "{{topic}}" - {{site_title}}'
         posted: '{{username}} ha pubblicato in "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} ti ha inviato un messaggio privato in "{{topic}}" - {{site_title}}'
         linked: '{{username}} ha aggiunto un collegamento a un tuo messaggio da "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Aggiungi un'immagine"
@@ -1225,6 +1232,7 @@ it:
       uploading: "In caricamento"
       select_file: "Seleziona File"
       image_link: "collegamento a cui la tua immagine punterà"
+      default_image_alt_text: immagine
     search:
       sort_by: "Ordina per"
       relevance: "Rilevanza"
@@ -1235,6 +1243,9 @@ it:
       select_all: "Seleziona Tutto"
       clear_all: "Cancella Tutto"
       too_short: "La tua chiave di ricerca è troppo corta."
+      result_count:
+        one: "1 risultato per <span class='term'>{{term}}</span>"
+        other: "{{count}}{{plus}} risultati per <span class='term'>{{term}}</span>"
       title: "cerca argomenti, messaggi, utenti o categorie"
       no_results: "Nessun risultato trovato."
       no_more_results: "Nessun altro risultato trovato."
@@ -1261,16 +1272,24 @@ it:
           label: Nel Gruppo
         with_badge:
           label: Con Distintivo
+        with_tags:
+          label: Con etichetta
         filters:
+          label: Mostra solamente argomenti/messaggi...
           likes: su cui ho messo "Mi Piace"
           posted: ho pubblicato in
           watching: sto osservando
           tracking: sto seguendo
+          private: Nei miei messaggi privati
+          bookmarks: Aggiunti ai segnalibri
           first: sono il primissimo post
           pinned: sono appuntati
           unpinned: non sono appuntati
+          seen: Che ho letto
           unseen: non ho letto
           wiki: sono wiki
+          images: che includono immagini
+          all_tags: Tutte le etichette sopra
         statuses:
           label: In cui gli argomenti
           open: sono aperti
@@ -1532,7 +1551,6 @@ it:
         visible: "Rendi Visibile"
         reset_read: "Reimposta Dati Letti"
         make_public: "Rendi Argomento Pubblico"
-        make_private: "Rendi Privato il Messaggio "
       feature:
         pin: "Appunta Argomento"
         unpin: "Spunta Argomento"
@@ -1653,6 +1671,18 @@ it:
       multi_select:
         select: 'scegli'
         selected: 'selezionati ({{count}})'
+        select_post:
+          label: 'seleziona'
+          title: 'Aggiungi il messaggio alla selezione'
+        selected_post:
+          label: 'selezionato'
+          title: 'Clicca per rimuovere un messaggio dalla selezione'
+        select_replies:
+          label: 'seleziona +risposte'
+          title: 'Aggiungi il messaggio e tutte le risposte alla selezione'
+        select_below:
+          label: 'seleziona +seguenti'
+          title: 'Aggiungi questo messaggio e tutti quelli seguenti alla selezione'
         delete: elimina i selezionati
         cancel: annulla selezione
         select_all: seleziona tutto
@@ -2211,7 +2241,6 @@ it:
         one: "1 assegnato"
         other: "%{count} assegnati"
       select_badge_for_title: Seleziona un distintivo da usare come tuo titolo
-      none: "<nessuno>"
       badge_grouping:
         getting_started:
           name: Iniziali
@@ -2240,7 +2269,7 @@ it:
       tags: "Etichette"
       delete_tag: "Cancella Etichetta"
       delete_confirm:
-        one: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da {{count}} argomenti a cui è assegnata?"
+        one: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da 1 argomento a cui è assegnata?"
         other: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da {{count}} argomenti a cui è assegnata?"
       delete_confirm_no_topics: "Sei sicuro di voler eliminare questa etichetta?"
       rename_tag: "Rinomina Etichetta"
@@ -2381,8 +2410,6 @@ it:
         agree_flag_restore_post_title: "Ripristina il messaggio in modo che tutti gli utenti possano vederlo."
         agree_flag: "Accetto e Mantieni il Messaggio"
         agree_flag_title: "Accetta la segnalazione e mantieni invariato il messaggio."
-        defer_flag: "Ignora"
-        defer_flag_title: "Rimuovi segnalazione; non è necessaria alcuna azione questa volta."
         delete: "Cancella"
         delete_title: "Cancella il messaggio a cui si riferisce la segnalazione."
         delete_post_defer_flag: "Elimina il Messaggio e Ignora la segnalazione"
@@ -2581,7 +2608,6 @@ it:
           label: "Carica"
           title: "Carica un backup su questa istanza"
           uploading: "In caricamento..."
-          success: "'{{filename}}' è stato caricato con successo."
           error: "Si è verificato un errore durante il caricamento {{filename}}': {{message}}"
         operations:
           is_running: "Un'operazione è attualmente in esecuzione..."
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 9083af4c3a..2db0766819 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -239,6 +239,7 @@ ja:
     uploading: "アップロード中..."
     uploading_filename: "{{filename}} をアップロードしています..."
     uploaded: "アップロードしました"
+    pasting: "貼り付け"
     enable: "有効にする"
     disable: "無効にする"
     undo: "取り消す"
@@ -429,7 +430,6 @@ ja:
       '14': "保留"
     categories:
       all: "すべてのカテゴリ"
-      all_subcategories: "すべてのサブカテゴリ"
       no_subcategory: "サブカテゴリなし"
       category: "カテゴリ"
       category_list: "カテゴリリストを表示"
@@ -500,6 +500,7 @@ ja:
         disable: "通知を無効にする"
         enable: "通知を有効にする"
         each_browser_note: "注意: 利用するすべてのブラウザでこの設定を変更する必要があります"
+      dismiss: '閉じる'
       dismiss_notifications: "すべて既読にする"
       dismiss_notifications_tooltip: "全ての未読の通知を既読にします"
       first_notification: "最初の通知です! 始めるために選択してください。"
@@ -513,7 +514,9 @@ ja:
       admin: "{{user}} は管理者です"
       moderator_tooltip: "このユーザーはモデレータです"
       admin_tooltip: "このユーザーは管理者です"
+      silenced_tooltip: "このユーザーは消音状態です"
       suspended_notice: "このユーザーは {{date}} まで凍結状態です。"
+      suspended_permanently: "このユーザーは凍結されています"
       suspended_reason: "理由: "
       github_profile: "Github"
       email_activity_summary: "アクティビティの情報"
@@ -530,6 +533,8 @@ ja:
       tag_settings: "タグ"
       watched_tags: "ウォッチ中"
       watched_tags_instructions: "自動的にこれらのタグが付いた全てのトピックをウォッチします。全ての新規投稿と新規トピックが通知されまた、新規投稿数がトピックの隣に表示されます。"
+      tracked_tags: "追跡"
+      tracked_tags_instructions: "これらのタグのすべてのトピックを自動的に追跡します。 新しい投稿の数がトピックの横に表示されます。"
       muted_tags: "通知しない"
       muted_tags_instructions: "これらのタグが付いたトピックについて何も通知されず、また新着にも表示されません。"
       watched_categories: "ウォッチ中"
@@ -561,6 +566,8 @@ ja:
       undo_revoke_access: "アクセス解除をやめる"
       api_approved: "承認されました:"
       theme: "テーマ"
+      home: "デフォルトホームページ"
+      staged: "段階"
       staff_counters:
         flags_given: "役に立った通報"
         flagged_posts: "通報された投稿"
@@ -721,7 +728,6 @@ ja:
         title: "招待"
         user: "招待したユーザ"
         sent: "送信済み"
-        none: "保留中の招待はありません。"
         truncated:
           other: "{{count}} 件の招待を表示しています。"
         redeemed: "招待を確認する"
@@ -859,6 +865,7 @@ ja:
     first_post: 最初の投稿
     mute: ミュート
     unmute: ミュート解除
+    last_post: 最終投稿
     last_reply_lowercase: 最後の返信
     replies_lowercase:
       other: 返信
@@ -989,6 +996,11 @@ ja:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: 選択...
+      no_content: 一致する項目が見つかりませんでした
+      filter_placeholder: 検索...
+      create: "{{content}} を作成"
     emoji_picker:
       filter_placeholder: 絵文字を探す
       people: ピープル
@@ -1050,6 +1062,7 @@ ja:
       edit_reason_placeholder: "編集する理由は何ですか?"
       show_edit_reason: "(編集理由を追加)"
       topic_featured_link_placeholder: "タイトルにリンクを入力してください。"
+      remove_featured_link: "トピックからリンクを削除する。"
       reply_placeholder: "文章を入力してください。 Markdown, BBコード, HTMLが使用出来ます。 画像はドラッグアンドドロップで貼り付けられます。"
       view_new_post: "新しい投稿を見る。"
       saving: "保存中"
@@ -1122,8 +1135,6 @@ ja:
         posted: "投稿者 "
         edited: "投稿の編集者: "
         liked: "あなたの投稿をいいねしました"
-        private_message: "プライベートメッセージを受け取りました: "
-        invited_to_private_message: "プライベートメッセージへ招待されました: "
         invited_to_topic: "トピックに招待されました: "
         invitee_accepted: "招待が承認されました: "
         moved_post: "投稿を移動しました: "
@@ -1136,7 +1147,6 @@ ja:
         quoted: '"{{topic}}"で{{username}}が引用しました - {{site_title}}'
         replied: '{{username}}が"{{topic}}"へ返信しました - {{site_title}}'
         posted: '{{username}} が投稿しました "{{topic}}" - {{site_title}}'
-        private_message: '"{{topic}}"で{{username}}からプライベートメッセージが届きました - {{site_title}}'
         linked: '"{{topic}}"にあるあなたの投稿に{{username}}がリンクしました - {{site_title}}'
     upload_selector:
       title: "画像のアップロード"
@@ -1436,7 +1446,6 @@ ja:
         visible: "リストに表示"
         reset_read: "読み込みデータをリセット"
         make_public: "公開トピックへ変更"
-        make_private: "プライベートメッセージへ変更"
       feature:
         pin: "トピックを固定表示"
         unpin: "トピックの固定表示を解除"
@@ -1793,6 +1802,13 @@ ja:
           description: "他のユーザからメンションされた場合や、投稿に返信された場合に通知されます。"
         muted:
           title: "ミュート中"
+      sort_options:
+        views: "表示"
+        posts: "投稿"
+        activity: "アクティビティー"
+        posters: "投稿者"
+        category: "カテゴリ"
+        created: "作成者"
     flagging:
       title: '報告していただきありがとうございます。'
       action: '投稿を通報'
@@ -2036,11 +2052,33 @@ ja:
         watching_first_post:
           title: "最初の投稿をウォッチする"
           description: "このタグの新規トピックに対する最初の投稿のみ通知されます。"
+      groups:
+        parent_tag_label: "親タグ:"
+        parent_tag_placeholder: "任意"
+        save: "保存する"
+        delete: "削除する"
+        confirm_delete: "このタググループを削除してもよろしいですか？"
       topics:
         none:
+          unread: "未読のトピックはありません。"
+          new: "新着トピックはありません。"
+          read: "あなたはまだ、どのトピックも読んでいません。"
+          posted: "あなたはまだ、どのトピックにも投稿していません。"
           latest: "最新のトピックはありません。"
+          hot: "ホットなトピックはありません。"
+          bookmarks: "ブックマークしたトピックはありません。"
+          top: "トップトピックはありません。"
+          search: "検索結果はありません。"
         bottom:
           latest: "最新のトピックは以上です。"
+          hot: "ホットなトピックは以上です。"
+          posted: "投稿のあるトピックは以上です。"
+          read: "既読のトピックは以上です。"
+          new: "新着トピックは以上です。"
+          unread: "未読のトピックは以上です。"
+          top: "トップトピックは以上です。"
+          bookmarks: "ブックマーク済みのトピックは以上です。"
+          search: "検索結果は以上です。"
   admin_js:
     type_to_filter: "設定項目を検索..."
     admin:
@@ -2098,7 +2136,6 @@ ja:
         title: "通報"
         agree: "賛成する"
         agree_title: "この通報が有効で正しいことを確認してください"
-        defer_flag_title: "通報を削除します。何も行いません。"
         delete: "削除する"
         delete_title: "この通報で通報されている投稿を削除します"
         delete_post_defer_flag_title: "投稿を削除します。最初の投稿を削除した場合、トピックも削除されます。"
@@ -2129,6 +2166,8 @@ ja:
         visit_topic: "トピックを確認"
         was_edited: "最初の通報後に編集された投稿"
         previous_flags_count: "この投稿は既に {{count}} 回通報されています"
+        flagged_topics:
+          topic: "トピック"
       groups:
         primary: "プライマリーグループ"
         no_primary: "（プライマリーグループなし）"
@@ -2211,7 +2250,6 @@ ja:
           label: "アップロード"
           title: "このインスタンスにバックアップをアップロード"
           uploading: "アップロード中..."
-          success: "ファイル'{{filename}}' がアップロードされました。"
           error: "ファイル '{{filename}}'アップロードエラー: {{message}}"
         operations:
           is_running: "バックアップ作業を実行中..."
@@ -2557,6 +2595,15 @@ ja:
         suspend_reason: "理由"
         suspend_reason_placeholder: "凍結理由"
         suspended_by: "凍結したユーザ"
+        silence_reason: "理由"
+        silenced_by: "消音化したユーザ"
+        silence_duration: "ユーザーはどのくらいの間、消音化されますか？"
+        silence_reason_label: "なぜあなたはこのユーザーを消音化させますか？"
+        silence_reason_placeholder: "消音化の理由"
+        silence_message: "メールメッセージ"
+        silence_message_placeholder: "(デフォルトのメッセージを送信する場合は空白のままにします)"
+        suspended_until: "(%{until}まで)"
+        cant_suspend: "このユーザーは凍結できません。"
         delete_all_posts: "全ての投稿を削除"
         moderator: "モデレータ権限の所有"
         admin: "管理者権限の所有"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 581fbf42b5..4a72621106 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -428,7 +428,6 @@ ko:
       '14': "대기"
     categories:
       all: "전체 카테고리"
-      all_subcategories: "모든 하위 카테고리"
       no_subcategory: "없음"
       category: "카테고리"
       category_list: "카테고리 목록 표시"
@@ -506,7 +505,6 @@ ko:
       disable_jump_reply: "댓글을 작성했을 때, 새로 작성한 댓글로 화면을 이동하지 않습니다."
       dynamic_favicon: "새 글이나 업데이트된 글 수를 브라우저 아이콘에 보이기"
       theme_default_on_all_devices: "이 테마를 모든 기기의 기본 테마로 설정합니다."
-      allow_private_messages: "다른 사용자가 개인 메시지를 보내도록 허용합니다."
       external_links_in_new_tab: "모든 외부 링크를 새 탭에 열기"
       enable_quoting: "강조 표시된 텍스트에 대한 알림을 사용합니다"
       change: "변경"
@@ -728,7 +726,6 @@ ko:
         title: "초대"
         user: "사용자 초대"
         sent: "보냄"
-        none: "승인을 기다리는 초대가 더이상 없습니다."
         truncated:
           other: "앞 {{count}}개의 초대를 보여줍니다."
         redeemed: "초대를 받았습니다."
@@ -1139,8 +1136,6 @@ ko:
         posted: "포스트 by"
         edited: "당신 글이 다음 이용자에 의해 수정"
         liked: "당신의 글을 좋아했음."
-        private_message: "다음 사람에게서온 개인 메시지"
-        invited_to_private_message: "다음 사람으로부터 개인 메시지가 초대됨"
         invited_to_topic: "다음 사람으로부터 한 주제로 초대됨"
         invitee_accepted: "다음 사람에 의해 초대가 수락됨."
         moved_post: "다음 사람에 의해서 당신의 글이 이동됨"
@@ -1153,7 +1148,6 @@ ko:
         quoted: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 나를 인용했습니다'
         replied: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 내게 답글을 달았습니다'
         posted: '"{{topic}}" - {{site_title}}에서 {{username}}님이 글을 게시하였습니다'
-        private_message: '{{username}}가 비공개 메시지를 "{{topic}}" - {{site_title}} 에 작성했습니다'
         linked: '{{username}}님이  "{{topic}}" - {{site_title}}에 내 글을 링크했습니다'
     upload_selector:
       title: "이미지 추가하기"
@@ -1463,7 +1457,6 @@ ko:
         visible: "목록에 넣기"
         reset_read: "값 재설정"
         make_public: "공개 토픽으로 만들기"
-        make_private: "비공개 메시지 만들기"
       feature:
         pin: "주제 고정"
         unpin: "주제 고정 취소"
@@ -2091,7 +2084,6 @@ ko:
       granted:
         other: "%{count}개 수여됨"
       select_badge_for_title: 타이틀로 사용할 배지 선택하기
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: 시작하기
@@ -2253,7 +2245,6 @@ ko:
         topics: "신고된 토픽"
         agree: "동의"
         agree_title: "이 신고가 올바르고 타당함을 확인합니다"
-        defer_flag_title: "신고 제거하기. 별도추가조치는 더이상 필요없습니다"
         delete: "삭제"
         delete_title: "신고에서 멘션된 글 삭제하기"
         delete_post_defer_flag_title: "글을 삭제하고 첫번째 글이면 주제 삭제하기"
@@ -2446,7 +2437,6 @@ ko:
           label: "업로드"
           title: "백업을 업로드"
           uploading: "업로드 중..."
-          success: "'{{filename}}' 파일이 성공적으로 업로드 되었습니다."
           error: "'{{filename}}' 파일 업로드중 에러가 발생하였습니다. ({{message}})"
         operations:
           is_running: "실행 중입니다."
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index f3e61363c7..ed00ec83da 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -467,7 +467,6 @@ lv:
       '14': "Gaida apstiprinājumu"
     categories:
       all: "visas sadaļas"
-      all_subcategories: "viss"
       no_subcategory: "nekas"
       category: "Sadaļa"
       category_list: "Parādīt sadaļu sarakstu"
@@ -765,7 +764,6 @@ lv:
         title: "Ielūgumi"
         user: "Ielūgtie lietotāji"
         sent: "Nosūtīts"
-        none: "Ielūgumu, kas gaidītu apstiprinājumu, nav."
         truncated:
           zero: "Nav ielūgumu."
           one: "Pirmais ielūgums."
@@ -1163,8 +1161,6 @@ lv:
         posted: "Ieraksts"
         edited: "Korektētēja"
         liked: "Pauda atzinību jūsu ierakstam"
-        private_message: "Privāta ziņa no"
-        invited_to_private_message: "Ielūgums uz privāto ziņu no"
         invited_to_topic: "Ielūgums uz tēmu no"
         invitee_accepted: "Ielūgumu pieņēma "
         moved_post: "Jūsu ierakstu pārvietoja"
@@ -1177,7 +1173,6 @@ lv:
         quoted: '{{username}} citēja jūs "{{topic}}" - {{site_title}}'
         replied: '{{username}} atbildēja jums "{{topic}}" - {{site_title}}'
         posted: '{{username}} ierakstīja "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} nosūtīja jums privātu ziņu "{{topic}}" - {{site_title}}'
         linked: '{{username}} ievietoja saiti uz jūsu ierakstu no "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Pievienot attēlu"
@@ -1493,7 +1488,6 @@ lv:
         visible: "Atgriezt tēmu sarakstos"
         reset_read: "Atstatīt visu kā nelasītu"
         make_public: "Izveidot publisku tēmu"
-        make_private: "Izveidot privātu ziņu"
       feature:
         pin: "Piespraust tēmu"
         unpin: "Atspraust tēmu"
@@ -2199,7 +2193,6 @@ lv:
         one: "1 piešķirts"
         other: "%{count} piešķirti"
       select_badge_for_title: Izvēlieties žetonu, ko lietot kā jūsu titulu
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Uzsākt darbu
@@ -2354,7 +2347,6 @@ lv:
         title: "Sūdzības"
         agree: "Piekrist"
         agree_title: "Apstiprināt šo ziņojumu kā pamatotu un korektu"
-        defer_flag_title: "Dzēst šo sūdzību; šoreiz nav jāveic nekādas darbības."
         delete: "Dzēst"
         delete_title: "Dzēst ierakstu, par ko ir šī sūdzība."
         delete_post_defer_flag_title: "Dzēst ierakstu; ja tas ir tēmas pirmais ieraksts, dzēst arī tēmu"
@@ -2515,7 +2507,6 @@ lv:
           label: "Augšupielādēt"
           title: "Augšupielādēt rezerves kopiju uz šo instanci"
           uploading: "Augšupielādē..."
-          success: "'{{filename}}' ir veiksmīgi augšupielādēts."
           error: "Augšupielādējot '{{filename}}', notika kļūda: {{message}}"
         operations:
           failed: "{{operation}} neizdevās. Lūdzu pārbaudīt žurnāla ierakstus."
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 122535a6ab..6c5b33a3f2 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -109,7 +109,7 @@ nb_NO:
       next_month: 'Neste måned'
       placeholder: dato
     share:
-      topic: 'del en lenke til dette emnet'
+      topic: 'del en lenke til denne tråden'
       post: 'innlegg #%{postNumber}'
       close: 'lukk'
       twitter: 'del denne lenken på Twitter'
@@ -117,12 +117,12 @@ nb_NO:
       google+: 'del denne lenken på Google+'
       email: 'del denne lenken i en e-post'
     action_codes:
-      public_topic: "gjorde dette emnet offentlig %{when}"
-      private_topic: "gjorde dette emnet privat %{when}"
-      split_topic: "splittet dette emnet %{when}"
+      public_topic: "gjorde denne tråden offentlig %{when}"
+      private_topic: "gjorde denne tråden privat %{when}"
+      split_topic: "del opp denne tråden %{when}"
       invited_user: "inviterte %{who} %{when}"
       invited_group: "inviterte %{who} %{when}"
-      user_left: "%{who} fjernet seg fra denne meldingen %{when}"
+      user_left: "%{who} fjernet seg selv fra denne meldingen %{when}"
       removed_user: "fjernet %{who} %{when}"
       removed_group: "fjernet %{who} %{when}"
       autoclosed:
@@ -133,7 +133,7 @@ nb_NO:
         disabled: 'åpnet %{when}'
       archived:
         enabled: 'arkivert %{when}'
-        disabled: 'fjernet fra arkiv %{when}'
+        disabled: 'arkivering opphevet %{when}'
       pinned:
         enabled: 'festet %{when}'
         disabled: 'feste fjernet %{when}'
@@ -144,12 +144,12 @@ nb_NO:
         enabled: 'gjort synlig %{when}'
         disabled: 'skjult %{when}'
       banner:
-        enabled: 'laget dette banneret %{when}. Det vil vises på toppen av hver side til brukeren lukker det.'
-        disabled: 'Fjernet dette banneret %{when}. Det vil ikke lenger vises på toppen av hver side.'
-    topic_admin_menu: "admin-handlinger for emne"
+        enabled: 'gjorde dette til et banner %{when}. Det vil vises på toppen av hver side inntil brukeren lukker det.'
+        disabled: 'fjernet dette banneret %{when}. Det vil ikke lenger vises på toppen av hver side.'
+    topic_admin_menu: "administratorhandlinger for tråd"
     wizard_required: "Velkommen til ditt nye Discourse! Kom i gang med <a href='%{url}' data-auto-route='true'>oppstartsveiviseren</a> ✨"
     emails_are_disabled: "All utgående e-post har blitt deaktivert globalt av en administrator. Ingen e-postvarslinger vil bli sendt."
-    bootstrap_mode_enabled: "For å gjøre det enklere å lansere det nye nettstedet ditt er det i bootstrap-modus. Alle nye brukere vil få tillitsnivå 1 og få daglige oppdateringer på e-post aktivert. Dette vil automatisk bli slått av når antallet brukere overstiger %{min_users}."
+    bootstrap_mode_enabled: "For å gjøre det enklere å lansere det nye nettstedet ditt er det i bootstrap-modus. Alle nye brukere vil få tillitsnivå 1 og ha daglige oppsummeringer på e-post aktivert. Dette vil bli slått av automatisk når antallet brukere overstiger %{min_users}."
     bootstrap_mode_disabled: "Bootstrap modus vil bli deaktivert i løpet av de neste 24 timene."
     themes:
       default_description: "Forvalg"
@@ -170,8 +170,8 @@ nb_NO:
         us_gov_west_1: "AWS GovCloud (USA)"
         us_west_1: "USA vest (N. California)"
         us_west_2: "USA vest (Oregon)"
-    edit: 'rediger tittelen og kategorien til dette emnet'
-    not_implemented: "Beklager, denne funksjonen har ikke blitt implementert enda."
+    edit: 'endre tittelen og kategorien til denne tråden'
+    not_implemented: "Beklager, den funksjonen er ikke blitt implementert enda."
     no_value: "Nei"
     yes_value: "Ja"
     generic_error: "Beklager, det har oppstått en feil."
@@ -214,7 +214,7 @@ nb_NO:
       one: "{{count}} tegn"
       other: "{{count}} tegn"
     suggested_topics:
-      title: "Anbefalte emner"
+      title: "Anbefalte tråder"
       pm_title: "Anbefalte meldinger"
     about:
       simple_title: "Om"
@@ -227,7 +227,7 @@ nb_NO:
         last_7_days: "Siste 7 dager"
         last_30_days: "Siste 30 dager"
       like_count: "Likes"
-      topic_count: "Emner"
+      topic_count: "Tråder"
       post_count: "Innlegg"
       user_count: "Brukere"
       active_user_count: "Aktive brukere"
@@ -237,24 +237,24 @@ nb_NO:
       title: "Bokmerke"
       clear_bookmarks: "Fjern bokmerker"
       help:
-        bookmark: "Klikk for å bokmerke det første innlegget i dette emnet"
-        unbookmark: "Klikk for å fjerne alle bokmerker i dette emnet"
+        bookmark: "Klikk for å bokmerke det første innlegget i denne tråden"
+        unbookmark: "Klikk for å fjerne alle bokmerker i denne tråden"
     bookmarks:
       not_logged_in: "beklager, du må være innlogget for å kunne bokmerke innlegg"
       created: "du har bokmerket dette innlegget"
-      not_bookmarked: "du har lest dette innlegget, trykk for å bokmerke det"
-      last_read: "dette er det siste innlegget du har lest, trykk for å bokmerke det"
+      not_bookmarked: "du har lest dette innlegget; klikk for å bokmerke det"
+      last_read: "dette er det siste innlegget du har lest; klikk for å bokmerke det"
       remove: "Fjern bokmerke"
-      confirm_clear: "Er du sikker på at du vil fjerne alle bokmerkene fra dette emnet?"
+      confirm_clear: "Er du sikker på at du vil fjerne alle bokmerkene fra denne tråden?"
     topic_count_latest:
-      one: "{{count}} nytt eller oppdatert emne"
-      other: "{{count}} nye eller oppdaterte emner"
+      one: "{{count}} nytt eller oppdatert tråd"
+      other: "{{count}} nye eller oppdaterte tråder"
     topic_count_unread:
-      one: "{{count}} ulest emne"
-      other: "{{count}} uleste emner"
+      one: "{{count}} ulest tråd"
+      other: "{{count}} uleste tråder"
     topic_count_new:
-      one: "{{count}} nytt emne"
-      other: "{{count}} nye emner"
+      one: "{{count}} ny tråd"
+      other: "{{count}} nye tråder"
     click_to_show: "Klikk for å vise"
     preview: "forhåndsvisning"
     cancel: "avbryt"
@@ -274,28 +274,28 @@ nb_NO:
     switch_to_anon: "Start inkognitomodus"
     switch_from_anon: "Avslutt inkognitomodus"
     banner:
-      close: "Fjern dette banneret"
+      close: "Fjern dette banneret."
       edit: "Endre dette banneret >>"
     choose_topic:
-      none_found: "Ingen emner funnet."
+      none_found: "Ingen tråder funnet."
       title:
-        search: "Søk etter et emne ved navn, URL eller ID:"
-        placeholder: "skriv emnetittelen her"
+        search: "Søk etter en tråd med navn, URL eller ID:"
+        placeholder: "skriv tittelen på tråden her"
     queue:
-      topic: "Emne:"
+      topic: "Tråd:"
       approve: 'Godkjenn'
       reject: 'Avvis'
       delete_user: 'Slett bruker'
       title: "Trenger godkjenning"
-      none: "Det er ingen innlegg som må evalueres."
+      none: "Det finnes ingen innlegg som må evalueres."
       edit: "Rediger"
       cancel: "Avbryt"
       view_pending: "vis ventende innlegg"
       has_pending_posts:
         one: "Dette emnet har <b>1</b> innlegg som venter på godkjenning"
-        other: "Dette emnet har <b>{{count}}</b> innlegg som venter på godkjenning"
+        other: "Denne tråden har <b>{{count}}</b> innlegg som venter på godkjenning"
       confirm: "Lagre endringer"
-      delete_prompt: "Er du sikker du ønsker å slette <b>%{username}</b>? Dette vil fjerne alle brukerens innlegg og blokkere brukerens epost- og IP-adresse."
+      delete_prompt: "Er du sikker på at du ønsker å slette <b>%{username}</b>? Dette vil fjerne alle innlegg og blokkere e-post- og IP-addressen til vedkommende."
       approval:
         title: "Innlegg trenger godkjenning"
         description: "Vi har mottatt ditt nye innlegg men det krever godkjenning av en moderator før det vises. Ha tålmod."
@@ -304,12 +304,12 @@ nb_NO:
           other: "Du har <strong>{{count}}</strong> innlegg som venter på godkjenning."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> postet <a href='{{topicUrl}}'>emnet</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Du</a> postet <a href='{{topicUrl}}'>emnet</a>"
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> opprettet <a href='{{topicUrl}}'>tråden</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Du</a> opprettet <a href='{{topicUrl}}'>tråden</a>"
       user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> besvarte <a href='{{postUrl}}'>{{post_number}}</a>"
       you_replied_to_post: "<a href='{{userUrl}}'>Du</a> besvarte <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> besvarte <a href='{{topicUrl}}'>emnet</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Du</a> besvarte <a href='{{topicUrl}}'>emnet</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> svarte på <a href='{{topicUrl}}'>tråden</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Du</a> svarte på <a href='{{topicUrl}}'>tråden</a>"
       user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> nevnte <a href='{{user2Url}}'>{{another_user}}</a>"
       user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> nevnte <a href='{{user2Url}}'>deg</a>"
       you_mentioned_user: "<a href='{{user1Url}}'>Du</a> nevnte <a href='{{user2Url}}'>{{another_user}}</a>"
@@ -318,15 +318,15 @@ nb_NO:
       sent_by_user: "Sendt av <a href='{{userUrl}}'>{{user}}</a>"
       sent_by_you: "Sendt av <a href='{{userUrl}}'>deg</a>"
     directory:
-      filter_name: "filtrer etter navn"
+      filter_name: "filtrer etter brukernavn"
       title: "Brukere"
       likes_given: "Gitt"
       likes_received: "Mottatt"
       topics_entered: "Lest"
-      topics_entered_long: "Emner Sett"
+      topics_entered_long: "Tråder sett"
       time_read: "Tid lest"
-      topic_count: "Emner"
-      topic_count_long: "Emner startet"
+      topic_count: "Tråder"
+      topic_count_long: "Tråder opprettet"
       post_count: "Svar"
       post_count_long: "Svar"
       no_results: "Ingen treff"
@@ -343,7 +343,7 @@ nb_NO:
         add_user_to_group: "Legg til bruker"
         remove_user_from_group: "Slett bruker"
         make_user_group_owner: "Gjør til eier"
-        remove_user_as_group_owner: "Fjern som eier"
+        remove_user_as_group_owner: "Trekk tilbake eierstatus"
     groups:
       logs:
         title: "Logger"
@@ -364,12 +364,12 @@ nb_NO:
       public_admission: "Tillat brukere å ta del i gruppen fritt (krever offentlig synlig gruppe)"
       public_exit: "Tillat brukere å fritt forlate gruppen"
       empty:
-        posts: "Det er ingen innlegg av medlemmer i denne gruppen."
-        members: "Det er ingen medlemmer av denne gruppen."
+        posts: "Det finnes ingen innlegg av medlemmer i denne gruppen."
+        members: "Det finnes ingen medlemmer av denne gruppen."
         mentions: "Denne gruppen har aldri blitt nevnt."
-        messages: "Det er ingen meldinger til denne gruppen."
-        topics: "Det er ingen emner av medlemmer av denne gruppen."
-        logs: "Det er ingen logger for denne gruppen."
+        messages: "Det finnes ingen meldinger til denne gruppen."
+        topics: "Det finnes ingen tråder opprettet av medlemmer av denne gruppen."
+        logs: "Det finnes ingen logger for denne gruppen."
       add: "Legg til"
       join: "Bli medlem av gruppe"
       leave: "Forlat gruppe"
@@ -392,13 +392,13 @@ nb_NO:
       owner: "eier"
       index:
         title: "Grupper"
-        empty: "Det er ingen synlige grupper"
+        empty: "Det finnes ingen synlige grupper"
       title:
         one: "Gruppe"
         other: "Grupper"
       activity: "Aktivitet"
       members: "Medlemmer"
-      topics: "Emner"
+      topics: "Tråder"
       posts: "Innlegg"
       mentions: "Omtalelser"
       messages: "Meldinger"
@@ -426,16 +426,16 @@ nb_NO:
           description: "Du vil bli varslet om hvert nye innlegg i hver beskjed, og antallet nye svar vil bli vist."
         watching_first_post:
           title: "Følger første innlegg"
-          description: "Du vil bare bli varslet om det første innlegget i hvert nye emne i denne gruppen."
+          description: "Du vil bare bli varslet om det første innlegget i hver nye tråd i denne gruppen."
         tracking:
           title: "Overvåker"
-          description: "Du vil få beskjeddersom nevner @navnet_ditt eller svarer deg, og antallet nye svar vil bli vist."
+          description: "Du vil få beskjeddersom nevner @navnet ditt eller svarer deg, og antallet nye svar vil bli vist."
         regular:
           title: "Normal"
-          description: "Du vil bli varslet hvis noen nevner ditt @navn eller svarer deg."
+          description: "Du vil bli varslet hvis noen nevner @navnet ditt eller svarer deg."
         muted:
           title: "Ignorert"
-          description: "Du vil aldri bli varslet om noe angående nye emner i denne gruppen."
+          description: "Du vil aldri bli varslet om noe vedrørende nye tråder i denne gruppen."
       flair_url: "Bilde for gruppetilhørighet på avatar"
       flair_url_placeholder: "(Valgfritt) Font Awesome-klasse eller URL til bilde"
       flair_bg_color: "Bakgrunnsfarge for gruppetilhørighetsbilde på avatar"
@@ -449,7 +449,7 @@ nb_NO:
       '1': "Likes tildelt"
       '2': "Likes mottatt"
       '3': "Bokmerker"
-      '4': "Emner"
+      '4': "Tråder"
       '5': "Svar"
       '6': "Svar"
       '7': "Omtalelser"
@@ -460,7 +460,7 @@ nb_NO:
       '14': "Venter"
     categories:
       all: "Alle"
-      all_subcategories: "alle"
+      all_subcategories: "alle i %{categoryName}"
       no_subcategory: "ingen"
       category: "Kategori"
       category_list: "Vis kategoriliste"
@@ -473,17 +473,17 @@ nb_NO:
         apply_all: "Bruk"
         position: "Posisjon"
       posts: "Innlegg"
-      topics: "Emner"
+      topics: "Tråder"
       latest: "Siste"
       latest_by: "siste av"
-      toggle_ordering: "veksle rekkefølge"
+      toggle_ordering: "Slå på/av styring av sortering"
       subcategories: "Underkategorier"
       topic_sentence:
-        one: "1 emne"
-        other: "%{count} nye emner"
+        one: "1 tråd"
+        other: "%{count} tråder"
       topic_stat_sentence:
-        one: "%{count} nytt emner de siste %{unit}."
-        other: "%{count} nye emner de siste %{unit}."
+        one: "%{count} nytt tråder de siste %{unit}."
+        other: "%{count} nye tråder de siste %{unit}."
     ip_lookup:
       title: Slå opp IP-adresse
       hostname: Vertsnavn
@@ -496,7 +496,7 @@ nb_NO:
       username: "brukernavn"
       trust_level: "TN"
       read_time: "lesetid"
-      topics_entered: "emner laget"
+      topics_entered: "tråder åpnet"
       post_count: "# innlegg"
       confirm_delete_other_accounts: "Er du sikker på at du vil slette disse kontoene?"
       powered_by: "drevet av <a href='https://ipinfo.io'>ipinfo.io</a>"
@@ -509,7 +509,7 @@ nb_NO:
       edit: "Rediger innstillinger"
       download_archive:
         button_text: "Last ned alle"
-        confirm: "Er du sikker på at du vil laste ned dine innlegg?"
+        confirm: "Er du sikker på at du vil laste ned innleggene dine?"
         success: "Nedlasting iverksatt. Du vil bli varslet med en melding når prosessen er fullført."
         rate_limit_error: "Innlegg kan lastes ned en gang om dagen, prøv igjen i morgen."
       new_private_message: "Ny Melding"
@@ -538,9 +538,9 @@ nb_NO:
       dismiss_notifications_tooltip: "Merk alle uleste varslinger som lest"
       first_notification: "Ditt første varsel! Velg det for å komme i gang."
       disable_jump_reply: "Ikke hopp til ditt nye innlegg etter svar"
-      dynamic_favicon: "Vis antall nye / oppdaterte emner på nettleser ikonet"
+      dynamic_favicon: "Vis antall nye / oppdaterte tråder på nettleserikonet"
       theme_default_on_all_devices: "Gjør dette til forvalgt drakt på alle mine enheter"
-      allow_private_messages: "Tillat andre brukere å sende meg private meldinger"
+      allow_private_messages: "Tillat andre brukere å sende meg personlige meldinger"
       external_links_in_new_tab: "Åpne alle eksterne lenker i ny fane"
       enable_quoting: "Aktiver svar med sitat for uthevet tekst"
       change: "Endre"
@@ -548,9 +548,9 @@ nb_NO:
       admin: "{{user}} er en admin"
       moderator_tooltip: "Denne brukeren er en moderator"
       admin_tooltip: "Denne brukeren er en administrator"
-      silenced_tooltip: "Brukeren er forstummet"
-      suspended_notice: "Denne brukeren er bannlyst til {{date}}."
-      suspended_permanently: "Brukeren er bannlyst."
+      silenced_tooltip: "Denne brukeren er dempet"
+      suspended_notice: "Denne brukeren er utestengt til {{date}}."
+      suspended_permanently: "Denne brukeren er utestengt."
       suspended_reason: "Begrunnelse:"
       github_profile: "Github"
       email_activity_summary: "Oppsummering av aktivitet"
@@ -559,28 +559,28 @@ nb_NO:
         enabled: "Slå på e-postlistemodus"
         instructions: |
           Denne innstillingen overstyrer oppsummeringen av aktivitet.<br />
-          Ignorerte emner og kategorier blir ikke inkludert i disse e-postene.
+          Ignorerte tråder og kategorier blir ikke inkludert i disse e-postene.
         individual: "Send en e-post for hvert nye innlegg"
         individual_no_echo: "Send en e-post for hvert nye innlegg bortsett fra mine egne"
         many_per_day: "Send meg en e-post for hvert nye innlegg (rundt {{dailyEmailEstimate}} per deg)"
         few_per_day: "Send meg en e-post for hvert nye innlegg (rundt to ganger om dagen)"
       tag_settings: "Stikkord"
       watched_tags: "Fulgt"
-      watched_tags_instructions: "Du vil automatisk følge alle emner med disse stikkordene. Du vil bli varslet om alle nye innlegg og emner, og tallet på nye innlegg til også vises ved siden av emnet."
+      watched_tags_instructions: "Du vil automatisk følge alle tråder med disse stikkordene. Du vil bli varslet om alle nye innlegg og tråder, og antallet nye innlegg til også vises ved siden av tråden."
       tracked_tags: "Overvåkes"
-      tracked_tags_instructions: "Du vil automatisk overvåke alle emner med disse stikkordene. Tallet på nye innlegg vil vises ved siden av emnet."
+      tracked_tags_instructions: "Du vil automatisk overvåke alle tråder med disse stikkordene. Antallet nye innlegg vil vises ved siden av tråden."
       muted_tags: "Ignorert"
-      muted_tags_instructions: "Du vil ikke bli varslet om noe med tanke på nye emner med disse stikkordene, og de vil ikke vises i siste."
+      muted_tags_instructions: "Du vil ikke bli varslet om noe vedrørende nye tråder med disse stikkordene, og de vil ikke vises i siste."
       watched_categories: "Fulgt"
-      watched_categories_instructions: "Du vil automatisk følge alle emner i disse kategoriene. Du vil bli varslet om alle nye innlegg og emner, og tallet på nye innlegg vil vises ved siden av emnet."
+      watched_categories_instructions: "Du vil automatisk følge alle trådene i disse kategoriene. Du vil bli varslet om alle nye innlegg og tråder, og antallet nye innlegg vil vises ved siden av tråden."
       tracked_categories: "Overvåkes"
-      tracked_categories_instructions: "Du vil automatisk overvåke alle emner i disse kategoriene. Tallet på nye innlegg vil vises ved siden av emnet."
+      tracked_categories_instructions: "Du vil automatisk overvåke alle tråder i disse kategoriene. Tallet på nye innlegg vil vises ved siden av tråden."
       watched_first_post_categories: "Følger første innlegg"
-      watched_first_post_categories_instructions: "Du vil bli varslet om det første innlegget i hvert nye emne i disse kategoriene."
+      watched_first_post_categories_instructions: "Du vil bli varslet om det første innlegget i hver nye tråd i disse kategoriene."
       watched_first_post_tags: "Følger første innlegg"
-      watched_first_post_tags_instructions: "Du vil bli varslet om det første innlegget i hvert nye emne med disse stikkordene."
+      watched_first_post_tags_instructions: "Du vil bli varslet om det første innlegget i hver nye tråd med disse stikkordene."
       muted_categories: "Ignorert"
-      muted_categories_instructions: "Du vil ikke bli varslet om noe med tanke på nye emner i disse kategoriene, og de vil ikke vises i siste."
+      muted_categories_instructions: "Du vil ikke bli varslet om noe med tanke på nye tråder i disse kategoriene, og de vil ikke vises i siste."
       no_category_access: "Som moderator har du begrenset kategoritilgang, lagring er avskrudd."
       delete_account: "Slett kontoen min"
       delete_account_confirm: "Er du sikker på at du vil slette kontoen din permanent? Denne handlingen kan ikke angres!"
@@ -591,13 +591,13 @@ nb_NO:
       users: "Brukere"
       muted_users: "Ignorert"
       muted_users_instructions: "Skjul alle varsler fra denne brukeren"
-      muted_topics_link: "Vis ignorerte emner"
-      watched_topics_link: "Vis fulgte emner"
-      tracked_topics_link: "Vis fulgte emner"
-      automatically_unpin_topics: "Automatisk fjern feste for emner når jeg når bunnen."
+      muted_topics_link: "Vis ignorerte tråder"
+      watched_topics_link: "Vis fulgte tråder"
+      tracked_topics_link: "Vis fulgte tråder"
+      automatically_unpin_topics: "Automatisk fjern feste for tråder når jeg når bunnen."
       apps: "Programmer"
       revoke_access: "Trekk tilbake tilgang"
-      undo_revoke_access: "Angre \"trekk tilbake tilgang\""
+      undo_revoke_access: "Angre tilbaketrekking av tilgang"
       api_approved: "Godkjent:"
       theme: "Drakt"
       home: "Forvalgt hjemmeside"
@@ -615,7 +615,7 @@ nb_NO:
         archive: "Arkiver"
         groups: "Mine grupper"
         bulk_select: "Velg meldinger"
-        move_to_inbox: "Flytt til inboks"
+        move_to_inbox: "Flytt til innboks"
         move_to_archive: "Arkiver"
         failed_to_move: "Kunne ikke flytte valgte meldinger (kanskje nettforbindelsen din er nede)"
         select_all: "Velg alle"
@@ -647,7 +647,7 @@ nb_NO:
       change_email:
         title: "Endre e-postadresse"
         taken: "Beklager, den e-postadressen er ikke tilgjengelig."
-        error: "Det oppsto en feil ved endring av din e-postadresse. Kanskje den adressen allerede er i bruk?"
+        error: "Det oppstod en feil ved endring av din e-postadresse. Kanskje den adressen allerede er i bruk?"
         success: "Vi har sendt en e-post til den adressen. Følg instruksjonene i meldingen."
         success_staff: "Vi har sendt en e-post til den gjeldende adressen. Følg bekreftelsesinstruksjonene."
       change_avatar:
@@ -725,7 +725,7 @@ nb_NO:
         always: "alltid"
         never: "aldri"
       email_digests:
-        title: "Send meg en oppsummering på e-post av populære emner og svar dersom jeg ikke besøker siden"
+        title: "Send meg en oppsummering på e-post av populære tråder og svar dersom jeg ikke besøker siden"
         every_30_minutes: "hvert 30 minutt"
         every_hour: "hver time"
         daily: "daglig"
@@ -734,20 +734,20 @@ nb_NO:
         every_two_weeks: "annenhver uke"
       include_tl0_in_digests: "Inkluder innhold fra nye brukere i oppsummerings-eposter"
       email_in_reply_to: "Inkluder et utdrag i e-poster av innlegget man svarer på"
-      email_direct: "Motta en e-post når noen siterer meg, svarer på innlegget mitt, nevner @brukernavnet mitt eller inviterer meg til et emne"
+      email_direct: "Send meg en e-post når noen siterer meg, svarer på innlegget mitt, nevner @brukernavnet mitt eller inviterer meg til en tråd"
       email_private_messages: "Motta en e-post når noen sender meg en melding"
       email_always: "Send meg varsler på e-post selv når jeg er aktiv på nettstedet"
       other_settings: "Annet"
       categories_settings: "Kategorier"
       new_topic_duration:
-        label: "Anse emner som nye når"
+        label: "Anse tråder som nye når"
         not_viewed: "jeg ikke har sett dem ennå"
         last_here: "opprettet siden jeg var her sist"
         after_1_day: "opprettet i løpet av det siste døgnet"
         after_2_days: "opprettet i løpet av de siste 2 døgnene"
         after_1_week: "opprettet i løpet av sist uke"
         after_2_weeks: "opprettet i løpet av de siste 2 ukene"
-      auto_track_topics: "Overvåk automatisk emner jeg åpner"
+      auto_track_topics: "Overvåk automatisk tråder jeg åpner"
       auto_track_options:
         never: "aldri"
         immediately: "øyeblikkelig"
@@ -758,13 +758,12 @@ nb_NO:
         after_4_minutes: "etter 4 minutt"
         after_5_minutes: "etter 5 minutt"
         after_10_minutes: "etter 10 minutt"
-      notification_level_when_replying: "Når jeg publiserer noe i et emner, sett det emnet til"
+      notification_level_when_replying: "Når jeg skriver noe i en tråd, sett tråden som"
       invited:
         search: "skriv for å søke etter invitasjoner…"
         title: "invitasjoner"
         user: "Invitert bruker"
         sent: "Sendt"
-        none: "Det er ingen ventende invitasjoner å vise."
         truncated:
           one: "Viser den første invitasjonen."
           other: "Viser de {{count}} første invitisajonene."
@@ -775,7 +774,7 @@ nb_NO:
         pending: "Ventende invitasjoner"
         pending_tab: "På vent"
         pending_tab_with_count: "Ventende ({{count}})"
-        topics_entered: "Emner vist"
+        topics_entered: "Tråder vist"
         posts_read_count: "Innlegg lest"
         expired: "Denne invitasjonen har utløpt"
         rescind: "Fjern"
@@ -796,7 +795,7 @@ nb_NO:
         link_generated: "Invitasjonslenke har blitt generert!"
         valid_for: "Invitasjonslenke er kun gyldig for denne e-postadressen: %{email}"
         bulk_invite:
-          none: "Du har ikke invitert noen enda. Sende enkeltsående invitasjoner, eller inviter mange samtidig ved å <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>laste opp ei CSV-fil</a>."
+          none: "Du har ikke invitert noen ennå. Sende enkeltsående invitasjoner, eller inviter mange samtidig ved å <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>laste opp ei CSV-fil</a>."
           text: "Masseinvitasjon fra fil"
           success: "Filen er lastet opp, du vil motta en melding når prosessesen er ferdig"
           error: "Beklager, fila må være i CSV-format."
@@ -814,8 +813,8 @@ nb_NO:
         time_read: "lesetid"
         recent_time_read: "nylig lesetid"
         topic_count:
-          one: "emne opprettet"
-          other: "emner opprettet"
+          one: "tråd opprettet"
+          other: "tråder opprettet"
         post_count:
           one: "innlegg skrevet"
           other: "innlegg skrevet"
@@ -829,8 +828,8 @@ nb_NO:
           one: "dag besøkt"
           other: "dager besøkt"
         topics_entered:
-          one: "emne vist"
-          other: "emner vist"
+          one: "tråd vist"
+          other: "tråder vist"
         posts_read:
           one: "innlegg lest"
           other: "innlegg lest"
@@ -838,20 +837,20 @@ nb_NO:
           one: "bokmerke"
           other: "bokmerker"
         top_replies: "Mest Populære Svar"
-        no_replies: "Ingen svar enda."
+        no_replies: "Ingen svar ennå."
         more_replies: "Flere svar"
-        top_topics: "Mest Populære Emner"
-        no_topics: "Ingen emner enda."
-        more_topics: "Flere Emner"
+        top_topics: "Mest populære tråder"
+        no_topics: "Ingen tråder ennå."
+        more_topics: "Flere tråder"
         top_badges: "Toppmerker"
-        no_badges: "Ingen merker enda."
+        no_badges: "Ingen merker ennå."
         more_badges: "Flere merker"
         top_links: "Topplenker"
         no_links: "Ingen lenker enda"
         most_liked_by: "Mest likt av"
         most_liked_users: "Mest likt"
         most_replied_to_users: "Mest besvart"
-        no_likes: "Ingen likes her enda."
+        no_likes: "Ingen likes her ennå."
       associated_accounts: "Innloggingsforsøk"
       ip_address:
         title: "Siste IP-adresse"
@@ -868,7 +867,7 @@ nb_NO:
         posted_by: "Skrevet av"
         sent_by: "Sendt av"
         private_message: "melding"
-        the_topic: "emnet"
+        the_topic: "tråden"
     loading: "Laster…"
     errors:
       prev_page: "ved lasting"
@@ -882,7 +881,7 @@ nb_NO:
         network: "Sjekk nettverkstilkoblingen din"
         network_fixed: "Ser ut som om den er tilbake."
         server: "Feilkode: {{status}}"
-        forbidden: "Du har ikke tilgang til dette."
+        forbidden: "Du har ikke tilgang til å se det."
         not_found: "Oisann, programmet forsøkte å laste inn en URL som ikke eksisterer."
         unknown: "Noe gikk galt."
       buttons:
@@ -890,16 +889,16 @@ nb_NO:
         again: "Prøv igjen"
         fixed: "Last side"
     close: "Lukk"
-    assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Gjenoppfrisk nå for siste versjon?"
+    assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Last inn siden på nytt nå for siste versjon?"
     logout: "Du ble logget ut"
     refresh: "Refresh"
     read_only_mode:
-      enabled: "Dette nettstedet er i lesemodus. Fortsett gjerne, men du kan ikke svare, gi likes eller utføre andre handlinger som er slått av."
+      enabled: "Dette nettstedet er i lesemodus. Fortsett gjerne å lese, men du kan ikke svare, gi likes eller utføre andre handlinger som er slått av."
       login_disabled: "Innlogging er deaktivert mens nettsiden er i skrivebeskyttet modus."
       logout_disabled: "Du kan ikke logge ut når nettstedet er i lese-modus."
-    too_few_topics_and_posts_notice: "La oss  <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> emner og <strong>%{currentPosts} / %{requiredPosts}</strong> innlegg. Nye brukere trenger noen samtaler å lese og svare på."
-    too_few_topics_notice: "La oss  <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> emner. Nye brukere trenger noen samtaler å lese og svare på."
-    too_few_posts_notice: "La oss  <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentPosts} / %{requiredPosts}</strong> innlegg. Nye brukere trenger noen samtaler å lese og svare på."
+    too_few_topics_and_posts_notice: "La oss <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen!</a> Det finnes for øyeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> tråder og <strong>%{currentPosts} / %{requiredPosts}</strong> svar. Nye besøkende trenger noen samtaler å lese og svare på."
+    too_few_topics_notice: "La oss <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> tråder. Nye besøkende trenger noen samtaler å lese og svare på."
+    too_few_posts_notice: "La oss <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentPosts} / %{requiredPosts}</strong> svar. Nye besøkende trenger noen samtaler å lese og svare på."
     logs_error_rate_notice:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> nådde innstillingsgrensen satt i %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> overstiger innstillingsgrensen satt i %{siteSettingRate}."
@@ -908,13 +907,13 @@ nb_NO:
         other: "%{count} feil/%{duration}"
     learn_more: "lær mer…"
     all_time: 'totalt'
-    all_time_desc: 'totalt antall emner opprettet'
+    all_time_desc: 'totalt antall tråder opprettet'
     year: 'år'
-    year_desc: 'emner opprettet de siste 365 dagene'
+    year_desc: 'tråder opprettet de siste 365 dagene'
     month: 'måned'
-    month_desc: 'emner opprettet de siste 30 dagene'
+    month_desc: 'tråder opprettet de siste 30 dagene'
     week: 'uke'
-    week_desc: 'emner opprettet de siste 7 dagene'
+    week_desc: 'tråder opprettet de siste 7 dagene'
     day: 'dag'
     first_post: Første innlegg
     mute: Ignorer
@@ -933,17 +932,17 @@ nb_NO:
       hide_session: "Spør meg igjen i morgen"
       hide_forever: "nei takk"
       hidden_for_session: "OK, jeg spør igjen i morgen. Du kan også registrere en konto når du vil!"
-      intro: "Hei du! :heart_eyes: Det ser ut som du følger diskusjonen, men ikke har registrert deg enda."
+      intro: "Hei du! :heart_eyes: Det ser ut som du følger diskusjonen, men ikke har registrert deg ennå."
       value_prop: "Når du registrerer deg husker vi hvor langt du har lest, så du starter på riktig sted neste gang du åpner en tråd. Du får også varsler, her og på e-post når det skjer ting i diskusjonene du vil følge. I tillegg kan du like innlegg :heartbeat:"
     summary:
-      enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: De mest interessante innleggene ifølge fellesskapet."
-      description: "Det er <b>{{replyCount}}</b> svar."
-      description_time: "Det er <b>{{replyCount}}</b> svar med en forventet lesetid på <b>{{readingTime}} minutter</b>."
-      enable: 'Oppsummer dette emnet'
+      enabled_description: "Du ser for øyeblikket en oppsummering av denne tråden: de mest interessante innleggene ifølge brukerne."
+      description: "Det finnes <b>{{replyCount}}</b> svar."
+      description_time: "Det finnes <b>{{replyCount}}</b> svar med en forventet lesetid på <b>{{readingTime}} minutter</b>."
+      enable: 'Oppsummer denne tråden'
       disable: 'Vis alle innlegg'
     deleted_filter:
-      enabled_description: "Dette emnet inneholder slettede innlegg som har blitt skjult."
-      disabled_description: "Slettede innlegg i emnet vises."
+      enabled_description: "Denne tråden inneholder slettede innlegg, som er blitt skjult."
+      disabled_description: "Slettede innlegg i tråden vises."
       enable: "Skjul slettede innlegg"
       disable: "Vis slettede innlegg"
     private_message_info:
@@ -954,7 +953,7 @@ nb_NO:
       remove_allowed_group: "Vil du virkelig fjerne {{name}} fra denne meldingen?"
     email: 'E-post'
     username: 'Brukernavn'
-    last_seen: 'Sist sett'
+    last_seen: 'Sett'
     created: 'Opprettet'
     created_lowercase: 'opprettet'
     trust_level: 'Tillitsnivå'
@@ -987,7 +986,7 @@ nb_NO:
       rate_limit: "Vent litt før du logger inn igjen."
       blank_username_or_password: "Oppgi din e-postadresse eller brukernavn og ditt passord."
       reset_password: 'Nullstill passord'
-      logging_in: "Logger på…"
+      logging_in: "Logger inn…"
       or: "Eller"
       authenticating: "Autentiserer…"
       awaiting_activation: "Din konto avventer aktivering. Bruk lenken for glemt passord for å sende en ny e-post for aktivering."
@@ -1001,11 +1000,11 @@ nb_NO:
       change_email: "Endre e-postadresse"
       provide_new_email: "Oppgi en ny adresse og vi vil sende din aktiverings-e-post på nytt."
       submit_new_email: "Oppdater e-postadresse"
-      sent_activation_email_again: "Vi sendte deg en ny e-post for aktivering på <b>{{currentEmail}}</b>. Det kan ta noen minutter før den kommer fram; sørg for at du sjekker nettsøppel om du ikke finner den."
+      sent_activation_email_again: "Vi sendte deg en ny aktiverings-e-post på <b>{{currentEmail}}</b>. Det kan ta noen minutter før den kommer frem; ikke glem å sjekke søppelpostmappen."
       to_continue: "Logg inn"
       preferences: "Du må være innlogget for å endre brukerinnstillinger."
       forgot: "I husker ikke mine kontodetaljer"
-      not_approved: "Kontoen din har ikke blitt godkjent enda. Du vil få beskjed via e-post når du er klar til å logge inn."
+      not_approved: "Kontoen din har ikke blitt godkjent ennå. Du vil få beskjed via e-post når du er klar til å logge inn."
       google:
         title: "med Google"
         message: "Autentiserer med Google (sørg for at du tillater oppsprettsvindu)"
@@ -1017,7 +1016,7 @@ nb_NO:
         message: "Autentiserer med Twitter (sørg for at du tillater oppsprettsvindu)"
       instagram:
         title: "med Instagram"
-        message: "Logger på med Instagram. Sørg for at du ikke har programvare som blokkerer forgrunnsvinduer."
+        message: "Logger inn med Instagram. Sørg for at du ikke har programvare som blokkerer forgrunnsvinduer."
       facebook:
         title: "med Facebook"
         message: "Autentiserer med Facebook (sørg for at du tillater oppsprettsvindu)"
@@ -1031,7 +1030,7 @@ nb_NO:
       accept_title: "Invitasjon"
       welcome_to: "Velkommen til %{site_name}!"
       invited_by: "Du ble invitert av:"
-      social_login_available: "Du vil også kunne logge inn med enhver annen sosial innloggingstjeneste ved bruk av den e-posten."
+      social_login_available: "Du vil også kunne logge inn med hvilken som helst annen sosial innloggingstjeneste ved bruk av den e-posten."
       your_email: "E-postadressen tilknyttet din konto er <b>%{email}</b>."
       accept_invite: "Godta invitasjon"
       success: "Kontoen din har blitt opprettet og du er nå logget inn."
@@ -1050,8 +1049,8 @@ nb_NO:
       facebook_messenger: "Facebook Meldingstjeneste"
     category_page_style:
       categories_only: "Kun kategorier"
-      categories_with_featured_topics: "Kategorier med framhevede emner"
-      categories_and_latest_topics: "Kategorier og siste emner"
+      categories_with_featured_topics: "Kategorier med fremhevede tråder"
+      categories_and_latest_topics: "Kategorier og siste tråder"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -1086,22 +1085,22 @@ nb_NO:
       unlist: "skjult"
       blockquote_text: "Sitatramme"
       add_warning: "Dette er en offisiell advarsel."
-      toggle_whisper: "Veksle hvisking"
+      toggle_whisper: "Slå på/av hvisking"
       toggle_unlisted: "Skjul eller gjør synlig"
-      posting_not_on_topic: "Du svarer på emnet \"{{title}}\", men for øyeblikket ser du på et annet emne."
+      posting_not_on_topic: "Du svarer på tråden \"{{title}}\", men for øyeblikket ser du på et annet tråd."
       saving_draft_tip: "lagrer…"
       saved_draft_tip: "lagret"
       saved_local_draft_tip: "lagret lokalt"
-      similar_topics: "Emnet ditt har likheter med…"
+      similar_topics: "Tråden din har likheter med…"
       drafts_offline: "utkast offline"
       group_mentioned_limit: "<b>Warning!</b> Du varslet <a href='{{group_link}}'>{{group}}</a>, dog har denne gruppen flere medlemmer en administratoren har satt opp som grense for varseling, {{max}} brukere. Ingen vil bli varslet."
       group_mentioned:
         one: "Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} én person</a> – er du sikker?"
         other: "Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} folk</a> – er du sikker?"
       cannot_see_mention:
-        category: "Du nevnte {{username}}, men de vil ikke ikke bli varslet fordi de ikke hara tilgang til denne kategorien. Du må legge dem til en gruppe som har tilgang til denne kategorien."
-        private: "Du nevnte {{username}}, men de vil ikke bli varslet fordi de ikke kan se denne samtalen. Du må invitere dem til samtalen."
-      duplicate_link: "Det ser ut til at <b>{{domain}}</b> allerede finnes som innlegg om emnet av <b>@{{username}}</b> i <a href='{{post_url}}'>et svar {{ago}}</a> – er du sikker på at du vil gjenta det?"
+        category: "Du nevnte {{username}}, men de vil ikke ikke bli varslet fordi de ikke har tilgang til denne kategorien. Du må legge dem til en gruppe som har tilgang til denne kategorien."
+        private: "Du nevnte {{username}}, men de vil ikke bli varslet fordi de ikke kan se denne samtalen. Du må invitere dem til denne private samtalen."
+      duplicate_link: "Det ser ut til at lenken din til <b>{{domain}}</b> allerede ble publisert i tråden av <b>@{{username}}</b> i <a href='{{post_url}}'>et svar {{ago}}</a>. Er du sikker på at du vil publisere den igjen?"
       error:
         title_missing: "Tittel er påkrevd"
         title_too_short: "Tittel må være på minst {{min}} tegn"
@@ -1111,11 +1110,11 @@ nb_NO:
         try_like: 'Har du prøvd <i class="fa fa-heart"></i> knappen?'
         category_missing: "Du må velge en kategori"
       save_edit: "Lagre endring"
-      reply_original: "Besvar det originale emnet"
+      reply_original: "Svar på den opprinnelige tråden"
       reply_here: "Svar her"
       reply: "Svar"
       cancel: "Avbryt"
-      create_topic: "Opprett emne"
+      create_topic: "Opprett tråd"
       create_pm: "Melding"
       create_whisper: "Hvisk"
       title: "Eller trykk Ctrl+Enter"
@@ -1125,8 +1124,9 @@ nb_NO:
       edit_reason_placeholder: "hvorfor endrer du?"
       show_edit_reason: "(legg till endringsbegrunnelse)"
       topic_featured_link_placeholder: "Skriv inn lenke vist med tittel."
-      remove_featured_link: "Fjern lenken fra emnet."
+      remove_featured_link: "Fjern lenke fra tråden."
       reply_placeholder: "Skriv her. Bruk Markdown, BBCode eller HTML for å formattere. Dra og slipp bilder."
+      reply_placeholder_no_images: "Skriv her. Bruk Markdown, BBkode, eller HTML for å formatere."
       view_new_post: "Se ditt nye innlegg."
       saving: "Lagrer"
       saved: "Lagret!"
@@ -1165,7 +1165,7 @@ nb_NO:
       yourself_confirm:
         title: "Glemte du å legge til mottagere?"
         body: "Nå sender du denne meldingen bare til deg selv!"
-      admin_options_title: "Valgfrie emne-instillinger for stab"
+      admin_options_title: "Valgfrie tråd-instillinger for stab"
     notifications:
       tooltip:
         regular:
@@ -1174,7 +1174,7 @@ nb_NO:
         message:
           one: "Én ulest melding"
           other: "{{count}} uleste meldinger"
-      title: "varsler om at ditt @navn blir nevnt, svar på dine innlegg, emner, meldinger, osv"
+      title: "varsler om at @navnet ditt blir nevnt, svar på dine innlegg og tråder, meldinger, osv"
       none: "Notifikasjoner er ikke tilgjengelig for øyeblikket."
       empty: "Ingen varsler funnet."
       more: "se gamle varsler"
@@ -1198,10 +1198,10 @@ nb_NO:
       linked: "<span>{{username}}</span> {{description}}"
       granted_badge: "Gjorde seg fortjent til '{{description}}'"
       topic_reminder: "<span>{{username}}</span> {{description}}"
-      watching_first_post: "<span>Nytt emne</span> {{description}}"
+      watching_first_post: "<span>Ny tråd</span> {{description}}"
       group_message_summary:
         one: "{{count}} melding i din {{group_name}} innboks"
-        other: "{{count}} meldinger i din {{group_name}} innboks"
+        other: "{{count}} meldinger i din innboks for {{group_name}}"
       alt:
         mentioned: "Nevnt av"
         quoted: "Sitert av"
@@ -1209,9 +1209,9 @@ nb_NO:
         posted: "Innlegg av"
         edited: "Rediger ditt innlegg innen"
         liked: "Likte innlegget ditt"
-        private_message: "Privat melding fra"
-        invited_to_private_message: "Invitert til privat korrespondanse av"
-        invited_to_topic: "Invitert til et emne fra"
+        private_message: "Personlig melding fra"
+        invited_to_private_message: "Invitert til en personlig melding fra"
+        invited_to_topic: "Invitert til en tråd fra"
         invitee_accepted: "Invitiasjon akseptert av"
         moved_post: "Ditt innlegg ble flyttet av"
         linked: "Link til innlegget ditt"
@@ -1223,9 +1223,9 @@ nb_NO:
         group_mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
         quoted: '{{username}} siterte deg i "{{topic}}" - {{site_title}}'
         replied: '{{username}} svarte deg i "{{topic}}" - {{site_title}}'
-        posted: '{{username}} skrev i "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} sendte deg en privat melding: "{{topic}}" - {{site_title}}'
-        linked: '{{username}} lenket til ditt innlegg i "{{topic}}" - {{site_title}}'
+        posted: '{{username}} skrev noe i "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} sendte deg en personlig melding i "{{topic}}" - {{site_title}}'
+        linked: '{{username}} lenket til innlegget ditt i "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Legg til bilde"
       title_with_attachments: "Legg til et bilde eller en fil"
@@ -1245,21 +1245,24 @@ nb_NO:
       sort_by: "Sorter etter"
       relevance: "Relevanse"
       latest_post: "Siste innlegg"
-      latest_topic: "Siste emne"
+      latest_topic: "Siste tråd"
       most_viewed: "Mest Lest"
       most_liked: "Mest Likt"
       select_all: "Velg alle"
       clear_all: "Fjern Alle"
       too_short: "Din søketekst er for kort."
-      title: "søk etter emner, innlegg, brukere eller kategorier"
+      result_count:
+        one: "1 resultat for <span class='term'>{{term}}</span>"
+        other: "{{count}}{{plus}} resultater for <span class='term'>{{term}}</span>"
+      title: "søk etter tråder, innlegg, brukere eller kategorier"
       no_results: "Ingen resultater funnet."
       no_more_results: "Ingen flere resultater funnet."
       searching: "Søker…"
       post_format: "#{{post_number}} av {{username}}"
       results_page: "Søkeresultater for \"{{term}}\""
-      more_results: "Det er flere resultater. Begrens søket ditt."
+      more_results: "Det finnes flere resultater. Begrens søket ditt."
       cant_find: "Finner du ikke det du leter etter?"
-      start_new_topic: "Kanskje du ønsker å starte et nytt emne?"
+      start_new_topic: "Kanskje opprette en ny tråd?"
       or_search_google: "Eller prøv å søke på Google istedenfor:"
       search_google: "Prøv å søke på Google istedenfor:"
       search_google_button: "Google"
@@ -1267,7 +1270,7 @@ nb_NO:
       context:
         user: "Søk i innleggene av @{{username}}"
         category: "Søk i kategorien #{{category}}"
-        topic: "Søk i dette emnet"
+        topic: "Søk i denne tråden"
         private_messages: "Søk i meldinger"
       advanced:
         title: Avansert søk
@@ -1282,7 +1285,7 @@ nb_NO:
         with_tags:
           label: Merket
         filters:
-          label: Kun kom med emner/innlegg…
+          label: Vis bare tråder/innlegg…
           likes: Jeg likte
           posted: jeg skrev innlegg i
           watching: Jeg følger
@@ -1296,9 +1299,9 @@ nb_NO:
           unseen: Jeg har ikke lest
           wiki: er wiki
           images: inkluder bilde(r)
-          all_tags: Alle ovennevnte stikkord
+          all_tags: Alle stikkord nevnt ovenfor
         statuses:
-          label: Der emner
+          label: Hvor tråder
           open: er åpen
           closed: er lukket
           archived: er arkivert
@@ -1311,7 +1314,7 @@ nb_NO:
             label: Skrevet
             before: før
             after: etter
-    hamburger_menu: "gå til en annen emneliste eller kategori"
+    hamburger_menu: "gå til en annen liste over tråder eller en annen kategori"
     new_item: "ny"
     go_back: 'gå tilbake'
     not_logged_in_user: 'brukerside med oppsummering av nåværende aktivtet og preferanser.'
@@ -1321,126 +1324,126 @@ nb_NO:
       bulk:
         select_all: "Velg alle"
         clear_all: "Fjern alle"
-        unlist_topics: "Avlist emner"
-        relist_topics: "List opp emner på nytt"
+        unlist_topics: "Fjern tråder fra lister"
+        relist_topics: "Før opp igjen tråder i lister"
         reset_read: "Nullstill lest"
-        delete: "Slett emne"
+        delete: "Slett tråder"
         dismiss: "Avslå"
-        dismiss_read: "Merk alle som lest"
+        dismiss_read: "Avslå alle uleste"
         dismiss_button: "Avslå…"
-        dismiss_tooltip: "Avslå bare nye innlegg eller slutt å overvåke emner"
-        also_dismiss_topics: "Slutt å overvåke disse emnene slik at de aldri igjen vises til meg som ulest"
-        dismiss_new: "Lest"
-        toggle: "Veksle mellom massevelging av emner"
+        dismiss_tooltip: "Avslå bare nye innlegg eller slutt å overvåke tråder"
+        also_dismiss_topics: "Slutt å overvåke disse trådene slik at de aldri igjen vises til meg som ulest"
+        dismiss_new: "Avslå nye"
+        toggle: "slå på/av massevelging av tråder"
         actions: "Massehandlinger"
         change_category: "Velg kategori"
-        close_topics: "Lukk Emner"
-        archive_topics: "Arkiverte emner"
+        close_topics: "Lukk tråder"
+        archive_topics: "Arkiver tråder"
         notification_level: "Varsler"
-        choose_new_category: "Velg den nye kategorien for emnene:"
+        choose_new_category: "Velg den nye kategorien for trådene:"
         selected:
-          one: "Du har valgt <b>1</b> emne."
-          other: "Du har valgt <b>{{count}}</b> emner."
+          one: "Du har valgt <b>1</b> tråd."
+          other: "Du har valgt <b>{{count}}</b> tråder."
         change_tags: "Erstatt stikkord"
         append_tags: "Legg til stikkord"
-        choose_new_tags: "Velg nye stikkord for disse emnene:"
-        choose_append_tags: "Velg nye stikkord å legge til disse emnene:"
-        changed_tags: "Stikkordene på disse innleggene ble endret."
+        choose_new_tags: "Velg nye stikkord for disse trådene:"
+        choose_append_tags: "Velg nye stikkord å legge til disse trådene:"
+        changed_tags: "Stikkordene for de trådene ble endret."
       none:
-        unread: "Du har ingen uleste emner å lese."
-        new: "Du har ingen nye emner å lese."
-        read: "Du har ikke lest noen emner enda."
-        posted: "Du har ikke sendt inn innlegg i noen emner enda."
-        latest: "Det finnes ingen siste emner. Det var synd."
-        hot: "Det er ingen populære emner."
-        bookmarks: "Du har ingen bokmerkede emner."
-        category: "Det er ingen {{category}}-emner."
-        top: "Det er ingen populære emner."
-        search: "Det er ingen søkeresultater"
+        unread: "Du har ingen uleste tråder."
+        new: "Du har ingen nye tråder å lese."
+        read: "Du har ikke lest noen tråder ennå."
+        posted: "Du har ikke skrevet innlegg i noen tråder ennå."
+        latest: "Det finnes ingen siste tråder. Det var synd."
+        hot: "Det finnes ingen populære tråder."
+        bookmarks: "Du har ingen bokmerkede tråder ennå."
+        category: "Det finnes ingen {{category}}-tråder."
+        top: "Det finnes ingen populære tråder."
+        search: "Det finnes ingen søkeresultater"
         educate:
-          new: '<p>Dine nye emner vil komme til syne her.</p><p>Som forvalg anses emner som nye og viser en<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span>indikator hvis de be opprettet i løpet av de siste to dagene.</p><p>Gå til <a href="%{userPrefsUrl}">innstillinger</a> for å endre dette.</p>'
-          unread: '<p>Dine uleste emner vil vises her.</p><p>Som forvalg anses emner for å være ulest og vil vise ulest-tall <span class="badge new-posts badge-notification">1</span> dersom du:</p><ul><li>Opprettet emnet</li><li>Svarte på emnet</li><li>Leste emnet i mer enn 4 minutter</li></ul><p>Eller dersom du uttrykkelig har satt emnet som overvåkes eller sett via varselkontrollen nederst i hvert emne.</p><p>Gå til<a href="%{userPrefsUrl}">innstillingene</a> dine for å endre dette.</p>'
+          new: '<p>Dine nye tråder vil vises her.</p><p>Som forvalg anses tråder som nye og viser en<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span>-indikator hvis de be opprettet i løpet av de siste 2 dagene.</p><p>Gå til <a href="%{userPrefsUrl}">innstillinger</a> for å endre dette.</p>'
+          unread: '<p>Dine uleste tråder vil vises her.</p><p>Som forvalg anses tråder som ulest og vil vise ulest-tall <span class="badge new-posts badge-notification">1</span> dersom du:</p><ul><li>Opprettet tråden</li><li>Svarte på tråden</li><li>Leste tråden i mer enn 4 minutter</li></ul><p>Eller dersom du uttrykkelig har satt tråden som overvåkes eller følges via varselkontrollen nederst i hver tråd.</p><p>Gå til<a href="%{userPrefsUrl}">innstillingene</a> dine for å endre dette.</p>'
       bottom:
-        latest: "Det er ingen siste emner igjen å lese."
-        hot: "Det er ingen populære emner igjen å lese."
-        posted: "Det er ingen emner med innlegg igjen å lese."
-        read: "Det er ingen leste emner igjen å lese."
-        new: "Det er ingen nye emner igjen å lese."
-        unread: "Det er ingen uleste emner igjen å lese."
-        category: "Det er ingen {{category}}-emner igjen."
-        top: "Det er ingen flere populære emner."
-        bookmarks: "Det er ingen bokmerkede emner."
-        search: "Det er ingen flere søkeresultater"
+        latest: "Det finnes ingen flere siste tråder."
+        hot: "Det finnes ingen flere populære tråder."
+        posted: "Det finnes ingen flere tråder med innlegg."
+        read: "Det finnes ingen flere leste tråder."
+        new: "Det finnes ingen flere nye tråder."
+        unread: "Det finnes ingen flere uleste tråder."
+        category: "Det finnes ingen {{category}}-tråder igjen."
+        top: "Det finnes ingen flere populære tråder."
+        bookmarks: "Det finnes ingen flere bokmerkede tråder."
+        search: "Det finnes ingen flere søkeresultater"
     topic:
       unsubscribe:
         stop_notifications: "Du vil nå få færre varsler for <strong>{{title}}</strong>"
         change_notification_state: "Din nåværende varslingsstatus er"
       filter_to:
-        one: "1 innlegg i emne"
-        other: "{{count}} innlegg i emne"
-      create: 'Nytt emne'
-      create_long: 'Opprett et nytt emne'
+        one: "1 innlegg i tråd"
+        other: "{{count}} innlegg i tråd"
+      create: 'Ny tråd'
+      create_long: 'Opprett et ny tråd'
       private_message: 'Begynn en melding'
       archive_message:
         help: 'Flytt meldinger til arkivet ditt'
         title: 'Arkiver'
       move_to_inbox:
-        title: 'Flytt til Inbox'
-        help: 'Flytt meldingen tilbake til Inbox'
-      list: 'Emner'
-      new: 'nytt emne'
+        title: 'Flytt til innboks'
+        help: 'Flytt melding tilbake til innboks'
+      list: 'Tråder'
+      new: 'ny tråd'
       unread: 'ulest'
       new_topics:
-        one: 'Ett nytt emne'
-        other: '{{count}} nye emner'
+        one: 'Ett ny tråd'
+        other: '{{count}} nye tråder'
       unread_topics:
-        one: 'Ett ulest emne'
-        other: '{{count}} uleste emner'
-      title: 'Emne'
+        one: 'Ett ulest tråd'
+        other: '{{count}} uleste tråder'
+      title: 'Tråd'
       invalid_access:
-        title: "Emnet er privat"
-        description: "Beklager, du har ikke tilgang til det emnet!"
-        login_required: "Du må være logget inn for å lese dette emnet."
+        title: "Tråden er privat"
+        description: "Beklager, du har ikke tilgang til den tråden!"
+        login_required: "Du må være innlogget for å lese den tråden."
       server_error:
-        title: "Emnet kunne ikke bli behandlet"
-        description: "Beklager, vi kunne ikke behandle det emnet, muligens på grunn av et tilkoblingsproblem. Prøv igjen. Om problemet vedvarer, fortell oss om det."
+        title: "Tråden kunne ikke lastes inn."
+        description: "Beklager, vi kunne ikke laste inn den tråden, muligens på grunn av et tilkoblingsproblem. Prøv igjen. Dersom problemet vedvarer, gi beskjed til oss."
       not_found:
-        title: "Emnet kunne ikke bli funnet"
-        description: "Beklager, vi kunne ikke finne det emnet. Kanskjer det ble fjernet av en moderator?"
+        title: "Tråd ikke funnet"
+        description: "Beklager, vi kunne ikke finne den tråden. Kanskjer den ble fjernet av en moderator?"
       total_unread_posts:
         one: "du har 1 ulest innlegg i dette emnet"
-        other: "du har {{count}} uleste innlegg i dette emnet"
+        other: "du har {{count}} uleste innlegg i denne tråden"
       unread_posts:
-        one: "du har 1 ulest gammelt innlegg i dette emnet"
-        other: "du har {{count}} uleste gamle innlegg i dette emnet"
+        one: "du har 1 ulest gammelt innlegg i denne tråden"
+        other: "du har {{count}} uleste gamle innlegg i denne tråden"
       new_posts:
-        one: "Det er 1 nytt innlegg i dette emnet siden sist du leste det"
-        other: "Det er {{count}} nye innlegg i dette emnet siden sist du leste det"
+        one: "Det finnes 1 nytt innlegg i denne tråden siden sist du leste det"
+        other: "Det finnes {{count}} nye innlegg i denne tråden siden sist du leste det"
       likes:
-        one: "det er én like i dette emnet"
-        other: "det er {{number}} likes i dette emnet"
-      back_to_list: "Tilbake til emnelisten"
-      options: "Valg for emner"
-      show_links: "vis lenker i dette emnet"
-      toggle_information: "vis/skjul emnedetaljer"
-      read_more_in_category: "Vil du lese mer? Bla gjennom andre emner i {{catLink}} eller {{latestLink}}."
+        one: "det er én like i denne tråden"
+        other: "det er {{number}} likes i denne tråden"
+      back_to_list: "Tilbake til listen over tråder"
+      options: "Valg for tråder"
+      show_links: "vis lenker i denne tråden"
+      toggle_information: "vis/skjul detaljer for tråden"
+      read_more_in_category: "Vil du lese mer? Les andre tråder i {{catLink}} eller {{latestLink}}."
       read_more: "Vil du lese mer? {{catLink}} eller {{latestLink}}."
-      read_more_MF: "There { UNREAD, plural, =0 {} one { is <a href='/unread'>1 unread</a> } other { are <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "Det { UNREAD, plural, =0 {} one { finnes <a href='/unread'>1 unread</a> } other { finnes <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{og } false {finnes } other{}} <a href='/new'>1 new</a> tråd} other { {BOTH, select, true{og } false {er } other{}} <a href='/new'># new</a> tråder} } igjen, or {CATEGORY, select, true {se andre tråder i {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Se alle kategorier
-      view_latest_topics: se siste emner
-      suggest_create_topic: Hvorfor ikke opprette et emne?
+      view_latest_topics: se siste tråder
+      suggest_create_topic: Hvorfor ikke opprette en tråd?
       jump_reply_up: hopp til tidligere svar
       jump_reply_down: hopp til senere svar
-      deleted: "Emnet har blitt slettet"
+      deleted: "Tråden er blitt slettet"
       topic_status_update:
-        title: "Sett emneutløp"
-        save: "Sett utløp"
+        title: "tidsbestemt handling for tråd"
+        save: "Sett opp tidsbestemt handling"
         num_of_hours: "Antall timer:"
-        remove: "Fjern utløp"
+        remove: "Fjern tidsbestemt handling"
         publish_to: "Publiser til:"
         when: "Når:"
-        public_timer_types: Emneutløp
-        private_timer_types: Brukerstyrte emneutløp
+        public_timer_types: Tidsbestemte handlinger for tråd
+        private_timer_types: Brukerstyrte tidsbestemte handlinger for tråd
       auto_update_input:
         none: "Velg et tidsrom"
         later_today: "Senere i dag"
@@ -1461,35 +1464,35 @@ nb_NO:
       temp_open:
         title: "Åpne midlertidig"
       auto_reopen:
-        title: "Auto-åpning av emne"
+        title: "Automatisk åpning av tråd"
       temp_close:
         title: "Lukk midlertidig"
       auto_close:
-        title: "Auto-lukk emne"
-        label: "Tidsbolk for autolukking av emne:"
+        title: "Automatisk lukking av tråd"
+        label: "Tidsbolk for automatisk lukking av tråd:"
         error: "Skriv inn en gyldig verdi."
-        based_on_last_post: "Ikke lukk før det siste innlegget i emnet er minst så gammelt."
+        based_on_last_post: "Ikke lukk før det siste innlegget i tråden er minst så gammelt."
       auto_delete:
-        title: "Auto-slett emne"
+        title: "Automatisk sletting av tråd"
       reminder:
         title: "Påminn meg"
       status_update_notice:
-        auto_open: "Dette emnet vil automatisk åpnes %{timeLeft}."
-        auto_close: "Dette emnet vil automatisk lukkes %{timeLeft}."
-        auto_publish_to_category: "Dette emnet vil bli publisert til <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Dette emnet vil bli lukket %{duration} etter det siste innlegget."
-        auto_delete: "Dette emnet vil automatisk slettes %{timeLeft}."
-        auto_reminder: "Du vil bli påminnet om dette emnet %{timeLeft}."
+        auto_open: "Denne tråden vil åpnes automatisk %{timeLeft}."
+        auto_close: "Denne tråden vil lukkes automatisk %{timeLeft}."
+        auto_publish_to_category: "Denne tråden vil bli opprettet i <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
+        auto_close_based_on_last_post: "Denne tråden vil bli lukket %{duration} etter det siste innlegget."
+        auto_delete: "Denne tråden vil bli automatisk slettet %{timeLeft}."
+        auto_reminder: "Du vil bli påminnet om denne tråden %{timeLeft}."
       auto_close_title: 'Auto-lukk innstillinger'
       auto_close_immediate:
-        one: "Det siste innlegget i emnet er allerede en time gammelt, så emnet vil stenges umiddelbart."
-        other: "Det siste innlegget i emnet er allerede %{count} timer gammelt, så emnet vil stenges umiddelbart."
+        one: "Det siste innlegget i tråden er allerede en time gammelt, så tråden vil stenges umiddelbart."
+        other: "Det siste innlegget i tråden er allerede %{count} timer gammelt, så tråden vil stenges umiddelbart."
       timeline:
         back: "Tilbake"
         back_description: "Gå tilbake til forrige uleste innlegg"
         replies_short: "%{current} / %{total}"
       progress:
-        title: emneframgang
+        title: fremgang i tråd
         go_top: "topp"
         go_bottom: "bunn"
         go: "gå"
@@ -1501,112 +1504,112 @@ nb_NO:
         total: innlegg totalt
         current: gjeldende innlegg
       notifications:
-        title: endre hvor ofte du blir varslet om dette emnet
+        title: endre hvor ofte du blir varslet om denne tråden
         reasons:
-          mailing_list_mode: "Du har slått på e-postlistemodus, så du vil bli varslet på e-post om svar på dette emnet."
-          '3_10': 'Du vil motta varsler fordi du følger et stikkord for dette emnet'
+          mailing_list_mode: "Du har e-postlistemodus påslått, så du vil bli varslet på e-post om svar på denne tråden."
+          '3_10': 'Du vil motta varsler fordi du følger et stikkord for denne tråden'
           '3_6': 'Du vil motta varsler fordi du følger denne kategorien'
-          '3_5': 'Du vil motta varsler fordi du startet å følge dette emnet automatisk.'
-          '3_2': 'Du vil motta varsler fordi du følger dette emnet.'
-          '3_1': 'Du vil motta varsler fordi du opprettet dette emnet.'
-          '3': 'Du vil motta varsler fordi du følger dette emnet.'
+          '3_5': 'Du vil motta varsler fordi du startet å følge denne tråden automatisk.'
+          '3_2': 'Du vil motta varsler fordi du følger denne tråden'
+          '3_1': 'Du vil motta varsler fordi du opprettet denne tråden.'
+          '3': 'Du vil motta varsler fordi du følger denne tråden.'
           '2_8': 'Du vil se antall nye svar fordi du følger denne kategorien.'
-          '2_4': 'Du vil se antall nye svar fordi du skrev et svar til dette emnet.'
-          '2_2': 'Du vil se antall nye svar fordi du følger dette emnet.'
-          '2': 'Du vil se antall nye svar fordi du <a href="/u/{{username}}/preferences">leste dette emnet</a>.'
-          '1_2': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.'
-          '1': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.'
+          '2_4': 'Du vil se antall nye svar fordi du skrev et svar til denne tråden.'
+          '2_2': 'Du vil se antall nye svar fordi du overvåker denne tråden.'
+          '2': 'Du vil se antall nye svar fordi du <a href="/u/{{username}}/preferences">leste denne tråden</a>.'
+          '1_2': 'Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt.'
+          '1': 'Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt.'
           '0_7': 'Du ignorerer alle varsler i denne kategorien.'
-          '0_2': 'Du ignorerer alle varsler på dette emnet.'
-          '0': 'Du ignorerer alle varsler på dette emnet.'
+          '0_2': 'Du ignorerer alle varsler om denne tråden.'
+          '0': 'Du ignorerer alle varsler om denne tråden.'
         watching_pm:
           title: "Følger"
           description: "Du vil bli varslet om hvert nye innlegg i denne meldingen. Antall nye tilbakemeldinger vil også bli vist. "
         watching:
           title: "Følger"
-          description: "Du vil bli varslet om hvert nye innlegg i dette emnet. Antall nye tilbakemeldinger vil også bli vist. "
+          description: "Du vil bli varslet om hvert nytt innlegg i denne tråden, og antall nye svar vil også bli vist."
         tracking_pm:
           title: "Overvåker"
           description: "Antall nye tilbakemeldinger vil bli vist for denne meldingen. Du vil bli varslet om noen nevner ditt @name eller svarer på din melding. "
         tracking:
           title: "Overvåker"
-          description: "Antall nye svar vil bli vist for dette emnet. Du vil bli varslet om noen nevner ditt @name eller svarer på ditt innlegg.. "
+          description: "Antall nye svar vil bli vist for denne tråden. Du vil bli varslet dersom noen nevner @navnet ditt eller svarer på innlegget ditt."
         regular:
           title: "Normal"
-          description: "Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg."
+          description: "Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt."
         regular_pm:
           title: "Normal"
-          description: "Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg."
+          description: "Du vil bli varslet om noen nevner @navnet ditt eller svarer på innlegget ditt."
         muted_pm:
           title: "Ignorert"
-          description: "Du vil ikke få varslinger om noe i denne meldingnen. "
+          description: "Du vil aldri bli varslet om noe vedrørende denne meldingnen. "
         muted:
           title: "Ignorert"
-          description: "Du vil bli varslet om alt som har med dette emnet og gjøre, og det vil ikke vises i siste."
+          description: "Du vil aldri bli varslet om noe vedrørende denne tråden, og den vil ikke vises i siste."
       actions:
-        recover: "Gjenopprett emne"
-        delete: "Slett emne"
-        open: "Åpne emne"
-        close: "Lukk emne"
+        recover: "Gjenopprett tråd"
+        delete: "Slett tråd"
+        open: "Åpne tråd"
+        close: "Lukk tråd"
         multi_select: "Velg innlegg…"
-        timed_update: "Sett emneutløp…"
-        pin: "Fest emnet…"
-        unpin: "Løsne emne…"
-        unarchive: "Opphev arkivering av emne"
-        archive: "Arkiver emne"
-        invisible: "Skjul emnet"
+        timed_update: "Sett opp tidsbestemt handling for tråd…"
+        pin: "Fest tråd…"
+        unpin: "Løsne tråd…"
+        unarchive: "Opphev arkivering av tråd"
+        archive: "Arkiver tråd"
+        invisible: "Skjul"
         visible: "Gjør synlig"
         reset_read: "Tilbakestill lesedata"
-        make_public: "Gjør emnet offentlig"
-        make_private: "Gjør om til privat melding"
+        make_public: "Gjør til offentlig tråd"
+        make_private: "Opprett personlig melding"
       feature:
-        pin: "Fest emnet"
-        unpin: "Løsne emnet"
-        pin_globally: "Fest emnet globalt"
-        make_banner: "Banneremne"
-        remove_banner: "Fjern banneremne"
+        pin: "Fest tråd"
+        unpin: "Løsne tråd"
+        pin_globally: "Fest tråd over alt"
+        make_banner: "Bannertråd"
+        remove_banner: "Fjern bannertråd"
       reply:
         title: 'Svar'
-        help: 'begynn å forfatte et svar i dette emnet'
+        help: 'begynn å skrive et svar i denne tråden'
       clear_pin:
-        title: "Løsne emne"
-        help: "Løsne feste-statusen til dette emnet slik at det ikke lenger vises på toppen av din emneliste"
+        title: "Løsne"
+        help: "Fjern festet-statusen til denne tråden slik at den ikke lenger vises øverst i listen din over tråder"
       share:
         title: 'Del'
-        help: 'del en lenke til dette emnet'
+        help: 'del en lenke til denne tråden'
       print:
         title: 'Skriv ut'
-        help: 'Åpne en utskriftsvennlig utgave av dette emnet.'
+        help: 'Åpne en utskriftsvennlig utgave av denne tråden.'
       flag_topic:
         title: 'Rapporter'
         help: 'rapporter dette innlegget privat eller send et privat varsel om det'
-        success_message: 'Du har rapportert dette emnet'
+        success_message: 'Du har rapportert denne tråden'
       feature_topic:
-        title: "Fremhev dette emnet"
-        pin: "La dette emnet få stå på toppen av {{categoryLink}} kategorien til"
-        confirm_pin: "Du har allerede {{count}} festede emner. For mange festede emner kan være et problem for nye og anonyme brukere. Er du sikker på at du ønsker å feste enda et emne i denne kategorien?"
-        unpin: "Fjern dette emnet fra toppen av {{categoryLink}} kategorien."
-        unpin_until: "Fjern dette emnet fra toppen av {{categoryLink}} kategorien, eller vent til <strong>%{until}</strong>."
-        pin_note: "Brukere kan selv fjerne festet for dette emnet."
-        pin_validation: "En dato kreves for å feste dette emnet."
-        not_pinned: "Det er ingen festede emner i {{categoryLink}}."
+        title: "Fremhev denne tråden"
+        pin: "La denne tråden vises øverst i {{categoryLink}}-kategorien inntil"
+        confirm_pin: "Du har allerede {{count}} festede tråder. For mange festede tråder kan være et problem for nye og anonyme brukere. Er du sikker på at du ønsker å feste enda en tråd i denne kategorien?"
+        unpin: "Fjern denne tråden fra toppen av {{categoryLink}}-kategorien."
+        unpin_until: "Fjern denne tråden fra toppen av {{categoryLink}}-kategorien, eller vent til <strong>%{until}</strong>."
+        pin_note: "Brukere kan fjerne festet for tråden for seg selv."
+        pin_validation: "En dato kreves for å feste denne tråden."
+        not_pinned: "Det finnes ingen festede tråder i {{categoryLink}}."
         already_pinned:
-          one: "Emner for øyeblikket låst i {{categoryLink}}: <strong class='badge badge-notification unread'>Ett</strong>"
-          other: "Emne for øyeblikket låst i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        pin_globally: "Få dette emnet til å figurere på toppen av alle emnelistene til"
-        confirm_pin_globally: "Du har allerede {{count}} globalt festede emner. For mange festede emner kan bli en byrde for nye og anonyme brukere. Er du sikker på at du vil feste enda et emne globalt? "
-        unpin_globally: "Fjern dette emnet fra toppen av alle emnelister. "
-        unpin_globally_until: "Fjern dette emnet fra toppen av alle emnelister eller vent til <strong>%{until}</strong>."
-        global_pin_note: "Brukere kan fjerne festet for emnet for seg selv"
-        not_pinned_globally: "Det er ingen festede emner globalt."
+          one: "Tråder for øyeblikket låst i {{categoryLink}}: <strong class='badge badge-notification unread'>Ett</strong>"
+          other: "Tråder som er festet i {{categoryLink}} for øyeblikket: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        pin_globally: "La denne tråden vises øverst i alle listene over tråder inntil"
+        confirm_pin_globally: "Du har allerede {{count}} globalt festede tråder. For mange festede tråder kan være et problem for nye og anonyme brukere. Er du sikker på at du vil feste enda en tråd globalt? "
+        unpin_globally: "Fjern denne tråden fra toppen av alle lister over tråder. "
+        unpin_globally_until: "Fjern denne tråden fra toppen av alle lister over tråder eller vent til <strong>%{until}</strong>."
+        global_pin_note: "Brukere kan fjerne festet for tråden for seg selv"
+        not_pinned_globally: "Det finnes ingen globalt festede tråder."
         already_pinned_globally:
-          one: "Emner for øyeblikket festet globalt: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Dette enmnet er festet globalt: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        make_banner: "Gjør dette emnet til et banner som dukker opp på toppen av alle sider."
-        remove_banner: "Fjern banneret som dukker opp på toppen av alle sider. "
-        banner_note: "Brukere kan fjerne banneret ved å lukke det. Kun et emne kan være banner på en og samme tid. "
-        no_banner_exists: "Det er ingen banneremner. "
-        banner_exists: "Det <strong class='badge badge-notification unread'>er</strong> for øyeblikket et banneremne. "
+          one: "Tråder for øyeblikket festet globalt: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Tråder som er festet globalt for øyeblikket: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        make_banner: "Gjør denne tråden til et banner som vises øverst på alle sider."
+        remove_banner: "Fjern banneret som vises øverst alle sider. "
+        banner_note: "Brukere kan fjerne banneret ved å lukke det. Kun én tråd kan være banner på et gitt tidspunkt. "
+        no_banner_exists: "Det finnes ingen bannertråd. "
+        banner_exists: "Det <strong class='badge badge-notification unread'>finnes</strong> en bannertråd for øyeblikket . "
       inviting: "Inviterer…"
       automatically_add_to_groups: "Denne invitasjonen inkluderer også tilgang til disse gruppene:"
       invite_private:
@@ -1614,27 +1617,27 @@ nb_NO:
         email_or_username: "Invitertes e-post eller brukernavn."
         email_or_username_placeholder: "e-postadresse eller brukernavn"
         action: "Inviter"
-        success: "Vi har invitert denne brukeren til å delta i denne meldingen."
-        success_group: "Vi har invitert denne gruppen til å delta i denne meldingen."
+        success: "Vi har invitert den brukeren til å delta i denne meldingen."
+        success_group: "Vi har invitert den gruppen til å delta i denne meldingen."
         error: "Beklager, det oppstod en feil ved å invitere den brukeren."
         group_name: "gruppenavn"
-      controls: "Emnefunksjoner"
+      controls: "Handlinger for tråd"
       invite_reply:
         title: 'Inviter'
         username_placeholder: "brukernavn"
         action: 'Send Invitasjon'
-        help: 'Inviter andre til dette emnet via e-post eller varsler'
+        help: 'Inviter andre til denne tråden via e-post eller varsler'
         to_forum: "Vi sender en kortfattet e-post som gjør det mulig for en venn å umiddelbart registreres ved å klikke på en lenke. Ingen innlogging er nødvendig."
-        sso_enabled: "Oppgi brukernavnet til personen du ønsker å invitere til dette emnet."
-        to_topic_blank: "Oppgi brukernavnet eller e-post-adressen til personen du ønsker å invitere til dette emnet."
-        to_topic_email: "Du har oppgitt en e-postadresse. Vi vil sende invitasjonen som lar vennen din svare på dette emnet umiddelbart."
-        to_topic_username: "Du har oppgitt et brukernavn. Vi sender et varsel med en link som inviterer dem til dette emnet."
-        to_username: "Oppgi brukernavnet til personen du ønsker å invitere. Vi sender et varsel med en lenke som inviterer dem til dette emnet."
+        sso_enabled: "Oppgi brukernavnet til personen du ønsker å invitere til denne tråden."
+        to_topic_blank: "Oppgi brukernavnet eller e-postadressen til personen du ønsker å invitere til denne tråden."
+        to_topic_email: "Du har oppgitt en e-postadresse. Vi vil sende en invitasjon som lar vennen din svare på denne tråden umiddelbart."
+        to_topic_username: "Du har oppgitt et brukernavn. Vi sender et varsel med en lenke som inviterer dem til denne tråden."
+        to_username: "Oppgi brukernavnet til personen du ønsker å invitere. Vi sender et varsel med en lenke som inviterer vedkommende til denne tråden."
         email_placeholder: 'navn@example.com'
         success_email: "Vi har sendt ut en invitasjon til <b>{{emailOrUsername}}</b>. Vi varsler deg når invitasjonen er godtatt. Sjekk invitiasjonsfanen på brukersiden din for å beholde oversikten over invitasjonene dine."
-        success_username: "Vi har invitert brukeren til å delta i dette emnet."
-        error: "Beklager, vi kunne ikke invitere den brukeren. De har muligens allerede blitt invitert?"
-        success_existing_email: "En bruker med e-posten <b>{{emailOrUsername}}</b> finnes allerede. Vi har invitert den brukeren til å ta del i emnet."
+        success_username: "Vi har invitert den brukeren til å delta i denne tråden."
+        error: "Beklager, vi kunne ikke invitere den brukeren. Vedkommende har muligens allerede blitt invitert? (Antall invitasjoner er begrenset)"
+        success_existing_email: "En bruker med e-postadressen <b>{{emailOrUsername}}</b> finnes allerede. Vi har invitert den brukeren til å ta del i tråden."
       login_reply: 'Logg Inn for å svare'
       filters:
         n_posts:
@@ -1642,20 +1645,20 @@ nb_NO:
           other: "{{count}} innlegg"
         cancel: "Fjern filter"
       split_topic:
-        title: "Del opp emne"
-        action: "del opp emne"
-        topic_name: "Nytt emnenavn:"
-        error: "Det oppsto en feil ved deling av dette emnet."
+        title: "Flytt til ny tråd"
+        action: "flytt til ny tråd"
+        topic_name: "Nytt navn på tråden"
+        error: "Det oppstod en feil ved flytting av innlegg til den nye tråden."
         instructions:
-          one: "Du er i ferd med å lage et nytt emne basert på innlegget du har valgt.."
-          other: "Du er i ferd med å lage et nytt emne basert på <b>{{count}}</b> innlegg du har valgt."
+          one: "Du er i ferd med å lage et ny tråd basert på innlegget du har valgt.."
+          other: "Du er i ferd med å opprette et ny tråd og fylle den med de <b>{{count}}</b> innleggne du har valgt."
       merge_topic:
-        title: "Slå sammen emne"
-        action: "slå sammen emne"
-        error: "Det oppsto en feil ved sammenslåing av dette emnet."
+        title: "Flytt til eksisterende tråd"
+        action: "flytt til eksisterende tråd"
+        error: "Det oppstod en feil ved flytting av innlegg til den tråden"
         instructions:
-          one: "Velg det emnet du vil flytte det innlegget til."
-          other: "Velg emnet du vil flytte de <b>{{count}}</b> innleggene til."
+          one: "Velg den tråden du vil flytte det innlegget til."
+          other: "Velg tråden du vil flytte de <b>{{count}}</b> innleggene til."
       merge_posts:
         title: "Slå sammen valgte innlegg"
         action: "slå sammen valgte innlegg"
@@ -1663,7 +1666,7 @@ nb_NO:
       change_owner:
         title: "Endre innleggenes eier"
         action: "Endre eierskap"
-        error: "Det oppsto en feil ved endring av eierskap til innleggene."
+        error: "Det oppstod en feil ved endring av eierskap til innleggene."
         label: "Innleggenes nye eier"
         placeholder: "den nye eierens brukernavn"
         instructions:
@@ -1673,9 +1676,9 @@ nb_NO:
       change_timestamp:
         title: "Endre tidsstempel…"
         action: "endre tidsstempel"
-        invalid_timestamp: "Tidsstempel kan ikke være i framtiden."
-        error: "Det oppstod en feil ved endring av tidsstempel for emnet."
-        instructions: "Velg et nytt tidsstempel for emnet. Innlegg i emnet blir oppdatert med samme tidsforksjell."
+        invalid_timestamp: "Tidsstempel kan ikke være i fremtiden."
+        error: "Det oppstod en feil ved endring av tidsstempel for tråden."
+        instructions: "Vennligst velg det nye tidsstempelet for tråden. Innlegg i tråden blir oppdatert med samme tidsforskjell."
       multi_select:
         select: 'velg'
         selected: 'valgte ({{count}})'
@@ -1707,7 +1710,7 @@ nb_NO:
       post_number: "innlegg {{number}}"
       wiki_last_edited_on: "wikien sist redigert"
       last_edited_on: "innlegg sist redigert"
-      reply_as_new_topic: "Svar med lenket emne"
+      reply_as_new_topic: "Svar med lenket tråd"
       reply_as_new_private_message: "Svar som ny melding til de samme mottakerne"
       continue_discussion: "Fortsetter diskusjonen fra {{postLink}}:"
       follow_quote: "gå til det siterte innlegget"
@@ -1716,7 +1719,9 @@ nb_NO:
       deleted_by_author:
         one: "(innlegg som er trukket tilbake av forfatter, blir automatisk slettet etter % {count} time, med mindre de blir flagget)"
         other: "(innlegg trukket tilbake av forfatter, blir automatisk slettet etter %{count} timer, med mindre det blir rapportert)"
+      collapse: "fold sammen"
       expand_collapse: "utvid/vis"
+      locked: "et stabsmedlem har låst dette innlegget fra å bli endret"
       gap:
         one: "vis 1 skjult svar"
         other: "vis {{count}} skjulte svar"
@@ -1744,7 +1749,7 @@ nb_NO:
         upload_not_authorized: "Beklager, filen du forsøket å laste opp er ikke tillatt. Tillatte filendelser er {{authorized_extensions}}."
         image_upload_not_allowed_for_new_user: "Beklager, nye brukere kan ikke laste opp bilder"
         attachment_upload_not_allowed_for_new_user: "Beklager, nye brukere kan ikke laste opp vedlegg."
-        attachment_download_requires_login: "Beklager, du må være logget inn for å laste ned vedlegg."
+        attachment_download_requires_login: "Beklager, du må være innlogget for å laste ned vedlegg."
       abandon:
         confirm: "Er du sikker på at du vil forlate innlegget ditt?"
         no_value: "Nei"
@@ -1784,9 +1789,14 @@ nb_NO:
         unwiki: "Fjern Wiki"
         convert_to_moderator: "Legg til stabsfarge"
         revert_to_regular: "Fjern stabsfarge"
-        rebake: "Gjenoppbygg HTML"
+        rebake: "Generer HTML på nytt"
         unhide: "Vis"
         change_owner: "Endre eierskap"
+        grant_badge: "Tildel merke"
+        lock_post: "Lås innlegg"
+        lock_post_description: "forhindre innleggsskriveren fra å redigere dette innlegget"
+        unlock_post: "Lås opp innlegg"
+        unlock_post_description: "tillat innleggsskriveren å redigere dette innlegget"
       actions:
         flag: 'Rapportering'
         defer_flags:
@@ -1796,11 +1806,11 @@ nb_NO:
           off_topic: "Angre rapportering"
           spam: "Angre rapportering"
           inappropriate: "Angre rapportering"
-          bookmark: "Angre bokmerke"
+          bookmark: "Angre bokmerking"
           like: "Angre liker"
           vote: "Angre stemme"
         people:
-          off_topic: "markerte dette som urelatert"
+          off_topic: "markerte dette som utenfor temaet"
           spam: "flagget dette som søppelpost"
           inappropriate: "flagget dette som upassende"
           notify_moderators: "varslet moderatorer"
@@ -1812,7 +1822,7 @@ nb_NO:
             other: "og {{count}} andre likte dette"
           vote: "stemte for dette"
         by_you:
-          off_topic: "Du rapporterte dette som irrelevant"
+          off_topic: "Du rapporterte dette som utenfor temaet"
           spam: "Du rapporterte dette som spam"
           inappropriate: "Du rapporterte dette som upassende"
           notify_moderators: "Du rapporterte dette for moderering"
@@ -1823,7 +1833,7 @@ nb_NO:
         by_you_and_others:
           off_topic:
             one: "Du og 1 annen markerte dette som irrelevant"
-            other: "Du og {{count}} andre rapporterte dette som irrelevant"
+            other: "Du og {{count}} andre rapporterte dette som utenfor temaet"
           spam:
             one: "Du og 1 annen markerte dette som spam"
             other: "Du og {{count}} andre rapporterte dette som spam"
@@ -1873,11 +1883,11 @@ nb_NO:
       delete:
         confirm:
           one: "Er du sikker på at du ønsker å slette dette innlegget?"
-          other: "Er du sikker på at du ønsker å slette disse {{count}} innleggene?"
+          other: "Er du sikker på at du ønsker å slette de {{count}} innleggene?"
       merge:
         confirm:
           one: "Er du sikker på at du vil flette disse postene?"
-          other: "Er du sikker på at du vil flette disse {{count}} postene?"
+          other: "Er du sikker på at du vil flette de {{count}} innleggene?"
       revisions:
         controls:
           first: "Første versjon"
@@ -1918,15 +1928,15 @@ nb_NO:
       choose: 'Velg en katekori&hellip;'
       edit: 'rediger'
       edit_long: "Rediger"
-      view: 'Se emner i kategori'
+      view: 'Se tråder i kategori'
       general: 'Generellt'
       settings: 'Innstillinger'
-      topic_template: "Emnemal"
+      topic_template: "Mal for tråd"
       tags: "Stikkord"
       tags_allowed_tags: "Bare tillat disse etikettene brukt i denne kategorien:"
-      tags_allowed_tag_groups: "Bare tillat stikkord fra disse gruppene brukt i denne kategorien:"
-      tags_placeholder: "(Valgfritt) Liste over tillatte stikkord"
-      tag_groups_placeholder: "(Valgfritt) Liste over tillatte stikkordgrupper"
+      tags_allowed_tag_groups: "Bare tillat stikkord fra disse gruppene å bli brukt i denne kategorien:"
+      tags_placeholder: "(Valgfritt) liste over tillatte stikkord"
+      tag_groups_placeholder: "(Valgfritt) liste over tillatte stikkordgrupper"
       topic_featured_link_allowed: "Tillat fremhevede lenker i denne kategorien"
       delete: 'Slett kategori'
       create: 'Ny Kategori'
@@ -1938,7 +1948,7 @@ nb_NO:
       save_error: Det oppstod en feil ved lagrinen av denne kategorien.
       name: "Kategorinavn"
       description: "Beskrivelse"
-      topic: "kategori emne"
+      topic: "kategoritråd"
       logo: "Kategoribilde"
       background_image: "Kategoriens bakgrunnsbilde"
       badge_colors: "Merkefarger"
@@ -1957,17 +1967,17 @@ nb_NO:
       images: "Bilder"
       email_in: "Egendefinert innkommende e-postadresse:"
       email_in_allow_strangers: "Godta e-post fra anonyme brukere uten brukerkonto"
-      email_in_disabled: "Posting av nye emner via e-post er deaktivert i nettstedsinstillingene. For å aktivere posting av nye emner via e-post,"
+      email_in_disabled: "Publisering av nye tråder via e-post er deaktivert i innstillingene for nettstedet. For å aktivere publisering av nye tråder via e-post,"
       email_in_disabled_click: 'aktiver innstillingen "e-post inn".'
       mailinglist_mirror: "Kategorien gjenspeiler en e-postliste"
       suppress_from_homepage: "Utelat denne kategorien fra hjemmesiden."
-      show_subcategory_list: "Vis underkategoriliste over emner i denne kategorien."
-      num_featured_topics: "Antall emner vist på kategori-siden:"
-      subcategory_num_featured_topics: "Antall framhevede emner på opphavets kategoriside:"
-      all_topics_wiki: "Gjør nye emner til wiki-er som forvalg."
+      show_subcategory_list: "Vis listen over underkategorier over tråder i denne kategorien."
+      num_featured_topics: "Antall tråder vist på kategori-siden:"
+      subcategory_num_featured_topics: "Antall fremhevede tråder på overkategoriens side:"
+      all_topics_wiki: "Gjør nye tråder til wiki-er som forvalg."
       subcategory_list_style: "Listestil for underkategorier:"
-      sort_order: "Sorter emneliste etter:"
-      default_view: "Forvalgt emneliste:"
+      sort_order: "Sorter liste over tråder etter:"
+      default_view: "Forvalgt liste over tråder:"
       default_top_period: "Forvalgt topp-periode:"
       allow_badges_label: "Tillat merker å bli tildelt i denne kategorien"
       edit_permissions: "Rediger tillatelser"
@@ -1981,19 +1991,19 @@ nb_NO:
       notifications:
         watching:
           title: "Følger"
-          description: "Du vil automatisk følge alle emnene i disse kategoriene. Du vil bli varslet om hvert nye innlegg i hvert emne, og antall nye svar vil bli vist."
+          description: "Du vil automatisk følge alle trådene i disse kategoriene. Du vil bli varslet om hvert nye innlegg i hver tråd, og antall nye svar vil bli vist."
         watching_first_post:
           title: "Følger første innlegg"
-          description: "Du vil bare bli varslet om det første innlegget i hvert nye emne i disse kategoriene."
+          description: "Du vil bare bli varslet om det første innlegget i hver nye tråd i disse kategoriene."
         tracking:
           title: "Overvåkning"
-          description: "Du vil automatisk overvåke alle emner i disse kategoriene. Du vil bli varslet dersom noen nevner @navnet ditt eller svarer deg, og antallet nye svar vil bli vist."
+          description: "Du vil automatisk overvåke alle tråder i disse kategoriene. Du vil bli varslet dersom noen nevner @navnet ditt eller svarer deg, og antallet nye svar vil bli vist."
         regular:
           title: "Normal"
-          description: "Du vil bli varslet om noen nevner ditt @navn eller svarer deg."
+          description: "Du vil bli varslet om noen nevner @navnet ditt eller svarer deg."
         muted:
           title: "Ignorert"
-          description: "Du vil aldri bli varslet om noe med tanke på nye emner i disse kategoriene, og de vil ikke vises i siste."
+          description: "Du vil aldri bli varslet om noe vedrørende nye tråder i disse kategoriene, og de vil ikke vises i siste."
       sort_options:
         default: "forvalg"
         likes: "Likes"
@@ -2001,16 +2011,16 @@ nb_NO:
         views: "Visninger"
         posts: "Innlegg"
         activity: "Aktivitet"
-        posters: "Bidragsytere"
+        posters: "Innleggsskrivere"
         category: "Kategori"
         created: "Opprettet"
       sort_ascending: 'Stigende'
       sort_descending: 'Synkende'
       subcategory_list_styles:
         rows: "Rader"
-        rows_with_featured_topics: "Rader med framhevede emner"
+        rows_with_featured_topics: "Rader med fremhevede tråder"
         boxes: "Bokser"
-        boxes_with_featured_topics: "Bokser med framhevede emner"
+        boxes_with_featured_topics: "Bokser med fremhevede tråder"
     flagging:
       title: 'Takk for at du hjelper å holde forumet ryddig!'
       action: 'Rapporter innlegg'
@@ -2018,7 +2028,7 @@ nb_NO:
       notify_action: 'Melding'
       official_warning: 'Offisiell advarsel'
       delete_spammer: "Slett spammer"
-      delete_confirm_MF: "Du er i ferd med å slette {POSTS, flere, ett {<b>1</b> innlegg} andre {<b>#</b> innlegg}} og {EMNER, flere, ett {<b>1</b> emne} andre {<b>#</b> emner}} av denne brukeren, fjern kontoen deres, blokker påmeldinger fra deres IP-adresse <b>{ip_address}</b>, og legg til deres e-postadresse <b>{email}</b> til en permanent blokkeringsliste. Er du sikker på at denne brukeren virkelig sender søppelpost?"
+      delete_confirm_MF: "Du er i ferd med å slette {POSTS, plural, one {<b>1</b> innlegg} other {<b>#</b> innlegg}} og {TOPICS, plural, one {<b>1</b> tråd} other {<b>#</b> tråder}} opprettet av denne brukeren, fjerne kontoen, blokkere påmeldinger fra IP-adressen <b>{ip_address}</b>, og legge til e-postadressen <b>{email}</b> til en permanent blokkeringsliste. Er du sikker på at denne brukeren virkelig sender søppelpost?"
       yes_delete_spammer: "Ja, slett spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(skjult)"
@@ -2027,10 +2037,10 @@ nb_NO:
       cant: "Beklager, du kan ikke rapportere dette innlegget nå."
       notify_staff: 'Gjør stab oppmerksom på dette privat'
       formatted_name:
-        off_topic: "Det er urelatert"
+        off_topic: "Det er utenfor temaet"
         inappropriate: "Det er upassende"
         spam: "Det er reklame"
-      custom_placeholder_notify_user: "Vær spesifikk, konstruktiv og snill."
+      custom_placeholder_notify_user: "Vær spesifikk, vær konstruktiv og vær alltid snill."
       custom_placeholder_notify_moderators: "La oss vite nøyaktig hva problemet er, og del relevante lenker og eksempler hvorvidt det er mulig."
       custom_message:
         at_least:
@@ -2044,11 +2054,11 @@ nb_NO:
           other: "{{count}} gjenstående"
     flagging_topic:
       title: "Takk for at du hjelper med å vedlikeholde god skikk i samfundet vårt!"
-      action: "Rapporter emne"
+      action: "Rapporter tråd"
       notify_action: "Melding"
     topic_map:
-      title: "Emneoppsummering"
-      participants_title: "Hyppige bidragsytere"
+      title: "Oppsummering av tråd"
+      participants_title: "Hyppige innleggsskrivere"
       links_title: "Populære Lenker"
       links_shown: "vis flere lenker…"
       clicks:
@@ -2063,31 +2073,31 @@ nb_NO:
       warning:
         help: "Dette er en offisiell advarsel."
       bookmarked:
-        help: "Du lagret dette emnet"
+        help: "Du bokmerket denne tråden"
       locked:
-        help: "dette emnet er låst; det aksepterer ikke lenger nye svar"
+        help: "denne tråden er låst; den aksepterer ikke lenger nye svar"
       archived:
-        help: "dette emnet er arkivert; det er fryst og kan ikke bli aktivert"
+        help: "denne tråden er arkivert; den er fryst og kan ikke bli endret"
       locked_and_archived:
-        help: "Dette emnet er lukket og akrivert; nye innlegg godtas ikke og tidligere svar kan ikke endres"
+        help: "Denne tråden er lukket og arkivert; den godtar ikke lenger nye innlegg og kan ikke endres"
       unpinned:
         title: "Feste fjernet"
-        help: "Dette emnet er ikke lenger festet, det vil vises i vanlig rekkefølge"
+        help: "Denne ble løsnet for deg; den vil vises i vanlig rekkefølge"
       pinned_globally:
         title: "Globalt fastsatt"
-        help: "Emnet er festet globalt; det vil vises på toppen av seneste og i egen kategori"
+        help: "Denne tråden er festet globalt; den vil vises øverst i seneste og sin kategori"
       pinned:
         title: "Fastsatt"
-        help: "Dette emnet er fastsatt for deg; det vil vises i toppen av sin kategori"
+        help: "Denne tråden er festet for deg; det vil vises øverst i sin kategori"
       invisible:
-        help: "Dette emnet er ikke synlig; det vil ikke vises i emnelister, og kan kun leses via en direktelenke"
+        help: "Denne tråden er ikke synlig; den vil ikke vises i lister over tråder, og er kun tilgjengelig via en direkte lenke"
     posts: "Innlegg"
-    posts_long: "{{number}} innlegg i dette emnet"
+    posts_long: "det finnes {{number}} innlegg i denne tråden"
     posts_likes_MF: |
-      This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-      low {with a high like to post ratio}
-      med {with a very high like to post ratio}
-      high {with an extremely high like to post ratio}
+      Denne tråden har {count, plural, one {1 svar} other {# svar}} {ratio, select,
+      low {med mange likes i forhold til innlegg}
+      med {med veldig mange likes i forhold til innlegg}
+      high {med ekstremt mange likes i forhold til innlegg}
       other {}}
     original_post: "Originalt innlegg"
     views: "Visninger"
@@ -2096,14 +2106,14 @@ nb_NO:
       other: "visninger"
     replies: "Svar"
     views_long:
-      one: "dette emnet er vist 1 gang"
-      other: "dette emnet er vist {{number}} ganger"
+      one: "denne tråden er vist 1 gang"
+      other: "denne tråden er blitt vist {{number}} ganger"
     activity: "Aktivitet"
     likes: "Likes"
     likes_lowercase:
       one: "like"
       other: "likes"
-    likes_long: "det er {{number}} likes i dette emnet"
+    likes_long: "det finnes {{number}} likes i denne tråden"
     users: "Deltakere"
     users_lowercase:
       one: "bruker"
@@ -2116,33 +2126,33 @@ nb_NO:
       not_available: "Ikke tilgjengelig!"
     categories_list: "Kategoriliste"
     filters:
-      with_topics: "%{filter} emner"
-      with_category: "%{filter} %{category} emner"
+      with_topics: "%{filter} tråder"
+      with_category: "%{filter} %{category} tråder"
       latest:
         title: "Siste"
         title_with_count:
           one: "Siste (1)"
           other: "Siste ({{count}})"
-        help: "de sist oppdaterte emnene"
+        help: "tråder med nylige innlegg"
       hot:
-        title: "Populære"
-        help: "et utvalg av de mest populære emnene"
+        title: "Populær"
+        help: "et utvalg av de mest populære trådene"
       read:
         title: "Lest"
-        help: "emner du har lest, i den rekkefølgen du har lest dem"
+        help: "tråder du har lest, i den rekkefølgen du sist leste dem"
       search:
         title: "Søk"
-        help: "Søk i alle emner"
+        help: "Søk i alle tråder"
       categories:
         title: "Kategorier"
         title_in: "Kategori - {{categoryName}}"
-        help: "alle emner sortert etter kategori"
+        help: "alle tråder sortert etter kategori"
       unread:
         title: "Uleste"
         title_with_count:
           one: "Ulest (1)"
           other: "Ulest ({{count}})"
-        help: "emner med uleste innlegg du for øyeblikket følger eller overvåker"
+        help: "tråder du følger eller overvåker for øyeblikket, med uleste innlegg"
         lower_title_with_count:
           one: "1 ulest"
           other: "{{count}} uleste"
@@ -2155,22 +2165,22 @@ nb_NO:
         title_with_count:
           one: "Nye (1)"
           other: "Nye ({{count}})"
-        help: "emner opprettet de siste dagene"
+        help: "tråder opprettet de siste dagene"
       posted:
         title: "Mine innlegg"
-        help: "emner du har bidratt med innlegg i"
+        help: "tråder du har bidratt med innlegg i"
       bookmarks:
         title: "Bokmerker"
-        help: "emner du har bokmerket"
+        help: "tråder du har bokmerket"
       category:
         title: "{{categoryName}}"
         title_with_count:
           one: "{{categoryName}} (1)"
           other: "{{categoryName}} ({{count}})"
-        help: "siste emner i {{categoryName}}-kategorien"
+        help: "siste tråder i {{categoryName}}-kategorien"
       top:
         title: "Aktive"
-        help: "de mest aktive emnene det siste året, den siste måneden, den siste uken eller i dag"
+        help: "de mest aktive trådene det siste året, den siste måneden, uken eller dagen "
         all:
           title: "Totalt"
         yearly:
@@ -2215,28 +2225,31 @@ nb_NO:
         jump: '<b>#</b> Gå til innlegg #'
         back: '<b>u</b> Tilbake'
         up_down: '<b>k</b>/<b>j</b> Flytt utvalg &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b> Åpne valgt emne'
+        open: '<b>o</b> eller <b>Enter</b> Åpne valgt tråd'
         next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Neste/forrige del'
       application:
         title: 'Applikasjon'
-        create: '<b>c</b> Opprett nytt emne'
+        create: '<b>c</b> Opprett ny tråd'
         notifications: '<b>n</b> Åpne varsler'
         hamburger_menu: '<b>=</b> Åpne hamburgermeny'
         user_profile_menu: '<b>p</b> Åpne brukermenyen'
-        show_incoming_updated_topics: '<b>.</b> Vis oppdaterte emner'
+        show_incoming_updated_topics: '<b>.</b> Vis oppdaterte tråder'
         search: '<b>/</b> eller <b>Ctrl</b>+<b>Alt</b>+<b>f</b> Søk'
         help: '<b>?</b> Åpne tastaturhjelp'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Avvis Nye/Innlegg'
-        dismiss_topics: '<b>x</b>, <b>t</b> Avvis emner'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Avslå Nye/Innlegg'
+        dismiss_topics: '<b>x</b>, <b>t</b> Avslå tråder'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Logg ut'
+      composing:
+        title: 'Skriving'
+        return: '<b>shift</b>+<b>c</b> Gå tilbake til redigeringspanelet'
       actions:
         title: 'Handlinger'
-        bookmark_topic: '<b>f</b> Bokmerk emne / Fjern bokmerke'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Fest/fjern feste for emne'
-        share_topic: '<b>shift</b>+<b>s</b> Del emne'
+        bookmark_topic: '<b>f</b> Legg til/fjern bokmerke for tråd'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> Fest/fjern feste for tråd'
+        share_topic: '<b>shift</b>+<b>s</b> Del tråd'
         share_post: '<b>s</b> Del innlegg'
-        reply_as_new_topic: '<b>t</b> Svar som lenket emne'
-        reply_topic: '<b>shift</b>+<b>r</b> Svar på emne'
+        reply_as_new_topic: '<b>t</b> Svar som lenket tråd'
+        reply_topic: '<b>shift</b>+<b>r</b> Svar på tråd'
         reply_post: '<b>r</b> Svar på innlegg'
         quote_post: '<b>q</b> Siter innlegg'
         like: '<b>l</b> Lik innlegg'
@@ -2244,11 +2257,11 @@ nb_NO:
         bookmark: '<b>b</b> Bokmerk innlegg'
         edit: '<b>e</b> Rediger innlegg'
         delete: '<b>d</b> Slett innlegg'
-        mark_muted: '<b>m</b>, <b>m</b> Ignorer emnet'
-        mark_regular: '<b>m</b>, <b>r</b> Vanlig (forvalgt) emne'
-        mark_tracking: '<b>m</b>, <b>t</b> Overvåk emne'
-        mark_watching: '<b>m</b>, <b>w</b> Følg emne'
-        print: '<b>ctrl</b>+<b>p</b> Skriv ut emne'
+        mark_muted: '<b>m</b>, <b>m</b> Ignorer tråden'
+        mark_regular: '<b>m</b>, <b>r</b> Vanlig (forvalgt) tråd'
+        mark_tracking: '<b>m</b>, <b>t</b> Overvåk tråd'
+        mark_watching: '<b>m</b>, <b>w</b> Følg tråd'
+        print: '<b>ctrl</b>+<b>p</b> Skriv ut tråd'
     badges:
       earned_n_times:
         one: "Har gjort seg fortjent til dette merket"
@@ -2259,8 +2272,8 @@ nb_NO:
       allow_title: "Du kan bruke dette merket som tittel"
       multiple_grant: "Du kan oppnå dette flere ganger"
       badge_count:
-        one: "Étt merke"
-        other: "%{count} Merker"
+        one: "1 merke"
+        other: "%{count} merker"
       more_badges:
         one: "+1 mer"
         other: "+%{count} Flere"
@@ -2268,7 +2281,8 @@ nb_NO:
         one: "ett tildelt"
         other: "%{count} tildelt"
       select_badge_for_title: Velg et merke å bruke som din tittel
-      none: "<none>"
+      none: "(intet)"
+      successfully_granted: "Tildelte %{badge} til %{username}"
       badge_grouping:
         getting_started:
           name: Kom i gang
@@ -2291,6 +2305,7 @@ nb_NO:
       </p>
     tagging:
       all_tags: "Alle stikkord"
+      other_tags: "Andre stikkord"
       selector_all_tags: "alle stikkord"
       selector_no_tags: "ingen stikkord"
       changed: "stikkord endret:"
@@ -2298,8 +2313,8 @@ nb_NO:
       choose_for_topic: "valgfrie stikkord"
       delete_tag: "Slett stikkord"
       delete_confirm:
-        one: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra emnet det er tilknyttet?"
-        other: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra {{count}} emner det er tilknyttet?"
+        one: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra tråden det er tilknyttet?"
+        other: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra {{count}} tråder som har det?"
       delete_confirm_no_topics: "Er du sikker på at du ønsker å slette dette stikkordet?"
       rename_tag: "Gi stikkord nytt navn"
       rename_instructions: "Velg et nytt navn for dette stikkordet:"
@@ -2309,66 +2324,66 @@ nb_NO:
       manage_groups: "Behandle stikkordgrupper"
       manage_groups_description: "Definer grupper for å organisere stikkord"
       filters:
-        without_category: "%{filter} %{tag} emner"
-        with_category: "%{filter} %{tag} emner i %{category}"
-        untagged_without_category: "%{filter} emner uten stikkord"
-        untagged_with_category: "%{filter} emner uten stikkord i %{category}"
+        without_category: "%{filter} %{tag} tråder"
+        with_category: "%{filter} %{tag} tråder i %{category}"
+        untagged_without_category: "%{filter} tråder uten stikkord"
+        untagged_with_category: "%{filter} tråder uten stikkord i %{category}"
       notifications:
         watching:
           title: "Følger"
-          description: "Du vil automatisk følge alle emnene med dette stikkordet. Du vil bli varslet om alle nye innlegg og emner; i tillegg vil antallet uleste og nye innlegg vises ved siden av emnet."
+          description: "Du vil automatisk følge alle trådene med dette stikkordet. Du vil bli varslet om alle nye innlegg og tråder; i tillegg vil antallet uleste og nye innlegg vises ved siden av tråden."
         watching_first_post:
           title: "Følger første innlegg"
-          description: "Du vil bare bli varslet om det første innlegget i hvert nye emne som gjør bruk av dette stikkordet."
+          description: "Du vil bare bli varslet om det første innlegget i hver nye tråd med dette stikkordet."
         tracking:
           title: "Overvåkning"
-          description: "Du vil automatisk overvåke alle emner med dette stikkordet. Antallet uleste og nye innlegg vil vises ved siden av emnet."
+          description: "Du vil automatisk overvåke alle tråder med dette stikkordet. Antallet uleste og nye innlegg vil vises ved siden av tråden."
         regular:
           title: "Aktivt medlem"
-          description: "Du vil bli varslet hvis noen nevner ditt @navn eller svarer på ditt innlegg."
+          description: "Du vil bli varslet hvis noen nevner @navnet ditt eller svarer på innlegget ditt."
         muted:
           title: "Ignorert"
-          description: "Du vil ikke bli varslet om noe vedrørende disse emner som bruker dette stikkordet, og de vil ikke vises i din ulest-liste."
+          description: "Du vil ikke bli varslet om noe vedrørende nye tråder som bruker dette stikkordet, og de vil ikke vises i ulest-listen din."
       groups:
         title: "Stikkordgrupper"
         about: "Legg stikkord til grupper for å kunne organisere dem enklere."
         new: "Ny gruppe"
         tags_label: "Stikkord i denne gruppen:"
-        parent_tag_label: "Foreldrestikkord:"
+        parent_tag_label: "Overordnet stikkord:"
         parent_tag_placeholder: "Valgfritt"
-        parent_tag_description: "Stikkord fra denne gruppen kan ikke brukes, med mindre foreldrestikkordet er til stede."
-        one_per_topic_label: "Sett grense på ett stikkord for hvert emne for denne gruppen"
+        parent_tag_description: "Stikkord fra denne gruppen kan ikke brukes med mindre det overordnede stikkordet er til stede."
+        one_per_topic_label: "Begrens til ett stikkord fra denne gruppen per tråd "
         new_name: "Ny stikkordgruppe"
         save: "Lagre"
         delete: "Slett"
         confirm_delete: "Er du sikker på at du vil slette denne stikkordgruppen?"
       topics:
         none:
-          unread: "Du har ingen uleste emner."
-          new: "Du har ingen nye emner."
-          read: "Du har ikke lest noen emner enda."
-          posted: "Du har ikke opprettet noen emner enda."
-          latest: "Det er ingen siste emner igjen å lese."
-          hot: "Det er ingen populære emner."
-          bookmarks: "Du har ikke bokmerket noen emner enda."
-          top: "Det er ingen populære emner."
-          search: "Det er ingen søkeresultater."
+          unread: "Du har ingen uleste tråder."
+          new: "Du har ingen nye tråder."
+          read: "Du har ikke lest noen tråder ennå."
+          posted: "Du har ikke skrevet noe innlegg i tråder ennå."
+          latest: "Det finnes ingen flere siste tråder."
+          hot: "Det finnes ingen populære tråder."
+          bookmarks: "Du har ikke bokmerket noen tråder ennå."
+          top: "Det finnes ingen populære tråder."
+          search: "Det finnes ingen søkeresultater."
         bottom:
-          latest: "Det er ingen siste emner igjen å lese."
-          hot: "Det er ingen populære emner igjen å lese."
-          posted: "Det er ingen emner med innlegg igjen å lese."
-          read: "Det er ingen leste emner igjen å lese."
-          new: "Det er ingen nye emner igjen å lese."
-          unread: "Det er ingen uleste emner igjen å lese."
-          top: "Det er ingen flere populære emner."
-          bookmarks: "Det er ingen bokmerkede emner."
-          search: "Det er ingen flere søkeresultater"
+          latest: "Det finnes ingen flere siste tråder."
+          hot: "Det finnes ingen flere populære tråder."
+          posted: "Det finnes ingen flere tråder med innlegg."
+          read: "Det finnes ingen flere leste tråder."
+          new: "Det finnes ingen flere nye tråder."
+          unread: "Det finnes ingen flere uleste tråder."
+          top: "Det finnes ingen flere populære tråder."
+          bookmarks: "Det finnes ingen bokmerkede tråder."
+          search: "Det finnes ingen flere søkeresultater"
     invite:
       custom_message: "Gjør din invitasjon litt mer personlig ved å skrive ett"
       custom_message_link: "egendefinert melding"
       custom_message_placeholder: "Skriv inn din egendefinerte melding"
       custom_message_template_forum: "Hei, du burde ta del i dette forumet!"
-      custom_message_template_topic: "Hei, jeg tenkte du fattet interesse for dette emnet!"
+      custom_message_template_topic: "Hei, jeg tenkte du ville like denne tråden!"
     safe_mode:
       enabled: "Sikkert modus er påskrudd, for å skru av sikkert modus, lukk dette nettleservinduet"
   admin_js:
@@ -2395,8 +2410,8 @@ nb_NO:
         no_problems: "Ingen problemer ble funnet."
         moderators: 'Moderatorer:'
         admins: 'Adminer:'
-        silenced: 'Forstummet:'
-        suspended: 'Bannlyst:'
+        silenced: 'Dempet:'
+        suspended: 'Utestengt:'
         private_messages_short: "Meldinger"
         private_messages_title: "Meldinger"
         mobile_title: "Mobil"
@@ -2424,13 +2439,13 @@ nb_NO:
           end_date: "Sluttdato"
           groups: "Alle grupper"
       commits:
-        latest_changes: "Siste endringer: Oppgrader ofte!"
+        latest_changes: "Siste endringer: Oppdater ofte!"
         by: "av"
       flags:
         title: "Rapporteringer"
         active_posts: "Rapporterte innlegg"
         old_posts: "Gamle rapporterte innlegg"
-        topics: "Rapporterte innlegg"
+        topics: "Rapporterte tråder"
         moderation_history: "Moderatorhistorikk"
         agree: "Godta"
         agree_title: "Bekreft at denne rapporteringen er gyldig og korrekt"
@@ -2440,26 +2455,26 @@ nb_NO:
         agree_flag_restore_post_title: "Gjenopprett innlegget slik at alle brukere kan se det."
         agree_flag: "Samtykk og behold innlegg"
         agree_flag_title: "Samtykk med flagg og behold innlegget uendret."
-        defer_flag: "Ignorer"
-        defer_flag_title: "Fjern denne rapporteringen; den krever ingen handling på dette tidspunktet."
+        ignore_flag: "Ignorer"
+        ignore_flag_title: "Fjern denne rapporteringen; den krever ingen handling på dette tidspunktet."
         delete: "Slett"
         delete_title: "Fjern innlegget denne rapporteringen refererer til."
         delete_post_defer_flag: "Slett innlegg og ingorer flagg"
-        delete_post_defer_flag_title: "Slett innlegg; hvis det er første innlegg, slett emnet"
+        delete_post_defer_flag_title: "Slett innlegg; hvis det er første innlegg, slett tråden"
         delete_post_agree_flag: "Slett innlegg og samtykk med flagg"
-        delete_post_agree_flag_title: "Slett innlegg; hvis det er første innlegg, slett emnet"
+        delete_post_agree_flag_title: "Slett innlegg; hvis det er første innlegg, slett tråden"
         delete_flag_modal_title: "Slett og…"
         delete_spammer: "Slett spammer"
-        delete_spammer_title: "Fjern denne brukeren og alle innlegg og emner av brukeren."
+        delete_spammer_title: "Fjern denne brukeren og alle innlegg og tråder av brukeren."
         disagree_flag_unhide_post: "Si deg uenig med rapportering (vis innlegg)"
         disagree_flag_unhide_post_title: "Fjern alle rapporteringer fra dette innlegget og gjør det synlig igjen"
         disagree_flag: "Si deg uenig"
         disagree_flag_title: "Benekt rapportering som ugyldig eller uriktig"
         clear_topic_flags: "Ferdig"
-        clear_topic_flags_title: "Emnet har blitt undersøkt og problemer har blitt løst. Klikk Ferdig for å fjerne rapporteringene."
+        clear_topic_flags_title: "Tråden er blitt undersøkt og problemer er blitt løst. Klikk Ferdig for å fjerne rapporteringene."
         more: "(flere svar…)"
-        suspend_user: "Bannlys bruker"
-        suspend_user_title: "Bannlys bruker for dette innlegget"
+        suspend_user: "Steng ute bruker"
+        suspend_user_title: "Steng ute bruker for dette innlegget"
         dispositions:
           agreed: "enig"
           disagreed: "uenig"
@@ -2470,21 +2485,22 @@ nb_NO:
         system: "System"
         error: "Noe gikk galt"
         reply_message: "Svar"
-        no_results: "Det er ingen rapporterte innlegg."
-        topic_flagged: "Dette emnet har blitt rapportert."
+        suspended_for_post: "Brukeren ble utestengt for dette innlegget."
+        no_results: "Det finnes ingen rapporterte innlegg."
+        topic_flagged: "Denne tråden er blitt rapportert."
         show_full: "vis hele innlegget"
-        visit_topic: "Besøk emnet for å utføre handling"
+        visit_topic: "Besøk tråden for å utføre handling"
         was_edited: "Innlegget ble redigert etter første rapportering"
         previous_flags_count: "Dette innlegget har allerede blitt rapportert {{count}} ganger."
         show_details: "Vis rapportdetaljer"
         details: "detaljer"
         flagged_topics:
-          topic: "Emne"
+          topic: "Tråd"
           type: "Type"
           users: "Brukere"
           last_flagged: "Sist rapporter"
         short_names:
-          off_topic: "urelatert"
+          off_topic: "utenfor temaet"
           inappropriate: "upassende"
           spam: "spam"
           notify_user: "egendefinert"
@@ -2524,18 +2540,18 @@ nb_NO:
         no_custom_groups: "Opprett en ny egendefinert gruppe"
       api:
         generate_master: "Generer Master API-nøkkel"
-        none: "Det er ingen aktive API-nøkler akkurat nå."
+        none: "Det finnes ingen aktive API-nøkler akkurat nå."
         user: "Bruker"
         title: "API"
         key: "Nøkkel"
         generate: "Generer API-nøkkel"
         regenerate: "Regenerer API-nøkkel"
-        revoke: "Tilbakedra"
-        confirm_regen: "Er du sikker på at du vil erstatte denne API-nøkkelen med en ny?"
-        confirm_revoke: "Er du sikker på at du vil tilbakedra denne nøkkelen?"
-        info_html: "Din API-nøkkel vil tillate deg å lage og oppdatere emner ved å bruke JSON-samteler."
+        revoke: "Trekk tilbake"
+        confirm_regen: "Er du sikker på at du vil erstatte den API-nøkkelen med en ny?"
+        confirm_revoke: "Er du sikker på at du vil trekke tilbake den nøkkelen?"
+        info_html: "Din API-nøkkel vil tillate deg å lage og oppdatere tråder ved å bruke JSON-kall."
         all_users: "Alle brukere"
-        note_html: "Hold denne nøkkelen <strong>hemmelig</strong>. Alle brukere som har den vil kunne opprette vilkårlige innlegg som en hvilken som helst bruker. "
+        note_html: "Hold denne nøkkelen <strong>hemmelig</strong>, alle brukere som har den, vil kunne opprette vilkårlige innlegg som hvilken som helst bruker. "
       web_hooks:
         title: "Webhooker"
         none: "Det finnes ingen webhooker for tiden."
@@ -2546,7 +2562,7 @@ nb_NO:
         save: "Lagre"
         destroy: "Slett"
         description: "Beskrivelse"
-        controls: "Kontroller"
+        controls: "Handlinger"
         go_back: "Tilbake til liste"
         payload_url: "Payload URL"
         payload_url_placeholder: "https://eksempel.no/postmottak"
@@ -2569,8 +2585,8 @@ nb_NO:
         groups_filter: "Utløse grupper"
         delete_confirm: "Slette denne webhooken?"
         topic_event:
-          name: "Emnehendelse"
-          details: "Når det et nytt, revidert, endret eller slettet emne."
+          name: "Hendelse for tråd"
+          details: "Når det finnes en ny, revidert, endret eller slettet tråd."
         post_event:
           name: "Innleggshendelse"
           details: "Når det er et nytt, redigert, slettet eller gjenopprettet innlegg."
@@ -2583,11 +2599,11 @@ nb_NO:
           failed: "Feilet"
           successful: "Vellykket"
         events:
-          none: "Det er ingen relaterte hendelser."
+          none: "Det finnes ingen relaterte hendelser."
           redeliver: "Send på nytt"
           incoming:
-            one: "Det er en ny hendelse."
-            other: "Det er {{count}} nye hendelser."
+            one: "Det finnes en ny hendelse."
+            other: "Det finnes {{count}} nye hendelser."
           completed_in:
             one: "Ferdig på 1 sekund."
             other: "Ferdig på {{count}} sekunder."
@@ -2619,11 +2635,11 @@ nb_NO:
         change_settings_short: "Innstillinger"
         howto: "Hvordan installerer jeg utvidelser?"
       backups:
-        title: "Sikkerhetskopieringer"
+        title: "Sikkerhetskopier"
         menu:
-          backups: "Sikkerhetskopieringer"
+          backups: "Sikkerhetskopier"
           logs: "Logger"
-        none: "Ingen sikkerhetskopiering er tilgjengelig."
+        none: "Ingen sikkerhetskopi er tilgjengelig."
         read_only:
           enable:
             title: "Aktiver skrivebeskyttet modus"
@@ -2641,8 +2657,7 @@ nb_NO:
           label: "Last opp"
           title: "Last opp en sikkerhetskopi til denne instansen"
           uploading: "Laster opp…"
-          success: "'{{filename}}' har blitt lastet opp."
-          error: "Det oppsto en feil ved opplastingen av '{{filename}}': {{message}}"
+          error: "Det oppstod en feil ved opplastingen av '{{filename}}': {{message}}"
         operations:
           is_running: "En prosess pågår…"
           failed: " {{operation}} mislyktes. Undersøk loggene."
@@ -2652,15 +2667,15 @@ nb_NO:
             confirm: "Er du sikker på at du vil avbryte denne operasjonen?"
           backup:
             label: "Sikkerhetskopi"
-            title: "Opprett en sikkerhetskopiering"
+            title: "Opprett en sikkerhetskopi"
             confirm: "Vil du starte en ny sikkerhetskopiering?"
             without_uploads: "Ja (ikke inkluder filer)"
           download:
             label: "Last ned"
             title: "Send e-post med nedlastingslenke"
-            alert: "En lenke til nedlasting av denne sikkerhetskopien har blitt sendt til deg per e-post."
+            alert: "En lenke for nedlasting av denne sikkerhetskopien er blitt sendt til deg på e-post."
           destroy:
-            title: "Fjern sikkerhetskopi"
+            title: "Fjern sikkerhetskopien"
             confirm: "Er du sikker på at du vil slette denne sikkerhetskopien"
           restore:
             is_disabled: "Gjenoppretting er deaktivert i nettstedsinnstillingene."
@@ -2708,7 +2723,7 @@ nb_NO:
         email_templates:
           title: "E-postmaler"
           subject: "Emne"
-          multiple_subjects: "Denne e-postmalen har flerfoldige emner."
+          multiple_subjects: "Denne e-postmalen har flere emner."
           body: "Meldingstekst"
           none_selected: "Velg en e-postmal for å begynne å redigere."
           revert: "Tilbakestill endringer"
@@ -2810,10 +2825,10 @@ nb_NO:
             description: "Tekst og ikoner i nettstedets hode."
           highlight:
             name: 'utheving'
-            description: 'Bakgrunnsfarge på uthevede elementer på siden, som innlegg og emner.'
+            description: 'Bakgrunnsfargen på uthevede elementer på siden, slik som innlegg og tråder.'
           danger:
             name: 'fare'
-            description: 'Uthevingsfarge for handlinger som sletting av innlegg og emner.'
+            description: 'Uthevingsfarge for handlinger som sletting av innlegg og tråder.'
           success:
             name: 'suksess'
             description: 'Brukt til å indikere hvorvidt en handling var vellykket.'
@@ -2827,7 +2842,7 @@ nb_NO:
         preview_digest: "Forhåndsvis oppsummering"
         sending_test: "Sender e-post for testing"
         error: "<b>ERROR</b> - %{server_error}"
-        test_error: "Det oppsto et problem ved utsendelse av e-post for testing. Sjekk e-postinnstillinger nøye, sjekk at verten ikke blokkerer e-posttilkoblinger, og prøv igjen."
+        test_error: "Det oppstod et problem ved utsendelse av e-post for testing. Sjekk e-postinnstillinger nøye, sjekk at verten ikke blokkerer e-posttilkoblinger, og prøv igjen."
         sent: "Sendt"
         skipped: "Hoppet over"
         bounced: "Tilbakesendt"
@@ -2842,7 +2857,7 @@ nb_NO:
         send_test: "Send e-post for testing"
         sent_test: "sendt!"
         delivery_method: "Leveringsmetode"
-        preview_digest_desc: "Forhåndsvis innholde i føljetong-e-postene som sendes til inaktive brukere."
+        preview_digest_desc: "Forhåndsvis innholde i oppsummerings-e-postene som sendes til inaktive brukere."
         refresh: "Refresh"
         send_digest_label: "Send dette resultatet til:"
         send_digest: "Send"
@@ -2850,8 +2865,8 @@ nb_NO:
         format: "Format"
         html: "html"
         text: "tekst"
-        last_seen_user: "Bruker sist sett:"
-        no_result: "Ingen resultater funnet for føljetong."
+        last_seen_user: "Bruker sett sist:"
+        no_result: "Ingen resultater funnet for oppsummering."
         reply_key: "Svar-ID"
         skipped_reason: "Hopp over grunn"
         incoming_emails:
@@ -2888,10 +2903,10 @@ nb_NO:
         no_results: "Ingen moderatorhistorikk tilgjengelig."
         actions:
           delete_user: "Bruker slettet"
-          suspend_user: "Bruker suspendert"
-          silence_user: "Bruker forstummet"
+          suspend_user: "Bruker utestengt"
+          silence_user: "Bruker dempet"
           delete_post: "Innlegg slettet"
-          delete_topic: "Emne slettet"
+          delete_topic: "Tråd slettet"
       logs:
         title: "Logger"
         action: "Handling"
@@ -2899,7 +2914,7 @@ nb_NO:
         last_match_at: "Siste treff"
         match_count: "Treff"
         ip_address: "IP"
-        topic_id: "Emne-ID"
+        topic_id: "Tråd-ID"
         post_id: "Innleggs-ID"
         category_id: "Kategori-ID"
         delete: 'Slett'
@@ -2934,12 +2949,12 @@ nb_NO:
             change_theme: "bytt drakt"
             delete_theme: "slett drakt"
             change_site_text: "endre sidens tekst"
-            suspend_user: "bannlys bruker"
-            unsuspend_user: "gjeninnsett bruker"
+            suspend_user: "steng ute bruker"
+            unsuspend_user: "Opphev utestenging av bruker"
             grant_badge: "tildel merke"
-            revoke_badge: "tilbakedra merke"
+            revoke_badge: "trekk tilbake merke"
             check_email: "sjekk e-post"
-            delete_topic: "slett emne"
+            delete_topic: "slett tråd"
             delete_post: "slett innlegg"
             impersonate: "overta brukerkonto"
             anonymize_user: "anonymiser bruker"
@@ -2947,16 +2962,16 @@ nb_NO:
             change_category_settings: "endre kategori-innstillinger"
             delete_category: "slett kategori"
             create_category: "opprett kategori"
-            silence_user: "forstum bruker"
-            unsilence_user: "fjern forstumming av bruker"
+            silence_user: "demp bruker"
+            unsilence_user: "opphev demping av bruker"
             grant_admin: "innvilg admin"
-            revoke_admin: "tilbakekall admin"
+            revoke_admin: "trekk tilbake administrering"
             grant_moderation: "innvilg moderering"
-            revoke_moderation: "tilbakekall moderering"
+            revoke_moderation: "trekk tilbake moderering"
             backup_create: "opprett sikkerhetskopi"
             deleted_tag: "slettet stikkord"
             renamed_tag: "stikkord med nytt navn"
-            revoke_email: "tilbakekall e-post"
+            revoke_email: "trekk tilbake e-post"
             lock_trust_level: "lås tillitsnivå"
             unlock_trust_level: "lås opp tillitsnivå"
             activate_user: "aktiver bruker"
@@ -2966,6 +2981,9 @@ nb_NO:
             backup_destroy: "ødelegg sikkerhetskopi"
             reviewed_post: "gjennomsett innlegg"
             custom_staff: "egendefinert handling for programtillegg"
+            post_locked: "innlegg låst"
+            post_unlocked: "innlegg opplåst"
+            check_personal_message: "sjekk personlig melding"
         screened_emails:
           title: "Kontrollerte e-poster"
           description: "Når noen forsøker å lage en ny konto, vil de følgende e-postadressene bli sjekket, og registreringen vil bli blokkert, eller en annen handling vil bli utført."
@@ -2974,7 +2992,7 @@ nb_NO:
             allow: "Tillat"
         screened_urls:
           title: "Kontrollerte URL-er"
-          description: "Disse URLene ble brukt i innlegg av brukere som har blitt identifisert som spammere."
+          description: "Disse URL-ene forekom i innlegg av brukere som har blitt identifisert som spammere."
           url: "URL"
           domain: "Domene"
         screened_ips:
@@ -3008,6 +3026,7 @@ nb_NO:
             header: "Hode"
             full_page: "Full side"
             click_through_only: "Alle (kun klikk gjennom)"
+          header_search_results: "Hode-søkeresultater"
         logster:
           title: "Feillogg"
       watched_words:
@@ -3024,9 +3043,9 @@ nb_NO:
           require_approval: 'Krev godkjenning'
           flag: 'Flagg'
         action_descriptions:
-          block: 'Forhindre innlegg som inneholder disse ordene fra å bli postet. Brukeren vil se en feilmelding når vedkommende prøver å sende inn innlegget sitt.'
+          block: 'Forhindre innlegg som inneholder disse ordene, fra å bli opprettet. Brukeren vil se en feilmelding når vedkommende prøver å opprette innlegget sitt.'
           censor: 'Tillat innlegg som inneholder disse ordene, men erstatt dem med bokstaver som skjuler de sensurerte ordene.'
-          require_approval: 'Det kreves at innlegg som inneholder disse ordene godkjennes av staben før de kan ses.'
+          require_approval: 'Innlegg som inneholder disse ordene, vil måtte godkjennes av staben før de kan bli sett.'
           flag: 'Tillat innlegg som inneholder disse ordene, men flagg dem som upassende slik at moderatorer kan se over dem.'
         form:
           label: 'Nytt ord:'
@@ -3046,7 +3065,7 @@ nb_NO:
         create: 'Legg til admin-bruker'
         last_emailed: "Sist kontaktet"
         not_found: "Beklager, det brukernavner eksisterer ikke i systemet vårt."
-        id_not_found: "Denne brukerID-en eksisterer ikke i vårt system."
+        id_not_found: "Beklager, den bruker-ID-en eksisterer ikke i systemet vårt."
         active: "Aktiv"
         show_emails: "Vis e-poster"
         nav:
@@ -3054,8 +3073,8 @@ nb_NO:
           active: "Aktiv"
           pending: "Ventende"
           staff: 'Stab'
-          suspended: 'Bannlyst'
-          silenced: 'Forstummet'
+          suspended: 'Utestengt'
+          silenced: 'Dempet'
           suspect: 'Mistenkt'
         approved: "Godkjent?"
         approved_selected:
@@ -3068,7 +3087,7 @@ nb_NO:
           active: 'Aktive brukere'
           new: 'Nye brukere'
           pending: 'Brukere som venter på evaluering'
-          newuser: 'Brukere på tillitsnivå 0 (Ny Bruker)'
+          newuser: 'Brukere på tillitsnivå 0 (Ny bruker)'
           basic: 'Brukere på tillitsnivå 1 (Juniormedlem)'
           member: 'Brukere på tillitsnivå 2 (Medlem)'
           regular: 'Brukere på tillitsnivå 3 (Aktivt medlem)'
@@ -3076,8 +3095,8 @@ nb_NO:
           staff: "Stab"
           admins: 'Admin-brukere'
           moderators: 'Moderatorer'
-          silenced: 'Forstummede brukere'
-          suspended: 'Bannlyste brukere'
+          silenced: 'Dempede brukere'
+          suspended: 'Utestengte brukere'
           suspect: 'Mistenkte brukere'
         reject_successful:
           one: "Avvist 1 bruker."
@@ -3090,34 +3109,34 @@ nb_NO:
           title: "Vis denne brukerens e-postadresse"
           text: "Vis"
       user:
-        suspend_failed: "Noe gikk galt ved bannlysing av denne brukeren {{error}}"
-        unsuspend_failed: "Noe gikk galt ved gjeninnsetting av denne brukeren {{error}}"
-        suspend_duration: "Hvor lenge vil du bannlyse denne brukeren? (dager)"
-        suspend_reason_label: "Hvorfor vil du bannlyse? Denne teksten <b>vil være synlig for alle</b> på denne brukerens profilside, og blir vist til brukeren om de skulle forsøke å logge inn. Fatt deg i korthet."
-        suspend_reason_hidden_label: "Hvorfor vil du bannlyse? Denne teksten vil bli vist til brukeren når vedkommende prøver å logge inn. Fatt deg i korthet."
+        suspend_failed: "Noe gikk galt ved utestenging av denne brukeren {{error}}"
+        unsuspend_failed: "Noe gikk galt ved opphevelse av utestenging av denne brukeren {{error}}"
+        suspend_duration: "Hvor lenge skal brukeren være utestengt? (dager)"
+        suspend_reason_label: "Hvorfor stenger du ute brukeren? Denne teksten <b>vil være synlig for alle</b> på denne brukerens profilside og vil bli vist til brukeren når vedkommende forsøker å logge inn. Fatt deg i korthet."
+        suspend_reason_hidden_label: "Hvorfor stenger du ute brukeren? Denne teksten vil bli vist til brukeren når vedkommende prøver å logge inn. Fatt deg i korthet."
         suspend_reason: "Begrunnelse"
         suspend_reason_placeholder: "Bannlysningsgrunn"
         suspend_message: "E-postmelding"
         suspend_message_placeholder: "Alternativt, kan du detaljere bannlysningen og det vil bli sendt per e-post til brukeren."
-        suspended_by: "Bannlyst av"
+        suspended_by: "Utestengt av"
         silence_reason: "Grunn"
-        silenced_by: "Forstummet av"
-        silence_modal_title: "Forstum bruker"
-        silence_duration: "Hvor lenge vil du forstumme denne brukeren?"
+        silenced_by: "Dempet av"
+        silence_modal_title: "Demp bruker"
+        silence_duration: "Hvor lenge skal brukeren dempes?"
         silence_reason_label: "Hvorfor forstummer du denne brukeren?"
-        silence_reason_placeholder: "Grunn til forstumming"
+        silence_reason_placeholder: "Årsak til demping"
         silence_message: "E-postmelding"
         silence_message_placeholder: "(la stå tom for forvalgt melding)"
         suspended_until: "(til %{until})"
-        cant_suspend: "Brukeren kan ikke bannlyses."
+        cant_suspend: "Brukeren kan ikke utestenges."
         delete_all_posts: "Slett alle innlegg"
-        delete_all_posts_confirm_MF: "Du er i ferd med å slette {INNLEGG, flertall, ett {ett innlegg} andre {# innlegg}} og {INNLEGG, flertall, ett {ett emne} andre {# emner}}. Er du sikker?"
-        silence: "Forstum"
-        unsilence: "Fjern forstumming"
-        silenced: "Forstummet?"
+        delete_all_posts_confirm_MF: "Du er i ferd med å slette {POSTS, plural, one {1 innlegg} other {# innlegg}} og {TOPICS, plural, one {1 tråd} other {# tråder}}. Er du sikker?"
+        silence: "Demp"
+        unsilence: "Opphev demping"
+        silenced: "Dempet?"
         moderator: "Moderator?"
         admin: "Admin?"
-        suspended: "Bannlyst?"
+        suspended: "Utestengt?"
         staged: "Arrangert?"
         show_admin_profile: "Admin"
         refresh_browsers: "Tving gjenoffrisking av nettleser"
@@ -3128,22 +3147,25 @@ nb_NO:
         ip_lookup: "IP Lookup"
         log_out: "Logg ut"
         logged_out: "Brukeren ble logget ut på alle enheter"
-        revoke_admin: 'Tilbakedra admin'
+        revoke_admin: 'Trekk tilbake administrering'
         grant_admin: 'Innvilg admin'
         grant_admin_confirm: "Vi har sendt deg en e-post for å bekrefte den nye administratoren. Følg instruksjonene i meldingen."
-        revoke_moderation: 'Tilbakedra moderering'
+        revoke_moderation: 'Trekk tilbake moderering'
         grant_moderation: 'Innvilg moderering'
-        unsuspend: 'Gjeninnsett'
-        suspend: 'Bannlyst'
+        unsuspend: 'Opphev utestenging'
+        suspend: 'Utestengt'
+        show_flags_received: "Vis mottatte rapporteringer"
+        flags_received_by: "Flagg mottatt av %{username}"
+        flags_received_none: "Denne brukeren har ikke mottatt noen rapporteringer."
         reputation: Rykte
         permissions: Tillatelser
         activity: Aktivitet
         like_count: Likes tildelt / mottatt
         last_100_days: 'de siste 100 dagene'
-        private_topics_count: Private emner
+        private_topics_count: Private tråder
         posts_read_count: Innlegg lest
         post_count: Innlegg skrevet
-        topics_entered: Emner vist
+        topics_entered: Tråder sett
         flags_given_count: Rapporteringer tildelt
         flags_received_count: Rapporteringer mottatt
         warnings_received_count: Advarsler mottatt
@@ -3162,7 +3184,7 @@ nb_NO:
         delete_posts_forbidden_because_staff: "Kan ikke slette alle innlegg av administratorer og moderatorer."
         delete_forbidden:
           one: "Brukere kan ikke slettes om de har innlegg. Slett alle brukerens innlegg før bruker kan slettes. (Innlegg eldre enn %{count} dag kan ikke slettes.)"
-          other: "Brukere kan ikke slettes om de har innlegg. Slett alle brukerens innlegg før bruker kan slettes. (Innlegg eldre enn %{count} dager kan ikke slettes.)"
+          other: "Brukere kan ikke slettes om de har innlegg. Slett alle innlegg før du forsøker å slette en bruker. (Innlegg eldre enn %{count} dager kan ikke slettes.)"
         cant_delete_all_posts:
           one: "Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dag gammel. (Innstillingen delete_user_max_post_age.)"
           other: "Kan ikke slette alle innlegg. Noen innlegg er eldre enn %{count} dager gamle. (Innstillingen delete_user_max_post_age.)"
@@ -3183,23 +3205,23 @@ nb_NO:
         deactivate_failed: "Det oppstod et problem ved deaktiveringen av den brukeren."
         unsilence_failed: 'Feil ved fjerning av forstumming av bruker.'
         silence_failed: 'Feil ved forstumming av bruker.'
-        silence_confirm: 'Er du sikker på at du vil forstumme denne brukeren? Vedkommende vil ikke kunne opprette nye emner eller innlegg.'
-        silence_accept: 'Ja, forstum denne brukeren'
+        silence_confirm: 'Er du sikker på at du vil dempe denne brukeren? Vedkommende vil ikke kunne opprette nye tråder eller innlegg.'
+        silence_accept: 'Ja, dem denne brukeren'
         bounce_score: "Antall tilbakesendinger"
         reset_bounce_score:
           label: "Tilbakestill"
           title: "Sett antall tilbakesendinger tilbake til 0"
-        visit_profile: "Besøk <a href='%{url}'>denne brukerinnstillingssiden</a> for å redigere profilen deres"
-        deactivate_explanation: "En deaktivert bruker må re-validere sin e-post."
-        suspended_explanation: "En bannlyst bruker kan ikke logge inn."
-        silence_explanation: "En forstummet bruker kan ikke poste eller starte emner."
-        staged_explanation: "En arrangert bruker kan bare skrive innlegg via e-post i gitte emner."
+        visit_profile: "Besøk <a href='%{url}'>denne brukerinnstillingssiden</a> for å redigere vedkommendes profil"
+        deactivate_explanation: "En deaktivert bruker må bekrefte e-postadressen sin på nytt."
+        suspended_explanation: "En utestengt bruker kan ikke logge inn."
+        silence_explanation: "En dempet bruker kan ikke skrive innlegg eller opprette tråder."
+        staged_explanation: "En arrangert bruker kan bare skrive innlegg via e-post i bestemte tråder."
         bounce_score_explanation:
           none: "Ingen tilbakesendinger ble mottatt nylig fra den e-posten."
           some: "Noen tilbakesendinger ble mottatt nylig fra den e-posten."
           threshold_reached: "Mottok for mange tilbakesendinger fra den e-posten."
-        trust_level_change_failed: "Det oppsto et problem ved endring av brukerens tillitsnivå."
-        suspend_modal_title: "Bannlys bruker"
+        trust_level_change_failed: "Det oppstod et problem ved endring av brukerens tillitsnivå."
+        suspend_modal_title: "Steng ute bruker"
         trust_level_2_users: "Brukere på tillitsnivå 2"
         trust_level_3_requirements: "Krav til tillitsnivå 3"
         trust_level_locked_tip: "tillitsnivå er låst, systemet vil ikke forfremme eller degradere bruker"
@@ -3215,9 +3237,9 @@ nb_NO:
           requirement_heading: "Krav"
           visits: "Besøk"
           days: "dager"
-          topics_replied_to: "Emner besvart"
-          topics_viewed: "Emner vist"
-          topics_viewed_all_time: "Emner vist (totalt)"
+          topics_replied_to: "Tråder besvart"
+          topics_viewed: "Tråder vist"
+          topics_viewed_all_time: "Tråder vist (totalt)"
           posts_read: "Innlegg lest"
           posts_read_all_time: "Innlegg lest (totalt)"
           flagged_posts: "Rapporterte innlegg"
@@ -3298,7 +3320,7 @@ nb_NO:
           required: 'Påkrevd'
           basic: 'Grunnleggende oppsett'
           users: 'Brukere'
-          posting: 'Innlegg'
+          posting: 'Publisering'
           email: 'E-post'
           files: 'Filer'
           trust: 'Tillitsnivå'
@@ -3335,19 +3357,19 @@ nb_NO:
           modal_title: Merkegrupper
         granted_by: Tildelt av
         granted_at: Tildelt
-        reason_help: (En lenke til et innlegg eller emne)
+        reason_help: (En lenke til et innlegg eller tråd)
         save: Lagre
         delete: Slett
         delete_confirm: Er du sikker på at du vil slette dette merket?
-        revoke: Tilbakedra
+        revoke: Trekk tilbake
         reason: Grunn
         expand: Ekspander
-        revoke_confirm: Er du sikker på at du vil tilbakedra dette merket?
+        revoke_confirm: Er du sikker på at du vil trekke tilbake dette merket?
         edit_badges: Rediger merker
         grant_badge: Tildel merke
         granted_badges: Tildelte merker
         grant: Tildel
-        no_user_badges: "%{name} har ikke blitt tildelt noen merker."
+        no_user_badges: "%{name} er ikke blitt tildelt noen merker."
         no_badges: Det er ingen merker som kan bli tildelt.
         none_selected: "Velg et merke for å komme i gang"
         allow_title: Tillat merke å bli benyttet som en tittel
@@ -3373,11 +3395,11 @@ nb_NO:
           link_text: "Forhåndsvis tildelte merker"
           plan_text: "Forhåndsvis med plan for spørring"
           modal_title: "Forhåndsvisning av spørring for merke"
-          sql_error_header: "Det oppsto en feil med spørringen."
+          sql_error_header: "Det oppstod en feil med spørringen."
           error_help: "Se følgende lenker for hjelp til spørringer for merker."
           bad_count_warning:
             header: "ADVARSEL!"
-            text: "Det er manglende grant samples. Dette skjer når merke-søket returnerer bruker-IDer eller innleggs-ID-er som ikke eksisterer. Dette kan føre til uventede resultater senere - dobbeltsjekk søket ditt."
+            text: "Det finnes manglende grant samples. Dette skjer når merke-søket returnerer bruker-IDer eller innleggs-ID-er som ikke eksisterer. Dette kan føre til uventede resultater senere - dobbeltsjekk søket ditt."
           no_grant_count: "Ingen merker å tildele."
           grant_count:
             one: "<b>Ett</b> merke å tildele."
@@ -3398,7 +3420,7 @@ nb_NO:
       embedding:
         get_started: "Hvis du vil bygge inn Discourse på en annen nettside, begynn med å legge til dens vert."
         confirm_delete: "Er du sikker på at du vil slette den verten?"
-        sample: "Bruk følgende HTML-kode på siden din for å bygge inn Discourse-emner. Erstatt <b>ERSTATT_MEG</b> med kanonisk nettadresse fra siden du bygger den inn i."
+        sample: "Bruk følgende HTML-kode på siden din for å bygge inn Discourse-tråder. Erstatt <b>ERSTATT_MEG</b> med riktig nettadresse til siden du bygger den inn i."
         title: "Innbygging"
         host: "Tillatte verter"
         class_name: "Klassenavn"
@@ -3408,11 +3430,11 @@ nb_NO:
         add_host: "Legg til vert"
         settings: "Innbyggingsinnstillinger"
         feed_settings: "Informasjonskanals-innstillinger"
-        feed_description: "Å tilby en RSS/ATOM-informasjonskanal for din side kan forbedre Discourse sin evne til å importere ditt innhold."
+        feed_description: "Å tilby en RSS/ATOM-strøm for nettstedet ditt kan forbedre Discourses evne til å importere innholdet ditt."
         crawling_settings: "Innstillinger for søkeroboter"
-        crawling_description: "Når Discourse oppretter emner for dine innlegg, og ingen RSS/ATOM-informasjonskanal finnes, vil den prøve å tolke innholdet ditt fra din HTML-kode. Noen ganger kan det være utfordrende å hente ut innhold, så muligheten til å oppgi CSS-regler er der for å gjøre uthentingen enklere."
-        embed_by_username: "Brukernavn for emneopprettelse"
-        embed_post_limit: "Maksimalt antall innlegg som skal bygges inn"
+        crawling_description: "Dersom Discourse oppretter tråder for innleggene dine og ingen RSS/ATOM-informasjonskanal finnes, vil det prøve å tolke innholdet ditt ut fra HTML-koden din. Noen ganger kan det være utfordrende å hente ut innhold, så muligheten til å oppgi CSS-regler er der for å gjøre uthentingen enklere."
+        embed_by_username: "Brukernavn for opprettelse av tråd"
+        embed_post_limit: "Maksimalt antall innlegg å bygge inn"
         embed_username_key_from_feed: "Nøkkel for å hente Discourse-brukernavn fra informasjonskanal"
         embed_title_scrubber: "Regulære uttrykk brukt til å finne og korrigere feil i titler"
         embed_truncate: "Forkort de innebygde innleggene"
@@ -3426,14 +3448,14 @@ nb_NO:
       permalink:
         title: "Permalenker"
         url: "URL"
-        topic_id: "Emne-ID"
-        topic_title: "Emne"
+        topic_id: "Tråd-ID"
+        topic_title: "Tråd"
         post_id: "Innleggs-ID"
         post_title: "Innlegg"
         category_id: "Kategori-ID"
         category_title: "Kategori"
         external_url: "Ekstern URL"
-        delete_confirm: Er du sikker du vil slette denne permalenken?
+        delete_confirm: Er du sikker på at du vil slette denne permalenken?
         form:
           label: "Ny:"
           add: "Legg til"
@@ -3449,11 +3471,11 @@ nb_NO:
       quit: "Kanskje senere"
       staff_count:
         one: "Din gemenskap har ett stabsmedlem (deg)."
-        other: "Din gemenskap har %{count} stab, inkludert deg selv."
+        other: " Ditt fellesskap har %{count} stab, inkludert deg selv."
       invites:
         add_user: "legg til"
         none_added: "Du har ikke invitert noen til staben. Er du sikker på at du vil fortsette?"
         roles:
           admin: "Administrator"
           moderator: "Moderator"
-          regular: "Regelmessig bruker"
+          regular: "Aktivt medlem"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index c5bfc95ea3..c50421b1a1 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -101,6 +101,7 @@ nl:
           other: "%{count} jaar later"
       previous_month: 'Vorige maand'
       next_month: 'Volgende maand'
+      placeholder: datum
     share:
       topic: 'een koppeling naar dit topic delen'
       post: 'bericht #%{postNumber}'
@@ -451,7 +452,6 @@ nl:
       '14': "In wachtrij"
     categories:
       all: "Alle categorieën"
-      all_subcategories: "alle"
       no_subcategory: "geen"
       category: "Categorie"
       category_list: "Categorielijst weergeven"
@@ -749,7 +749,6 @@ nl:
         title: "Uitnodigingen"
         user: "Uitgenodigde gebruiker"
         sent: "Verzonden"
-        none: "Er zijn geen uitstaande uitnodigingen om weer te geven."
         truncated:
           one: "De eerste uitnodiging wordt getoond."
           other: "De eerste {{count}} uitnodigingen worden getoond."
@@ -1167,8 +1166,6 @@ nl:
         posted: "Geplaatst door"
         edited: "Uw bericht bewerkt door"
         liked: "Heeft uw bericht geliket"
-        private_message: "Privébericht van"
-        invited_to_private_message: "Uitgenodigd voor een privébericht van"
         invited_to_topic: "Uitgenodigd voor een topic door"
         invitee_accepted: "Uitnodiging geaccepteerd door"
         moved_post: "Uw bericht is verplaatst door"
@@ -1181,7 +1178,6 @@ nl:
         quoted: '{{username}} heeft u geciteerd in ''{{topic}}'' - {{site_title}}'
         replied: '{{username}} heeft op u geantwoord in ''{{topic}}'' - {{site_title}}'
         posted: '{{username}} heeft een bericht geplaatst in ''{{topic}}'' - {{site_title}}'
-        private_message: '{{username}} heeft u een privébericht gestuurd in ''{{topic}}'' - {{site_title}}'
         linked: '{{username}} heeft een koppeling naar uw bericht geplaatst vanaf ''{{topic}}'' - {{site_title}}'
     upload_selector:
       title: "Een afbeelding toevoegen"
@@ -1499,7 +1495,6 @@ nl:
         visible: "Zichtbaar maken"
         reset_read: "Leesgegevens herinitialiseren"
         make_public: "Topic openbaar maken"
-        make_private: "Nieuw privébericht"
       feature:
         pin: "Topic vastmaken"
         unpin: "Topic losmaken"
@@ -2175,7 +2170,6 @@ nl:
         one: "1 toegekend"
         other: "%{count} toegekend"
       select_badge_for_title: Kies een badge om als uw titel te gebruiken
-      none: "<geen>"
       badge_grouping:
         getting_started:
           name: Aan de slag
@@ -2338,7 +2332,6 @@ nl:
         topics: "Gemarkeerde Topics"
         agree: "Akkoord"
         agree_title: "Bevestig dat deze melding geldig en correct is"
-        defer_flag_title: "Deze melding verwijderen; er is nu geen actie nodig."
         delete: "Verwijderen"
         delete_title: "Het bericht waarnaar deze melding verwijst verwijderen."
         delete_post_defer_flag_title: "Bericht verwijderen; als dit het eerste bericht is, het topic verwijderen"
@@ -2527,7 +2520,6 @@ nl:
           label: "Uploaden"
           title: "Een back-up naar deze instantie uploaden"
           uploading: "Uploaden..."
-          success: "'{{filename}}' is geupload."
           error: "Er is een fout opgetreden bij het uploaden van '{{filename}}': {{message}}"
         operations:
           is_running: "Er wordt al een bewerking uitgevoerd..."
@@ -3154,6 +3146,7 @@ nl:
           developer: 'Ontwikkelaar'
           embedding: "Embedden"
           legal: "Juridisch"
+          api: 'API'
           user_api: 'Gebruikers-API'
           uncategorized: 'Overige'
           backups: "Backups"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 3bbb08e58b..44980ea0d0 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -511,7 +511,6 @@ pl_PL:
       '14': "Oczekujące"
     categories:
       all: "wszystkie kategorie"
-      all_subcategories: "wszystkie"
       no_subcategory: "żadne"
       category: "Kategoria"
       category_list: "Wyświetl listę kategorii"
@@ -595,7 +594,6 @@ pl_PL:
       disable_jump_reply: "Po odpowiedzi nie przechodź do nowego wpisu"
       dynamic_favicon: "Pokazuj licznik powiadomień na karcie jako dynamiczny favicon"
       theme_default_on_all_devices: "Ustaw ten motyw jako domyślny na wszystkich moich urządzeniach"
-      allow_private_messages: "Zezwól aby użytkownicy wysyłali mi wiadomości prywatne"
       external_links_in_new_tab: "Otwieraj wszystkie zewnętrzne odnośniki w nowej karcie"
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       change: "zmień"
@@ -818,7 +816,6 @@ pl_PL:
         title: "Zaproszenia"
         user: "Zaproszony(-a) użytkownik(-czka)"
         sent: "Wysłane"
-        none: "Nie ma żadnych zaproszeń do wyświetlenia."
         truncated:
           one: "Wyświetlanie pierwszego zaproszenia."
           few: "Wyświetlanie {{count}} pierwszych zaproszeń."
@@ -1281,8 +1278,6 @@ pl_PL:
         posted: "Autor wpisu"
         edited: "Edycja twojego wpisu"
         liked: "Lajk twojego wpisu"
-        private_message: "Prywatna wiadomość od"
-        invited_to_private_message: "Zaproszenie do prywatnej wiadomości od"
         invited_to_topic: "Zaproszenie do tematu od"
         invitee_accepted: "Zaproszenie zaakceptowane przez"
         moved_post: "Twój wpis został przeniesiony przez"
@@ -1296,7 +1291,6 @@ pl_PL:
         quoted: '{{username}} cytuje cie w "{{topic}}" - {{site_title}}'
         replied: '{{username}} odpowiada na twój wpis w "{{topic}}" - {{site_title}}'
         posted: '{{username}} pisze w "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} wysyła ci prywatną wiadomość w "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkuje do twojego wpisu z "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Dodaj obraz"
@@ -1642,7 +1636,6 @@ pl_PL:
         visible: "Ustaw jako widoczny"
         reset_read: "Zresetuj przeczytane dane"
         make_public: "Upublicznij temat"
-        make_private: "Utwórz prywatną wiadomość"
       feature:
         pin: "Przypnij temat"
         unpin: "Odepnij temat"
@@ -2430,7 +2423,6 @@ pl_PL:
         many: "%{count} przyznanych"
         other: "%{count} przyznanych"
       select_badge_for_title: Wybierz odznakę do użycia jako twój tytuł
-      none: "<brak>"
       badge_grouping:
         getting_started:
           name: Pierwsze kroki
@@ -2594,8 +2586,6 @@ pl_PL:
         agree_flag_hide_post: "Potwierdź i ukryj post"
         agree_flag_restore_post: "Potwierdź i przywróć post"
         agree_flag: "Potwierdź i zachowaj post"
-        defer_flag: "Ignoruj"
-        defer_flag_title: "Usunięcie flagi z twojej listy, nie wymaga dalszych działań."
         delete: "Usuń"
         delete_title: "Usuń wpis do którego odnosi się flaga."
         delete_post_defer_flag: "Usuń post i ignoruj flagę"
@@ -2796,7 +2786,6 @@ pl_PL:
           label: "Wyślij"
           title: "Wyślij kopię zapasową do tej instancji"
           uploading: "Wysyłanie…"
-          success: "'{{filename}}' został pomyślnie przesłany."
           error: "Podczas przesyłania pliku wystąpił błąd '{{filename}}': {{message}}"
         operations:
           is_running: "Proces jest w trakcie działania…"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 08e25bb819..fd667b5ac2 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -438,7 +438,6 @@ pt:
       '14': "Pendente"
     categories:
       all: "todas as categorias"
-      all_subcategories: "todas"
       no_subcategory: "nenhuma"
       category: "Categoria"
       category_list: "Exibir lista de categorias"
@@ -733,7 +732,6 @@ pt:
         title: "Convites"
         user: "Utilizadores Convidados"
         sent: "Enviado"
-        none: "Não há convites pendentes para mostrar."
         truncated:
           one: "A exibir o primeiro convite."
           other: "A exibir os primeiros {{count}} convites."
@@ -1107,8 +1105,6 @@ pt:
         posted: "Publicado por"
         edited: "Edição da sua publicação por"
         liked: "Gostou da sua publicação"
-        private_message: "Mensagem privada de"
-        invited_to_private_message: "Convidado para uma mensagem privada de"
         invited_to_topic: "Convidado para um tópico de"
         invitee_accepted: "Convite aceite por"
         moved_post: "A sua publicação foi movida por"
@@ -1121,7 +1117,6 @@ pt:
         quoted: '{{username}} citou-o em "{{topic}}" - {{site_title}}'
         replied: '{{username}} respondeu-lhe em "{{topic}}" - {{site_title}}'
         posted: '{{username}} publicou em "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} enviou-lhe uma mensagem privada em "{{topic}}" - {{site_title}}'
         linked: '{{username}} ligou à sua publicação de "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Adicionar uma imagem"
@@ -1394,7 +1389,6 @@ pt:
         visible: "Tornar Listado"
         reset_read: "Repor Data de Leitura"
         make_public: "Criar tópico publico"
-        make_private: "Criar mensagem privada"
       feature:
         pin: "Fixar Tópico"
         unpin: "Desafixar Tópico"
@@ -2024,7 +2018,6 @@ pt:
         one: "1 concedido"
         other: "%{count} concedidos"
       select_badge_for_title: Selecionar um distintivo para usar como seu título
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Começar
@@ -2178,7 +2171,6 @@ pt:
         title: "Denúncias"
         agree: "Aceitar"
         agree_title: "Confirmar esta denúncia como válida e correta"
-        defer_flag_title: "Remover esta denúncia; não requer qualquer ação de momento."
         delete: "Eliminar"
         delete_title: "Eliminar a publicação associada a esta denúncia."
         delete_post_defer_flag_title: "Eliminar publicação; se é a primeira do tópico então eliminar o tópico"
@@ -2352,7 +2344,6 @@ pt:
           label: "Carregar"
           title: "Carregar uma cópia de segurança para esta instância"
           uploading: "A carregar…"
-          success: "'{{filename}}' foi carregado com sucesso."
           error: "Verificou-se um erro no carregamento de '{{filename}}': {{message}}"
         operations:
           is_running: "Existe atualmente uma operação em execução..."
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 2acb10f26a..f94403a25e 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -444,7 +444,6 @@ pt_BR:
       '14': "Pendente"
     categories:
       all: "todas as categorias"
-      all_subcategories: "todos"
       no_subcategory: "nenhum"
       category: "Categoria"
       category_list: "Exibir lista de categorias."
@@ -523,7 +522,6 @@ pt_BR:
       disable_jump_reply: "Não pular para o meu tópico depois que eu respondo"
       dynamic_favicon: "Exibir ícone no navegador de tópicos novos / atualizados."
       theme_default_on_all_devices: "Definir este tema como padrão em todos os meus dispositivos"
-      allow_private_messages: "Permitir que outros usuários me mandem mensagens privadas"
       external_links_in_new_tab: "Abrir todos os links externos em uma nova aba"
       enable_quoting: "Ativar resposta citando o texto destacado"
       change: "alterar"
@@ -742,7 +740,6 @@ pt_BR:
         title: "Convites"
         user: "Usuários convidados"
         sent: "Enviado"
-        none: "Não existem convites pendentes para exibir."
         truncated:
           one: "Mostrando os primeiro convite."
           other: "Mostrando os primeiros {{count}} convites."
@@ -1143,8 +1140,6 @@ pt_BR:
         posted: "Mensagem por"
         edited: "Edição na sua mensagem por"
         liked: "Curtiu sua mensagem"
-        private_message: "Mensagem privada de"
-        invited_to_private_message: "Convidou para uma mensagem privada"
         invited_to_topic: "Convite para um tópico de"
         invitee_accepted: "Convite aceito por"
         moved_post: "Seu tópico foi movido por"
@@ -1158,7 +1153,6 @@ pt_BR:
         quoted: '{{username}} citou você em "{{topic}}" - {{site_title}}'
         replied: '{{username}} respondeu para você em "{{topic}}" - {{site_title}}'
         posted: '{{username}} postou em "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} enviou uma mensagem particular para você em "{{topic}}" - {{site_title}}'
         linked: '{{username}} linkou o seu post de "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Adicionar uma imagem"
@@ -1461,7 +1455,6 @@ pt_BR:
         visible: "Tornar Visível"
         reset_read: "Repor data de leitura"
         make_public: "Transformar em Tópico Público"
-        make_private: "Transformar em Mensagem Privada"
       feature:
         pin: "Fixar Tópico"
         unpin: "Desafixar Tópico"
@@ -2126,7 +2119,6 @@ pt_BR:
         one: "1 concedido"
         other: "%{count} concedidos"
       select_badge_for_title: Selecione um emblema para usar como o seu título
-      none: "<nenhum>"
       badge_grouping:
         getting_started:
           name: Primeiros Passos
@@ -2283,8 +2275,6 @@ pt_BR:
         title: "Sinalizações"
         agree: "Concordo"
         agree_title: "Confirmar esta marcação como válida e correta"
-        defer_flag: "Ignorar"
-        defer_flag_title: "Remover esta marcação; ela não requer nenhuma ação neste momento."
         delete: "Apagar"
         delete_title: "Apagar o post ao qual a marcação se refere."
         delete_post_defer_flag_title: "Apaga a resposta; se for a primeira, apagar o tópico"
@@ -2470,7 +2460,6 @@ pt_BR:
           label: "Enviar"
           title: "Carregar um backup para esta instância"
           uploading: "Subindo..."
-          success: "'{{filename}}' foi carregado com sucesso."
           error: "Houve um erro ao carregar '{{filename}}': {{message}}"
         operations:
           is_running: "Uma operação está sendo executada..."
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index a313c055dd..11a6e9f587 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -450,7 +450,6 @@ ro:
       '14': "În așteptare"
     categories:
       all: "Toate categoriile"
-      all_subcategories: "Toate"
       no_subcategory: "Niciuna"
       category: "Categorie"
       category_list: "Afișează lista de categorii"
@@ -732,7 +731,6 @@ ro:
         title: "Invitații"
         user: "Utilizator invitat"
         sent: "Trimis(e)"
-        none: "Nu sunt invitații în așteptare."
         truncated:
           one: "Se afișează prima invitație."
           few: "Se afișează primele {{count}} invitații."
@@ -1083,8 +1081,6 @@ ro:
         posted: "Postat de"
         edited: "Editează postarea prin"
         liked: "V-a apreciat postarea"
-        private_message: "Mesaj privat de la"
-        invited_to_private_message: "Invitat la un mesaj privat de către"
         invited_to_topic: "Invitat la un subiect de către"
         invitee_accepted: "Invitație acceptată de către"
         moved_post: "Postarea ta a fost mutată de către"
@@ -1097,7 +1093,6 @@ ro:
         quoted: '{{username}} te-a citat în "{{topic}}" - {{site_title}}'
         replied: '{{username}} ți-a răspuns la "{{topic}}" - {{site_title}}'
         posted: '{{username}} a postat în "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} ți-a trimis un mesaj privat în "{{topic}}" - {{site_title}}'
         linked: '{{username}} a pus un link către postarea ta din "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Adaugă o imagine"
@@ -1362,7 +1357,6 @@ ro:
         visible: "Fă vizibil"
         reset_read: "Resetează datele despre subiecte citite"
         make_public: "Transformă în subiect public"
-        make_private: "Transformă în mesaj privat"
       feature:
         pin: "Fixează subiectul"
         unpin: "Anulează subiect fixat"
@@ -2034,7 +2028,6 @@ ro:
         few: "%{count} acordate"
         other: "%{count} acordate"
       select_badge_for_title: Selectați un ecuson pentru a-l folosi ca titlu
-      none: "<niciunul>"
       badge_grouping:
         getting_started:
           name: Cum începem
@@ -2188,7 +2181,6 @@ ro:
         title: "Marcaje de avertizare"
         agree: "De acord"
         agree_title: "Confirmă acest marcaj ca valid și corect"
-        defer_flag_title: "Scoate marcajul de avertizare; Nu necesită nicio acțiune deocamdată."
         delete: "Șterge"
         delete_title: "Șterge postarea la care se referă marcajul de avertizare."
         delete_post_defer_flag_title: "Șterge postarea; dacă este prima, șterge subiectul"
@@ -2364,7 +2356,6 @@ ro:
           label: "Încarcă"
           title: "Încarcă un backup în această instanță."
           uploading: "Se încarcă..."
-          success: "fișierul '{{filename}}' a fost încărcat cu succes."
           error: "A apărut o eroare la încărcarea fișierului '{{filename}}': {{message}}"
         operations:
           is_running: "O altă operație este în desfășurare..."
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 9c9298f8d0..f0421e01e9 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -498,7 +498,6 @@ ru:
       '14': "Ожидает одобрения"
     categories:
       all: "Все разделы"
-      all_subcategories: "Все подкатегории"
       no_subcategory: "Вне подкатегорий"
       category: "Раздел"
       category_list: "Показать список разделов"
@@ -799,7 +798,6 @@ ru:
         title: "Приглашения"
         user: "Кто приглашен"
         sent: "Когда"
-        none: "Приглашения, ожидающие одобрения, отсутствуют."
         truncated:
           one: "Первое приглашение"
           few: "Первые {{count}} приглашения"
@@ -1100,6 +1098,8 @@ ru:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Выбрать...
     emoji_picker:
       filter_placeholder: Искать emoji
       people: People
@@ -1126,6 +1126,7 @@ ru:
       saved_local_draft_tip: "Сохранено локально"
       similar_topics: "Ваша тема похожа на..."
       drafts_offline: "Черновики, сохраненные в офлайн"
+      group_mentioned_limit: "<b>Внимание!</b> Вы упомянули <a href='{{group_link}}'>{{group}}</a>, в которой больше участников, чем установленный администратором лимит упоминаний на {{max}} пользователей. Никто не получит оповещение."
       group_mentioned:
         one: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>1му пользователю</a> – вы уверены?"
         few: "Упоминая группу {{group}}, вы тем самым отправите уведомление <a href='{{group_link}}'>{{count}} пользователям</a> – вы уверены?"
@@ -1150,6 +1151,7 @@ ru:
       cancel: "Отмена"
       create_topic: "Создать тему"
       create_pm: "Отправить личное сообщение"
+      create_whisper: "Внутреннее сообщение"
       title: "Или нажмите Ctrl+Enter"
       users_placeholder: "Добавить пользователя"
       title_placeholder: "Название: суть темы коротким предложением"
@@ -1209,8 +1211,6 @@ ru:
         posted: "Опубликовано"
         edited: "Изменил ваше сообщение"
         liked: "Понравилось ваше сообщение"
-        private_message: "Личное сообщение от"
-        invited_to_private_message: "Приглашение в личную беседе от"
         invited_to_topic: "Приглашение в тему от"
         invitee_accepted: "Приглашение принято"
         moved_post: "Ваша тема перенесена участником "
@@ -1223,7 +1223,6 @@ ru:
         quoted: '{{username}} процитировал Вас в "{{topic}}" - {{site_title}}'
         replied: '{{username}} ответил вам в "{{topic}}" - {{site_title}}'
         posted: '{{username}} написал в "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} отправил вам личное сообщение в "{{topic}}" - {{site_title}}'
         linked: '{{username}} ссылается на ваш пост в теме: "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Add an image"
@@ -1537,7 +1536,6 @@ ru:
         visible: "Включить в списки"
         reset_read: "Сбросить счетчики"
         make_public: "Сделать тему публичной"
-        make_private: "Сделать тему приватной"
       feature:
         pin: "Закрепить тему"
         unpin: "Открепить тему"
@@ -1669,6 +1667,16 @@ ru:
       multi_select:
         select: 'выбрать'
         selected: 'выбрано ({{count}})'
+        select_post:
+          label: 'выбрать'
+        selected_post:
+          label: 'выбранный'
+        select_replies:
+          label: 'выбрать + ответы'
+          title: 'Добавить запись и все ответы для выбора'
+        select_below:
+          label: 'выбрать + все ниже'
+          title: 'Добавить запись и все ответы для выбора'
         delete: удалить выбранные
         cancel: отменить выделение
         select_all: выбрать все
@@ -2294,7 +2302,6 @@ ru:
         many: "выдано %{count}"
         other: "выдано %{count}"
       select_badge_for_title: Использовать награду в качестве Вашего титула
-      none: "<отсутствует>"
       badge_grouping:
         getting_started:
           name: Начало работы
@@ -2451,7 +2458,6 @@ ru:
         moderation_history: "История модерации"
         agree: "Принять"
         agree_title: "Подтвердить корректность жалобы"
-        defer_flag_title: "Удалить эту жалобу — никаких действий на данный момент не требуется."
         delete: "Удалить"
         delete_title: "Удалить обжалованное сообщение."
         delete_post_defer_flag_title: "Удалить сообщение; если это первое сообщение, удалить тему целиком"
@@ -2634,7 +2640,6 @@ ru:
           label: "Загрузить"
           title: "Загрузить копию на сервер"
           uploading: "Загрузка..."
-          success: "'{{filename}}' был успешно загружен."
           error: "При загрузке '{{filename}}' произошла ошибка: {{message}}"
         operations:
           is_running: "Операция в данный момент исполняется..."
@@ -2971,11 +2976,18 @@ ru:
           roll_up:
             text: "Группировка"
             title: "Создание новой записи бана целой подсети если уже имеется хотя бы 'min_ban_entries_for_roll_up' записей отдельных IP адресов."
+        search_logs:
+          types:
+            all_search_types: "Все типы поиска"
+            header: "Шапка"
         logster:
           title: "Журнал ошибок"
       watched_words:
+        actions:
+          flag: 'Жалоба'
         form:
           placeholder_regexp: "Регулярное выражение"
+          add: 'Добавить'
       impersonate:
         title: "Войти от имени пользователя"
         help: "Используйте этот инструмент, чтобы войти от имени пользователя. Может быть полезно для отладки. После этого необходимо выйти и зайти под своей учетной записью снова."
@@ -3379,6 +3391,11 @@ ru:
       upload: "Загрузить"
       uploading: "Загрузка..."
       quit: "Может быть позже"
+      staff_count:
+        one: "В вашем сообществе 1 сотрудник (это вы)."
+        few: "В вашем сообществе %{count} сотрудника, включая вас."
+        many: "В вашем сообществе %{count} сотрудников, включая вас."
+        other: "В вашем сообществе %{count} сотрудников, включая вас."
       invites:
         add_user: "добавить"
         none_added: "Вы ещё не пригласили сотрудников. Вы уверены, что хотите продолжить?"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index b8525ef964..928dea873a 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -51,6 +51,10 @@ sk:
           one: "1s"
           few: "1s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          few: "< 1m"
+          other: "< %{count}m"
         x_minutes:
           one: "1m"
           few: "%{count}m"
@@ -160,17 +164,22 @@ sk:
     emails_are_disabled: "Odosielanie emailov bolo globálne vypnuté administrátorom. Žiadne emailové notifikácie nebudú odoslané."
     bootstrap_mode_enabled: "Pre zjednodušenie spustenia Vašej novej stránky sa nachádzate v zavádzacom režime. Všetci noví používatelia budú mať pridelený stupeň dôvery 1 a budú mať zapnutý denný emailový výber aktualít. Toto bude automaticky vypnuté keď celkový počet používateľov presiahne %{min_users}."
     bootstrap_mode_disabled: "Zavádzací režim bude zrušený v priebehu nasledujúcich 24 hodín."
+    themes:
+      default_description: "Predvolené"
     s3:
       regions:
         ap_northeast_1: "Ázia Tichomorie (Tokio)"
         ap_northeast_2: "Asia Pacific (Soul)"
+        ap_south_1: "Asia Pacific (Mumbai)"
         ap_southeast_1: "Ázia Tichomorie (Singapur)"
         ap_southeast_2: "Ázia Tichomorie (Sydney)"
         cn_north_1: "Čína (Peking)"
         eu_central_1: "EU (Frankfurt)"
         eu_west_1: "EU (Írsko)"
+        eu_west_2: "EU (Londýn)"
         sa_east_1: "Južná Amerika (Sao Paulo)"
         us_east_1: "USA Východ (S. Virginia)"
+        us_east_2: "USA Východ (Ohio)"
         us_gov_west_1: "AWS GovCloud (USA)"
         us_west_1: "USA Západ (S. Kalifornia)"
         us_west_2: "USA Západ (Oregon)"
@@ -274,6 +283,7 @@ sk:
     uploading: "Upload prebieha..."
     uploading_filename: "Nahrávám {{filename}}..."
     uploaded: "Upload úspešne dokončený."
+    pasting: "Vkladám..."
     enable: "Zapnúť"
     disable: "Vypnúť"
     undo: "Späť"
@@ -370,6 +380,9 @@ sk:
         full_name: 'Celé meno'
         add_members: "Pridať používateľov"
       add: "Pridať"
+      join: "Pridať sa do skupiny"
+      leave: "Opustiť skupinu"
+      request: "Požiadať o pridanie do skupiny"
       closed_group: Uzavretá skupina
       membership: "Členstvo"
       name: "Meno"
@@ -380,6 +393,10 @@ sk:
       index:
         title: "Skupiny"
         empty: "Nenašli sa viditeľné skupiny."
+      title:
+        one: "Skupina"
+        few: "Skupiny"
+        other: "Skupiny"
       activity: "Aktivita"
       members: "Členovia"
       topics: "Témy"
@@ -426,7 +443,6 @@ sk:
       '14': "Čakajúce správy"
     categories:
       all: "všetky kategórie"
-      all_subcategories: "všetky"
       no_subcategory: "žiadne"
       category: "Kategória"
       category_list: "Zobraziť zoznam kategórií"
@@ -475,6 +491,7 @@ sk:
       mute: "Ignorovať"
       edit: "Upraviť nastavenia"
       download_archive:
+        button_text: "Stiahnuť všetko"
         confirm: "Si si istý, že si chceš uložiť svoje príspevky na disk?"
         success: "Sťahovanie bolo spustené, o jeho ukončení budeš informovaný správou."
         rate_limit_error: "Príspevky možu byť stiahnuté len raz za deň. Skús opäť zajtra prosím."
@@ -499,6 +516,7 @@ sk:
         disable: "Zakázať upozornenia"
         enable: "Povoliť upozornenia"
         each_browser_note: "Poznámka: Toto nastavenie musíte zmeniť v každom používanom prehliadači."
+      dismiss: 'Zahodiť'
       dismiss_notifications: "Zahodiť všetko"
       dismiss_notifications_tooltip: "Označiť všetky neprečítané upozornenia ako prečítané"
       disable_jump_reply: "Neskočiť na môj príspevok po odpovedi"
@@ -700,7 +718,6 @@ sk:
         title: "Pozvánky"
         user: "Pozvaný používateľ"
         sent: "Odoslané"
-        none: "Nemáte žiadne čakajúce pozvánky."
         truncated:
           one: "Zobrazuje sa prvá pozvánka."
           few: "Zobrazujú sa prvé {{count}} pozvánky."
@@ -1030,8 +1047,6 @@ sk:
         posted: "Príspevok od"
         edited: "Upravte Váš príspevok do"
         liked: "Váš príspevok sa páčil"
-        private_message: "Súkromná správa od"
-        invited_to_private_message: "Pozvaný na súkromné správy od"
         invited_to_topic: "Pozvaný k téme od"
         invitee_accepted: "Pozvánka akceptovaná "
         moved_post: "Váš príspevok bol presunutý "
@@ -1044,7 +1059,6 @@ sk:
         quoted: '{{username}} vás citoval v "{{topic}}" - {{site_title}}'
         replied: '{{username}} vám odpovedal v "{{topic}}" - {{site_title}}'
         posted: '{{username}} prispel v "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} vám poslal súkromnú správu v "{{topic}}" - {{site_title}}'
         linked: '{{username}} odkázal na váš príspevok z "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Pridať obrázok"
@@ -1286,7 +1300,6 @@ sk:
         visible: "Zobraziť"
         reset_read: "Zrušiť načítané údaje"
         make_public: "Spraviť verejnou témou"
-        make_private: "Spraviť súkromnou správou"
       feature:
         pin: "Pripni tému"
         unpin: "Odopni tému"
@@ -1915,7 +1928,6 @@ sk:
         one: "1 udelený"
         few: "%{count} udelené"
         other: "%{count} udelených"
-      none: "<žiadne>"
       badge_grouping:
         getting_started:
           name: Začíname
@@ -2050,7 +2062,6 @@ sk:
         title: "Označenia"
         agree: "Súhlasiť"
         agree_title: "Akceptovať toto označenie ako platné a správne"
-        defer_flag_title: "Zrušíť označenie. Žiadna akcia nie je nateraz potrebná."
         delete: "Odstrániť"
         delete_title: "Zmazať príspevok na ktorý označenie odkazuje ."
         delete_post_defer_flag_title: "Zmazať prípspevok; ak ide o prvý príspevok, zmazať aj tému"
@@ -2157,7 +2168,6 @@ sk:
           label: "Upload"
           title: "Nahrať zálohu do tejto inštancie"
           uploading: "Upload prebieha..."
-          success: "'{{filename}}' bol úspešne nahratý."
           error: "Počas nahrávania '{{filename}}' nastala chyba: {{message}}"
         operations:
           is_running: "Operácia práve prebieha..."
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 81b758a2b1..665b5e622b 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -409,7 +409,6 @@ sq:
       '14': "Në pritje"
     categories:
       all: "kategoritë"
-      all_subcategories: "të gjitha"
       no_subcategory: "asnjë"
       category: "Kategori"
       category_list: "Trego listën e kategorive"
@@ -692,7 +691,6 @@ sq:
         title: "Ftesat"
         user: "Anëtari i ftuar"
         sent: "Dërguar"
-        none: "Nuk keni asnjë ftesë në pritje. "
         truncated:
           one: "Po afishohet ftesa e parë."
           other: "Po afishohen {{count}} ftesat e para."
@@ -1042,8 +1040,6 @@ sq:
         posted: "Postim nga"
         edited: "Redakto postimin tuaj"
         liked: "Pëlqeu postimin tuaj"
-        private_message: "Mesazh privat nga"
-        invited_to_private_message: "I/e ftuar në një mesazh privat nga"
         invited_to_topic: "I/e ftuar në temë nga"
         invitee_accepted: "Ftesa u pranua nga"
         moved_post: "Postimi juaj u transferua nga"
@@ -1056,7 +1052,6 @@ sq:
         quoted: '{{username}} ju ka cituar në "{{topic}}" - {{site_title}}'
         replied: '{{username}} ju u përgjigj në "{{topic}}" - {{site_title}}'
         posted: '{{username}} postoi në "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} ju dërgoi një mesazh privat nga "{{topic}}" - {{site_title}}'
         linked: '{{username}} vendosi një lidhje për postimin tuaj nga "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Shto një imazh"
@@ -1283,7 +1278,6 @@ sq:
         invisible: "Hiqeni nga Listat"
         visible: "Listojeni"
         make_public: "Bëje temën publike"
-        make_private: "Bëje mesazh privat"
       feature:
         pin: "Ngjite temën"
         unpin: "Çngjite temën"
@@ -1883,7 +1877,6 @@ sq:
         one: "1 e akorduar"
         other: "%{count} të akorduara"
       select_badge_for_title: Zgjidhni një stemë për ta përdorur si titullin tuaj
-      none: "<asnjë>"
       badge_grouping:
         getting_started:
           name: Fillestar
@@ -2031,7 +2024,6 @@ sq:
         title: "Sinjalizimet"
         agree: "Pranoj"
         agree_title: "Konfirmo këtë sinjalizim si të vlefshëm do korrekt"
-        defer_flag_title: "Hiqe këtë sinjalizim; nuk ka nevojë për veprime në këtë moment. "
         delete: "Fshij"
         delete_title: "Fshini postimin e sinjalizuar."
         delete_post_defer_flag_title: "Fshini postimin; në qoftë postim i parë, fshihet tema"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index c871946ff1..ebf9090332 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -60,9 +60,9 @@ sr:
           few: "%{count} min"
           other: "%{count} min"
         about_x_hours:
-          one: "%{count}sat"
+          one: "%{count} sat"
           few: "%{count} sata"
-          other: "%{count}sati"
+          other: "%{count} sati"
         x_days:
           one: "%{count} dan"
           few: "%{count} dana"
@@ -129,7 +129,7 @@ sr:
       next_month: 'Sledeći mesec'
       placeholder: datum
     share:
-      topic: 'podeli link na ovu temu'
+      topic: 'podeli link ka ovoj temi'
       post: 'poruka #%{postNumber}'
       close: 'zatvori'
       twitter: 'podeli ovaj link na Twitteru'
@@ -209,7 +209,7 @@ sr:
       one: "link"
       few: "linkovi"
       other: "linkovi"
-    faq: "ČPP"
+    faq: "FAQ (često postavljana pitanja)"
     guidelines: "Smernice"
     privacy_policy: "Politika Privatnosti"
     privacy: "Privatnost"
@@ -263,8 +263,8 @@ sr:
         unbookmark: "Klikni da bi obirsao sve markere sa ove teme"
     bookmarks:
       not_logged_in: "izvini, morate biti prijavljeni da bi markirali ovu temu"
-      created: "ti si markirao ovu poruku"
-      not_bookmarked: "ti si pročitao ovu poruku; klikni da bi je markirao"
+      created: "markirao si ovu poruku"
+      not_bookmarked: "pročitao si ovu poruku; klikni da bi je markirao (bookmark-ovao)"
       last_read: "ovo je zadnja poruka koju si pročitao; klikni da bi je markirao"
       remove: "Obriši marker"
       confirm_clear: "Jeste li sigurni da želite izbrisati sve markere sa ove teme?"
@@ -364,6 +364,8 @@ sr:
     groups:
       logs:
         action: "Akcije"
+      edit:
+        full_name: 'Ime'
       owner: "vlasnik"
       index:
         title: "Grupe"
@@ -382,9 +384,9 @@ sr:
         none: "Ništa"
       flair_bg_color_placeholder: "(Opciono) Hex vrednost boje"
     user_action_groups:
-      '1': "Sviđanja Dodata"
-      '2': "Primljena Sviđanja"
-      '3': "Markiraj"
+      '1': "Data sviđanja"
+      '2': "Dobijena sviđanja"
+      '3': "Markirano"
       '4': "Teme"
       '5': "Odgovori"
       '7': "Spomeni"
@@ -395,7 +397,6 @@ sr:
       '14': "U toku"
     categories:
       all: "sve kategorije"
-      all_subcategories: "sve"
       no_subcategory: "ništa"
       category: "Kategorija"
       reorder:
@@ -428,6 +429,8 @@ sr:
       topics_entered: "tema posećeno"
       post_count: "# poruka"
       confirm_delete_other_accounts: "Jeste li sigurni da želite obrisati ove naloge?"
+    user_fields:
+      none: "(izaberi jednu od opcija)"
     user:
       said: "{{username}}:"
       profile: "Profil"
@@ -477,11 +480,13 @@ sr:
         warnings_received: "upozorenja"
       messages:
         all: "sve"
+        archive: "Arhiviraj"
+        move_to_archive: "Arhiviraj"
       change_password:
         success: "(email je poslat)"
         in_progress: "(email se šalje)"
         error: "(greška)"
-        action: "Pošalj e-mail za povratak šifre."
+        action: "Pošalji e-mail za povratak šifre."
         set_password: "Postavi Šifru"
       change_about:
         title: "Promijeni O meni"
@@ -490,7 +495,7 @@ sr:
         taken: "Žao nam je, to je ime zauzeto."
         invalid: "Korisničko ime je nevažeće. Može sadržati samo slova i brojeve."
       change_email:
-        title: "Promijeni E-mail"
+        title: "Promeni e-mail"
         taken: "Žao nam je, taj e-mail nije dostupan"
         error: "Dogodila se greška u promeni tvog e-maila. Možda ta adresa već postoji?"
         success: "Poslali smo e-mail na tu adresu. Molimo vas sledite uputstva za potvrdu."
@@ -511,15 +516,18 @@ sr:
         instructions: "Pozadinske slike će biti centrirane i imati standardu širinu od 590px."
       email:
         title: "E-mail"
-        ok: "Poslati ćemo vam e-mail za potvrdu"
+        ok: "Poslaćemo vam e-mail za potvrdu"
         invalid: "Molimo unesite validnu e-mail adresu"
         authenticated: "E-mail vam je potvrđen od {{provider}}"
       name:
         title: "Ime"
+        instructions: "vaše ime (opciono)"
+        instructions_required: "Vaše ime"
         too_short: "Ime vam je prekratko"
         ok: "Vaše ime dobro izgleda"
       username:
         title: "Korisničko ime"
+        instructions: "jedinstveno, bez razmaka, kratko"
         short_instructions: "Ljudi vas mogu spominjati kao @{{username}}"
         available: "Vaše korisničko ime slobodno"
         not_available: "Nije dostupno. Pokušajte {{suggestion}}?"
@@ -606,6 +614,7 @@ sr:
         same_as_username: "Tvoja šifra je ista kao i tvoje korisničko ime."
         same_as_email: "Tvoja šifra je ista kao i tvoj email."
         ok: "Vaša šifra izgleda dobro."
+        instructions: "najmanje %{count} karaktera"
       summary:
         title: "Rezime"
         stats: "Statistike"
@@ -709,7 +718,10 @@ sr:
     first_post: Prva poruka
     mute: Utišaj
     unmute: Poništi utišanje
+    last_post: Pisao
     last_reply_lowercase: poslednji odgovor
+    signup_cta:
+      hidden_for_session: "OK, pitacu te sutra. Uvek mozes da koristis 'Uloguj se' da kreiras nalog."
     summary:
       enabled_description: "Gledate pregled ove teme: najzanimljivije poruke su odabrane od strane zajednice."
       enable: 'Sumirajte Ovu Temu'
@@ -729,7 +741,8 @@ sr:
     trust_level: 'Nivo poverenja'
     search_hint: 'korisničko ime, e-mail ili IP adresa'
     create_account:
-      title: "Napravi Novi Nalog"
+      disclaimer: "Registracijom prihvataš <a href='{{privacy_link}}'>pravila privatnosti</a> i <a href='{{tos_link}}'>uslove korišćenja</a>."
+      title: "Napravi novi nalog"
       failed: "Nešto nije u redu, možda je ovaj e-mail već registrovan, pokušajte s linkom za zaboravljenu šifru."
     forgot_password:
       action: "Zaboravio/la sam šifru"
@@ -748,6 +761,7 @@ sr:
       email_placeholder: "e-mail ili korisničko ime"
       caps_lock_warning: "Caps Lock vam je uključen"
       error: "Nepoznata greška"
+      rate_limit: "Molimo sačekajte pre nego pokušate opet da se prijavite."
       blank_username_or_password: "Molimo unesite e-mail ili korisničko ime i šifru."
       reset_password: 'Resetujte Šifru'
       logging_in: "Prijavljivanje..."
@@ -761,23 +775,26 @@ sr:
       resend_activation_email: "Pritisnite ovde da ponovno pošaljemo aktivacijski e-mail."
       sent_activation_email_again: "Poslali smo vam drugi aktivacijski e-mail na: <b>{{currentEmail}}</b>. Možda zatreba par minuta da stigne; svakako proverite nepoželjnu poštu."
       google:
-        title: "pomoću Google"
-        message: "Autentifikacija pomoću Google (isključite pop-up blokere)"
+        title: "pomoću Google-a"
+        message: "Autentifikacija pomoću Google-a (isključite pop-up blokere)"
       google_oauth2:
-        title: "pomoću Googlea"
+        title: "pomoću Google-a"
         message: "Autentifikacija pomoću Googlea (isključite pop-up blokere)"
       twitter:
-        title: "pomoću Twittera"
+        title: "pomoću Twitter-a"
         message: "Autentifikacija preko Twittera (isključite pop-up blokere)"
       facebook:
-        title: "pomoću Facebooka"
+        title: "pomoću Facebook-a"
         message: "Autentifikacija preko Facebooka (isključite pop-up blokere)"
       yahoo:
-        title: "pomoću Yahooa"
+        title: "pomoću Yahoo-a"
         message: "Autentifikacija preko Yahooa (isključite pop-up blokere)"
       github:
         title: "pomoću GitHuba"
         message: "Autentifikacija preko GitHuba (isključite pop-up blokere)"
+    invites:
+      welcome_to: "Dobrodošao na %{site_name}!"
+      success: "Tvoj nalog je kreiran i sada si ulogovan."
     emoji_set:
       google: "Google"
       twitter: "Twitter"
@@ -857,7 +874,6 @@ sr:
       total_flagged: "sve ukupno označenih poruka"
       alt:
         replied: "Odgovoreno"
-        private_message: "Privatna poruka od"
     upload_selector:
       title: "Dodaj sliku"
       title_with_attachments: "Dodaj sliku ili datoteku"
@@ -882,6 +898,9 @@ sr:
         topic: "Pretražite ovu temu"
       advanced:
         title: Napredna pretraga
+        post:
+          time:
+            before: pre
     go_back: 'idi nazad'
     not_logged_in_user: 'stranica korisnika sa sažetkom trenutnih aktivnosti i postavki'
     current_user: 'idi na korisničku stranicu'
@@ -894,7 +913,7 @@ sr:
         toggle: "uključi/isključi grupni odabir tema"
         actions: "Grupne aktivnosti"
         close_topics: "Zatvori Teme"
-        archive_topics: "Arhiviraj Teme"
+        archive_topics: "Arhiviraj teme"
         choose_new_category: "Izaberite novu kategoriju za vašu temu."
         selected:
           one: "Odabrali ste <b>{{count}}</b> temu."
@@ -923,6 +942,8 @@ sr:
     topic:
       create: 'Nova Tema'
       create_long: 'Otvori novu Temu'
+      archive_message:
+        title: 'Arhiviraj'
       list: 'Teme'
       new: 'nova tema'
       unread: 'nepročitano'
@@ -932,8 +953,8 @@ sr:
         other: '{{count}} nove teme'
       unread_topics:
         one: '{{count}} nepročitana tema'
-        few: '{{count}} nepročitanih tema'
-        other: '{{count}} nepročitane teme'
+        few: '{{count}} nepročitane tema'
+        other: '{{count}} nepročitanih teme'
       title: 'Tema'
       invalid_access:
         title: "Tema je privatna"
@@ -967,6 +988,7 @@ sr:
       toggle_information: "uključi/isključi detalje teme"
       read_more_in_category: "Želite da pročitate više? Pregledaj druge teme u  {{catLink}} ili {{latestLink}}."
       read_more: "Želite da pročitate više? {{catLink}} ili {{latestLink}}."
+      read_more_MF: "There { UNREAD, plural, =0 {} one { is <a href='/unread'>1 unread</a> } other { are <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Pregledaj sve kategorije
       view_latest_topics: pogledaj najnovije teme
       suggest_create_topic: Zašto ne otvorite temu?
@@ -1017,7 +1039,6 @@ sr:
         visible: "Stavi na popis"
         reset_read: "Poništi podatke o pročitanom"
         make_public: "Napravi javnu temu"
-        make_private: "Napravi privatnu poruku"
       feature:
         pin: "Zakači temu"
       reply:
@@ -1028,7 +1049,7 @@ sr:
         help: "Ukloni status zakačenog s ove teme da se vise ne pojavljuje na vrhu liste tema"
       share:
         title: 'Podeli'
-        help: 'podeli link na ovu temu'
+        help: 'podeli link ka ovoj temi'
       print:
         title: 'Štampaj'
         help: 'Otvori verziju pogodnu za štampanje'
@@ -1131,14 +1152,14 @@ sr:
       controls:
         reply: "počnite sa sastavljanjem odgovora na ovu poruku"
         like: "Lajkuj ovu poruku"
-        has_liked: "Ti si lajkovao ovu poruku"
+        has_liked: "lajkovao si ovu poruku"
         undo_like: "poništi lajk"
         edit: "izmeni ovu poruku"
         edit_anonymous: "Žao nam je, morate biti prijavljeni da bi ste izmjenili ovu poruku."
         flag: "privatno označi poruku za pozornost ili pošalji privatno obaveštenje o njoj"
         delete: "obriši ovu poruku"
         undelete: "poništi brisanje poruke"
-        share: "podeli link za ovu poruku"
+        share: "podeli link ka ovoj poruci"
         more: "Više"
         admin: "admin akcije na objavi"
         wiki: "Napravi Wiki"
@@ -1427,7 +1448,7 @@ sr:
         this_week: "Nedelja"
         today: "Danas"
         other_periods: "vidi top teme"
-    browser_update: 'Nažalost, <a href="http://www.discourse.org/faq/#browser">vaš  pretraživač je prestar da radi na ovoj stranici</a>. Molimo <a href="http://browsehappy.com"> nadogradite si pretraživač</a>'
+    browser_update: 'Nažalost, <a href="http://www.discourse.org/faq/#browser">vaš  pretraživač je previše zastareo da bi radio na ovoj stranici</a>. Molimo <a href="http://browsehappy.com"> ažurirajte ga na novu verziju </a>'
     permission_types:
       full: "Otvoriti / Odgovori / Pogledaj"
       create_post: "Odgovori / Pogledaj"
@@ -1479,7 +1500,6 @@ sr:
         title: "Zastave"
         agree: "Slažem se"
         agree_title: "Potvrdite ovu zastavu kao validnu i tačnu"
-        defer_flag_title: "Ukloni zastavu; trenutno nema potrebe za akcijom."
         delete: "Obriši"
         delete_title: "Obriši poruku na koju ova zastava referira."
         delete_post_defer_flag_title: "Obriši poruku; ako je prva, obriši temu"
@@ -1551,7 +1571,6 @@ sr:
           size: "Veličina"
         upload:
           uploading: "Učitavanje..."
-          success: "'{{filename}}' je uspešno učitano."
           error: "Dogodila se greška pri učitavanju '{{filename}}': {{message}}"
         operations:
           is_running: "Operacija je trenutno u toku..."
@@ -1746,7 +1765,7 @@ sr:
       users:
         title: 'Korisnici'
         create: 'Dodaj Administratora'
-        last_emailed: "Zadnji Email-an"
+        last_emailed: "Poslednji e-mail"
         not_found: "Žao nam je, taj korisnik ne postoji u našem sistemu."
         id_not_found: "Žao nam je, taj korisnički ID ne postoji u našem sistemu."
         active: "Aktivni"
@@ -1757,7 +1776,7 @@ sr:
           pending: "U toku"
           staff: 'Osoblje'
           suspended: 'Suspendovani'
-          suspect: 'Sumljivi'
+          suspect: 'Sumnjivi'
         approved: "Potvrđenji?"
         approved_selected:
           one: "Potvrdi korisnika"
@@ -1777,7 +1796,7 @@ sr:
           admins: 'Administratori'
           moderators: 'Moderatori'
           suspended: 'Suspendovani Korisnici'
-          suspect: 'Sumljivi Korisnici'
+          suspect: 'Sumnjivi korisnici'
         reject_successful:
           one: "Uspešno odbio %{count} koriniska."
           few: "Uspešno odbio %{count} koriniska."
@@ -1810,11 +1829,11 @@ sr:
         log_out: "Odjava"
         logged_out: "Korisnik je odjavljen sa svih uređaja"
         revoke_admin: 'Poništi Administratora'
-        grant_admin: 'Dodijeli Administratora'
+        grant_admin: 'Postavi za administratora'
         revoke_moderation: 'Poništi Moderatora'
-        grant_moderation: 'Dodijeli Moderatora'
+        grant_moderation: 'Postavi za moderatora'
         unsuspend: 'Poništi suspenziju'
-        suspend: 'Suspendiraj'
+        suspend: 'Suspenduj'
         reputation: Reputacija
         permissions: Dozvole
         activity: Aktivnost
@@ -1884,8 +1903,8 @@ sr:
           flagged_by_users: "Korisnici Koji Su Označili Zastavom"
           likes_given: "Lajkova Dato"
           likes_received: "Primljeno Lajkova"
-          likes_received_days: "Lajkova Primljeno: jedinsteni dani"
-          likes_received_users: "Lajkova Primljeno: jedinstveni korisnici"
+          likes_received_days: "Lajkova dobijeno : jedinstveni dani"
+          likes_received_users: "Lajkova dobijeno: jedinstveni korisnici"
           qualifies: "Kvalifikovao se za nivo poverenja 3."
           does_not_qualify: "Ne kvalificira se za nivo poverenja 3."
           will_be_promoted: "Uskoro će biti unapređen."
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index dba0cfdc2f..f2bcf7ae5e 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -430,7 +430,6 @@ sv:
       '14': "Väntar"
     categories:
       all: "alla kategorier"
-      all_subcategories: "alla"
       no_subcategory: "ingen"
       category: "Kategori"
       category_list: "Visa kategori-lista"
@@ -712,7 +711,6 @@ sv:
         title: "Inbjudningar"
         user: "Inbjuden Användare"
         sent: "Skickat"
-        none: "Det finns inga pågående inbjudningar att visa."
         truncated:
           one: "Visar den första inbjudningen."
           other: "Visar de första {{count}} inbjudningarna."
@@ -1070,8 +1068,6 @@ sv:
         posted: "Skrivet av"
         edited: "Redigera ditt inlägg genom"
         liked: "Gillade ditt inlägg"
-        private_message: "Privat meddelande från"
-        invited_to_private_message: "Inbjudan till ett privat meddelande från "
         invited_to_topic: "Inbjudan till ett ämne från"
         invitee_accepted: "Inbjudan accepterades av"
         moved_post: "Ditt inlägg blev flyttad av"
@@ -1084,7 +1080,6 @@ sv:
         quoted: '{{username}} citerade dig i "{{topic}}" - {{site_title}}'
         replied: '{{username}} svarade dig i "{{topic}}" - {{site_title}}'
         posted: '{{username}} skrev i "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} skickade dig ett privat meddelande i "{{topic}}" - {{site_title}}'
         linked: '{{username}} länkade till ett inlägg du gjort från "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Lägg till en bild"
@@ -1364,7 +1359,6 @@ sv:
         visible: "Markera listad"
         reset_read: "Återställ läsdata"
         make_public: "Skapa allmänt ämne"
-        make_private: "Skapa privat meddelande"
       feature:
         pin: "Klistra ämne"
         unpin: "Avklistra ämne"
@@ -2022,7 +2016,6 @@ sv:
         one: "1 utfärdad"
         other: "%{count} utfärdade"
       select_badge_for_title: Välj en utmärkelse att använda som din titel
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Komma igång
@@ -2178,7 +2171,6 @@ sv:
         title: "Flaggningar"
         agree: "Godkänn"
         agree_title: "Bekräfta att den här flaggan är giltig och korrekt"
-        defer_flag_title: "Ta bort den här flaggan; den kräver ingen åtgärd för tillfället."
         delete: "Ta bort"
         delete_title: "Ta bort inlägget som den här flaggan refererar till."
         delete_post_defer_flag_title: "Ta bort inlägg; om det är det första inlägget, ta bort ämnet"
@@ -2354,7 +2346,6 @@ sv:
           label: "Ladda upp"
           title: "Ladda upp en säkerhetskopia till denna instans"
           uploading: "Laddar upp..."
-          success: "'{{filename}}' har laddats upp."
           error: "Ett fel har uppstått vid uppladdning av '{{filename}}': {{message}}"
         operations:
           is_running: "En operation körs just nu..."
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index befa20c434..b949e17287 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -83,10 +83,10 @@ te:
       topic: 'ఈ విషయానికి ఒక లంకెను పంచండి'
       post: '#%{postNumber} టపా'
       close: 'మూసివేయి'
-      twitter: 'ట్విట్టరుపై లంకెను పంచు'
-      facebook: 'ఫేస్ బుక్ పై లంకెను పంచు'
-      google+: 'గూగుల్ ప్లస్ పై లంకెను పంచు'
-      email: 'ఈ లంకెను ఈమెయిల్ ద్వారా పంచు'
+      twitter: 'ఈ లింక్ ను ట్విట్టరు లో పంచుకొండి'
+      facebook: 'ఈ లింక్ ను ఫేస్ బుక్ లో పంచుకొండి'
+      google+: 'ఈ లింక్ ను గూగుల్ ప్లస్ లో పంచుకొండి'
+      email: 'ఈ లింక్ ను ఈమెయిల్ లో పంచుకొండి'
     topic_admin_menu: "విషయపు అధికార చర్యలు"
     emails_are_disabled: "బయటకు వెళ్లే అన్ని ఈమెయిల్లూ అధికారి నిశేధించాడు. ఇప్పుడు ఎటువంటి ఈమెయిల్ ప్రకటనలూ పంపవీలవదు."
     edit: 'ఈ విషయపు శీర్షిక మరియు వర్గం సవరించు'
@@ -229,7 +229,6 @@ te:
       '13': "ఇన్ బాక్స్"
     categories:
       all: "అన్ని వర్గాలు"
-      all_subcategories: "అన్నీ"
       no_subcategory: "ఏదీకాదు"
       category: "వర్గం"
       posts: "టపాలు"
@@ -1107,7 +1106,6 @@ te:
         title: "కేతనాలు"
         agree: "ఒప్పుకోండి"
         agree_title: "ఈ కేతనం సరైనదిగా చెప్పండి"
-        defer_flag_title: "ఈ కేతనం తొలగించు; ఇప్పుడు ఎటువంటి చర్య అవసరంలేదు."
         delete: "తొలగించు"
         delete_title: "ఈ కేతనం వర్తించే టపా తొలగించు"
         delete_post_defer_flag_title: "టపా తొలగించు; ఇదే తొలి టపా అయితే ఈ విషయాన్ని తొలగించు"
@@ -1187,7 +1185,6 @@ te:
           size: "పరిమాణం"
         upload:
           uploading: "ఎగుమతవుతోంది..."
-          success: "'{{filename}}' విజయవంతంగా ఎగుమతయింది."
           error: "'{{filename}}' ఎగుమతించుటలో దోషం: {{message}}"
         operations:
           is_running: "ఒక కార్యం ప్రస్తుతం నడుస్తోంది..."
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 694907eaff..4b4130e1ae 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -370,7 +370,6 @@ th:
       '14': "อยู่ระหว่างการพิจารณา"
     categories:
       all: "ดูทุกหมวดหมู่"
-      all_subcategories: "ทั้งหมด"
       no_subcategory: "ไม่มี"
       category: "หมวดหมู่"
       category_list: "แสดงหมวดหมู่ทั้งหมด"
@@ -615,7 +614,6 @@ th:
         title: "เชิญชวน"
         user: "เชิญชวนผู้ใช้"
         sent: "ส่ง"
-        none: "ไม่มีคำเชิญที่รออยู่ให้แสดง"
         truncated:
           other: "กำลังแสดงคำเชิญ {{count}} รายการแรก"
         redeemed: "ยืนยันการเชิญชวน"
@@ -909,8 +907,6 @@ th:
         posted: "โพสโดย"
         edited: "แก้ไขโพสของคุณโดย"
         liked: "ได้ถูกใจโพสของคุณ"
-        private_message: "ข้อความส่วนตัวจาก"
-        invited_to_private_message: "ได้รับคำเชิญเพื่อข้อความส่วนตัวจาก"
         invited_to_topic: "เชิญไปยังกระทู้จาก"
         invitee_accepted: "การเชิญได้ตอบรับโดย"
         moved_post: "โพสของคุณได้ถูกย้ายโดย"
@@ -923,7 +919,6 @@ th:
         quoted: '{{username}} อ้างอิงถึงคุณใน "{{topic}}" - {{site_title}}'
         replied: '{{username}} ตอบคุณใน "{{topic}}" - {{site_title}}'
         posted: '{{username}} โพสท์ใน "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} ส่งข้อความส่วนตัวถึงคุณใน "{{topic}}" - {{site_title}}'
         linked: '{{username}} ลิงค์โพสของคุณจาก "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "เพิ่มรูปภาพ"
@@ -1072,7 +1067,6 @@ th:
         visible: "ทำให้แสดงในรายชื่อ"
         reset_read: "ล้างข้อมูลวันที่"
         make_public: "ทำให้กระทู้เป็นสาธารณะ"
-        make_private: "ทำเป็นข้อความส่วนตัว"
       feature:
         pin: "ปักหมุดกระทู้"
         unpin: "ยกเลิกปักหมุดกระทู้"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 90631af3f3..0b5a6255f2 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -420,7 +420,6 @@ tr_TR:
       '14': "Bekleyen"
     categories:
       all: "tüm kategoriler"
-      all_subcategories: "hepsi"
       no_subcategory: "hiçbiri"
       category: "Kategori"
       category_list: "Kategori listesini göster"
@@ -497,7 +496,6 @@ tr_TR:
       disable_jump_reply: "Cevapladıktan sonra gönderime atlama"
       dynamic_favicon: "Tarayıcı simgesinde yeni / güncellenen konu sayısını göster"
       theme_default_on_all_devices: "Seçilen temayı bütün cihazlarımda varsayılan yap"
-      allow_private_messages: "Diğer kullanıcıların bana özel mesaj göndermelerine izin ver"
       external_links_in_new_tab: "Tüm dış bağlantıları yeni sekmede aç"
       enable_quoting: "Vurgulanan yazıyı alıntılayarak cevaplama özelliğini etkinleştir"
       change: "değiştir"
@@ -718,7 +716,6 @@ tr_TR:
         title: "Davetler"
         user: "Davet Edilen Kullanıcı"
         sent: "Gönderildi"
-        none: "Bekleyen davet yok."
         truncated:
           other: "İlk {{count}} davet gösteriliyor."
         redeemed: "Kabul Edilen Davetler"
@@ -1102,8 +1099,6 @@ tr_TR:
         posted: "Gönderildi, şu kişi tarafından"
         edited: "Gönderiniz düzenlendi, şu kişi tarafından"
         liked: "Gönderiniz beğenildi"
-        private_message: "Özel ileti, şu kişiden"
-        invited_to_private_message: "Şu kişi tarafından özel iletiyle davet edildiniz"
         invited_to_topic: "Bir konuya davet edildiniz, şu kişi tarafından"
         invitee_accepted: "Davet kabul edildi, şu kişi tarafından"
         moved_post: "Gönderiniz taşındı, şu kişi tarafından"
@@ -1116,7 +1111,6 @@ tr_TR:
         quoted: '{{username}}, "{{topic}}" başlıklı konuda sizden alıntı yaptı - {{site_title}}'
         replied: '{{username}}, "{{topic}}" başlıklı konuda size cevap verdi - {{site_title}}'
         posted: '{{username}}, "{{topic}}" başlıklı konuya yazdı - {{site_title}}'
-        private_message: '{{username}}, "{{topic}}" başlıklı konuda size özel ileti gönderdi - {{site_title}}'
         linked: '{{username}}, "{{topic}}" başlıklı konudaki gönderinize bağlantı yaptı - {{site_title}}'
     upload_selector:
       title: "Resim ekle"
@@ -1388,7 +1382,6 @@ tr_TR:
         visible: "Görünür Yap"
         reset_read: "Görüntüleme Verilerini Sıfırla"
         make_public: "Herkese Açık Konu Yap"
-        make_private: "Özel İleti Oluştur"
       feature:
         pin: "Başa Tuttur"
         unpin: "Baştan Kaldır"
@@ -1986,7 +1979,6 @@ tr_TR:
       granted:
         other: "%{count} izin verildi"
       select_badge_for_title: Başlık yazısı olarak kullanılacak bir rozet seçin
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Başlangıç
@@ -2142,8 +2134,6 @@ tr_TR:
         title: "Bildirilenler"
         agree: "Onayla"
         agree_title: "Bu bildirimi geçerli ve doğru olarak onayla"
-        defer_flag: "Yoksay"
-        defer_flag_title: "Bu bildirimi kaldır; şu an için bir şey yapmak gerekmiyor."
         delete: "Sil"
         delete_title: "Bu bildirimin ait olduğu gönderiyi sil."
         delete_post_defer_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil."
@@ -2328,7 +2318,6 @@ tr_TR:
           label: "Yedek Yükle"
           title: "Bu oluşuma bir yedek yükle"
           uploading: "Yükleniyor..."
-          success: "'{{filename}}' başarıyla yüklendi."
           error: "'{{filename}}': {{message}} yüklenirken bir hata oluştu"
         operations:
           is_running: "İşlem devam ediyor..."
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index d2fcdb8f6d..eec08baed0 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -281,7 +281,6 @@ uk:
       '14': "Очікують"
     categories:
       all: "всі категорії"
-      all_subcategories: "все"
       no_subcategory: "немає"
       category: "Категорія"
       reorder:
@@ -1242,7 +1241,6 @@ uk:
         upload:
           label: "Вивантажити"
           uploading: "Вивантаження..."
-          success: "'{{filename}}' has successfully been uploaded."
           error: "There has been an error while uploading '{{filename}}': {{message}}"
         operations:
           is_running: "An operation is currently running..."
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 0b2bdf21a2..21604d91b5 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -1980,7 +1980,7 @@ ur:
         one: "1 عطا کیا گیا"
         other: "%{count} عطا کیے گئے"
       select_badge_for_title: اپنے عنوان کے طور پر استعمال کرنے کے لئے ایک بیج منتخب کریں
-      none: "<none>"
+      none: "(none)"
       badge_grouping:
         getting_started:
           name: شروعات
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 7f14104b46..143b0a6fad 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -413,7 +413,6 @@ vi:
       '14': "Đang chờ xử lý"
     categories:
       all: "tất cả chuyên mục"
-      all_subcategories: "Tất cả"
       no_subcategory: "không có gì"
       category: "Chuyên mục"
       category_list: "Hiễn thị danh sách chuyên mục"
@@ -701,7 +700,6 @@ vi:
         title: "Lời mời"
         user: "User được mời"
         sent: "Đã gửi"
-        none: "Không có thư mời nào đang chờ để hiển thị"
         truncated:
           other: "Hiện {{count}} thư mời đầu tiên"
         redeemed: "Lời mời bù lại"
@@ -1039,8 +1037,6 @@ vi:
         posted: "Đăng bởi"
         edited: "Bài viết của bạn được sửa bởi"
         liked: "Bạn đã like bài viết"
-        private_message: "Tin nhắn riêng từ"
-        invited_to_private_message: "Lời mời thảo luận riêng từ"
         invited_to_topic: "Lời mời tham gia chủ đề từ"
         invitee_accepted: "Lời mời được chấp nhận bởi"
         moved_post: "Bài viết của bạn đã được di chuyển bởi"
@@ -1053,7 +1049,6 @@ vi:
         quoted: '{{username}} trích lời bạn trong "{{topic}}" - {{site_title}}'
         replied: '{{username}} trả lời cho bạn trong "{{topic}}" - {{site_title}}'
         posted: '{{username}} gửi bài trong "{{topic}}" - {{site_title}}'
-        private_message: '{{username}} đã gửi cho bạn một tin nhắn trong "{{topic}}" - {{site_title}}'
         linked: '{{username}} liên quan đến bài viết của bạn từ "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Thêm một ảnh"
@@ -1834,7 +1829,6 @@ vi:
       title: Huy hiệu
       badge_count:
         other: "%{count} huy hiệu"
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: Bắt đầu
@@ -1931,7 +1925,6 @@ vi:
         title: "Gắn cờ"
         agree: "Đồng ý"
         agree_title: "Xác nhận đánh dấu này hợp lệ và chính xác"
-        defer_flag_title: "Xóa cờ này; nó yêu cầu không có hành động nào vào thời điểm này."
         delete: "Xóa"
         delete_title: "Xóa bài viết đánh dấu này đề cập đến."
         delete_post_defer_flag_title: "Xóa bài viết; nếu là bài viết đầu tiên, xóa chủ đề này"
@@ -2038,7 +2031,6 @@ vi:
           label: "Tải lên"
           title: "Tải lên bản sao lưu cho phiên bản này"
           uploading: "Đang tải lên..."
-          success: "'{{filename}}' đã tải lên thành công."
           error: "Có lõi trong quá trình tải lên '{{filename}}': {{message}}"
         operations:
           is_running: "Tác vụ đang chạy..."
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index db4deb9195..35835966f2 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -431,7 +431,6 @@ zh_CN:
       '14': "待定"
     categories:
       all: "所有分类"
-      all_subcategories: "全部"
       no_subcategory: "无"
       category: "分类"
       category_list: "显示分类列表"
@@ -509,7 +508,6 @@ zh_CN:
       disable_jump_reply: "回复后不跳转至新帖子"
       dynamic_favicon: "在浏览器图标中显示主题更新数量"
       theme_default_on_all_devices: "将其设为我所有设备上的默认主题"
-      allow_private_messages: "允许其他用户发送私信给我"
       external_links_in_new_tab: "在新标签页打开外部链接"
       enable_quoting: "在选择文字时显示引用回复按钮"
       change: "修改"
@@ -732,7 +730,6 @@ zh_CN:
         title: "邀请"
         user: "邀请用户"
         sent: "已发送"
-        none: "没有未接受状态的邀请。"
         truncated:
           other: "只显示前 {{count}} 个邀请。"
         redeemed: "确认邀请"
@@ -1160,8 +1157,6 @@ zh_CN:
         posted: "发自"
         edited: "编辑你的帖子"
         liked: "赞了你的帖子"
-        private_message: "私信来自"
-        invited_to_private_message: "私信邀请自"
         invited_to_topic: "主题邀请自"
         invitee_accepted: "介绍邀请自"
         moved_post: "你的帖子被移动自"
@@ -1175,7 +1170,6 @@ zh_CN:
         quoted: '{{username}}在“{{topic}}”引用了你的帖子 - {{site_title}}'
         replied: '{{username}}在“{{topic}}”回复了你 - {{site_title}}'
         posted: '{{username}}在“{{topic}}”中发布了帖子 - {{site_title}}'
-        private_message: '{{username}}在“{{topic}}”中给你发送了一个私信 - {{site_title}}'
         linked: '{{username}}在“{{topic}}”中链接了你的帖子 - {{site_title}}'
     upload_selector:
       title: "插入图片"
@@ -1500,7 +1494,6 @@ zh_CN:
         visible: "取消隐藏主题"
         reset_read: "重置阅读数据"
         make_public: "设置为公共主题"
-        make_private: "设置为私信"
       feature:
         pin: "置顶主题"
         unpin: "取消置顶主题"
@@ -2142,7 +2135,6 @@ zh_CN:
       granted:
         other: "%{count} 授予"
       select_badge_for_title: 选择一个徽章作为你的头衔使用
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: 开始
@@ -2313,8 +2305,6 @@ zh_CN:
         agree_flag_restore_post_title: "恢复帖子为所有用户可见。"
         agree_flag: "确认并保持帖子"
         agree_flag_title: "确认标记并保持帖子不变。"
-        defer_flag: "忽略"
-        defer_flag_title: "移除标记；这次不处理。"
         delete: "删除"
         delete_title: "删除标记指向的帖子。"
         delete_post_defer_flag: "删除帖子并忽略标记"
@@ -2511,7 +2501,6 @@ zh_CN:
           label: "上传"
           title: "上传备份至实例"
           uploading: "上传中..."
-          success: "“{{filename}}”已成功上传。"
           error: "上传“{{filename}}”时出错：{{message}}"
         operations:
           is_running: "已有操作正在执行"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 83409b1f3e..6fd464b20e 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -397,7 +397,6 @@ zh_TW:
       '14': "等待中"
     categories:
       all: "所有分類"
-      all_subcategories: "所有"
       no_subcategory: "無"
       category: "分類"
       category_list: "顯示分類列表"
@@ -684,7 +683,6 @@ zh_TW:
         title: "邀請"
         user: "受邀請的用戶"
         sent: "送出"
-        none: "沒有未接受狀態的邀請。"
         truncated:
           other: "只顯示前 {{count}} 個邀請。"
         redeemed: "已接受的邀請"
@@ -1028,8 +1026,6 @@ zh_TW:
         posted: "發自"
         edited: "編輯你的帖子"
         liked: "讚了你的帖子"
-        private_message: "私信來自"
-        invited_to_private_message: "私信邀請自"
         invited_to_topic: "主題邀請自"
         invitee_accepted: "介紹邀請自"
         moved_post: "你的帖子被移動自"
@@ -1042,7 +1038,6 @@ zh_TW:
         quoted: '{{username}}在“{{topic}}”引用了你的帖子 - {{site_title}}'
         replied: '{{username}}在“{{topic}}”回覆了你 - {{site_title}}'
         posted: '{{username}}在“{{topic}}”中發佈了帖子 - {{site_title}}'
-        private_message: '{{username}}在“{{topic}}”中給你發送了一個私信 - {{site_title}}'
         linked: '{{username}}在“{{topic}}”中連結了你的帖子 - {{site_title}}'
     upload_selector:
       title: "加入一張圖片"
@@ -1290,7 +1285,6 @@ zh_TW:
         visible: "出現在列表上"
         reset_read: "重置讀取資料"
         make_public: "設置為公共主題"
-        make_private: "設置為私信"
       feature:
         pin: "置頂主題"
         unpin: "取消置頂主題"
@@ -1884,7 +1878,6 @@ zh_TW:
       granted:
         other: "%{count} 授予"
       select_badge_for_title: 選擇一個徽章作為你的頭銜使用
-      none: "<none>"
       badge_grouping:
         getting_started:
           name: 開始
@@ -2040,7 +2033,6 @@ zh_TW:
         title: "投訴"
         agree: "同意"
         agree_title: "確認此投訴為有效且正確"
-        defer_flag_title: "移除標記；不需處理。"
         delete: "刪除"
         delete_title: "刪除此標記文章。"
         delete_post_defer_flag_title: "刪除文章，如果刪除的是討論話題的第一則文章，討論話題也將一併刪除"
@@ -2213,7 +2205,6 @@ zh_TW:
           label: "上傳"
           title: "上傳備份"
           uploading: "上傳中..."
-          success: "'{{filename}}' 已成功被上載"
           error: "上載時發生問題： '{{filename}}': {{message}}"
         operations:
           is_running: "指令執行中..."
diff --git a/config/locales/names.yml b/config/locales/names.yml
index 6f15ab632d..60e9925014 100644
--- a/config/locales/names.yml
+++ b/config/locales/names.yml
@@ -119,9 +119,6 @@ eo:
 es:
   name: Spanish
   nativeName: Español
-es_MX:
-  name: Spanish
-  nativeName: Español (MX)
 et:
   name: Estonian
   nativeName: eesti
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index d13bba2c1e..46334a785b 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -238,7 +238,6 @@ ar:
     hot: "مواضيع نَشطة"
     top: "مواضيع مميزة"
     posts: "اخر المنشورات"
-    private_posts: "الرسائل الخاصة الآخيرة"
     group_posts: "احدث المنشورات من %{group_name} "
     group_mentions: "احدث التذكيرات من %{group_name} "
     user_posts: "احدث المنشورات من %{username} "
@@ -337,9 +336,7 @@ ar:
         topic:
           attributes:
             base:
-              warning_requires_pm: "يمكنك إرفاق التحذيرات إلى الرسائل الخاصة فقط."
               too_many_users: "يمكنك إرسال التحذيرات إلى مستخدم واحد كل مرة."
-              cant_send_pm: "نأسف، لا يمكنك إرسال رسالة خاصّة إلى هذا المستخدم."
               no_user_selected: "عليك تحديد مستخدم صالح."
             featured_link:
               invalid_category: "لا يمكن التعديل في هذا القسم"
@@ -925,7 +922,6 @@ ar:
     censored_words: "الكلمات التي ستُستبدل آليًّا ب‍ &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "نمط التّعبير النّمطيّ الذي سيُستبدل آليًّا ب‍ &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "سيتم حذف المنشورات المخفية تلقائيًا إذا زادت مدة الإخفاء أكثر من 30 يومًا"
-    default_locale: "اللغة الافتراضيّة للموقع طبقا للمعيار (ISO 639-1)"
     allow_user_locale: "اسمح للمستخدمين باختيار لغة الواجهة التي تناسبهم"
     set_locale_from_accept_language_header: "اختيار لغة الواجة للمستخدمين المتخفون طبقا للغة المختارة بمتصفح الشبكة. ( إعداد تجريبى، لا يعمل مع ذاكرة المتصفح )"
     min_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف"
@@ -1106,7 +1102,6 @@ ar:
     clean_orphan_uploads_grace_period_hours: "فترة الراحة (بالساعات) قبل الرفع الوحيد تمت إزالته."
     purge_deleted_uploads_grace_period_days: "يتم مسح فترة سماح (بالأيام) قبل تحميل حذفه."
     enable_s3_uploads: "وضع الإضافات على تخزين الأمازون S3. هام: يتطلب اعتماد S3 صالحة (على حد سواء الوصول معرف مفتاح ومفتاح الوصول السري)."
-    s3_use_iam_profile: 'إستعمل وظيفة AWS EC2 IAM لإسترجاع المفاتيح. ملاحظة : التمكين سوف يتجاوز " مفتاح معرف الوصول ل s3 " و "مفتاح الوصول السري ل s3" الإعدادات.'
     s3_upload_bucket: "اسم حزمة Amazon S3 التي سيتم تحميل الملفات إليها. تحذير : يجب أن تكون أحرف صغيرة، لا تحوي مسافات، ولا _."
     s3_access_key_id: "معرف مفتاح دخول امازون S3 سيستخدم لرفع الصور."
     s3_secret_access_key: "مفتاح دخول أمازون السري S3 سيستخدم لرفع الصور."
@@ -1137,7 +1132,6 @@ ar:
     min_trust_to_edit_wiki_post: "أدنى مستوى ثقة مطلوب لتحرير مشاركة ويكي."
     min_trust_to_edit_post: "أدنى مستوى ثقة مطلوب لتحرير المشاركات."
     min_trust_to_allow_self_wiki: "أدنى مستوى ثقة مطلوب ليستطيع المستخدم جعل مشاركاته ويكي."
-    min_trust_to_send_messages: "أدنى مستوى ثقة مطلوب لإنشاء رسائل خاصّة جديدة."
     newuser_max_links: "عدد الروابط التي يمكن للمستخدم الجديد إضافتها للمشاركة."
     newuser_max_images: "عدد الصّور التي يمكن للمستخدم الجديد إضافتها للمشاركة."
     newuser_max_attachments: "عدد المرفقات التي يمكن للمستخدم الجديد إضافتها للمشاركة."
@@ -2008,7 +2002,6 @@ ar:
     badge_title_metadata: "%{display_name} شاره على %{site_title}"
   admin_login:
     success: "البريد أُرسل"
-    error: "خطأ!"
     email_input: "مدير البريد الإيكتروني"
     submit_button: "أرسل البريد الإلكتروني"
   performance_report:
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 398c41d45f..c56485b2c9 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -116,7 +116,6 @@ bs_BA:
         topic:
           attributes:
             base:
-              warning_requires_pm: "You can only attach warnings to private messages."
               too_many_users: "You can only send warnings to one user at a time."
         user:
           attributes:
@@ -356,7 +355,6 @@ bs_BA:
   site_settings:
     censored_words: "Words that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days."
-    default_locale: "The default language of this Discourse instance (ISO 639-1 Code)"
     allow_user_locale: "Allow users to choose their own language interface preference"
     min_post_length: "Minimum allowed post length in characters"
     min_private_message_post_length: "Minimum allowed post length in characters for private messages"
@@ -470,7 +468,6 @@ bs_BA:
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
-    s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods."
     s3_access_key_id: "The Amazon S3 access key id that will be used to upload images."
     s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images."
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 3339523174..21a6465faf 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -188,8 +188,9 @@ ca:
     latest: "Darrers temes"
     hot: "Temes d'interès"
     top: "Principals temes"
+    top_yearly: "Temes més actius anualment"
+    top_monthly: "Temes més actius mensualment"
     posts: "Darreres publicacions"
-    private_posts: "Darrers missatges privats"
     group_posts: "Darreres publicacions de %{group_name}"
     group_mentions: "Darreres mencions de %{group_name}"
     user_posts: "Darreres publicacions segons @%{username}"
@@ -270,12 +271,6 @@ ca:
       Disculpa, però les noves persones usuàries estan temporalment limitades a %{newuser_max_replies_per_topic} respostes al mateix tema.
 
       En comptes d'afegir-hi una altra resposta, si us plau, considera l'edició de les teves respostes d'abans o fes una visita a altres temes.
-    reviving_old_topic: |
-      ### Reviu aquest tema?
-
-      Fa **%{days}** de la darrera resposta a aquest tema. La teva resposta llençarà el tema a la part superior de la llista i ho notificarà a tota persona que hi participi.
-
-      Segur que vols continuar amb aquesta conversa antiga?
   activerecord:
     attributes:
       category:
@@ -292,9 +287,7 @@ ca:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Només pots adjuntar avisos a missatges privats."
               too_many_users: "Només pots enviar missatges a una persona usuària d'un sol cop."
-              cant_send_pm: "Disculpa, no pots enviar a un missatge privat a aquesta persona usuària."
               no_user_selected: "Has de triar una persona usuària vàlida."
             featured_link:
               invalid: "no és vàlid. La URL hauria d'incloure http:// o https://."
@@ -786,7 +779,6 @@ ca:
     censored_words: "Paraules que es reemplaçaran automàticament amb  &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Patró d'expressió regular que serà reemplaçat automàticament amb  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Esborra automàticament qualsevol publicació que resten oculta durant més de 30 dies."
-    default_locale: "La llengua per defecte d'aquesta instància Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permet que les persones usuàries triïn la seva preferència de llengua d'interfície"
     set_locale_from_accept_language_header: "configura la llengua d'interfície per a persones anònimes des dels encapçalaments dels seus navegadors. (EXPERIMENTAL, no funciona amb memòria cau anònima)"
     min_post_length: "Mínim permès en caràcters per a l'extensió de publicacions "
@@ -976,7 +968,6 @@ ca:
     clean_orphan_uploads_grace_period_hours: "Període de gràcia (en hores) abans d'eliminar una càrrega òrfena. "
     purge_deleted_uploads_grace_period_days: "Període de gràcia (en dies) abans d'esborrar una càrrega eliminada."
     enable_s3_uploads: "Emmagatzema les càrregues a un servei Amazon S3. IMPORTANT: calen credencials vàlides S3 (tant l'id de clau d'accés & com la clau secreta d'accés)."
-    s3_use_iam_profile: 'Fes servir el rol AWS EC2 IAM per recuperar claus. NOTA: activar això anul·larà les configuracions "s3 access key id" i "s3 secret access key" settings.'
     s3_upload_bucket: "El nom del dipòsit Amazon S3 on es carregaran els fitxers. ATENCIÓ: ha de ser en minúscula, sense comes, ni guions."
     s3_access_key_id: "La clau d'accés a Amazon S3 que es farà servir per carregar imatges."
     s3_secret_access_key: "La clau secreta d'accés a Amazon S3 que es farà servir per carregar imatges."
@@ -1019,7 +1010,6 @@ ca:
     min_trust_to_edit_wiki_post: "Nivell de confiança mínim necessari per editar una publicació marcada com a wiki."
     min_trust_to_edit_post: "Nivell de confiança mínim necessari per editar publicacions."
     min_trust_to_allow_self_wiki: "Nivell de confiança mínim per fer-ne wiki de la pròpia publicació personal."
-    min_trust_to_send_messages: "Nivell de confiança mínim necessari per crear nous missatges privats."
     newuser_max_links: "Quants enllaços pot afegir una persona a una publicació."
     newuser_max_images: "Quantes imatges pot afegir una persona a una publicació."
     newuser_max_attachments: "Quants adjunts pot afegir una persona a una publicació"
@@ -1186,7 +1176,6 @@ ca:
     approve_post_count: "Cal aprovar la quantitat de publicacions d'una persona usuària nova o bàsica"
     approve_unless_trust_level: "Cal aprovar les publicacions per a persones usuàries amb aquest nivell de confiança"
     approve_new_topics_unless_trust_level: "Cal aprovar els nous temes per a persones amb aquest nivell de confiança"
-    notify_about_queued_posts_after: "Si hi ha publicacions que han estat esperant la revisió durant més d'aquesta quantitat d'hores, s'enviarà un correu a contact_email. Deixa-ho a 0 per inhabilitar aquests correus."
     auto_close_messages_post_count: "Quantitat màxima de publicacions permeses a un missatge abans no es tanqui automàticament (a 0 per desactivar)"
     auto_close_topics_post_count: "Quantitat màxima de publicacions permeses a un tema abans no es tanqui automàticament (a 0 per desactivar)"
     code_formatting_style: "El botó de codi al compositor serà per defecte d'aquest estil de format de codi"
@@ -1626,6 +1615,9 @@ ca:
         S'ha informat d'alguns problemes al teu tauler de control d'administració.
 
         [Si us plau, revisa'ls i soluciona'ls](%{base_url}/admin).
+    new_user_of_the_month:
+      title: "Ets la Nova Usuària del Mes!"
+      subject_template: "Ets la Nova Usuària del Mes!"
   unsubscribe_link: |
     Per cancel·lar la subscripció d'aquests correus, [clica aquí](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -1874,141 +1866,6 @@ ca:
     title: "Guies/Preguntes frqüents"
   tos_topic:
     title: "Condicions del Servei"
-    body: |
-      The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
-
-      Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
-
-      <a name="1"></a>
-
-      ## [1. Your %{company_domain} Account](#1)
-
-      If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
-
-      <a name="2"></a>
-
-      ## [2. Responsibility of Contributors](#2)
-
-      If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
-
-      *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
-      *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
-      *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
-      *   the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
-      *   the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
-      *   the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;
-      *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
-      *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
-      *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
-
-      <a name="3"></a>
-
-      ## [3. User Content License](#3)
-
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
-
-
-      <a name="4"></a>
-
-      ## [4. Payment and Renewal](#4)
-
-      ### General Terms
-
-      Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
-
-      ### Automatic Renewal
-
-      Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
-
-      <a name="5"></a>
-
-      ## [5. Services](#5)
-
-      ### Hosting, Support Services
-
-      Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
-
-      <a name="6"></a>
-
-      ## [6. Responsibility of Website Visitors](#6)
-
-      %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
-
-      <a name="7"></a>
-
-      ## [7. Content Posted on Other Websites](#7)
-
-      We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
-
-      <a name="8"></a>
-
-      ## [8. Copyright Infringement and DMCA Policy](#8)
-
-      As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Intellectual Property](#9)
-
-      This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
-
-      <a name="10"></a>
-
-      ## [10. Advertisements](#10)
-
-      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
-
-      <a name="11"></a>
-
-      ## [11. Attribution](#11)
-
-      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
-
-      <a name="12"></a>
-
-      ## [12. Changes](#12)
-
-      %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
-
-      <a name="13"></a>
-
-      ## [13. Termination](#13)
-
-      %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-
-      <a name="14"></a>
-
-      ## [14. Disclaimer of Warranties](#14)
-
-      The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
-
-      <a name="15"></a>
-
-      ## [15. Limitation of Liability](#15)
-
-      In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
-
-      <a name="16"></a>
-
-      ## [16. General Representation and Warranty](#16)
-
-      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
-
-      <a name="17"></a>
-
-      ## [17. Indemnification](#17)
-
-      You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
-
-      <a name="18"></a>
-
-      ## [18. Miscellaneous](#18)
-
-      This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
-
-      This document is CC-BY-SA. It was last updated May 31, 2013.
-
-      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Política de Privacitat"
   badges:
@@ -2220,9 +2077,10 @@ ca:
       name: Primera resposta per correu
       long_description: |
         Aquesta distinció es concedeix el primer cop que respons una publicació per correu :e-mail:.
+    new_user_of_the_month:
+      name: "Nova Usuària del Mes"
   admin_login:
     success: "Correu enviat"
-    error: "Error!"
     email_input: "Administrar correu"
     submit_button: "Enviar correu"
   performance_report:
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 09ff573a3a..cd757daaa3 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -101,6 +101,8 @@ cs:
       default_categories_already_selected: "Nemůžeš vybrat kategorii používanou v jiném seznamu."
   invite:
     user_exists: "Netřeba posílat pozvánku na <b>%{email}</b>. Tento email <a href='/u/%{username}/summary'>je veden u tohoto účtu!</a>"
+  bulk_invite:
+    file_should_be_csv: "Nahraný soubor by měl být ve formátu csv."
   backup:
     operation_already_running: "Právě probíhá operace %{operation}. V tuto chvíli nelze zahájit novou operaci %{operation}."
     backup_file_should_be_tar_gz: "Záloha by měla být archiv s příponou .tar.gz."
@@ -130,10 +132,15 @@ cs:
       few: "%{count} reakce"
       other: "%{count} reakcí"
   no_mentions_allowed: "Bohužel, nemůžete zmiňovat ostatní uživatele."
+  too_many_mentions:
+    one: "Bohužel, můžete zmínit jen jednoho uživatele v jednom příspěvku."
+    few: "Bohužel, můžete zmínit jen %{count} uživatele v jednom příspěvku."
+    other: "Bohužel, můžete zmínit jen %{count} uživatelů v jednom příspěvku."
   no_mentions_allowed_newuser: "Bohužel, noví uživatelé nemohou zmiňovat ostatní uživatele."
   no_images_allowed: "Bohužel, noví uživatelé nemohou vkládat obrázky do příspěvků."
   no_attachments_allowed: "Bohužel, noví uživatelé nemohou do příspěvků vkládat přílohy."
   no_links_allowed: "Bohužel, noví uživatelé nemohou vkládat odkazy do příspěvků."
+  contains_blocked_words: "Tvůj příspěvek obsahuje slova, která nejsou povolena."
   spamming_host: "Bohužel, na tento server nemůžete odkazovat."
   user_is_suspended: "Vyloučení uživatelé nemohou přidávat příspěvky."
   not_accepting_pms: "Bohužel, %{username} v současnosti nepřijímá zprávy."
@@ -154,6 +161,7 @@ cs:
   rss_description:
     latest: "Poslední témata"
     hot: "Populární témata"
+    top: "Nejlepší témata"
     posts: "Poslední příspěveky"
     group_posts: "Poslední příspěvky z @{group_name}"
     user_posts: "Poslední příspěvky od @{username}"
@@ -178,6 +186,16 @@ cs:
       one: "příspěvek"
       few: "%{count} příspěvky"
       other: "%{count} příspěvků"
+    new-topic: |
+      Vítej na %{site_name} &mdash; **díky za nový příspěvek!**
+
+      - Zní název zajímavě, když si jej přečteš nahlas? Je to dobré shrnutí daného tématu?
+
+      - Koho by to mohlo zajímat? Proč na tom záleží? Jaké typy odpovědí očekáváš?
+
+      - Používej ve svém tématu klíčová slova, aby jej ostatní mohli *najít*. Pro zařažení svého tématu pro něj vyber kategorii.
+
+      Více se dozvíš v [pravidlech komunity](/guidelines). Tenhle panel se zobrazí pouze pro vaše první %{education_posts_text}.
     new-reply: |
       Vítejte na %{site_name} &mdash; **díky za přispívání!**
 
@@ -203,9 +221,7 @@ cs:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Varování můžete přidat pouze k soukromým zprávám."
               too_many_users: "Varování můžete najednou poslat pouze jednomu uživateli."
-              cant_send_pm: "Bohužel, tomuto uživateli nemůžete poslat soukromou zprávu."
               no_user_selected: "Musíte vybrat platného uživatele."
         user:
           attributes:
@@ -260,6 +276,9 @@ cs:
       title: "základní uživatel"
     member:
       title: "člen"
+  post:
+    image_placeholder:
+      broken: "Tento obrázek je rozbitý"
   rate_limiter:
     too_many_requests: "Děláte tuto akci příliš často. Prosím počkejte %{time_left} a zkuste to znovu."
     by_type:
@@ -370,6 +389,7 @@ cs:
         few: "téměř před %{count} roky"
         other: "téměř před %{count} roky"
   password_reset:
+    choose_new: "Vyber si nové heslo"
     choose: "Vybrat heslo"
     update: 'změnit heslo'
     save: 'Nastavit heslo'
@@ -381,6 +401,7 @@ cs:
     please_continue: "Pokračovat na %{site_name}"
     error: "Nastala chyba běhěm změny emailové adresy. Není nová adresa již někým používána?"
   activation:
+    action: "Klikni sem pro aktivaci svého účtu"
     already_done: "Bohužel, tento odkaz pro aktivaci účtu již není platný. Není váš účet jíž aktivní?"
     please_continue: "Váš účet je aktivovaný; budete přesměrování na výchozí stránku."
     continue_button: "Pokračovat na %{site_name}"
@@ -390,6 +411,7 @@ cs:
     off_topic:
       title: 'Off-Topic'
       description: 'Tento příspěvek se nevztahuje k diskuzi definované názvem a obsahem prvního příspěvku a měl by asi být přesunut jinam.'
+      short_description: 'Není relevantní k diskuzi'
       long_form: 'označil příspěvek jako off-topic'
     spam:
       title: 'Spam'
@@ -400,6 +422,7 @@ cs:
       title: 'Nevhodné'
       long_form: 'nahlášeno jako nevhodné'
     notify_user:
+      title: 'Poslat @{{username}} zprávu'
       long_form: 'obeslaný uživatel'
       email_title: 'Váš příspěvek v „%{title}“'
       email_body: "%{link}\\\n\\\n%{message}\n"
@@ -409,18 +432,25 @@ cs:
     bookmark:
       title: 'Záložka'
       description: 'Přidat záložku k tomuto příspěvku'
+      short_description: 'Přidat záložku k tomuto příspěvku'
       long_form: 'přidal záložku k tomuto příspěvku'
     like:
       title: 'To se mi líbí'
       description: 'Tento příspěvek se mi líbí'
+      short_description: 'Tento příspěvek se mi líbí'
       long_form: 'se líbí'
     vote:
       title: 'Hlasovat'
       description: 'Hlasujte pro tento příspěvek'
+      short_description: 'Hlasujte pro tento příspěvek'
       long_form: 'hlasoval pro tento příspěvek'
   user_activity:
     no_bookmarks:
       others: "Žádné záložky."
+    no_likes_given:
+      self: "Zatím se ti nelíbil žádný příspěvek."
+    no_replies:
+      others: "Žádné odpovědi."
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -448,6 +478,7 @@ cs:
     title: "Odhlášení"
     stop_watching_topic: "Přestat sledovat toto téma, %{link}"
     disable_digest_emails: "Zrušit zasílání souhrnných emailů"
+    log_out: "Odhlásit se"
   user_api_key:
     scopes:
       session_info: "Číst user session info"
@@ -594,7 +625,6 @@ cs:
     github_config_warning: 'Server je nakonfigurován, aby povoloval registraci a přihlášení přes GitHub (enable_github_logins), ale nejsou nastaveny hodnoty "client id" a "secret". Navštivte <a href="/admin/site_settings">nastevení webu</a> a opravte nastavení. <a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide" target="_blank">Pro více informací si přečtěte tento návod</a>.'
     image_magick_warning: 'Server je nakonfigurován, aby vytvářel náhledy velkých obrázků, ale není nainstalován ImageMagick. Nainstalujte ImageMagick pomocí vašeho oblíbeného balíčkovače, nebo navštivte <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">web ImageMagick pro stažení aktuální verze</a>.'
   site_settings:
-    default_locale: "Výchozí jazyk této Discourse instance (kód ve formátu ISO 639-1)"
     allow_user_locale: "Povolit uživatelům nastavit si jazyk fóra"
     min_search_term_length: "Minimální délka hledaného výrazu ve znacích"
     allow_duplicate_topic_titles: "Povolit témata se stejným, duplicitním názvem"
@@ -793,7 +823,6 @@ cs:
       name: Obdivovaný
   admin_login:
     success: "E-mail odeslán"
-    error: "Chyba!"
     submit_button: "Odeslat e-mail"
   wizard:
     step:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 0d279ca0e4..59a8da7edb 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -174,6 +174,7 @@ da:
   user_is_suspended: "Suspenderede brugere tilllades ikke at oprette indlæg."
   topic_not_found: "Der er gået noget galt. Måske er emnet blevet lukket eller slettet mens du kiggede på det?"
   not_accepting_pms: "Beklager, %{username} tager ikke imod beskeder i øjeblikket."
+  max_pm_recepients: "Du kan desværre kun sende til %{recipients_limit} modtagere."
   just_posted_that: "ligner et andet indlæg, som du har skrevet for nyligt, for meget"
   invalid_characters: "indeholder ugyldige tegn"
   is_invalid: "lader til at være uklart - er det en komplet sætning?"
@@ -200,7 +201,7 @@ da:
     top_weekly: "Top-emner per uge"
     top_daily: "Top-emner per dag"
     posts: "Seneste indlæg"
-    private_posts: "Seneste private beskeder"
+    private_posts: "Seneste personlige beskeder"
     group_posts: "Seneste indlæg fra %{group_name}"
     group_mentions: "Seneste nævnelser fra %{group_name}"
     user_posts: "Seneste indlæg af @%{username}"
@@ -292,12 +293,6 @@ da:
       Beklager, men nye brugere er begrænset til %{newuser_max_replies_per_topic} svar inden for samme emne.
 
       I stedet for at tilføje endnu et svar, bør du overveje at redigere et af dine eksisterende svar eller at besøge andre emner.
-    reviving_old_topic: |
-      ### Genopliv dette emne?
-
-      Det seneste svar på dette emne er nu over **%{days}** gammelt. Dit svar vil trække dette emne til toppen af listen og vil påminde alle der tidligere have været med i samtalen.
-
-      Er du sikker på du vil vække dette emne til live igen?
   activerecord:
     attributes:
       category:
@@ -314,10 +309,9 @@ da:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Du kan kun vedhæfte advarsler til private beskeder."
               too_many_users: "Du kan kun sende advarsler til en bruger ad gangen."
-              cant_send_pm: "Beklager, du kan ikke sende en privat besked til den bruger."
               no_user_selected: "Du skal vælge en gyldig bruger."
+              reply_by_email_disabled: "Svar via email er slået fra"
             featured_link:
               invalid: "er ugyldig. URL'en skal indeholde http:// eller https://. "
               invalid_category: "kan ikke redigeres i denne kategori."
@@ -821,7 +815,6 @@ da:
     censored_words: "Ord der automatisk vil blive erstattet med &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Regex-mønster som automatisk vil blive erstattet med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Slet automatisk skjulte indlæg der forbliver skjulte i mere end 30 dage."
-    default_locale: "Standardsproget for denne Discourse-instans (ISO 639-1 kode)."
     allow_user_locale: "Tillad brugere at vælge egne sprog præferencer på site"
     set_locale_from_accept_language_header: "set interface language for anonymous users from their web browser's language headers. (EXPERIMENTAL, does not work with anonymous cache)"
     min_post_length: "Minimumlængde tilladt for indlæg i tegn"
@@ -1609,7 +1602,6 @@ da:
         Dette emblem gives første gang du svarer til et indlæg via email  :e-mail:.
   admin_login:
     success: "Email sendt"
-    error: "Fejl!"
     email_input: "Admin email"
     submit_button: "Send email"
   performance_report:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 5c224a24ee..2fa6cc8568 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -130,6 +130,7 @@ de:
     backup_file_should_be_tar_gz: "Die Sicherungsdatei sollte ein .tar.gz-Archiv sein."
     not_enough_space_on_disk: "Es gibt nicht genügend freien Festplattenspeicher, um dieses Backup hochzuladen."
     invalid_filename: "Der Dateiname für das Backup enthält ungültige Zeichen. Gültig sind: a-z 0-9 . - _."
+  invalid_params: "Du hast bei der Anfrage ungültige Parameter angegeben: %{message}"
   not_logged_in: "Dazu musst du angemeldet sein."
   not_found: "Die angeforderte URL oder Ressource konnte nicht gefunden werden."
   invalid_access: "Du hast nicht die Erlaubnis, die angeforderte Ressource zu betrachten."
@@ -210,7 +211,6 @@ de:
     top_weekly: "Top-Themen der letzten Woche"
     top_daily: "Top-Themen der letzten 24 Stunden"
     posts: "Letzte Beiträge"
-    private_posts: "Neueste private Nachricht"
     group_posts: "Letzte Beiträge von %(Gruppen_name)"
     group_mentions: "Neueste Nennungen von %{group_name}"
     user_posts: "Neueste Beiträge von @%{username}"
@@ -306,12 +306,6 @@ de:
       Entschuldige, aber neue Benutzer sind vorübergehend auf %{newuser_max_replies_per_topic} Antworten im gleichen Thema beschränkt.
 
       Anstatt eine weitere Antwort hinzuzufügen, denke darüber nach, deine vorherigen Antworten zu bearbeiten oder andere Themen zu besuchen.
-    reviving_old_topic: |
-      ### Dieses Thema neu beleben?
-
-      Die letzte Antwort auf dieses Thema war vor **%{days}** Tagen. Deine Antwort wird das Thema wieder ans obere Ende der Liste befördern und jeden benachrichtigen, der zuvor in der Unterhaltung beteiligt war.
-
-      Bist du sicher, dass du diese alte Unterhaltung fortsetzen möchtest?
   activerecord:
     attributes:
       category:
@@ -328,9 +322,7 @@ de:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Du kannst eine Warnung nur an eine Nachricht zugleich anhängen."
               too_many_users: "Du kannst eine Warnung nur an einen Benutzer zugleich anhängen."
-              cant_send_pm: "Entschuldigung, du kannst diesem Benutzer keine Direktnachricht schicken."
               no_user_selected: "Du musst einen gültigen Benutzer auswählen."
               reply_by_email_disabled: "Antwort per E-Mail ist deaktiviert."
             featured_link:
@@ -346,6 +338,10 @@ de:
               unique_characters: "hat zu viele sich wiederholende Zeichen. Bitte verwende ein sichereres Passwort."
             ip_address:
               signup_not_allowed: "Eine Registrierung ist von diesem Konto nicht erlaubt."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Eine primäre E-Mail Adresse einem weiteren Benutzer zuzuordnen ist nicht erlaubt."
         color_scheme_color:
           attributes:
             hex:
@@ -873,7 +869,6 @@ de:
     censored_words: "Wörter, die automatisch durch &#9632;&#9632;&#9632;&#9632; ersetzt werden"
     censored_pattern: "Regex-Muster das automatisch ersetzt wird mit &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatisch alle Beiträge löschen, die länger als 30 Tage versteckt bleiben."
-    default_locale: "Die Standardsprache dieser Discourse-Instanz (kodiert in ISO 639-1)."
     allow_user_locale: "Erlaube Benutzern, ihre eigene Oberflächensprache zu wählen"
     set_locale_from_accept_language_header: "Sprache der Benutzeroberfläche für anonyme Benutzer an Hand der Spracheinstellung ihres Browsers wählen (EXPERIMENTELL, funktioniert nicht mit Caches für anonyme Benutzer)"
     min_post_length: "Minimal zulässige Beitragslänge in Zeichen."
@@ -933,7 +928,7 @@ de:
     email_custom_headers: "Eine durch senkrechte Striche getrennte Liste von eigenen E-Mail Headerzeilen"
     email_subject: "Format der Betreffzeile in Standard-E-Mails. Siehe https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     force_https: "Erzwinge HTTPS für deine Site. ACHTUNG: Aktiviere dies nicht, bevor HTTPS nicht vollständig eingerichtet ist und auf jeden Fall überall funktioniert! Hast du alle CDN-Netzwerke, alle Logins über Soziale Netzwerke, alle externe Logos / Abhängigkeiten geprüft, um sicherzustellen, dass sie auch alle HTTPS-kompatibel sind?"
-    same_site_cookies: "Verwende Same-Site-Cookies, die alle Angriffsszenarien für Cross-Site-Request-Forgery in unterstützten Browsern (lax oder strict). Warnung: Strict wird nur auf Seiten funktionieren, die Login erzwingen und SSO verwenden."
+    same_site_cookies: "Verwende Same-Site-Cookies, die alle Angriffsszenarien für Cross-Site-Request-Forgery in unterstützten Browsern verhindern. Warnung: Strikt wird nur auf Seiten funktionieren, die Login erzwingen und SSO verwenden."
     summary_score_threshold: "Mindestpunktzahl, die ein Beitrag benötigt, um in der \"Thema zusammenfassen\"-Ansicht zu erscheinen."
     summary_posts_required: "Mindestanzahl an Beiträgen in einem Thema, bevor die \"Thema zusammenfassen\"-Funktion aktiviert wird."
     summary_likes_required: "Mindestanzahl an Likes in einem Thema, bevor die \"Thema zusammenfassen\" Funktion aktiviert wird."
@@ -1091,7 +1086,6 @@ de:
     purge_deleted_uploads_grace_period_days: "Schonfrist (in Tagen), bevor ein entfernter Upload endgültig gelöscht wird."
     purge_unactivated_users_grace_period_days: "Frist (in Tagen), bevor ein Benutzer gelöscht wird, der sein Konto nicht aktiviert hat. Setze sie auf 0, um nicht aktivierte Benutzer nie zu bereinigen."
     enable_s3_uploads: "Speichere hochgeladene Dateien auf Amazon S3. WICHTIG: benötigt gültige S3 Anmeldedaten (sowohl access_key_id als auch secret_access_key)."
-    s3_use_iam_profile: 'Benutze die AWS EC2 IAM Rolle zum Abrufen von Keys. ANMERKUNG: Das Aktivieren überschreibt die Einstellungen „s3 access key id“ und „s3 secret access key“.'
     s3_upload_bucket: "Der Name des Amazon S3 Buckets, in dem hochgeladene Dateien gespeichert werden sollen. ACHTUNG: nur Kleinbuchstaben, keine Punkte, keine Unterstriche."
     s3_access_key_id: "The Amazon S3 access key id that will be used to upload images"
     s3_secret_access_key: "Der geheime Schlüssel von Amazon S3 welcher für das Hochladen verwendet wird"
@@ -1137,8 +1131,6 @@ de:
     min_trust_to_edit_wiki_post: "Die minimal benötigte Vertrauensstufe, um als Wiki markierte Beiträge bearbeiten zu können."
     min_trust_to_edit_post: "Die minimal benötigte Vertrauensstufe, um Beiträge bearbeiten zu können."
     min_trust_to_allow_self_wiki: "Die minimale Vertrauensstufe, die ein Benutzer haben muss, um einen eigenen Wiki Eintrag zu erstellen."
-    min_trust_to_send_messages: "Benötigte Vertrauensstufe um neue private Nachrichten erstellen zu dürfen."
-    min_trust_to_send_email_messages: "Mindestvertrauensstufe, die nötig ist, um neue private Nachrichten per E-Mail (an vorbereitete Benutzer) zu schicken."
     newuser_max_links: "Maximale Anzahl der Links, die neue Benutzer Beiträgen hinzufügen dürfen."
     newuser_max_images: "Maximale Anzahl der Bilder, die neue Benutzer Beiträgen hinzufügen dürfen."
     newuser_max_attachments: "Maximale Anzahl der Dateien, die neue Benutzer Beiträgen hinzufügen dürfen."
@@ -1206,7 +1198,6 @@ de:
     reply_by_email_enabled: "Aktviere das Antworten auf Themen via E-Mail."
     reply_by_email_address: "Vorlage für die Antwort einer per E-Mail eingehender E-Mail-Adresse, zum Beispiel: %{reply_key}@reply.example.com oder replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste alternativer Vorlagen für eingehende E-Mail-Adressen für das Antworten per E-Mail. Beispiel: %{reply_key}@antwort.example.com|antworten+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Verwende das HTML statt dem Text für eingehende E-Mails."
     disable_emails: "Discourse daran hindern jegliche E-Mails zu verschicken"
     strip_images_from_short_emails: "Entferne Bilder aus E-Mails kleiner als 2800 Bytes."
     short_email_length: "Kurze E-Mail-Länge in Bytes"
@@ -1311,7 +1302,6 @@ de:
     allowed_href_schemes: "URI-Schemas, die in Links zusätzlich zu http und https erlaubt sind."
     embed_post_limit: "Maximale Anzahl der Beiträge die eingebettet werden."
     embed_username_required: "Der Benutzername ist für die Themenerstellung notwendig"
-    notify_about_flags_after: "Wenn es Meldungen gibt, die nicht innerhalb der angegebenen Anzahl von Stunden behandelt wurden, sende eine Nachricht an das Team. Ein Wert von 0 deaktiviert die Funktion."
     show_create_topics_notice: "Administratoren eine Warnmeldung anzeigen, wenn im Forum weniger als 5 öffentlich sichtbare Themen existieren."
     delete_drafts_older_than_n_days: Lösche Entwürfe, die mehr als (n) Tage alt sind.
     bootstrap_mode_min_users: "Erforderliche Benutzeranzahl, um den Starthilfe-Modus zu deaktivieren (0 = ausgeschaltet)"
@@ -1323,7 +1313,6 @@ de:
     approve_post_count: "Anzahl der Beiträge eines neuen Benutzer oder Anwärters, die genehmigt werden müssen"
     approve_unless_trust_level: "Beiträge von Benutzer unterhalb dieser Vertrauensstufe müssen genehmigt werden"
     approve_new_topics_unless_trust_level: "Beiträge von Benutzer unterhalb dieser Vertrauensstufe müssen genehmigt werden"
-    notify_about_queued_posts_after: "Wenn es Beiträge gibt, die länger als diese Anzahl von Stunden auf ihre Überprüfung gewartet haben, sende eine E-Mail an contact_email. Setze sie auf 0, um diese E-Mails zu deaktivieren."
     auto_close_messages_post_count: "Maximale Anzahl von Beiträgen, die in einer Nachricht erlaubt sind, bevor sie automatisch geschlossen wird (0 = ausgeschaltet)"
     auto_close_topics_post_count: "Maximale Anzahl von Beiträgen, die in einem Thema erlaubt sind, bevor es automatisch geschlossen wird (0 = ausgeschaltet)"
     code_formatting_style: "Code-Schaltfläche im Editor wird standardmäßig diesen Formatierungsstil anwenden"
@@ -2664,143 +2653,6 @@ de:
       Ja, die rechtliche Seite ist langweilig, aber wir müssen uns selbst schützen &ndash; und im erweiterten Sinne auch dich und deine Daten &ndash; vor unfreundlichen Leuten. Wir haben [Nutzungsbedingungen](/tos), die deines (und unser) Verhalten und unsere Rechte bezüglich des Inhalts, der Privatsphäre und den Gesetzen beschreiben. Um diesen Dienst zu nutzen, musst du dich mit unseren [Nutzungsbedingungen](/tos) einverstanden erklären.
   tos_topic:
     title: "Nutzungsbedingungen"
-    body: |
-      Die folgenden Geschäftsbedingungen sind maßgebend für die gesamte %{company_domain} Webseite und aller Inhalte, Dienstleistungen und Produkte, die auf oder über die Webseite zur Verfügung gestellt werden, einschließlich, aber nicht beschränkt auf die %{company_domain} Foren-Software, die %{company_domain} Support-Foren und den %{company_domain} Hosting-Dienst ("Hosting"), (zusammengefasst: die „Webseite“). Die Webseite gehört und wird betrieben von %{company_full_name} („%{company_name}“). Die Website wird angeboten vorbehaltlich der uneingeschränkten Zustimmung aller hierin enthaltenen Bedingungen und aller anderen sonstigen betrieblichen Regeln, Richtlinien (einschließlich, ohne Einschränkung, der [Datenschutzrichtlinien](/privacy) and [Community-Richtlinien](/faq)) von %{company_domain} und Verfahren, die von Zeit zu Zeit auf dieser Webseite von %{company_name} veröffentlicht werden können (zusammen die „Vereinbarung“).
-
-      Bitte lies diese Vereinbarung sorgfältig durch, bevor du die Webseite verwendest oder darauf zugreifst. Durch die Benutzung oder den Zugriff auf einen Teil der Webseite stimmst du den Geschäftsbedingungen dieser Vereinbarung zu. Wenn du nicht allen Geschäftsbedingungen in dieser Vereinbarung zustimmst, dann darfst du weder auf die Seite zugreifen noch irgendwelche Dienstleistungen in Anspruch nehmen. Wenn diese Geschäftsbedingungen als Angebot von %{company_name} erachtet werden, beschränkt sich die Zustimmung ausdrücklich auf diese Bedingungen. Die Website wird nur für Benutzer angeboten, die mindestens 13 Jahre alt sind.
-
-      <a name="1"></a>
-
-      ## [1. Dein %{company_domain}-Konto](#1)
-
-      Wenn du eine Konto auf der Webseite erstellst, bist du verantwortlich, die Sicherheit deines Kontos aufrecht zu erhalten und du bist verantwortlich für alle Aktivitäten, die mit deinem Konto durchgeführt werden. Du musst %{company_name} umgehend über eine unbefugte Benutzung deines Kontos oder über jeden anderen Sicherheitsverstoß informieren. %{company_name} haftet nicht für Handlungen oder Unterlassungen deinerseits, einschließlich Schäden jeglicher Art, die infolge solcher Handlungen oder Unterlassungen eingetreten sind.
-
-      <a name="2"></a>
-
-      ## [2. Pflichten der Mitwirkenden](#2)
-
-      Wenn du Material, oder Links auf der Webseite veröffentlichst, anderweitig Material über die Webseite zur Verfügung stellst (oder Dritte dazu berrechtigst) (ajegliches Material als „Inhalt“), bist du für dessen Inhalt und den aus diesem Inhalt resultierenden Schaden in vollem Umfang verantwortlich. Dies gilt unabhängig davon, in welcher Form der Inhalt präsentiert wird, einschließlich, aber nicht beschränkt auf Text, Foto, Video, Audio oder Computer-Software. Indem du Inhalt zur Verfügung stellst, versicherst und garantierst du, dass:
-
-      * das Herunterladen, Kopieren und die Benutzung des Inhalts keine proprietären Rechte verletzt, einschließlich, aber nicht beschränkt auf Urheberrecht, Patente, Schutzmarken oder Betriebsgeheimnissen irgendeines Dritten;
-      * sofern dein Arbeitgeber die Rechte an geistigem Eigentum hat, die du erstellst, entweder (i) du die Erlaubnis von deinem Arbeitgeber hast, den Inhalt zu einzustellen bzw. verfügbar zu machen, einschließlich, aber nicht beschränkt auf Software, oder (ii) deinem Arbeitgeber dir einen Verzicht auf alle Rechte an dem Inhalt versichert hat;
-      * du Fremdlizenzen im Zusammenhang mit dem Inhalt vollständig nachgekommen bist und dass du alle notwendigen Dinge unternommen hast, um erforderliche Bedingungen erfolgreich an die Endbenutzer weiterzureichen;
-      * der Inhalt keine Viren, Würmer, Malware, Trojaner oder anderen schädliche oder zerstörenden Inhalt enthält oder installiert;
-      * der Inhalt kein Spam und nicht von einer Maschine oder zufallsgeneriert ist und dass er keine sittenwidrigen oder unerwünschte kommerzielle Inhalte enthält, die darauf ausgerichtet sind, Zugriffe auf dritte Seiten zu lenken oder die Suchmaschinenplatzierung fördern, oder sonstige unerlaubte Handlungen (wie etwa Phishing) darstellen oder Empfänger hinsichtlich der Quelle des Materials täuschen (wie etwa Spoofing);
-      * der Inhalt nicht pornografisch ist, keine Bedrohungen enthält oder zu Gewalt auffordert, und dass er nicht gegen die Privatsprähe oder Persönlichkeitsrechte Dritter verstößt;
-      * dein Inhalt nicht über unerwünschte elektronische Nachrichten wie Spam-Links in Newsgroups, E-Mail-Verteilern, Blogs und Webseiten oder ähnliche unaufgeforderte Werbemaßnahmen beworben wird;
-      * dein Inhalt in keiner Weise bezeichnet ist, die die Leser täuschen zu glauben, dass du eine andree Person oder Firma bist; und
-      * dass du, im Falle von Inhalt, der Quelltext enthält, deren Art, Natur, Nutzen und Auswirkungen genau kategorisiert und/oder beschreibst, egal ob du dazu von %{company_name} aufgefordert wirst oder nicht.
-
-      <a name="3"></a>
-
-      ## [3. Lizenz von Benutzerinhalten](#3)
-
-      Benutzerbeiträge werden unter eine [Creative Commons Namensnennung - Nicht-kommerziell - Weitergabe unter gleichen Bedingungen 3.0 Unported - Lizenz](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.de) gestellt. Ohne Einschränkung dieser Darstellungen und Garantien, hat %{company_name} das Recht (jedoch nicht die Pflicht) dazu, nach dem Ermessen von %{company_name} (i) jeglichen Inhalt abzulehnen oder zu entfernen der, refuse or remove any content that, nach eigenem Ermessen von %{company_name}, gegen eine Richtlinie von %{company_name} verstößt oder in einer anderen Weise schädlich oder bedenklich ist, oder (ii) einer Person oder juristischen Person den Zugriff auf und die Benutzung der Seite zu beenden oder zu verweigern, gleich aus welchem Grund, nach eigenem Ermessen von %{company_name}. %{company_name} hat keine Verpflichtigung, Beiträge zu erstatten, die vorher bezahlt wurden.
-
-
-      <a name="4"></a>
-
-      ## [4. Zahlung und Verlängerung](#4)
-
-      ### Allgemeine Bedingungen
-
-      Optionale, kostenpflichtige Dienstleistungen oder Upgrades können auf der Webseite zur Verfügung stehen. Durch die Wahl optionaler, kostenpflichtigen Dienstleistungen oder Upgrades stimmst du der monatlichen oder jährlichen Zahlung der ausgewiesenen Gebühren an %{company_name} zu. Die Zahlungen werden im Voraus am Tag der Anmeldung für die Dienstleistungen oder Upgrades fällig und decken die Benutzung dieser Dienstleistung wie angegeben für einen Monats- oder Jahreszeitraum ab. Diese Gebühren sind nicht erstattungsfähig.
-
-      ### Automatische Verlängerung
-
-      Sofern du %{company_name} nicht vor Ablauf des jeweiligen Abonnementzeitraums darüber informierst, dass du eine Dienstleistung oder ein Upgrade kündigen möchtest, wird dein Abonnement automatisch verlängert und du ermächtigst uns, die zu diesem Zeitpunkt geltenden Gebühren für ein Jahres- oder Monatsabonnement (einschließlich aller Steuern) für mittels einer Kreditkarte oder sonstiger Zahlungsmittel einzuziehen, die du bei der Anmeldung angegeben hast. Dienstleistungen und Upgrades können jederzeit gekündigt werden.
-
-      <a name="5"></a>
-
-      ## [5. Dienstleistungen](#5)
-
-      ### Hosting, Support-Dienstleistungen
-
-      Optionales Hosting und Support-Dienstleistungen können gemäß den Geschäftsbedingungen von %{company_name} für einen solchen Dienstleistung zur Verfügung gestellt werden. Durch die Registrierung eines Kontos für Hosting oder Support-Dienstleistungen, stimmst du diesen Geschäftsbedingungen zu.
-
-      <a name="6"></a>
-
-      ## [6. Pflichten der Website-Besucher](#6)
-
-      %{company_name} hat und kann nicht alle Materialien, einschließlich Computer-Software, die auf der Webseite veröffentlicht werden, überprüft/überprüfen, und kann deshalb nicht für die Inhalte, Verwendung oder Auswirkung dieses Materials haftbar gemacht werden. Durch den Betrieb der Webseite versichert oder impliziert %{company_name} nicht, dass das dort veröffentlichte Material gutgeheißen wird oder dass ein solches Material für zutreffend, nützlich oder ungefährlich gehalten wird. Du bist dafür verantwortlich, die notwendigen Sicherheitsvorkehrungen zu treffen, um dich und dein Computersystem vor Viren, Würmern, Trojanern und anderen schädlichen oder zerstörerischen Inhalten zu schützen. Die Webseite kann Inhalte enthalten, die beleidigend, unanständig oder anderweitig anstößig sind, sowie Inhalte, die technische Ungenauigkeiten, Schreibfehler und sonstige Fehler aufweisen. Diese Webseite kann auch Material enthalten, das gegen Eigentums- oder Veröffentlichungsrechte verstößt oder die Rechte an geistigem Eigentum oder sonstige Eigentumsrechte Dritter verletzt. Das Herunterladen, Kopieren oder Nutzen des Materials kann außerdem zusätzlichen genannten oder ungenannten Geschäftsbedingungen unterliegen. %{company_name} schließt jegliche Verantwortung für einen Schaden infolge der Benutzung durch Benutzer der Webseite oder infolge des Herunterladens der dort veröffentlichten Inhalte durch solche Benutzer aus.
-
-      <a name="7"></a>
-
-      ## [7. Inhalt, der auf anderen Websites veröffentlicht wird](#7)
-
-      Wir haben nicht alle Materialien, einschließlich Computer-Software, die auf den Webseiten und Seiten zur Verfügung gestellt, auf die %{company_domain} verlinkt oder die auf %{company_domain} verlinken, überprüft und können dies auch nicht tun. %{company_name} hat keine Kontrolle über diese Nicht-%{company_domain}-Webseiten und -Seiten und ist nicht verantwortlich für deren Inhalte oder Benutzung. DDu bist dafür verantwortlich, die notwendigen Sicherheitsvorkehrungen zu treffen, um dich und dein Computersystem vor Viren, Würmern, Trojanern und anderen schädlichen oder zerstörerischen Inhalten zu schützen. %{company_name} schließt jegliche Verantwortung für einen Schaden infolge der Benutzung von Nicht-%{company_domain}-Webseiten und -Seiten aus.
-
-      <a name="8"></a>
-
-      ## [8. Verstoß gegen das Urheberrecht und DMCA-Richtlinien](#8)
-
-      Genauso wie %{company_name} andere auffordert, Rechte an geistigem Eigentum zu respektieren, so respektiert auch %{company_name} die Rechte an geistigem Eigentum anderer. Wenn du der Ansicht bist, dass Material, das sich auf %{company_domain} befindet oder das von %{company_domain} verlinkt wird, gegen dein Urheberrecht verstößt, wirst du gebeten, %{company_name} gemäß der Richtlinie zum [Digital Millennium Copyright Act ("DMCA")]https://de.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) von %{company_name} zu benachrichtigen. %{company_name} wird alle derartigen Mitteilungen beantworten und das verletztende Material wie erforderlich oder angemessen löschen oder alle Links auf das verletztende Material deaktivieren. %{company_name} wird den Zugang eines Besuchers auf und die Benutzung der Webseite kündigen, wenn unter entsprechenden Umständen der Benutzer nachweislich wiederholt gegen das Urheberrecht oder andere Rechte an geistigem Eigentum von %{company_name} oder anderen verstößt. Im Falle einer solchen Kündigung ist %{company_name} nicht verpflichtet, jegliche zuvor an %{company_name} bezahlten Beträge zu erstatten.
-
-      <a name="9"></a>
-
-      ## [9. Geistiges Eigentum](#9)
-
-      Durch diese Vereinbarung wird kein geistiges Eigentum von %{company_name} oder Dritten von %{company_name} auf dich übertragen, und alle Rechte, Titel und Rechtsansprüche an einem solchen Eigentum bleiben bei %{company_name} (wie zwischen den Parteien). %{company_name}, %{company_domain}, das %{company_domain}-Logo und alle anderen Marken, Dienstleistungsmarken, Grafiken und Logos, die in Verbindung mit %{company_domain} oder der Website verwendet werden, sind Marken oder eingetragene Marken von %{company_name} oder %{company_name}-Lizenznehmern. Andere Marken, Dienstleistungsmarken, Grafiken und Logos, die in Verbindung mit der Website verwendet werden, können die Marken anderer Dritter sein. Durch deine Benutzung der Website werden dir keine Rechte oder Lizenzen zur Vervielfältigung oder anderweitigen Benutzung jeglicher Marken von %{company_name} oder Dritten gewährt.
-
-      <a name="10"></a>
-
-      ## [10. Werbeanzeigen](#10)
-
-      %{company_name} behält sich das Recht vor, Werbeanzeigen auf deinem Inhalt anzuzeigen, sofern du kein „Keine Werbeanzeigen“-Upgrade erworben haben.
-
-      <a name="11"></a>
-
-      ## [11. Namensnennung](#11)
-
-      %{company_name} behält sich das Recht vor, Namensnennung-Links, wie z. B. „Powered by %{company_domain}“, Theme-Autor und Schriftartnennung in der Fußzeile oder der Werkzeugleiste anzuzeigen. Informationen in der Fußzeile und in der %{company_domain}-Werkzeugleiste dürfen ungeachtet der gekauften Upgrades nicht geändert oder gelöscht werden.
-
-      <a name="12"></a>
-
-      ## [12. Änderungen](#12)
-
-      %{company_name} behält sich das Recht vor, jeden Teil dieser Bestimmungen nach eigenem Ermessen zu verändern oder zu ersetzen. Du bist dafür verantwortlich, diese Bestimmungen regelmäßig auf Änderungen zu überprüfen. Deine weitere Benutzung or dein Zugang zur Webseite nach einer Änderung dieser Bestimmungen stellt eine Zustimmung dieser Änderungen dar. %{company_name} kann in der Zukunft auch neue Dienste und Funktionen über die Webseite (einschließlich der Veröffentlichung neuer Werkzeuge und Ressourcen) anbieten. Solche neuen Funktionen und Dienste unterliegen den Bedingungen dieser Geschäftsbedingungen.
-
-      <a name="13"></a>
-
-      ## [13. Kündigung](#13)
-
-      %{company_name} kann deinen Zugang zur gesamten Website oder einem Teil hiervon jederzeit und mit oder ohne Angabe eines Grundes, mit oder ohne Kündigungsfrist und mit sofortiger Wirkung kündigen. Wenn du diese Vereinbarung oder dein Konto auf %{company_domain} (falls du eines besitzt) kündigen möchtest, kannst du auch einfach die Benutzung der Webseite einstellen. Alle Bestimmungen dieser Vereinbarung, die gemäß ihrer Art die Kündigung überdauern sollten, überdauern die Kündigung, einschließlich, aber nicht beschränkt auf Eigentumsbestimmungen, Haftungsausschlüsse, Entschädigungen und Haftungsbeschränkungen.
-
-
-      <a name="14"></a>
-
-      ## [14. Haftungsausschluss](#14)
-
-      Die Webseite wird „so wie sie ist“ zur Verfügung gestellt. %{company_name}, Vertragspartner und Lizenznehmer schließen hiermit sämtliche Gewährleistungen, ausdrücklich oder implizit, aus, einschließlich, aber nicht beschränkt auf die Gewährleistungen der Marktgängigkeit, der Eignung für einen bestimmten Zweck oder der Nichtverletzung von Rechten. Weder %{company_name} noch Vertragspartner und Lizenznehmer übernehmen jedwede Gewährleistung, dass die Website fehlerfrei ist oder dass der Zugang fortlaufend oder unterbrechungsfrei erfolgt. Wenn du dies tatsächlich liest, findest du hier [eine Belohnung](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Du verstehst, dass du nach eigenem Ermessen und auf eigene Gefahr Inhalte oder Leistungen von der Website herunterlädst oder über die Webseite einholst.
-
-
-      <a name="15"></a>
-
-      ## [15. Haftungsbeschränkung](#15)
-
-      In keinem Fall haften %{company_name}, Vertragspartner oder Lizenznehmer in Bezug auf einen Gegenstand dieser Vereinbarung aufgrund eines Vertrages, aufgrund von Fahrlässigkeit, Gefährdungshaftung oder einer sonstigen Billigkeitstheorie für: (i) jegliche beiläufig entstandene Schäden, Folgeschäden oder sonstige Schäden; (ii) die Kosten für die Beschaffung von Ersatzprodukten oder Leistungen; (iii) die Benutzungsunterbrechung oder den Verlust oder die Beschädigung von Daten; oder (iv) für jegliche Beträge, die Gebühren übersteigen, die von dir an %{company_name} gemäß dieser Vereinbarung während eines Zeitraums von zwölf (12) Monaten vor dem Klageanspruch bezahlt wurden. %{company_name} übernimmt keine Haftung für einen Ausfall oder eine Verzögerung aufgrund von Tatsachen, die nach vernünftigem Ermessen über seine Kontrolle hinausgehen. Das Vorstehende gilt nicht, soweit nach anwendbarem Recht unzulässig.
-
-      <a name="16"></a>
-
-      ## [16. Allgemeine Zusicherung und Gewährleistung](#16)
-
-      Du versicherst und garantierst, dass (i) deine Benutzung der Webseite gemäß der [Datenschutzrichtlinie](/privacy) von %{company_name}, der [Community-Richtlinie](/guidelines), dieser Vereinbarung und allen geltenden Gesetzen und Bestimmungen erfolgt (einschließlich, aber nicht beschränkt auf jegliche lokale Gesetze oder Bestimmungen in Ihrem Land, Bundesland, Ihrer Stadt oder einem anderen Regierungsgebiet, hinsichtlich des Online-Verhaltens und zulässiger Inhalte, und einschließlich aller geltender Gesetze hinsichtlich der Übertragung technischer Daten, die aus den USA oder dieinem Wohnsitzland exportiert wurden) und (ii) deine Benutzung der Website nicht gegen die Rechte an geistigem Eigentum Dritter verstößt oder diese falsch anwendet.
-
-      <a name="17"></a>
-
-      ## [17. Schadloshaltung](#17)
-
-      Du stimmst zu, %{company_name}, Vertragspartnern und Lizenznehmern, und jeweiligen Vorstandsmitglieder, Amtsträger, Team-Mitglieder und Vertreter gegen jegliche Haftungsfälle, Ansprüche und Ausgaben schadlos zu halten, einschließlich angemessener Anwaltskosten, die den schadlos gehaltenen Parteien im Zusammenhang mit jeglichen Ansprüchen entstehen, die sich aus jeglicher Verletzung dieser Vereinbarung ergeben.
-
-      <a name="18"></a>
-
-      ## [18. Verschiedenes](#18)
-
-      Diese Vereinbarung stellt die gesamte Vereinbarung zwischen %{company_name} und dir bezüglich des Gegenstands dieser Geschäftsbedingungen dar, und sie kann nur durch eine schriftliche, durch einen befugten Vertreter von %{company_name} unterzeichnet oder durch die Veröffentlichung einer überarbeiteten Version durch %{company_name} geändert werden. Vorbehaltlich eventuell anwendbarer anders lautender gesetzlicher Bestimmungen, unterliegt diese Vereinbarung, der Zugang zu und die Benutzung der Website den Gesetzen des Staates Kalifornien, USA unter Ausschluss des Kollisionsrechts. Gerichtsstand für alle Streitigkeiten aus oder im Zusammenhang mit derselben ist der Staat und die Bundesgerichte in San Francisco County, Kalifornien. Mit Ausnahme der Ansprüche auf jede Unterlassung oder jeden Rechtsbehelf oder Ansprüche hinsichtlich der Rechte an geistigem Eigentum (die vor ein ordentliches Gericht ohne die Hinterlegung einer Einlage gebracht werden können) wird jeder Rechtsstreit, der gemäß dieser Vereinbarung entsteht, endgültig durch umfassende Schiedsregelungen des Judicial Arbitration and Mediation Service, Inc. („JAMS“) von drei Schlichtern, die gemäß solcher Regeln ernannt werden, beigelegt werden. Das Schiedsverfahren findet in San Francisco, Kalifornien in englischer Sprache statt, und die Schiedsentscheidung kann vor jedem Gericht durchgesetzt werden. Die obsiegende Partei im Rahmen einer Verhandlung oder eines Verfahrens zur Durchsetzung dieser Vereinbarung ist berechtigt, Unkosten und Anwaltsgebühren in Rechnung zu stellen. Wenn ein Teil dieser Vereinbarung für ungültig oder nicht einklagbar erachtet wird, wird dieser Teil so ausgelegt, dass die ursprüngliche Absicht der Parteien widergespiegelt wird, und die restlichen Abschnitte vollständig gültig bleiben. Eine Verzichtserklärung einer der Parteien hinsichtlich einer Bedingung oder Kondition dieser Vereinbarung oder ein Verstoß gegen eine solche Bedingung in einer anderen Instanz stellt keinen Verzicht auf eine solche Bestimmung oder eine nachfolgende Nichterfüllung einer solchen Bestimmung dar. Du kannst deine Rechte gemäß dieser Vereinbarung auf eine Partei übertragen, die sich mit folgenden Benutzungsbedingungen einverstanden erklärt und bestätigt, dass sie sich an die Geschäftsbedingungen halten wird; %{company_name} kann seine Rechte gemäß dieser Vereinbarung bedingungslos übertragen. Diese Vereinbarung ist bindend und wird zugunsten der Parteien und ihrer entsprechenden Erben und Rechtsnachfolger wirksam.
-
-      Dieses Dokument ist als CC-BY-SA lizensiert. Es wurde zuletzt aktualisiert am am 31. Mai 2013.
-
-      Basiert ursprünglich auf den [WordPress-Geschäftsbedingungen](https://de.wordpress.com/tos/).
   privacy_topic:
     title: "Datenschutzrichtlinie"
     body: |
@@ -3119,7 +2971,6 @@ de:
     badge_title_metadata: "%{display_name} Abzeichen auf %{site_title}"
   admin_login:
     success: "E-Mail gesendet"
-    error: "Fehler!"
     email_input: "Administrator-E-Mail"
     submit_button: "E-Mail senden"
   performance_report:
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index a21b06301f..f271eb0d4d 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -209,7 +209,6 @@ el:
     top_weekly: "Κορυφαία νήματα εβδομαδιαία "
     top_daily: "Κορυφαία νήματα ημερησίως "
     posts: "Τελευταίες αναρτήσεις"
-    private_posts: "Νέα προσωπικά μηνύματα"
     group_posts: "Τελευταίες αναρτήσεις από %{group_name}"
     group_mentions: "Τελευταίες αναφορές από %{group_name}"
     user_posts: "Τελευταίες αναρτήσεις από @%{username}"
@@ -304,12 +303,6 @@ el:
       Λυπούμαστε, αλλά οι νέοι χρήστες είναι προσωρινά περιορισμένοι σε %{newuser_max_replies_per_topic} απαντήσεις στο ίδιο νήμα.
 
       Αντί να προσθέσετε κι άλλη απάντηση, παρακαλώ επεξεργαστείτε τις προηγούμενες απαντήσεις σας ή επισκεφθείτε άλλα νήματα.
-    reviving_old_topic: |
-      ### Αναβίωση αυτού του νήματος;
-
-      Η τελευταία απάντηση σε αυτό το νήμα ήταν **%{days}** μέρες πριν. Η απάντησή σας θα μεταφέρει το νήμα στην κορυφή της λίστας και θα ειδοποιήσει οποιονδήποτε έχει προηγουμένως συμμετάσχει στη συζήτηση.
-
-      Είστε σίγουροι ότι θέλετε να συνεχίσετε αυτή την παλιά συζήτηση;
   activerecord:
     attributes:
       category:
@@ -326,9 +319,7 @@ el:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Μπορείτε να καταχωρίσετε προειδοποιήσεις μόνο σε προσωπικά μηνύματα."
               too_many_users: "Μπορείτε να στέλνετε προειδοποιήσεις μόνο σε ένα χρήστη κάθε φορά."
-              cant_send_pm: "Συγγνώμη, δεν μπορείτε να στείλετε προσωπικό μήνυμα σε αυτόν τον χρήστη."
               no_user_selected: "Πρέπει να επιλέξετε έναν έγκυρο χρήστη."
               reply_by_email_disabled: "Η απάντηση μέσω email έχει απενεργοποιηθεί."
             featured_link:
@@ -877,7 +868,6 @@ el:
     censored_words: "Αυτόματη αντικατάσταση λέξεων θα γίνεται με &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Το Regex πρότυπο που θα αντικατασταθεί αυτόματα με &#9632;&#9632;&#9632;&#;"
     delete_old_hidden_posts: "Διάγραψε αυτόματα όποιες κρυμμένες αναρτήσεις μένουν κρυφές για πάνω από 30 ημέρες. "
-    default_locale: "Η προεπιλεγμένη γλώσσα του Discourse (ISO 639-1 Code)"
     allow_user_locale: "Επίτρεψε στους χρήστες να επιλέγουν την γλώσσα που επιθυμούν. "
     set_locale_from_accept_language_header: "θέστε την γλώσσα του interface για ανώνυμους χρήστες από τη γλώσσα που χρησιμοποιεί το πρόγραμμα περιήγησης τους. (ΠΕΙΡΑΜΑΤΙΚΟ ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ, δεν λειτουργεί με ανώνυμη cache)"
     min_post_length: "Ελάχιστο επιτρεπτό μήκος ανάρτησης σε χαρακτήρες"
@@ -1093,7 +1083,6 @@ el:
     purge_deleted_uploads_grace_period_days: "Η περίοδος χάριτος (σε μέρες) πριν μία διεγραμένη μεταφόρτωση αφαιρεθεί μόνιμα."
     purge_unactivated_users_grace_period_days: "Περίοδος χάριτος (σε ημέρες) πριν διαγραφεί ο λογαριασμός ενός χρήστη ο οποίος δεν ενεργοποιήθηκε. Ρυθμίστε στο 0 για να μην διαγράφονται ποτέ οι μη ενεργοποιημένοι χρήστες."
     enable_s3_uploads: "Τοποθέτηση μεταφορτώσεων σε αποθηκευτικό χώρο Amazon S3. ΣΗΜΑΝΤΙΚΟ: Απαιτούνται έγκυρα διαπιστευτήρια S3 (access key id και secret access key)."
-    s3_use_iam_profile: 'Χρησιμοποιήστε AWS EC2 ΙΑΜ ρόλο για να ανακτήσετε τα κλειδιά. ΣΗΜΕΙΩΣΗ: η ενεργοποίηση θα αναιρέσει τις ρυθμίσεις "s3 access key id" και "s3 secret access key".'
     s3_upload_bucket: "Το όνομα κουβά Amazon S3 οπου θα μεταφορτωθούν τα αρχεία . ΠΡΟΣΟΧΗ: πρέπει να είναι πεζά, χωρίς τελείες και χωρίς κάτω παύλες."
     s3_access_key_id: "Η ταυτότητα του κλειδιού πρόσβασης του Amazon S3 η οποία θα χρεισημοποιηθεί για το ανέβασμα φωτογραφιών."
     s3_secret_access_key: "Το μυστικό κλειδί πρόσβασης στο Amazon S3 που θα χρησιμοποιηθεί για να ανεβάσετε εικόνες."
@@ -1139,8 +1128,6 @@ el:
     min_trust_to_edit_wiki_post: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να επεξεργαστείς μία ανάρτηση που έχει σημειωθεί ως wiki."
     min_trust_to_edit_post: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να επεξεργαστείς αναρτήσεις."
     min_trust_to_allow_self_wiki: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να μετατραπεί μία ανάρτηση του ίδιου του χρήστη σε wiki."
-    min_trust_to_send_messages: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να δημιουργήσεις νέα προσωπικά μηνύματα."
-    min_trust_to_send_email_messages: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για την αποστολή νέου προσωπικού μηνύματος μέσω email (σε σταδιακούς χρήστες)."
     newuser_max_links: "Πόσους συνδέσμους μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
     newuser_max_images: "Πόσες εικόνες μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
     newuser_max_attachments: "Πόσα συνημμένα μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
@@ -1207,7 +1194,6 @@ el:
     reply_by_email_enabled: "Ενεργοποίηση απάντησης στα νήματα μέσω email."
     reply_by_email_address: "Πρότυπο για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, για παράδειγμα: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Λίστα εναλλακτικών προτύπων για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, πχ: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Χρησιμοποίησε HTML αντί για κείμενο στα εισερχόμενα email."
     disable_emails: "Απαγόρευσε στο Discourse να στέλνει email οποιοασδήποτε μορφής"
     strip_images_from_short_emails: "Αφαίρεσε εικόνες από email που έχουν μέγεθος λιγότερο από 2800 Bytes. "
     short_email_length: "Μέγεθος μικρού email σε Bytes"
@@ -1310,7 +1296,6 @@ el:
     allowed_href_schemes: "Τα σχεδιαγράμματα επιτρέπονται σε συνδέσμους επιπλέον απο το http και το https."
     embed_post_limit: "Μέγιστος αριθμός αναρτήσεων για ενσωμάτωση."
     embed_username_required: "Απαιτείται το όνομα χρήστη για τη δημιουργία νήματος."
-    notify_about_flags_after: "Αν υπάρχουν σημάνσεις που δεν έχουν διαχειριστεί μετά από αυτόν τον αριθμό ωρών, στείλε ένα μήνυμα στο προσωπικό. Θέσε 0 για απενεργοποίηση."
     show_create_topics_notice: "Εάν η ιστοσελίδα έχει λιγότερα από 5 δημόσια νήματα, κάνε μια παρατήρηση ζητώντας από τον διαχειριστή να δημιουργήσει μερικά νήματα."
     delete_drafts_older_than_n_days: 'Διαγραφή προχείρων παλαιότερα απο (ν) ημερων '
     bootstrap_mode_min_users: "Μέγιστος αριθμός χρηστών που απαιτούνται για την απενεργοποίηση της κατάστασης bootstrap (0 για απενεργοποίηση)"
@@ -1322,7 +1307,6 @@ el:
     approve_post_count: "Ο όγκος των αναρτήσεων ενός καινούριου ή βασικού χρήστη που θα πρέπει να εγκριθεί."
     approve_unless_trust_level: "Οι αναρτήσεις για χρήστες κάτω από αυτό το επίπεδο εμπιστοσύνης πρέπει να εγκριθούν"
     approve_new_topics_unless_trust_level: "Τα καινούρια νήματα για χρήστες κάτω από αυτό το επίπεδο εμπιστοσύνης πρέπει να εγκριθούν."
-    notify_about_queued_posts_after: "Εάν υπάρχουν αναρτήσεις που περιμέναν να αναθεωρηθούν για περισσότερο από τόσες ώρες, θα σταλεί ένα email στο contact_email. Όρισε το στο 0 για να απενεργοποιήσεις αυτά τα emails."
     auto_close_messages_post_count: "Ανώταρο όριο αναρτήσεων που επιτρέπονται σε ένα μήνυμα πριν αυτό κλείσει αυτομάτως (0 για απενεργοποιήση)"
     auto_close_topics_post_count: "Ανώτατο όριο αναρτήσεων που επιτρέπονται σε ένα νήμα πριν αυτό κλείσει αυτομάτως (0 για απενεργοποίηση)"
     code_formatting_style: "Το κουμπί κώδικα στον συνθέτη θα έχει ως αποτέλεσμα αυτό το στυλ μορφοποίησης κώδικα "
@@ -2553,162 +2537,6 @@ el:
       Yes, legalese is boring, but we must protect ourselves &ndash; and by extension, you and your data &ndash; against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos).
   tos_topic:
     title: "Όροι Χρήσης"
-    body: |+
-      Οι ακόλουθοι όροι και προϋποθέσεις διέπουν την χρήση του %{company_domain} ιστότοπου και όλου του περιεχομένου, υπηρεσιών και προϊόντων που διατίθενται στον ή από τον ιστότοπο, συμπεριλαμβανομένων αλλά μη περιοριζομένων, και των %{company_domain} Λογισμικό Φόρουμ, %{company_domain} Φόρουμ Υποστήριξης και %{company_domain} Υπηρεσία Φιλοξενίας (‘’Φιλοξενια’’), (λαμβανόμενα μαζί, ο ιστότοπος). Ο ιστότοπος ανήκει και λειτουργεί από την %{company_full_name} ("%{company_name}"). Ο ιστότοπος προσφέρεται υπό την προυπόθεση της εκ μέρους σας αποδοχής, χωρίς τροποποίηση όλων των όρων και συνθηκών που περιλαμβάνονται στο παρόν κείμενο και όλους τους άλλους κανόνες λειτουργείας, πολιτικές (περιλαμβανομένων, χωρίς περιορισμό, %{company_domain}’s [Πολιτική προστασίας προσωπικών δεδομένων](/προστασία προσωπικών δεδομένων) και [Κατευθυντήριες Οδηγίες Κοινότητας](Συχνές Ερωτήσεις)) και διαδικασίες που μπορεί να δημοσιευθούν από καιρού εις καιρών σε αυτό τον ιστότοπο από την %{company_name} (Συνοπτικά, το ‘’Συμφωνητικό’’).
-
-      Παρακαλώ διαβάστε αυτό το Συμφωνητικό προσεκτικά πριν την πρόσβαση ή την χρήση του ιστότοπου. Με την πρόσβαση ή την χρήση οποιουδήποτε μέρους του ιστότοπου, συφωνείτε να δεσμευτείτε από τους όρους και τις προϋποθέσεις αυτού του Συμφωνητικού. Αν δεν συμφωνείτε με όλους τους όρους και τις προϋποθέσεις του Συμφωνητικού, τότε δεν μπορείτε να έχετε πρόσβαση στον ιστότοπο ή να χρησιμοποιήσετε οποιαδήποτε από τις υπηρεσίες. Εαν αυτοί οι όροι και οι προϋποθέσεις θεωρούνται ως προσφορά από την %{company_name}, η αποδοχή περιορίζεται ρητά σε αυτούς τους όρους. Ο ιστότοπος είναι διαθέσιμος μόνο σε άτομα που είναι τουλάχιστον 13 ετών.
-
-      <a name="1"></a>
-
-      ## [1. Ο %{company_domain} Λογαριασμός σας](#1)
-
-
-      Αν δημιουργήσετε λογαριασμό στον ιστότοπο, είστε υπεύθυνοι για την τήρηση της ασφάλειας του λογαριασμού σας και έχετε πλήρη ευθύνη για όλες τις ενέργειες που θα πραγματοποιηθούν μέσω του λογαριασμού. Πρέπει να ειδοποιήσετε αμέσως την %{company_name} για την οποιαδήποτε μη εξουσιοδοτημένη χρήση του λογαριασμού σας ή οποιαδήποτε άλλη παραβίαση της ασφάλειας του. Η %{company_name} δεν φέρει ευθύνη για οποιεσδήποτε πράξεις ή παραλείψεις από εσάς, συμπεριλαμβανομένων των οποιουδήποτε είδους ζημιών που προκλήθηκαν ως αποτέλεσμα αυτών των πράξεων ή παραλείψεων.
-
-      <a name="2"></a>
-
-      ## [2. Ευθύνη των Συνεισφερόντων](#2)
-
-
-      Αν αναρτήσετε υλικό στον ιστότοπο, αναρτήσετε συνδέσμους στον ιστότοπο, ή με άλλον τρόπο καταστήσετε (ή επιτρέψετε σε κάποιον τρίτον να καταστήσει) υλικό διαθέσιμο μέσω του ιστότοπου (οποιοδήποτε τέτοιο υλικό, ‘Περιεχόμενο’), είστε αποκλειστικά υπεύθυνοι για το περιεχόμενο και οποιαδήποτε βλάβη προκληθεί από το περιεχόμενο αυτό. Αυτό ισχύει ανεξάρτητα από το αν το εν λόγω περιεχόμενο αποτελείται απο κείμενο, γραφικά, αρχείο ήχου, ή λογισμικό για ηλεκτρονικούς υπολογιστές. Καθιστόντας περιεχόμενο διαθέσιμο, εκπροσωπείτε και εγγυάστε οτι:
-
-      * η λήψη, αντιγραφή και χρήση του Περιεχομένου δεν παραβιάζει τα δικαιώματα ιδιοκτησίας, περιλαμβανομένων αλλά μη περιοριζομένων στα πνευματικά δικαιώματα, ευρεσιτεχνίες, σήματα κατατεθέντα ή δικαιώματα εμπορικών μυστικών, κανενός τρίτου·
-
-      * αν ο εργοδότης έχει δικαιώματα στην πνευματική ιδιοκτησία που παράγετε, τότε είτε (1) έχετε λάβει άδεια από τον εργοδότη σας να αναρτάτε ή να διαθέτετε το Περιεχόμενο, περιλαμβανομένου αλλά μη περιοριζομένου οποιουδήποτε λογισμικού, ή (2) έχετε εξασφαλίσει από τον εργοδότη σας μια παραίτηση όσον αφορά τα πνευματικά δικαιώματα σχετικά με το Περιεχόμενο·
-
-      * έχετε πλήρως συμμορφωθεί με τις άδειες τρίτων σχετικά με το Περιεχόμενο, και έχετε όλες τις αναγκαίες ενέργειες για να ενημερώσετε τους τελικούς χρήστες για οποιουσδήποτε απαιτούμενους όρους·
-
-      * το Περιεχόμενο δεν περιέχει ή εγκαθιστά ιούς, και πάσης φύσεως κακόβουλο λογισμικό ή άλλο επιβλαβές ή καταστροφικό περιεχόμενο·
-
-      * το Περιεχόμενο δεν είναι ανεπιθύμητη αλληλογραφία, δεν παράγεται από μηχανή ή τυχαία διαδικασία, και δεν περιλαμβάνει ανήθικο ή ανεπιθύμητο εμπορικό περιεχόμενο σχεδιασμένο να καθοδηγεί κίνηση προς ιστότοπους τρίτων ή να βελτιώνει τις κατατάξεις ιστότοπων τρίτων σε μηχανές αναζήτησης ή σε περαιτέρω παράνομες πράξεις (όπως η κακόβουλη εκμαίευση μυστικών πληροφοριών (‘ψάρεμα’)) ή να παραπλανήσει αποδέκτες σχετικά με την πηγή του υλικού (όπως η παράνομη παραποίηση της ηλεκτρονικής διεύθυνσης προέλευσης)·
-
-      * το Περιεχόμενο δεν είναι πορνογραφικό, δεν περιέχει απειλές ή προκαλεί βία και δεν παραβιάζει τα προσωπικά δεδομένα ή δικαιώματα δημοσιότητας τρίτων·
-
-      * το Περιεχόμενο δεν διαφημίζεται μέσω ανεπιθύμητων ηλεκτρονικών μηνυμάτων, όπως σύνδεσμοι σε ανεπιθύμητη αλληλογραφία ευρισκόμενους σε ομάδες συζήτησης, καταλόγους διευθύνσεων ηλεκτρονικού ταχυδρομείου, ιστολόγια και ιστότοπους, καθώς και παρεμφερείς απρόσκλητες προωθητικές μεθόδους·
-
-      * το περιεχόμενο σας δεν έχει όνομα που να παραπλανεί τους αναγνώστες στο να πιστεύουν οτι είστε ένα άλλο πρόσωπο ή εταιρεία· και
-
-      * έχετε, στην περίπτωση περιεχομένου που περιλαμβάνει κώδικα προγραμματισμού ηλεκτρονικών υπολογιστών, επακριβώς κατηγοριοποιήσει ή/και περιγράψει τον τύπο, την φύση, τις χρήσεις και τα αποτελέσματα των υλικών, είτε αυτό απαιτείται να γίνει από την %{company_name} ή από κάποιον άλλον.
-
-      <a name="3"></a>
-
-      ## [3. Άδεια Περιεχομένου του Χρήστη](#3)
-
-      Οι συνεισφορές των χρηστών αδειοδοτούνται υπό το καθεστώς του [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Χωρίς να περιορίζονται καμία από αυτές τις αντιπροσωπεύσεις ή εγγυήσεις, η %{company_name} έχει το δικαίωμα (αλλά όχι την υποχρέωση), κατά την αποκλειστική διακριτική ευχέρεια της %{company_name} να (i) αρνηθεί ή αφαιρέσει οποιοδήποτε περιεχόμενο που, κατά την λογική άποψη της %{company_name}, παραβιάζει οποιαδήποτε πολιτική της %{company_name} ή είναι κατά οιονδήποτε τρόπο επιβλαβές ή ανάρμοστο, ή (ii) να τερματίσει ή να αρνηθεί την πρόσβαση και τη χρήση του Ιστότοπου σε οποιοδήποτε άτομο ή οντότητα για οποιονδήποτε λόγο, κατά την απόλυτη διακριτική ευχέρεια της %{company_name}. Η %{company_name} δεν θα έχει υποχρέωση να επιστρέψει οποιαδήποτε χρηματικά ποσά έχουν ήδη πληρωθεί.
-
-      <a name="4"></a>
-
-      ## [4. Πληρωμή και Ανανέωση](#4)
-
-      ### Γενικοί Όροι
-
-      Προαιρετικές υπηρεσίες ή αναβαθμίσεις επί πληρωμής μπορεί να είναι διαθέσιμες στον ιστότοπο. Όταν χρησιμοποιείται μία υπηρεσία ή αναβάθμιση επί πληρωμής, συμφωνείτε να πληρώσετε την %{company_name} τα μηνιαία ή ετήσια συνδρομητικά τέλη που  υποδεικνύονται. Οι πληρωμές θα πραγματοποιούνται την ημέρα που θα αρχίσετε να χρησιμοποιείτε την υπηρεσία ή την αναβάθμιση και θα καλύπτουν την χρήση αυτής της υπηρεσίας ή της αναβάθμισης για την μηνιαία ή την ετήσια συνδρομητική περίοδο όπως υποδεικνύεται. Αυτές οι χρεώσεις είναι μη επιστρεφόμενες.
-
-      ### Αυτόματη Ανανέωση
-
-      Εκτώς και αν ειδοποιήσετε την %{company_name} πριν το τέλος της ισχύουσας συνδρομητικής περιόδου οτι θέλετε να ακυρώσετε μία υπηρεσία ή μία αναβάθμιση, η συνδρομή σας θα ανανεωθεί αυτόματα και μας εξουσιοδοτείτε να εισπράξουμε τα τότε ισχύοντα ετήσια ή μηνιαία συνδρομητικά τέλη (καθώς και οποιουσδήποτε φόρους) χρησιμοποιόντας οποιαδήποτε πιστωτική κάρτα ή άλλο τρόπο πληρωμής που έχουμε καταγεγραμμένη από εσάς. Οι συνδρομές μπορούν να ακυρωθούν οποιαδήποτε στιγμή.
-
-      <a name="5"></a>
-
-      ## [5. Υπηρεσίες](#5)
-
-      ### Φιλοξενία, Υπηρεσίες Υποστήριξης
-
-      Προαιρετική φιλοξενία και υπηρεσίες Υποστήριξης μπορεί να προμηθευτούν από την %{company_name} υπό τους όρους και τις προϋποθέσεις της κάθε τέτοιας υπηρεσίας. Με την εγγραφή σας για έναν λογαριασμό Φιλοξενίας/Υποστήριξης ή λογαριασμό υπηρεσιών Υποστήριξης, συμφωνείτε να συμμορφωθείτε με τέτοιους όρους και προϋποθέσεις.
-
-      <a name="6"></a>
-
-      ## [6. Ευθήνη των Επισκεπτών του Ιστότοπου](#6)
-
-
-      Η %{company_name} δεν έχει ελέγξει, και δεν μπορεί να ελέγξει, όλο το υλικό, περιλαμβανομένων των λογισμικών υπολογιστών, που αναρτώνται στον Ιστότοπο, και επομένως δεν μπορεί να είναι υπεύθυνη για τα περιεχόμενα, την χρήση και τις επιδράσεις αυτού του υλικού. Η λειτουργεία του Ιστότοπου από την %{company_name}, δεν αντιπροσωπεύει ή συνεπάγεται οτι εγκρίνει το υλικό που έχει αναρτηθεί στον Ιστότοπο, ή οτι πιστεύει πως το υλικό είναι σωστό, χρήσιμο ή μη επιβλαβές. Είστε υπεύθυνος να λάβετε τις απαραίτητες προφυλάξεις για να προστατεύσετε τον εαυτό σας και τον υπολογιστή σας από ιούς, κακόβουλα λογισμικά και άλλα επιβλαβή ή καταστροφικά περιεχόμενα. Ο Ιστότοπος μπορεί να περιέχει περιεχόμενα που να είναι προσβλητικά, απρεπή ή αλλιώς μη αποδεκτά, καθώς και περιεχόμενο που εμπεριέχει θεωρητικές ανακρίβειες, τυπογραφικά λάθη και άλλα σφάλματα. Ο Ιστότοπος μπορεί επίσης να περιέχει υλικό που παραβιάζει τα δικαιώματα προστασίας προσωπικών δεδομένων ή τα δικαιώματα δημοσιότητας, ή καταπατά την πνευματική ιδιοκτησία και άλλα δικαιώματα ιδιοκτησίας τρίτων, ή των οποίων η λήψη, η αντιγραφή ή η χρήση υπόκειται σε επιπλέον όρους και προϋποθέσεις, καθορισμένους ή μη καθορισμένους. Η %{company_name} αποποιείται οποιαδήποτε ευθύνη για όποια τυχόν βλάβη προκληθεί από την χρήση του Ιστότοπου από τους επισκέπτες του, ή από την όποιαδήποτε λήψη περιεχομένου από τους επισκέπτες του Ιστότοπου που  αναρτήθηκε σε αυτο.
-
-      <a name="7"></a>
-
-      ## [7. Περιεχόμενο που Άναρτήθηκε σε Άλλους Ιστότοπους](#7)
-
-      Δεν έχουμε ελέγξει, και δεν μπορούμε να ελέγξουμε, όλο το υλικό, περιλαμβανομένων των λογισμικών υπολογιστών, διαθέσιμο μέσα από τους ιστότοπους και τις ιστοσελίδες που συνδέονται με την %{company_domain}. Η %{company_name} δεν ελέγχει τους ιστότοπους και τις ιστοσελίδες που δεν ανήκουν στην %{company_name} και δεν είναι υπεύθυνη για τα περιεχόμενα τους ή την χρήση τους. Η ύπαρξη συνδέσμων μεταξύ της %{company_name} και των ιστότοπων ή των ιστοσελίδων που δεν ανήκουν στην %{company_name}, δεν αντιπροσωπεύει ή συνεπάγεται οτι η  %{company_name} εγκρίνει αυτούς τους ιστότοπους ή ιστοσελίδες. Είστε υπεύθυνοι να λάβετε τις απαραίτητες προφυλάξεις για να προστατεύσετε τον εαυτό σας και τον υπολογιστή σας από ιούς, κακόβουλα λογισμικά και άλλα επιβλαβή ή καταστροφικά περιεχόμενα. Η %{company_name} αποποιείται οποιαδήποτε ευθύνη για όποια ζημιά προκληθεί από την χρήση ιστότοπων και ιστοσελίδων που δεν ανήκουν στην %{company_name}.
-
-
-      <a name="8"></a>
-
-      ## [8. Καταπάτηση Πνευματικής Ιδιοκτησίας και η Πολιτική DMCA](#8)
-
-
-      Όπως η %{company_name} ζητά από τους άλλους να σεβαστούν τα δικαιώματα πνευματικής ιδιοκτησίας της, έτσι και η %{company_name} σέβεται τα δικαιώματα πνευματικής ιδιοκτησίας των άλλων. Αν πιστεύετε οτι υλικό που βρίσκεται στην %{company_domain} ή συνδέεται με την %{company_domain} παραβιάζει τα δικαιώματα πνευματικής ιδιοκτησίας σας, και αν αυτός ο ιστότοπος βρίσκεται στις ΗΠΑ, σας ενθαρρύνουμε να ειδοποιήσετε την %{company_name} σύμφωνα με την Πολιτική [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") της %{company_name}. Η %{company_name} θα ανταποκριθεί με τον τρόπο που ζητείται ή είναι κατάλληλος, σε όλες τις σχετικές ειδοποιήσεις και θα αφαιρέσει το υλικό που καταπατά τα δικαιώματα πνευματικής ιδιοκτησίας σας ή θα απενεργοποιήσει όλους τους συνδέσμους που συνδέονται με αυτό το υλικό. Η %{company_name} θα τερματίσει την πρόσβαση του επισκέπτη στον Ιστότοπο, καθώς και τη χρήση του Ιστότοπου από τον επισκέπτη, αν, υπό τις κατάλληλες συνθήκες, ο επισκέπτης θεωρηθεί πως έχει επανειλημμένα καταπατήσει τα πνευματικά δικαιώματα ή άλλα πνευματικά δικαιώματα ιδιοκτησίας της %{company_name} ή άλλων. Σε περίπτωση τέτοιου τερματισμού, η %{company_name} δεν έχει καμία υποχρέωση να προβεί σε επιστροφή όποιων ποσών έχουν προηγουμένως πληρωθεί στην %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Πνευματική Ιδιοκτησία](#9)
-
-
-      Το παρόν Συμφωνητικό δεν μεταφέρει από την %{company_name} προς εσάς καμία πνευματική ιδιοκτησία της %{company_name} ή τρίτου και κάθε δικαίωμα, τίτλος και συμφέρον σε τέτοιου είδους ιδιοκτησία θα παραμείνει (όπως μεταξύ των μερών) αποκλειστικά στην %{company_name}. %{company_name}, %{company_domain}, το %{company_domain} λογότυπο, και όλα τα άλλα σήματα κατατεθέντα, σήματα υπηρεσιών, γραφικά και λογότυπα που χρησιμοποιούνται σε σχέση με την %{company_domain}, ή τον Ιστότοπο αποτελούν σήματα κατατεθέντα ή καταχωρημένα σήματα κατατεθέντα της %{company_name} ή των αδειοδοτών της %{company_name}. Άλλα σήματα κατατεθέντα, σήματα υπηρεσιών, γραφικά και λογότυπα που χρησιμοποιούνται σε σχέση με τον Ιστότοπο μπορεί να είναι σήματα κατατεθέντα τρίτων. Η χρήση του Ιστότοπου δεν σας δίνει το δικαίωμα ή την άδεια να αναπαράγετε ή κατά οιοδήποτε τρόπο να χρησιμοποιείτε τα σήματα κατατεθέντα της %{company_name} ή τρίτων.
-
-
-      <a name="10"></a>
-
-      ## [10. Διαφημίσεις](#10)
-
-      Η %{company_name} διατηρεί το δικαίωμα να προβάλει διαφημίσεις πάνω στο περιεχόμενο σας εκτός εάν έχετε αγοράσει μία Αναβάθμιση ή λογαριασμό Υπηρεσιών δίχως διαφημίσεις.
-
-      <a name="11"></a>
-
-      ## [11. Αναγνώριση](#11)
-
-
-      Η %{company_name} διατηρεί το δικαίωμα να προβάλει συνδέσμους αναγνώρισης όπως ‘Powered by %{company_domain},’ συγγραφέα θεματικής εμφάνισης, και γραμματοσειράς αναγνώρισης στο υποσέλιδο του περιεχομένου σας ή στην εργαλειοσειρά σας. Οι αναφορές αναγνώρισης στο υποσέλιδο και η εργαλειοσειρά της %{company_domain} δεν μπορούν να αφαιρεθούν ανεξαρτήτως από το αν έχουν αγοραστεί αναβαθμίσεις.
-
-
-      <a name="12"></a>
-
-      ## [12. Αλλαγές](#12)
-
-      Η %{company_name} διατηρεί το δικαίωμα, κατά την αποκλειστική διακριτική της ευχέρεια, να τροποποιεί ή να αντικαθιστά οποιοδήποτε μέρος του παρόντος Συμφωνητικού. Είναι δική σας ευθύνη να ελέγχετε περιοδικά το παρόν Συμφωνητικό για αλλαγές. Η συνεχιζόμενη χρήση ή πρόσβαση στον Ιστότοπο μετά την ανάρτηση οιονδήποτε αλλαγών στο παρόν Συμφωνητικό, συνιστά αποδοχή αυτών των αλλαγών. Η %{company_name} μπορεί επίσης, στο μέλλον, να προσφέρει νέες υπηρεσίες ή/και χαρακτηριστικά δια του Ιστότοπου (περιλαμβανομένης της κυκλοφορίας νέων εργαλείων και πόρων). Αυτά τα νέα χαρακτηριστικά ή/και οι υπηρεσίες θα υπόκεινται στους όρους και τις προϋποθέσεις του παρόντος Συμφωνητικού.
-
-
-      <a name="13"></a>
-
-      ## [13. Τερματισμός](#13)
-
-      Η %{company_name} μπορεί να τερματίσει την πρόσβαση σας στο σύνολο ή σε οποιοδήποτε μέρος του Ιστότοπου οιαδήποτε στιγμή, με ή χωρίς αιτία, με ή χωρίς ειδοποίηση, με άμεση ισχύ. Αν επιθυμείτε να τερματίσετε το παρόν Συμφωνητικό ή τον λογαριασμό σας στο %{company_domain} (εάν έχετε), μπορείτε απλώς να σταματήσετε να χρησιμοποιείτε τον Ιστότοπο. Όλες οι προβλέψεις του παρόντος συμφωνητικού, οι οποίες εκ της φύσεως τους πρέπει να ισχύουν και μετά των τερματισμό, θα ισχύουν και μετά τον τερματισμό, περιλαμβανομένων, χωρίς περιορισμό, προβλέψεων ιδιοκτησίας, αποποιήσεων ευθυνών εγγυήσεων, αποζημιώσεων και περιορισμών ευθύνης.
-
-      <a name="14"></a>
-
-      ## [14. Αποποίηση Ευθυνών Εγγυήσεων ](#14)
-
-
-      Ο Ιστότοπος παρέχεται ‘ως έχει’. Η %{company_name} και οι προμηθευτές και αδειοδότες της αποποιούνται όλες τις εγγυήσεις παντώς είδους, ρητά διατυπομένες ή εννοούμενες, περιλαμβανομένων, χωρίς περιορισμό, των εγγυήσεων εμπορευσιμότητας, καταλληλότητας για συγκεκριμένο σκοπό και μη παραβίασης. Ούτε η %{company_name} ούτε οι προμηθευτές και οι αδειοδότες της, εγγυώνται οτι ο Ιστότοπος δεν θα περιέχει λάθη ή οτι η πρόσβαση σε αυτόν θα είναι συνεχής και χωρίς διακοπή. Αν το διαβάζει αυτό: (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Κατανοείτε οτι η λήψη ή με άλλο τρόπο η παροχή υπηρεσιών ή περιεχομένου από τον Ιστότοπο υπόκειται στην δική σας διακριτική ευχέρεια και ανάληψη κινδύνου.
-
-      <a name="15"></a>
-
-      ## [15. Περιορισμός Ευθύνης ](#15)
-
-
-      Σε καμία περίπτωση η %{company_name} ή οι προμηθευτές ή αδειοδότες της, θα είναι υπεύθυνοι σχετικά με οποιοδήποτε θέμα του παρόντος Συμφωνητικού εξ αιτίας οποιουδήποτε συμβολαίου, αμέλειας, αυστηρής ευθύνης ή άλλης νομικής ή άλλης θεωρίας δικαίου για: (i) όποιες ειδικές, συμπτωματικές ή επακόλουθες βλάβες· (ii) το κόστος της προμήθειας για προϊόντα ή υπηρεσίες υποκατάστασης· (iii) την διακοπή της χρήσης ή απώλεια ή φθορά δεδομένων· ή (iv) οιαδήποτε ποσά που υπερβαίνουν τις αμοιβές που εσείς πληρώσατε στην %{company_name} στο πλαίσιο του παρόντος Συμφωνητικού κατά την περίοδο των 12 μηνών που προηγήθηκαν της αιτίας της ενέργειας. Η %{company_name} δεν θα έχει ευθύνη για οιαδήποτε αστοχία ή καθυστέρηση οφειλόμενη σε λόγους πέραν εύλογου εκ μέρους της ελέγχου. Τα ανωτέρω δεν ισχύουν πέραν των προβλεπομένων από τους εφαρμόσιμους νόμους.
-
-      <a name="16"></a>
-
-      ## [16. Γενική Εκπροσώπηση και Εγγύηση](#16)
-
-      Εκπροσωπείτε και εγγυάστε οτι (i) η χρήση σας του Ιστότοπου θα βρίσκεται σε αυστήρη συμμόρφωση με τις Πολιτικές Προστασίας Προσωπικών Δεδομένων της %{company_name},  [CommunityGuidelines] (/γενικές οδηγίες), με το παρόν Συμφωνητικό και με όλους τους εφαρμόσιμους νόμους και κανονισμούς (περιλαμβανομένων, χωρίς περιορισμό οιονδήποτε τοπικών νόμων ή κανονισμών της χώρας, πολιτείας, πόλης, ή άλλης περιοχής διακυβέρνησης, σε σχέση με την διαδικτυακή συμπεριφορά και αποδεκτό περιεχόμενο, και περιλαμβανομένων όλων των εφαρμόσιμων νόμων σχετικά με την μετάδοση τεχνικών δεδομένων εξαγομένων από την χώρα όπου αυτός ο Ιστότοπος ευρίσκεται ή εσείς ευρίσκεστε) και (ii) η εκ μέρους σας χρήση του Ιστότοπου δεν θα παραβίασει ή υπεξαιρέσει τα δικαιώματα πνευματικής ιδιοκτησίας τρίτων.
-
-
-
-      <a name="17"></a>
-
-      ## [17. Αποζημίωση](#17)
-
-      Συμφωνείτε να αποζημιώσετε και να φροντίσετε να μην βλαφθούν η %{company_name}, οι εργολάβοι της, και οι αδειοδότες της, καθώς και οι αντίστοιχοι διευθυντές, αξιωματούχοι, υπάλληλοι και παράγοντες τους από κάθε διεκδίκηση και έξοδα, περιλαμβανομένων αμοιβών δικηγόρων, που προκύπτουν από τη χρήση σας του Ιστότοπου, περιλαμβανομένης αλλά μη περιοριζόμενης στην εκ μέρους σας παραβίαση αυτού του Συμφωνητικού.
-
-      <a name="18"></a>
-
-      ## [18. Διάφορα](#18)
-
-      Το παρόν Συμφωνητικό αποτελεί το σύνολο της συμφωνίας μεταξύ της %{company_name} και εσάς σχετικά με το περιεχόμενο θέμα, και μπορεί να τροποποιηθεί μόνον με γραπτή τροπολογία υπογεγραμμένη από εξουσιοδοτημένο στέλεχος της %{company_name}, ή από την ανάρτηση αναθεωρημένης εκδόσεως από την %{company_name}. Εκτός αν ο εφαρμόσιμος νόμος, εφόσον υπάρχει, προβλέπει διαφορετικά, το παρόν Συμφωνητικό, οιαδήποτε πρόσβαση ή χρήση του Ιστότοπου ρυθμίζεται από τους νόμους της πολιτείας της Καλιφόρνια, Η.Π.Α., εξαιρουμένων των προβλέψεων για σύγκρουση νόμων, και ο κατάλληλος τόπος για διαφωνίες που προέρχονται από ή σχετίζονται με τα προαναφερθόντα, θα είναι τα πολιτειακά και ομοσπονδιακά δικαστήρια που βρίσκονται στην κομητεία του Σαν Φρανσίσκο, Καλιφόρνια. Εκτώς από αξιώσεις ασφαλιστικών μέτρων ή δίκαιης ανακούφισης ή αξιώσεων που αφορούν δικαιώματα πνευματικής ιδιοκτησίας (οι οποίες μπορεί να παρουσιαστούν σε κάθε αρμόδιο δικαστήριο χωρίς την πληρωμή εγγυήσεως), κάθε διαφωνία που εγείρεται στο πλαίσιο του παρόντος Συμψωνητικού θα ρυθμίζεται οριστικά σύμφωνα με τις προβλέψεις των Κανόνων Συνολικής Διαιτησίας της Υπηρεσίας Μεσολάβησης και Δικαστικής Διαιτησίας ΑΕ (‘’ΥΜΔΔ’’) από τρεις διαιτητές διορισμένους σύμφωνα με τις προβλέψεις αυτών των Κανόνων. Η διαιτησία θα λάβει χώρα στο Σαν Φρανσίσκο, Καλιφόρνια, στην Αγγλική γλώσσα και η διαιτητική απόφαση μπορεί να εφαρμοστεί σε οποιοδήποτε δικαστήριο. Η επικρατούσα πλευρά σε κάθε δράση ή διαδικασία εφαρμογής αυτής της Συμφωνίας δικαιούται έξοδα και αμοιβές δικηγόρων. Εάν κάποιο τμήμα του παρόντος Συμφωνητικού κριθεί άκυρο ή ανεφάρμοστο, αυτό το τμήμα θα ερμηνευθεί οτι αντανακλά τις αρχικές προθέσεις των μερών, και τα εναπομένοντα μέρη θα παραμείνουν σε πλήρη ισχύ και αποτέλεσμα. Η αποποίηση από οποιαδήποτε πλευρά, οιουδήποτε όρου ή προϋπόθεσης του παρόντος Συμφωνητικού ή παραβίασης τους, σε κάθε μία περίσταση δεν θα αποποιείται τον όρο ή την προϋπόθεση ή όποια επακόλουθη παραβίαση τους. Μπορείτε να αναθέσετε τα δικαιώματα σας στο πλαίσιο του παρόντος Συμφωνητικού σε οποιονδήποτε συναινεί και συμφωνεί να δεσμεύεται από τους όρους και τις προϋποθέσεις του· η %{company_name} μπορεί να αναθέσει τα δικαιώματα που έχει στο πλαίσιο του παρόντος Συμφωνητικού χωρίς περιορισμό. Το παρόν Συμφωνητικό είναι δεσμευτικό και θα ισχύει προς ώφελος των μερών, των διαδόχων και των επιτετραμένων τους.
-      Το παρόν κείμενο είναι CC-BY-SA. Η τελευταία ενημέρωση έγινε στις 31 Μαίου, 2013.
-      Η αρχική προσαρμογή έγινε από το [WordPress Terms of Service](http://en.wordpress.com/tos/).
-
-
   privacy_topic:
     title: "Πολιτική Ιδιωτικότητας"
     body: |
@@ -3043,7 +2871,6 @@ el:
     badge_title_metadata: "%{display_name} παράσημο στην %{site_title}"
   admin_login:
     success: "Το Email Στάλθηκε"
-    error: "Σφάλμα!"
     email_input: "Email Διαχειριστή"
     submit_button: "Αποστολή Email"
   performance_report:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index b0c2c5033d..7b162be31e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -63,6 +63,8 @@ en:
       default_subject: "This topic needs a title"
       show_trimmed_content: "Show trimmed content"
       maximum_staged_user_per_email_reached: "Reached maximum number of staged users created per email."
+      no_subject: "(no subject)"
+      no_body: "(no body)"
       errors:
         empty_email_error: "Happens when the raw mail we received was blank."
         no_message_id_error: "Happens when the mail has no 'Message-Id' header."
@@ -162,6 +164,7 @@ en:
     not_enough_space_on_disk: "There is not enough space on disk to upload this backup."
     invalid_filename: "The backup filename contains invalid characters. Valid characters are a-z 0-9 . - _."
 
+  invalid_params: "You supplied invalid parameters to the request: %{message}"
   not_logged_in: "You need to be logged in to do that."
   not_found: "The requested URL or resource could not be found."
   invalid_access: "You are not permitted to view the requested resource."
@@ -250,7 +253,7 @@ en:
     top_weekly: "Weekly top topics"
     top_daily: "Daily top topics"
     posts: "Latest posts"
-    private_posts: "Latest private messages"
+    private_posts: "Latest personal messages"
     group_posts: "Latest posts from %{group_name}"
     group_mentions: "Latest mentions from %{group_name}"
     user_posts: "Latest posts by @%{username}"
@@ -362,7 +365,7 @@ en:
     reviving_old_topic: |
       ### Revive this topic?
 
-      The last reply to this topic was **%{days}** days ago. Your reply will bump the topic to the top of its list and notify anyone previously involved in the conversation.
+      The last reply to this topic was **%{time_ago}**. Your reply will bump the topic to the top of its list and notify anyone previously involved in the conversation.
 
       Are you sure you want to continue this old conversation?
 
@@ -385,9 +388,9 @@ en:
         topic:
           attributes:
             base:
-              warning_requires_pm: "You can only attach warnings to private messages."
+              warning_requires_pm: "You can only attach warnings to personal messages."
               too_many_users: "You can only send warnings to one user at a time."
-              cant_send_pm: "Sorry, you cannot send a private message to that user."
+              cant_send_pm: "Sorry, you cannot send a personal message to that user."
               no_user_selected: "You must select a valid user."
               reply_by_email_disabled: "Reply by email has been disabled."
             featured_link:
@@ -403,6 +406,10 @@ en:
               unique_characters: "has too many repeated characters. Please use a more secure password."
             ip_address:
               signup_not_allowed: "Signup is not allowed from this account."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "Reassigning a primary email to another user is not allowed."
         color_scheme_color:
           attributes:
             hex:
@@ -952,12 +959,13 @@ en:
     bad_favicon_url: "The favicon is failing to load. Check your favicon_url setting in <a href='/admin/site_settings'>Site Settings</a>."
     poll_pop3_timeout: "Connection to the POP3 server is timing out. Incoming email could not be retrieved. Please check your <a href='/admin/site_settings/category/email'>POP3 settings</a> and service provider."
     poll_pop3_auth_error: "Connection to the POP3 server is failing with an authentication error. Please check your <a href='/admin/site_settings/category/email'>POP3 settings</a>."
+    force_https_warning: "Your website is using SSL. But `<a href='/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` is not yet enabled in your site settings."
 
   site_settings:
     censored_words: "Words that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Regex pattern that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days."
-    default_locale: "The default language of this Discourse instance (ISO 639-1 Code)"
+    default_locale: "The default language of this Discourse instance"
     allow_user_locale: "Allow users to choose their own language interface preference"
     set_locale_from_accept_language_header: "set interface language for anonymous users from their web browser's language headers. (EXPERIMENTAL, does not work with anonymous cache)"
     min_post_length: "Minimum allowed post length in characters"
@@ -989,6 +997,7 @@ en:
     download_remote_images_max_days_old: "Don't download remote images for posts that are more than n days old."
     disabled_image_download_domains: "Remote images will never be downloaded from these domains. Pipe-delimited list."
     editing_grace_period: "For (n) seconds after posting, editing will not create a new version in the post history."
+    staff_edit_locks_post: "Posts will be locked from editing if they are edited by staff members"
     post_edit_time_limit: "The author can edit or delete their post for (n) minutes after posting. Set to 0 for forever."
     edit_history_visible_to_public: "Allow everyone to see previous versions of an edited post. When disabled, only staff members can view."
     delete_removed_posts_after: "Posts removed by the author will be automatically deleted after (n) hours. If set to 0, posts will be deleted immediately."
@@ -1028,6 +1037,7 @@ en:
     summary_max_results: "Maximum posts returned by 'Summary This Topic'"
 
     enable_private_messages: "Allow trust level 1 (configurable via min trust level to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what."
+    enable_system_message_replies: "Allows users to reply to system messages, even if private messages are disabled"
     enable_private_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send private email messages. Note that staff can always send messages no matter what."
 
     enable_long_polling: "Message bus used for notification can use long polling"
@@ -1211,7 +1221,7 @@ en:
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
     purge_unactivated_users_grace_period_days: "Grace period (in days) before a user who has not activated their account is deleted. Set to 0 to never purge unactivated users."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
-    s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
+    s3_use_iam_profile: 'Use an <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 instance profile</a> to grant access to the S3 bucket. NOTE: enabling this requires Discourse to be running in an appropriately-configured EC2 instance, and overrides the "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
     s3_access_key_id: "The Amazon S3 access key id that will be used to upload images."
     s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images."
@@ -1274,9 +1284,9 @@ en:
 
     min_trust_to_allow_self_wiki: "The minimum trust level required to make user's own post wiki."
 
-    min_trust_to_send_messages: "The minimum trust level required to create new private messages."
+    min_trust_to_send_messages: "The minimum trust level required to create new personal messages."
 
-    min_trust_to_send_email_messages: "The minimum trust level required to send new private messages via email (to staged users)."
+    min_trust_to_send_email_messages: "The minimum trust level required to send new personal messages via email (to staged users)."
 
     newuser_max_links: "How many links a new user can add to a post."
     newuser_max_images: "How many images a new user can add to a post."
@@ -1365,7 +1375,7 @@ en:
     reply_by_email_enabled: "Enable replying to topics via email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "List of alternative templates for reply by email incoming email addresses. Example: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Use the HTML instead of the text for incoming email."
+    incoming_email_prefer_html: "Use HTML instead of text for incoming email."
 
     disable_emails: "Prevent Discourse from sending any kind of emails"
 
@@ -1455,6 +1465,9 @@ en:
     show_inactive_accounts: "Allow logged in users to browse profiles of inactive accounts."
 
     hide_suspension_reasons: "Don't display suspension reasons publically on user profiles."
+
+    log_personal_messages_views: "Log personal message views by Admin for other users/groups."
+
     user_website_domains_whitelist: "User website will be verified against these domains. Pipe-delimited list."
 
     allow_profile_backgrounds: "Allow users to upload profile backgrounds."
@@ -1505,7 +1518,7 @@ en:
     allowed_href_schemes: "Schemes allowed in links in addition to http and https."
     embed_post_limit: "Maximum number of posts to embed."
     embed_username_required: "The username for topic creation is required."
-    notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send a private message to staff. Set to 0 to disable."
+    notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send a personal message to staff. Set to 0 to disable."
     show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
 
     delete_drafts_older_than_n_days: Delete drafts older than (n) days.
@@ -1517,13 +1530,14 @@ en:
     slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
 
     enable_emoji: "Enable emoji"
+    enable_emoji_shortcuts: "Common smiley text such as :) :p :( will be converted to emojis"
     emoji_set: "How would you like your emoji?"
     enforce_square_emoji: "Force a square aspect ratio to all emojis."
 
     approve_post_count: "The amount of posts from a new or basic user that must be approved"
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
     approve_new_topics_unless_trust_level: "New topics for users below this trust level must be approved"
-    notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact_email. Set to 0 to disable these emails."
+    notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, send a notification to all moderators. Set to 0 to disable these notifications."
     auto_close_messages_post_count: "Maximum number of posts allowed in a message before it is automatically closed (0 to disable)"
     auto_close_topics_post_count: "Maximum number of posts allowed in a topic before it is automatically closed (0 to disable)"
 
@@ -1578,6 +1592,7 @@ en:
     show_filter_by_tag: "Show a dropdown to filter a topic list by tag."
     max_tags_in_filter_list: "Maximum number of tags to show in the filter dropdown. The most used tags will be shown."
     tags_sort_alphabetically: "Show tags in alphabetical order. Default is to show in order of popularity."
+    tags_listed_by_group: "List tags by tag group on the Tags page (/tags)."
     tag_style: "Visual style for tag badges."
     staff_tags: "A list of tags that can only be applied by staff members"
     min_trust_level_to_tag_topics: "Minimum trust level required to tag topics"
@@ -3169,7 +3184,7 @@ en:
 
       This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
 
-      This document is CC-BY-SA. It was last updated January 1, 2017.
+      This document is CC-BY-SA. It was last updated January 1, 2018.
 
       Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
 
@@ -3493,7 +3508,9 @@ en:
 
   admin_login:
     success: "Email Sent"
-    error: "Error!"
+    errors:
+      unknown_email_address: "Unknown email address."
+      invalid_token: "Invalid token."
     email_input: "Admin Email"
     submit_button: "Send Email"
 
@@ -3669,3 +3686,5 @@ en:
 
   search_logs:
     graph_title: "Search Count"
+
+  joined: "Joined"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 7befac1f30..3fb1b1119f 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -80,7 +80,7 @@ es:
       has_already_been_used: "ya se está utilizando"
       inclusion: no está incluido en la lista
       invalid: no es válido
-      is_invalid: "parece poco claro, es una oración completa?"
+      is_invalid: "parece poco claro, ¿es una oración completa?"
       contains_censored_words: "contiene las siguientes palabras censuradas: %{censored_words}"
       matches_censored_pattern: "contiene las siguientes palabras que coinciden con el regexp de censuras: %{censored_words}"
       less_than: debe ser menor que %{count}
@@ -141,8 +141,8 @@ es:
     one: "Lo sentimos, pero los usuarios nuevos están limitados a 1 respuesta en el mismo tema."
     other: "Lo sentimos, pero los usuarios nuevos están limitados a %{count} respuestas en el mismo tema."
   embed:
-    start_discussion: "Empezar discusión"
-    continue: "Continuar discusión"
+    start_discussion: "Empezar debate"
+    continue: "Continuar debate"
     error: "Error al insertar"
     referer: "Referente:"
     mismatch: "El referente no ha coincidido con ninguno de los siguientes hosts:"
@@ -178,7 +178,7 @@ es:
   too_many_links:
     one: "Lo sentimos, los nuevos usuarios solo pueden poner un link en un post."
     other: "Lo sentimos, los nuevos usuarios solo pueden poner %{count} enlaces en un post."
-  contains_blocked_words: "Tu post contiene palabras que no son permitidas."
+  contains_blocked_words: "Tu post contiene palabras que no están permitidas."
   spamming_host: "Lo sentimos, no puedes publicar un enlace a esa web."
   user_is_suspended: "A los usuarios suspendidos no se les permite publicar."
   topic_not_found: "Algo ha salido mal. ¿Tal vez este tema ha sido cerrado o eliminado mientras estabas lo estabas mirando?"
@@ -186,7 +186,7 @@ es:
   max_pm_recepients: "Lo sentimos, puedes enviar un mensaje a un máximo de %{recipients_limit} destinatarios."
   just_posted_that: "es demasiado parecido a lo que has publicado recientemente"
   invalid_characters: "contiene caracteres no válidos"
-  is_invalid: "parece poco claro, es una oración completa?"
+  is_invalid: "parece poco claro, ¿es una oración completa?"
   next_page: "siguiente página →"
   prev_page: "← página anterior"
   page_num: "Página %{num}"
@@ -210,7 +210,7 @@ es:
     top_weekly: "Semanal: Temas Top"
     top_daily: "Diario: Temas Top"
     posts: "Últimos posts"
-    private_posts: "Últimos mensajes privados"
+    private_posts: "Últimos mensajes personale"
     group_posts: "Últimos posts de %{group_name}"
     group_mentions: "Últimas menciones de %{group_name}"
     user_posts: "Posts recientes por @%{username}"
@@ -221,11 +221,11 @@ es:
   revert_version_same: "La versión actual es la misma que la versión a la que intentas volver."
   excerpt_image: "imagen"
   queue:
-    delete_reason: "Eliminado vía moderación"
-    not_found: "Post no encontrado o ya se actualizó."
+    delete_reason: "Eliminado vía cola de moderación de posts"
+    not_found: "Post no encontrado o ya actualizado."
   groups:
     success:
-      bulk_add: "usuarios %{users_added} han sido agregado al grupo."
+      bulk_add: "%{users_added} usuarios han sido agregados al grupo."
     errors:
       can_not_modify_automatic: "No se puede modificar un grupo automático"
       member_already_exist: "'%{username}' ya es miembro de este grupo."
@@ -251,7 +251,7 @@ es:
       one: "1 post"
       other: "%{count} posts"
     new-topic: |
-      Bienvenido a %{site_name} &mdash; **¡gracias por comenzar una nueva conversación!**
+      Bienvenido a %{site_name} &mdash; **¡gracias por empezar una nueva conversación!**
 
       - ¿El título describe de forma precisa tu tema? ¿Suena interesante?
 
@@ -273,11 +273,11 @@ es:
     avatar: |
       ### Por qué no una imagen para tu cuenta?
 
-      Has publicado pocos temas y respuestas, pero tu imagen de perfil no es único como lo eres tú., es sólo una letra.
+      Has publicado unos cuantos temas y respuestas, pero tu imagen de perfil no es único como lo eres tú., es sólo una letra.
 
-      Has considerado **[visitar tu perfil](%{profile_path})** y subir una imagen que te represente?
+      ¿Has considerado **[visitar tu perfil](%{profile_path})** y subir una imagen que te represente?
 
-      Es más fácil seguir debates y encontrar personas interesantes en las conversaciones cuando todos tienen una imagen de perfil única!
+      ¡Es más fácil seguir debates y encontrar personas interesantes en las conversaciones cuando todos tienen una imagen de perfil única!
     sequential_replies: |
       ### Considera la posibilidad de responder a varios posts a la vez
 
@@ -297,7 +297,7 @@ es:
 
       Has respondido %{count} veces a @%{reply_username} sólo en este tema.
 
-      Has considerado que puedes responder a las *otras* personas en el debate también? Una buena conversación incluye muchas respuestas y perspectivas.
+      ¿Has considerado que puedes responder a las *otras* personas en el debate también? Una buena conversación incluye muchas respuestas y perspectivas.
 
       Si necesitas mantener la conversación con ese usuario en particular, puedes [enviarle un mensaje privado](/u/%{reply_username}).
     too_many_replies: |
@@ -309,9 +309,9 @@ es:
     reviving_old_topic: |
       ### ¿Revivir este tema?
 
-      La última respuesta a este tema fue hace %{days} días. Tu post reactivará el tema subiéndolo a las primeras posiciones de la lista y notificará a aquellos involucrados en la conversación previa.
+      La última respuesta a este tema fue **%{time_ago}**. Tu respuesta revivirá el tema y lo subirá al principio de la lista, notificando a los que hayan participado anteriormente.
 
-      ¿Estás seguro de que quieres continuar esta conversación antigua?
+      ¿Seguro que quieres continuar este conversación antigua?
   activerecord:
     attributes:
       category:
@@ -328,9 +328,9 @@ es:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Solamente puedes enviar advertencias por mensajes privado."
+              warning_requires_pm: "Solo puedes adjuntar advertencias a mensajes personales."
               too_many_users: "Solamente puedes enviar advertencias a un usuario a la vez."
-              cant_send_pm: "Lo sentimos, no puedes enviar un mensaje privado a este usuario."
+              cant_send_pm: "Lo sentimos, no puedes enviarle mensajes personales a ese usuario."
               no_user_selected: "Debes seleccionar un usuario válido."
               reply_by_email_disabled: "Respuestas por email han sido desactivadas."
             featured_link:
@@ -341,11 +341,15 @@ es:
             password:
               common: "es una de las 10000 contraseñas más comunes. Por favor usa una contraseña más segura"
               same_as_username: "es la misma que tu nombre de usuario. Por favor, escoge una contraseña más segura."
-              same_as_email: "es el mismo que tu email. Por favor, utiliza una contraseña más segura."
+              same_as_email: "es la misma que tu email. Por favor, utiliza una contraseña más segura."
               same_as_current: "es la misma que tu contraseña actual."
               unique_characters: "tiene demasiados caracteres repetidos. Por favor usa una contraseña más segura."
             ip_address:
               signup_not_allowed: "El registro no está permitido para esta cuenta."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "No se puede reasignar un correo primario a otro usuario."
         color_scheme_color:
           attributes:
             hex:
@@ -384,9 +388,9 @@ es:
   staff_category_name: "Staff"
   staff_category_description: "Categoría privada para debates entre moderadores y administradores. Los temas solo serán visibles para miembros del staff."
   assets_topic_title: "Recursos para el diseño del sitio"
-  assets_topic_body: "Este tema, es visible únicamente para miembros del staff, con el fin de almacenar las imágenes y archivos utilizados en el diseño del sitio. ¡No lo elimines!\n\n\nCómo hacerlo:\n\n\n1. Responde a este tema.\n2. Sube todas las imágenes que desees para los logos, favicons y demás aquí. (Usa el icono de la barra de herramientas en el editor o arrastra y suelta las imágenes o pégalas). \n3. Publica tu respuesta.\n4. Haz clic con el botón derecho en las imágenes de tu nuevo post para obtener la ruta donde están subidas, o haz clic en el icono de editar para ver estas rutas en el panel de edición. Copia las rutas.\n5. Pega las rutas a las imágenes en [ajustes básicos](/admin/site_settings/category/required).\n\n\nSi necesitas habilitar la subida de diferentes tipos de archivo, edita `authorized_extensions` en las opciones de [archivos](/admin/site_settings/category/files)."
+  assets_topic_body: "Este tema, visible únicamente para miembros del staff,  tiene como fin el almacenar las imágenes y archivos utilizados en el diseño del sitio. ¡No lo elimines!\n\n\nCómo hacerlo:\n\n\n1. Responde a este tema.\n2. Sube todas las imágenes que desees para los logos, favicons y demás aquí. (Usa el icono de la barra de herramientas en el editor o arrastra y suelta las imágenes o pégalas). \n3. Publica tu respuesta.\n4. Haz clic con el botón derecho en las imágenes de tu nuevo post para obtener la ruta donde están subidas, o haz clic en el icono de editar para ver estas rutas en el panel de edición. Copia las rutas.\n5. Pega las rutas a las imágenes en [ajustes básicos](/admin/site_settings/category/required).\n\n\nSi necesitas habilitar la subida de diferentes tipos de archivo, edita `authorized_extensions` en las opciones de [archivos](/admin/site_settings/category/files)."
   discourse_welcome_topic:
-    title: "Bienvenido a Discourse"
+    title: "Te damos la bienvenida a Discourse"
     body: |2
 
       El primer párrafo de este tema destacado (tema fijo) será visible para todos los usuarios como mensaje de bienvenida en tu página principal. Es importante!
@@ -508,20 +512,20 @@ es:
         one: "1d"
         other: "%{count}d"
       about_x_months:
-        one: "1mon"
-        other: "%{count}mon"
+        one: "1mes"
+        other: "%{count}mes"
       x_months:
-        one: "1mon"
-        other: "%{count}mon"
+        one: "1mes"
+        other: "%{count}mes"
       about_x_years:
-        one: "1y"
-        other: "%{count}y"
+        one: "1a"
+        other: "%{count}a"
       over_x_years:
-        one: "> 1y"
-        other: "> %{count}y"
+        one: "> 1a"
+        other: "> %{count}a"
       almost_x_years:
-        one: "1y"
-        other: "%{count}y"
+        one: "1a"
+        other: "%{count}a"
     distance_in_words_verbose:
       half_a_minute: "ahora mismo"
       less_than_x_seconds:
@@ -560,7 +564,7 @@ es:
   password_reset:
     no_token: "Lo sentimos, ese enlace para cambiar la contraseña es demasiado antiguo. Haz clic en el botón Iniciar sesión y utiliza el 'olvidé mi contraseña' para obtener un nuevo enlace. "
     choose_new: "Escoge una nueva contraseña"
-    choose: "Escoge una contraseñ"
+    choose: "Escoge una contraseña"
     update: 'Actualizar contraseña'
     save: 'Establecer contraseña'
     title: 'Restablecer contraseña'
@@ -580,22 +584,22 @@ es:
     already_done: "Lo sentimos, este link de confirmación de cuenta ya no es válido. ¿Quizás tu cuenta ya está activa?"
     please_continue: "Tu nueva cuenta está confirmada; se te redirigirá a la página de inicio."
     continue_button: "Continuar a %{site_name}"
-    welcome_to: "Bienvenido a %{site_name}!"
-    approval_required: "Un moderador debe aprobar manualmente tu nueva cuenta antes de que puedas acceder a este foro. ¡Recibirás un email cuando tu cuenta sea aprobada!"
-    missing_session: "No hemos podido detectar si tu cuenta fue creada. Por favor, asegúrate de tener activadas las cookies en tu navegador."
+    welcome_to: "¡Te damos la bienvenida a %{site_name}!"
+    approval_required: "Un moderador o moderadora debe aprobar manualmente tu nueva cuenta antes de que puedas acceder a este foro. ¡Recibirás un email cuando tu cuenta sea aprobada!"
+    missing_session: "No hemos podido detectar si tu cuenta ha sido creada. Por favor, asegúrate de tener activadas las cookies en tu navegador."
     activated: "Disculpa, esta cuenta ya ha sido activada."
     admin_confirm:
-      title: "Confirmar Cuenta Administrador"
+      title: "Confirmar cuenta administrativa"
       description: "Estás seguro que quieres que <b>%{target_username}</b> sea un administrador?"
-      grant: "Conceder acceso de Admin"
+      grant: "Conceder acceso de administración"
       complete: "<b>%{target_username}</b> es ahora un administrador."
       back_to: "Volver al %{title}"
   post_action_types:
     off_topic:
-      title: 'Off-Topic'
+      title: 'Fuera de tema'
       description: 'Este post se desvía demasiado o no es relevante para el tema en cuestión (definido por el título del tema y su primer post), probablemente debería ser movido a otro hilo.'
-      short_description: 'No es relevante para la discusión'
-      long_form: 'reportado como off-topic'
+      short_description: 'No es relevante para el debate'
+      long_form: 'reportado como fuera de tema'
     spam:
       title: 'Spam'
       description: 'Este post es publicidad, o vandalismo. No es útil o relevante para el tema.'
@@ -628,7 +632,7 @@ es:
       short_description: 'Guarda este post'
       long_form: 'Post marcado'
     like:
-      title: 'Like'
+      title: 'Me gusta'
       description: 'Te gusta este post'
       short_description: 'Te gusta este post'
       long_form: 'Te gusta esto'
@@ -636,7 +640,7 @@ es:
       title: 'Vota'
       description: 'Vota por este post'
       short_description: 'Vota por este post'
-      long_form: 'Votado para este post'
+      long_form: 'votado por este post'
   user_activity:
     no_default:
       self: "No tienes actividad aún."
@@ -672,13 +676,13 @@ es:
     regular:
       title: "Tema normal"
     banner:
-      title: "Tema de Encabezado"
+      title: "Tema de encabezado"
       message:
         make: "Este tema se utiliza ahora como banner. Aparecerá en la parte superior de cada página hasta que sea descartada por el usuario."
         remove: "Este tema ya no se utiliza como banner. Ya no aparecerá en la parte superior de cada página."
   unsubscribed:
     title: "¡Suscripción cancelada!"
-    description: "<b>%{email}</b> ha sido desuscrito. Para cambiar la configuración del email <a href='%{url}'>visita las preferencias del usuario</a>."
+    description: "<b>%{email}</b> se ha desuscrito. Para cambiar la configuración del email, <a href='%{url}'>visita las preferencias del usuario</a>."
     topic_description: "Para volver a suscribirte a %{link}, utiliza el desplegable de notificación al pie o en la parte derecha del tema."
   unsubscribe:
     title: "Cancelar suscripción"
@@ -873,7 +877,6 @@ es:
     censored_words: "Las palabras serán reemplazadas con &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Patrones de Regex serán automáticamente reemplazados con &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-borrar cualquier post que se quede oculto por mas de 30 días."
-    default_locale: "El idioma por defecto de Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permitir que los usuarios escojan su propio idioma para la interfaz"
     set_locale_from_accept_language_header: "Establece el lenguaje de la interfaz para usuarios anónimos desde el lenguaje declarado por su navegador web. (EXPERIMENTAL, no funciona con caché anónimo)"
     min_post_length: "Extensión mínima de los posts, en número de caracteres"
@@ -905,6 +908,7 @@ es:
     download_remote_images_max_days_old: "No descargar imágenes remotas de posts que sean más antiguos de n días."
     disabled_image_download_domains: "Las imágenes remotas que provengan de estos dominios no serán descargadas. Lista delimitada por barras."
     editing_grace_period: "Durante (n) segundos después de publicar un post, se puede editar ese post sin crear una nueva versión en el historial."
+    staff_edit_locks_post: "Los mensajes serán bloqueados y no podrán ser editados por usuarios si son editados por miembros del staff."
     post_edit_time_limit: "El autor puede editar o eliminar su post durante (n) minutos después de publicarlo. Pon un 0 para que pueda hacerlo siempre."
     edit_history_visible_to_public: "Permitir a todos ver las versiones previas de un post editado. Si se deshabilita, solo los miembros del staff podrán verlas."
     delete_removed_posts_after: "Los posts borrados por su autor serán automáticamente eliminados después de (n) horas. Si se establece este valor a 0, los posts serán eliminados automáticamente."
@@ -1091,7 +1095,6 @@ es:
     purge_deleted_uploads_grace_period_days: "Período de gracia (en días) antes de que una subida eliminada sea borrada totalmente."
     purge_unactivated_users_grace_period_days: "Periodo de gracia (en días) antes de que un usuario que no ha activado su cuenta sea borrado. Configurar a 0 para que nunca se purgue a usuarios no activados."
     enable_s3_uploads: "Coloca los archivos subidos en el almacén Amazon S3. IMPORTANTE: requiere de credenciales de S3 validas. (ambas clave de acceso y clave de acceso secreta)."
-    s3_use_iam_profile: 'Usar el rol de AWS EC2 IAM para descargar las llaves. NOTA: habilitando esta opción ignorará la "llave de acceso s3" y "la llave de acceso secreta s3".'
     s3_upload_bucket: "El nombre del bucket Amazon S3 donde se subirán los archivos. AVISO: debe ser en minúsculas, sin puntos ni guiones bajos."
     s3_access_key_id: "La clave id de acceso de Amazon S3 que se utilizará para subir imágenes."
     s3_secret_access_key: "La clave secreta de acceso de Amazon S3 que se utilizará para subir imágenes."
@@ -1137,8 +1140,6 @@ es:
     min_trust_to_edit_wiki_post: "El mínimo nivel de confianza requerido para editar un post marcado como wiki."
     min_trust_to_edit_post: "El mínimo nivel de confianza requerido para editar posts."
     min_trust_to_allow_self_wiki: "El mínimo nivel de confianza requerido para que un usuario convierta sus propios posts a wiki."
-    min_trust_to_send_messages: "Mínimo nivel de confianza requerido para crear nuevos mensajes directos."
-    min_trust_to_send_email_messages: "El nivel de confianza mínimo necesario para enviar nuevos mensajes privados por correo electrónico (a los usuarios en escena)."
     newuser_max_links: "Cuántos enlaces puede un nuevo usuario añadir a un post."
     newuser_max_images: "Cuántas imágenes puede un nuevo usuario añadir a un post."
     newuser_max_attachments: "Cuántos adjuntos puede un nuevo usuario añadir a un post."
@@ -1206,8 +1207,7 @@ es:
     reply_by_email_enabled: "Habilitar la respuesta a temas por email."
     reply_by_email_address: "Plantilla para la dirección de email que aparecerá al recibir correos con la función de respuesta por email: %{reply_key}@respuesta.ejemplo.com o respuestas+%{reply_key}@ejemplo.com"
     alternative_reply_by_email_addresses: "Lista de plantillas alternativa para las direcciones de respuesta por email. Ejemplo: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Usar el HTML en vez del texto del email entrante."
-    disable_emails: "Impedir que Discourse envié cualquier tipo de e-mail."
+    disable_emails: "Impedir que Discourse envíe cualquier tipo de emails"
     strip_images_from_short_emails: "Remover imágenes de e-mails que tengan un tamaño menor a 2800 Bytes"
     short_email_length: "e-mail corto longitud en Bytes"
     display_name_on_email_from: "Mostrar nombres completos en los campos de remitente de emails"
@@ -1311,7 +1311,6 @@ es:
     allowed_href_schemes: "Esquemas permitidos en enlaces además de http y https."
     embed_post_limit: "Número máximo de posts a embeber."
     embed_username_required: "Se requiere el nombre de usuario para la creación de temas."
-    notify_about_flags_after: "Si hay reportes que no han sido revisados después de este número de horas, enviar un correo electrónico al staff. Deshabilita esta opción introduciendo el valor 0."
     show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas."
     delete_drafts_older_than_n_days: Eliminar borradores de más de (n) días de antigüedad.
     bootstrap_mode_min_users: "Mínimo número de usuarios requerido para desactivar el modo bootstrap (pon 0 para desactivar esta opción)"
@@ -1323,7 +1322,6 @@ es:
     approve_post_count: "La cantidad de posts que deben ser aprobados de usuarios nuevos o de nivel básico"
     approve_unless_trust_level: "Los posts de usuarios con un nivel de confianza inferior a este deberán ser aprobados"
     approve_new_topics_unless_trust_level: "Los nuevos temas de usuarios por debajo de este nivel de confianza deben ser aprobados"
-    notify_about_queued_posts_after: "Si hay publicaciones que han estado esperando para ser revisadas por más de este número de horas, se enviará un email a la dirección de contacto del sitio. Pon 0 para desactivar estos emails."
     auto_close_messages_post_count: "Máximo número de publicaciones permitidas en un mensaje antes de que sea cerrado automáticamente (0 para desactivar)"
     auto_close_topics_post_count: "Máximo número de publicaciones permitidas en un tema antes de que sea cerrado automáticamente (0 para desactivar)"
     code_formatting_style: "El botón de código en el editor se establecerá por defecto a este estilo de formato de código"
@@ -1423,8 +1421,8 @@ es:
   most_recent_poster: "Autor más reciente"
   frequent_poster: "Autor frecuente"
   redirected_to_top_reasons:
-    new_user: "¡Bienvenido a nuestra comunidad! Estos son los temas recientes mas populares."
-    not_seen_in_a_month: "¡Bienvenido de vuelta! No te habíamos visto en un tiempo. Estos son los temas mas populares desde que no has estado."
+    new_user: "¡Bienvenido a nuestra comunidad! Estos son los temas recientes más populares."
+    not_seen_in_a_month: "¡Bienvenido de vuelta! No te habíamos visto en un tiempo. Estos son los temas más populares desde estuviste por aquí."
   merge_posts:
     edit_reason:
       one: "Un tema fue juntado por %{username}"
@@ -1524,7 +1522,7 @@ es:
     click_to_continue: "Clic aquí para continuar."
     already_logged_in: "Ups, parece que estás intentando aceptar una invitación dirigida a otro usuariol. Si no eres %{current_user}, por favor cierra sesión e inténtalo de nuevo."
   user:
-    no_accounts_associated: "No hay cuentas relacionadas."
+    no_accounts_associated: "No hay cuentas asociadas"
     deactivated: "Ha sido desactivado a causa de muchos rebotes al email '%{email}'."
     deactivated_by_staff: "Desactivado por el staff"
     activated_by_staff: "Activado por el staff"
@@ -1796,7 +1794,7 @@ es:
 
         ¡Disfruta de tu estancia!
     welcome_invite:
-      title: "Bienvenido Invitado"
+      title: "Bienvenido, Invitado"
       subject_template: "¡Bienvenido a %{site_name}!"
       text_body_template: |
         Gracias por aceptar tu invitación a %{site_name} -- ¡Te damos la bienvenida!
@@ -1816,7 +1814,7 @@ es:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       title: "Copia de seguridad completada con éxito"
-      subject_template: "La copia de seguridad se completo exitosamente"
+      subject_template: "La copia de seguridad se ha completado con éxito"
       text_body_template: |+
         Copia de seguridad realizada con éxito.
 
@@ -1830,7 +1828,7 @@ es:
 
     backup_failed:
       title: "Error en la copia de seguridad"
-      subject_template: "La copia de seguridad falló"
+      subject_template: "La copia de seguridad ha fallado"
       text_body_template: |
         La copia de seguridad ha fallado.
 
@@ -1841,7 +1839,7 @@ es:
         ```
     restore_succeeded:
       title: "Restauración completada con éxito"
-      subject_template: "Restauración completada exitosamente."
+      subject_template: "Restauración completada con éxito"
       text_body_template: |
         La restauración se ha completado con éxito.
 
@@ -1852,7 +1850,7 @@ es:
         ```
     restore_failed:
       title: "Error en la restauración"
-      subject_template: "La restauración falló."
+      subject_template: "La restauración ha fallado."
       text_body_template: |
         La restauración ha fallado.
 
@@ -2062,7 +2060,7 @@ es:
 
         Esto es un mensaje automático de %{site_name} para hacerte saber que tus mensajes han sido ocultados temporalmente porque han sido reportados muchas veces por la comunidad.
 
-        Como medida cautelar, tu cuenta nueva ha sido silenciada de crear nuevas respuestas o debates hasta que un miembro del staff la revise tu cuenta. Sentimos las molestias ocasionadas.
+        Como medida cautelar, tu cuenta nueva ha sido silenciada y no puede crear nuevas respuestas o debates hasta que un miembro del staff la revise. Sentimos las molestias ocasionadas.
 
         Para más información sobre lo que consideramos adecuado, lee las [directrices de la comunidad](%{base_url}/guidelines).
     too_many_tl3_flags:
@@ -2071,13 +2069,13 @@ es:
       text_body_template: |
         Hola,
 
-        Esto es un mensaje automático de %{site_name} para hacerte saber que tu cuenta ha sido retenida porque ha sido reportada muchas veces por la comunidad.
+        Este es un mensaje automático de %{site_name} para hacerte saber que tu cuenta ha sido retenida porque ha sido reportada muchas veces por la comunidad.
 
-        Como medida cautelar, tu cuenta nueva ha sido silenciada de crear nuevas respuestas o debates hasta que un miembro del staff la revise tu cuenta. Sentimos las molestias ocasionadas.
+        Como medida cautelar, tu cuenta nueva ha sido silenciada y no puede crear nuevas respuestas o debates hasta que un miembro del staff la revise. Sentimos las molestias ocasionadas.
 
         Para más información, por favor lee las [directrices de la comunidad](%{base_url}/guidelines).
     silenced_by_staff:
-      title: "Silenciado por Staff"
+      title: "Silenciado por el Staff"
       subject_template: "Cuenta temporalmente retenida"
       text_body_template: |
         Hola,
@@ -2111,11 +2109,11 @@ es:
         Esto puede ser modificado a través de los ajustes `newuser_spam_host_threshold` y `newuser_spam_host_threshold`.
     unsilenced:
       title: "Dejar de silenciar"
-      subject_template: "Cuenta no retenida"
+      subject_template: "Tu cuenta ya no está retenida"
       text_body_template: |
         Hola,
 
-        Este es un mensaje automático desde %{site_name} para informarte que tu cuenta no se encuentra retenida debido a la revisión de miembros del staff.
+        Este es un mensaje automático de %{site_name} para informarte que tu cuenta ya no se encuentra retenida y ha sido revisada por miembros del staff.
 
         Ahora puedes crear temas, y responder a otros usuarios. Gracias por tu paciencia.
     pending_users_reminder:
@@ -2142,7 +2140,7 @@ es:
       title: "¡Eres el Nuevo Usuario del Mes!"
       subject_template: "¡Eres el Nuevo Usuario del Mes!"
       text_body_template: |
-        ¡Felicitaciones, has ganado el **premio Nuevo Usuario del Mes para %{month_year}**. :trophy: !
+        ¡Felicitaciones, has ganado el **premio Nuevo Usuario del Mes para %{month_year}**. :trophy:!
 
         Este premio solo lo ganan dos de los nuevos miembros por mes, y será visible permanentemente en [la página de distintivos](%{url}).
 
@@ -2669,144 +2667,9 @@ es:
 
       Sí, estos temas aburren, pero debemos protegernos &ndash; y, por extensión, a ti y a tus datos &ndash; frente a gente poco amigable. Tenemos unos [Términos del Servicio](/tos) que describen nuestra forma de actuar (y la tuya), y los derechos con relación al contenido, la privacidad y las leyes, Para usar nuestros servicios, debes aceptar nuestros [Términos y Condiciones](/tos).
   tos_topic:
-    title: "Términos de Servicio"
-    body: |
-      The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
-
-      Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
-
-      <a name="1"></a>
-
-      ## [1. Your %{company_domain} Account](#1)
-
-      If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
-
-      <a name="2"></a>
-
-      ## [2. Responsibility of Contributors](#2)
-
-      If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
-
-      *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
-      *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
-      *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
-      *   the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
-      *   the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
-      *   the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;
-      *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
-      *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
-      *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
-
-      <a name="3"></a>
-
-      ## [3. User Content License](#3)
-
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
-
-
-      <a name="4"></a>
-
-      ## [4. Payment and Renewal](#4)
-
-      ### General Terms
-
-      Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
-
-      ### Automatic Renewal
-
-      Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
-
-      <a name="5"></a>
-
-      ## [5. Services](#5)
-
-      ### Hosting, Support Services
-
-      Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
-
-      <a name="6"></a>
-
-      ## [6. Responsibility of Website Visitors](#6)
-
-      %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
-
-      <a name="7"></a>
-
-      ## [7. Content Posted on Other Websites](#7)
-
-      We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
-
-      <a name="8"></a>
-
-      ## [8. Copyright Infringement and DMCA Policy](#8)
-
-      As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Intellectual Property](#9)
-
-      This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
-
-      <a name="10"></a>
-
-      ## [10. Advertisements](#10)
-
-      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
-
-      <a name="11"></a>
-
-      ## [11. Attribution](#11)
-
-      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
-
-      <a name="12"></a>
-
-      ## [12. Changes](#12)
-
-      %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
-
-      <a name="13"></a>
-
-      ## [13. Termination](#13)
-
-      %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-
-      <a name="14"></a>
-
-      ## [14. Disclaimer of Warranties](#14)
-
-      The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
-
-      <a name="15"></a>
-
-      ## [15. Limitation of Liability](#15)
-
-      In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
-
-      <a name="16"></a>
-
-      ## [16. General Representation and Warranty](#16)
-
-      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
-
-      <a name="17"></a>
-
-      ## [17. Indemnification](#17)
-
-      You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
-
-      <a name="18"></a>
-
-      ## [18. Miscellaneous](#18)
-
-      This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
-
-      This document is CC-BY-SA. It was last updated May 31, 2013.
-
-      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
+    title: "Términos del servicio"
   privacy_topic:
-    title: "Políticas de Privacidad"
+    title: "Política de privacidad"
     body: |
       <a name="collect"></a>
 
@@ -3126,7 +2989,6 @@ es:
     badge_title_metadata: "%{display_name} distintivo en %{site_title}"
   admin_login:
     success: "Email enviado"
-    error: "¡Error!"
     email_input: "Email de admin"
     submit_button: "Enviar email"
   performance_report:
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index a7fa24e09c..4f9f296593 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -184,7 +184,6 @@ et:
     hot: "Populaarsed teemad"
     top: "Parimad teemad"
     posts: "Viimased postitused"
-    private_posts: "Viimased privaatsõnumid"
     group_posts: "Viimased postitused grupilt %{group_name}"
     group_mentions: "Viimati mainitud grupis %{group_name}"
     user_posts: "Viimased postitused kasutajalt @%{username}"
@@ -253,9 +252,7 @@ et:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Saad hoiatusi lisada vaid privaatsõnumitele."
               too_many_users: "Saad hoiatusi saata vaid ühele kasutajale korraga."
-              cant_send_pm: "Vabanda, sa ei saa sellele kasutajale privaatsõnumit saata."
               no_user_selected: "Pead valima sobiva kasutaja."
             featured_link:
               invalid: "on vigane. URL peab sisaldama http:// või https://."
@@ -882,7 +879,6 @@ et:
       name: Esimene vastamine meiliga
   admin_login:
     success: "Kiri saadetud"
-    error: "Viga!"
     email_input: "Admini kiri"
     submit_button: "Saada kiri"
   tags:
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 2635f3c403..c68066aac8 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -191,7 +191,6 @@ fa_IR:
     top_weekly: "برترین موضوعات هفتگی"
     top_daily: "برتین موضوعات روزانه"
     posts: "آخرین نوشته‌ها"
-    private_posts: "آخرین پیام‌های خصوصی"
     group_posts: "آخرین نوشته‌ها در گروه %{group_name}"
     group_mentions: "آخرین اشاره‌ها از %{group_name}"
     user_posts: "آخرین نوشته ها توسط @%{username}"
@@ -284,12 +283,6 @@ fa_IR:
       با عرض پوزش، محدودیت %{newuser_max_replies_per_topic} پاسخ در هر موضوع برای کاربران جدید وجود دارد.
 
       به جای افزودن پاسخ‌های دیگر پاسخ‌های قبلی را ویرایش کنید یا موضوعات دیگر را ببینید
-    reviving_old_topic: |
-      ### می‌خواهید موضوع را احیا کنید؟
-
-      آخرین پاسخ **%{days}** روز قبل بوده. نوشته‌ی شما موضوع را به بالای لیست خواهد آورد و تمام افرادی که در این بحث شرکت کردند متوجه خواهند شد.
-
-      آیا ادامه می‌دهید؟
   activerecord:
     attributes:
       category:
@@ -306,9 +299,7 @@ fa_IR:
         topic:
           attributes:
             base:
-              warning_requires_pm: "شما فقط قادر به ضمیمه کردن اخطار در پیام‌های خصوصی هستید."
               too_many_users: "شما در هر بار می توانید به یک کاربر اخطار ارسال نمایید."
-              cant_send_pm: "متأسفانه ، شما نمی‌توانید به این کاربر پیام‌خصوصی بفرستید."
               no_user_selected: "باید یک کاربر معتبر انتخاب کنید"
               reply_by_email_disabled: "پاسخ با ایمیل از کار انداخته شده است."
             featured_link:
@@ -814,7 +805,6 @@ fa_IR:
     censored_words: "کلماتی که به صورت خودکار جایگزین می شوند با  &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "الگوی Regex به صورت خودکار با &#9632;&#9632;&#9632;&#9632; جا به جا می‌شود."
     delete_old_hidden_posts: "پاک کردن خودکار تمام نوشته‌هایی که بیش از 30 روز بصورت پنهان باقی می‌مانند. "
-    default_locale: "زبان پیشفرض برای دیسکورس  (ISO 639-1 کد)"
     allow_user_locale: "اجازه انتخاب زبان به کاربران داده شود."
     set_locale_from_accept_language_header: "تنظیم زبان برای رابط کاربری کاربران ناشناس که از هدر مرورگر دریافت می‌شود. (تجربی، با کش ناشناس کار نمی‌کند)"
     min_post_length: "حداقل طول مجاز نوشته به نویسه"
@@ -1011,7 +1001,6 @@ fa_IR:
     clean_orphan_uploads_grace_period_hours: "دوره معافیت (واحد ساعت) قبل از اینکه بارگذاری‌های بدون ریشه پاک شوند. "
     purge_deleted_uploads_grace_period_days: "دوره معافیت (واحد روز) قبل از اینکه بارگذاری‌های پاک شده حذف شوند. "
     enable_s3_uploads: "مکان بارگزاری ها در فضای Amazon S3. مهم: به اطلاعات ورود S3 صحیح معتبر نیاز است (a3 access key id و s3 secret key)"
-    s3_use_iam_profile: 'از نقش AWS EC2 IAM  برای بازیابی کلید‌ها استفاده کن. نکته: بکارگیری این مورد موجب باطل کردن  تنظیمات "s3 access key id"  و "s3 secret access key" می شود. '
     s3_upload_bucket: "نام میزبان Amazon S3 که فایل‌ها در آنجا بارگذاری می شود. اخطار: باید حروف کوچک باشد٬ بدون دوره٬‌ بدون زیرخط"
     s3_access_key_id: "ID کلید درسترسی Amazon S3 که برای بارگذاری عکس‌ها استفاده می‌شود."
     s3_secret_access_key: "کلید درسترسی مخفی Amazon S3 که برای بارگذاری عکس‌ها استفاده می‌شود."
@@ -1057,7 +1046,6 @@ fa_IR:
     min_trust_to_edit_wiki_post: "حداقل سطح اعتماد برای ویرایش نوشته ای که به‌عنوان دانشنامه نشانه‌گزاری شده است. "
     min_trust_to_edit_post: "حداقل سطح اعتماد برای ویرایش نوشته مورد نیاز است."
     min_trust_to_allow_self_wiki: "حداقل سطح اعتماد برای تبدیل نوشته‌ی خود به دانش‌نامه نیاز است."
-    min_trust_to_send_messages: "حداقل سطح اعتماد برای ایجاد پیام خصوصی جدید نیاز است."
     newuser_max_links: "کاربر جدید می تواند چند پیوند به نوشته اضافه کند. "
     newuser_max_images: "کاربر جدید می تواند چند عکس به نوشته اضافه کند."
     newuser_max_attachments: "کاربر جدید می تواند چند پیوست اضافه کند به پست. "
@@ -1120,7 +1108,6 @@ fa_IR:
     reply_by_email_enabled: "Enable replying to topics via email."
     reply_by_email_address: "نمونه برای پاسخ به ایمیل، آدرس‌های ایمیل آمده برای مثال: %{reply_key}@reply.example.com یا replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "لیست قالب‌های مشابه برای پاسخ به ایمیل‌های دریافتی. مثال:\n%{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "استفاده از HTML به جای متن در ایمیل‌های ورودی."
     disable_emails: "به discourse اجازه ارسال هیچ گونه ایمیلی را نده"
     strip_images_from_short_emails: "محروم کردن تصاویر از ایمیل‌هایی با حجم کمتر از 2800 بایت"
     short_email_length: "طول ایمیل کوتاه به بایت"
@@ -1218,7 +1205,6 @@ fa_IR:
     allowed_href_schemes: "طرح‌ها در لینک‌های http و https مجازند"
     embed_post_limit: "حداکثر تعداد نوشته‌هایی که می‌توانید جا‌سازی کنید. "
     embed_username_required: "نام‌کاربری برای ایجاد تاپیک مورد نیاز است."
-    notify_about_flags_after: "اگر پرچم‌ها بعد از چند ساعت حل نشدند، یک پیام خصوصی به کارمندان ارسال کن. 0 برای غیرفعال"
     show_create_topics_notice: "اگر سایت کمتر از 5 موضوع عمومی دارد٬ مدیران اطلاع بده تا موضوعات بیشتری بسازند."
     delete_drafts_older_than_n_days: پیش‌نویس‌های قدیمی‌تر از (n) روز را حذف کن
     bootstrap_mode_min_users: "حداقل تعداد کاربرانی که نیاز است تا حالت خود‌راه‌انداز غیر‌فعال شود (0 برای غیر‌فعال)"
@@ -1230,7 +1216,6 @@ fa_IR:
     approve_post_count: "تعداد نوشته‌های کاربر جدید که باید تایید شود."
     approve_unless_trust_level: "نوشته‌ها برای کاربران پایین تر از این سطح اعتماد نیاز به تایید دارد. "
     approve_new_topics_unless_trust_level: "موضوعات جدید برای کاربرانی با کمتر از این سطح اعتماد باید تایید شود"
-    notify_about_queued_posts_after: "در صورتی که نوشته‌هایی بیش از این مقدار ساعت منتظر تایید باشند یک ایمیل به contact_email ارسال می‌شود. تنظیم به 0 برای غیرفعال‌سازی ایمیل ها."
     auto_close_messages_post_count: "حداکثر تعداد نوشته‌های مجاز برای پیام‌خصوصی قبل از اینکه به صورت خودکار بسته شود (0 برای غیر فعال)"
     auto_close_topics_post_count: "حداکثر تعداد نوشته‌های مجاز برای موضوع قبل از اینکه به صورت خودکار بسته شود (0 برای غیر فعال)"
     code_formatting_style: "کد دکمه در composer به صورت پیشفرض این حالت خواهد بود"
@@ -2322,7 +2307,6 @@ fa_IR:
     badge_title_metadata: "نشان %{display_name} در %{site_title}"
   admin_login:
     success: "ایمیل ارسال شد "
-    error: "خطا!"
     email_input: "ایمیل مدیر ارشد"
     submit_button: "ارسال ایمیل "
   performance_report:
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 76998f092e..cc8c3e9a59 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -209,7 +209,6 @@ fi:
     top_weekly: "Viikon parhaat ketjut"
     top_daily: "Päivän parhaat ketjut"
     posts: "Uusimmat viestit"
-    private_posts: "Uusimmat yksityisviestit"
     group_posts: "Uusimmat viestit ryhmässä %{group_name}"
     group_mentions: "Uusimmat maininnat ryhmässä %{group_name}"
     user_posts: "Viimeisimmät viestit käyttäjältä @%{username}"
@@ -306,12 +305,6 @@ fi:
       Olemme pahoillamme, mutta uusien käyttäjien viestien määrä on rajoitettu %{newuser_max_replies_per_topic} vastaukseen samassa ketjussa.
 
       Harkitse edellisten viestiesi muokkaamista uuden viestin kirjoittamisen sijaan tai vieraile muissa ketjuissa.
-    reviving_old_topic: |
-      ### Elvytä tämä ketju?
-
-      Viimeisin vastaus tähän ketjuun on %{days} päivän takaa. Vastauksesi nostaa ketjun listauksen kärkeen ja lähettää ilmoituksen kaikille, jotka ovat aiemmin olleet osallistuneet keskusteluun
-
-      Oletko varma, että haluat jatkaa tätä vanhaa keskustelua?
   activerecord:
     attributes:
       category:
@@ -328,9 +321,7 @@ fi:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Voit liittää varoituksia vain yksityisviesteihin."
               too_many_users: "Voit lähettää varoituksia vain yhdelle käyttäjälle kerrallaan."
-              cant_send_pm: "Pahoittelut, et voi lähettää tälle käyttäjälle yksityisviestiä."
               no_user_selected: "Sinun täytyy valita kelpaava käyttäjä."
               reply_by_email_disabled: "Sähköpostilla vastaaminen ei ole käytössä."
             featured_link:
@@ -873,7 +864,6 @@ fi:
     censored_words: "Sanat, jotka korvataan automaattisesti merkeillä &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Säännöllinen lauseke, joka korvataan automaattisesti &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Poista automaattisesti kaikki yli 30 päivää piilotettuna olleet viestit."
-    default_locale: "Sivuston oletuskieli (ISO 639-1 koodi)"
     allow_user_locale: "Salli käyttäjien vaihtaa käyttöliittymän kieli omista asetuksista"
     set_locale_from_accept_language_header: "Aseta sivuston kieli kirjautumattomille käyttäjille selaimen kielivalinnan perusteella. (KOKEELLINEN, ei toimi anonyymin välimuistin kanssa)"
     min_post_length: "Viestin merkkien minimimäärä"
@@ -1024,6 +1014,7 @@ fi:
     sso_overrides_name: "Ohittaa paikallisen koko nimen SSO:n kautta saatavalla ulkopuolisella nimellä jokaisella kirjautumiskerralla ja estää paikalliset muutokset"
     sso_overrides_avatar: "Syrjäyttää käyttäjän avatarin ulkopuolisella kertakirjautumisen kautta haetulla avatarilla. Jos tämä otetaan käyttöön, suositellaan samalla allow_uploaded_avatars -asetuksen poistamista käytöstä."
     sso_not_approved_url: "Uudelleenohjaa hyväksymättömät SSO-tilit tähän osoitteeseen"
+    sso_allows_all_return_paths: "Älä rajoita SSO:n antamien palautuspolkujen verkkotunnusta (oletuksena palautuspolun on oltava nykyisellä sivustolla)"
     enable_local_logins: "Ota käyttöön käyttäjätunnus/salasana -perusteinen kirjautuminen. (Huom: tämän täytyy olla käytössä kutsujen toimimiseksi)"
     allow_new_registrations: "Salli uusien käyttäjien rekisteröityminen. Ota tämä asetus pois käytöstä estääksesi uusien käyttäjätilien luomisen."
     enable_signup_cta: "Näytä palaaville anonyymeille käyttäjille ilmoitus, jossa kehoitetaan heitä luomaan tili."
@@ -1087,7 +1078,6 @@ fi:
     purge_deleted_uploads_grace_period_days: "Varoaika (päivinä) kunnes poistettu liitetiedosto tuhotaan."
     purge_unactivated_users_grace_period_days: "Varoaika (päivissä) ennen kuin aktivoimaton käyttäjätili poistetaan.  Aseta 0 niin aktivoimattomia käyttäjiä ei poisteta ollenkaan."
     enable_s3_uploads: "Lataa liitetiedostot Amazon S3:een. Tärkeää: edellyttää toimivat S3 kirjautumistiedot (access key id ja secret access key)."
-    s3_use_iam_profile: 'Käytä AWS EC2 IAM roolia avainten hakuun. HUOM: käyttöönotto korvaa "s3 access key id" ja "s3 secret access key" asetukset.'
     s3_upload_bucket: "Amazon S3 bucket, jonne lataukset sijoitetaan. VAROITUS: täytyy olla pienillä kirjaimilla, ei pisteitä, ei alaviivoja."
     s3_access_key_id: "Amazon S3 access key id, jota käytetään kuvien sijoittamisessa."
     s3_secret_access_key: "Amazon S3 secret access key, jota käytetään kuvien sijoittamisessa."
@@ -1133,8 +1123,6 @@ fi:
     min_trust_to_edit_wiki_post: "Wikiviestin muokkaamiseen vaadittava luottamustaso."
     min_trust_to_edit_post: "Viestin muokkaamiseen vaadittava luottamustaso."
     min_trust_to_allow_self_wiki: "Minimiluottamustaso, jolla käyttäjä voi tehdä omasta viestistään wiki-viestin."
-    min_trust_to_send_messages: "Yksityisviestien luomiseen vaadittava luottamustaso"
-    min_trust_to_send_email_messages: "Vähimmäisluottamustaso, jotta voi lähettää uusia yksityisviestejä sähköpostilla (esikäyttäjille)"
     newuser_max_links: "Kuinka monta linkkiä uusi käyttäjä voi lisätä viestiin."
     newuser_max_images: "Kuinka monta kuvaa uusi käyttäjä voi lisätä viestiin."
     newuser_max_attachments: "Kuinka monta liitettä uusi käyttäjä voi lisätä viestiin."
@@ -1202,7 +1190,6 @@ fi:
     reply_by_email_enabled: "Ota käyttöön vastaukset sähköpostin avulla."
     reply_by_email_address: "Saapuvien sähköpostivastausten sähköpostiosoitekaava, esimerkiksi: %{reply_key}@reply.example.com tai replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Lista vaihtoehtoisista saapuvien sähköpostivastausten sähköpostiosoitekaavoista, esimerkiksi: %{reply_key}@reply.example.com tai replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Käytä HTMLää tekstin sijaan saapuville sähköposteille."
     disable_emails: "Estä Discoursea lähettämästä mitään sähköpostia"
     strip_images_from_short_emails: "Poista kuvat sähköposteista, joiden koko on alle 2800 tavua"
     short_email_length: "Lyhyen sähköpostin pituus tavuissa"
@@ -1307,7 +1294,6 @@ fi:
     allowed_href_schemes: "Linkeissä sallitut skeemat http:n ja https:n lisäksi."
     embed_post_limit: "Upotettavien viestien maksimimäärä."
     embed_username_required: "Käyttäjänimi vaaditaan ketjun luomiseksi."
-    notify_about_flags_after: "Jos liputusta ei ole käsitelty näin monessa tunnissa, lähetä yksityisviesti henkilökunnalle. Aseta 0 ottaaksesi pois käytöstä."
     show_create_topics_notice: "Jos palstalla on vähemmän kuin 5 julkista ketjua, kehota ylläpitäjiä aloittamaan ketjuja."
     delete_drafts_older_than_n_days: Poista yli (n) päivää vanhat luonnokset.
     bootstrap_mode_min_users: "Vähimmäismäärä käyttäjiä, joka vaaditaan aloitustilan poistamiseen (aseta 0 poistaaksesi käytöstä)"
@@ -1319,7 +1305,6 @@ fi:
     approve_post_count: "Viestien lukumäärä, joka tarkastetaan uusilta käyttäjiltä ja haastajilta."
     approve_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien viestit tarkastetaan"
     approve_new_topics_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien aloittamat ketjut tarkastetaan"
-    notify_about_queued_posts_after: "Jos viesti on odottanut hyväksyntää kauemmin kuin näin monta tuntia, sähköpostiviesti lähetetään contact_email osoitteeseen. Aseta 0 ottaaksesi pois käytöstä."
     auto_close_messages_post_count: "Maksimimäärä viestejä yksityisketjussa, kunnes se suljetaan automaattisesti (0 poistaaksesi käytöstä)"
     auto_close_topics_post_count: "Maksimimäärä viestejä ketjussa, kunnes se suljetaan automaattisesti (0 poistaaksesi käytöstä)"
     code_formatting_style: "Viestikentän koodipainike käyttää oletuksena tätä koodimuotoilutyyliä"
@@ -1353,6 +1338,7 @@ fi:
     allow_user_api_key_scopes: "Lista rajapinnan käyttäjäavaimiin liittyvistä oikeuksista"
     max_api_keys_per_user: "Enimmäismäärä rajapinnan käyttäjäavaimia käyttäjää kohden"
     min_trust_level_for_user_api_key: "Vähimmäisluottamustaso, joka vaaditaan rajapinnan käyttäjäavainten muodostamiseen"
+    allowed_user_api_push_urls: "Sallitut URL-osoitteet "
     tagging_enabled: "Ota käyttöön ketjujen tunnisteet?"
     min_trust_to_create_tag: "Vähimmäisluottamustaso, jolla voi luoda tunnisteita."
     max_tags_per_topic: "Suurin tunnisteiden määrä, joka voi liittyä ketjuun."
@@ -1755,6 +1741,20 @@ fi:
     post_hidden:
       title: "Viesti piilotettu"
       subject_template: "Yhteisön piiloon liputtama viesti"
+      text_body_template: |
+        Hei,
+
+        Tämä automaattinen viesti lähetettiin sivustolta %{site_name} kertoaksemme sinulle, että viestisi piilotettiin.
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        Usea sivuston käyttäjä liputti viestin ennen sen piilottamista, joten mieti miten voisit muokata sitä heidän antamansa palautteen pohjalta. **Kun %{edit_delay} minuuttia on kulunut, voit muokata viestiä, mikä palauttaa sen näkyville.**
+
+        Jos viesti kuitenkin piilotetaan toisen kerran, se pysyy piilotettuna, kunnes henkilökunta selvittää tilanteen.
+
+        Saadaksesi lisätietoja, lue [yhteisön säännöt](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         [Tässä blogikirjoituksessa](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) on joitakin käteviä vinkkejä uudelle käyttäjälle.
@@ -2491,6 +2491,7 @@ fi:
     store_failure: "Latauksen #%{upload_id} käyttäjälle #%{user_id} tallentaminen epäonnistui."
     file_missing: "Pahoittelut, sinun täytyy valita tiedosto joka ladataan."
     empty: "Pahoittelut, mutta tiedostosi on tyhjä."
+    png_to_jpg_conversion_failure_message: "PNG:n muuttamisessa JPG:ksi tapahtui virhe."
     attachments:
       too_large: "Pahoittelut, tiedosto jonka latausta yritit on liian suuri ( suurin tiedostokoko on %{max_size_kb}KB)."
     images:
@@ -2961,7 +2962,6 @@ fi:
     badge_title_metadata: "%{display_name} -ansiomerkki sivustolla %{site_title}"
   admin_login:
     success: "Sähköposti lähetetty"
-    error: "Virhe!"
     email_input: "Ylläpitäjän sähköpostiosoite"
     submit_button: "Lähetä sähköposti"
   performance_report:
@@ -3106,6 +3106,8 @@ fi:
         description: |
           <p>Jos milloin tahansa haluat muuttaa asetuksia, käy <a href='/admin' target='_blank'>ylläpito-osiossa</a>; löydät sen jakoavainkuvakkeen vierestä sivuston valikosta.</p>
           <p>Onnea ja menestystä <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>uuden yhteisön rakentamiseen!</a></p>
+  search_logs:
+    graph_title: "Hakujen määrä"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index f5dede83a7..7b75135a66 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -209,7 +209,6 @@ fr:
     top_weekly: "Meilleurs sujets de la semaine"
     top_daily: "Meilleurs sujets du jour"
     posts: "Messages récents"
-    private_posts: "Derniers messages privés"
     group_posts: "Derniers messages de %{group_name}"
     group_mentions: "Dernières mentions de %{group_name}"
     user_posts: "Derniers messages par @%{username}"
@@ -305,12 +304,6 @@ fr:
       Nous sommes désolés, les nouveaux membres sont limités temporairement à %{newuser_max_replies_per_topic} réponses dans un même topic.
 
       Plutôt que d'ajouter une nouvelle réponse, vous pouvez éditer vos messages précédents ou visiter d'autres topics.
-    reviving_old_topic: |
-      ### Déterrer ce sujet ?
-
-      La dernière réponse à ce sujet date d'il y a plus de %{days} jours. Votre réponse va faire remonter ce sujet en haut de la liste et notifier chaque personne qui suit cette conversation.
-
-      Êtes-vous sûr de vouloir continuer cette conversation ?
   activerecord:
     attributes:
       category:
@@ -327,9 +320,7 @@ fr:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Vous ne pouvez joindre des avertissements qu'aux messages privés."
               too_many_users: "Vous ne pouvez envoyer des avertissements qu'à un utilisateur à la fois."
-              cant_send_pm: "Désolé, vous ne pouvez pas envoyer de message privé à cet utilisateur."
               no_user_selected: "Vous devez choisir un utilisateur valide."
               reply_by_email_disabled: "Réponse par courriel désactivée."
             featured_link:
@@ -872,7 +863,6 @@ fr:
     censored_words: "Mots qui seront automatiquement remplacés par &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Expressions régulières qui seront automatiquement remplacées par &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Supprimer automatiquement les messages cachés plus de 30 jours."
-    default_locale: "La langue par défaut de cette instance de Discourse (code ISO 639-1)"
     allow_user_locale: "Autoriser les utilisateurs à choisir la langue de l'interface dans leurs préférences"
     set_locale_from_accept_language_header: "configurer la langue de l'interface pour les visiteurs à partir des entêtes de langue de leur navigateur. (EXPÉRIMENTAL, ne fonctionne pas avec le cache anonyme)"
     min_post_length: "Longueur minimale autorisée des messages en nombre de caractères"
@@ -1073,7 +1063,6 @@ fr:
     clean_orphan_uploads_grace_period_hours: "La période de grâce (en heures) avant qu'un fichier envoyé orphelin soit retiré."
     purge_deleted_uploads_grace_period_days: "La période de grâce (en jours) avant qu'un fichier envoyé et supprimé soit effacé."
     enable_s3_uploads: "Placez les fichiers envoyés sur un stockage Amazon S3. IMPORTANT: nécessite un accès valide à S3  (l'identifiant et la clé secrète)."
-    s3_use_iam_profile: 'Utiliser un role AWS EC2 IAM pour la récupération des clés. NOTE: si activé, surcharge les paramètres "s3 access key id" et "s3 secret access key".'
     s3_upload_bucket: "Le nom du bucket Amazon S3 qui contiendra les fichiers téléchargés. ATTENTION : doit être en minuscule, sans points et sans caractères de soulignement."
     s3_access_key_id: "L' access key Amazon S3 qui sera utilisée pour uploader les images."
     s3_secret_access_key: "La clé secrète Amazon S3 qui va être utilisée pour uploader des images."
@@ -1119,8 +1108,6 @@ fr:
     min_trust_to_edit_wiki_post: "Le niveau de confiance minimum requis pour modifier les messages de type wiki."
     min_trust_to_edit_post: "Le niveau de confiance minimum requis pour modifier des messages."
     min_trust_to_allow_self_wiki: "Le niveau de confiance minimum requis pour transformer ses propres messages en type wiki."
-    min_trust_to_send_messages: "Le niveau de confiance minimum pour être autorisé à créer des nouveaux messages privés."
-    min_trust_to_send_email_messages: "Le niveau de confiance minimum requis pour envoyer de nouveaux messages privés par courriel (aux utilisateurs générés)."
     newuser_max_links: "Combien de liens un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_images: "Combien d'images un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_attachments: "Combien de fichiers un nouvel utilisateur peut-il ajouter à un message."
@@ -1185,7 +1172,6 @@ fr:
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant; exemple : %{reply_key}@reply.example.com ou replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Utilisez le HTML plutôt que le texte pour les emails entrants."
     disable_emails: "Désactiver l'envoi de les courriels depuis Discourse."
     strip_images_from_short_emails: "Retirer les images des courriels dont la taille est inférieur à 2800 Octets"
     short_email_length: "Taille des courriels courts en Octets"
@@ -1284,7 +1270,6 @@ fr:
     allowed_href_schemes: "Préfixes autorisés dans les liens en plus de http et https."
     embed_post_limit: "Nombre maximum de messages à embarquer."
     embed_username_required: "Un pseudo d'utilisateur pour la création du sujet est nécessaire."
-    notify_about_flags_after: "S'il y a des signalements qui n'ont pas été traités après ce nombre d'heures, envoyer un message privé aux responsables. Mettre 0 pour désactiver."
     show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets."
     delete_drafts_older_than_n_days: Supprimer les brouillons plus vieux que (n) jours.
     bootstrap_mode_min_users: "Nombre minimum d'utilisateurs nécessaire pour désactiver le mode de démarrage (mettre à 0 pour désactiver)"
@@ -1296,7 +1281,6 @@ fr:
     approve_post_count: "Le nombre de messages d'un utilisateur nouveau ou basique devant être approuvés"
     approve_unless_trust_level: "Les messages des utilisateurs qui n'ont pas atteint ce niveau de confiance doivent être approuvés"
     approve_new_topics_unless_trust_level: "Les nouveaux sujets des utilisateurs en dessous de ce niveau de confiance doivent être approuvés"
-    notify_about_queued_posts_after: "Si des messages sont en attente de modération depuis ce nombre d'heures, un courriel sera envoyé à l'email de contact. Mettre 0 pour désactiver ces courriels."
     auto_close_messages_post_count: "Nombre maximum de messages dans un message privé avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
     auto_close_topics_post_count: "Nombre maximum de messages dans un sujet avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
     code_formatting_style: "Le bouton Code dans l'éditeur utilisera ce style de formatage par défaut"
@@ -2659,19 +2643,18 @@ fr:
     enthusiast:
       name: Passionné
       description: A visité 10 jours
-      long_description: Ce badge est décerné pour avoir visiter 10 jours consécutifs. Merci d'être resté avec nous pendant plus d'une semaine !
+      long_description: Ce badge est décerné pour avoir visité 10 jours consécutifs. Merci d'être resté avec nous pendant plus d'une semaine !
     aficionado:
       name: Aficionado
       description: A visité 100 jours
-      long_description: Ce badge est décerné pour avoir visiter 100 jours consécutifs. C'est plus de trois mois !
+      long_description: Ce badge est décerné pour avoir visité 100 jours consécutifs. C'est plus de trois mois !
     devotee:
       name: Adepte
       description: A visité 365 jours
-      long_description: Ce badge est décerné pour avoir visiter 365 jours consécutifs. Waouh, une année entière !
+      long_description: Ce badge est décerné pour avoir visité 365 jours consécutifs. Waouh, une année entière !
     badge_title_metadata: "%{display_name} badge sur %{site_title}"
   admin_login:
     success: "Courriel envoyé"
-    error: "Erreur !"
     email_input: "Courriel de l'administrateur"
     submit_button: "Envoyer un courriel"
   performance_report:
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index 6a2712fe3c..d77428c94c 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -128,7 +128,6 @@ gl:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Só podes anexar avisos a mensaxes privadas."
               no_user_selected: "Debes seleccionar un usuario correcto."
         user:
           attributes:
@@ -386,7 +385,6 @@ gl:
       yaxis: "Número de visitas"
   site_settings:
     delete_old_hidden_posts: "Eliminar automaticamente as publicacións ocultas durante máis de 30 días."
-    default_locale: "Idioma predeterminado desta instancia (código ISO 639-1)"
     allow_user_locale: "Permitir os usuarios escoller o idioma da interface"
     min_post_length: "Número mínimo de caracteres permitido para unha publicación"
     min_first_post_length: "Número mínimo de caracteres (corpo do tema) permitido para unha primeira publicación"
@@ -447,7 +445,6 @@ gl:
   privacy_topic:
     title: "Política de intimidade"
   admin_login:
-    error: "Erro!"
     submit_button: "Enviar correo-e"
   time:
     <<: *datetime_formats
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 655be9279e..67f443f2c1 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -204,7 +204,6 @@ he:
     top_weekly: "הנושאים המובילים השבועיים"
     top_daily: "הנושאים המובילים היומיים"
     posts: "פוסטים אחרונים"
-    private_posts: "הודעות פרטיות אחרונות"
     group_posts: "פוסטים אחרונים מ %{group_name}"
     group_mentions: "איזכורים אחרונים מ %{group_name}"
     user_posts: "פוסטים אחרונים של @%{username}"
@@ -296,12 +295,6 @@ he:
       אנחנו מצטערים, אבל משתמשים חדשים מוגבלים זמנית ל-%{newuser_max_replies_per_topic} תגובות באותו הנושא.
 
       במקום להוסיף תגובה נוספת, בבקשה שיקלו לערוך תגובות קודמות שלכם, או לבקר נושאים אחרים.
-    reviving_old_topic: |
-      ### לחיות נושא זה?
-
-      התגובה האחרונה לנושא זה ארעה לפני **%{days}** ימים. התגובה שלכם תקפיץ את הנושא לראש הרשימה ותודיע לכל המעורבים בשיחה.
-
-      האם אתם בטוחים שאתם מעוניינים להמשיך עם שיחה ישנה זו?
   activerecord:
     attributes:
       category:
@@ -318,9 +311,7 @@ he:
         topic:
           attributes:
             base:
-              warning_requires_pm: "אתם יכולים להוסיף אזהרות רק למסרים פרטיים."
               too_many_users: "אתם יכולים לשלוח אזהרות רק למשתמש/ת אחד בכל פעם."
-              cant_send_pm: "מצטערים, אינכם יכולים לשלוח הודעה פרטית למשתמש זה."
               no_user_selected: "עליכם לבחור משתמש/ת תקניים."
               reply_by_email_disabled: "תגובה באמצעות מייל נוטרלה"
             featured_link:
@@ -854,7 +845,6 @@ he:
     censored_words: "מלים שיוחלפו באופן אוטומטי ב- &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "ביטוי רגולרי שיוחלף אוטומטית עם &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "מחיקת אוטומטית של פרסומים מוסתרים שנותרים מוסתרים במשך יותר מ-30 יום."
-    default_locale: "שפת ברירת המחדל עבור אתר Discourse זה (קוד ISO 639-1)"
     allow_user_locale: "אפשרו למשתמשים לבחור את הגדרות השפה שלהם בממשק המשתמש/ת"
     set_locale_from_accept_language_header: "קבעו את שפת הממשק עבור משתמשים אנונימיים לפי השפה בדפדפן. (נ-י-ס-י-ו-נ-י, לא עובד עם cache אנונימי)"
     min_post_length: "מספר התווים המותר כאורך מינימלי לפוסט"
@@ -1052,7 +1042,6 @@ he:
     clean_orphan_uploads_grace_period_hours: "תקופת חסד (בשעות) לפני שהעלאות יתומות מוסרות."
     purge_deleted_uploads_grace_period_days: "תקופת חסד (בימים) לפני שהעלאה שהוסרה תמחק."
     enable_s3_uploads: "אחסן העלאות (uploads) על תשתית של Amazon S3. חשוב: מצריך מפתח גישה + מפתח גישה סודי שיהיו חוקיים."
-    s3_use_iam_profile: 'השתמש ב-AWS EC2 IAM role על מנת לאחזר מפתחות. שימו לב: איפשור של זה ידרוס את ההגדרות "S3 access key id" וכן את "s3 secret access key".'
     s3_upload_bucket: "שם של Amazon S3 bucket אליו יועלו קבצים. אזהרה: שם זה חייב להיות באותיות קטנות, ללא נקודות וללא קווים תחתונים."
     s3_access_key_id: "מפתח הגישה (access key id) של Amazon S3 שישמש להעלאת התמונות."
     s3_secret_access_key: "מפתח הגישה הסודי (secret access key) של Amazon S3 שישמש להעלאת תמונות."
@@ -1098,7 +1087,6 @@ he:
     min_trust_to_edit_wiki_post: "רמת האמון המינימלי הנדרשת כדי לערוך פוסט שמסומן כ-wiki."
     min_trust_to_edit_post: "רמת האמון המינימלית הנדרשת כדי לערוך פוסטים."
     min_trust_to_allow_self_wiki: "רמת האמון המינימלית הנדרשת כדי שמשתמש יוכל להפוך פוסט של עצמו לויקי."
-    min_trust_to_send_messages: "רמת האמון המינימלית המדרשת כדי ליצור הודעות פרטיות חדשות."
     newuser_max_links: "כמה קישורים יכולים משתמשים חדשים להוסיף לפוסט."
     newuser_max_images: "כמה תמונות יכולים משתמשים להוסיף לפוסט."
     newuser_max_attachments: "כמה קבצים מצורפים יכולים משתמשים חדשים להוסיף לפוסט."
@@ -1161,7 +1149,6 @@ he:
     reply_by_email_enabled: "אפשרו  תגובה לנושאים באמצעות הדוא\"ל."
     reply_by_email_address: "תבנית עבור כתובות מייל של מענה באמצעות אימייל, למשל: {reply_key}@reply.example.com או  replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "רשימה של כמה תבניות לתגובות במייל באמצעות כתובות מייל נכנסות. למשל: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "השתמשו ב HTML במקום טקסט למייל נכנס."
     disable_emails: "מנעו מ-Discourse ממשלוח דוא\"ל כלשהו"
     strip_images_from_short_emails: "הסרת תמונות מדוא\"ל בגודל של פחות מ-2800 בתים"
     short_email_length: "אורכו של דוא\"ל קצר בבתים (Bytes)"
@@ -1259,7 +1246,6 @@ he:
     allowed_href_schemes: "פרוטוקולים מותרים בלינקים בנוסף ל http ו https."
     embed_post_limit: "מספר מקסימלי של פוסטים להטמעה."
     embed_username_required: "נדרש שם משתמש ליצירת הנושא."
-    notify_about_flags_after: "אם יש דגלים שלא טופלו לאחר מספר זה של שעות, שילחו הודעה פרטית לצוות. קיבעו ל 0 כדי לנטרל."
     show_create_topics_notice: "אם לאתר פחות מ-5 נושאים פומביים, הציגו מודעה המבקשת מן המנהלים ליצור עוד נושאים."
     delete_drafts_older_than_n_days: מחקו טיוטות בנות יותר מ (n) ימים.
     bootstrap_mode_min_users: "מספר משתמשים מינימלי שנדרש כדי לנטרל מצב איתחול (קבעו ל 0 כדי לנטרל)"
@@ -1271,7 +1257,6 @@ he:
     approve_post_count: "מספר הפוסטים ממשתמשים חדשים או בסיסיים שחייבים לאשר אותם"
     approve_unless_trust_level: "פוסטים של משתמשים מתחת לרמת אמון זו חייבים לעבור אישור"
     approve_new_topics_unless_trust_level: "נושאים חדשים עבור משתמשים מתחת לרמת אמון זו חייבים להיות מאושרים"
-    notify_about_queued_posts_after: "אם יש פוסטים שהמתינו לסקירה ליותר מכמות השעות הזו, יישלח מייל ל contact_email. קבעו 0 כדי לנטרל את המיילים האלו."
     auto_close_messages_post_count: "מספר פוסטים מקסימלי בהודעה לפני שהיא נסגרת אוטומטית (0 לניטרול)"
     auto_close_topics_post_count: "מספר מקסימלי של פוסטים בנושא לפני שהוא נסגר אוטומטית (0 לניטרול)"
     code_formatting_style: "כפתור קוד בדפדפן יציע אוטומטית סגנון קידוד זה"
@@ -2156,147 +2141,6 @@ he:
     title: "שאלות נפוצות / הנחיות"
   tos_topic:
     title: "תנאי השימוש"
-    body: |
-      התנאים והתניות שלהלן מסדירים את כל פרטי השימוש באתר %{company_domain} ובכל פריטי התוכן, השירותים והמוצרים הזמינים באתר או דרכו, כולל, בין השאר, את תוכנת הפורום של %{company_domain} (שיקראו ביחד ״האתר״ או ״אתר האינטרנט״). האתר שייך ומתופעל על-ידי %{company_full_name} (להלן ״%{company_name}״). אנו מציעים לכם את אתר האינטרנט, אך מתנים זאת בקבלת כל התנאים והתניות הכלולים כאן, ללא שינוי, וכל יתר כללי ההפעלה, העקרונות (כולל, ללא הגבלה,  [מדיניות הפרטיות](/privacy) של %{company_name}, [הנחיות הקהילה](/faq) של %{company_name}) והנהלים ש%{company_name} עשויה לפרסם מעת לעת באתר האינטרנט (במקובץ, 'ההסכם').
-
-      יש לקרוא את ההסכם בעיון לפני הגישה לאתר או השימוש בו. הגישה לאתר או לחלק ממנו והשימוש בהם פירושם הסכמה מצדכם כי יחולו עליכם התנאים והתניות הכלולים בהסכם זה. הרשות לגשת אל אתר האינטרנט ולהשתמש בשירותים מותנית בהסכמתכם לכל התנאים והתניות שבהסכם. אם תנאים ותניות אלה נחשבים להצעה מטעם %{company_name}, קבלת התנאים מצדכם מוגבלת במפורש לתנאים אלה.
-
-      האתר אינו מיועד למי שלא מלאו לו 13 שנים והשירות באתר מוצע אך ורק למשתמשים בני 13 ומעלה. משתמשים בני 13 ומטה מתבקשים לא להירשם לשימוש באתר. כל אדם שנרשם כמשתמש או מספק את פרטיו האישיים לאתר מצהיר בזאת כי הוא בן 13 ומעלה.
-
-      <a name="1"></a>
-
-      ## [1. חשבונכם ב %{company_domain}](#1)
-
-      אם אתם יוצרים חשבון באתר, אתם אחראים על שמירת האבטחה של חשבונכם ואתם אחראים לחלוטין על כל הפעילויות שמתרחשות בשמכם בחשבון. באחריותכם ליידע את %{company_name} מיידית על כל שימוש לא מורשה בחשבונכם ועל כל הפרה אחרת של האבטחה. לא תחול על %{company_name} חבות בגין מעשים או מחדלים מצידכם, לרבות נזק מכל סוג ומין שייגרם כתוצאה מאותם מעשים או מחדלים.
-
-      <a name="2"></a>
-
-      ## [2. אחריות התורמים](#2)
-
-      אם אתם מפרסמים חומרים באתר, קישורים באתר, או יוצרים (או מאפשרים לצד שלישי ליצור) חומרים שנעשים זמינים באמצעות האתר (כל חומר שהוא, להלן ״תוכן״), האחריות המלאה על התוכן הזה, כמו גם על כל נזק הנובע ממנו, תחול עליכם. האחריות חלה ללא תלות בסוג התוכן, לרבות, אך ללא הגבלה, טקסט, תמונה, סרטון וידאו, אודיו או קוד. כאשר אתם מנגישים תוכן, אתם מאשרים ש:
-
-      *   הורדה, העתקה ושימוש בתוכן לא יפרו זכויות קיניין, לרבות זכויות יוצרים, פטנטים, סימני מסחר או זכויות סודות מסחריים, של שום צד שלישי;
-      *   אם למעסיק שלכם יש זכויות על קיניין רוחני שאתם יוצרים, או (i) שקיבלתם רשות מהמעסיק לפרסם או להפוך תוכן לנגיש, לרבות תוכנה, או (ii) שקיבלתם ויתור מהמעסיק לכל הזכויות על התוכן;
-      *   אתם מתואמים לחלוטין עם כל רשיון צד שלישי שקשור לתוכן, ועשיתם את כל שנדרש כדי להעביר בהצלחה למשתמשי הקצה כל תנאי נדרש;
-      *   התוכן אינו מכיל או מתקין שום וירוס, תולעת, רוגלה, סוס טרויאני או כל תוכן הרסני אחר;
-      *   התוכן אינו ספאם, אינו מיוצר באקראי או על ידי מכונה, ואינו מכיל תוכן מסחרי שאינו אתי או בלתי רצוי שתוכנן כדי להזרים תנועה לאתרי צד שלישי או לשפר דירוגים של מנועי חיפוש של צדדים שלישיים, או כדי לקדם מעשים לא חוקיים (כגון פישינג) או להטעות נמענים בנוגע למקור של התוכן (כמו ספופינג);
-      *   התוכן אינו פורנוגרפי, לא מכיל איומים או מסית לאלימות, ולא מפר את הפרטיות או זכויות הפרסום של שום צד שלישי;
-      *   התוכן שלכם אינו מפורסם באמצעות הודעות אלקטרוניות בלתי רצויות כמו קישורי ספאם בקבוצות דיון, רשימות מיילים, בלוגים ואתרים, ודרכי קידום בלתי רצויות אחרות;
-      *   לתוכן לא ניתן שם בצורה שמטעה את הקוראים שלכם וגורמת להם לחשוב שאתם אדם אחר או חברה אחרת; ו
-      *   במקרה שהתוכן מכיל קוד מחשב, קיטלגתם במדוייק ו/או תיארתם את הסוג, אופי, שימושים והשפעות של החומרים שפרסמתם, בין שנתבקשתם לעשות זאת על ידי %{company_name} או שלא.
-
-      <a name="3"></a>
-
-      ## [3. רשיון תוכן משתמשים](#3)
-
-      תרומות תוכן של משתמשים הן תחת [רשיון קריאייטיב קומונס ייחוס-שימוש_לא_מסחרי-שיתוף_זהה 3.0 לא-מותאם](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.he). מבלי להגביל אף אחת מהמצגים והערובות, ל%{company_name} יש את הזכות (אך לא את החובה), לפי שיקול דעתה הבלעדי (i) לסרב לקבל או להסיר כל תוכן שלפי דעתה הסבירה של %{company_name}, מפר איזשהי מהמדיניויות של %{company_name} או שהוא פוגעני או שהוא מעורר התנגדות, או (ii) לסגור או למנוע כניסה ו/או שימוש באתר לכל אדם או יישות מכל סיבה שהיא, לפי שיקול דעתה הבלעדי של %{company_name}. על %{company_name} לא תחול שום חובה להחזיר איזה מהסכומים ששולמו בעבר.
-
-      <a name="4"></a>
-
-      ## [4. תשלומים וחידוש](#4)
-
-      ### תנאים כלליים
-
-      שירותים אופציונליים ושידרוגים יכולים להיות זמינים באתר. כאשר אתם משתמשים בשירות או שדרוג אופציונליים, אתם מסכימים לשלם ל%{company_name} את דמי המנוי החודשיים או שנתיים. תשלומים יגבו מראש ביום שתתחילו להשתמש בשירות או בשדרוג ויכסו את השימוש בשירות או בשדרוג למנוי תקופתי חודשי או שנתי כפי שמצויין. תשלומים אלו לא ניתנים להחזרה.
-
-      ### חידוש אוטומטי
-
-      אלא אם תודיעו ל%{company_name} לפני סיום תקופת המנוי הרלוונטית שאתם מעוניינים לבטל את השירות או השדרוג, המנוי שלכם יתחדש אוטומטית ואתם מאשרים לנו לגבות את דמי המנוי החודשיים השנתיים (וכן מיסים) באמצעות כרטיס אשראי או אמצעי תשלום אחר שברשותנו. ניתן לבטל מנויים בכל עת.
-
-      <a name="5"></a>
-
-      ## [5. שירותים](#5)
-
-      ### אירוח, שרותי תמיכה
-
-      שירותי אירוח ותמיכה אופציונליים עלולים להיות מסופקים על ידי %{company_name} תחת התנאים וההתניות לכל אחד מהשירותים הללו. על ידי הרשמה לאירוח/תמיכה או חשבון שירותי תמיכה, אתם מסכימים לציית לכל התנאים וההתניות.
-
-      <a name="6"></a>
-
-      ## [6. אחריות מבקרים](#6)
-
-      %{company_name} לא סקרה, ולא יכולה לסקור, את כל החומר, כולל תוכנות מחשב, שפורסמו באתר, ולכן לא יכולה להיות אחראית לתכנים, שימושם או השפעתם. על ידי הפעלת האתר, %{company_name} לא מייצגת או רומזת שהיא תומכת בחומר שפורסם בו, או שהיא מאמינה שהחומר מדוייק, שימושי או לא-מזיק. אתם האחראים על נקיטת אמצעים לפי הצורך כדי להגן על עצמכם ועל מערכות המחשב שלכם בפני וירוסים, תולעים, סוסים טרויאנים, ותכנים מזיקים או הרסניים אחרים. האתר עלוללהכיל תכנים פוגעניים, לא-ראויים, או נתונים לביקורת בצורה אחרת, כמו גם מכילים אי-דיוקים טכניים, טעויות טיפוגרפיות, ואחרות. האתר עלול להכיל גם תכנים שמפרים את הפרטיות או זכויות הפרסום, או מפרים את זכויות הקניין וזכויות רכוש אחרות, של צדדים שלישיים, או הורדות, העתקות או שימוש שעליו חלים תנאים והתניות, מצויינים או שאינם מצויינים. %{company_name} לא לוקחת כל אחריות לכל נזק שייגרם מהשימוש על ידי מבקרים באתר, או מכל הורדה על ידי מבקרים שתכניהם מפורסמים.
-
-      <a name="7"></a>
-
-      ## [7. תכנים שמפורסמים באתרים אחרים](#7)
-
-      לא סקרנו, ואנחנו לא יכולים לסקור, את כל החומר, כולל תוכנות מחשב, שמוצעים דרך האתרים ודפי האינטרנט אליהם %{company_domain} מקשר, ואשר מקשרים אל %{company_domain}. ל%{company_name} אין שליטה על אתרים ודפים אלו שאינם %{company_domain} והיא אינה אחראית על התוכן והשימוש שלהם. על ידי קישור לאתר או דף שאינו חלק מ %{company_domain}, %{company_name} לא מייצגת או רומזת שהיא תומכת באתרים ודפים כאלו. אתם אחראים לנקוט באמצעי זהירות לפי הצורך כדי להגן על עצמכם ועל מערכות המחשוב שלכם מוירוסים, תולעים, סוסים טרוינים, ותכנים פוגעניים או הרסניים אחרים. %{company_name} פוטרת עצמה מכל אחריות לכל נזק שנגרם כתוצאה משימוש באתרים ודפים שאינם %{company_domain}.
-
-      <a name="8"></a>
-
-      ## [8. הפרת זכויות יוצרים ומדיניות DMCA](#8)
-
-      כשם ש%{company_name} מבקשת מאחרים לכבד את זכויות הקניין הרוחני שלה, היא מכבדת את זכויות הקניין הרוחני של אחרים. אם אתם מאמינים שחומר שנמצא ב או מקושר מ %{company_domain} מפר את זכויות היוצרים שלכם, ואם אתר זה שוכן בארה״ב, %{company_name} מעודדת אתכם להודיע לה בהתאם למדיניות [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") של %{company_name}. %{company_name} תגיב להודעות כאלו, כפי שנדרש או ראוי על ידי הסרה של תכנים מפרים או ביטול כל הקישורים לחומרים המפרים. %{company_name} תבטל גישה ותחסום שימוש באתר אם, תחת נסיבות מתאימות, המבקר נחוש להיות מפר סדרתי של זכויות יוצרים או זכויות קניין רוחני אחרות של %{company_name} או אחרים. במקרה של סיום התקשרות שכזה, ל%{company_name} לא תהיה שום מחוייבות לספק החזר של שום סכום ששולם לפני כן ל%{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. קיניין רוחני](#9)
-
-      הסכם זה לא מעביר אליכם מ%{company_name} או מצד שלישי שום קניין רוחני, וכל זכות, קניין ועיניין בקניין זה יישאר (כפי שבין הצדדים) ב%{company_name} בלבד. %{company_name}, %{company_domain}, הלוגו של %{company_domain}, וכל שאר סימני המסחר, סימני השירות, גרפיקות ולוגואים שנעשה בהם שימוש בקשר ל %{company_domain}, או האתר הם סימני מסחר או סימנים רשומים של %{company_name} או זכייניה. סימני מסחר אחרים, סימני שירות, גרפיקות ולוגואים שנעשה בהם שימוש בהקשר של האתר יכולים להיות סימני מסחר של צדדים שלישיים אחרים. השימוש שלכם באתר לא מקנה לכם זכות או רישיון לייצר או להשתמש בשום סימני מסחר של %{company_name} או צד שלישי.
-
-      <a name="10"></a>
-
-      ## [10. פרסום](#10)
-
-      %{company_name} שומרת על זכותה להציג פרסומות על גבי התכנים שלך, אלא אם רכשת שדרוג 'ללא פרסומות' או שברשותך חשבון מיוחד.
-
-      <a name="11"></a>
-
-      ## [11. ייחוס](#11)
-
-      %{company_name} שומרת לעצמה את הזכות להציג קישורי ייחוס כמו ״מופעל על ידי %{company_domain}״, ייחוס לתמה, כותב וייחוס פונט בתחתית או בבאר הכלים של התכנים שלכם. קרדיטים בתחתית ובבאר הכלים של %{company_domain} לא מותרים להסרה בלי קשר לשדרוגים שנרכשו.
-
-      <a name="12"></a>
-
-      ## [12. שינויים](#12)
-
-      אנו מעדכנים את השירותים שלנו ללא הרף ופירוש הדבר, שלעתים אנו נדרשים לשנות את התנאים המשפטיים שבכפוף להם אנו מציעים את שירותינו. באחריותך לבדוק מפעם לפעם הסכם זה בנוגע לשינויים בו. המשך השימוש שלך ב-%{company_domain} יהיה בכפוף לתנאים החדשים ומשקף הסכמה אליהם. עם זאת, %{company_name} יכולה בהמשך להציע שירותים נוספים, עליהם יחול הסכם זה.
-
-      <a name="13"></a>
-
-      ## [13. סיום](#13)
-
-      %{company_name} רשאית להפסיק את הגישה שלך לאתר האינטרנט בכל עת, באופן מלא או חלקי, עם או בלי סיבה, עם או בלי התראה, ובתוקף מיידי. אם ברצונך לסיים את ההסכם או לסגור את חשבונך ב-%{company_domain} (אם קיים), עליך פשוט להפסיק את השימוש באתר האינטרנט. כל הוראות הסכם זה אשר מעצם טבען אמורות לשרוד סיום כאמור ישרדו אותו, כולל, ללא הגבלה, הוראות בדבר בעלות, תניות פטור וסעיפי הסתייגות מאחריות, סעיפי שיפוי וסעיפי הגבלת חבות.
-
-      <a name="14"></a>
-
-      ## [14. הגבלת אחריות](#14)
-
-      האתר מוגש ״כמו שהוא״. %{company_name} והספקים שלה והגורמים המעניקים לה רשיונות מתנערים מכל אחריות מכל סוג שהוא, מוצהרת או מרומזת, ובכללה, מבלי להגביל, אחריות מסחרית, התאמה למטרה כלשהי ואחריות לאי-הפרה. לא %{company_name} ולא הספקים או הגורמים המעניקים לה רשיונות, מתחייבים שבאתר לא יהיו שגיאות או שהגישה אליו תהיה רציפה וללא שיבושים. אם אתם באמת קוראים זאת, הנה [הפתעה](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). אתם מבינים שאתם מורידים, או מקבלים תכנים או שירותים מהאתר על אחריותכם וסיכונכם בלבד.
-
-
-      <a name="15"></a>
-
-      ## [15. הגבלת חבות](#15)
-
-      בשום מקרה %{company_name}, או הספקים שלה או בעלי הרשיון שלה, יהיו אחראים לכל דבר ועיניין שקשורים להסכם זה תחת כל חוזה, התרשלות, אחריות קפידה או דין אחר או תיאוריית יושר בעבור: (i) נזקים מיוחדים, מקריים או תוצאתיים; (ii) מחיר רכש של מוצרים תחליפיים או שירותים; (iii) בעבור הפרעה בשימוש או אבדן או השחתה של מידע; או (iv) כל סכום שעולה על המחיר ששילמתם ל%{company_name} תחת הסכם זה במהלך שנים עשר (12) החודשים שלפני סיבת הפעולה. ל%{company_name} לא תהיה אחריות לכל תקלה או איחור בעקבות עיניינים שמחוץ לשליטתה הסבירה. האמור לעיל לא תקף מעבר למה שנאסר בחוק.
-
-      <a name="16"></a>
-
-      ## [16. ייצוג כללי ואחריות](#16)
-
-      אתם מייצגים ומאשרים ש (i) שימושכם באתר יתאם בקפידה עם [מדיניות הפרטיות](/privacy) של %{company_name}, [הנחיות הקהילה](/guidelines), עם הסכם זה ועם כל החוקים והתקנות הרלוונטיים (כולל, מבלי להגביל, כל החוקים המקומיים או התקנות בארצכם, מדינתכם, עירכם, או אזור ממשלתי אחר, בנוגע להתנהלות מקוונת ותכנים קבילים, וכולל כל החוקים הרלוונטיים בנוגע למשלוח מידע טכני מהמדינה בה אתר זה נמצא או המדינה בה אתם נמצאים) ו (ii) שימושכם באתר לא מפר או מועל בזכויות קניין רוחני של כל צד שלישי.
-
-      <a name="17"></a>
-
-      ## [17. שיפוי](#17)
-
-      הסכמתכם נתונה לכך שתחול עליכם החובה לפצות ולשפות את %{company_name}, קבלניה והגורמים המעניקים לה רישיונות, ואת המנהלים, בעלי התפקידים, העובדים והסוכנים של כל אלה, מפני וכנגד כל תביעה והוצאה, כולל הוצאות הגנה משפטית כתוצאה מהשימוש שלכם באתר האינטרנט, כולל אך לא רק, הפרה מצדכם של האמור בהסכם זה.
-
-      <a name="18"></a>
-
-      ## [18. שונות](#18)
-
-      הסכם זה מהווה את כלל ההסכם בין %{company_name} לבינכם בנוגע לעיניין הנדון, והוא יכול להשתנות על ידי תיקון כתוב חתום על ידי מנהל מורשה של %{company_name}, או על ידי פרסום מטעם %{company_name} של גרסה מתוקנת. למעט במידה המותרת בחוק הרלוונטי, אם יש, הסכם זה, הגישה לאתר האינטרנט והשימוש בו יוסדרו על פי חוקי מדינת ישראל, והמקום לבירור מחלוקות שיתעוררו מתוך או בנוגע לכל אלה יהיה בתי המשפט המדינתיים שבתל אביב, ישראל. למעט תביעות לסעד באמצעות צו מניעה או מן הדין, או תביעות בנוגע לזכויות קניין רוחני (אשר מותר להגישן בכל בית משפט מוסמך ללא תשלום ערבות), כל מחלוקת שתיווצר כתוצאה מהסכם זה תיושב באופן סופי בהתאם לכללי הבוררות הנהוגים בישראל, באמצעות שלושה בוררים שימונו בהתאם לאותם כללים. הבוררות תתקיים בתל אביב, ישראל, בשפה העברית, ויהיה אפשר לאכוף את פסיקת הבוררות בכל בית משפט. הצד שייצא וידו על העליונה בכל תביעה או הליך לאכיפת הסכם זה יהא זכאי להחזר בגין עלויות ודמי הגנה משפטית. היה וייקבע כי חלק כלשהו בהסכם זה אינו תקף או בלתי אכיף, אותו חלק יפורש כך שישקף את הכוונה המקורית של הצדדים ויתר חלקי ההסכם ישמרו על מלוא תוקפם וחלותם. ויתור של צד מן הצדדים על תנאי או תניה הכלולים בהסכם זה או על הפרה של תנאי/תניה כאמור בהזדמנות נתונה, ייחשב לוויתור באותה הזדמנות בלבד ולא יחול על אף הפרה נוספת/עתידית. מותר לכם להסב את זכויותיכם במסגרת הסכם זה לזכות כל גורם שיסכים כי האמור בתנאים ובתניות שהוא כולל יחולו עליו. %{company_name} רשאית להסב את זכויותיה במסגרת הסכם ללא שום תנאי. הסכם זה יחייב את הצדדים וייזקף לזכות הצדדים, יורשיהם ונמחיהם המורשים.
-
-      ## [19. תרגום](#19)
-
-      תנאי שירות אלה נוסחו במקור בשפה האנגלית (ארה"ב). אפשר שנתרגם את התנאים לשפות אחרות. במקרה של סתירה בין גרסה מתורגמת של תנאי השירות לבין הגרסה באנגלית, תינתן עדיפות לגרסה בשפה האנגלית.
-
-      מסמך זה הוא CC-BY-SA. הוא עודכן ב 2 באוקטובר, 2016.
-
-      הותאם במקור מ[תנאי השירות של Wordpress](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "מדיניות פרטיות"
     body: |
@@ -2605,7 +2449,6 @@ he:
     badge_title_metadata: "עיטור ב-%{site_title} של %{display_name}"
   admin_login:
     success: "דוא\"ל נשלח"
-    error: "שגיאה!"
     email_input: "מייל של המנהל"
     submit_button: "שלח מייל"
   performance_report:
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index 040029a506..322bc4eb79 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -138,7 +138,6 @@ id:
     hot: "Topik Terpanas"
     top: "Topik unggulan"
     posts: "Pos terbaru"
-    private_posts: "pesan pribadi terkini"
     group_posts: "Posting terkini dari %{group_name}"
     group_mentions: "Mention terkini dari %{group_name}"
     user_topics: "Topik terakhir oleh @%{username}"
@@ -179,8 +178,6 @@ id:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Anda hanya dapat melampirkan peringatan pada pesan pribadi."
-              cant_send_pm: "Mohon maaf, Anda tidak dapat mengirimkan pesan pribadi pada pengguna tersebut."
               no_user_selected: "Anda harus memilih pengguna yang valid."
         user:
           attributes:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 84fd7684b6..af3edb7ef8 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -209,7 +209,6 @@ it:
     top_weekly: "Argomenti di punta settimanali"
     top_daily: "Argomenti di punta giornalieri"
     posts: "Ultimi messaggi"
-    private_posts: "Ultimi messaggi privati"
     group_posts: "Ultimi messaggi da %{group_name}"
     group_mentions: "Ultime menzioni da %{group_name}"
     user_posts: "Ultimi messaggi di @%{username}"
@@ -306,13 +305,6 @@ it:
 
       Invece di aggiungere un'altra risposta, per favore considera di modificare le tue precedenti risposte o di visitare altri argomenti.
 
-    reviving_old_topic: |+
-      ### Resuscitare questo argomento?
-
-      L'ultima risposta a questo argomento è vecchia di %{days} giorni. La tua risposta farà tornare l'argomento in cima alla lista e tutti gli utenti coinvolti verranno notificati.
-
-      Sei davvero sicuro di voler continuare questa vecchia conversazione?
-
   activerecord:
     attributes:
       category:
@@ -329,9 +321,7 @@ it:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Puoi allegare solo avvertimenti ai messaggi privati."
               too_many_users: "Puoi inviare avvertimenti ad un solo utente per volta."
-              cant_send_pm: "Spiacenti, non puoi inviare un messaggio privato a quell'utente."
               no_user_selected: "Seleziona un utente valido."
               reply_by_email_disabled: "La risposta via email è stata disabilitata."
             featured_link:
@@ -870,7 +860,6 @@ it:
     censored_words: "Parole che saranno automaticamente sostituite con &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Pattern regex che sarà automaticamente sostituito con &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Cancella automaticamente tutti i messaggi nascosti che restano nascosti per più di 30 giorni."
-    default_locale: "Il linguaggio di default di questa istanza Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permetti agli utenti di personalizzare la lingua dell'interfaccia"
     set_locale_from_accept_language_header: "imposta la lingua di interfaccia per gli utenti anonimi in base ai language header del loro browser.\n(SPERIMENTALE, non funziona con cache anonima)"
     min_post_length: "Lunghezza minima dei messaggi in caratteri"
@@ -1086,7 +1075,6 @@ it:
     purge_deleted_uploads_grace_period_days: "Dopo quanti giorni un caricamento cancellato viene rimosso."
     purge_unactivated_users_grace_period_days: "Il periodo di grazia (in giorni) prima che un utente che non ha attivato il suo account venga eliminato. Impostare su 0 per non eliminare mai gli utenti non attivati."
     enable_s3_uploads: "Mette i caricamenti sullo spazio disco Amazon S3. IMPORTANTE: richiede che siano inserite valide credenziali S3 (sia l'access key id sia l'access key secret)."
-    s3_use_iam_profile: 'Usa il ruolo AWS EC2 IAM per recuperare le chiavi. NOTA: abilitarla sovrascriverà le impostazioni "s3 access key id" e "s3 secret access key". '
     s3_upload_bucket: "Il nome del bucket Amazon S3 sul quale verranno caricati i file. ATTENZIONE: deve essere tutto minuscolo, senza punti, senza trattini bassi."
     s3_access_key_id: "La access key id Amazon S3 che verrà usata per caricare le immagini."
     s3_secret_access_key: "La access key secret Amazon S3 che verrà usata per caricare le immagini."
@@ -1132,8 +1120,6 @@ it:
     min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un argomento segnato come wiki."
     min_trust_to_edit_post: "Il livello di esperienza minimo richiesto per modificare i messaggi."
     min_trust_to_allow_self_wiki: "Il livello di esperienza minimo richiesto per consentire agli utenti di pubblicare una propria wiki."
-    min_trust_to_send_messages: "Il livello di esperienza minimo richiesto per creare nuovi messaggi privati."
-    min_trust_to_send_email_messages: " Il livello di esperienza minimo richiesto per inviare nuovi messaggi privati via email (a utenti temporanei)."
     newuser_max_links: "Quanti collegamenti può aggiungere a un messaggio un nuovo utente ."
     newuser_max_images: "Quante immagini può aggiungere ad un messaggio un nuovo utente."
     newuser_max_attachments: "Quanti allegati può aggiungere ad un messaggio un nuovo utente."
@@ -1200,7 +1186,6 @@ it:
     reply_by_email_enabled: "Abilita la possibilità di rispondere ai messaggi tramite email."
     reply_by_email_address: "Modello per rispondere via email, per esempio: %{reply_key}@risposta.esempio.com o risposte+%{reply_key}@esempio.com"
     alternative_reply_by_email_addresses: "Elenco dei template alternativi per la risposta via email in arrivo da indirizzi email. Esempio: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Usa l'HTML invece del testo per le email in arrivo."
     disable_emails: "Evita che Discourse invii qualunque tipo di email"
     strip_images_from_short_emails: "Elimina le immagini dalle email aventi dimensione inferiore a 2800 Byte."
     short_email_length: "Lunghezza delle email brevi in Byte"
@@ -1303,7 +1288,6 @@ it:
     allowed_href_schemes: "Schemi consentiti nei collegamenti in aggiunta a http e https."
     embed_post_limit: "Numero massimo di messaggi da incorporare."
     embed_username_required: "E' richiesto il nome utente per la creazione di argomenti."
-    notify_about_flags_after: "Se ci sono segnalazioni che non sono state revisionate dopo un tale numero di ore, invia un messaggio privato allo staff. Imposta a 0 per disattivare. "
     show_create_topics_notice: "Se il sito ha meno di 5 argomenti pubblici, mostra un avviso chiedendo agli amministratori di creare qualche argomento."
     delete_drafts_older_than_n_days: Elimina bozze più vecchie di (n) giorni.
     bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare)"
@@ -1315,7 +1299,6 @@ it:
     approve_post_count: "La quantità di messaggi di un utente nuovo o di base che deve essere approvata"
     approve_unless_trust_level: "I messaggi degli utenti al di sotto di questo livello di esperienza devono essere approvati"
     approve_new_topics_unless_trust_level: "I nuovi argomenti degli utenti al di sotto di questo livello di esperienza devono essere approvati"
-    notify_about_queued_posts_after: "Se ci sono messaggi che devono essere revisionati dopo un tale numero di ore, una email verrà inviata a contact_email. Imposta a 0 per disattivare queste email."
     auto_close_messages_post_count: "Numero massimo di messaggi consentiti in un messaggio privato prima di essere automaticamente chiuso (0 per disabilitare)"
     auto_close_topics_post_count: "Numero massimo di messaggi consentiti in un argomento prima di essere automaticamente chiuso (0 per disabilitare)"
     code_formatting_style: "Il pulsante del testo preformattato nel composer verrà predefinito a questo stile di formattazione del codice"
@@ -2545,141 +2528,6 @@ it:
       Sì, l'avvocatese è noioso, ma ci dobbiamo proteggere &ndash; e, per estensione, proteggere anche te ed i tuoi dati &ndash; contro persone non amichevoli. Abbiamo dei [Termini di Servizio](/tos) che descrivono il tuo (e il nostro) comportamento ed i diritti che riguardano i contenuti, la privacy e le leggi. Per poter usare questo servizio, devi accettare i nostri [TDS](/tos)
   tos_topic:
     title: "Termini del Servizio"
-    body: |
-      I seguenti termini e condizioni regolano l’uso del sito web %{company_domain} e di tutti i contenuti, i servizi e i prodotti disponibili direttamente sul sito web e mediante di esso, compresi, ma non limitatamente a, il Software Forum di %{company_domain}, il Forum di Supporto di %{company_domain} e il Servizio Hosting ("Hosting") di %{company_domain} (collettivamente chiamati nel seguito il Sito). Il Sito è di proprietà ed è gestito da %{company_full_name} ("%{company_name}"). L’uso del Sito è soggetto all’accettazione incondizionata di tutti i termini e le condizioni previsti nel presente documento e di tutte le altre regole operative, le politiche (incluse, senza limitazione, la [Politica sulla Privacy](/privacy) di %{company_domain}e le [Linee guida della comunità](/faq)) e le procedure che possono essere pubblicate di volta in volta su questo Sito da %{company_name} (nel seguito, il “Contratto”).
-
-      Leggi il presente Contratto prima di accedere o utilizzare il Sito. L’accesso o l’utilizzo di qualsiasi parte del Sito implica l’accettazione dei termini e delle condizioni del presente contratto. In caso di mancata accettazione di tutti i termini e le condizioni del presente contratto, l’accesso al Sito o l’uso di qualsiasi servizio potrebbe non essere consentito. Se questi termini e condizioni sono considerati un’offerta di %{company_name}, l’accettazione è espressamente limitata ai presenti termini. Il Sito è disponibile solo per gli utenti con almeno 13 anni di età.
-
-      <a name="1"></a>
-
-      ## [1. Il tuo Account su %{company_domain}](#1)
-
-      Se crei un account sul Sito, è tua responsabilità mantenere la sicurezza dell’account e sei interamente responsabile di tutte le attività eseguite con l’account. L’utente è tenuto a notificare immediatamente a %{company_name} usi non autorizzati dell’account o altre violazioni della sicurezza. %{company_name} non sarà responsabile per qualsiasi atto od omissione da parte tua, inclusi eventuali danni di qualsiasi tipo derivanti da tali atti o omissioni.
-
-      <a name="2"></a>
-
-      ## [2. Responsabilità dei Collaboratori](#2)
-
-      Se pubblichi materiale o inserisci collegamenti sul Sito o rendi disponibile in altro modo (o consenti a terzi di rendere disponibile) materiale mediante il Sito (qualsiasi materiale di questo tipo, nel seguito chiamato il “Contenuto”), sei interamente responsabile del Contenuto e di qualsiasi danno risultante da tale Contenuto. Ciò è valido indipendentemente dalla circostanza in cui il Contenuto in questione sia costituito da testo, grafica, file audio o software informatico. Rendendo disponibile il Contenuto, l’utente dichiara e garantisce che:
-
-      *   il download, la copia e l’uso del Contenuto non viola i diritti di proprietà, inclusi ma non limitatamente a, il copyright, i brevetti, i diritti di marchi di fabbrica o di segreti commerciali di terze parti;
-      *   se il tuo datore di lavoro è titolare dei diritti sulla proprietà intellettuale creata da te, allora delle due l’una, o (i) hai ottenuto il permesso dal datore di lavoro di pubblicare o rendere disponibile il Contenuto, incluso ma non limitatamente a, qualsiasi software oppure (ii) che hai ottenuto dal datore di lavoro una rinuncia relativamente a tutti i diritti sul Contenuto o in riferimento ad esso;
-      *   sei pienamente in regola con le licenze di terze parti in relazione al Contenuto e che sono state adottate tutte le azioni necessarie per trasferire con esito positivo qualsiasi condizione richiesta agli utenti finali;
-      *   il Contenuto non contiene né installa alcun virus, worm, malware, cavalli di Troia o altri contenuti dannosi o distruttivi;
-      *   il Contenuto non costituisce spam, non è generato da macchina o in modo casuale e non contiene contenuto commerciale indesiderato o immorale finalizzato a indirizzare il traffico verso siti di terze parti o a migliorare il posizionamento nei motori di ricerca di siti di terze parti o per altri atti illeciti (ad esempio, il phishing) o per indurre in errore i destinatari in relazione all’origine del materiale (ad esempio, lo spoofing);
-      *   il Contenuto non ha carattere pornografico, non contiene minacce e non incita alla violenza e non viola i diritti di privacy o pubblicitari di terze parti;
-      *   il Contenuto non viene pubblicizzato tramite messaggi elettronici indesiderati, come collegamenti spam verso a newsgroup, elenchi email, altri blog e siti web e analoghi metodi promozionali non richiesti;
-      *   il Contenuto non è presentato in modo da indurre gli utenti a errori di identità con altri utenti o aziende; e
-      *   nel caso di Contenuto contenente codice informatico, hai classificato e/o descritto in modo accurato il tipo, la natura, gli usi e gli effetti dei materiali, se richiesto da %{company_name} o in altro modo.
-
-      <a name="3"></a>
-
-      ## [3. Licenza sui contenuti utente](#3)
-
-      I contributi degli utenti sono resi disponibili ai sensi di una [Licenza Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Senza alcuna limitazione di tali dichiarazioni o garanzie, %{company_name} ha il diritto (sebbene non l’obbligo), a discrezione di %{company_name} (i), di rifiutare o rimuovere qualsiasi contenuto che, nella ragionevole opinione di %{company_name}, viola qualsiasi politica di %{company_name} o è in altro modo dannoso o sgradevole, o (ii) di cessare o negare l’accesso e l’utilizzo del Sito a qualsiasi singolo utente o entità per qualsiasi motivo, a sola discrezione di %{company_name}. %{company_name} non ha alcun obbligo di rimborsare eventuali somme pagate in precedenza.
-
-
-      <a name="4"></a>
-
-      ## [4. Pagamento e rinnovo](#4)
-
-      ### Termini Generali
-
-      Potrebbero essere disponibili sul Sito servizi opzionali o aggiornamenti a pagamento. Quando si utilizza un servizio opzionale o aggiornamento a pagamento, acconsenti a pagare a %{company_name} le commissioni per l’abbonamento mensile o annuale indicate per tale servizio. Le somme verranno addebitate con pagamento anticipato il giorno dell’abbonamento al servizio o aggiornamento e riguarderanno l’uso di tale servizio o aggiornamento per un periodo di abbonamento mensile o annuale, come indicato. Le commissioni non sono rimborsabili.
-
-      ### Rinnovo Automatico
-
-      A meno che non invii una notifica a %{company_name} prima della scadenza del periodo di abbonamento applicabile da annullare, l’abbonamento si rinnoverà automaticamente e tu ci autorizzi a riscuotere le commissioni dell’abbonamento annuale o mensile applicabili in quel momento per tale abbonamento (così come eventuali tasse) utilizzando qualsiasi carta di credito o altro meccanismo di pagamento registrato. Gli abbonamenti possono essere annullati in qualsiasi momento.
-
-      <a name="5"></a>
-
-      ## [5. Servizi](#5)
-
-      ### Servizi di Hosting e di supporto
-
-      Possono essere forniti da %{company_name} servizi opzionali di Hosting e di supporto, ai sensi dei termini e delle condizioni specifici per ogni servizio. Con la sottoscrizione a un account di servizi di hosting o supporto, accetti di rispettare i termini e le condizioni previsti.
-
-      <a name="6"></a>
-
-      ## [6. Responsabilità dei visitatori del Sito](#6)
-
-      %{company_name} non ha rivisto e non può rivedere tutto il materiale, compreso il software informatico, pubblicato sul Sito e pertanto non può essere considerata responsabile per il contenuto, l’uso o gli effetti di tale materiale. Gestendo il Sito, %{company_name} non dichiara né implica che approva il materiale pubblicato o che ritiene che tale materiale sia accurato, utile o non nocivo. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. Il Sito potrebbe includere contenuto offensivo, indecente, o altrimenti discutibile, così come contenuto contenente imprecisioni tecniche, errori tipografici e altri errori. Il Sito potrebbe inoltre contenere materiale che viola i diritti pubblicitari o di privacy, o violare la proprietà intellettuale e altri diritti proprietari di terzi, o il cui download, la copia o l’utilizzo siano soggetti a ulteriori termini e condizioni, dichiarati o non dichiarati. %{company_name} declina ogni responsabilità per qualsiasi danno derivante dall’uso da parte di visitatori del Sito, o da qualsiasi download eseguito da tali visitatori del contenuto pubblicato.
-
-      <a name="7"></a>
-
-      ## [7. Contenuto pubblicato su altri siti Web](#7)
-
-      Non abbiamo rivisto e non possiamo rivedere tutto il materiale, compreso il software informatico, reso disponibile mediante i siti e le pagine Web che contengono link a %{company_domain} e dal sito %{company_domain}. %{company_name} non esercita alcun controllo su tali siti e pagine Web non %{company_domain} e non è responsabile del loro contenuto o utilizzo. Con il collegamento a un sito o a una pagina Web non %{company_domain}, %{company_name} non dichiara né ammette implicitamente che approva tale sito o pagina Web. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. %{company_name} declina ogni responsabilità per eventuali danni risultanti dall’uso di siti e pagine Web non %{company_domain}.
-
-      <a name="8"></a>
-
-      ## [8. Violazione del copyright e della politica DMCA](#8)
-
-      %{company_name} chiede agli altri di rispettare i propri diritti di proprietà intellettuale e a sua volta rispetta i diritti di proprietà intellettuale di terzi. Se l’utente ritiene che il materiale presente o a cui accede mediante link dal sito %{company_domain} violi il proprio copyright, è invitato a inviare una notifica a %{company_name} in conformità alla politica [Digital Millennium Copyright Act] (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (“DMCA”) di %{company_name}. %{company_name} risponderà a tutte le notifiche includendo, in base alle misure necessarie o appropriate, la rimozione del materiale che genera la violazione o la disabilitazione di tutti i link al materiale in presunta violazione. %{company_name} non consentirà più l’accesso e l’utilizzo del Sito al visitatore se, in circostanze appropriate, il visitatore si comporta come trasgressore recidivo del copyright o di altri diritti di proprietà intellettuale di %{company_name} o di terzi. In caso di rescissione, %{company_name} non avrà alcun obbligo di rimborsare eventuali somme pagate in precedenza a  %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Proprietà intellettuale](#9)
-
-      Il presente Contratto non trasferisce da %{company_name} all’utente qualsiasi proprietà intellettuale di %{company_name} o di terzi e tutti i diritti, la titolarità e l’interesse nel e su tale proprietà rimarranno (fra le parti) esclusivamente di %{company_name}. %{company_name}, %{company_domain}, il logo %{company_domain} e tutti gli altri marchi commerciali, marchi di servizio, grafica e logo utilizzati in connessione a %{company_domain} o il Sito sono marchi commerciali o marchi commerciali registrati di %{company_name} o dei licenziatari di %{company_name}. Altri marchi, marchi di servizio, grafica e logo utilizzati in connessione con il Sito possono essere marchi di terzi. L’utilizzo del Sito non implica per l’utente alcun diritto o licenza di riprodurre o utilizzare in altro modo qualsiasi marchio commerciale di %{company_name} o di terzi.
-
-      <a name="10"></a>
-
-      ## [10. Annunci pubblicitari](#10)
-
-      %{company_name} si riserva il diritto di visualizzare annunci pubblicitari sul tuo contenuto, a meno che tu non abbia acquistato un Upgrade o un account di servizi senza pubblicità.
-
-      <a name="11"></a>
-
-      ## [11. Attribuzione](#11)
-
-      %{company_name} si riserva il diritto di visualizzare link di attribuzione come “Powered by %{company_domain}”, autore del tema e attribuzione dei caratteri nel piè di pagina o la barra degli strumenti del tuo contenuto. I crediti a piè di pagina e la barra degli strumenti %{company_domain} non possono essere alterati o rimossi indipendentemente dagli upgrade acquistati.
-
-      <a name="12"></a>
-
-      ## [12. Modifiche](#12)
-
-      %{company_name} si riserva il diritto, a sua unica discrezione, di modificare o rimpiazzare qualunque parte di questo Contratto. E’ tua responsabilità controllare questo Contratto periodicamente per prendere atto dei cambiamenti. L’uso continuato e l'accesso al sito web implica l’accettazione di tali cambiamenti. %{company_name} può, in futuro, offrire nuovi servizi e/o funzionalità attraverso il Sito (incluso il rilascio di nuovi strumenti e risorse). Tali nuovi servizi e/o funzionalità saranno soggetti ai termini e condizioni di questo Contratto.
-
-      <a name="13"></a>
-
-      ## [13. Rescissione del contratto](#13)
-
-      %{company_name} può interrompere l’accesso a tutto o a parte del Sito in qualsiasi momento, con o senza causa, con o senza preavviso, con efficacia immediata. Se desideri rescindere dal presente Contratto o dall’account %{company_domain} (se disponibile), puoi semplicemente interrompere l’utilizzo del Sito. Tutte le disposizioni del presente Contratto che, per loro natura, devono permanere dopo la rescissione permarranno, incluse, senza limitazione, le disposizioni di proprietà, le esclusioni di garanzia, le indennità e le limitazioni di responsabilità.
-
-      <a name="14"></a>
-
-      ## [14. Esclusione di garanzie](#14)
-
-      Il Sito è fornito “così com’è”. Con la presente, %{company_name}, i suoi fornitori e licenziatari declinano tutte le garanzie di qualsiasi tipo, espresse o implicite, incluse, senza limitazione, le garanzie di commerciabilità, idoneità per un particolare scopo e non violazione. Né %{company_name} né i suoi fornitori e licenziatari concedono alcuna garanzia che il Sito sia privo di errori o che l’accesso ad essi sarà continuo o ininterrotto. Se stai leggendo queste informazioni, ecco un [chiarimento] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Tu comprendi che scaricare o ottenere in altro modo i contenuti o i servizi mediante il Sito, a tua discrezione e a tuo rischio.
-
-      <a name="15"></a>
-
-      ## [15. Limitazione di responsabilità](#15)
-
-      In nessun caso %{company_name}, o suoi fornitori o licenziatari, saranno responsabili per qualsiasi aspetto oggetto del presente contratto ai sensi di qualsiasi accordo, negligenza, responsabilità oggettiva o altra dottrina legale o equitativa: (i) per qualsiasi danno speciale, incidentale o consequenziale; (ii) per il costo di approvvigionamento dei prodotti o dei servizi sostitutivi; (iii) per l’interruzione dell’utilizzo oppure la perdita o il danneggiamento di dati; o (iv) per gli importi che superano le commissioni versate a %{company_name} ai sensi del presente contratto nel corso del periodo di dodici (12) mesi precedenti alla causa dell’azione. %{company_name} non sarà responsabile per qualsiasi errore o ritardo dovuto a cause al di fuori del proprio ragionevole controllo. Quanto precede non si applica nella misura vietata dalla legge applicabile.
-
-      <a name="16"></a>
-
-      ## [16. Garanzia e dichiarazione generale](#16)
-
-      Tu dichiari e garantisci che (i) l’utilizzo del Sito avverrà in stretta conformità alla [Politica sulla Privacy] (/privacy) di %{company_name}, alle [Linee Guida](/guidelines), al presente Contratto e a tutti i regolamenti e le leggi (inclusi senza limitazioni le leggi o i regolamenti locali in vigore nel paese, nello stato, nella città o in altra area governativa di appartenenza, per quanto riguarda la condotta online e il contenuto accettabile, e comprese tutte le leggi applicabili in materia di trasmissione di dati tecnici esportati dal paese di residenza del Sito o del tuo) e (ii) l’uso del Sito non viola o non si appropria indebitamente dei diritti di proprietà intellettuale di terze parti.
-
-      <a name="17"></a>
-
-      ## [17. Indennizzo](#17)
-
-      Tu accetti di indennizzare e manlevare %{company_name}, i suoi contraenti e i suoi licenziatari, e i rispettivi direttori, funzionari, dipendenti e agenti da e contro tutte le richieste di risarcimento e le spese, inclusi gli onorari, derivanti dall’uso del Sito, inclusa ma non limitatamente alla violazione dell’utente del presente Contratto.
-
-      <a name="18"></a>
-
-      ## [18. Varie](#18)
-
-      Il presente Contratto costituisce l’intero contratto tra te e %{company_name} riguardo l’argomento oggetto del contratto, e può essere modificato solo da un emendamento scritto e firmato da un dirigente autorizzato di %{company_name}, o mediante l’invio da parte di %{company_name} di una versione riveduta. Salvo diversa disposizione nel presente Contratto nei limiti consentiti dalla legge applicabile, se disponibile, qualsiasi accesso a o utilizzo del sito sarà disciplinato dalle leggi dello stato italiano, con esclusione delle disposizioni in materia di conflitto di leggi, il foro competente per qualsiasi controversia derivante dal presente contratto o collegata allo stesso è il tribunale di Roma. Fatta eccezione per le richieste di risarcimento ingiuntivo o per via equitativa o richieste di risarcimento relative ai diritti di proprietà intellettuale (che possono essere avanzate in qualsiasi tribunale competente senza prestare garanzie), qualsiasi controversia derivante dal presente contratto sarà risolta in conformità alle leggi italiane (Italia). La parte vincente in qualsiasi azione o procedimento per l’applicazione del presente Contratto avrà diritto di ottenere il rimborso delle spese e degli onorari legali. Nel caso in cui una parte del presente Contratto venga ritenuta non valida o non applicabile, tale parte verrà interpretata in modo da riflettere le intenzioni originali delle parti e le altre disposizioni rimarranno attive ed efficaci. Il mancato esercizio da parte di qualsiasi parte di qualsiasi termine o condizione del presente Contratto o qualsiasi violazione dello stesso, in qualsiasi unica istanza, non implicherà la rinuncia a tale termine o condizione oppure a successive violazioni. Tu puoi assegnare diritti ai sensi del presente Contratto a qualsiasi parte che acconsenta e accetti di essere vincolata dai suoi termini e condizioni; %{company_name} può assegnare i suoi diritti ai sensi del presente Contratto senza condizioni. Il presente Contratto sarà vincolante e avrà effetto a beneficio delle parti, dei subentranti e degli assegnatari autorizzati.
-
-      Questo documento è CC-BY-SA. Ultimo aggiornamento 31 maggio 2013.
-
-      Adattamento dal contratto originale [Termini di Servizio WordPress](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Politica della Privacy"
     body: |
@@ -2998,7 +2846,6 @@ it:
     badge_title_metadata: "%{display_name}distintivo su %{site_title}"
   admin_login:
     success: "email Inviata"
-    error: "Errore!"
     email_input: "Email Amministratore"
     submit_button: "Invia Email"
   performance_report:
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 3df482f16d..787fa3dd93 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -131,7 +131,6 @@ ja:
     latest: "最新のトピック"
     hot: "ホットトピック"
     posts: "最近の投稿"
-    private_posts: "最新のプライベートメッセージ"
     group_posts: "%{group_name}からの最新投稿"
     group_mentions: "%{group_name}からの最新メンション"
     user_posts: "@%{username}からの最新投稿"
@@ -183,9 +182,7 @@ ja:
         topic:
           attributes:
             base:
-              warning_requires_pm: "プライベートメッセージでのみ警告を送ることができます"
               too_many_users: "一度に1ユーザーにしか警告を送る事はできません"
-              cant_send_pm: "申し訳ありません。このユーザーにはプライベートメッセージを送る事ができません"
               no_user_selected: "有効なユーザーを選択してください"
         user:
           attributes:
@@ -552,7 +549,6 @@ ja:
   site_settings:
     censored_words: "自動的に &#9632;&#9632;&#9632;&#9632; で置換されます"
     delete_old_hidden_posts: "30日以上非表示になっている投稿を自動で削除します"
-    default_locale: "この Discourse インスタンスのデフォルト言語 (ISO 639-1 Code)"
     allow_user_locale: "ユーザーが言語を選択できるようにする"
     min_post_length: "投稿を許可する最少の文字数"
     min_first_post_length: "最初の投稿(投稿本文)を許可する最少の文字数"
@@ -689,7 +685,6 @@ ja:
     clean_orphan_uploads_grace_period_hours: "どこからもリンクされていないアップロードファイルを削除するまでの猶予期間 (単位：時間)。"
     purge_deleted_uploads_grace_period_days: "削除されたアップロードファイルが完全削除されるまでの猶予期間 (単位：日)。"
     enable_s3_uploads: "Amazon S3にアップロードします。重要: 有効なS3 credentials(access key id & secret access key)が必要です"
-    s3_use_iam_profile: 'キーの取得にAWS EC2 IAM roleを使用する 注意: 有効にすると、s3 access key id" と "s3 secret access key"の設定を上書きします'
     s3_upload_bucket: "ファイルをアップロードする Amazon S3のバケット名。　警告: 小文字である必要があり、ピリオドとアンダースコアを含むことはできません"
     s3_access_key_id: "画像をアップロードするAmazonS3のaccess key id"
     s3_secret_access_key: "画像をアップロードする Amazon S3 の secret access key"
@@ -1191,7 +1186,6 @@ ja:
       name: はじめての絵文字
   admin_login:
     success: "メールを送信しました"
-    error: "エラー！"
     email_input: "アドミンメール"
     submit_button: "メールを送信する"
   performance_report:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 6220d2e962..27f21799fc 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -191,7 +191,6 @@ ko:
     top_weekly: "주간 인기 토픽"
     top_daily: "일간 인기 토픽"
     posts: "최근 글"
-    private_posts: "최신 개인 메시지"
     group_posts: "%{group_name}의 최신 게시글"
     group_mentions: "%{group_name}의 최신 멘션"
     user_posts: "@%{username}님의 최신 포스트"
@@ -285,12 +284,6 @@ ko:
       죄송하지만, 새로운 사용자는 한 토픽 당%{newuser_max_replies_per_topic}개의 답글만 쓸 수 있습니다.
 
       새 답글을 다는 대신에, 전에 쓴 답글을 수정하거나 다른 토픽을 구경해보세요.
-    reviving_old_topic: |
-      ### 이 토픽을 다시 살려보고 싶으세요?
-
-      마지막으로 답글이 달린 지 **%{days}** 일이 지났습니다. 여기에 답글을 쓰시면 토픽이 리스트의 상단으로 껑충 뛰어오르고, 이 토픽과 관련된 사람들에게 알림이 가게 됩니다.
-
-      이 오래된 대화를 이어가고 싶은 것이 확실하신가요?
   activerecord:
     attributes:
       category:
@@ -307,9 +300,7 @@ ko:
         topic:
           attributes:
             base:
-              warning_requires_pm: "개인 메시지를 통해 경고를 보낼 수 있습니다."
               too_many_users: "한 번에 한 명의 사용자에게 경고를 보낼 수 있습니다."
-              cant_send_pm: "죄송합니다. 그 사용자에게 개인 메세지를 보낼 수 없습니다."
               no_user_selected: "유효한 사용자를 선택해주십시오"
               reply_by_email_disabled: "이메일로 답글쓰기가 비활성화되었습니다."
             featured_link:
@@ -798,7 +789,6 @@ ko:
     censored_words: "단어는 자동적으로 `&#9632;&#9632;&#9632;&#9632;` 로 대체 됩니다."
     censored_pattern: "자동으로 `&#9632;&#9632;&#9632;&#9632;` 로 대체되는 정규표현식"
     delete_old_hidden_posts: "30일이 지난 숨겨진 글은 자동으로 삭제됩니다."
-    default_locale: "Discourse 인스턴스가 사용하는 기본 언어 (ISO 639-1 Code)"
     allow_user_locale: "사용자에게 자신이 원하는 언어를 선택 허용"
     set_locale_from_accept_language_header: "익명 사용자의 인터페이스 언어를 웹브라우저 언어 헤더를 기준으로 변경하기(실험적인 기능입니다. 익명 cache와 동작하지 않습니다.)"
     min_post_length: "글의 최소 글자 수"
@@ -998,7 +988,6 @@ ko:
     clean_orphan_uploads_grace_period_hours: "참조되지 않은 업로드 파일을 제거하기 전 기간(시간)"
     purge_deleted_uploads_grace_period_days: "참조되지 않은 업로드 파일을 완전 삭제하지 전 기간(일)"
     enable_s3_uploads: "Amazon S3 storage에 업로드해주세요. 중요: 올바른 S3 계정이 필요합니다.(access key id와 secret access key 둘다)"
-    s3_use_iam_profile: 'AWS EC2 IAM role로 key를 받음. 정보: 활성화하면 "s3 access key id"와 "s3 secret access key" 설정도 같이 변경됩니다.'
     s3_upload_bucket: "파일이 업로드 될 위치의 Amazon S3 bucket name.  경고: 소문자 알파벳만 허용되며 점 . 이나 밑줄문자 _ 가 없어야 함."
     s3_access_key_id: "이미지를 업로드 할 때 사용할 Amazon S3의 access key id"
     s3_secret_access_key: "이미지를 업로드 할 때 사용할 Amazon S3의 secret access key"
@@ -1043,7 +1032,6 @@ ko:
     min_trust_to_edit_wiki_post: "위키로 설정된 글 수정할 수 있는 최소 회원등급"
     min_trust_to_edit_post: "포스트를 편집하기 위한 최소 신뢰도"
     min_trust_to_allow_self_wiki: "사용자의 포스트 위키를 만들기 위한 최소 신뢰도"
-    min_trust_to_send_messages: "새로운 개인 메시지를 보내기 위한 최소 신뢰도"
     newuser_max_links: "새로운 사용자가 글에 붙일 수 있는 최대 링크 개수"
     newuser_max_images: "새로운 사용자가 글에 붙일 수 있는 최대 이미지 개수"
     newuser_max_attachments: "새로운 사용자가 포스트에 첨부할 수 있는 최대 파일 개수"
@@ -1106,7 +1094,6 @@ ko:
     reply_by_email_enabled: "이메일을 통해 주제에 답글을 달 수 있음."
     reply_by_email_address: "이메일 주소로 답글을 다는 템플릿. 예: %{reply_key}@reply.myforum.com"
     alternative_reply_by_email_addresses: "수신된 이메일에 대한 답장메일의 대체 템플릿 목록. 예: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "수신 이메일에 text 대신 HTML을 사용"
     disable_emails: "Discourse가 어떤 메일로 보내지 못하도록 합니다."
     strip_images_from_short_emails: "2800바이트, 즉 2.73 KB 이내 사이즈를 가지도록 이미지를 빼주세요."
     short_email_length: "짦은 이메일 바이트 길이"
@@ -1728,7 +1715,6 @@ ko:
     badge_title_metadata: "%{site_title}의 %{display_name} 배지"
   admin_login:
     success: "이메일 보냄"
-    error: "에러!"
     email_input: "관리자 이메일"
     submit_button: "이메일 보내기"
   performance_report:
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 20c1bd5d7d..ef38d44f60 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -24,7 +24,7 @@ nb_NO:
     pm: "pm"
     <<: *datetime_formats
   title: "Discourse"
-  topics: "Emner"
+  topics: "Tråder"
   posts: "innlegg"
   loading: "Laster"
   powered_by_html: 'Drives av <a href="https://www.discourse.org">Discourse</a>, og ser best ut med JavaScript aktivert'
@@ -37,7 +37,7 @@ nb_NO:
     bad_color_scheme: "Kan ikke oppdatere drakt, ugyldig fargepalett"
   emails:
     incoming:
-      default_subject: "Emnet trenger en tittel"
+      default_subject: "Tråden trenger en tittel"
       show_trimmed_content: "Vis beskåret innhold"
       errors:
         empty_email_error: "Skjer når den rå e-posten vi mottok var blank."
@@ -47,11 +47,11 @@ nb_NO:
         no_sender_detected_error: "Skjer når vi ikke kunne finne en gyldig adresse i Fra-hodet."
         inactive_user_error: "Skjer når senderen ikke er aktiv."
         bad_destination_address: "Skjer når ingen av adressene i To-, Cc- eller Bcc-feltene passer med en konfigurert innkommende e-postadresse."
-        strangers_not_allowed_error: "Skjer når en bruker forsøket å opprette et nytt emne i en kategori som han eller hun ikke er medlem av."
-        insufficient_trust_level_error: "Skjer når en bruker forsøket å opprette et nytt emne i en kategori som han eller hun ikke har tillitsnivå for."
+        strangers_not_allowed_error: "Skjer når en bruker har forsøkt å opprette en ny tråd i en kategori som vedkommende ikke er medlem av."
+        insufficient_trust_level_error: "Skjer når en bruker har forsøkt å opprette en ny tråd i en kategori som vedkommende ikke har påkrevet tillitsnivå for."
         reply_user_not_matching_error: "Skjer når et innkommende svar kommer fra en annen e-postadresse enn varselet var sendt til."
-        topic_not_found_error: "Skjer når et svar blir mottatt, men det tilhørene emnet er slettet."
-        topic_closed_error: "Skjer når et svar blir mottatt, men det tilhørene emnet er stengt."
+        topic_not_found_error: "Skjer når et svar blir mottatt, men den tilhørende tråden er slettet."
+        topic_closed_error: "Skjer når et svar blir mottatt, men den tilhørende tråden er stengt."
       unrecognized_error: "Ukjent feil"
   errors: &errors
     format: '%{attribute} %{message}'
@@ -116,7 +116,7 @@ nb_NO:
     backup_file_should_be_tar_gz: "Backup-filen må være en .tar.gz -arkiveringsfil."
     not_enough_space_on_disk: "Det er ikke nok diskplass til å laste opp denne backupen."
     invalid_filename: "Det sikkerhetskopierte filnavnet inneholder ugyldige tegn. Gyldige tegn er a-z 0-9 . - _."
-  not_logged_in: "Du må være logget inn for å gjøre dette."
+  not_logged_in: "Du må være innlogget for å gjøre det."
   not_found: "Den etterspurte URL eller ressurs ble ikke funnet"
   invalid_access: "Du har ingen tilgang til denne resurssen."
   invalid_api_credentials: "Du har ikke tillatelse til å se denne forespurte ressuresen. API-brukernavnet eller -nøkkelen er ikke gyldig."
@@ -124,8 +124,8 @@ nb_NO:
   reading_time: "Lesetid"
   likes: "Likes"
   too_many_replies:
-    one: "Vi beklager, men nye brukere er midlertidig begrenset til 1 svar i det samme emnet."
-    other: "Vi beklager, men nye brukere er midlertidig begrenset til %{count} svar i det samme emnet."
+    one: "Vi beklager, men nye brukere er midlertidig begrenset til 1 svar i det samme tråden."
+    other: "Vi beklager, men nye brukere er midlertidig begrenset til %{count} svar i samme tråd."
   embed:
     start_discussion: "Start diskusjon"
     continue: "Fortsett diskusjon"
@@ -159,39 +159,40 @@ nb_NO:
     other: "Beklager, nye brukere kan bare laste opp %{count} vedlegg til et innlegg."
   no_links_allowed: "Beklager, nye brukere kan ikke publisere innlegg med lenker."
   spamming_host: "Beklager, du kan ikke lenke til det domenet."
-  user_is_suspended: "Utviste brukere kan ikke skrive innlegg."
-  topic_not_found: "Noe gikk galt. Kanskje emnet har blitt lukket eller slettet samtidig som du har sett på det?"
+  user_is_suspended: "Utestengte brukere kan ikke skrive innlegg."
+  topic_not_found: "Noe gikk galt. Kanskje tråden ble lukket eller slettet mens du leste den?"
   just_posted_that: "er for likt det du nylig publiserte."
   invalid_characters: "inneholder ugyldige tegn"
   next_page: "neste side →"
   prev_page: "← forrige side"
   page_num: "Side %{num}"
   home_title: "Hjem"
-  topics_in_category: "Emner i '%{category}' kategorien"
+  topics_in_category: "Tråder i '%{category}'-kategorien"
   rss_posts_in_topic: "RSS-strøm av '%{topic}'"
-  rss_topics_in_category: "RSS-strøm av emner i '%{category}' kategorien"
+  rss_topics_in_category: "RSS-strøm av tråder i '%{category}'-kategorien"
   author_wrote: "%{author} skrev:"
   num_posts: "Innlegg:"
   num_participants: "Deltakere:"
-  read_full_topic: "Les hele emnet"
+  read_full_topic: "Les hele tråden"
   private_message_abbrev: "Mld"
   rss_description:
-    latest: "Siste emner"
-    hot: "Populære emner"
-    top: "Mest Populære Emner"
-    top_all: "Tidenes mest populære emner"
-    top_yearly: "Årets mest populære emner"
-    top_quarterly: "Kvartalets mest populære emner"
-    top_monthly: "Månedens mest populære emner"
-    top_weekly: "Ukas mest populære emner"
-    top_daily: "Dagens mest populære emner"
+    latest: "Siste tråder"
+    hot: "Populære tråder"
+    top: "Mest populære tråder"
+    top_all: "Tidenes mest populære tråder"
+    top_yearly: "Årets mest populære tråder"
+    top_quarterly: "Kvartalets mest populære tråder"
+    top_monthly: "Månedens mest populære tråder"
+    top_weekly: "Ukens mest populære tråder"
+    top_daily: "Dagens mest populære tråder"
     posts: "Siste innlegg"
-    private_posts: "Siste private meldinger"
+    private_posts: "Siste personlige beskjeder"
     group_posts: "Siste innlegg fra %{group_name}"
+    group_mentions: "Siste omtalelser %{group_name}"
     user_posts: "Siste innlegg av @%{username}"
-    user_topics: "Siste emner av @%{username}"
-    tag: "Emner merket med stikkord"
-  too_late_to_edit: "Det innlegget ble laget for lenge siden. Det kan ikke lenger redigeres eller slettes."
+    user_topics: "Siste tråder av @%{username}"
+    tag: "Tråder med stikkord"
+  too_late_to_edit: "Det er for lenge siden det innlegget ble skrevet. Det kan ikke lenger redigeres eller slettes."
   excerpt_image: "bilde"
   queue:
     delete_reason: "Slettet via køen for innleggmoderering"
@@ -218,13 +219,13 @@ nb_NO:
       one: "1 innlegg"
       other: "%{count} innlegg"
     new-topic: |
-      Velkommen til %{site_name}. **Takk for at du starter et nytt innlegg!**
+      Velkommen til %{site_name}. **Takk for at du starter en ny samtale!**
 
-      - Høres tittelen på innlegget interessant ut hvis du leser den høyt? Er den en god oppsummering?
+      - Høres tittelen interessant ut hvis du leser den høyt? Er den en god oppsummering?
 
       - Hvem vil være interessert i dette? Hvorfor har det noe å si? Hva slags respons er du ute etter?
 
-      - Bruk relevante begrep i emnet så andre kan *finne* det. Velg en kategori for å gruppere emnet ditt med andre lignende emner.
+      - Bruk relevante begrep i tråden slik at andre kan *finne* det. Velg en kategori for å gruppere tråden ditt med andre lignende tråder.
 
       [Se retningslinjene for dette nettstedet](/guidelines) for mer informasjon. Denne meldingen vises kun for ditt/dine første %{education_posts_text}.
     new-reply: |
@@ -232,7 +233,7 @@ nb_NO:
 
       - Forbedrer innlegget ditt samtalen på noen måte?
 
-      - Vær snill mot andre medlemmer.
+      - Vær snill mot andre brukere.
 
       - Konstruktiv kritikk er velkommen, men husk å kritisere *idéer,* ikke mennesker.
 
@@ -253,9 +254,7 @@ nb_NO:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Du kan bare legge ved advarsel til private meldinger."
               too_many_users: "Du kan bare sende advarsel til en bruker om gangen."
-              cant_send_pm: "Beklager, du kan ikke sende en privat melding til den brukeren."
               no_user_selected: "Du må velge en gyldig bruker. "
             featured_link:
               invalid: "er ugyldig. Nettadressen bør inneholde http:// eller https://"
@@ -276,7 +275,7 @@ nb_NO:
               invalid: "er ikke en gyldig farge"
         post_reply:
           base:
-            different_topic: "Innlegg ogg svar må tilhøre samme emne."
+            different_topic: "Innlegg og svar må tilhøre samme tråd."
         web_hook:
           attributes:
             payload_url:
@@ -291,13 +290,13 @@ nb_NO:
               in_the_past: "må være i fremtiden."
       <<: *errors
   user_profile:
-    no_info_other: "<div class='missing-profile'>%{name} har ikke skrevet noe i Om meg-feltet på sin profil ennå</div>"
+    no_info_other: "<div class='missing-profile'>%{name} har ikke skrevet noe i Om meg-feltet i profilen sin ennå</div>"
   vip_category_name: "Salong"
   vip_category_description: "En kategori tilgjengelig for brukere på tillitsnivå 3 og høyere."
   meta_category_name: "Tilbakemeldinger"
   meta_category_description: "Diskusjon om dette nettstedet, hvordan det er organisert, hvordan det fungerer og hvordan vi kan forbedre det."
   staff_category_name: "Stab"
-  staff_category_description: "Privat kategori for diskusjoner blant staben. Emner er kun synlige for administratorer og moderatorer."
+  staff_category_description: "Privat kategori for diskusjoner blant staben. Tråder er kun synlige for administratorer og moderatorer."
   discourse_welcome_topic:
     title: "Velkommen til Discourse"
   lounge_welcome:
@@ -306,27 +305,27 @@ nb_NO:
 
       Gratulerer! :confetti_ball:
 
-      Hvis du kan se dette emnet har du nylig blitt promotert til **trofast** (tillitsnivå 3).
+      Hvis du kan se denne tråden, er du nylig blitt forfremmet til **aktivt medlem** (tillitsnivå 3).
 
       Du kan nå &hellip;
 
-      * Redigere tittelen på alle emner
-      * Endre kategorien på alle emner
+      * Endre tittelen til hvilken som helst tråd
+      * Endre kategorien til hvilken som helst tråd
       * Få lenkene dine fulgt opp ([automatisk nofollow](http://en.wikipedia.org/wiki/Nofollow) er fjernet)
-      * Tilgang til en privat salong-kategori som bare er synlig for brukere på tillitsnivå 3 eller høyere.
-      * All søppelpost du flagger vil bli gjemt umiddelbart.
+      * Se og delta i diskusjonene i en privat salong-kategori som bare er synlig for brukere med tillitsnivå 3 eller høyere.
+      * Skjule søppelpost med ett flagg.
 
-      Her er den [oppdaterte listen over andre "trofaste"](/badges/3/regular). Si gjerne hei!
+      Her er den [oppdaterte listen over andre trofaste](/badges/3/regular). Si gjerne hei!
 
-      Takk for at du er en aktiv del av fellesskapet vårt.
+      Takk for at du er en viktig del av fellesskapet vårt.
 
-      (For mer informasjon om tillitsnivå, [see dette emnet][trust]. Merk deg at bare medlemmer som fortsetter å oppfylle kravene over tid vil forbli *trofaste*.)
+      (For mer informasjon om tillitsnivå [se denne tråden][tillit]. Merk deg at bare medlemmer som fortsetter å oppfylle kravene over tid, vil forbli *trofaste*.)
 
-      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+      [tillit]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Om kategorien %{category} "
-    replace_paragraph: "(Erstatt dette første avsnittet med en kort beskrivelse av den nye kategorien din. Denne teksten vil vises i oversikten over kategorier, så prøv å holde den under 200 ord. **Inntil du endrer denne beskrivelsen eller oppretter emner, vil denne kategorien ikke vises på kategorier-siden.**)"
-    post_template: "%{replace_paragraph}\n\nBruk de følgende avsnittene for en lengre beskrivelse, eller for å beskrive retningslinjer eller regler for kategorien:\n\n- Hvorfor skal folk bruke denne kategorien? Hva er den ment for?\n\n- På hvilken måte skiller den seg fra de andre kategoriene vi allerede har?\n\n- Hva skal emner i denne kategorien generelt sett inneholde?\n\n- Trenger vi denne kategorien? Kan vi slå den sammen med en annen kategori eller underkategori?\n"
+    replace_paragraph: "(Erstatt dette første avsnittet med en kort beskrivelse av den nye kategorien din. Denne teksten vil vises i oversikten over kategorier, så prøv å holde lengden under 200 bokstaver. **Inntil du endrer denne beskrivelsen eller oppretter tråder, vil denne kategorien ikke vises på kategorier-siden.**)"
+    post_template: "%{replace_paragraph}\n\nBruk de følgende avsnittene for en lengre beskrivelse, eller for å formulere retningslinjer eller regler for kategorien:\n\n- Hvorfor skal folk bruke denne kategorien? Hva er den ment for?\n\n- Hvordan skiller den seg fra de andre kategoriene vi allerede har?\n\n- Hva skal tråder i denne kategorien generelt sett inneholde?\n\n- Trenger vi denne kategorien? Kan vi slå den sammen med en annen kategori eller underkategori?\n"
     errors:
       uncategorized_parent: "Ukategorisert kan ikke ha en foreldrekategori"
       self_parent: "En underkategori kan ikke være underlagt seg selv"
@@ -335,10 +334,10 @@ nb_NO:
       uncategorized: "Kan ikke slette Ukategorisert"
       has_subcategories: "Kan ikke slette denne kategorien fordi den har underkategorier."
       topic_exists:
-        one: "Kan ikke slette denne kategorien fordi den har 1 emne. Eldste emne er %{topic_link}."
-        other: "Kan ikke slette denne kategorien fordi den har %{count} emner. Eldste emne er %{topic_link}."
-      topic_exists_no_oldest: "Kan ikke slette denne kategorien fordi emneantallet er %{count}."
-    uncategorized_description: "Emner som ikke trenger en kategori eller som ikke passer i noen av de eksisterende."
+        one: "Kan ikke slette denne kategorien fordi den har 1 tråd. Eldste tråd er %{topic_link}."
+        other: "Kan ikke slette denne kategorien fordi den har %{count} tråder. Eldste tråd er %{topic_link}."
+      topic_exists_no_oldest: "Kan ikke slette denne kategorien fordi antall tråder er %{count}."
+    uncategorized_description: "Tråder som ikke trenger en kategori eller som ikke passer i noen av de eksisterende kategoriene."
   trust_levels:
     newuser:
       title: "ny bruker"
@@ -347,14 +346,14 @@ nb_NO:
     member:
       title: "medlem"
     regular:
-      title: "trofast"
+      title: "aktivt medlem"
     leader:
       title: "leder"
   rate_limiter:
     too_many_requests: "Vi har en daglig begrensning for hvor mange ganger den handlingen kan utføres. Vent %{time_left} før du prøver igjen."
     by_type:
-      first_day_replies_per_day: "Du har nådd det maksimale antall svar en ny bruker kan publisere på sin første dag. Vær så snill og vent %{time_left} før du prøver igjen."
-      first_day_topics_per_day: "Du har nådd det maksimale antall emner en ny bruker kan publisere på sin første dag. Vær så snill og vent %{time_left} før du prøver igjen."
+      first_day_replies_per_day: "Du har nådd det maksimale antall svar en ny bruker kan publisere på sin første dag. Vennligst vent %{time_left} før du prøver igjen."
+      first_day_topics_per_day: "Du har nådd det maksimale antall tråder en ny bruker kan publisere på sin første dag. Vennligst vent %{time_left} før du prøver igjen."
       create_post: "Du svarer for raskt. Vent %{time_left} før du prøver igjen."
       delete_post: "Du sletter innlegg for raskt. Vent %{time_left} før du prøver igjen."
       topics_per_day: "Du har oppnådd høyest antall innlegg for i dag. Vær så snill og vent %{time_left} før du prøver igjen."
@@ -468,7 +467,7 @@ nb_NO:
   post_action_types:
     off_topic:
       title: 'Urelatert'
-      description: 'Dette innlegget er ikke relevant til den aktuelle emne som definert av tittelen og første innlegget, og burde sannsynligvis flyttes et annet sted. '
+      description: 'Dette innlegget er ikke relevant for den aktuelle diskusjonen som fastsatt av tittelen og det første innlegget og burde sannsynligvis flyttes til et annet sted. '
       long_form: 'markerte dette som urelevant'
     spam:
       title: 'Spam'
@@ -481,6 +480,8 @@ nb_NO:
       long_form: 'markerte dette som upassende'
     notify_user:
       title: 'Send en melding til @{{username}}'
+      description: 'Jeg vil snakke direkte og privat med denne personen om innlegget.'
+      short_description: 'Jeg vil snakke direkte og privat med denne personen om innlegget.'
       long_form: 'sendt melding til bruker'
       email_title: 'Ditt innlegg i "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -508,7 +509,7 @@ nb_NO:
   topic_flag_types:
     spam:
       title: 'Spam'
-      description: 'Dette innlegget er reklame. Det er ikke nyttig eller relevant til emnet, men av promoterende karakter.'
+      description: 'Dette innlegget er reklame. Det er ikke nyttig eller relevant for dette nettstedet, men av promoterende karakter.'
       long_form: 'rapporterte dette som spam'
     inappropriate:
       title: 'Upassende'
@@ -517,23 +518,23 @@ nb_NO:
     notify_moderators:
       title: "Noe annet"
       long_form: 'Markert for mederering'
-      email_title: 'Emne "%{title}" krever moderator oppmerksomhet'
+      email_title: 'Tråden "%{title}" krever oppmerksomhet fra en moderator'
       email_body: "%{link}\n\n%{message}"
   flagging:
     user_must_edit: '<p>Dette innlegget ble rapportert av gemenskapen og er midlertidig skjult.</p>'
   archetypes:
     regular:
-      title: "Vanlig emne"
+      title: "Vanlig tråd"
     banner:
-      title: "Banneremne"
+      title: "Bannertråd"
       message:
-        make: "Dette emnet er nå en banner. Det vil vises på toppen av hver side til brukeren lukker det."
-        remove: "Dette emnet er ikke lenger en banner. Det vil ikke lenger vises på toppen av hver side."
+        make: "Denne tråden er nå et banner. Det vil vises øverst på hver side til brukeren lukker det."
+        remove: "Denne tråden er ikke lenger et banner. Det vil ikke lenger vises øverst på hver side."
   unsubscribe:
     title: "Avmeld"
-    stop_watching_topic: "Slutt å følge dette emnet, %{link}"
-    mute_topic: "Demp alle varslene for dette emnet, %{link}"
-    unwatch_category: "Slutt å følge alle emner i %{category}"
+    stop_watching_topic: "Slutt å følge denne tråden, %{link}"
+    mute_topic: "Ignorer alle varslene for denne tråden, %{link}"
+    unwatch_category: "Slutt å følge alle tråder i %{category}"
     mailing_list_mode: "Slå av e-postlistemodus"
     disable_digest_emails: "Slutt å sende meg oppsummerings-eposter"
     all: "Ikke send meg noen e-poster fra %{sitename}"
@@ -559,9 +560,9 @@ nb_NO:
       xaxis: "Dag"
       yaxis: "Antallet brukerprofiler vist"
     topics:
-      title: "Emner"
+      title: "Tråder"
       xaxis: "Dag"
-      yaxis: "Antall nye emner"
+      yaxis: "Antall nye tråder"
     posts:
       title: "Innlegg"
       xaxis: "Dag"
@@ -579,9 +580,9 @@ nb_NO:
       xaxis: "Dag"
       yaxis: "Antall nye bokmerker"
     starred:
-      title: "Favorisert"
+      title: "Favoritt"
       xaxis: "Dag"
-      yaxis: "Antall nye favoriserte emner"
+      yaxis: "Antall nye favoritt-tråder"
     users_by_trust_level:
       title: "Brukere per tillitsnivå"
       xaxis: "Tillitsnivå"
@@ -614,16 +615,16 @@ nb_NO:
       title: "Topp-henvisere"
       xaxis: "Bruker"
       num_clicks: "Klikk"
-      num_topics: "Emner"
+      num_topics: "Tråder"
     top_traffic_sources:
       title: "Topp trafikk-kilder"
       xaxis: "Domene"
       num_clicks: "Klikk"
-      num_topics: "Emner"
+      num_topics: "Tråder"
       num_users: "Brukere"
     top_referred_topics:
-      title: "Topp henviste emner"
-      xaxis: "Emne"
+      title: "Topp henviste tråder"
+      xaxis: "Tråd"
       num_clicks: "Klikk"
     page_view_anon_reqs:
       title: "Anonym"
@@ -632,7 +633,7 @@ nb_NO:
     page_view_logged_in_reqs:
       title: "Innlogget"
       xaxis: "Dag"
-      yaxis: "Innloggede sidevisninger"
+      yaxis: "Sidevisninger av innloggede"
     page_view_crawler_reqs:
       title: "Web crawlere"
       xaxis: "Dag"
@@ -641,9 +642,9 @@ nb_NO:
       xaxis: "Dag"
       yaxis: "Totalt antall sidevisninger"
     page_view_logged_in_mobile_reqs:
-      title: "Innloggede sidevisninger"
+      title: "Sidevisninger av innloggede"
       xaxis: "Dag"
-      yaxis: "Innloggede sidevisninger fra mobil"
+      yaxis: "Sidevisninger på mobil av innloggede"
     page_view_anon_mobile_reqs:
       xaxis: "Dag"
     http_background_reqs:
@@ -675,7 +676,7 @@ nb_NO:
       xaxis: "Dag"
       yaxis: "Gjennomsnittlig tid (timer)"
     topics_with_no_response:
-      title: "Emner uten svar"
+      title: "Tråder uten svar"
       xaxis: "Dag"
       yaxis: "Totalt"
     mobile_visits:
@@ -689,7 +690,6 @@ nb_NO:
   site_settings:
     censored_words: "Ord som automatisk vil bli erstattet med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Slett automatisk skjulte innlegg som har vært skjult i mer enn 30 dager."
-    default_locale: "Forvalgt språk for denne instansen av Discourse (ISO 639-1 Kode)"
     allow_user_locale: "Tillat brukere å velge eget språk"
     min_post_length: "Minimum tillatt lengde for innlegg i tegn"
     min_first_post_length: "Minimum tillatt lengde på for teksten i første innlegg"
@@ -699,9 +699,9 @@ nb_NO:
     max_topic_title_length: "Maksimum tillatt lengde for innlegg i tegn"
     min_private_message_title_length: "Minste antall tegn tillatt til bruk for tittellengde i meldinger"
     min_search_term_length: "Minimum lengde på søkeord i tegn"
-    allow_duplicate_topic_titles: "Tillat flere emner med identisk tittel."
+    allow_duplicate_topic_titles: "Tillat flere tråder med identisk tittel."
     unique_posts_mins: "Hvor mange minutter før en bruker kan lage et innlegg med det samme innholdet igjen"
-    educate_until_posts: "Når bruker begynner å skrive på de første (n) innleggene, vis pop-up med opplæringspanelet for nye brukere i editoren."
+    educate_until_posts: "Når brukeren begynner å skrive sine første (n) innlegg, vis pop-up med opplæringspanelet for nye brukere i redigeringspanelet."
     title: "Navnet på denne siden, slik du vil ha det i title-taggen."
     site_description: "Beskriv siden med en setning, vil brukes i beskrivelses-merkelappen."
     contact_url: "Kontakt-URL for siden. Brukes på /om siden."
@@ -710,18 +710,18 @@ nb_NO:
     download_remote_images_threshold: "Minimum ledig diskplass for å kunne laste ned eksterne bilder (i prosent)"
     disabled_image_download_domains: "Eksterne bilder vil aldri bli lastet ned fra disse domenene (pipe-separert liste)."
     editing_grace_period: "(n) sekunder etter publisering vil redigering ikke opprette en ny versjon i redigeringsloggen."
-    post_edit_time_limit: "Forfattere kan redigere eller slette innleggene sine (n) minutter etter opprettelse. Sett 0 for uendelig."
-    edit_history_visible_to_public: "Alle kan se tidligere versjoner av et redigert innlegg. Hvis det er slått av kan kun staben se det."
+    post_edit_time_limit: "Forfatteren kan redigere eller slette innleggene sine (n) minutter etter opprettelse. Sett til 0 for uendelig."
+    edit_history_visible_to_public: "La alle se tidligere versjoner av et redigert innlegg. Hvis det er slått av, kan kun staben se det."
     delete_removed_posts_after: "Innlegg som blir fjernet av forfatter blir automatisk slettet etter (n) timer. Sett til 0 og innleggene blir slettet øyeblikkelig."
     max_image_width: "Maksimal thumbnail bredde for bilder i et innlegg"
     max_image_height: "Maksimal thumbnail høyde for bilder i et innlegg"
     post_excerpt_maxlength: "Maksimal lengde på utdrag eller oppsummering av innlegg."
     apple_touch_icon_url: "Ikon brukt på Apple touch enheter. Anbefalt størrelse er 144px x 144px."
-    summary_max_results: "Maksimalt antall innlegg som returneres av 'Oppsummer dette emnet'"
+    summary_max_results: "Maksimalt antall innlegg som returneres av 'Oppsummer denne tråden'"
     allow_moderators_to_create_categories: "Tillat moderatorer å opprette nye kategorier"
     send_welcome_message: "Send alle nye brukere en velkomstmelding med en rask startveileder."
-    topics_per_period_in_top_summary: "Antall topp-emner vises som forvalg i oppsummeringen av topp-emner."
-    show_email_on_profile: "Vis brukerens e-postadresse i profilen (kun synlig for brukeren selv og forumstaben)"
+    topics_per_period_in_top_summary: "Antall tråder som vises i standard oppsummering av mest populære tråder."
+    show_email_on_profile: "Vis en brukers e-postadresse vedkommendes profil (kun synlig for brukeren selv og forumstaben)"
     email_token_valid_hours: "Glemt passord / aktiver konto tokens er gyldig for (n) timer."
     enable_badges: "Aktiver badge system"
     log_out_strict: "Ved utlogging, logg ut av ALLE enheter som er pålogget"
@@ -734,6 +734,7 @@ nb_NO:
     max_likes_per_day: "Maximum antall likes per bruker per dag"
     max_invites_per_day: "Maksimalt antall invitasjoner en bruker kan sende hver dag."
     max_logins_per_ip_per_hour: "Maksimalt antall innlogginger som tillates for hver IP-adresse per time."
+    allow_staff_to_upload_any_file_in_pm: "Tillat medlemmer av staben å laste opp hvilken som helst fil i private samtaler"
     newuser_max_links: "Hvor mange linker en ny bruker kan legge til i et innlegg."
     newuser_max_images: "Hvor mange bilder en ny bruker kan legge til i et innlegg."
     title_prettify: "Unngå vanlige skrivefeil i titler, sånn som store bokstaver, liten bokstav først, mange !, ? og punktum på slutten, osv."
@@ -741,32 +742,32 @@ nb_NO:
     tos_url: "Dersom du har et bruksvilkår-dokument et annet sted som du vil bruke, skriv inn den fullstendige URL-en her."
     privacy_policy_url: "Dersom du har en personvernerklæring et annet sted som du vil bruke, skriv inn den fullstendige URL-en her."
     delete_user_max_post_age: "Ikke tillatt å slette brukere hvor deres første innlegg er mer enn (x) dager gamle."
-    email_editable: "Tillat brukere å endre deres email etter at de har registrert seg."
-    digest_topics: "Maksimalt antall populære emner å vise i oppsummerings-e-posten."
+    email_editable: "Tillat brukere å endre e-postadressen sin etter registrering."
+    digest_topics: "Maksimalt antall populære tråder som skal vises i oppsummerings-e-posten."
     digest_posts: "Maksimalt antall populære innlegg å vise i oppsummerings-e-posten."
-    digest_other_topics: "Maksimalt antall emner å vise i delen 'Nytt i emner og kategorier du følger' i oppsummerings-e-posten."
+    digest_other_topics: "Maksimalt antall tråder som skal vises i delen 'Nytt i tråder og kategorier du følger' i oppsummerings-e-posten."
     digest_min_excerpt_length: "Minimal lengde på utdrag av innlegg i e-post-oppsummeringen, i antall tegn."
     digest_suppress_categories: "Utelat disse kategoriene i oppsummerings-eposter"
     disable_digest_emails: "Deaktiver oppsummerings-eposter for alle brukere."
     allow_profile_backgrounds: "Gi brukere mulighet til å laste opp profilbakgrunner."
     enable_mobile_theme: "Mobilenheter bruker et mobilvennlig drakt, med muligheten til å gå til den fulle siden. Deaktiver dette hvis du ønsker å bruke et tilpasset stilark."
     dominating_topic_minimum_percent: "Hvor mange innlegg en bruker kan lage innenfor en topic før de blir påminnet om dominering av en topic."
-    automatically_unpin_topics: "Automatisk fjern feste for emner når brukeren når bunnen."
+    automatically_unpin_topics: "Automatisk fjern feste for tråder når brukeren når bunnen."
     embed_post_limit: "Maksimalt antall innlegg som skal bygges inn."
-    embed_username_required: "Brukernavn kreves for opprettelse av emne."
+    embed_username_required: "Brukernavn kreves for opprettelse av tråd."
     enable_emoji: "Aktiver emoji."
     emoji_set: "Hvordan vil du ha din emoji?"
     default_email_digest_frequency: "Forvalgt innstilling for hvor ofte brukere mottar oppsummerings-e-poster"
-    default_include_tl0_in_digests: "La det være forvalgt innstilling å inkludere innlegg fra nye brukere i oppsummerings-e-poster. Brukere kan endre dette i innstillingene sine."
+    default_include_tl0_in_digests: "Inkluder innlegg fra nye brukere i oppsummerings-e-poster som forvalg. Brukere kan endre dette i innstillingene sine."
     default_email_mailing_list_mode_frequency: "Brukere som slår på e-postlistemodus, vil motta e-poster så ofte som forvalg"
     disable_mailing_list_mode: "Forby brukere å slå på e-postlistemodus"
     default_email_previous_replies: "Inkluder tidligere svar i e-poster som forvalg."
-    default_topics_automatic_unpin: "Automatisk fjern feste for emner når brukeren når bunnen som forvalg."
+    default_topics_automatic_unpin: "La det være forvalgt innstilling å fjerne feste for tråder automatisk når brukeren når bunnen."
     default_categories_watching: "Liste med kategorier som følges som forvalg"
     default_categories_tracking: "Liste med kategorier som overvåkes som forvalg"
-    default_categories_muted: "Liste med kategorier som blir dempet som forvalg"
-    default_categories_watching_first_post: "Liste med kategorier hvor det første innlegget i hvert nye emne følges som forvalg."
-    remove_muted_tags_from_latest: "Ikke vis emner med dempede stikkord i listen med siste emner."
+    default_categories_muted: "Liste med kategorier som er dempet som forvalg"
+    default_categories_watching_first_post: "Liste over kategorier hvor det er forvalgt innstilling at det første innlegget i hver nye tråd følges."
+    remove_muted_tags_from_latest: "Ikke vis tråder med dempede stikkord i listen over siste tråder."
     company_short_name: "Firmanavn (kort)"
     company_full_name: "Firmanavn (hele)"
     company_domain: "Firmadomene"
@@ -786,45 +787,46 @@ nb_NO:
   most_posts: "Flest innlegg"
   most_recent_poster: "Ferskeste innlegg av"
   redirected_to_top_reasons:
-    new_user: "Velkommen til forumet vårt! Dette er de mest populære emnene for tiden. "
-    not_seen_in_a_month: "Velkommen tilbake! Nå har ikke vi sett deg på en stund. Dette er de mest populære emnene for tiden."
+    new_user: "Velkommen til forumet vårt! Dette er de mest populære trådene for tiden. "
+    not_seen_in_a_month: "Velkommen tilbake! Vi har ikke sett deg på en stund. Dette er de mest populære trådene siden du var her sist."
   change_owner:
     deleted_user: "en slettet bruker"
   topic_statuses:
-    archived_enabled: "Dette emnet er nå arkivert. Det er fryst og kan ikke bli endret på noen måte. "
-    archived_disabled: "Dette emnet er ikke lenger arkivert. Det er ikke lenger fryst, og kan endres."
-    closed_enabled: "Dette emnet er nå lukket. Emnet kan ikke lenger svares på. "
-    closed_disabled: "Dette emnet er nå åpent. Emnet kan svares på. "
+    archived_enabled: "Denne tråden er nå arkivert. Den er fryst og kan ikke endres på noen måte. "
+    archived_disabled: "Denne tråden er ikke lenger arkivert. Den er ikke lenger fryst, og kan endres."
+    closed_enabled: "Denne tråden er nå lukket. Nye svar er ikke lenger tillatt."
+    closed_disabled: "Denne tråden er nå åpen. Nye svar er tillatt."
     autoclosed_enabled_days:
-      one: "Dette emnet ble automatisk lukket etter 1 dag. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket etter %{count} dager. Emnet kan ikke lenger svares på. "
+      one: "Denne tråden ble automatisk lukket etter 1 dag. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket etter %{count} dager. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_hours:
-      one: "Dette emnet ble automatisk lukket etter 1 time. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket etter %{count} timer. Emnet kan ikke lenger svares på. "
+      one: "Denne tråden ble automatisk lukket etter 1 time. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket etter %{count} timer. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_minutes:
-      one: "Dette emnet ble automatisk lukket etter 1 minutt. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket etter %{count} minutter. Emnet kan ikke lenger svares på. "
+      one: "Denne tråden ble automatisk lukket etter 1 minutt. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket etter %{count} minutter. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_lastpost_days:
-      one: "Dette emnet ble automatisk lukket 1 dag etter siste innlegg. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket %{count} dager etter siste innlegg. Emnet kan ikke lenger svares på. "
+      one: "Denne tråden ble automatisk lukket 1 dag etter siste innlegg. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket %{count} dager etter siste svar. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_lastpost_hours:
-      one: "Dette emnet ble automatisk lukket 1 time etter siste innlegg. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket %{count} timer etter siste innlegg. Emnet kan ikke lenger svares på. "
+      one: "Denne tråden ble automatisk lukket 1 time etter siste innlegg. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket %{count} timer etter siste svar. Nye svar er ikke lenger tillatt. "
     autoclosed_enabled_lastpost_minutes:
-      one: "Dette emnet ble automatisk lukket 1 minutt etter siste innlegg. Emnet kan ikke lenger svares på. "
-      other: "Dette emnet ble automatisk lukket %{count} minutter etter siste innlegg. Emnet kan ikke lenger svares på. "
-    autoclosed_disabled: "Dette emnet er nå åpent. Emnet kan svares på. "
-    autoclosed_disabled_lastpost: "Dette emnet er åpnet. Nye svar er tillatt."
-    pinned_enabled: "Dette emnet er nå festet. Det vil vises i toppen av sin kategori inntil festet fjernes av en administrator eller av enkeltbrukere for seg selv."
-    pinned_disabled: "Dette emnet er ikke lenger festet. Det vil ikke lenger vises i toppen av sin kategori."
-    pinned_globally_enabled: "Dette emnet er nå festet globalt. Det vil vises i toppen av sin kategori og alle emne lister inntil festet fjernes for alle av staben, eller for enkelte brukere av dem selv."
-    pinned_globally_disabled: "Dette emnet er ikke lenger festet. Det vil ikke lenger vises i toppen av sin kategori."
-    visible_enabled: "Dette emnet er nå listet. Det vil vises i emne listene. "
-    visible_disabled: "Dette ement er ikke lenger listet. Det vil ikke lenger bli vist i noen av emnelistene. Den eneste måten å få tilgang til dette emnet er via en direkte link. "
+      one: "Denne tråden ble automatisk lukket 1 minutt etter siste innlegg. Nye svar er ikke lenger tillatt. "
+      other: "Denne tråden ble automatisk lukket %{count} minutter etter siste svar. Nye svar er ikke lenger tillatt. "
+    autoclosed_disabled: "Denne tråden er nå åpen. Tråden kan svares på. "
+    autoclosed_disabled_lastpost: "Denne tråden er åpne. Nye svar er tillatt."
+    pinned_enabled: "Denne tråden er nå festet. Den vil vises øverst i kategorien sin inntil festet fjernes for alle av en administrator eller for individuelle brukere av dem selv."
+    pinned_disabled: "Denne tråden er ikke lenger festet. Den vil ikke lenger vises øverst i kategorien sin."
+    pinned_globally_enabled: "Denne tråden er nå festet globalt. Den vil vises øverst i kategorien sin og alle lister over tråder inntil festet fjernes for alle av staben eller for individuelle brukere av dem selv."
+    pinned_globally_disabled: "Denne tråden er ikke lenger festet. Den vil ikke lenger vises øverst i kategorien sin."
+    visible_enabled: "Denne tråden er nå synlig. Den vil vises i listene over tråder."
+    visible_disabled: "Denne tråden er nå usynlig. Den vil ikke lenger vises i noen liste over tråder. Den eneste måten å se denne tråden er med en direkte lenke. "
   login:
     incorrect_username_email_or_password: "Feil brukernavn, email eller passord"
     wait_approval: "Takk for at du registrerte deg. Vi vil varsle deg når din konto er blitt godkjent."
     active: "Kontoen din har blitt godkjent og er klar for bruk."
+    suspended_with_reason: "Konto sperret til %{date}: %{reason}"
     not_available: "Ikke mulig. Prøv %{suggestion}?"
     something_already_taken: "Noe gikk galt, kanskje brukernavn eller email er allerede i bruk? Prøv 'glemt passord' linken."
     omniauth_error_unknown: "Noe gikk galt under innloggingsprosessen, prøv igjen."
@@ -867,19 +869,43 @@ nb_NO:
     Du mottar dette fordi du har slått på e-postlistemodus.
 
     For å melde deg av disse e-postene [klikk her](%{unsubscribe_url}).
+  subject_pm: "[privat samtale]"
   user_notifications:
     previous_discussion: "Tidligere svar"
+    user_invited_to_private_message_pm_group:
+      title: "Bruker inviterte gruppe til privat samtale"
+    user_invited_to_private_message_pm:
+      title: "Bruker invitert til privat samtale"
+    user_invited_to_private_message_pm_staged:
+      title: "Bruker invitert til privat samtale arrangert"
+    user_replied_pm:
+      title: "Bruker svarte i privat samtale"
+      subject_template: "[%{email_prefix}] [privat samtale] %{topic_title}"
+    user_posted_pm:
+      title: "Bruker opprettet privat samtale"
+      subject_template: "[%{email_prefix}] [privat samtale] %{topic_title}"
+    user_posted_pm_staged:
+      title: "Bruker opprettet arrangert privat samtale"
+    account_suspended:
+      title: "Konto sperret"
+      subject_template: "[%{email_prefix}] Kontoen din er blitt sperret"
+      text_body_template: |
+        Du er blitt utestengt fra forumet til %{suspended_till}.
+
+        %{reason}
+
+        %{message}
     digest:
       why: "Dette har skjedd på %{site_link} siden ditt forrige besøk %{last_seen_at}"
       since_last_visit: "Siden siste besøk"
-      new_topics: "Nye emner"
+      new_topics: "Nye tråder"
       unread_messages: "Uleste meldinger"
       unread_notifications: "Uleste varslinger."
       liked_received: "Likes mottatt"
       new_posts: "Nye innlegg"
       new_users: "Nye brukere"
-      popular_topics: "Populære emner"
-      follow_topic: "Følg dette emnet"
+      popular_topics: "Populære tråder"
+      follow_topic: "Følg denne tråden"
       join_the_discussion: "Les mer"
       popular_posts: "Populære innlegg"
       more_new: "Nytt for deg"
@@ -906,9 +932,10 @@ nb_NO:
   email_log:
     no_user: "Finner ikke brukeren med id %{user_id}"
     anonymous_user: "Brukeren er anonym"
+    suspended_not_pm: "Bruker er utestengt, ikke en beskjed"
     seen_recently: "Brukeren ble sett nylig"
     post_deleted: "innlegget var "
-    user_suspended: "Brukeren var suspendert"
+    user_suspended: "Brukeren var utestengt"
     already_read: "bruker har allerede lest dette innlegget"
     message_blank: "meldingen er tom"
   color_schemes:
@@ -950,7 +977,7 @@ nb_NO:
       *   For å gjøre opplevelsen din mer personlig. Opplysningene dine hjelper oss å svare bedre på dine individuelle behov.
       *   For å forbedre nettstedet vårt. Vi jobber konstant for å forbedre nettstedets tilbud basert på opplysningene og tilbakemeldingene vi mottar fra deg.
       *   For å forbedre vår kundeservice. Dine opplysninger hjelper oss å svare mer effektivt på dine forespørsler sendt til kundeservice eller behov om støtte.
-      *   For å sende periodiske e-poster. E-postadressen du oppgir, kan bli brukt til å sende deg informasjon, påminnelser som du ber om ved endringer av emner eller ved svar til brukernavnet ditt, til henvendelser, og/eller andre forspørsler eller andre spørsmål.
+      *   For å sende periodiske e-poster. E-postadressen du oppgir, kan bli brukt til å sende deg informasjon, påminnelser som du ber om ved endringer av tråder eller ved svar til brukernavnet ditt, til henvendelser, og/eller andre forspørsler eller andre spørsmål.
 
       <a name="sikre"></a>
 
@@ -1017,12 +1044,16 @@ nb_NO:
       name: Tekstbehandler
     member:
       name: Medlem
+    regular:
+      name: Aktivt medlem
+      long_description: |
+        Dette merket tildeles når du når tillitsnivå 3. Takk for at du har vært en aktivt medlem av fellesskapet vårt gjennom flere måneder. Du er nå en av de mest aktive leserne og en pålitelig bidragsyter som gjør fellesskapet vårt storartet. Du kan nå endre kategori og navn på tråder, fjerne søppelpost med ett flagg, delta i diskusjoner i en privat kategori bare for medlemmer med tillitsnivå 3 eller høyere , og du vil også få mange flere likes per dag.
     welcome:
       name: Velkommen
     anniversary:
       name: Jubileum
     good_topic:
-      name: Bra emne
+      name: Bra tråd
     champion:
       description: Inviterte fem medlemmer
     first_quote:
@@ -1030,6 +1061,8 @@ nb_NO:
       description: Siterte et innlegg
     read_guidelines:
       name: Les retningslinjene
+    hot_link:
+      name: Populær lenke
     famous_link:
       name: Berømt lenke
     appreciated:
@@ -1044,11 +1077,14 @@ nb_NO:
       long_description: Dette merket tildeles den første gangen du publiserer et innlegg med en lenke på en egen linje, som deretter automatisk blir utvidet til en miniboks med en kort oppsummering av lenken, en tittel og (dersom tilgjengelig) et bilde.
   admin_login:
     success: "E-post sendt"
-    error: "Feil!"
     submit_button: "Send e-post"
   tags:
     title: "Stikkord"
   finish_installation:
+    register:
+      button: "Registrer"
+      title: "Registrer administratorkonto"
+      help: "registrer en ny konto for å komme igang"
     confirm_email:
       title: "Bekreft din e-postadresse"
     resend_email:
@@ -1058,9 +1094,19 @@ nb_NO:
     title: "Start sikkerhetsmodus"
     description: "Sikkerhetsmodus lar deg teste nettstedet ditt uten at tillegg eller tilpasninger lastes."
   wizard:
+    title: "Discourse-oppsett"
     step:
       forum_title:
         title: "Navn"
+      introduction:
+        title: "Introduksjon"
+      privacy:
+        title: "Tilgang"
+        fields:
+          privacy:
+            choices:
+              restricted:
+                label: "Privat"
       contact:
         fields:
           contact_email:
@@ -1078,6 +1124,13 @@ nb_NO:
             label: "Bedriftsnavn (kort)"
       colors:
         title: "Drakt"
+        fields:
+          theme_id:
+            choices:
+              default:
+                label: "Enkel lys"
+              dark:
+                label: "Enkel mørk"
       logos:
         title: "Logoer"
         fields:
@@ -1102,7 +1155,7 @@ nb_NO:
           homepage_style:
             choices:
               latest:
-                label: "Siste emner"
+                label: "Siste tråder"
               categories:
                 label: "Kategorier"
       emoji:
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 1ccee3384b..f486c0f4ca 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -202,7 +202,6 @@ nl:
     top_weekly: "Wekelijkse toptopics"
     top_daily: "Dagelijkse toptopics"
     posts: "Nieuwste berichten"
-    private_posts: "Nieuwste privéberichten"
     group_posts: "Nieuwste berichten van %{group_name}"
     group_mentions: "Nieuwste vermeldingen van %{group_name}"
     user_posts: "Nieuwste berichten van @%{username}"
@@ -296,12 +295,6 @@ nl:
       Het spijt ons, maar nieuwe gebruikers hebben een tijdelijke beperking van %{newuser_max_replies_per_topic} antwoorden in hetzelfde topic.
 
       Overweeg uw eerdere antwoorden te bewerken of andere topics te bezoeken in plaats van nog een antwoord toe te voegen.
-    reviving_old_topic: |
-      ### Dit topic nieuw leven inblazen?
-
-      Het laatste antwoord op dit topic was **%{days}** dagen geleden. Uw antwoord zal het topic naar de bovenkant van de bijbehorende lijst verplaatsen en iedereen die eerder bij de conversatie was betrokken op de hoogte brengen.
-
-      Weet u zeker dat u deze oude conversatie wilt voortzetten?
   activerecord:
     attributes:
       category:
@@ -318,9 +311,7 @@ nl:
         topic:
           attributes:
             base:
-              warning_requires_pm: "U kunt alleen waarschuwingen aan privéberichten toevoegen."
               too_many_users: "U kunt alleen waarschuwingen naar één gebruiker tegelijk sturen."
-              cant_send_pm: "Sorry, u kunt geen privébericht naar die gebruiker sturen."
               no_user_selected: "U moet een geldige gebruiker selecteren."
               reply_by_email_disabled: "Antwoorden met een email is uitgeschakeld."
             featured_link:
@@ -851,7 +842,6 @@ nl:
     censored_words: "Woorden die automatisch door &#9632;&#9632;&#9632;&#9632; zullen worden vervangen"
     censored_pattern: "Regex-patroon dat automatisch door &#9632;&#9632;&#9632;&#9632; zal worden vervangen"
     delete_old_hidden_posts: "Verborgen berichten die meer dan 30 dagen verborgen blijven automatisch verwijderen"
-    default_locale: "De standaardtaal van dit Discourse-forum (ISO 639-1-code)"
     allow_user_locale: "Gebruikers toestaan om een eigen voorkeur voor de interfacetaal te kiezen"
     set_locale_from_accept_language_header: "Taal van interface voor anonieme gebruikers instellen op basis van de taalheaders van hun webbrowser. (EXPERIMENTEEL, werkt niet met anonieme cache)"
     min_post_length: "Minimaal toegestane lengte van een bericht in tekens"
@@ -1026,7 +1016,6 @@ nl:
     purge_deleted_uploads_grace_period_days: "Na hoeveel uur een weesbestand definitief verwijderd wordt."
     purge_unactivated_users_grace_period_days: "Periode (in dagen) voordat een gebruiker die zijn account niet heeft geactiveerd wordt verwijderd. Zet op 0 om gebruikers nooit te verwijderen."
     enable_s3_uploads: "Uploads plaatsen op Amazon S3 storage. LET OP: vereist geldige S3 inloggegevens (zowel acces key id als secret access key)"
-    s3_use_iam_profile: 'Gebruik AWS EC2 IAM rol om keys binnen te halen. LET OP: na inschakelen dit gebruikt i.p.v. de instellingen voor "s3 access key id" en "s3 secret access key".'
     s3_upload_bucket: "De naam van de Amazon S3 bucket waar bestanden naar worden geüpload. LET OP: moet bestaan uit kleine letters, zonder puntjes en geen underscores."
     s3_access_key_id: "Het Amazon S3 access key id dat wordt gebruikt voor het uploaden van afbeeldingen."
     s3_secret_access_key: "De Amazon S3 secret access key die wordt gebruikt voor het uploaden van afbeeldingen."
@@ -1059,7 +1048,6 @@ nl:
     min_trust_to_create_topic: "Het minimale trust level dat nodig is om een topic te mogen maken."
     min_trust_to_edit_wiki_post: "Het minimale trust level dat nodig is om een bericht te wijzigen dat als wiki gemarkeerd is."
     min_trust_to_edit_post: "Het minimale vertrouwensniveau dat nodig is om het bericht te bewerken."
-    min_trust_to_send_messages: "Het minimum vertrouwensniveau dat nodig is om nieuwe private berichten aan te maken."
     newuser_max_links: "Hoeveel links een nieuw lid in een bericht kan plaatsen."
     newuser_max_images: "Hoeveel afbeeldingen een nieuw lid in een bericht kan plaatsen."
     newuser_max_attachments: "Hoeveel bestanden een nieuw lid in een bericht kan plaatsen."
@@ -1116,7 +1104,6 @@ nl:
     min_first_post_typing_time: "Minimum tijd in milliseconden dat een gebruiker moet typen tijdens een eerste post, als de drempelwaarde niet wordt bereikt zal de post automatisch in de wachtrij voor goedkeuring gezet worden. Zet op 0 om uit te schakelen (niet aanbevolen)"
     reply_by_email_enabled: "Mogelijk inschakelen om te antwoorden per e-mail."
     reply_by_email_address: "Template voor antwoorden per e-mail, bijvoorbeeld: %{reply_key}@reageer.mijnforum.nl"
-    incoming_email_prefer_html: "De HTML gebruiken in plaats van de tekst voor inkomende e-mail"
     disable_emails: "Voorkomt dat Discourse e-mails van welke soort dan ook verstuurd."
     strip_images_from_short_emails: "Verwijder afbeeldingen met grootte van minder dan 2800 Bytes uit e-mails."
     short_email_length: "Korte e-mail lengte in Bytes"
@@ -1183,7 +1170,6 @@ nl:
     embed_truncate: "Kort de geembedde berichten in"
     embed_post_limit: "Maximale aantal te embedden berichten."
     embed_username_required: "De gebruikersnaam om topics aan te maken is vereist."
-    notify_about_flags_after: "Als er na dit aantal uren markeringen zijn die nog niet zijn afgehandeld, een privébericht naar stafleden sturen. Gebruik 0 om dit uit te schakelen."
     show_create_topics_notice: "Als de site minder dan 5 publieke topics heeft, toon dan een melding waarin admins gevraagd wordt om een aantal topics te creëren."
     delete_drafts_older_than_n_days: Verwijder concepten ouder dan (n) dagen.
     prevent_anons_from_downloading_files: "Voorkom dat anonieme gebruikers bijlagen mogen downloaden. WAARSCHUWING: hierdoor zullen website onderdelen, anders dan afbeeldingen, die zijn gepost als bijlage niet langer werken."
@@ -1556,7 +1542,6 @@ nl:
       name: Richtlijnen gelezen
   admin_login:
     success: "E-mail verstuurd"
-    error: "Fout!"
     email_input: "E-mailadres van beheerder"
     submit_button: "E-mail versturen"
   performance_report:
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index b360c45573..80e185dc7e 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -223,7 +223,6 @@ pl_PL:
     top_weekly: "Najpopularniejsze tematy w tym tygodniu"
     top_daily: "Najpopularniejsze tematy dzisiaj"
     posts: "Aktualne wpisy"
-    private_posts: "Najnowsze prywatne wiadomości"
     group_posts: "Ostatni post z %{group_name}"
     group_mentions: "Ostatnie wspomnienie z %{group_name}"
     user_posts: "Ostatnie posty @%{username}"
@@ -324,12 +323,6 @@ pl_PL:
       Przepraszamy, ale nowi użytkownicy są obecnie ograniczeni do %{newuser_max_replies_per_topic} odpowiedzi w tym samym temacie.
 
       Zamiast dodawać kolejną odpowiedź, rozważ edycję swoich poprzednich odpowiedzi lub odwiedzenie innych tematów.
-    reviving_old_topic: |
-      ### Ożywić ten temat?
-
-      Ostatnia odpowiedź w tym temacie ma ponad %{days} dni. Twoja odpowiedź przesunie temat na górę listy i spowoduje powiadomienie wszystkich wcześniej uczestniczących w rozmowie.
-
-      Czy na pewno chcesz kontynuować tę starą rozmowę?
   activerecord:
     attributes:
       category:
@@ -346,9 +339,7 @@ pl_PL:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Ostrzeżenie można dołączać jedynie do prywatnych wiadomości."
               too_many_users: "Jedno ostrzeżenie możesz wysłać tylko do pojedynczego użytkownika."
-              cant_send_pm: "Przepraszamy, niestety nie możesz wysłać prywatnej wiadomości temu użytkownikowi."
               no_user_selected: "Musisz wybrać poprawnego użytkownika,"
               reply_by_email_disabled: "Odpowiedź przez e-mail została wyłączona."
             featured_link:
@@ -940,7 +931,6 @@ pl_PL:
     censored_words: "Wskazane słowa będą automatycznie zamieniane na  &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Wzorzec Regex który będzie automatycznie zamieniany na  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatycznie kasuj wpisy ukryte dłużej niż 30 dni."
-    default_locale: "Domyślny język tej instancji Discourse (kod ISO 639-1)"
     allow_user_locale: "Zezwól użytkownikom na zmianę języka interfejsu we własnych  ustawieniach"
     set_locale_from_accept_language_header: "ustaw język interfejsu dla niezalogowanych użytkowników na podstawie języka w nagłówku ich przeglądarki. (EKSPERYMENTALNE, nie działa z anonimowym cache)"
     min_post_length: "Minimalna długość wpisu w znakach"
@@ -1144,7 +1134,6 @@ pl_PL:
     clean_orphan_uploads_grace_period_hours: "Okres karencji (w dniach) przed wysłaniem sierot zostanie skasowany."
     purge_deleted_uploads_grace_period_days: "Okres karencji (w dniach) przed usunięciem upload zostanie skasowany."
     enable_s3_uploads: "Umieść przesyły w pamięci Amazon S3. Ważne: wymaga ważnych danych uwierzytelniających (zarówno klucza id i tajnego klucza dostępu)"
-    s3_use_iam_profile: 'Użyj AWS EC2 IAM aby odzyskać klucze. Pamiętaj: włączenie spowoduje nadpisanie ustawień "id klucza dostępu s3" i "tajnego klucza dostępu s3" '
     s3_upload_bucket: "Nazwa koszyka Amazon S3, do którego zostaną przesłane pliki. Ostrzeżenie: bez wielkich liter, kropek czy podkreślenia."
     s3_access_key_id: "Klucz dostępu Amazon S3, który zostanie użyty do przesyłania zdjęć."
     s3_secret_access_key: "Tajny klucz dostępu Amazon S3, który zostanie użyty do przesyłania zdjęć."
@@ -1190,7 +1179,6 @@ pl_PL:
     min_trust_to_edit_wiki_post: "Minimalny poziom zaufania wymagany do edycji posta oznaczonego jako wiki."
     min_trust_to_edit_post: "Minimalny poziom zaufania potrzebny do edytowania postów."
     min_trust_to_allow_self_wiki: "Wymagany poziom zaufania, by post użytkownika uczynić wiki."
-    min_trust_to_send_messages: "Minimalny poziom zaufania wymagany do tworzenia nowych prywatnych wiadomości."
     newuser_max_links: "Ile linków może dodać nowy użytkownik do posta."
     newuser_max_images: "Ile obrazów może dodać nowy użytkownik do posta."
     newuser_max_attachments: "Ile załączników może dodać nowy użytkownik do posta."
@@ -1253,7 +1241,6 @@ pl_PL:
     reply_by_email_enabled: "Włącz możliwość odpowiadania na wpisy poprzez email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Lista alternatywnych szablonów do odpowiedzi przez adres email. Przykład: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Używaj HTML zamiast tekstu dla emaili przychodzących."
     disable_emails: "Powstrzymaj Discourse przed wysyłaniem jakichkolwiek emaili."
     strip_images_from_short_emails: "Pasek zdjęć z emaila o rozmiarze mniejszym niż 2800 bajtów"
     short_email_length: "Długość krótkiego emaila w bajtach"
@@ -1352,7 +1339,6 @@ pl_PL:
     allowed_href_schemes: "Projekty dozwolone w linkach jako dodatek do http i https."
     embed_post_limit: "Maksymalna liczba postów do osadzenia."
     embed_username_required: "W celu stworzenia tematu potrzebna jest nazwa użytkownika."
-    notify_about_flags_after: "Jeśli istnieją oflagowania, które nie zostały przejrzane po tylu godzinach, wyślij wiadomość prywatną do obsługi. Ustaw 0, aby wyłączyć."
     show_create_topics_notice: "Jeśli na stronie jest mniej niż 5 publicznych tematów, pokaż powiadomienie proszące adminów, aby stworzyli nowe wątki."
     delete_drafts_older_than_n_days: Usuń projekty starsze niż (n) dni.
     bootstrap_mode_min_users: "Minimalna liczba użytkowników potrzebnych do wyłączenia trybu rozruchowego (ustaw 0, aby wyłączyć)"
@@ -1364,7 +1350,6 @@ pl_PL:
     approve_post_count: "Liczba postów od nowego lub podstawowego użytkownika, które muszą zostać zatwierdzone"
     approve_unless_trust_level: "Posty użytkowników poniżej tego poziomu zaufania muszą być zatwierdzane"
     approve_new_topics_unless_trust_level: "Nowe wątki dodawane przez użytkowników z poziomem zaufania poniżej muszą zostać zaakceptowane"
-    notify_about_queued_posts_after: "Jeśli są posty, które czekają na przejrzenie przez więcej niż tak wiele godzin, zostanie wysłany email do contact_email. Ustaw 0, aby wyłączyć te emaile."
     auto_close_messages_post_count: "Maksymalna liczba postów dozwolonych w wiadomości przed automatycznym zamknięciem (0 aby wyłączyć)"
     auto_close_topics_post_count: "Maksymalna liczba postów dozwolona w temacie przed automatycznym zamknięciem (0 aby wyłączyć)"
     code_formatting_style: "Przycisk kodu w kompozytorze narzuci domyśl styl formatowania dla tego kodu"
@@ -2771,7 +2756,6 @@ pl_PL:
     badge_title_metadata: "%{display_name} odznaka na %{site_title}"
   admin_login:
     success: "Email wysłany"
-    error: "Błąd!"
     email_input: "Email administratora. "
     submit_button: "Wyślij Email. "
   performance_report:
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 5984c4ad49..e7346ed940 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -198,7 +198,6 @@ pt:
     top_weekly: "Melhores tópicos da semana"
     top_daily: "Melhores tópicos do dia"
     posts: "Últimas mensagens"
-    private_posts: "Mensagens privadas recentes"
     group_posts: "Mensagens recentes em %{group_name}"
     group_mentions: "Menções recentes em %{group_name}"
     user_posts: "Mensagens recentes criadas por @%{username}"
@@ -272,9 +271,7 @@ pt:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Apenas pode anexar avisos a mensagens privadas."
               too_many_users: "Apenas pode enviar avisos a um utilizador de cada vez."
-              cant_send_pm: "Pedimos desculpa, não pode enviar uma mensagem privada a esse utilizador."
               no_user_selected: "Tem que selecionar um utilizador válido."
             featured_link:
               invalid: "é inválida. URL deve incluir http:// ou https://."
@@ -780,7 +777,6 @@ pt:
     censored_words: "Palavras que serão automaticamente substituídas por &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Expressão regular que será automaticamente substituída por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Eliminar automaticamente quaisquer mensagens ocultas que permaneçam escondidas por mais de 30 dias."
-    default_locale: "Idioma padrão para esta instância do Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permitir aos utilizadores escolherem a sua própria língua preferencial para a interface."
     set_locale_from_accept_language_header: "defina a língua de interface para utilizadores anónimos com base nos cabeçalhos de língua dos seus navegadores. (EXPERIMENTAL, não funciona com cache anónima)"
     min_post_length: "Tamanho mínimo permitido por mensagem, em caracteres"
@@ -966,7 +962,6 @@ pt:
     clean_orphan_uploads_grace_period_hours: "Período de carência (em horas) antes de um carregamento orfão ser removido."
     purge_deleted_uploads_grace_period_days: "Período de carência (em dias) antes de um carregamento eliminado ser apagado."
     enable_s3_uploads: "Coloca os carregamentos no armazenamento Amazon S3. IMPORTANTE: requer credenciais S3 válidas (tanto id de chave de acesso como a chave de acesso secreta)."
-    s3_use_iam_profile: 'Utiliza AWS EC2 IAM para recuperar chaves. NOTA: a ativação irá substituir as configurações de "id da chave de acesso s3" e a "chave de acesso secreta s3".'
     s3_upload_bucket: "Nome do balde da Amazon S3 que contém os ficheiros carregados. AVISO: tem que ser minúsculo, sem pontos e sem sublinhados."
     s3_access_key_id: "Id da chave de acesso Amazon S3 que será usada para carregar imagens."
     s3_secret_access_key: "Chave de acesso secreta Amazon S3 que será usada para carregar imagens."
@@ -1009,7 +1004,6 @@ pt:
     min_trust_to_edit_wiki_post: "O nível mínimo de confiança necessário para editar mensagens marcadas como wiki."
     min_trust_to_edit_post: "O nível mínimo de confiança necessário para editar publicações."
     min_trust_to_allow_self_wiki: "O nível mínimo de confiança necessário para o utilizador criar as suas publicações wiki."
-    min_trust_to_send_messages: "O nível de confiança mínimo necessário para criar mensagens privadas."
     newuser_max_links: "Quantas hiperligações um novo utilizador pode adicionar a uma mensagem."
     newuser_max_images: "Quantas imagens um novo utilizador pode adicionar a uma mensagem."
     newuser_max_attachments: "Quantos anexos um novo utilizador pode adicionar a uma mensagem."
@@ -1070,7 +1064,6 @@ pt:
     reply_by_email_enabled: "Ativar respostas aos tópicos por email."
     reply_by_email_address: "Modelo para endereços emails recebidos com função resposta por email, por exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com"
     alternative_reply_by_email_addresses: "Lista de modelos alternativos para respostas via email. Exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com"
-    incoming_email_prefer_html: "Utilize HTML em vez de texto para o correio a receber."
     disable_emails: "Impedir que Discourse envie qualquer tipo de emails"
     strip_images_from_short_emails: "Remover imagens de emails cujo tamanho seja inferior a 2800 Bytes"
     short_email_length: "Comprimento de email curto, em Bytes"
@@ -1172,7 +1165,6 @@ pt:
     approve_post_count: "A quantidade de publicações de um novo utilizador ou utilizador básico que devem ser aprovadas"
     approve_unless_trust_level: "Mensagens para utilizadores abaixo deste nível de confiança devem ser aprovados"
     approve_new_topics_unless_trust_level: "Novos tópicos para utilizadores abaixo deste nível de confiança devem ser aprovados"
-    notify_about_queued_posts_after: "Se houver publicações a aguardar revisão após tantas horas, enviar email para `contact_email`. Configurar a 0 para desactivar."
     auto_close_messages_post_count: "Número máximo de publicações numa mensagem  antes de a fechar automáticamente (configurar a 0 para desactivar)"
     auto_close_topics_post_count: "Número máximo de publicações num tópico antes de o fechar automáticamente (configurar a 0 para desactivar)"
     code_formatting_style: "Botão de código no compositor por defeito usa este estilo de formatação"
@@ -1794,140 +1786,6 @@ pt:
     title: "FAQ/Orientações"
   tos_topic:
     title: "Termos de Serviço"
-    body: |
-      Os seguintes termos e condições governam todo o uso do sítio %{company_domain} e todo o conteúdo, serviços e produtos disponíveis no ou através do sítio, incluindo mas não limitado a, Software do Fórum de %{company_domain}, Fóruns de Suporte de %{company_domain} e serviço de alojamento de %{company_domain} ("Alojamento"), (em conjunto, o Sítio). O Sítio é propriedade e operado por %{company_full_name} ("%{company_name}"). O Sítio oferecido está sujeito à sua aprovação sem nenhuma modificação de todos os termos e condições contidos aqui e todas as outras regras de operação políticas (incluindo, sem limitação, a [Política de Privacidade](/privacy) e [Orientações da Comunidade](/faq) de %{company_domain}) e procedimentos que possam ser publicados esporadicamente neste Sítio por %{company_name} (coletivamente, o "Acordo").
-
-      Por favor leia este Acordo com cuidado antes de aceder ou usar o Sítio. Ao aceder ou usar qualquer parte do Sítio, concorda em estar limitado pelos termos e condições deste acordo. Se não concorda com todos os termos e condições deste acordo, então não deve aceder ao Sítio ou usar qualquer um dos serviços. Se estes termos e condições são considerados uma oferta de %{company_name}, a sua aceitação é expressamente limitada a estes termos. O Sítio está disponível apenas a indíviduos que têm pelo menos 13 anos de idade.
-
-      <a name="1"></a>
-
-      ## [1. A Sua Conta em %{company_domain}](#1)
-
-      Se criar uma conta no Sítio, será responsável por manter a segurança da sua conta e será totalmente responsável por todas as atividades que ocorrerem sob a sua conta. Deve notificar imediatamente %{company_name} de qualquer uso não autorizado da sua conta ou qualquer outra falha de segurança. %{company_name} não será passível de quaisquer atos ou omissões da sua parte, incluindo danos de qualquer tipo que incorram como resultado de tais atos ou omissões.
-
-      <a name="2"></a>
-
-      ## [2.Responsabilidade dos Participantes](#2)
-
-      Se publicar material no Sítio, publicar ligações no Sítio, ou de outra maneira disponibilizar (ou permitir que qualquer terceiro o faça) material disponível por meios do Sítio (qualquer material, “Conteúdo”), será inteiramente responsável pelo conteúdo de, e qualquer dano resultante de, tal Conteúdo. Esse é o caso independentemente de o Conteúdo em questão constituir texto, gráficos, ficheiros áudio, ou programas de computador. Ao tornar o Conteúdo disponível, está a representar e garantir que:
-
-      *   o descarregamento, cópia e uso do Conteúdo não irá infringir os direitos do proprietário, incluindo mas não limitado aos direitos de autor, patentes, marcas registadas ou direitos de segredos de troca, de qualquer terceiro;
-      *   se o seu empregado tem direitos sob a propriedade intelectual que criou, terá que (i) ou ter recebido permissões do seu empregado para publicar ou tornar o Conteúdo disponível, incluindo mas não limitado a qualquer software, ou (ii) ter garantido uma renúncia do seu empregador a todos os direitos no e ao Conteúdo;
-      *   está de acordo com licenças de qualquer terceiro relacionado com o Conteúdo, e fez tudo o necessário para passar corretamente quaisquer termos requeridos aos utilizadores finais;
-      *   o Conteúdo não contém ou instala quaisquer vírus, minhocas ou malware, cavalos de Tróia ou outro conteúdo nocivo ou destrutivo;
-      *   o Conteúdo não é spam, não é gerado por máquinas ou aleatóriamente gerado, e não contém conteúdo indesejado sem ética ou comercial com intuito de conduzir o tráfico de sítios terceiros ou aumentar a posição de sítios terceiros em motores de pesquisa, ou ainda outros atos ilegais (tais como phishing) ou destinatários enganadores relativamente à origem do material (tais como spoofing);
-      *   o Conteúdo não é pornográfico, nem contém ameaças ou incita à violência, e não viola os direitos de privacidade ou publicidade de qualquer terceiro;
-      *   o conteúdo não está a ser anunciado através de quaisquer mensagens eletrónicas indesejadas tais como ligações de spam em grupos de notícias, listas de email, blogs e sítios, e similares métodos promocionais não solicitados;
-      *   o seu conteúdo não está nomeado de nenhuma maneira que leve os seus leitores a pensarem que é outra pessoa ou empresa; e
-      *   terá, no caso do Conteúdo incluir código de computador, categorizado e/ou descrito o tipo, natureza, uso e efeito dos materiais, quer tenha sido pedido para fazê-lo por %{company_name} ou não.
-
-      <a name="3"></a>
-
-      ## [3. Licença do Conteúdo do Utilizador](#3)
-
-      As contribuições dos utilizadores estão licenciadas sob a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem qualquer limitação de qualquer dessas representações ou garantias, %{company_name} tem o direito (embora não tenha a obrigação) de, em critério exclusivo de %{company_name} (i) recusar ou remover qualquer conteúdo que, na sensata opinião de %{company_name} viola qualquer política de %{company_name} ou é de alguma maneira prejudicial ou questionável, ou (ii) terminar ou negar acesso ao Sítio e ao uso do mesmo a qualquer indivíduo ou entidade por qualquer razão, em critério exclusivo de %{company_name}. %{company_name} não terá obrigação de fornecer reembolsos de quaisquer montantes previamente pagos.
-
-      <a name="4"></a>
-
-      ## [4. Pagamento e Renovação](#4)
-
-      ### Termos Gerais
-
-      Atualizações ou serviços opcionais pagos poderão estar disponíveis no Sítio. Ao utilizar uma atualização ou serviço opcional pago, está a concordar em pagar a %{company_name} as taxas de subscrição mensais ou anuais indicadas. Os pagamentos serão cobrados numa base pré-paga no dia em que começa a utilizar o serviço ou a atualização e irá cobrir o uso desse serviço ou atualização por um período de subscrição mensal ou anual tal como indicado. Estas taxas não são reembolsáveis.
-
-      ### Renovação Automática
-
-      A não ser que notifique %{company_name} antes do final do período da subscrição que quer cancelar, a sua subscrição será automaticamente renovada e você autoriza-nos a colecionar as taxas anuais ou mensais (assim como outras taxas) usando qualquer cartão de crédito ou outro mecanismo de pagamento que tivermos no seu registo. As subscrições podem ser canceladas em qualquer altura.
-
-      <a name="5"></a>
-
-      ## [5. Serviços](#5)
-
-      ### Serviços de Alojamento, Suporte
-
-      Serviços opcionais de Alojamento e Suporte podem ser fornecidos por %{company_name} sob os termos e condições para cada serviço. Ao inscrever-se numa conta com serviços de Alojamento ou Suporte, irá concordar e agir sob tais termos e condições.
-
-      <a name="6"></a>
-
-      ## [6. Responsabilidade dos Visitantes do Sítio](#6)
-
-      %{company_name} não reviu, nem pode rever, todo o material, incluindo programas de computador, publicado no Sítio, e não pode portanto ser responsável pelo conteúdo do mesmo, pelo seu uso ou efeitos. Ao operar o Sítio, %{company_name} não representa ou implica que corrobora com o material publicado, ou que acredita que o material seja preciso, útil e não prejudicial. Será responsável por tomar as precauções necessárias para proteger-se a si próprio e o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos nocivos ou destrutivos. O Sítio pode ter conteúdo ofensivo, indecente, ou questionável de outra maneira, assim como também imprecisões técnicas, erros tipográficos, e outros erros. O Sítio pode também ter material que viola os direitos de privacidade e publicidade, ou que infringe a propriedade intelectual e outros direitos do proprietário, de terceiros, ou o descarregamento, cópia ou uso que é sujeito a termos e condições adicionais, estabelecidos ou não. %{company_name} está isenta de qualquer responsabilidade de qualquer dano resultante do uso por parte dos visitantes do Sítio, ou de qualquer descarregamento feito por esses visitantes do conteúdo lá publicado.
-
-      <a name="7"></a>
-
-      ## [7. Conteúdo Publicado Noutros Sítios](#7)
-
-      Não revimos nem podemos rever todo o material, incluindo programas de computador, disponibilizado através de sítios e páginas em %{company_domain} no qual existem ligações e que se ligam a %{company_domain}. %{company_name} não tem qualquer controlo dos sítios e páginas não-%{company_domain}, e não é responsável pelo seu conteúdo ou o seu uso. Ao clicar num sítio ou página não-%{company_domain}, %{company_name} não representa ou implica que corrobora com tais sítios ou páginas. Você é responsável por tomar ações necessárias para proteger-se a si próprio ou o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos nocivos ou destrutivos. %{company_name} renuncia qualquer responsabilidade por qualquer dano resultante do uso de sítios e páginas não-%{company_domain}.
-
-      <a name="8"></a>
-
-      ## [8. Violação de Direitos de Autor e Política DCMA](#8)
-
-      Assim como %{company_name} pede aos outros para respeitarem os direitos de propriedade intelectual, a mesma respeita os direitos de propriedade intelectual dos outros. Se acredita que material localizado em ou com ligação por %{company_domain} viola os seus direitos de autor, e se este sítio reside nos EUA, encorajamo-lo a notificar a %{company_name} em concordância com a Política (“DMCA”) [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) da %{company_name}. %{company_name} irá responder a todos tais avisos, incluindo, tal como requerido ou apropriado, por remover o material ilícito ou desativando as ligações para o material ilícito. %{company_name} irá terminar o acesso a e o uso do Sítio por um visitante se, sob circunstâncias apropriadas, o visitante é determinado como sendo um infrator reincidente dos direitos de autor e de outros direitos de propriedade intelectual de %{company_name} ou outros. No caso de tal terminação, %{company_name} não terá qualquer obrigação de fornecer um reembolso de quaisquer valores previamente pagos a %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Propriedade Intelectual](#9)
-
-      Este Acordo não transfere de %{company_name} para si qualquer propriedade intelectual de %{company_name} ou de terceiros, e todos os direitos, títulos e interesse na e à propriedade irão permanecer (como entre as partes) apenas com %{company_name}. %{company_name}, %{company_domain}, o logótipo %{company_domain} e todos as outras marcas, marcas de serviço, gráficos, logótipos usados na ligação com %{company_domain}, ou o Sítio é marca registada de %{company_name} ou licenciadores de %{company_name}. Outras marcas, marcas de serviço, gráficos e logótipos usados em conexão com o Sítio podem ser marcas de terceiros. O seu uso do Sítio não lhe concede direitos ou licença para reproduzir ou de outra forma usar quaisquer marcas de %{company_name} ou de terceiros.
-
-      <a name="10"></a>
-
-      ## [10. Anúncios](#10)
-
-      %{company_name} reserva-se ao direito de mostrar anúncios no seu conteúdo a não ser que tenha comprado a Atualização Ad-free ou uma conta de Serviços.
-
-      <a name="11"></a>
-
-      ## [11. Atribuição](#11)
-
-      %{company_name} reserva-se ao direito de mostrar ligações de atribuição tais como ‘Suportado por %{company_domain},’ autor do tema, e atribuição das fontes tipográficas ao conteúdo do rodapé ou da sua ferramenta. Os créditos do rodapé e a ferramenta de %{company_domain} não poderão ser removidas independentemente das atualizações compradas.
-
-      <a name="12"></a>
-
-      ## [12. Alterações](#12)
-
-      %{company_name} reserva-se ao direito, por critério exclusivo, de modificar ou substituir qualquer parte deste Acordo. É sua responsabilidade verificar periodicamente o Acordo e verificar as suas alterações. O seu uso ou acesso contínuo ao Sítio seguido da publicação de qualquer alteração a este Acordo constitui aceitação a essas mudanças. %{company_name} pode também, no futuro, oferecer novos serviços e/ou funcionalidades através do Sítio (incluindo, o lançamento de novas ferramentas e recursos). Estas novas funcionalidades e/ou serviços serão sujeitos aos termos e condições deste Acordo.
-
-      <a name="13"></a>
-
-      ## [13. Terminação](#13)
-
-      %{company_name} pode terminar o seu acesso a todas ou alguma parte do Sítio em qualquer altura, com ou sem motivo, com ou sem aviso, com efeitos imediatos. Se desejar terminar este Acordo ou a sua conta %{company_domain} (se tiver uma), pode simplesmente deixar de usar o Sítio. Todas as provisões para este Acordo que pela sua natureza deverão sobreviver à terminação sobreviverão à sua terminação, incluindo, sem limitações, provisões de propriedade, isenções de garantia, indemnizações e limitações de responsabilidade.
-
-      <a name="14"></a>
-
-      ## [14. Isenção de Garantias](#14)
-
-      O Sítio é fornecido “tal como está”. %{company_name} e os seus fornecedores e licenciadores ficam aqui isentos de garantias de qualquer tipo, expressas ou implícitas, sem limitação, as garantias de comerciabilidade, adequabilidade a uma finalidade específica e não-infrigimento. Nem %{company_name} nem os seus fornecedores e licenciadores, garantem que o Sítio está livre de erros ou que o acesso seja contínuo e ininterrupto. Se está realmente a ler isto, aqui está [um presente] (http://www.newyorker.com/humor/daily-shouts/the-hundred-best-lists-of-all-time). Compreende que descarregou de, ou de outra maneira obteve conteúdo ou serviços através do Sítio a seu próprio risco e descrição.
-
-      <a name="15"></a>
-
-      ## [15. Limitação da Responsabilidade](#15)
-
-      Em nenhum evento %{company_name} ou os seus fornecedores ou licenciadores, serão responsáveis em respeito a qualquer assunto deste acordo sob qualquer contrato, negligência, estrita responsabilidade ou outras teorias legais para: (i) quaisquer danos especiais, incidentes ou consequenciais; (ii) o custo de procura de produtos ou serviços substitutos; (iii) por interrupção do uso, perda ou corrupção dos dados; ou (iv) por quaisquer valores que excedem as taxas pagas por si a %{company_name} sob este acordo durante um período de doze (12) meses anterior à causa da ação. %{company_name} não deverá ter qualquer responsabilidade por qualquer falha ou atraso devido a assuntos para além do seu controlo razoável. O disposto neste artigo não se aplica nas medidas proibidas pela lei aplicável.
-
-      <a name="16"></a>
-
-      ## [16. Representações Gerais e Garantia](#16)
-
-      Representa e garante que (i) o seu uso do Sítio irá estar em estrita concordância com a [Política de Privacidade](/privacy) e das [Orientações da Comunidade](/guidelines) da %{company_name}, com este Acordo e com as leis e regulações aplicáveis (incluindo sem limitação de quaisquer leis ou regulações locais no seu país, estado, cidade ou outras áreas governamentais, relativamente à conduta online e ao conteúdo aceitável, e incluindo quaisquer leis aplicáveis relativamente à transmissão de dados técnicos exportados do país em que o sítio reside ou do país em que você reside) e (ii) o seu uso do Sítio não irá infringir os direitos de propriedade intelectual de qualquer terceiro.
-
-      <a name="17"></a>
-
-      ## [17. Indemnização](#17)
-
-      Concorda em indemnizar e não prejudicar %{company_name}, os seus contratados, e os seus licenciadores, os seus respetivos diretores, empregados e agentes de e contra quaisquer reivindicações e despesas, incluindo taxas de advogados, decorrentes do seu uso do Sítio, incluindo mas não limitado à sua violação deste Acordo.
-
-      <a name="18"></a>
-
-      ## [18. Diversos](#18)
-
-      Este Acordo constitui o acordo integral entre si e %{company_name} em relação ao assunto em questão, e poderá ser modificado apenas por uma emenda escrita assinada por um executivo autorizado da %{company_name}, ou pela publicação por parte da %{company_name} de uma versão revista. Excepto se existirem disposições opostas na leis aplicáveis, o presente Acordo, qualquer acesso ou uso do sítio será governado pelas leis do estado da Califórnia, E.U.A, excluindo os conflitos das disposições da lei, e a local próprio para qualquer disputa emergente de ou relativa a qualquer do mesmo será o tribunal federal e estatal localizado em São Francisco, Califórnia. Exceto para os pedidos de medida cautelar ou equitativa ou reclamações relativas aos direitos de propriedade intelectual (que podem ser introduzidos em qualquer tribunal competente, sem a prestação de uma caução), qualquer litígio decorrente do presente acordo será resolvido de acordo com as Regras de Arbitragem de "Judicial Arbitration and Mediation Service, Inc.” (“JAMS”) por três árbitros apontados em concordância com tais Regras. A arbitragem deverá ter lugar em São Francisco, Califórnia, em língua Inglesa e a decisão arbitral pode ser feita em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Acordo terá direito a custos e honorários dos advogados. Se qualquer parte deste Acordo for considerada inválida ou inexequível, essa parte será interpretada de forma a refletir a intenção original das partes e as porções restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Acordo ou qualquer violação dos mesmos, em qualquer instância, não renuncia tal termo ou condição ou qualquer violação subsequente. Pode atribuir os seus direitos sob este acordo a qualquer parte que consente a, e concorda em ficar vinculado por, os seus termos e condições; %{company_name} pode atribuir os seus direitos sob este Acordo sem condição. O presente Acordo será vinculativo e reverterá em benefício das partes, dos seus sucessores e signatários autorizados.
-
-      Este documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013.
-
-      Originalmente adaptado de [Termos de Serviço WordPress](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Política de Privacidade"
     body: |
@@ -2221,7 +2079,6 @@ pt:
         Este distintivo é concedido pela primeira vez que responde a uma publicação por email :e-mail:.
   admin_login:
     success: "Email Enviado"
-    error: "Erro!"
     email_input: "Email Administração"
     submit_button: "Enviar Email"
   performance_report:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index f855ee931f..d8f6f1a75a 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -188,7 +188,6 @@ pt_BR:
     hot: "Tópicos quentes"
     top: "Principais tópicos"
     posts: "Últimos tópicos"
-    private_posts: "Últimas mensagens privadas"
     group_posts: "Últimos posts de %{group_name}"
     group_mentions: "Últimas citações de %{group_name}"
     user_posts: "Últimos posts por @%{username}"
@@ -269,12 +268,6 @@ pt_BR:
       Sentimos muito, mas novos usuários são temporariamente limitados a %{newuser_max_replies_per_topic} respostas no mesmo tópico.
 
       Em vez de adicionar outra resposta, por favor considere editar suas respostas anteriores, ou visite outros tópicos.
-    reviving_old_topic: |
-      ### Reviver este tópico?
-
-      A última resposta deste tópico foi feita há **%{days}** dias atrás. Sua resposta jogará o tópico para o topo da sua lista e notificará as pessoas que foram envolvidas na conversa.
-
-      Tem certeza que deseja continuar essa velha conversa?
   activerecord:
     attributes:
       category:
@@ -291,9 +284,7 @@ pt_BR:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Você só pode anexar avisos em mensagens privadas."
               too_many_users: "Você só pode enviar avisos para um usuário de cada vez."
-              cant_send_pm: "Desculpe, você não pode enviar uma mensagem privada para este usuário."
               no_user_selected: "Você deve escolher um usuário válido."
             featured_link:
               invalid: "é inválida. A URL deve conter http:// ou https://."
@@ -798,7 +789,6 @@ pt_BR:
     censored_words: "Palavras que serão substituídos automaticamente por &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Padrão de expressão regular que será automaticamente substituído por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-apagar todas as mensagens ocultas que ficar oculta por mais de 30 dias."
-    default_locale: "Idioma padrão para esta instância do Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permitir que os usuários escolham suas próprias preferências de idioma de interface"
     set_locale_from_accept_language_header: "define a língua da interface para os usuários anônimos de acordo com os cabeçalhos de língua de seus navegadores. (EXPERIMENTAL, não funciona com cache anônimo)"
     min_post_length: "Comprimento mínimo permitido do post em caracteres"
@@ -980,7 +970,6 @@ pt_BR:
     clean_orphan_uploads_grace_period_hours: "Carência (em horas) antes de um upload órfão ser removido."
     purge_deleted_uploads_grace_period_days: "Carência (em dias) antes que um upload excluído seja apagado."
     enable_s3_uploads: "Colocar uploads no armazenamento da Amazon S3. IMPORTANTE: exige credenciais válidas da S3 (ambos id da chave de acesso & segredo da chave de acesso)."
-    s3_use_iam_profile: 'Usar papel AWS EC2 IAM para recuperar chaves. OBS: habilitar irá substituir configurações "s3 access key id" e "s3 secret access key".'
     s3_upload_bucket: "Nome do bucket da Amazon S3 no qual os arquivos serão enviados. AVISO: precisa ser em minúsculas, sem pontos, sem underscores."
     s3_access_key_id: "A id da chave de acesso da Amazon S3 que será usada para fazer upload de imagens."
     s3_secret_access_key: "O segredo da chave de acesso da Amazon S3 que será usada para fazer upload de imagens."
@@ -1663,7 +1652,6 @@ pt_BR:
       name: Primeira Resposta por email
   admin_login:
     success: "Email Enviado"
-    error: "Erro!"
     email_input: "Email do Administrador"
     submit_button: "Enviar Email"
   performance_report:
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 95f2e9f36c..5764c9fb1d 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -197,7 +197,6 @@ ro:
     hot: "Subiecte fierbinți"
     top: "Subiecte fierbinți"
     posts: "Ultimele postări"
-    private_posts: "Ultimele mesaje private"
     group_posts: "Ultimele postări de la %{group_name}"
     group_mentions: "Ultimele menționări de la %{group_name}"
     user_posts: "Ultimele postări ale lui @%{username}"
@@ -259,12 +258,6 @@ ro:
       Ai luat în considerare să **[îți actualizezi profilul](%{profile_path})** cu o imagine care te reprezintă?
 
       Este mai ușor să urmărești o discuție și să găsești oameni interesanți într-o conversație atunci când fiecare are o imagine unică!
-    reviving_old_topic: |
-      ### Reînvii această discuție?
-
-      Ultimul răspuns în această discuție a fost în urmă cu **%{days}** zile. Răspunsul tău va pune discuția pe prima pagină și îi va notifica pe toți cei ce au fost implicați în discuție.
-
-      Ești sigur că vrei să continui această discuție veche?
   activerecord:
     attributes:
       category:
@@ -281,9 +274,7 @@ ro:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Poți ataşa avertizări doar la mesajele private."
               too_many_users: "Poți trimite avertizări la un singur utilizator odată."
-              cant_send_pm: "Ne pare rău, nu poți trimite un mesaj privat acestui utilizator."
               no_user_selected: "Trebuie selectat un nume de utilizator valid."
             featured_link:
               invalid: "e invalid. URL-ul trebuie să includă http:// sau https://."
@@ -794,7 +785,6 @@ ro:
     censored_words: "Cuvintele vor fi înlocuite automat cu &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Modelul Regex va fi înlocuit automat cu  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "șterge automat toate postările ascunse care stau ascunse mai mult de 30 de zile."
-    default_locale: "Limba implicită a acestei instanțe de Discourse (ISO 639-1 Code)"
     allow_user_locale: "Permite utilizatorilor să-și aleagă singuri limba pentru interfață"
     set_locale_from_accept_language_header: "setează limba interfeței pentru utilizatorii anonimi pe baza header-elor de limbă ale web browser-elor lor. (EXPERIMENTAL, nu funcționează cu cache anonim)"
     min_post_length: "Lungimea minimă a postării, în caractere"
@@ -981,7 +971,6 @@ ro:
     clean_orphan_uploads_grace_period_hours: "Perioada de grație (în ore) înainte ca o reîncărcare orfană să fie ștearsă."
     purge_deleted_uploads_grace_period_days: "Perioada de grație (în zile) înainte ca o încărcare ștearsă să fie eliminată."
     enable_s3_uploads: "Pune încărcările pe spațiul Amazon S3. IMPORTANT: necesită un acces valid (atât identificatorul cheii de acces cât și cheia secretă)."
-    s3_use_iam_profile: 'Folosește rolul AWS EC2 IAM pentru retragerea cheilor. NOTĂ: activarea va suprascrie setările pentru "s3 access key id" și "s3 secret access key".'
     s3_upload_bucket: "Numele containerului Amazon S3 unde vor fi încărcate fișierele. ATENȚIE: trebuie să fie scris cu litere mici, fără puncte și fără underscore."
     s3_access_key_id: "Id cheie de acces Amazon S3 ce va fi folosit la încărcarea imaginilor."
     s3_secret_access_key: "Cheie secretă de acces Amazon S3 ce va fi folosită la încărcarea imaginilor."
@@ -1024,7 +1013,6 @@ ro:
     min_trust_to_edit_wiki_post: "Nivelul de încredere minim necesar pentru a edita o postare marcată ca wiki."
     min_trust_to_edit_post: "Nivelul de încredere minim necesar pentru a edita postări."
     min_trust_to_allow_self_wiki: "Nivelul de încredere minim necesar pentru transformarea propriilor mesaje în wiki."
-    min_trust_to_send_messages: "Nivelul minim de încredere necesar pentru a crea noi mesaje private."
     newuser_max_links: "Câte linkuri poate adăuga un nou utilizator într-o postare."
     newuser_max_images: "Câte imagini poate adăuga un nou utilizator într-o postare."
     newuser_max_attachments: "Câte atașamente poate adăuga un nou utilizator într-o postare."
@@ -1185,7 +1173,6 @@ ro:
     approve_post_count: "Numărul de postări de la un utilizator simplu trebuie să fie aprobat"
     approve_unless_trust_level: "Postările utilizatorilor care au un nivel de încredere mai mic decât acesta trebuie să fie aprobate."
     approve_new_topics_unless_trust_level: "Crearea de subiecte noi pentru utilizatorii care se află sub acest nivel de încredere, trebuie aprobată"
-    notify_about_queued_posts_after: "Dacă există postări care au așteptat să fie verificate mai mult de atâtea ore, un email va fi trimis către contact_email. Setează la 0 pentru a dezactiva aceste emailuri."
     auto_close_messages_post_count: "Numărul maxim de postări permise într-un mesaj privat înainte să fie închis automat (0 pentru dezactivare) "
     auto_close_topics_post_count: "Numărul maxim de postări permise într-un subiect înainte ca acesta să fie închis automat (0 pentru dezactivare)"
     code_formatting_style: "Butonul Cod din cadrul editorului va fi setat cu opțiunea implicită pe acest stil de formatare cod "
@@ -1781,141 +1768,6 @@ ro:
     title: "FAQ/Ghid"
   tos_topic:
     title: "Condiții generale de utilizare"
-    body: |
-      The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
-
-      Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
-
-      <a name="1"></a>
-
-      ## [1. Your %{company_domain} Account](#1)
-
-      If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
-
-      <a name="2"></a>
-
-      ## [2. Responsibility of Contributors](#2)
-
-      If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
-
-      *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
-      *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
-      *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
-      *   the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
-      *   the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
-      *   the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;
-      *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
-      *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
-      *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
-
-      <a name="3"></a>
-
-      ## [3. User Content License](#3)
-
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
-
-
-      <a name="4"></a>
-
-      ## [4. Payment and Renewal](#4)
-
-      ### General Terms
-
-      Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
-
-      ### Automatic Renewal
-
-      Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
-
-      <a name="5"></a>
-
-      ## [5. Services](#5)
-
-      ### Hosting, Support Services
-
-      Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
-
-      <a name="6"></a>
-
-      ## [6. Responsibility of Website Visitors](#6)
-
-      %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
-
-      <a name="7"></a>
-
-      ## [7. Content Posted on Other Websites](#7)
-
-      We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
-
-      <a name="8"></a>
-
-      ## [8. Copyright Infringement and DMCA Policy](#8)
-
-      As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Intellectual Property](#9)
-
-      This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
-
-      <a name="10"></a>
-
-      ## [10. Advertisements](#10)
-
-      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
-
-      <a name="11"></a>
-
-      ## [11. Attribution](#11)
-
-      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
-
-      <a name="12"></a>
-
-      ## [12. Changes](#12)
-
-      %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
-
-      <a name="13"></a>
-
-      ## [13. Termination](#13)
-
-      %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-
-      <a name="14"></a>
-
-      ## [14. Disclaimer of Warranties](#14)
-
-      The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
-
-      <a name="15"></a>
-
-      ## [15. Limitation of Liability](#15)
-
-      In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
-
-      <a name="16"></a>
-
-      ## [16. General Representation and Warranty](#16)
-
-      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
-
-      <a name="17"></a>
-
-      ## [17. Indemnification](#17)
-
-      You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
-
-      <a name="18"></a>
-
-      ## [18. Miscellaneous](#18)
-
-      This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
-
-      This document is CC-BY-SA. It was last updated May 31, 2013.
-
-      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Politica de confidențialitate"
     body: |
@@ -2207,7 +2059,6 @@ ro:
         Acest ecuosn se acordă când ai răspuns pentru prima dată la o postare prin email :e-mail:.
   admin_login:
     success: "Emailul a fost trimis"
-    error: "Eroare!"
     email_input: "Email Admin"
     submit_button: "Trimite email"
   performance_report:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 4f956b8212..ffa033217b 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -220,7 +220,6 @@ ru:
     top_weekly: "Лучшие темы за неделю"
     top_daily: "Лучшие темы за день"
     posts: "Последние сообщения"
-    private_posts: "Последние личные сообщения"
     group_posts: "Последние сообщения от %{group_name}"
     group_mentions: "Последние упоминания от %{group_name}"
     user_posts: "Последние сообщения, отправленные @%{username}"
@@ -312,9 +311,7 @@ ru:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Прикреплять предупреждения можно только к приватным сообщениям."
               too_many_users: "Можно отправлять предупреждения только одному пользователю за раз."
-              cant_send_pm: "Извините, вы не можете посылать личные сообщения данному пользователю."
               no_user_selected: "Вы должны выбрать корректного пользователя."
             featured_link:
               invalid: "недействителен. URL должен включать http:// или https://."
@@ -830,7 +827,6 @@ ru:
   site_settings:
     censored_words: "Слова, которые будут автоматически заменены на &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Автоматически удалять сообщения, скрытые дольше чем 30 дней."
-    default_locale: "Язык по умолчанию для данного экземпляра Discourse (ISO 639-1 Code)"
     allow_user_locale: "Позволять пользователям выбирать язык интерфейса"
     min_post_length: "Минимально допустимое количество символов в одном сообщении."
     min_first_post_length: "Минимально допустимое количество символов в первом сообщении (или теле темы)"
@@ -969,7 +965,6 @@ ru:
     clean_orphan_uploads_grace_period_hours: "Период (в часах) после которого неопубликованные вложения удаляются."
     purge_deleted_uploads_grace_period_days: "Период (в днях) после которого удаленные вложения очищаются."
     enable_s3_uploads: "размещать загружаемые файлы на Amazon S3. ВАЖНО: требуется правильные настройки S3 (access key id и secret access key)."
-    s3_use_iam_profile: 'Использовать AWS EC2 IAM роль для ключей. ПРИМЕЧАНИЕ: включение данной функции перезапишет настройки "s3 access key id" и "s3 secret access key".'
     s3_upload_bucket: "Имя Amazon S3 bucket куда будут загружаться файлы. ВНИМАНИЕ: должно быть в нижнем регистре, без пробелов, без подчеркиваний.\nhttp://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html"
     s3_access_key_id: "Amazon S3 access key для загрузки и хранения изображений"
     s3_secret_access_key: "Amazon S3 secret key для загрузки и хранения изображений"
@@ -1000,7 +995,6 @@ ru:
     min_trust_to_edit_wiki_post: "Минимальный уровень доверия, требуемый для редактирования вики-сообщения."
     min_trust_to_edit_post: "Минимальный уровень доверия, требуемый для редактирования сообщений."
     min_trust_to_allow_self_wiki: "Минимальный уровень доверия, требуемый для создания своего вики-сообщений."
-    min_trust_to_send_messages: "Минимальный уровень доверия, требуемый для создания личных сообщений."
     newuser_max_links: "Сколько ссылок новый пользователь может вставлять в сообщение."
     newuser_max_images: "Сколько изображений новый пользователь может вставлять в одно сообщение."
     newuser_max_attachments: "Максимальное количество вложений, которое новый пользователь может прикрепить к одному сообщению."
@@ -1591,7 +1585,6 @@ ru:
       name: Первый Ответ По Почте
   admin_login:
     success: "письмо отправлено"
-    error: "Ошибка!"
     email_input: "Email Администратора"
     submit_button: "отправить письмо"
   performance_report:
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index e2daaafb6a..d300784b05 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -31,6 +31,9 @@ sk:
   disable_remote_images_download_reason: "Sťahovanie vzdialených obrázkov je vypnuté kvôli nedostatku diskového priestoru."
   anonymous: "Anonymný"
   remove_posts_deleted_by_author: "Zmazané autorom"
+  themes:
+    bad_color_scheme: "Nepodarilo sa aktualizovať tému, neplatná farebná schéma"
+    other_error: "počas aktualizácie tému sa niečo nepodarilo"
   emails:
     incoming:
       default_subject: "Táto téma musí mať názov"
@@ -40,8 +43,11 @@ sk:
         empty_email_error: "Nastane, keď prijmeme úplne prázdny mail."
         no_message_id_error: "Nastane, keď v maili chýba hlavička 'Message-Id'."
         inactive_user_error: "Nastane, keď odosielateľ nie je aktívny."
+        silenced_user_error: "Nastane, keď odosielateľ bol stíšený."
         insufficient_trust_level_error: "Nastane, keď sa používateľ pokúsi vytvoriť novú tému v kategórii, na ktorú nemajú dostatočný stupeň dôvery."
         topic_closed_error: "Nastane, keď príde odpoveď na uzavretú tému."
+        bounced_email_error: "Email report bol odoslaný emailom"
+      unrecognized_error: "Chyba nebola rozpoznaná."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -61,6 +67,8 @@ sk:
       has_already_been_used: "je už použité"
       inclusion: nie je v zozname
       invalid: je nesprávne
+      is_invalid: "je to nejasné, je to kompletná veta?"
+      contains_censored_words: "obsahuje nasledujúce cenzúrované slová %{censored_words}"
       less_than: musí byť menej ako %{count}
       less_than_or_equal_to: musí byť menej alebo rovné %{count}
       not_a_number: nie je číslo
@@ -98,6 +106,11 @@ sk:
       max_username_length_range: "Nemôžete nastaviť maximum menšie ako minimum."
       default_categories_already_selected: "Nemôžete vybrať kategóriu použitú v inom zozname."
       s3_upload_bucket_is_required: "Nemôžete nahrávať na S3 pokiaľ ste nezadali 's3_upload_bucket'."
+  invite:
+    not_found: "Tvoj pozívací token je nesprávny. Prosím, kontaktujte administrátora stránky."
+  bulk_invite:
+    file_should_be_csv: "Nahrávaný súbor by mal byť typu CSV."
+    error: "Počas nahrávanie súboru sa vyskytla chyba. Prosím, vyskúšajte ho nahraď znovu neskôr."
   backup:
     operation_already_running: "Prebieha spracovanie inej operácie. Momentálne sa nová úloha nedá spustiť. "
     backup_file_should_be_tar_gz: "Záložný súbor musí byť archív .tar.gz"
@@ -173,8 +186,11 @@ sk:
     latest: "Najnovšie témy"
     hot: "Horúce témy"
     top: "Top témy"
+    top_monthly: "Mesačné najčastejšie témy"
+    top_weekly: "Týždenné najčastejšie témy"
+    top_daily: "Denné najčastejšie témy"
     posts: "Najnovšie príspevky"
-    private_posts: "Najnovšie súkromné správy"
+    private_posts: "Posledné osobné správy"
     group_posts: "Najnovšie príspevky od %{group_name}"
     group_mentions: "Najnovšie zmienky od %{group_name}"
     user_posts: "Najnovšie príspevky od @%{username}"
@@ -249,9 +265,7 @@ sk:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Výstraha môže byť pripojená len k súkromným spravam"
               too_many_users: "Výstraha môže byť zaslaná len jednej osobe"
-              cant_send_pm: "Ľutujeme, nemôžete zaslať súkromnú správu tomuto používateľovi"
               no_user_selected: "Musíte zadať existujúceho používateľa"
         user:
           attributes:
@@ -266,6 +280,10 @@ sk:
           attributes:
             hex:
               invalid: "nesprávna farba"
+        watched_word:
+          attributes:
+            word:
+              too_many: "Príliš veľa slov k tej akcii"
       <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} nevložil zatiaľ nič do profilu \"O mne\"</div>"
@@ -275,6 +293,8 @@ sk:
   meta_category_description: "Diskusia o stránke, organizácii, ako funguje a ako ju môžme vylepšit"
   staff_category_name: "Zamestnanci"
   staff_category_description: "Súkromna kategória pre zamestnaneckú diskusiu. Témy su viditeľné len pre správcov a moderátorov diskusie"
+  discourse_welcome_topic:
+    title: "Vitajte v Discourse"
   lounge_welcome:
     title: "Vítajte v Salóne"
     body: |2
@@ -330,6 +350,9 @@ sk:
     leader:
       title: "vodca"
     change_failed_explanation: "Pokúsili  ste sa znížiť úroveň %{user_name} na '%{new_trust_level}'. Ale jeho/jej aktuálna úroveň už je '%{current_trust_level}'. %{user_name} zostane na úrovni '%{current_trust_level}' - Ak chcete znížiť úroveň používateľa, najskôr uzamknite úroveň"
+  post:
+    image_placeholder:
+      broken: "Tento obrázok je poškodený"
   rate_limiter:
     slow_down: "Vykonali ste túto akciu príliš veľa krát, skúste neskôr"
     too_many_requests: "Na vykonávanie tejto akcie máme nastavený denný limit. Prosím počkajte %{time_left} než skúsite znovu."
@@ -449,6 +472,8 @@ sk:
         other: "pred takmer %{count} rokmi"
   password_reset:
     no_token: "Ľutujeme, tento odkaz na zmenu hesla je už príliš starý. Stlačte tlačidlo Prihlásiť a použite \"Zabudol som heslo\" pre vytvorenie nového odkazu."
+    choose_new: "Napíš nové heslo"
+    choose: "Napíš heslo"
     update: 'Aktualizujte heslo'
     save: 'Nastavte heslo'
     title: 'Obnoviť heslo'
@@ -466,6 +491,9 @@ sk:
     continue_button: "Pokračujte na %{site_name}"
     welcome_to: "Vitajte na %{site_name}!"
     approval_required: "Moderátor musí manuálne povoliť Váš prístup na toto fórum.  O schválení prístupu budete upovedomení emailom."
+    admin_confirm:
+      title: "Potvrď admin účet"
+      back_to: "Vráť sa na %{title}"
   post_action_types:
     off_topic:
       title: 'Mimo témy'
@@ -504,6 +532,9 @@ sk:
       title: 'Hlasovať'
       description: 'Hlasovať pre tento príspevok'
       long_form: 'hlasoval pre tento príspevok'
+  user_activity:
+    no_default:
+      others: "Žiadna aktivita"
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -697,7 +728,6 @@ sk:
   site_settings:
     censored_words: "Slová, ktoré budu automatický nahradené znakmi &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatické zmazanie príspevkov, ktoré ostali skryté viac ako 30 dní"
-    default_locale: "Predvolený jazyk tejto inštancie Discourse je (ISO 639-1 Code)"
     allow_user_locale: "Povoliť používateľom zvoliť si vlastný jazyk"
     min_post_length: "Minimálny povolený počet znakov v príspevkoch"
     min_first_post_length: "Minimálny povolený počet znakov pre prvý príspevok (obsah témy)"
@@ -849,7 +879,6 @@ sk:
     clean_orphan_uploads_grace_period_hours: "Doba (v hodinách) pred odstránením opustených nahraných súborov."
     purge_deleted_uploads_grace_period_days: "Doba (v dňoch) pred úplným vymazaním odstráneného nahraného súboru."
     enable_s3_uploads: "Ukladať nahrávané súbory na úložište S3. DÔLEŽITÉ: vyžaduje platné prístupové údaje S3 (id prístupového kľúča (access key id) a tajný prístupový kľúč (secret access key))."
-    s3_use_iam_profile: 'Použiť rolu AWS EC2 IAM na načítanie kľúčov. POZNÁMKA: zapnutie prepíše nastavený "s3 prístupový kľúč id (s3 access key id)" a "s3 tajný prístupový kľúč (s3 secret access key)".'
     s3_upload_bucket: "Amazon S3 bucket name, do ktorého budú nahraté súbory. POZOR: musí byť malými písmenami, žiadne bodky a žiadne podtržítka."
     s3_access_key_id: "Amazon S3 access key id, ktoré bude použité pre nahrávanie obrázkov."
     s3_secret_access_key: "Amazon S3 secret access key, ktorý bude použitý pre nahrávanie obrázkov."
@@ -878,7 +907,6 @@ sk:
     min_trust_to_create_topic: "MInimálna úroveň dôvery na vytvorenie novej témy."
     min_trust_to_edit_wiki_post: "MInimálna úroveň dôvery na úpravu wiki príspevku."
     min_trust_to_allow_self_wiki: "MInimálna úroveň dôvery k tomu aby mohol používateľ svoje témy meniť na wiki."
-    min_trust_to_send_messages: "MInimálna úroveň dôvery na vytvorenie novej osobnej správy."
     newuser_max_links: "Koľko odkazov môže nový používateľ pridať do príspevku."
     newuser_max_images: "Koľko obrázkov môže nový používateľ pridať do príspevku."
     newuser_max_attachments: "Koľko príloh môže nový používateľ pridať do príspevku."
@@ -1305,7 +1333,6 @@ sk:
       long_description: Tento odznak je udelený, keď prvýkrát zmienite niekoho @meno vo Vašom príspevku. Každá zmienka generuje upozornenie danej osobe, takže bude vedieť o Vašom príspevku. Jednoducho začnite písať @ (zavináč) aby ste zmienili používateľa alebo, ak je to povolené, skupinu - Je to pohodlný spôsob ako upútať ich pozornosť.
   admin_login:
     success: "Email odoslaný"
-    error: "Chyba !"
     email_input: "Email administrátora"
     submit_button: "Poslať email"
   performance_report:
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 2a51d683ac..537722da2d 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -152,7 +152,6 @@ sq:
         topic:
           attributes:
             base:
-              cant_send_pm: "Ndjesë, nuk mund t'i dërgoni këtij përdoruesi një mesazh privat."
               no_user_selected: "Ju duhet të zgjidhni një përdorues të vlefshëm."
         user:
           attributes:
@@ -544,7 +543,6 @@ sq:
   site_settings:
     censored_words: "Fjalët do të zhvendosen automatikisht me &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days."
-    default_locale: "The default language of this Discourse instance (ISO 639-1 Code)"
     allow_user_locale: "Allow users to choose their own language interface preference"
     min_post_length: "Minimum allowed post length in characters"
     min_first_post_length: "Minimum allowed first post (topic body) length in characters"
@@ -682,7 +680,6 @@ sq:
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
-    s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
     s3_access_key_id: "The Amazon S3 access key id that will be used to upload images."
     s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images."
@@ -1197,141 +1194,6 @@ sq:
     title: "Pyetje dhe Përgjigje/Udhëzime"
   tos_topic:
     title: "Termat e Shërbimit "
-    body: |
-      The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
-
-      Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
-
-      <a name="1"></a>
-
-      ## [1. Your %{company_domain} Account](#1)
-
-      If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
-
-      <a name="2"></a>
-
-      ## [2. Responsibility of Contributors](#2)
-
-      If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
-
-      *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
-      *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
-      *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
-      *   the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
-      *   the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
-      *   the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;
-      *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
-      *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
-      *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
-
-      <a name="3"></a>
-
-      ## [3. User Content License](#3)
-
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
-
-
-      <a name="4"></a>
-
-      ## [4. Payment and Renewal](#4)
-
-      ### General Terms
-
-      Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
-
-      ### Automatic Renewal
-
-      Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
-
-      <a name="5"></a>
-
-      ## [5. Services](#5)
-
-      ### Hosting, Support Services
-
-      Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
-
-      <a name="6"></a>
-
-      ## [6. Responsibility of Website Visitors](#6)
-
-      %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
-
-      <a name="7"></a>
-
-      ## [7. Content Posted on Other Websites](#7)
-
-      We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
-
-      <a name="8"></a>
-
-      ## [8. Copyright Infringement and DMCA Policy](#8)
-
-      As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Intellectual Property](#9)
-
-      This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
-
-      <a name="10"></a>
-
-      ## [10. Advertisements](#10)
-
-      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
-
-      <a name="11"></a>
-
-      ## [11. Attribution](#11)
-
-      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
-
-      <a name="12"></a>
-
-      ## [12. Changes](#12)
-
-      %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
-
-      <a name="13"></a>
-
-      ## [13. Termination](#13)
-
-      %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-
-      <a name="14"></a>
-
-      ## [14. Disclaimer of Warranties](#14)
-
-      The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
-
-      <a name="15"></a>
-
-      ## [15. Limitation of Liability](#15)
-
-      In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
-
-      <a name="16"></a>
-
-      ## [16. General Representation and Warranty](#16)
-
-      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
-
-      <a name="17"></a>
-
-      ## [17. Indemnification](#17)
-
-      You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
-
-      <a name="18"></a>
-
-      ## [18. Miscellaneous](#18)
-
-      This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
-
-      This document is CC-BY-SA. It was last updated May 31, 2013.
-
-      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Politika e Privatësisë"
   badges:
@@ -1543,7 +1405,6 @@ sq:
         Kjo stemë jepet herën e parë kur i përgjigjeni një postimi nëpërmjet email-it :e-mail:
   admin_login:
     success: "Emaili u dërgua"
-    error: "Error!"
     email_input: "Admin Email"
     submit_button: "Dërgo Email"
   performance_report:
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index 57e7f7a111..4d988855b4 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -106,10 +106,6 @@ sr:
         bio_raw: "O meni"
     errors:
       models:
-        topic:
-          attributes:
-            base:
-              cant_send_pm: "Žao nam je, ne možete slati privatne poruke tom korisniku."
         user:
           attributes:
             password:
@@ -135,7 +131,6 @@ sr:
     topic_views_heat_high: "Nakon ovoliko pregleda, polje pregleda je jako označeno."
     num_hours_to_close_topic: "Broj sati za pauziranje teme radi intervencije."
     reply_by_email_enabled: "Omogući odgovore na teme putem email poruka."
-    incoming_email_prefer_html: "Koristi HTML umesto tekstualnog formata za dolazne email poruke."
     disable_emails: "Spreči Discourse da šalje bilo kakve email poruke"
     delete_email_logs_after_days: "Obriši email logove posle (N) dana. Uneti 0 za neograničeno čuvanje."
     block_auto_generated_emails: "Blokiraj dolazne email poruke prepoznate kao automatski generisane."
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index e2f12b7b6c..4074488961 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -188,7 +188,6 @@ sv:
     hot: "Heta ämnen"
     top: "Toppämnen"
     posts: "Senaste inläggen"
-    private_posts: "Senaste privata meddelanden"
     group_posts: "Senaste inläggen från %{group_name}"
     group_mentions: "Senaste omnämningarna från %{group_name}"
     user_posts: "Senaste inlägggen av @%{username}"
@@ -257,9 +256,7 @@ sv:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Du kan endast bifoga varningar till privata meddelanden."
               too_many_users: "Du kan endast skicka varningar till en användare åt gången."
-              cant_send_pm: "Tyvärr, du kan inte skicka ett privat medelande till den användaren. "
               no_user_selected: "Du måste välja en giltig användare."
             featured_link:
               invalid: "är ogiltig. URL måste innehålla http:// eller http://."
@@ -735,7 +732,6 @@ sv:
   site_settings:
     censored_words: "Ord som automatiskt ersätts med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-radera alla dolda inlägg som varit dolda i mer än 30 dagar."
-    default_locale: "Standardspråk för den här instansen av Discourse (ISO 639-1-kod)"
     allow_user_locale: "Tillåt användare att själva välja språk"
     set_locale_from_accept_language_header: "sätt gränssnittets språk för anonyma användare från deras webbläsares rubriks språk. (EXPERIMENTELLT, det fungerar inte med anonym cache)"
     min_post_length: "Minsta tillåtna inläggslängd i antal tecken"
@@ -918,7 +914,6 @@ sv:
     clean_orphan_uploads_grace_period_hours: "Nådefrist (i timmar) innan en föräldralös uppladdning raderas."
     purge_deleted_uploads_grace_period_days: "Nådefrist (i dagar) innan en borttagen uppladdning raderas."
     enable_s3_uploads: "Lägg uppladdningar i Amazon S3 lagring. VIKTIGT: kräver giltiga S3-kreditiv (både åtkomstnyckelns ID och den hemliga åtkomstnyckeln)."
-    s3_use_iam_profile: 'Använd AWS EC2 IAM roll för att återfå nycklar. OBS: aktivering kommer att åsidosätta inställningarna "s3 access key id" och "s3 secret access key". '
     s3_upload_bucket: "Namnet på Amazon S3 behållaren som filerna kommer att laddas upp i. VARNING: måste vara gemener, inga punkter och inga understreck."
     s3_access_key_id: "ID för åtkomstnyckeln till Amazon S3 som kommer att användas för att ladda upp bilder."
     s3_secret_access_key: "Den hemliga åtkomstnyckeln till Amazon S3 som kommer att användas för att ladda upp bilder."
@@ -959,7 +954,6 @@ sv:
     min_trust_to_edit_wiki_post: "Lägsta förtroendenivå som krävs för att redigera inlägg markerade som wiki. "
     min_trust_to_edit_post: "Lägsta förtroende nivån som krävs för att skapa ett inlägg."
     min_trust_to_allow_self_wiki: "Lägsta förtroendenivå som krävs för att göra användares egna inlägg wiki."
-    min_trust_to_send_messages: "Lägsta förtroendenivå som krävs för att skapa nya privata meddelanden."
     newuser_max_links: "Antalet länkar en ny användare kan lägga till i ett inlägg."
     newuser_max_images: "Antalet bilder en ny användare kan lägga till i ett inlägg."
     newuser_max_attachments: "Antalet bilagor en ny användare kan lägga till i ett inlägg."
@@ -1120,7 +1114,6 @@ sv:
     approve_post_count: "Antalet inlägg från en ny användare eller basanvändare som måste godkännas"
     approve_unless_trust_level: "Inlägg för användare under den här förtroendenivån måste godkännas"
     approve_new_topics_unless_trust_level: "Nya ämnen för användare under denna förtroendenivå måste bli godkända"
-    notify_about_queued_posts_after: "Om det finns inlägg som väntat på att granskas i fler än så här många timmar så skickas ett e-postmeddelande till contact_email. Ange 0 för att inaktivera de här e-postmeddelandena."
     auto_close_messages_post_count: "Högsta antal inlägg som tillåts i ett meddelande innan det automatiskt stängs (ange 0 för att inaktivera)"
     auto_close_topics_post_count: "Högsta antal inlägg som tillåts i ett ämne innan det automatiskt stängs (ange 0 för att inaktivera)"
     code_formatting_style: "Kodknappen i redigeraren kommer att använda den här kodformatteringsstilen som standard"
@@ -1910,7 +1903,6 @@ sv:
         Den här utmärkelsen beviljas när du för första gången svarar på ett inlägg via e-post :e-mail:.
   admin_login:
     success: "E-post skickat"
-    error: "Fel!"
     email_input: "E-post till administratör"
     submit_button: "Skicka e-post"
   performance_report:
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index d6f0962ec6..e48114f9a1 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -142,9 +142,7 @@ te:
         topic:
           attributes:
             base:
-              warning_requires_pm: "ప్రైవేటు సందేశాలకు మీరు కేవలం హెచ్చరికలు మాత్రమే జోడించగలరు"
               too_many_users: "మీరు హెచ్చరికలు ఒక పర్యాయం కేవలం ఒక సభ్యునికి మాత్రమే పంపగలరు."
-              cant_send_pm: "క్షమించాలి. ఆ సభ్యునికి మీరు ప్రైవేటు సందేశం పంపలేరు."
               no_user_selected: "మీరు ఒక సభ్యుడిని ఎంచుకోవాలి."
         user:
           attributes:
@@ -453,7 +451,6 @@ te:
   site_settings:
     censored_words: "వీటితో పదాలు స్వయంచాలకంగా భర్తీ చేయబడతాయి &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "30 రోజుల కంటే ఎక్కువ దాగివున్న టపాలు స్వయంసిధ్ధంగా తొలగింపబడతాయి."
-    default_locale: "ఈ సంభాషణ సమయంలో అప్రమేయ భాష (ISO 639-1 Code)"
     allow_user_locale: "వినియోగదారులు వారి సొంత భాష ఇంటర్ఫేస్ ప్రాధాన్యతను ఎంచుకోవడానికి అనుమతించు"
     min_post_length: "టపా అనుమతించే అక్షరాల కనిష్ఠ పొడవు"
     max_post_length: "టపా అనుమతించే అక్షరాల గరిష్ఠ పొడవు"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 5a70c66156..2d49802ea4 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -161,7 +161,6 @@ tr_TR:
     top_weekly: "Haftalık en iyi konular"
     top_daily: "Günlük en iyi konular"
     posts: "Son gönderiler"
-    private_posts: "Son özel iletiler"
     group_posts: "%{group_name} tarafından son gönderiler"
     group_mentions: "%{group_name} tarafından son bahsetmeler"
     user_posts: "@%{username} tarafından son gönderiler"
@@ -228,9 +227,7 @@ tr_TR:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Özel iletilere sadece uyarı ekleyebilirsiniz. "
               too_many_users: "Uyarıları aynı anda sadece bir kişiye gönderebilirsiniz."
-              cant_send_pm: "Üzgünüz, seçtiğiniz kullanıcıya özel ileti gönderemezsiniz."
               no_user_selected: "Geçerli bir kullanıcı seçmelisiniz."
         user:
           attributes:
@@ -640,7 +637,6 @@ tr_TR:
   site_settings:
     censored_words: "kelime yerine otomatik olarak &#9632;&#9632;&#9632;&#9632; kullanılacak kelimeler"
     delete_old_hidden_posts: "30 günden fazla süreyle gizli kalan gizlenmiş gönderileri otomatik olarak sil."
-    default_locale: "Bu Discourse yüklemesinin  (ISO 639-1 Code) öntanımlı dili"
     allow_user_locale: "Kullanıcıların arayüz için kendi istedikleri dili seçmesine izin ver"
     set_locale_from_accept_language_header: "anonim kullanıcıların arayüz dilini tarayıcılarının dil başlığından al. (DENEYSELDİR, anonim önbellek ile çalışmaz)"
     min_post_length: "Gönderide olması gereken en az karakter sayısı"
@@ -809,7 +805,6 @@ tr_TR:
     clean_orphan_uploads_grace_period_hours: "Artık yüklemeler kaldırılmadan önce tanınan süre (saat olarak)."
     purge_deleted_uploads_grace_period_days: "Silinen yüklemelerin kaldırılması için tanınan süre (gün olarak)."
     enable_s3_uploads: "Yüklemeleri Amazon S3 belleklerinde sakla. ÖNEMLİ: Doğru S3 bilgileri (erişim anahtarı id & gizli erişim anahtarı) gerektirir"
-    s3_use_iam_profile: 'Anahtarları almak için AWS EC2 IAM rolünü kullan. NOT: Etkinleştirilmesi "s3 access key id" and "s3 secret access key" ayarlarının üzerine yazacaktır.'
     s3_upload_bucket: "Dosyaların yükleneceği Amazon S3 biriktirme yeri adı. DİKKAT: büyük harfler, nokta ve altçizgi karakterleri kullanılmamalı."
     s3_access_key_id: "Resimleri yüklemek için kullanılacak olan Amazon S3 access key id."
     s3_secret_access_key: "Resimleri yüklemek için kullanılacak olan Amazon S3 secret access key."
@@ -848,7 +843,6 @@ tr_TR:
     min_trust_to_edit_wiki_post: "Wiki olarak işaretlenmiş bir gönderiyi düzenleyebilmek için gereken en az güven seviyesi."
     min_trust_to_edit_post: "Gönderilerin düzenlenebilmesi için gereken en düşük güven seviyesi."
     min_trust_to_allow_self_wiki: "Kullanıcının kendi wiki gönderisini oluşturabilmesi için gereken güven seviyesi."
-    min_trust_to_send_messages: "Özel bir ileti oluşturabilmek için gerekli olan güven seviyesi."
     newuser_max_links: "Yeni bir kullanıcının bir gönderiye ekleyebileceği bağlantı sayısı."
     newuser_max_images: "Yeni bir kullanıcının bir gönderiye ekleyebileceği resim sayısı."
     newuser_max_attachments: "Yeni bir kullanıcının bir gönderiye ekleyebileceği dosya sayısı."
@@ -1643,7 +1637,6 @@ tr_TR:
         Bu rozet ilk defa bir gönderiye mail yoluyla cevap verdiğiniz için verilmiştir :e-mail:.
   admin_login:
     success: "E-posta Gönderildi"
-    error: "Hata!"
     email_input: "Yönetici e-postası"
     submit_button: "E-posta Gönder"
   performance_report:
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 29794e9440..7dbc3e88a0 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -90,7 +90,6 @@ uk:
     latest: "Останні теми"
     hot: "Гарячі теми"
     posts: "Останні дописи"
-    private_posts: "Останні приватні повідомлення"
     group_posts: "Останні дописи від %{group_name}"
     user_posts: "Останні дописи @%{username}"
     user_topics: "Останні теми @%{username}"
@@ -300,7 +299,6 @@ uk:
     github_config_warning: 'The server is configured to allow signup and log in with GitHub (enable_github_logins), but the client id and secret values are not set. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide" target="_blank">See this guide to learn more</a>.'
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download the latest release</a>.'
   site_settings:
-    default_locale: "Мова за замовчуванням для цього екземпляра Discourse (Код ISO 639-1)"
     allow_user_locale: "Allow users to choose their own language interface preference"
     min_search_term_length: "Мінімальна дозволена довжина пошукової фрази у символах"
     allow_duplicate_topic_titles: "Дозволити теми з однаковими, дублюючими назвами."
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 7320fbe29b..a55aafc269 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -55,7 +55,7 @@ vi:
       confirmation: "%{attribute} không khớp"
       empty: không thể để trống
       equal_to: phải bằng %{count}
-      even: phải là chắn
+      even: phải là số chẵn
       exclusion: được dành riêng
       greater_than: phải lớn hơn %{count}
       greater_than_or_equal_to: phải lớn hơn hoặc bằng %{count}
@@ -153,7 +153,6 @@ vi:
     hot: "Chủ đề nóng nhất"
     top: "Top chủ đề"
     posts: "Bài viết mới nhất"
-    private_posts: "Tin nhắn mới nhất"
     group_posts: "Bài viết mới từ %{group_name}"
     group_mentions: "Đề cập mới từ %{group_name}"
     user_posts: "Bài viết mới của @%{username}"
@@ -220,9 +219,7 @@ vi:
         topic:
           attributes:
             base:
-              warning_requires_pm: "Bạn chỉ có thể đính kèm cảnh báo qua tin nhắn cá nhân"
               too_many_users: "Bạn chỉ có thể gửi một cảnh báo tới một người dùng mỗi lần."
-              cant_send_pm: "Xin lỗi, bạn không thể gửi tin nhắn tới thành viên này"
               no_user_selected: "Bạn phải chọn một thành viên phù hợp."
         user:
           attributes:
@@ -615,7 +612,6 @@ vi:
   site_settings:
     censored_words: "Từ sẽ tự động thay thế bằng &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Tự động ẩn bất kỳ bài viết ở ẩn hơn 30 ngày."
-    default_locale: "Ngôn ngữ mặc định của Discourse (Mã ISO 639-1)"
     allow_user_locale: "Cho phép thành viên chọn ngôn ngữ của riêng trong thiết lập giao diện."
     set_locale_from_accept_language_header: "đặt ngôn ngữ giao diện cho người dùng ẩn danh từ tiêu đề ngôn ngữ trình duyệt web của họ. (KINH NGHIỆM, không hoạt động với bộ nhớ cache ẩn danh)"
     min_post_length: "Số kí tự tối thiểu trong bài đăng."
@@ -776,7 +772,6 @@ vi:
     clean_orphan_uploads_grace_period_hours: "Thời gian gia hạn (theo giờ) trước khi dòng mồ côi upload được loại bỏ."
     purge_deleted_uploads_grace_period_days: "Thời gian gia hạn (theo ngày) trước khi upload cần xóa được xóa."
     enable_s3_uploads: "Đặt thư mục upload trên Amazon S3. QUAN TRỌNG: yêu cầu chứng thực S3 (cả ID khóa truy cập & khóa bảo mật)."
-    s3_use_iam_profile: 'Sử dụng AWS EC2 IAM để lấy khóa. LƯU Ý: bật thiết lập này sẽ ghi đè thiết lập "s3 access key id" và "s3 secret access key".'
     s3_upload_bucket: "Tên Amazon S3 để lưu trữ các file sẽ được upload. CHÚ Ý: phải là chữ thường, không cách và không gạch dưới."
     s3_access_key_id: "Amazon S3 access key id này sẽ được sử dụng để tải lên ảnh."
     s3_secret_access_key: "Amazon S3 secret access key này sẽ được sử dụng để tải lên ảnh."
@@ -814,7 +809,6 @@ vi:
     min_trust_to_create_topic: "Bậc tin tưởng tối thiểu để tạo một chủ đề mới."
     min_trust_to_edit_wiki_post: "Bậc tin cậy tối thiểu cần thiết để có thể sửa bài viết được đánh dấu là wiki."
     min_trust_to_allow_self_wiki: "Bậc tin cậy tối thiểu cần thiết để người dùng có thể đánh dấu bài viết của họ là wiki."
-    min_trust_to_send_messages: "Bậc tin cậy tối thiểu cần thiết để có thể tạo hội thoại riêng."
     newuser_max_links: "Bao nhiêu liên kết tài khoản mới có thể thêm vào bài viết."
     newuser_max_images: "Bao nhiêu hình tài khoản mới có thể thêm vào bài viết."
     newuser_max_attachments: "Bao nhiêu đính kèm tài khoản mới có thể thêm vào bài viết"
@@ -940,7 +934,6 @@ vi:
     enforce_square_emoji: "Sử dụng kích thước vuông cho tất cả các emoji."
     approve_post_count: "Số lượng bài viết từ một thành viên mới hoặc thành viên cũ phải được duyệt"
     approve_unless_trust_level: "Bài viết của thành viên dưới cấp độ tin cậy này phải được duyệt"
-    notify_about_queued_posts_after: "Nếu những bài viết đang chờ duyệt có thời gian cũ hơn số giờ thiết lập ở đây, một email sẽ được gửi đến contact_email. Đặt là 0 để vô hiệu hóa email này."
     default_email_private_messages: "Gửi email khi ai đó nhắn tin cho thành viên theo mặc định."
     default_email_direct: "Gửi email khi ai đó trích dẫn/trả lời/đề cập hoặc mời thành viên theo mặc định."
     default_email_mailing_list_mode: "Mặc định gửi email cho mỗi bài viết mới."
@@ -1433,7 +1426,6 @@ vi:
       name: Đề cập đầu tiên
   admin_login:
     success: "Gửi mail lỗi"
-    error: "Lỗi!"
     email_input: "Email quản trị"
     submit_button: "Gửi email"
   performance_report:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index aaf5ae63d1..114480b9ec 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -197,7 +197,6 @@ zh_CN:
     top_weekly: "每周热门主题"
     top_daily: "每日热门主题"
     posts: "最新帖子"
-    private_posts: "最近的私信"
     group_posts: "%{group_name}组最近的帖子"
     group_mentions: "%{group_name}组最近的提及"
     user_posts: "最新贴子由@%{username}发表"
@@ -292,12 +291,6 @@ zh_CN:
       非常抱歉，但新用户被限制只能在同一主题中回复 %{newuser_max_replies_per_topic} 次。
 
       与其添加另一个回复不如考虑编辑你以前的回复，或访问其他主题。
-    reviving_old_topic: |
-      ### 重新激活这个主题？
-
-      这个主题的最后一个回复距今已有 %{days} 天了。你的回复将让主题重新出现在列表的顶端并通知原先参与讨论的人。
-
-      你确定要继续这个老的话题吗？
   activerecord:
     attributes:
       category:
@@ -314,9 +307,7 @@ zh_CN:
         topic:
           attributes:
             base:
-              warning_requires_pm: "只能使用私信警告。"
               too_many_users: "一次只能发送警告给一个用户。"
-              cant_send_pm: "抱歉，不能向该用户发送私信。"
               no_user_selected: "必须选择一个有效的用户。"
               reply_by_email_disabled: "用邮件回复已被禁止"
             featured_link:
@@ -832,7 +823,6 @@ zh_CN:
     censored_words: "将被自动替换为 &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "正则表达式将自动被替换为&#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "自动删除被隐藏超过 30 天的帖子。"
-    default_locale: "此论坛的缺省语言（ISO 639-1 代码）"
     allow_user_locale: "允许用户选择他们自己的语言界面"
     set_locale_from_accept_language_header: "为未登录用户按照他们的浏览器发送的请求头部设置界面语言。（实验性，无法和匿名缓存共同使用）"
     min_post_length: "帖子允许的最少字符数"
@@ -1048,7 +1038,6 @@ zh_CN:
     purge_deleted_uploads_grace_period_days: "彻底删除孤立上传资料的宽限期（单位：天）"
     purge_unactivated_users_grace_period_days: "删除未激活用户账户的宽限期（单位：天）。设置为 0 将永不清除未激活用户。"
     enable_s3_uploads: "上传至 Amazon S3 存储的地址。重要：需要有效的 S3 验证资料（包括 access key id & secret access key）。"
-    s3_use_iam_profile: '使用 AWS EC2 IAM 角色来获得 key。注意：启用这个会覆盖“S3 access key id”和“S3 secret access key” 设置。'
     s3_upload_bucket: "上传文件保存于 Amazon S3 的 bucket 名字。警告：必须为小写，无句点，无下划线。"
     s3_access_key_id: "将用于上传图片的 Amazon S3 access key。"
     s3_secret_access_key: "将用于上传图片的 Amazon S3 secret key。"
@@ -1094,8 +1083,6 @@ zh_CN:
     min_trust_to_edit_wiki_post: "能编辑维基模式帖子的最小信任等级"
     min_trust_to_edit_post: "能编辑帖子的最小信任等级。"
     min_trust_to_allow_self_wiki: "用户将自己的帖子设置为维基模式的最低信任等级。"
-    min_trust_to_send_messages: "发送私信所需的最低信任等级。"
-    min_trust_to_send_email_messages: "通过 email 发送新私信（给暂存用户）所需的最低信任等级。"
     newuser_max_links: "一个访问者可以添加到一个帖子里的链接数量。"
     newuser_max_images: "一个访问者可以加入到一个帖子里的图片数量。"
     newuser_max_attachments: "一个新用户可以添加到一个帖子里的附件数量。"
@@ -1163,7 +1150,6 @@ zh_CN:
     reply_by_email_enabled: "启用通过邮件回复。"
     reply_by_email_address: "通过邮件回复的回复地址模板，例如：%{reply_key}@reply.example.com 或 replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "通过邮件回复的回复地址模板，例如：%{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "处理进站邮件时优先使用 HTML 而不是文本。"
     disable_emails: "禁止 Discourse 发送任何邮件"
     strip_images_from_short_emails: "忽略邮件中小于 2800 字节的图片"
     short_email_length: "短邮件地址长度（以比特作为单位）"
@@ -1267,7 +1253,6 @@ zh_CN:
     allowed_href_schemes: "除了 http 和 https 外允许的链接协议。"
     embed_post_limit: "嵌入帖子的最大数量。"
     embed_username_required: "创建主题需要用户名。"
-    notify_about_flags_after: "如果有标记在设定的小时数后仍未被处理，那么发送邮件给管理人员。设为 0 禁用。"
     show_create_topics_notice: "如果站点只有少于 5 篇的公开帖子时，显示一条请管理员创建帖子的提示。"
     delete_drafts_older_than_n_days: 删除超过 n 天得草稿。
     bootstrap_mode_min_users: "禁用摘要模式的用户数下限（0 为禁用）。"
@@ -1279,7 +1264,6 @@ zh_CN:
     approve_post_count: "新用户或基础用户需要被审核的帖子数量"
     approve_unless_trust_level: "该信任等级之下的用户的帖子必须被审核"
     approve_new_topics_unless_trust_level: "低于该信任等级的用户的新帖子需要被审核"
-    notify_about_queued_posts_after: "如果帖子在设定的小时数后仍在等候处理，发送一封邮件至 contact_email。设为 0 将禁用这些邮件。"
     auto_close_messages_post_count: "私信中贴子数上限，达到后自动关闭私信（0 为禁用）"
     auto_close_topics_post_count: "主题中贴子数上限，达到后自动关闭主题 ( 0 为禁用 )"
     code_formatting_style: "编辑器中的代码格式化按钮设置的默认格式"
@@ -2584,141 +2568,6 @@ zh_CN:
       是的，法律很无聊，但是我们必须保护我们自己 &ndash; 引申开来，你和你的数据 &ndash; 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述你的（以及我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，你必须同意遵守[使用条款](/tos)。
   tos_topic:
     title: "服务条款"
-    body: |
-      The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
-
-      Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
-
-      <a name="1"></a>
-
-      ## [1. Your %{company_domain} Account](#1)
-
-      If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
-
-      <a name="2"></a>
-
-      ## [2. Responsibility of Contributors](#2)
-
-      If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
-
-      *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
-      *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
-      *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
-      *   the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
-      *   the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
-      *   the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;
-      *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
-      *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
-      *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
-
-      <a name="3"></a>
-
-      ## [3. User Content License](#3)
-
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
-
-
-      <a name="4"></a>
-
-      ## [4. Payment and Renewal](#4)
-
-      ### General Terms
-
-      Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
-
-      ### Automatic Renewal
-
-      Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
-
-      <a name="5"></a>
-
-      ## [5. Services](#5)
-
-      ### Hosting, Support Services
-
-      Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
-
-      <a name="6"></a>
-
-      ## [6. Responsibility of Website Visitors](#6)
-
-      %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
-
-      <a name="7"></a>
-
-      ## [7. Content Posted on Other Websites](#7)
-
-      We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
-
-      <a name="8"></a>
-
-      ## [8. Copyright Infringement and DMCA Policy](#8)
-
-      As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Intellectual Property](#9)
-
-      This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
-
-      <a name="10"></a>
-
-      ## [10. Advertisements](#10)
-
-      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
-
-      <a name="11"></a>
-
-      ## [11. Attribution](#11)
-
-      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
-
-      <a name="12"></a>
-
-      ## [12. Changes](#12)
-
-      %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
-
-      <a name="13"></a>
-
-      ## [13. Termination](#13)
-
-      %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-
-      <a name="14"></a>
-
-      ## [14. Disclaimer of Warranties](#14)
-
-      The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
-
-      <a name="15"></a>
-
-      ## [15. Limitation of Liability](#15)
-
-      In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
-
-      <a name="16"></a>
-
-      ## [16. General Representation and Warranty](#16)
-
-      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
-
-      <a name="17"></a>
-
-      ## [17. Indemnification](#17)
-
-      You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
-
-      <a name="18"></a>
-
-      ## [18. Miscellaneous](#18)
-
-      This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
-
-      This document is CC-BY-SA. It was last updated May 31, 2013.
-
-      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "隐私政策"
     body: |
@@ -3039,7 +2888,6 @@ zh_CN:
     badge_title_metadata: "%{site_title}的%{display_name}徽章"
   admin_login:
     success: "邮件已发送"
-    error: "错误！"
     email_input: "管理员邮件"
     submit_button: "发送邮件"
   performance_report:
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 1f838e50f3..94d81c4a70 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -181,7 +181,6 @@ zh_TW:
     top: "熱門討論話題"
     top_weekly: "每週最佳話題"
     posts: " 最近文章"
-    private_posts: "最新的私人訊息"
     group_posts: "%{group_name} 的最新貼文"
     group_mentions: "%{group_name} 的最近提及"
     user_posts: "@%{username} 的最新貼文"
@@ -270,12 +269,6 @@ zh_TW:
       非常抱歉，新使用者有只能回覆同一話題 %{newuser_max_replies_per_topic} 次的臨時限制。
 
       除了繼續回覆外，請考慮修改你先前的回應，或參與其他話題。
-    reviving_old_topic: |
-      ### 討論串考古？
-
-      這個主題中最新的回應已經是 **%{days} 天** 前的事情了。你的回應會讓主題跳到最上方，並且通知所有曾參與過討論的人。
-
-      你確定你想要喚醒這個舊主題嗎？
   activerecord:
     attributes:
       category:
@@ -292,9 +285,7 @@ zh_TW:
         topic:
           attributes:
             base:
-              warning_requires_pm: "你只能附加警告於私人訊息。"
               too_many_users: "你只能同時傳送警告給一位使用者。"
-              cant_send_pm: "抱歉，你不能向該用戶發送私人訊息。"
               no_user_selected: "你必須選擇有效用戶。"
             featured_link:
               invalid: "不合法。URL 應包括 http:// 或 https://。"
@@ -771,7 +762,6 @@ zh_TW:
     censored_words: "將被自動替換為 &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "正則表達式將自動被替換為&#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "自動刪除被隱藏超過 30 天的帖子。"
-    default_locale: "Discourse 執行個體 (instance) 的預設語言編碼 (ISO 639-1)"
     allow_user_locale: "允許用戶選擇自己的語言介面"
     set_locale_from_accept_language_header: "為未登錄用戶按照他們的瀏覽器發送的請求頭部設置界面語言。（實驗性，無法和匿名緩存共同使用）"
     min_post_length: "文章允許的最小文字數"
@@ -962,7 +952,6 @@ zh_TW:
     clean_orphan_uploads_grace_period_hours: "刪除孤立的上傳檔案的寬限期（單位：小時）"
     purge_deleted_uploads_grace_period_days: "徹底刪除孤立的上傳檔案的寬限期（單位：天）"
     enable_s3_uploads: "上傳至 Amazon S3 存儲的地址。重要：需要有效的 S3 驗證資料（包括 access key id & secret access key）。"
-    s3_use_iam_profile: '使用 AWS EC2 IAM 角色來獲得鑰匙。注意：啟用這個會覆蓋“S3 access key id”和“S3 secret access key” 設定。'
     s3_upload_bucket: "Amazon S3 保存上傳檔案的 bucket 名稱。警告：必須為小寫，不包含句點 (.) 與底線 (_)。"
     s3_access_key_id: "上傳至 Amazon S3 的 access key id，將用於上傳圖片"
     s3_secret_access_key: "上傳至 Amazon S3 的 secret access key，將用於上傳圖片"
@@ -1005,8 +994,6 @@ zh_TW:
     min_trust_to_edit_wiki_post: "編輯被標示為維基的文章所需之最低信任等級。"
     min_trust_to_edit_post: "能編輯帖子的最小信任等級。"
     min_trust_to_allow_self_wiki: "用戶將自己的帖子設置為維基模式的最低信任等級。"
-    min_trust_to_send_messages: "發送消息所需的最低信任等級。"
-    min_trust_to_send_email_messages: "透過郵件發送私訊給暫存使用者所需的最低信任等級"
     newuser_max_links: "新用戶可添加多少連結於一篇文章中"
     newuser_max_images: "新用戶可添加多少張圖片於一篇文章中"
     newuser_max_attachments: "新用戶可添加多少附件於一篇文章中"
@@ -1172,7 +1159,6 @@ zh_TW:
     approve_post_count: "新用戶或基礎用戶需要被審核的帖子數量"
     approve_unless_trust_level: "該信任等級之下的用戶的帖子必須被審核"
     approve_new_topics_unless_trust_level: "低於該信任等級的用戶的新帖子需要被審核"
-    notify_about_queued_posts_after: "如果帖子在設定的小時數後仍在等候處理，發送一封郵件至 contact_email。設為 0 將禁用這些郵件。"
     auto_close_messages_post_count: "消息中貼子數上限，達到後自動關閉消息（0 為禁用）"
     auto_close_topics_post_count: "主題中貼子數上限，達到後自動關閉主題 ( 0 為禁用 )"
     code_formatting_style: "編輯器中的代碼格式化按鈕設置的預設格式"
@@ -2102,141 +2088,6 @@ zh_TW:
       是的，法律條文很無聊，但是我們必須保護自己 &ndash; 以及你與你的資料 &ndash; 面對那些不友善的傢伙。我們的[服務條款](/tos)描述你（以及我們）在內容、隱私和法律上的行為和權利。想要使用我們的服務，你必須同意並遵守[服務條款](/tos)。
   tos_topic:
     title: "服務條款"
-    body: |
-      The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
-
-      Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
-
-      <a name="1"></a>
-
-      ## [1. Your %{company_domain} Account](#1)
-
-      If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
-
-      <a name="2"></a>
-
-      ## [2. Responsibility of Contributors](#2)
-
-      If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
-
-      *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
-      *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
-      *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
-      *   the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
-      *   the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
-      *   the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;
-      *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
-      *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
-      *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
-
-      <a name="3"></a>
-
-      ## [3. User Content License](#3)
-
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
-
-
-      <a name="4"></a>
-
-      ## [4. Payment and Renewal](#4)
-
-      ### General Terms
-
-      Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
-
-      ### Automatic Renewal
-
-      Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
-
-      <a name="5"></a>
-
-      ## [5. Services](#5)
-
-      ### Hosting, Support Services
-
-      Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
-
-      <a name="6"></a>
-
-      ## [6. Responsibility of Website Visitors](#6)
-
-      %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
-
-      <a name="7"></a>
-
-      ## [7. Content Posted on Other Websites](#7)
-
-      We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
-
-      <a name="8"></a>
-
-      ## [8. Copyright Infringement and DMCA Policy](#8)
-
-      As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Intellectual Property](#9)
-
-      This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
-
-      <a name="10"></a>
-
-      ## [10. Advertisements](#10)
-
-      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
-
-      <a name="11"></a>
-
-      ## [11. Attribution](#11)
-
-      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
-
-      <a name="12"></a>
-
-      ## [12. Changes](#12)
-
-      %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
-
-      <a name="13"></a>
-
-      ## [13. Termination](#13)
-
-      %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-
-      <a name="14"></a>
-
-      ## [14. Disclaimer of Warranties](#14)
-
-      The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
-
-      <a name="15"></a>
-
-      ## [15. Limitation of Liability](#15)
-
-      In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
-
-      <a name="16"></a>
-
-      ## [16. General Representation and Warranty](#16)
-
-      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
-
-      <a name="17"></a>
-
-      ## [17. Indemnification](#17)
-
-      You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
-
-      <a name="18"></a>
-
-      ## [18. Miscellaneous](#18)
-
-      This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
-
-      This document is CC-BY-SA. It was last updated May 31, 2013.
-
-      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "隱私政策"
     body: |
@@ -2536,7 +2387,6 @@ zh_TW:
         這個徽章每個月授與兩位新使用者，以表揚他們的傑出貢獻。衡量的標準在發表的文章獲得喜歡的頻率、與喜愛者的身份。
   admin_login:
     success: "已發送郵件"
-    error: "錯誤"
     email_input: "管理者郵件"
     submit_button: "送出電子郵件"
   performance_report:
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index 7c77c09b08..a1f0551589 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -40,6 +40,7 @@ server {
   gzip_min_length 1000;
   gzip_comp_level 5;
   gzip_types application/json text/css application/x-javascript application/javascript image/svg+xml;
+  gzip_proxied any;
 
   # Uncomment and configure this section for HTTPS support
   # NOTE: Put your ssl cert in your main nginx config directory (/etc/nginx)
@@ -90,7 +91,7 @@ server {
     # auth_basic on;
     # auth_basic_user_file /etc/nginx/htpasswd;
 
-    location ~* assets/.*\.(eot|ttf|woff|woff2|ico)$ {
+    location ~* (assets|plugins|uploads)/.*\.(eot|ttf|woff|woff2|ico)$ {
       expires 1y;
       add_header Cache-Control public,immutable;
       add_header Access-Control-Allow-Origin *;
@@ -107,6 +108,13 @@ server {
       break;
     }
 
+    # some minimal caching here so we don't keep asking
+    # longer term we should increas probably to 1y
+    location ~ ^/javascripts/ {
+      expires 1d;
+      add_header Cache-Control public,immutable;
+    }
+
     location ~ ^/assets/(?<asset_path>.+)$ {
       expires 1y;
       # asset pipeline enables this
diff --git a/config/routes.rb b/config/routes.rb
index f3cb50b6fb..23d6447d86 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -475,6 +475,7 @@ Discourse::Application.routes.draw do
     put "post_type"
     put "rebake"
     put "unhide"
+    put "locked"
     get "replies"
     get "revisions/latest" => "posts#latest_revision"
     get "revisions/:revision" => "posts#revisions", constraints: { revision: /\d+/ }
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c94fff8489..1b19897afc 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -117,6 +117,7 @@ basic:
     default: "latest|new|unread|top|categories"
     regex: "latest"
     regex_error: "site_settings.errors.must_include_latest"
+    validator: RegexPresenceValidator
     choices:
      - latest
      - new
@@ -424,6 +425,7 @@ users:
   hide_suspension_reasons:
     default: false
     client: true
+  log_personal_messages_views: false
 
 groups:
   enable_group_directory:
@@ -506,11 +508,14 @@ posting:
   enable_private_messages:
     default: true
     client: true
+  enable_system_message_replies:
+    default: true
   enable_private_email_messages:
     default: false
     client: true
     validator: "EnablePrivateEmailMessagesValidator"
   editing_grace_period: 300
+  staff_edit_locks_post: false
   post_edit_time_limit:
     default: 86400
     max: 525600
@@ -598,6 +603,9 @@ posting:
   enable_emoji:
     default: true
     client: true
+  enable_emoji_shortcuts:
+    default: true
+    client: true
   emoji_set:
     default: 'twitter'
     client: true
@@ -633,6 +641,7 @@ posting:
     default: 30
     min: 1
   watched_words_regular_expressions:
+    client: true
     default: false
   enable_advanced_editor_preview_sync:
     hidden: true
@@ -938,9 +947,13 @@ security:
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   allow_moderators_to_create_categories: false
+  non_crawler_user_agents:
+    hidden: true
+    default: 'trident|webkit|gecko|chrome|safari|msie|opera'
+    type: list
   crawler_user_agents:
     hidden: true
-    default: 'Googlebot|Mediapartners|AdsBot|curl|HTTrack|Twitterbot|facebookexternalhit|bingbot|Baiduspider|ia_archiver|archive.org_bot|Wayback Save Page|360Spider|Swiftbot|YandexBot'
+    default: 'rss|bot|spider|crawler|facebook|archive|wayback|ping|monitor'
     type: list
   cors_origins:
     default: ''
@@ -956,7 +969,7 @@ security:
     default: ''
     type: list
   allowed_iframes:
-    default: 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?'
+    default: 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?|https://calendar.google.com/calendar/embed?'
     type: list
     client: true
 
@@ -1520,6 +1533,9 @@ tags:
     client: true
     default: false
     refresh: true
+  tags_listed_by_group:
+    client: true
+    default: false
   staff_tags:
     type: list
     client: true
diff --git a/db/migrate/20180111092141_add_indexes_to_email_logs.rb b/db/migrate/20180111092141_add_indexes_to_email_logs.rb
new file mode 100644
index 0000000000..692c6dcb60
--- /dev/null
+++ b/db/migrate/20180111092141_add_indexes_to_email_logs.rb
@@ -0,0 +1,6 @@
+class AddIndexesToEmailLogs < ActiveRecord::Migration[5.1]
+  def change
+    add_index :email_logs, :post_id
+    add_index :email_logs, :topic_id
+  end
+end
diff --git a/db/migrate/20180125185717_add_locked_by_to_posts.rb b/db/migrate/20180125185717_add_locked_by_to_posts.rb
new file mode 100644
index 0000000000..ec832cdd94
--- /dev/null
+++ b/db/migrate/20180125185717_add_locked_by_to_posts.rb
@@ -0,0 +1,5 @@
+class AddLockedByToPosts < ActiveRecord::Migration[5.1]
+  def change
+    add_column :posts, :locked_by_id, :integer
+  end
+end
diff --git a/db/migrate/20180127005644_remove_old_ga_site_settings.rb b/db/migrate/20180127005644_remove_old_ga_site_settings.rb
new file mode 100644
index 0000000000..6c3f29df20
--- /dev/null
+++ b/db/migrate/20180127005644_remove_old_ga_site_settings.rb
@@ -0,0 +1,10 @@
+class RemoveOldGaSiteSettings < ActiveRecord::Migration[5.1]
+  def up
+    execute "DELETE FROM site_settings WHERE name = 'ga_tracking_code'"
+    execute "DELETE FROM site_settings WHERE name = 'ga_domain_name'"
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md
index f02868df86..045b964c3a 100644
--- a/docs/ADMIN-QUICK-START-GUIDE.md
+++ b/docs/ADMIN-QUICK-START-GUIDE.md
@@ -83,7 +83,7 @@ All new users start out in a sandbox with restrictions for everyone's safety. **
 
 - post more than 2 hyperlinks
 - post any images or file attachments
-- send private messages
+- send personal messages
 - flag posts or topics
 - have actual links in the "about me" field of their profile
 - @name mention more than 2 users in a post
diff --git a/lib/admin_constraint.rb b/lib/admin_constraint.rb
index db5c0e73b6..1d0291cd7f 100644
--- a/lib/admin_constraint.rb
+++ b/lib/admin_constraint.rb
@@ -9,9 +9,17 @@ class AdminConstraint
   def matches?(request)
     return false if @require_master && RailsMultisite::ConnectionManagement.current_db != "default"
     provider = Discourse.current_user_provider.new(request.env)
-    provider.current_user && provider.current_user.admin?
+    provider.current_user &&
+      provider.current_user.admin? &&
+      custom_admin_check(request)
   rescue Discourse::InvalidAccess
     false
   end
 
+  # Extensibility point: plugins can overwrite this to add additional checks
+  # if they require.
+  def custom_admin_check(request)
+    true
+  end
+
 end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 105ae53839..a23f028152 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -259,6 +259,10 @@ class Auth::DefaultCurrentUserProvider
         api_key.user if !api_username || (api_key.user.username_lower == api_username.downcase)
       elsif api_username
         User.find_by(username_lower: api_username.downcase)
+      elsif user_id = request["api_user_id"]
+        User.find_by(id: user_id.to_i)
+      elsif external_id = request["api_user_external_id"]
+        SingleSignOnRecord.find_by(external_id: external_id.to_s).try(:user)
       end
     end
   end
diff --git a/lib/auth/github_authenticator.rb b/lib/auth/github_authenticator.rb
index bde25ed5d1..9c9d5f3c18 100644
--- a/lib/auth/github_authenticator.rb
+++ b/lib/auth/github_authenticator.rb
@@ -42,13 +42,11 @@ class Auth::GithubAuthenticator < Auth::Authenticator
       # need to know.
       user = user_info.user
       result.email = data[:email],
-      result.email_valid = !!data[:email_verified]
+      result.email_valid = data[:email].present?
     else
       # Potentially use *any* of the emails from GitHub to find a match or
       # register a new user, with preference given to the primary email.
       all_emails = Array.new(auth_token[:extra][:all_emails])
-      all_emails.unshift(email: data[:email],
-                         verified: !!data[:email_verified])
 
       # Only consider verified emails to match an existing user.  We don't want
       # someone to be able to create a GitHub account with an unverified email
diff --git a/lib/auth/result.rb b/lib/auth/result.rb
index 35204bb7e3..911dca0a28 100644
--- a/lib/auth/result.rb
+++ b/lib/auth/result.rb
@@ -4,7 +4,7 @@ class Auth::Result
                 :awaiting_approval, :authenticated, :authenticator_name,
                 :requires_invite, :not_allowed_from_ip_address,
                 :admin_not_allowed_from_ip_address, :omit_username,
-                :skip_email_validation
+                :skip_email_validation, :destination_url
 
   attr_accessor(
     :failed,
@@ -42,13 +42,15 @@ class Auth::Result
                                      date: I18n.l(user.suspended_till, format: :date_only), reason: user.suspend_reason)
         }
       else
-        {
+        result = {
           authenticated: !!authenticated,
           awaiting_activation: !!awaiting_activation,
           awaiting_approval: !!awaiting_approval,
           not_allowed_from_ip_address: !!not_allowed_from_ip_address,
           admin_not_allowed_from_ip_address: !!admin_not_allowed_from_ip_address
         }
+        result[:destination_url] = destination_url if authenticated && destination_url.present?
+        result
       end
     else
       result = { email: email,
diff --git a/lib/base62.rb b/lib/base62.rb
index 84f9fbf23c..bec48359aa 100644
--- a/lib/base62.rb
+++ b/lib/base62.rb
@@ -1,9 +1,9 @@
 # Modified version of: https://github.com/steventen/base62-rb
 
 module Base62
-  KEYS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".freeze
-  KEYS_HASH = KEYS.each_char.with_index.inject({}) { |h, (k, v)| h[k] = v; h }
-  BASE = KEYS.length
+  KEYS ||= "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".freeze
+  KEYS_HASH ||= KEYS.each_char.with_index.to_h
+  BASE ||= KEYS.length
 
   # Encodes base10 (decimal) number to base62 string.
   def self.encode(num)
diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index 94d5a23efa..8b765c0e14 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -187,7 +187,7 @@ class ComposerMessagesFinder
       templateName: 'education',
       wait_for_typing: false,
       extraClass: 'education-message',
-      body: PrettyText.cook(I18n.t('education.reviving_old_topic', days: (Time.zone.now - @topic.last_posted_at).round / 1.day))
+      body: PrettyText.cook(I18n.t('education.reviving_old_topic', time_ago: FreedomPatches::Rails4.time_ago_in_words(@topic.last_posted_at, false, scope: :'datetime.distance_in_words_verbose')))
     }
   end
 
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 5cc187a490..3582a42e46 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -237,7 +237,8 @@ class CookedPostProcessor
     return unless SiteSetting.crawl_images? || Discourse.store.has_been_uploaded?(url)
 
     @size_cache[url] = FastImage.size(absolute_url)
-  rescue Zlib::BufError # FastImage.size raises BufError for some gifs
+  rescue Zlib::BufError, URI::InvalidURIError, URI::InvalidComponentError
+    # FastImage.size raises BufError for some gifs, leave it.
   end
 
   def is_valid_image_url?(url)
diff --git a/lib/crawler_detection.rb b/lib/crawler_detection.rb
index 5d222ecf7b..2958087a3c 100644
--- a/lib/crawler_detection.rb
+++ b/lib/crawler_detection.rb
@@ -1,17 +1,31 @@
 module CrawlerDetection
 
-  # added 'ia_archiver' based on https://meta.discourse.org/t/unable-to-archive-discourse-pages-with-the-internet-archive/21232
-  # added 'Wayback Save Page' based on https://meta.discourse.org/t/unable-to-archive-discourse-with-the-internet-archive-save-page-now-button/22875
-  # added 'Swiftbot' based on https://meta.discourse.org/t/how-to-add-html-markup-or-meta-tags-for-external-search-engine/28220
-  def self.to_matcher(string)
+  def self.to_matcher(string, type: nil)
     escaped = string.split('|').map { |agent| Regexp.escape(agent) }.join('|')
-    Regexp.new(escaped)
+
+    if type == :real && Rails.env == "test"
+      # we need this bypass so we properly render views
+      escaped << "|Rails Testing"
+    end
+
+    Regexp.new(escaped, Regexp::IGNORECASE)
   end
 
   def self.crawler?(user_agent)
+    return true if user_agent.nil?
+
     # this is done to avoid regenerating regexes
+    @non_crawler_matchers ||= {}
     @matchers ||= {}
-    matcher = (@matchers[SiteSetting.crawler_user_agents] ||= to_matcher(SiteSetting.crawler_user_agents))
-    matcher.match?(user_agent)
+
+    possibly_real = (@non_crawler_matchers[SiteSetting.non_crawler_user_agents] ||= to_matcher(SiteSetting.non_crawler_user_agents, type: :real))
+
+    if user_agent.match?(possibly_real)
+      known_bots = (@matchers[SiteSetting.crawler_user_agents] ||= to_matcher(SiteSetting.crawler_user_agents))
+      user_agent.match?(known_bots)
+    else
+      true
+    end
+
   end
 end
diff --git a/lib/demon/base.rb b/lib/demon/base.rb
index 188a27e9fe..af4a73bb3c 100644
--- a/lib/demon/base.rb
+++ b/lib/demon/base.rb
@@ -7,10 +7,10 @@ class Demon::Base
     @demons
   end
 
-  def self.start(count = 1)
+  def self.start(count = 1, verbose: false)
     @demons ||= {}
     count.times do |i|
-      (@demons["#{prefix}_#{i}"] ||= new(i)).start
+      (@demons["#{prefix}_#{i}"] ||= new(i, verbose: verbose)).start
     end
   end
 
@@ -38,16 +38,18 @@ class Demon::Base
   attr_reader :pid, :parent_pid, :started, :index
   attr_accessor :stop_timeout
 
-  def initialize(index)
+  def initialize(index, rails_root: nil, parent_pid: nil, verbose: false)
     @index = index
     @pid = nil
-    @parent_pid = Process.pid
+    @parent_pid = parent_pid || Process.pid
     @started = false
     @stop_timeout = 10
+    @rails_root = rails_root || Rails.root
+    @verbose = verbose
   end
 
   def pid_file
-    "#{Rails.root}/tmp/pids/#{self.class.prefix}_#{@index}.pid"
+    "#{@rails_root}/tmp/pids/#{self.class.prefix}_#{@index}.pid"
   end
 
   def alive?(pid = nil)
@@ -153,8 +155,15 @@ class Demon::Base
 
   private
 
+  def verbose(msg)
+    if @verbose
+      puts msg
+    end
+  end
+
   def write_pid_file
-    FileUtils.mkdir_p(Rails.root + "tmp/pids")
+    verbose("writing pid file #{pid_file} for #{@pid}")
+    FileUtils.mkdir_p(@rails_root + "tmp/pids")
     File.open(pid_file, 'w') do |f|
       f.write(@pid)
     end
@@ -190,7 +199,7 @@ class Demon::Base
   end
 
   def establish_app
-    Discourse.after_fork
+    Discourse.after_fork if defined?(Discourse)
 
     Signal.trap("HUP") do
       begin
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 66ce5c3d76..4a558224c6 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -446,6 +446,10 @@ module Discourse
   # report a warning maintaining backtrack for logster
   def self.warn_exception(e, message: "", env: nil)
     if Rails.logger.respond_to? :add_with_opts
+
+      env ||= {}
+      env[:current_db] ||= RailsMultisite::ConnectionManagement.current_db
+
       # logster
       Rails.logger.add_with_opts(
         ::Logger::Severity::WARN,
@@ -505,7 +509,7 @@ module Discourse
   def self.reset_active_record_cache_if_needed(e)
     last_cache_reset = Discourse.last_ar_cache_reset
     if e && e.message =~ /UndefinedColumn/ && (last_cache_reset.nil? || last_cache_reset < 30.seconds.ago)
-      Rails.logger.warn "Clear Active Record cache cause schema appears to have changed!"
+      Rails.logger.warn "Clearing Active Record cache, this can happen if schema changed while site is running or in a multisite various databases are running different schemas. Consider running rake multisite:migrate."
       Discourse.last_ar_cache_reset = Time.zone.now
       Discourse.reset_active_record_cache
     end
diff --git a/lib/discourse_diff.rb b/lib/discourse_diff.rb
index 91e4115fed..c1971ed710 100644
--- a/lib/discourse_diff.rb
+++ b/lib/discourse_diff.rb
@@ -85,7 +85,7 @@ class DiscourseDiff
       i += 1
     end
 
-    "<div class=\"span8\">#{left.join}</div><div class=\"span8 offset1\">#{right.join}</div>"
+    "<div class=\"revision-content\">#{left.join}</div><div class=\"revision-content\">#{right.join}</div>"
   end
 
   def side_by_side_markdown
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index afe8009f8c..e46cf891fd 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -14,6 +14,7 @@ class DiscoursePluginRegistry
     attr_writer :handlebars
     attr_writer :serialized_current_user_fields
     attr_writer :seed_data
+    attr_writer :locales
     attr_accessor :custom_html
 
     def plugins
@@ -65,6 +66,10 @@ class DiscoursePluginRegistry
       @seed_data ||= HashWithIndifferentAccess.new({})
     end
 
+    def locales
+      @locales ||= HashWithIndifferentAccess.new({})
+    end
+
     def html_builders
       @html_builders ||= {}
     end
@@ -92,6 +97,10 @@ class DiscoursePluginRegistry
     self.class.stylesheets << filename
   end
 
+  def self.register_locale(locale, options = {})
+    self.locales[locale] = options
+  end
+
   def register_archetype(name, options = {})
     Archetype.register(name, options)
   end
@@ -171,6 +180,10 @@ class DiscoursePluginRegistry
     result.uniq
   end
 
+  def locales
+    self.class.locales
+  end
+
   def javascripts
     self.class.javascripts
   end
@@ -207,6 +220,7 @@ class DiscoursePluginRegistry
     self.desktop_stylesheets = nil
     self.sass_variables = nil
     self.handlebars = nil
+    self.locales = nil
   end
 
   def self.reset!
@@ -222,6 +236,7 @@ class DiscoursePluginRegistry
     html_builders.clear
     vendored_pretty_text.clear
     seed_path_builders.clear
+    locales.clear
   end
 
   def self.setup(plugin_class)
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 1cf9754b25..19389398ca 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -39,6 +39,8 @@ module Email
     attr_reader :mail
     attr_reader :message_id
 
+    COMMON_ENCODINGS ||= [-"utf-8", -"windows-1252", -"iso-8859-1"]
+
     def self.formats
       @formats ||= Enum.new(plaintext: 1,
                             markdown: 2)
@@ -47,7 +49,11 @@ module Email
     def initialize(mail_string, opts = {})
       raise EmptyEmailError if mail_string.blank?
       @staged_users = []
-      @raw_email = try_to_encode(mail_string, "UTF-8") || try_to_encode(mail_string, "ISO-8859-1") || mail_string
+      @raw_email = mail_string
+      COMMON_ENCODINGS.each do |encoding|
+        fixed = try_to_encode(mail_string, encoding)
+        break @raw_email = fixed if fixed.present?
+      end
       @mail = Mail.new(@raw_email)
       @message_id = @mail.message_id.presence || Digest::MD5.hexdigest(mail_string)
       @opts = opts
@@ -105,10 +111,10 @@ module Email
 
       raise NoBodyDetectedError if body.blank? && attachments.empty?
 
-      if is_auto_generated?
+      if is_auto_generated? && !sent_to_mailinglist_mirror?
         @incoming_email.update_columns(is_auto_generated: true)
 
-        if SiteSetting.block_auto_generated_emails? && !sent_to_mailinglist_mirror?
+        if SiteSetting.block_auto_generated_emails?
           raise AutoGeneratedEmailError
         end
       end
@@ -239,7 +245,7 @@ module Email
 
       if text.present?
         text = trim_discourse_markers(text)
-        text, elided_text = EmailReplyTrimmer.trim(text, true)
+        text, elided_text = trim_reply_and_extract_elided(text)
 
         if @opts[:convert_plaintext] || sent_to_mailinglist_mirror?
           text_content_type ||= ""
@@ -255,7 +261,7 @@ module Email
       markdown, elided_markdown = if html.present?
         markdown = HtmlToMarkdown.new(html, keep_img_tags: true, keep_cid_imgs: true).to_markdown
         markdown = trim_discourse_markers(markdown)
-        EmailReplyTrimmer.trim(markdown, true)
+        trim_reply_and_extract_elided(markdown)
       end
 
       if text.blank? || (SiteSetting.incoming_email_prefer_html && markdown.present?)
@@ -265,6 +271,11 @@ module Email
       end
     end
 
+    def trim_reply_and_extract_elided(text)
+      return [text, ""] if @opts[:skip_trimming]
+      EmailReplyTrimmer.trim(text, true)
+    end
+
     def fix_charset(mail_part)
       return nil if mail_part.blank? || mail_part.body.blank?
 
@@ -273,7 +284,7 @@ module Email
       return nil if string.blank?
 
       # common encodings
-      encodings = ["UTF-8", "ISO-8859-1"]
+      encodings = COMMON_ENCODINGS.dup
       encodings.unshift(mail_part.charset) if mail_part.charset.present?
 
       # mail (>=2.5) decodes mails with 8bit transfer encoding to utf-8, so
@@ -451,7 +462,7 @@ module Email
         category = destination[:obj]
 
         raise StrangersNotAllowedError    if user.staged? && !category.email_in_allow_strangers
-        raise InsufficientTrustLevelError if !user.has_trust_level?(SiteSetting.email_in_min_trust)
+        raise InsufficientTrustLevelError if !user.has_trust_level?(SiteSetting.email_in_min_trust) && !sent_to_mailinglist_mirror?
 
         create_topic(user: user,
                      raw: body,
@@ -753,6 +764,11 @@ module Email
         options[:raw] << Email::Receiver.elided_html(options[:elided])
       end
 
+      if sent_to_mailinglist_mirror?
+        options[:skip_validations] = true
+        options[:skip_guardian] = true
+      end
+
       user = options.delete(:user)
       result = NewPostManager.new(user, options).perform
 
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index b5835bf3af..1f021752e4 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -5754,7 +5754,7 @@
     },
     {
       "code": "1f92b",
-      "name": "sushing_face"
+      "name": "shushing_face"
     },
     {
       "code": "1f92d",
diff --git a/lib/emoji/groups.json b/lib/emoji/groups.json
index 5b313dfc11..82766edadb 100644
--- a/lib/emoji/groups.json
+++ b/lib/emoji/groups.json
@@ -325,7 +325,7 @@
         "diversity": false
       },
       {
-        "name": "sushing_face",
+        "name": "shushing_face",
         "diversity": false
       },
       {
diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb
index 0e3f824679..295515ea2a 100644
--- a/lib/excerpt_parser.rb
+++ b/lib/excerpt_parser.rb
@@ -18,6 +18,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     @keep_onebox_source = options[:keep_onebox_source] == true
     @remap_emoji = options[:remap_emoji] == true
     @start_excerpt = false
+    @in_details_depth = 0
     @summary_contents = ""
     @detail_contents = ""
   end
@@ -91,31 +92,37 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
     when "aside"
       attributes = Hash[*attributes.flatten]
+      unless @keep_onebox_source && attributes['class'].include?('onebox')
+        @in_quote = true
+      end
 
-        unless @keep_onebox_source && attributes['class'].include?('onebox')
-          @in_quote = true
-        end
     when 'article'
       if @keep_onebox_source && attributes.include?(['class', 'onebox-body'])
         @in_quote = true
       end
+
     when "div", "span"
       if attributes.include?(["class", "excerpt"])
         @excerpt = ""
         @current_length = 0
         @start_excerpt = true
       end
-        # Preserve spoilers
-        if attributes.include?(["class", "spoiler"])
-          include_tag("span", attributes)
-          @in_spoiler = true
-        end
+      # Preserve spoilers
+      if attributes.include?(["class", "spoiler"])
+        include_tag("span", attributes)
+        @in_spoiler = true
+      end
+
     when "details"
-      @detail_contents = ""
-      @in_details = true
+      @detail_contents = "" if @in_details_depth == 0
+      @in_details_depth += 1
+
     when "summary"
-      @summary_contents = ""
-      @in_summary = true
+      if @in_details_depth == 1 && !@in_summary
+        @summary_contents = ""
+        @in_summary = true
+      end
+
     end
   end
 
@@ -135,16 +142,17 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     when "aside"
       @in_quote = false
     when "details"
-      @in_details = false
-      full = "<details><summary>#{clean(@summary_contents)}</summary>#{clean(@detail_contents)}</details>"
-      if @current_length + full.length > @length
-        @excerpt << "<details class='disabled'><summary>#{@summary_contents[0..@length]}</summary></details>"
-      else
-        @excerpt << full
+      @in_details_depth -= 1
+      if @in_details_depth == 0
+        full = "<details><summary>#{clean(@summary_contents)}</summary>#{clean(@detail_contents)}</details>"
+        if @current_length + full.length > @length
+          @excerpt << "<details class='disabled'><summary>#{@summary_contents[0..@length]}</summary></details>"
+        else
+          @excerpt << full
+        end
       end
-
     when "summary"
-      @in_summary = false
+      @in_summary = false if @in_details_depth == 1
     when "div", "span"
       throw :done if @start_excerpt
       characters("</span>", false, false, false) if @in_spoiler
@@ -161,7 +169,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
     # we call length on this so might as well ensure we have a string
     string = string.to_s
-    if @in_details
+    if @in_details_depth > 0
       if @in_summary
         @summary_contents << string
       else
diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index f30882d4d6..aa602c2c79 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -131,7 +131,7 @@ module FileStore
       FileUtils.mkdir_p(dir) unless Dir[dir].present?
       FileUtils.cp(file.path, path)
       # keep latest 500 files
-      `ls -tr #{CACHE_DIR} | head -n +#{CACHE_MAXIMUM_SIZE} | xargs rm -f`
+      `ls -tr #{CACHE_DIR} | head -n -#{CACHE_MAXIMUM_SIZE} | xargs rm -f`
     end
 
     private
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index d28fc0d3c7..3c999e8a0e 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -51,12 +51,17 @@ class FinalDestination
     @cookie = nil
     @limited_ips = []
     @verbose = @opts[:verbose] || false
+    @timeout = @opts[:timeout] || nil
   end
 
   def self.connection_timeout
     20
   end
 
+  def timeout
+    @timeout || FinalDestination.connection_timeout
+  end
+
   def redirected?
     @limit < @opts[:max_redirects]
   end
@@ -75,12 +80,58 @@ class FinalDestination
 
   def small_get(headers)
     Net::HTTP.start(@uri.host, @uri.port, use_ssl: @uri.is_a?(URI::HTTPS)) do |http|
-      http.open_timeout = FinalDestination.connection_timeout
-      http.read_timeout = FinalDestination.connection_timeout
+      http.open_timeout = timeout
+      http.read_timeout = timeout
       http.request_get(@uri.request_uri, headers)
     end
   end
 
+  # this is a new interface for simply getting
+  # N bytes accounting for all internal logic
+  def get(uri = @uri, redirects = @limit, extra_headers: {}, &blk)
+    raise "Must specify block" unless block_given?
+
+    if uri && uri.port == 80 && FinalDestination.is_https_domain?(uri.hostname)
+      uri.scheme = "https"
+      uri = URI(uri.to_s)
+    end
+
+    unless validate_uri
+      return nil
+    end
+
+    result, (location, cookie) = safe_get(uri, &blk)
+
+    if result == :redirect && (redirects == 0 || !location)
+      return nil
+    end
+
+    if result == :redirect
+      old_port = uri.port
+
+      location = "#{uri.scheme}://#{uri.host}#{location}" if location[0] == "/"
+      uri = URI(location) rescue nil
+
+      # https redirect, so just cache that whole new domain is https
+      if old_port == 80 && uri&.port == 443 && (URI::HTTPS === uri)
+        FinalDestination.cache_https_domain(uri.hostname)
+      end
+
+      return nil if !uri
+
+      extra = nil
+      if cookie
+        extra = { 'Cookie' => cookie }
+      end
+
+      get(uri, redirects - 1, extra_headers: extra, &blk)
+    elsif result == :ok
+      uri.to_s
+    else
+      nil
+    end
+  end
+
   def resolve
     if @uri && @uri.port == 80 && FinalDestination.is_https_domain?(@uri.hostname)
       @uri.scheme = "https"
@@ -108,7 +159,7 @@ class FinalDestination
     headers = request_headers
     response = Excon.public_send(@http_verb,
       @uri.to_s,
-      read_timeout: FinalDestination.connection_timeout,
+      read_timeout: timeout,
       headers: headers
     )
 
@@ -135,7 +186,7 @@ class FinalDestination
         headers['set-cookie'] = cookie_val.join
       end
 
-      # TODO this is confusing why grap location for anything not
+      # TODO this is confusing why grab location for anything not
       # between 300-400 ?
       if location_val = get_response.get_fields('location')
         headers['location'] = location_val.join
@@ -284,4 +335,69 @@ class FinalDestination
     nil
   end
 
+  protected
+
+  def safe_get(uri)
+
+    result = nil
+    unsafe_close = false
+
+    safe_session(uri) do |http|
+
+      headers = request_headers.merge(
+        'Accept-Encoding' => 'gzip',
+        'Host' => uri.host
+      )
+
+      req = Net::HTTP::Get.new(uri.request_uri, headers)
+
+      http.request(req) do |resp|
+        if Net::HTTPRedirection === resp
+          result = :redirect, [resp['location'], resp['Set-Cookie']]
+        end
+
+        if Net::HTTPSuccess === resp
+
+          resp.decode_content = true
+          resp.read_body { |chunk|
+            read_next = true
+
+            catch(:done) do
+              if read_next
+                read_next = false
+                yield resp, chunk, uri
+                read_next = true
+              end
+            end
+
+            # no clean way of finishing abruptly cause
+            # response likes reading till the end
+            if !read_next
+              unsafe_close = true
+              http.finish
+              raise StandardError
+            end
+          }
+          result = :ok
+        end
+      end
+    end
+
+    result
+  rescue StandardError
+    if unsafe_close
+      :ok
+    else
+      raise
+    end
+  end
+
+  def safe_session(uri)
+    Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == "https")) do |http|
+      http.read_timeout = timeout
+      http.open_timeout = timeout
+      yield http
+    end
+  end
+
 end
diff --git a/lib/flag_query.rb b/lib/flag_query.rb
index f8051853c6..15b1591d3f 100644
--- a/lib/flag_query.rb
+++ b/lib/flag_query.rb
@@ -145,6 +145,16 @@ module FlagQuery
       post_actions = post_actions.where("topics.id = ?", opts[:topic_id])
     end
 
+    if opts[:user_id]
+      post_actions = post_actions.where("posts.user_id = ?", opts[:user_id])
+    end
+
+    if opts[:filter] == 'without_custom'
+      return post_actions.where(
+        'post_action_type_id' => PostActionType.flag_types_without_custom.values
+      )
+    end
+
     if opts[:filter] == "old"
       post_actions.where("post_actions.disagreed_at IS NOT NULL OR
                           post_actions.deferred_at IS NOT NULL OR
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 92f0b80b31..fe737f5257 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -39,6 +39,13 @@ module I18n
         if @loaded_locales.empty?
           # load all rb files
           I18n.backend.load_translations(I18n.load_path.grep(/\.rb$/))
+
+          # load plural rules from plugins
+          DiscoursePluginRegistry.locales.each do |locale, options|
+            if options[:plural]
+              I18n.backend.store_translations(locale, i18n: { plural: options[:plural] })
+            end
+          end
         end
 
         # load it
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 9792f468f3..82f66a7016 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -70,12 +70,13 @@ class Guardian
   def is_developer?
     @user &&
     is_admin? &&
-    (Rails.env.development? ||
+    (
+      Rails.env.development? ||
+      Developer.user_ids.include?(@user.id) ||
       (
         Rails.configuration.respond_to?(:developer_emails) &&
         Rails.configuration.developer_emails.include?(@user.email)
-      ) ||
-      Developer.user_ids.include?(@user.id)
+      )
     )
   end
 
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index d4ce94fdff..5996f84812 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -46,6 +46,10 @@ module PostGuardian
     !!result
   end
 
+  def can_lock_post?(post)
+    can_see_post?(post) && is_staff?
+  end
+
   def can_defer_flags?(post)
     can_see_post?(post) && is_staff? && post
   end
@@ -80,6 +84,9 @@ module PostGuardian
 
   # Creating Method
   def can_create_post?(parent)
+
+    return false if !SiteSetting.enable_system_message_replies? && parent.try(:subtype) == "system_message"
+
     (!SpamRule::AutoSilence.silence?(@user) || (!!parent.try(:private_message?) && parent.allowed_users.include?(@user))) && (
       !parent ||
       !parent.category ||
@@ -95,6 +102,9 @@ module PostGuardian
 
     return true if is_admin?
 
+    # Must be staff to edit a locked post
+    return false if post.locked? && !is_staff?
+
     if is_staff? || @user.has_trust_level?(TrustLevel[4])
       return can_create_post?(post.topic)
     end
diff --git a/lib/hijack.rb b/lib/hijack.rb
index 026077dbb6..9814ea4bef 100644
--- a/lib/hijack.rb
+++ b/lib/hijack.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_dependency 'method_profiler'
+
 # This module allows us to hijack a request and send it to the client in the deferred job queue
 # For cases where we are making remote calls like onebox or proxying files and so on this helps
 # free up a unicorn worker while the remote IO is happening
@@ -13,20 +15,27 @@ module Hijack
       request.env['discourse.request_tracker.skip'] = true
       request_tracker = request.env['discourse.request_tracker']
 
-      # unicorn will re-cycle env, this ensures we keep the original copy
-      env_copy = request.env.dup
-      request_copy = ActionDispatch::Request.new(env_copy)
+      # in the past unicorn would recycle env, this is not longer the case
+      env = request.env
 
-      transfer_timings = MethodProfiler.transfer if defined? MethodProfiler
+      # rack may clean up tempfiles unless we trick it and take control
+      tempfiles = env[Rack::RACK_TEMPFILES]
+      env[Rack::RACK_TEMPFILES] = nil
+      request_copy = ActionDispatch::Request.new(env)
+
+      transfer_timings = MethodProfiler.transfer
 
       io = hijack.call
 
+      # duplicate headers so other middleware does not mess with it
+      # on the way down the stack
+      original_headers = response.headers.dup
+
       Scheduler::Defer.later("hijack #{params["controller"]} #{params["action"]}") do
 
-        MethodProfiler.start(transfer_timings) if defined? MethodProfiler
-
+        MethodProfiler.start(transfer_timings)
         begin
-          Thread.current[Logster::Logger::LOGSTER_ENV] = env_copy
+          Thread.current[Logster::Logger::LOGSTER_ENV] = env
           # do this first to confirm we have a working connection
           # before doing any work
           io.write "HTTP/1.1 "
@@ -38,12 +47,15 @@ module Hijack
           instance.response = response
 
           instance.request = request_copy
+          original_headers&.each do |k, v|
+            instance.response.headers[k] = v
+          end
 
           begin
             instance.instance_eval(&blk)
           rescue => e
             # TODO we need to reuse our exception handling in ApplicationController
-            Discourse.warn_exception(e, message: "Failed to process hijacked response correctly", env: env_copy)
+            Discourse.warn_exception(e, message: "Failed to process hijacked response correctly", env: env)
           end
 
           unless instance.response_body || response.committed?
@@ -56,16 +68,21 @@ module Hijack
 
           headers = response.headers
           # add cors if needed
-          if cors_origins = env_copy[Discourse::Cors::ORIGINS_ENV]
-            Discourse::Cors.apply_headers(cors_origins, env_copy, headers)
+          if cors_origins = env[Discourse::Cors::ORIGINS_ENV]
+            Discourse::Cors.apply_headers(cors_origins, env, headers)
           end
 
+          headers['Content-Type'] ||= response.content_type || "text/plain"
           headers['Content-Length'] = body.bytesize
-          headers['Content-Type'] = response.content_type || "text/plain"
           headers['Connection'] = "close"
 
-          status_string = Rack::Utils::HTTP_STATUS_CODES[instance.status.to_i] || "Unknown"
-          io.write "#{instance.status} #{status_string}\r\n"
+          status_string = Rack::Utils::HTTP_STATUS_CODES[response.status.to_i] || "Unknown"
+          io.write "#{response.status} #{status_string}\r\n"
+
+          timings = MethodProfiler.stop
+          if timings && duration = timings[:total_duration]
+            headers["X-Runtime"] = "#{"%0.6f" % duration}"
+          end
 
           headers.each do |name, val|
             io.write "#{name}: #{val}\r\n"
@@ -77,16 +94,17 @@ module Hijack
           # happens if client terminated before we responded, ignore
           io = nil
         ensure
-
+          MethodProfiler.clear
           Thread.current[Logster::Logger::LOGSTER_ENV] = nil
 
           io.close if io rescue nil
 
           if request_tracker
-            status = instance.status rescue 500
-            timings = MethodProfiler.stop if defined? MethodProfiler
-            request_tracker.log_request_info(env_copy, [status, headers || {}, []], timings)
+            status = response.status rescue 500
+            request_tracker.log_request_info(env, [status, headers || {}, []], timings)
           end
+
+          tempfiles&.each(&:close!)
         end
       end
       # not leaked out, we use 418 ... I am a teapot to denote that we are hijacked
diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index 375b72b8cc..1f33dd60e0 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -25,7 +25,7 @@ module I18n
       end
 
       def fallbacks(locale)
-        [locale, SiteSetting.default_locale.to_sym, :en].uniq.compact
+        I18n.fallbacks[locale]
       end
 
       def exists?(locale, key)
diff --git a/lib/i18n/backend/fallback_locale_list.rb b/lib/i18n/backend/fallback_locale_list.rb
new file mode 100644
index 0000000000..6b4faf1bf1
--- /dev/null
+++ b/lib/i18n/backend/fallback_locale_list.rb
@@ -0,0 +1,11 @@
+module I18n
+  module Backend
+    # Configure custom fallback order
+    class FallbackLocaleList < Hash
+      def [](locale)
+        fallback_locale = LocaleSiteSetting.fallback_locale(locale)
+        [locale, fallback_locale, SiteSetting.default_locale.to_sym, :en].uniq.compact
+      end
+    end
+  end
+end
diff --git a/lib/import_export/base_exporter.rb b/lib/import_export/base_exporter.rb
index ff6cd2ed07..dec228fbc0 100644
--- a/lib/import_export/base_exporter.rb
+++ b/lib/import_export/base_exporter.rb
@@ -75,10 +75,10 @@ module ImportExport
       end
 
       user_ids.uniq!
-      return [] if user_ids.empty?
+      return User.none if user_ids.empty?
 
       users = User.where(id: user_ids)
-      export_users(users.to_a)
+      export_users(users)
     end
 
     def export_group_users!
@@ -118,10 +118,9 @@ module ImportExport
       return if @export_data[:topics].blank?
       topic_ids = @export_data[:topics].pluck(:id)
 
-      users = User.joins(:topics).where('topics.id IN (?)', topic_ids).to_a
-      users.uniq!
+      users = User.joins(:posts).where('posts.topic_id IN (?)', topic_ids).distinct
 
-      export_users(users.to_a)
+      export_users(users)
     end
 
     def export_topic_users!
@@ -132,9 +131,9 @@ module ImportExport
 
     def export_users(users)
       data = []
-      users.reject! { |u| u.id == Discourse::SYSTEM_USER_ID }
 
-      users.each do |u|
+      users.find_each do |u|
+        next if u.id == Discourse::SYSTEM_USER_ID
         x = USER_ATTRS.inject({}) { |h, a| h[a] = u.send(a); h; }
         x.merge(bio_raw: u.user_profile.bio_raw,
                 website: u.user_profile.website,
diff --git a/lib/import_export/importer.rb b/lib/import_export/importer.rb
index 2e982a089e..94502a348e 100644
--- a/lib/import_export/importer.rb
+++ b/lib/import_export/importer.rb
@@ -32,6 +32,8 @@ module ImportExport
     def import_users
       return if @users.blank?
 
+      puts "Importing users..."
+
       @users.each do |u|
         import_id = "#{u[:id]}#{import_source}"
         existing = User.with_email(u[:email]).first
@@ -52,6 +54,8 @@ module ImportExport
     def import_groups
       return if @groups.blank?
 
+      puts "Importing groups..."
+
       @groups.each do |group_data|
         g = group_data.dup
         user_ids = g.delete(:user_ids)
@@ -68,6 +72,8 @@ module ImportExport
     def import_categories
       return if @categories.blank?
 
+      puts "Importing categories..."
+
       import_ids = @categories.collect { |c| "#{c[:id]}#{import_source}" }
       existing_categories = CategoryCustomField.where("name = 'import_id' AND value IN (?)", import_ids).select(:category_id, :value).to_a
       existing_category_ids = existing_categories.pluck(:value)
@@ -106,6 +112,8 @@ module ImportExport
     def import_topics
       return if @topics.blank?
 
+      puts "Importing topics...", ''
+
       @topics.each do |t|
         puts ""
         print t[:title]
diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb
index 4c71cba888..ccc2b547fe 100644
--- a/lib/inline_oneboxer.rb
+++ b/lib/inline_oneboxer.rb
@@ -2,6 +2,8 @@ require_dependency 'retrieve_title'
 
 class InlineOneboxer
 
+  MIN_TITLE_LENGTH = 2
+
   def initialize(urls, opts = nil)
     @urls = urls
     @opts = opts || {}
@@ -46,6 +48,7 @@ class InlineOneboxer
         uri.hostname.present? &&
         (always_allow || domains.include?(uri.hostname)) &&
         title = RetrieveTitle.crawl(url)
+        title = nil if title && title.length < MIN_TITLE_LENGTH
         return onebox_for(url, title, opts)
       end
     end
@@ -58,7 +61,7 @@ class InlineOneboxer
     def self.onebox_for(url, title, opts)
       onebox = {
         url: url,
-        title: Emoji.gsub_emoji_to_unicode(title)
+        title: title && Emoji.gsub_emoji_to_unicode(title)
       }
       unless opts[:skip_cache]
         Rails.cache.write(cache_key(url), onebox, expires_in: 1.day)
diff --git a/lib/javascripts/moment_locale/ar.js b/lib/javascripts/moment_locale/ar.js
index d263e4c4f8..dbe4e7dd94 100644
--- a/lib/javascripts/moment_locale/ar.js
+++ b/lib/javascripts/moment_locale/ar.js
@@ -58,18 +58,18 @@ var pluralize = function (u) {
     };
 };
 var months = [
-    'كانون الثاني يناير',
-    'شباط فبراير',
-    'آذار مارس',
-    'نيسان أبريل',
-    'أيار مايو',
-    'حزيران يونيو',
-    'تموز يوليو',
-    'آب أغسطس',
-    'أيلول سبتمبر',
-    'تشرين الأول أكتوبر',
-    'تشرين الثاني نوفمبر',
-    'كانون الأول ديسمبر'
+    'يناير',
+    'فبراير',
+    'مارس',
+    'أبريل',
+    'مايو',
+    'يونيو',
+    'يوليو',
+    'أغسطس',
+    'سبتمبر',
+    'أكتوبر',
+    'نوفمبر',
+    'ديسمبر'
 ];
 
 var ar = moment.defineLocale('ar', {
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 4d1b15e8a5..af8d5fbfac 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -85,6 +85,7 @@ module JsLocaleHelper
   end
 
   def self.load_translations_merged(*locales)
+    locales = locales.compact
     @loaded_merges ||= {}
     @loaded_merges[locales.join('-')] ||= begin
       all_translations = {}
@@ -101,9 +102,10 @@ module JsLocaleHelper
   end
 
   def self.translations_for(locale_str)
-    current_locale = I18n.locale
-    locale_sym     = locale_str.to_sym
-    site_locale    = SiteSetting.default_locale.to_sym
+    current_locale  = I18n.locale
+    locale_sym      = locale_str.to_sym
+    site_locale     = SiteSetting.default_locale.to_sym
+    fallback_locale = LocaleSiteSetting.fallback_locale(locale_str)
 
     I18n.locale = locale_sym
 
@@ -113,9 +115,9 @@ module JsLocaleHelper
       elsif locale_sym == :en
         load_translations(locale_sym)
       elsif locale_sym == site_locale || site_locale == :en
-        load_translations_merged(locale_sym, :en)
+        load_translations_merged(locale_sym, fallback_locale, :en)
       else
-        load_translations_merged(locale_sym, site_locale, :en)
+        load_translations_merged(locale_sym, fallback_locale, site_locale, :en)
       end
 
     I18n.locale = current_locale
@@ -125,22 +127,25 @@ module JsLocaleHelper
 
   def self.output_locale(locale)
     locale_str = locale.to_s
+    fallback_locale_str = LocaleSiteSetting.fallback_locale(locale_str)&.to_s
     translations = Marshal.load(Marshal.dump(translations_for(locale_str)))
 
     message_formats = strip_out_message_formats!(translations[locale_str]['js'])
     message_formats.merge!(strip_out_message_formats!(translations[locale_str]['admin_js']))
-    result = generate_message_format(message_formats, locale_str)
+    mf_locale, mf_filename = find_message_format_locale([locale_str], true)
+    result = generate_message_format(message_formats, mf_locale, mf_filename)
 
-    translations.keys.each do |locale|
-      translations[locale].keys.each do |k|
-        translations[locale].delete(k) unless k == "js"
+    translations.keys.each do |l|
+      translations[l].keys.each do |k|
+        translations[l].delete(k) unless k == "js"
       end
     end
 
     # I18n
     result << "I18n.translations = #{translations.to_json};\n"
     result << "I18n.locale = '#{locale_str}';\n"
-    result << "I18n.pluralizationRules.#{locale_str} = MessageFormat.locale.#{locale_str};\n" if locale_str != "en"
+    result << "I18n.fallbackLocale = '#{fallback_locale_str}';\n" if fallback_locale_str && fallback_locale_str != "en"
+    result << "I18n.pluralizationRules.#{locale_str} = MessageFormat.locale.#{mf_locale};\n" if mf_locale != "en"
 
     # moment
     result << File.read("#{Rails.root}/lib/javascripts/moment.js")
@@ -150,6 +155,41 @@ module JsLocaleHelper
     result
   end
 
+  def self.find_moment_locale(locale_chain)
+    path = "#{Rails.root}/lib/javascripts/moment_locale"
+
+    # moment.js uses a different naming scheme for locale files
+    locale_chain = locale_chain.map { |l| l.tr('_', '-').downcase }
+
+    find_locale(locale_chain, path, :moment_js, false)
+  end
+
+  def self.find_message_format_locale(locale_chain, fallback_to_english)
+    path = "#{Rails.root}/lib/javascripts/locale"
+    find_locale(locale_chain, path, :message_format, fallback_to_english)
+  end
+
+  def self.find_locale(locale_chain, path, type, fallback_to_english)
+    locale_chain.each do |locale|
+      plugin_locale = DiscoursePluginRegistry.locales[locale]
+      return plugin_locale[type] if plugin_locale&.has_key?(type)
+
+      filename = File.join(path, "#{locale}.js")
+      return [locale, filename] if File.exist?(filename)
+    end
+
+    # try again, but this time only with the language itself
+    locale_chain = locale_chain.map { |l| l.split(/[-_]/)[0] }
+      .uniq.reject { |l| locale_chain.include?(l) }
+    unless locale_chain.empty?
+      locale_data = find_locale(locale_chain, path, type, false)
+      return locale_data if locale_data
+    end
+
+    # English should alyways work
+    ["en", File.join(path, "en.js")] if fallback_to_english
+  end
+
   def self.moment_formats
     result = ""
     result << moment_format_function('short_date_no_year')
@@ -163,23 +203,13 @@ module JsLocaleHelper
     "moment.fn.#{name.camelize(:lower)} = function(){ return this.format('#{format}'); };\n"
   end
 
-  def self.moment_locale(locale_str)
-    # moment.js uses a different naming scheme for locale files
-    locale_str = locale_str.tr('_', '-').downcase
-    filename = "#{Rails.root}/lib/javascripts/moment_locale/#{locale_str}.js"
-
-    # try the language without the territory
-    locale_str = locale_str.split("-")[0]
-    filename = "#{Rails.root}/lib/javascripts/moment_locale/#{locale_str}.js" unless File.exists?(filename)
-
-    File.exists?(filename) ? File.read(filename) << "\n" : ""
+  def self.moment_locale(locale)
+    _, filename = find_moment_locale([locale])
+    filename && File.exist?(filename) ? File.read(filename) << "\n" : ""
   end
 
-  def self.generate_message_format(message_formats, locale_str)
-    formats = message_formats.map { |k, v| k.inspect << " : " << compile_message_format(locale_str, v) }.join(", ")
-
-    filename = "#{Rails.root}/lib/javascripts/locale/#{locale_str}.js"
-    filename = "#{Rails.root}/lib/javascripts/locale/en.js" unless File.exists?(filename)
+  def self.generate_message_format(message_formats, locale, filename)
+    formats = message_formats.map { |k, v| k.inspect << " : " << compile_message_format(filename, locale, v) }.join(", ")
 
     result = "MessageFormat = {locale: {}};\n"
     result << "I18n._compiledMFs = {#{formats}};\n"
@@ -203,10 +233,9 @@ module JsLocaleHelper
     end
   end
 
-  def self.compile_message_format(locale, format)
+  def self.compile_message_format(path, locale, format)
     with_context do |ctx|
-      path = "#{Rails.root}/lib/javascripts/locale/#{locale}.js"
-      ctx.load(path) if File.exists?(path)
+      ctx.load(path) if File.exist?(path)
       ctx.eval("mf = new MessageFormat('#{locale}');")
       ctx.eval("mf.precompile(mf.parse(#{format.inspect}))")
     end
diff --git a/lib/method_profiler.rb b/lib/method_profiler.rb
index c96a7f5957..9ad59b007f 100644
--- a/lib/method_profiler.rb
+++ b/lib/method_profiler.rb
@@ -37,6 +37,10 @@ class MethodProfiler
     }
   end
 
+  def self.clear
+    Thread.current[:_method_profiler] = nil
+  end
+
   def self.stop
     finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     if data = Thread.current[:_method_profiler]
diff --git a/lib/middleware/discourse_public_exceptions.rb b/lib/middleware/discourse_public_exceptions.rb
new file mode 100644
index 0000000000..4770b42793
--- /dev/null
+++ b/lib/middleware/discourse_public_exceptions.rb
@@ -0,0 +1,41 @@
+# since all the rescue from clauses are not caught by the application controller for matches
+# we need to handle certain exceptions here
+module Middleware
+  class DiscoursePublicExceptions < ::ActionDispatch::PublicExceptions
+
+    def initialize(path)
+      super
+    end
+
+    def call(env)
+      # this is so so gnarly
+      # sometimes we leak out exceptions prior to creating a controller instance
+      # this can happen if we have an exception in a route constraint in some cases
+      # this code re-dispatches the exception to our application controller so we can
+      # properly translate the exception to a page
+      exception = env["action_dispatch.exception"]
+      response = ActionDispatch::Response.new
+
+      if exception
+        begin
+          fake_controller = ApplicationController.new
+          fake_controller.response = response
+          fake_controller.request = ActionDispatch::Request.new(env)
+
+          if ApplicationController.rescue_with_handler(exception, object: fake_controller)
+            body = response.body
+            if String === body
+              body = [body]
+            end
+            return [response.status, response.headers, body]
+          end
+        rescue => e
+          Discourse.warn_exception(e, message: "Failed to handle exception in exception app middleware")
+        end
+
+      end
+      super
+    end
+
+  end
+end
diff --git a/lib/middleware/omniauth_bypass_middleware.rb b/lib/middleware/omniauth_bypass_middleware.rb
new file mode 100644
index 0000000000..4ee40a4f5e
--- /dev/null
+++ b/lib/middleware/omniauth_bypass_middleware.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# omniauth loves spending lots cycles in its magic middleware stack
+# this middleware bypasses omniauth middleware and only hits it when needed
+class Middleware::OmniauthBypassMiddleware
+
+  def initialize(app, options = {})
+    @app = app
+
+    # if you need to test this and are having ssl issues see:
+    #  http://stackoverflow.com/questions/6756460/openssl-error-using-omniauth-specified-ssl-path-but-didnt-work
+    # OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if Rails.env.development?
+    @omniauth = OmniAuth::Builder.new(app) do
+      Discourse.authenticators.each do |authenticator|
+        authenticator.register_middleware(self)
+      end
+    end
+  end
+
+  def call(env)
+    if env["PATH_INFO"].start_with?("/auth")
+      @omniauth.call(env)
+    else
+      @app.call(env)
+    end
+  end
+
+end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 2e3fd707d6..6f802ec16f 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_dependency 'middleware/anonymous_cache'
+require_dependency 'method_profiler'
 
 class Middleware::RequestTracker
 
@@ -15,7 +16,6 @@ class Middleware::RequestTracker
   def self.register_detailed_request_logger(callback)
 
     unless @patched_instrumentation
-      require_dependency "method_profiler"
       MethodProfiler.patch(PG::Connection, [
         :exec, :async_exec, :exec_prepared, :send_query_prepared, :query
       ], :sql)
@@ -97,7 +97,7 @@ class Middleware::RequestTracker
       status: status,
       is_crawler: helper.is_crawler?,
       has_auth_cookie: helper.has_auth_cookie?,
-      is_background: request.path =~ /^\/message-bus\// || request.path == /\/topics\/timings/,
+      is_background: !!(request.path =~ /^\/message-bus\// || request.path =~ /\/topics\/timings/),
       is_mobile: helper.is_mobile?,
       track_view: track_view,
       timing: timing
@@ -134,26 +134,43 @@ class Middleware::RequestTracker
     end
 
     env["discourse.request_tracker"] = self
-    MethodProfiler.start if @@detailed_request_loggers
+    MethodProfiler.start
     result = @app.call(env)
-    info = MethodProfiler.stop if @@detailed_request_loggers
+    info = MethodProfiler.stop
+    # possibly transferred?
+    if info && (headers = result[1])
+      headers["X-Runtime"] = "%0.6f" % info[:total_duration]
+    end
     result
   ensure
     log_request_info(env, result, info) unless env["discourse.request_tracker.skip"]
   end
 
+  PRIVATE_IP = /^(127\.)|(192\.168\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(::1$)|([fF][cCdD])/
+
+  def is_private_ip?(ip)
+    ip = IPAddr.new(ip) rescue nil
+    !!(ip && ip.to_s.match?(PRIVATE_IP))
+  end
+
   def rate_limit(env)
+
     if (
-      GlobalSetting.max_requests_per_ip_mode == "block" ||
-      GlobalSetting.max_requests_per_ip_mode == "warn"
+      GlobalSetting.max_reqs_per_ip_mode == "block" ||
+      GlobalSetting.max_reqs_per_ip_mode == "warn" ||
+      GlobalSetting.max_reqs_per_ip_mode == "warn+block"
     )
 
       ip = Rack::Request.new(env).ip
 
+      if !GlobalSetting.max_reqs_rate_limit_on_private
+        return false if is_private_ip?(ip)
+      end
+
       limiter10 = RateLimiter.new(
         nil,
         "global_ip_limit_10_#{ip}",
-        GlobalSetting.max_requests_per_ip_per_10_seconds,
+        GlobalSetting.max_reqs_per_ip_per_10_seconds,
         10,
         global: true
       )
@@ -161,7 +178,7 @@ class Middleware::RequestTracker
       limiter60 = RateLimiter.new(
         nil,
         "global_ip_limit_60_#{ip}",
-        GlobalSetting.max_requests_per_ip_per_10_seconds,
+        GlobalSetting.max_reqs_per_ip_per_10_seconds,
         10,
         global: true
       )
@@ -172,9 +189,12 @@ class Middleware::RequestTracker
         type = 60
         limiter60.performed!
       rescue RateLimiter::LimitExceeded
-        if GlobalSetting.max_requests_per_ip_mode == "warn"
-          Rails.logger.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit")
-          false
+        if (
+          GlobalSetting.max_reqs_per_ip_mode == "warn" ||
+          GlobalSetting.max_reqs_per_ip_mode == "warn+block"
+        )
+          Rails.logger.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit, uri: #{env["REQUEST_URI"]}")
+          !(GlobalSetting.max_reqs_per_ip_mode == "warn")
         else
           true
         end
diff --git a/lib/onebox/engine/discourse_local_onebox.rb b/lib/onebox/engine/discourse_local_onebox.rb
index a1ce9ebe82..b4add001ac 100644
--- a/lib/onebox/engine/discourse_local_onebox.rb
+++ b/lib/onebox/engine/discourse_local_onebox.rb
@@ -14,7 +14,7 @@ module Onebox
 
         route = Discourse.route_for(url)
 
-        !!(route[:controller] =~ /topics|uploads/)
+        !!(route[:controller] =~ /topics|uploads|users/)
       rescue ActionController::RoutingError
         false
       end
@@ -27,6 +27,7 @@ module Onebox
         case route[:controller]
         when "uploads" then upload_html(path)
         when "topics"  then topic_html(route)
+        when "users"   then user_html(route)
         end
       end
 
@@ -82,6 +83,33 @@ module Onebox
           end
         end
 
+        def user_html(route)
+          link = "<a href='#{@url}'>#{@url}</a>"
+          username = route[:username] || ''
+          user = User.find_by(username_lower: username.downcase)
+
+          if user
+            args = {
+              user_id: user.id,
+              username: user.username,
+              avatar: PrettyText.avatar_img(user.avatar_template, "extra_large"),
+              name: user.name,
+              bio: user.user_profile.bio_excerpt(230),
+              location: user.user_profile.location,
+              joined: I18n.t('joined'),
+              created_at: user.created_at.strftime(I18n.t('datetime_formats.formats.date_only')),
+              website: user.user_profile.website,
+              website_name: UserSerializer.new(user).website_name,
+              original_url: @url
+            }
+
+            template = File.read("#{Rails.root}/lib/onebox/templates/discourse_user_onebox.hbs")
+            Mustache.render(template, args)
+          else
+            return link
+          end
+        end
+
         def can_see_post?(post, source_topic)
           return false if post.nil? || post.hidden || post.trashed? || post.topic.nil?
           Guardian.new.can_see_post?(post) || same_category?(post.topic.category, source_topic)
diff --git a/lib/onebox/templates/discourse_user_onebox.hbs b/lib/onebox/templates/discourse_user_onebox.hbs
new file mode 100644
index 0000000000..079e3268ec
--- /dev/null
+++ b/lib/onebox/templates/discourse_user_onebox.hbs
@@ -0,0 +1,24 @@
+<aside class="onebox">
+  <article class="onebox-body user-onebox">
+    {{{avatar}}}
+    <h3><a href="{{original_url}}">{{{username}}}</a></h3>
+    <div>
+      {{#name}}
+        <span class="full-name">{{name}}</span>
+      {{/name}}
+      {{#location}}
+        <span class="location"><i class="fa fa-map-marker d-icon d-icon-map-marker"></i>{{{location}}}</span>
+      {{/location}}
+      {{#website}}
+        <span>
+          <i class="fa fa-globe d-icon d-icon-globe"></i><a href="{{website}}">{{{website_name}}}</a>
+        </span>
+      {{/website}}
+    </div>
+    {{#bio}}
+      <p>{{{bio}}}</p>
+    {{/bio}}
+    <span>{{joined}} {{created_at}}</span>
+  </article>
+  <div style="clear: both"></div>
+</aside>
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 197606da79..91953a1074 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -29,6 +29,7 @@ class Plugin::Instance
    :color_schemes,
    :initializers,
    :javascripts,
+   :locales,
    :service_workers,
    :styles,
    :themes].each do |att|
@@ -319,6 +320,14 @@ class Plugin::Instance
     javascripts << js
   end
 
+  # @option opts [String] :name
+  # @option opts [String] :nativeName
+  # @option opts [String] :fallbackLocale
+  # @option opts [Hash] :plural
+  def register_locale(locale, opts = {})
+    locales << [locale, opts]
+  end
+
   def register_custom_html(hash)
     DiscoursePluginRegistry.custom_html ||= {}
     DiscoursePluginRegistry.custom_html.merge!(hash)
@@ -427,7 +436,7 @@ JS
     end
 
     register_assets! unless assets.blank?
-
+    register_locales!
     register_service_workers!
 
     seed_data.each do |key, value|
@@ -532,6 +541,33 @@ JS
     end
   end
 
+  def register_locales!
+    root_path = File.dirname(@path)
+
+    locales.each do |locale, opts|
+      opts = opts.dup
+      opts[:client_locale_file] = File.join(root_path, "config/locales/client.#{locale}.yml")
+      opts[:server_locale_file] = File.join(root_path, "config/locales/server.#{locale}.yml")
+      opts[:js_locale_file] = File.join(root_path, "assets/locales/#{locale}.js.erb")
+
+      locale_chain = opts[:fallbackLocale] ? [locale, opts[:fallbackLocale]] : [locale]
+      lib_locale_path = File.join(root_path, "lib/javascripts/locale")
+
+      path = File.join(lib_locale_path, "message_format")
+      opts[:message_format] = find_locale_file(locale_chain, path)
+      opts[:message_format] = JsLocaleHelper.find_message_format_locale(locale_chain, false) unless opts[:message_format]
+
+      path = File.join(lib_locale_path, "moment_js")
+      opts[:moment_js] = find_locale_file(locale_chain, path)
+      opts[:moment_js] = JsLocaleHelper.find_moment_locale(locale_chain) unless opts[:moment_js]
+
+      if valid_locale?(opts)
+        DiscoursePluginRegistry.register_locale(locale, opts)
+        Rails.configuration.assets.precompile << "locales/#{locale}.js"
+      end
+    end
+  end
+
   private
 
   def write_asset(path, contents)
@@ -553,4 +589,18 @@ JS
     yield plugin
   end
 
+  def valid_locale?(custom_locale)
+    File.exist?(custom_locale[:client_locale_file]) &&
+      File.exist?(custom_locale[:server_locale_file]) &&
+      File.exist?(custom_locale[:js_locale_file]) &&
+      custom_locale[:message_format] && custom_locale[:moment_js]
+  end
+
+  def find_locale_file(locale_chain, path)
+    locale_chain.each do |locale|
+      filename = File.join(path, "#{locale}.js")
+      return [locale, filename] if File.exist?(filename)
+    end
+    nil
+  end
 end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 4209d24595..67694d527c 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -130,7 +130,7 @@ class PostCreator
       return false unless skip_validations? || validate_child(topic_creator)
     else
       @topic = Topic.find_by(id: @opts[:topic_id])
-      if (@topic.blank? || !guardian.can_create?(Post, @topic))
+      unless @topic.present? && (@opts[:skip_guardian] || guardian.can_create?(Post, @topic))
         errors[:base] << I18n.t(:topic_not_found)
         return false
       end
diff --git a/lib/post_locker.rb b/lib/post_locker.rb
new file mode 100644
index 0000000000..d78951231c
--- /dev/null
+++ b/lib/post_locker.rb
@@ -0,0 +1,23 @@
+class PostLocker
+  def initialize(post, user)
+    @post, @user = post, user
+  end
+
+  def lock
+    Guardian.new(@user).ensure_can_lock_post!(@post)
+
+    Post.transaction do
+      @post.update_column(:locked_by_id, @user.id)
+      StaffActionLogger.new(@user).log_post_lock(@post, locked: true)
+    end
+  end
+
+  def unlock
+    Guardian.new(@user).ensure_can_lock_post!(@post)
+
+    Post.transaction do
+      @post.update_column(:locked_by_id, nil)
+      StaffActionLogger.new(@user).log_post_lock(@post, locked: false)
+    end
+  end
+end
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index a6b1623e8d..3dd2db5f4f 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -1,4 +1,5 @@
 require "edit_rate_limiter"
+require 'post_locker'
 
 class PostRevisor
 
@@ -163,6 +164,13 @@ class PostRevisor
       advance_draft_sequence
     end
 
+    # Lock the post by default if the appropriate setting is true
+    if SiteSetting.staff_edit_locks_post? &&
+        @editor.staff? &&
+        !@post.user.staff?
+      PostLocker.new(@post, @editor).lock
+    end
+
     # WARNING: do not pull this into the transaction
     # it can fire events in sidekiq before the post is done saving
     # leading to corrupt state
@@ -475,6 +483,7 @@ class PostRevisor
   end
 
   def alert_users
+    return if @editor.id == Discourse::SYSTEM_USER_ID
     PostAlerter.new.after_save_post(@post)
   end
 
diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb
index 37b17716b0..c8e5f8a7ed 100644
--- a/lib/retrieve_title.rb
+++ b/lib/retrieve_title.rb
@@ -1,10 +1,10 @@
 require_dependency 'final_destination'
 
 module RetrieveTitle
-  class ReadEnough < StandardError; end
+  CRAWL_TIMEOUT = 1
 
   def self.crawl(url)
-    extract_title(fetch_beginning(url))
+    fetch_title(url)
   rescue Exception
     # If there was a connection error, do nothing
   end
@@ -41,7 +41,7 @@ module RetrieveTitle
 
       # Amazon and YouTube leave the title until very late. Exceptions are bad
       # but these are large sites.
-      return 80 if uri.host =~ /amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
+      return 500 if uri.host =~ /amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
       return 300 if uri.host =~ /youtube\.com$/ || uri.host =~ /youtu.be/
 
       # default is 10k
@@ -49,27 +49,24 @@ module RetrieveTitle
     end
 
     # Fetch the beginning of a HTML document at a url
-    def self.fetch_beginning(url)
-      fd = FinalDestination.new(url)
-      uri = fd.resolve
-      return "" unless uri
+    def self.fetch_title(url)
+      fd = FinalDestination.new(url, timeout: CRAWL_TIMEOUT)
 
-      result = ""
-      streamer = lambda do |chunk, _, _|
-        result << chunk
+      current = nil
+      title = nil
 
-        # Using exceptions for flow control is really bad, but there really seems to
-        # be no sane way to get a stream to stop reading in Excon (or Net::HTTP for
-        # that matter!)
-        raise ReadEnough.new if result.size > (max_chunk_size(uri) * 1024)
+      fd.get do |_response, chunk, uri|
+
+        if current
+          current << chunk
+        else
+          current = chunk
+        end
+
+        max_size = max_chunk_size(uri) * 1024
+        title = extract_title(current)
+        throw :done if title || max_size < current.length
       end
-      Excon.get(uri.to_s, response_block: streamer, read_timeout: 20, headers: fd.request_headers)
-      result
-
-    rescue Excon::Errors::SocketError => ex
-      return result if ex.socket_error.is_a?(ReadEnough)
-      raise
-    rescue ReadEnough
-      result
+      return title
     end
 end
diff --git a/lib/search.rb b/lib/search.rb
index 6f553a4945..30c5b00b99 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -180,7 +180,7 @@ class Search
 
   # Query a term
   def execute
-    if SiteSetting.log_search_queries?
+    if SiteSetting.log_search_queries? && @opts[:search_type].present?
       status, search_log_id = SearchLog.log(
         term: @term,
         search_type: @opts[:search_type],
diff --git a/lib/staff_message_format.rb b/lib/staff_message_format.rb
new file mode 100644
index 0000000000..e6005d0fac
--- /dev/null
+++ b/lib/staff_message_format.rb
@@ -0,0 +1,23 @@
+# This is used for formatting Suspension/Silencing messages.
+# It can be extended by plugins to provide custom message formats.
+class StaffMessageFormat
+  def initialize(type, reason, message = nil)
+    @type = type
+    @reason = reason
+    @message = message
+
+    after_initialize
+  end
+
+  # Plugins can overwrite this to munge values before formatting
+  def after_initialize
+  end
+
+  # Overwrite this to change formatting
+  def format
+    result = ""
+    result << @reason if @reason.present?
+    result << "\n\n#{@message}" if @message.present?
+    result
+  end
+end
diff --git a/lib/stylesheet/importer.rb b/lib/stylesheet/importer.rb
index 93e4c479c8..f55d1d2ec7 100644
--- a/lib/stylesheet/importer.rb
+++ b/lib/stylesheet/importer.rb
@@ -5,14 +5,12 @@ module Stylesheet
   class Importer < SassC::Importer
     include GlobalPath
 
-    @special_imports = {}
-
     def self.special_imports
-      @special_imports
+      @special_imports ||= {}
     end
 
     def self.register_import(name, &blk)
-      @special_imports[name] = blk
+      special_imports[name] = blk
     end
 
     register_import "theme_field" do
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index 5ff933cab7..376416338e 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -363,7 +363,7 @@ EMOJI_SETS ||= {
   "apple" => "apple",
   "google" => "google",
   "google_blob" => "google_classic",
-  "facebook_messenger" => "facebook_messenger",
+  "facebook" => "facebook_messenger",
   "twitter" => "twitter",
   "emoji_one" => "emoji_one",
   "windows" => "win10",
diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index c97b26d9bc..b45b817f68 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -1,15 +1,21 @@
 desc "Runs the qunit test suite"
 
 task "qunit:test", [:timeout, :qunit_path] => :environment do |_, args|
-
   require "rack"
   require "socket"
+  require 'rbconfig'
 
-  unless system("command -v google-chrome >/dev/null;")
+  if RbConfig::CONFIG['host_os'][/darwin|mac os/]
+    google_chrome_cli = "/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome"
+  else
+    google_chrome_cli = "google-chrome"
+  end
+
+  unless system("command -v \"#{google_chrome_cli}\" >/dev/null")
     abort "Chrome is not installed. Download from https://www.google.com/chrome/browser/desktop/index.html"
   end
 
-  if Gem::Version.new(`$(command -v google-chrome) --version`.match(/[\d\.]+/)[0]) < Gem::Version.new("59")
+  if Gem::Version.new(`\"#{google_chrome_cli}\" --version`.match(/[\d\.]+/)[0]) < Gem::Version.new("59")
     abort "Chrome 59 or higher is required to run tests in headless mode."
   end
 
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 9ecf00c3d9..9c5136b0e2 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -1,12 +1,12 @@
+require "db_helper"
 require "digest/sha1"
+require "base62"
 
 ################################################################################
 #                                    gather                                    #
 ################################################################################
 
 task "uploads:gather" => :environment do
-  require "db_helper"
-
   ENV["RAILS_DB"] ? gather_uploads : gather_uploads_for_all_sites
 end
 
@@ -84,8 +84,6 @@ end
 ################################################################################
 
 task "uploads:migrate_from_s3" => :environment do
-  require "db_helper"
-
   ENV["RAILS_DB"] ? migrate_from_s3 : migrate_all_from_s3
 end
 
@@ -114,56 +112,58 @@ def migrate_from_s3
   require "file_store/s3_store"
 
   # make sure S3 is disabled
-  if SiteSetting.Uploads.enable_s3_uploads
+  if SiteSetting.Upload.enable_s3_uploads
     puts "You must disable S3 uploads before running that task."
     return
   end
 
-  # make sure S3 bucket is set
-  if SiteSetting.Upload.s3_upload_bucket.blank?
-    puts "The S3 upload bucket must be set before running that task."
-    return
-  end
-
   db = RailsMultisite::ConnectionManagement.current_db
 
   puts "Migrating uploads from S3 to local storage for '#{db}'..."
 
-  s3_base_url = FileStore::S3Store.new.absolute_base_url
   max_file_size_kb = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
 
-  Post.unscoped.find_each do |post|
-    if post.raw[s3_base_url]
-      post.raw.scan(/(#{Regexp.escape(s3_base_url)}\/(\d+)(\h{40})\.\w+)/).each do |url, id, sha|
+  Post.where("user_id > 0 AND raw LIKE '%.s3%.amazonaws.com/%'").find_each do |post|
+    begin
+      updated = false
+
+      post.raw.gsub!(/(\/\/[\w.-]+amazonaws\.com\/(original|optimized)\/([a-z0-9]+\/)+\h{40}([\w.-]+)?)/i) do |url|
         begin
-          puts "POST ID: #{post.id}"
-          puts "UPLOAD ID: #{id}"
-          puts "UPLOAD SHA: #{sha}"
-          puts "UPLOAD URL: #{url}"
           if filename = guess_filename(url, post.raw)
-            puts "FILENAME: #{filename}"
-            file = FileHelper.download(
-              "http:#{url}",
-              max_file_size: 20.megabytes,
-              tmp_file_name: "from_s3",
-              follow_redirect: true
-            )
-            if upload = UploadCreator.new(file, filename).create_for(post.user_id || -1)
-              post.raw = post.raw.gsub(/(https?:)?#{Regexp.escape(url)}/, upload.url)
-              post.save
-              post.rebake!
-              puts "OK :)"
-            else
-              puts "KO :("
+            file = FileHelper.download("http:#{url}", max_file_size: 20.megabytes, tmp_file_name: "from_s3", follow_redirect: true)
+            sha1 = Upload.generate_digest(file)
+            origin = nil
+
+            existing_upload = Upload.find_by(sha1: sha1)
+            if existing_upload&.url&.start_with?("//")
+              filename = existing_upload.original_filename
+              origin = existing_upload.origin
+              existing_upload.destroy
+            end
+
+            new_upload = UploadCreator.new(file, filename, origin: origin).create_for(post.user_id || -1)
+            if new_upload&.save
+              updated = true
+              url = new_upload.url
             end
-            puts post.full_url, ""
-          else
-            puts "NO FILENAME :("
           end
-        rescue => e
-          puts "EXCEPTION: #{e.message}"
+
+          url
+        rescue
+          url
         end
       end
+
+      if updated
+        post.save!
+        post.rebake!
+        putc "#"
+      else
+        putc "."
+      end
+
+    rescue
+      putc "X"
     end
   end
 
@@ -177,7 +177,6 @@ end
 task "uploads:migrate_to_s3" => :environment do
   require "file_store/s3_store"
   require "file_store/local_store"
-  require "db_helper"
 
   ENV["RAILS_DB"] ? migrate_to_s3 : migrate_to_s3_all_sites
 end
@@ -412,50 +411,65 @@ def recover_from_tombstone
     original_setting = SiteSetting.max_image_size_kb
     SiteSetting.max_image_size_kb = 10240
     current_db = RailsMultisite::ConnectionManagement.current_db
-
     public_path = Rails.root.join("public")
     paths = Dir.glob(File.join(public_path, 'uploads', 'tombstone', current_db, '**', '*.*'))
-    max = paths.length
+    max = paths.size
 
     paths.each_with_index do |path, index|
       filename = File.basename(path)
       printf("%9d / %d (%5.1f%%)\n", (index + 1), max, (((index + 1).to_f / max.to_f) * 100).round(1))
 
-      Post.where("raw LIKE ?", "%#{filename}%").each do |post|
+      Post.where("raw LIKE ?", "%#{filename}%").find_each do |post|
         doc = Nokogiri::HTML::fragment(post.raw)
         updated = false
 
         doc.css("img[src]").each do |img|
           url = img["src"]
 
-          next unless url =~ /^\/uploads\//
+          next if !url.start_with?("/uploads/")
+          next if Upload.exists?(url: url)
 
-          upload = Upload.find_by(url: url)
+          puts "Restoring #{path}..."
+          tombstone_path = File.join(public_path, 'uploads', 'tombstone', url.gsub(/^\/uploads\//, ""))
 
-          if !upload && url
-            printf "Restoring #{path}..."
-            tombstone_path = File.join(public_path, 'uploads', 'tombstone', url.gsub(/^\/uploads\//, ""))
+          if File.exists?(tombstone_path)
+            File.open(tombstone_path) do |file|
+              new_upload = UploadCreator.new(file, File.basename(url)).create_for(Discourse::SYSTEM_USER_ID)
 
-            if File.exists?(tombstone_path)
-              File.open(tombstone_path) do |file|
-                new_upload = UploadCreator.new(file, File.basename(url)).create_for(Discourse::SYSTEM_USER_ID)
-
-                if new_upload.persisted?
-                  printf "Restored into #{new_upload.url}\n"
-                  DbHelper.remap(url, new_upload.url)
-                  updated = true
-                else
-                  puts "Failed to create upload for #{url}: #{new_upload.errors.full_messages}."
-                end
+              if new_upload.persisted?
+                puts "Restored into #{new_upload.url}"
+                DbHelper.remap(url, new_upload.url)
+                updated = true
+              else
+                puts "Failed to create upload for #{url}: #{new_upload.errors.full_messages}."
               end
-            else
-              puts "Failed to find file (#{tombstone_path}) in tombstone."
             end
+          else
+            puts "Failed to find file (#{tombstone_path}) in tombstone."
           end
         end
 
         post.rebake! if updated
       end
+
+      sha1 = File.basename(filename, File.extname(filename))
+      short_url = "upload://#{Base62.encode(sha1.hex)}"
+
+      Post.where("raw LIKE ?", "%#{short_url}%").find_each do |post|
+        puts "Restoring #{path}..."
+
+        File.open(path) do |file|
+          new_upload = UploadCreator.new(file, filename).create_for(Discourse::SYSTEM_USER_ID)
+
+          if new_upload.persisted?
+            puts "Restored into #{new_upload.short_url}"
+            DbHelper.remap(short_url, new_upload.short_url) if short_url != new_upload.short_url
+            post.rebake!
+          else
+            puts "Failed to create upload for #{filename}: #{new_upload.errors.full_messages}."
+          end
+        end
+      end
     end
   ensure
     SiteSetting.max_image_size_kb = original_setting
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 14aaaa8bbc..1556e085fc 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -43,6 +43,7 @@ class TopicQuery
          page
          per_page
          visible
+         guardian
          no_definitions)
   end
 
@@ -90,7 +91,7 @@ class TopicQuery
     options.assert_valid_keys(TopicQuery.valid_options)
     @options = options.dup
     @user = user
-    @guardian = Guardian.new(@user)
+    @guardian = options[:guardian] || Guardian.new(@user)
   end
 
   def joined_topic_user(list = nil)
@@ -99,7 +100,11 @@ class TopicQuery
 
   # Return a list of suggested topics for a topic
   def list_suggested_for(topic)
-    return if topic.private_message? && !@user
+
+    # Don't suggest messages unless we have a user, and private messages are
+    # enabled.
+    return if topic.private_message? &&
+      (@user.blank? || !SiteSetting.enable_private_messages?)
 
     builder = SuggestedTopicsBuilder.new(topic)
 
@@ -511,7 +516,17 @@ class TopicQuery
         if options[:no_subcategories]
           result = result.where('categories.id = ?', category_id)
         else
-          result = result.where('categories.id = :category_id OR (categories.parent_category_id = :category_id AND categories.topic_id <> topics.id)', category_id: category_id)
+          sql = <<~SQL
+            categories.id IN (
+              SELECT c2.id FROM categories c2 WHERE c2.parent_category_id = :category_id
+              UNION ALL
+              SELECT :category_id
+            ) AND
+            topics.id NOT IN (
+              SELECT c3.topic_id FROM categories c3 WHERE c3.parent_category_id = :category_id
+            )
+          SQL
+          result = result.where(sql, category_id: category_id)
         end
         result = result.references(:categories)
 
@@ -820,7 +835,12 @@ class TopicQuery
 
     def random_suggested(topic, count, excluded_topic_ids = [])
       result = default_results(unordered: true, per_page: count).where(closed: false, archived: false)
-      excluded_topic_ids += Category.topic_ids.to_a
+
+      if SiteSetting.limit_suggested_to_category
+        excluded_topic_ids += Category.where(id: topic.category_id).pluck(:id)
+      else
+        excluded_topic_ids += Category.topic_ids.to_a
+      end
       result = result.where("topics.id NOT IN (?)", excluded_topic_ids) unless excluded_topic_ids.empty?
 
       result = remove_muted_categories(result, @user)
@@ -837,7 +857,8 @@ class TopicQuery
       #
       # we over select in case cache is stale
       max = (count * 1.3).to_i
-      ids = RandomTopicSelector.next(max) + RandomTopicSelector.next(max, topic.category)
+      ids = SiteSetting.limit_suggested_to_category ? [] : RandomTopicSelector.next(max)
+      ids.concat(RandomTopicSelector.next(max, topic.category))
 
       result.where(id: ids.uniq)
     end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 1ad15dc879..041f52fe3e 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -489,8 +489,9 @@ class TopicView
     raise Discourse::NotFound if @topic.blank?
     # Special case: If the topic is private and the user isn't logged in, ask them
     # to log in!
-    if @topic.present? && @topic.private_message? && @user.blank?
-      raise Discourse::NotLoggedIn.new
+    if @topic.present? && @topic.private_message?
+      raise Discourse::NotLoggedIn.new if @user.blank?
+      StaffActionLogger.new(@user).log_check_personal_message(@topic) if SiteSetting.log_personal_messages_views && @topic.all_allowed_users.where(id: @user.id).blank?
     end
     raise Discourse::InvalidAccess.new("can't see #{@topic}", @topic) unless @guardian.can_see?(@topic)
   end
diff --git a/lib/validators/regex_presence_validator.rb b/lib/validators/regex_presence_validator.rb
new file mode 100644
index 0000000000..fcdeb4ddad
--- /dev/null
+++ b/lib/validators/regex_presence_validator.rb
@@ -0,0 +1,16 @@
+class RegexPresenceValidator
+  include RegexSettingValidation
+
+  def initialize(opts = {})
+    @opts = opts
+    initialize_regex_opts(opts)
+  end
+
+  def valid_value?(val)
+    val.present? && regex_match?(val)
+  end
+
+  def error_message
+    I18n.t(@regex_error)
+  end
+end
diff --git a/lib/version.rb b/lib/version.rb
index 856c536755..3089a596ac 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 2
       MINOR = 0
       TINY  = 0
-      PRE   = 'beta1'
+      PRE   = 'beta2'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/plugins/discourse-narrative-bot/client.sr.yml b/plugins/discourse-narrative-bot/client.sr.yml
deleted file mode 100644
index d1c20b0756..0000000000
--- a/plugins/discourse-narrative-bot/client.sr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-sr:
-  js:
-    discourse_narrative_bot:
-      welcome_post_type:
-        new_user_track: "Započni korisnički tutorijal za sve nove korisnike"
-        welcome_message: "Pošalji svim novim korisnicima poruku dobrodošlice sa kratkim uputstvom za početnike"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml b/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml
index bae00c4791..7b126f2a6c 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.fa_IR.yml
@@ -10,4 +10,4 @@ fa_IR:
     discourse_narrative_bot:
       welcome_post_type:
         new_user_track: "شروع برنامه آموزشی کاربر جدید برای تمام کاربران جدید"
-        welcome_message: "برای تمام کاربران جدید پیام خوش آمدید به همراه راهنمای شروع سریع بفرست"
+        welcome_message: "برای تمام کاربران جدید پیام \"خوش آمدید\" به همراه راهنمای \"شروع سریع\" بفرست"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ur.yml b/plugins/discourse-narrative-bot/config/locales/client.ur.yml
index 58bc9735bc..9e323b5279 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ur.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ur: {}
+ur:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "تمام نئے صارفین کے لئے نیا صارف ٹیوٹوریل شروع کریں"
+        welcome_message: "تمام نئے صارفین کو جلدی سے شروعات کرنے کے ٹیوٹوریل کے ساتھ خوش آمدید کا پیغام بھیجیں"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 6d6c2f499e..5f5194a03b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -284,12 +284,6 @@ ar:
         reply: |-
           رائع! تذكر ان هذا يعمل مع الاقسام و الوسوم, اذا كانت خاصية الوسوم مفعلة بالموقع.
       change_topic_notification_level:
-        instructions: |-
-          لكل موضوع مستوي من الإشعارات. تبدأ بالوضع **العادي** حيث يتم اشعارك فقط عندما يشير احدهم اليك بشكل مباشر.
-
-          بشكل افتراضي مستوي الإشعارات للرسائل الخاصة مضبوطة علي الوضع **مراقب** حيث يتم اشعارك بكل رد جديد لكن يمكنك تعديل مستوي الإشعارات _لاي_ موضوع الي ** "مراقب" او "متابع" او "عادي" او "مكتوم" **.
-
-          دعنا نحاول تغيير مستوي الاشعارات لهذا الموضوع. في نهاية الموضوع ستجد زر مكتوب علية **مراقب**. هل يمكنك الضغط علية و اختيار الوضع **متابع**؟
         not_found: |-
           يبدوا انك ماذلت تراقب :eyes: هذا الموضوع! اذا واجهت مشكلة في إجاد رز مستوي الإشعارات. قم بالنزول إلي نهاية الصفحة علي اليمين, ستجدة هناك
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index 394c6e6c7a..d58cbc17ff 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -220,8 +220,6 @@ ca:
 
           Seleccionant qualsevol text de la meva publicació farà que aparegui el botó <kbd>**Cita**</kbd>. També funcionarà clicant **Resposta** amb qualsevol text seleccionat. Pots tornar-ho a provar?
       bookmark:
-        instructions: |-
-          Si vols saber-ne més, selecciona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> a sota i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marca aquest missatge privat**. Si ho fas, potser tindràs un :gift: més endavant!
         reply: |-
           Fantàstic! Ara pots trobar fàcilment com tornar a la nostra conversa privada en qualsevol moment, exactament des de [la pestanya de favorits del teu perfil](%{profile_page_url}/activity/bookmarks). Només has de seleccionar la teva imatge de perfil a la part superior dreta &#8599;
         not_found: |-
@@ -355,12 +353,6 @@ ca:
         reply: |-
           Genial! Recorda que això funciona per les dues categories _i_ etiquetes, si les etiquetes estan activades.
       change_topic_notification_level:
-        instructions: |-
-          Tots els temes tenen un nivell de notificació. Comença en 'normal', el que significa que normalment només se't notificarà quan algú et parli directament.
-
-          De manera predeterminada, el nivell de notificació d'un missatge privat està establert al nivell més alt de 'veure', cosa que significa que se't notificarà cada resposta nova. Però podeu anul·lar el nivell de notificació de _cada_tema per "mirar", "seguint" o "silenciat".
-
-          Intentem canviar el nivell de notificació d'aquest tema. A la part inferior del tema, trobareu un botó que mostra que estàs **veient ** aquest tema. Es pot canviar el nivell de notificació al **seguint**?
         not_found: |-
           Sembla que encara estàs mirant :eyes: aquest tema! Si tens problemes per trobar-lo, el botó de nivell de notificació es troba a la part inferior del tema.
         reply: |-
@@ -389,20 +381,6 @@ ca:
           *: -1:
           [/poll]
       details:
-        instructions: |-
-          A vegades potser voldràs **amagar detalls** a les teves respostes:
-
-          - Quan estiguis debatent punts de la trama d'una pel·lícula o programa de televisió que podría ser considerat un spoiler.
-
-          - Quan la teva publicació necessita molts detalls opcionals que puguin resultar aclaparadors quan es llegeixin alhora
-
-          [details = Selecciona-ho per veure com funciona!] 「
-          1. Selecciona l'engranatge<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> a l'editor
-          2. Selecciona "Amaga els detalls"
-          3. Edita el resum de les dades i afegeix el teu contingut
-          [/ detalls]
-
-          Pots utilitzar l'engranatge <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> a l'editor per afegir una secció de detalls a la seva pròxima resposta?
         not_found: |-
           Tens problemes per crear un giny de detalls? Prova d'incloure el següent a la teva pròxima resposta:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 20345d59f2..02225a1f24 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -222,7 +222,7 @@ de:
           Das Auswählen von beliebigem Text in meinem Beitrag lässt die <kbd>**Zitat**</kbd>-Schaltfläche erscheinen. Und das Drücken von **Antworten** mit einem beliebigen ausgewählten Text wird auch funktionieren! Kannst du es nochmal versuchen?
       bookmark:
         instructions: |-
-          Wenn du gerne mehr lernen würdest, wähle <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> unten und <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **Lesezeichen auf diese Nachricht setzen**.  Wenn du das macht, gibt es vielleicht ein :gift: in deiner Zukunft!
+          Wenn du gerne mehr darüber erfahren möchtest, wähle unten <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">   aus und klicke auf <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **Lesezeichen für diese Nachricht**.  Wenn du das machst, wird es demnächst vielleicht ein :gift: geben!
         reply: |-
           Hervorragend! Jetzt kannst du jederzeit über [den Lesezeichen-Reiter in deinem Profil](%{profile_page_url}/activity/bookmarks) zu unserer Unterhaltung zurückkehren. Gehe dazu einfach auf dein Profilbild oben rechts &#8599;.
         not_found: |-
@@ -359,12 +359,6 @@ de:
         reply: |-
           Hervorragend! Denk daran, dass dies sowohl für Kategorien _als auch_ für Schlagwörter funktioniert, sofern Schlagwörter aktiviert sind.
       change_topic_notification_level:
-        instructions: |-
-          Jedes Thema hat eine Benachrichtigungsstufe. Es beginnt bei „Normal“, was bedeutet, dass du normalerweise nur benachrichtigt wirst, wenn dich jemand direkt anspricht.
-
-          Standardmäßig ist die Benachrichtigungsstufe für Nachrichten auf die höchste Stufe „Beobachten“ gesetzt, was bedeutet, dass du über jede Antwort informiert wirst. Aber du kannst die Benachrichtigungsstufe für _jedes_ Thema auf „Beobachten“, „Verfolgen“ oder „Stummgeschaltet“ setzen.
-
-          Lass uns versuchen, die Benachrichtigungsstufe für dieses Thema zu ändern. Am Ende des Themas wirst du eine Schaltfläche finden, die „Beobachten“ anzeigt. Kannst du die Benachrichtigungsstufe auf **Verfolgen** ändern?
         not_found: |-
           Es sieht so aus, als würdest du dieses Thema noch beobachten! :eyes: Falls du Probleme hast es zu finden: Die Schaltfläche für die Benachrichtigungsstufe befindet sich am Ende des Themas.
         reply: |-
@@ -393,20 +387,6 @@ de:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          Manchmal möchtest du vielleicht in deinen Antworten bestimmte **Details ausblenden**:
-
-          - Wenn du Handlungen eines Films oder einer TV-Serie diskutierst und dies als Spoiler betrachtet werden könnte.
-
-          - Wenn dein Beitrag viele optionalen Details benötigt, die überwältigend sein könnten, wenn man sie alle auf einmal liest.
-
-          [details=Wähle dies aus, um zu sehen, wie es funktioniert!]
-          1. Wähle das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor aus.
-          2. Wähle „Details ausblenden“ aus.
-          3. Bearbeite die Zusammenfassung der Details und füge deinen Inhalt hinzu.
-          [/details]
-
-          Kannst du das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor verwenden und einen Details-Abschnitt in deine nächste Antwort einfügen?
         not_found: |-
           Hast du Schwierigkeiten, den Details-Abschnitt zu erstellen? Versuche Folgendes in deine nächste Antwort aufzunehmen:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index 0c7daab39f..1035daeaa5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -221,8 +221,6 @@ el:
 
           Επιλέγοντας ένα τμήμα από το κείμενο της ανάρτησής μου, εμφανίζεται το κουμπί <kbd>**Παράθεση**</kbd>. Επίσης πατώντας **Απάντηση** έχωντας πρώτα επιλέξει ένα τμήμα του κειμένου, είναι το ίδιο! Μπορείς να δοκιμάσεις ξανά;
       bookmark:
-        instructions: |-
-          Αν θέλεις να μάθεις περισσότερα, διάλεξε <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> παρακάτω και <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **πρόσθεσε σελιδοδείκτη στο ΠΜ**.  Αν το κάνεις, θα λάβεις ένα :gift: σύντομα!
         reply: |-
           Καταπληκτικά! Τώρα μπορείς εύκολα να επιστρέψεις στην συνομιλία μας όποτε θελήσεις, απευθείας από [την καρτέλα σελιδοδεικτών του προφίλ σου](%{profile_page_url}/activity/bookmarks). Απλά κάνε κλικ στην εικόνα προφίλ σου στην πάνω δεξιά πλευρά &#8599;
         not_found: |-
@@ -357,12 +355,6 @@ el:
         reply: |-
           Άψογα! Να θυμάσαι ότι αυτό λειτουργεί για κατηγορίες _και_ ετικέττες, αν οι ετικέττες είναι ενεργές.
       change_topic_notification_level:
-        instructions: |-
-          Κάθε νήμα έχει το δικό του επίπεδο ειδοποιήσεων. Ξεκινάει στο 'φυσιολογικό', το οποίο σημαίνει ότι κανονικά θα λάβεις ειδοποίηση μόνο αν κάποιος μιλήσει απευθείας σε σένα.
-
-          Από προεπιλογή, το επίπεδο ειδοποιήσεων στα προσωπικά μηνύματα είναι ορισμένο στο ανώτερο επίπεδο το 'επιτηρείται', το οποίο σημαίνει ότι θα λαμβάνεις ειδοποίηση για κάθε νέα απάντηση. Μπορείς όμως να αλλάξεις το επίπεδο ειδοποιήσεων για _κάθε_ νήμα σε 'επιτηρείται', 'παρακολουθείται' ή 'σε σιγή'.
-
-          Ας δοκιμάσουμε να αλλάξουμε το επίπεδο ειδοποιήσεων σε αυτό το νήμα. Στο κάτω μέρος του νήματος, θα βρεις το κουμπί το οποίο δείχνει ότι το νήμα **επιτηρείται**. Μπορείς να αλλάξεις το επίπεδο ειδοποιήσεων σε **παρακολουθείται**;
         not_found: |-
           Δείχνει ότι ακόμα επιτηρείς :eyes: αυτό το νήμα! Αν δεν μπορείς να βρεις το κουμπί επιπέδου ειδοποιήσεων, αυτό βρίσκεται στο κάτω μέρος του νήματος.
         reply: |-
@@ -391,20 +383,6 @@ el:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          Κάποιες στιγμές θέλεις να **κρύψεις λόγια** στις απαντήσεις σου:
-
-          - Όταν συζητούνται λεπτομέρειες από μια ταινία ή μια σειρά και αυτά που γράφεις μπορεί να θεωρηθούν σπόιλερ.
-
-          - Όταν η ανάρτησή σου περιλαμβάνει πολλές προεραιτικές πληροφορίες οι οποίες θα είναι πιθανώς κουραστικές αν διαβαστούν με την μία.
-
-          [details=Πάτα εδώ για να δεις πως λειτουργεί!]
-          1. Διάλεξε το <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> γρανάζι στον editor.
-          2. Επίλεξε "κρυφό τμήμα".
-          3. Επεξεργάσου τον τίτλο των λεπτομερειών και πρόσθεσε το περιεχόμενό σου.
-          [/details]
-
-          Μπορείς να πατήσεις το <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> γρανάζι στον editor και να προσθέσεις ένα κρυφό τμήμα στην επόμενη απάντησή σου;
         not_found: |-
           Έχεις πρόβλημα να προσθέσεις ένα κρυφό τμήμα στην απάντησή σου; Προσπάθησε να συμπεριλάβεις τα παρακάτω στην απάντησή σου:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index da2fd0c677..05a5c72b2f 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -233,7 +233,7 @@ en:
 
       bookmark:
         instructions: |-
-          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**.  If you do, there may be a :gift: in your future!
+          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this personal message**.  If you do, there may be a :gift: in your future!
         reply: |-
           Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{profile_page_url}/activity/bookmarks). Just select your profile picture at the upper right &#8599;
         not_found: |-
@@ -385,7 +385,7 @@ en:
         instructions: |-
           Every topic has a notification level. It starts at 'normal', which means you’ll normally only be notified when someone is speaking directly to you.
 
-          By default, the notification level for a private message is set to the highest level of 'watching', which means you you’ll be notified of every new reply.  But you can override the notification level for _any_ topic to 'watch', 'tracking' or 'muted'.
+          By default, the notification level for a private message is set to the highest level of 'watching', which means you’ll be notified of every new reply.  But you can override the notification level for _any_ topic to 'watch', 'tracking' or 'muted'.
 
           Let’s try changing the notification level for this topic. At the bottom of the topic, you’ll find a button which shows that you’re **watching** this topic. Can you change the notification level to **tracking**?
         not_found: |-
@@ -420,7 +420,7 @@ en:
         instructions: |-
           Sometimes you may wish to **hide details** in your replies:
 
-          - When you’re discussing plot points of a movie or TV show that would be a considered a spoiler.
+          - When you’re discussing plot points of a movie or TV show that would be considered a spoiler.
 
           - When your post needs lots of optional details that may be overwhelming when read all at once.
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index a36baf1741..63d1e9a381 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -215,7 +215,7 @@ es:
           Seleccionando cualquier texto de mi mensaje, aparecerá la palabra <kbd>**Citar**</kbd>, como si fuese un botón. Y si decides presionar **Responder** habiendo seleccionado el texto, funcionará igual! ¿Puedes intentarlo de nuevo?
       bookmark:
         instructions: |-
-          Si quieres aprender más, selecciona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> y <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **guarda como favorito este mensaje privado**.  Si lo haces, ¡podrá haber un  :gift: en tu futuro!
+          Si te gustaría saber más, selecciona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> debajo y <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **añade a marcadores este mensaje personal**. Si lo haces, ¡puede que haya un :gift: en un futuro!
         reply: |-
           ¡Excelente! Ahora puedes encontrar fácilmente las conversaciones privadas en cualquier momento, desde la [sección de marcadores de tu perfil](%{profile_page_url}/activity/bookmarks). Sólo debes seleccionar la foto de tu perfil en la parte superior derecha de la pantalla &#8599;
         not_found: |-
@@ -347,10 +347,6 @@ es:
         reply: |-
           ¡Excelente! Recuerda que ésto funciona para ambos, categorías _y_ etiquetas, si las etiquetas están disponibles.
       change_topic_notification_level:
-        instructions: |-
-          Cada tema tiene un nivel de notificación. Comienza en 'normal', lo que significa que normalmente sólo se notificará cuando alguien está hablando directamente con usted.
-          De forma predeterminada, el nivel de notificación de un mensaje privado se establece en el nivel más alto de "observación", lo que significa que se le notificará cada nueva respuesta. Pero puede sobrescribir el nivel de notificación de _cualquier_ tema a 'vigilar', 'seguir' o 'silenciar'.
-          Intentemos cambiar el nivel de notificación de este tema. Al final del tema, encontrarás un botón que muestra que estás **vigilando** este tema. ¿Puedes cambiar el nivel de notificación a **seguir**?
         not_found: |-
           Parece que aún estás vigilando :eyes: este tema! Si tienes problemas para encontrar el botón del nivel de notificación, el mismo está debajo de todo el tema de debate.
         reply: |-
@@ -377,20 +373,6 @@ es:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          A veces, tú puedes decidir **ocultar detalles** en tus respuestas:
-
-          - Cuando estás discutiendo puntos de trama de una película o programa de televisión que sería considerado un spoiler.
-
-          - Cuando su post necesita un montón de detalles opcionales que pueden ser abrumador cuando se lee todo a la vez.
-
-          [details=¡Clic aquí para ver cómo funciona!]
-          1. Selecciona el botón de engranaje <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> en el editor.
-          2. Selecciona "Hide Details".
-          3. Edita los detalles, y agrega el contenido que desees ocultar.
-          [/details]
-
-          ¿Puedes usar el botón de engranaje <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> en el editor para agregar datos ocultos en tu próxima respuesta?
         not_found: |-
           ¿Tiene problemas para crear un widget de detalles? Trate de incluir lo siguiente en su siguiente respuesta:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.et.yml b/plugins/discourse-narrative-bot/config/locales/server.et.yml
index 8c601aa1ed..cf76b5d705 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.et.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.et.yml
@@ -5,4 +5,23 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-et: {}
+et:
+  badges:
+    licensed:
+      name: Litsenseeritud
+  discourse_narrative_bot:
+    quote:
+      trigger: "tsitaat"
+      '1':
+        author: "Albert Einstein"
+      '3':
+        author: "Dr. Seuss"
+    magic_8_ball:
+      answers:
+        '1': "See on kindel"
+        '3': "Kahtlemata"
+        '4': "Jah, kindlasti"
+        '5': "Võid sellele loota"
+        '7': "Tõenäoliselt"
+        '9': "Jah"
+        '12': "Küsi hiljem uuesti"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 594b14b756..5e373ebe11 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -221,8 +221,6 @@ fi:
 
           <kbd>**Lainaa**</kbd>-painike ilmestyy, kun maalaat viestini tekstiä. **Vastaa**-painike käy yhtä hyvin, jos sinulla on tekstiä maalattuna. Kokeilisitko uudelleen?
       bookmark:
-        instructions: |-
-          Jos haluat oppia lisää, valitse <iimg src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> tämän alta ja <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **lisää tämä yksityisviestiketju kirjanmerkkeihisi**.  Jos teet niin, sinua voi odottaa :gift: tulevaisuudessa!
         reply: |-
           Erinomaista! Löydät yksityiskeskustelumme nyt helposti koska vain [profiilisi kirjanmerkkivälilehdeltä](%{profile_page_url}/activity/bookmarks). Klikkaat vain profiilikuvaasi oikeassa yläkulmasssa &#8599;
         not_found: |-
@@ -359,12 +357,6 @@ fi:
         reply: |-
           Erinomaista! Muista, että tämä toimii alueiden lisäksi myös tunnisteille, jos ne ovat käytössä täällä.
       change_topic_notification_level:
-        instructions: |-
-          Sinulla on jokaiselle ketjulle ilmoitustaso. Aluksi se on 'tavallinen', jolloin saat tavalliseen tapaan ilmoituksen vain, jos joku puhuu nimenomaan sinulle.
-
-          Oletuksena yksityisviestiketjujen ilmoitustaso on kaikkein korkein eli 'tarkkaillaan', jolloin saat ilmoituksen joka ikisestä viestistä. Voit kuitenkin valita _mille tahansa_ ketjulle ilmoitustason 'tarkkaillaan', 'seurataan' tai 'vaimennettu'.
-
-          Kokeillaanpa vaihtaa tämän ketjun ilmoitustasoa. Ketjun alla on painike, joka näyttää sinun tarkkailevan tätä ketjua. Vaihdapa ilmoitustasoksi **seurataan**.
         not_found: |-
           Näytät yhä tarkkailevan :eyes: tätä ketjua! Jollet meinaa löytää sitä, ilmoitustasopainike sijaitsee ketjun alla.
         reply: |-
@@ -393,20 +385,6 @@ fi:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          Joskus voit haluta **piilottaa yksityiskohtia** vastauksissasi:
-
-          - Kirjoitat elokuvasta tai TV-ohjelmasta jotakin, minkä voi kokea juonipaljastukseksi.
-
-          - Viestissäsi on suuria määriä yksityiskohtaista tietoa, joka ei ole kaikille olennaista ja joka voisi uuvuttaa tai häiritä lukijaa.
-
-          [details=Napauta niin näet kuinka se toimii!]
-          1. Valitse editorin <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvake.
-          2. Valitse "Piilota yksityiskohdat".
-          3. Muokkaa Yhteenveto-tekstiä, jonka taakse tiedot piilotetaan, ja lisää sisältö.
-          [/details]
-
-          Piilottaisitko yksityiskohtia editorin <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvakkeen avulla seuraavasta vastauksestasi?
         not_found: |-
           Onko ongelmia yksityiskohtatoiminnon kanssa? Kokeilepa laittaa tämä seuraavaan vastaukseesi:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index d1063d5281..0a01f1b79d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -293,12 +293,6 @@ fr:
         reply: |-
           Excellent ! Retenez que ceci fonctionne pour les catégories _et_ les tags, si les tags sont activés.
       change_topic_notification_level:
-        instructions: |-
-          Chaque sujet a un niveau de notification. Il démarre comme 'normal', c'est à dire que vous ne serez notifié que quand quelqu'un vous parle directement.
-
-          Par défaut, le niveau de notification pour un message privé est configuré au plus haut niveau de 'surveillance', c'est à dire que vous serez notifié et chaque nouvelle réponse. Mais vous pouvez changer le niveau de notification pour _n'importe quel_ sujet en 'Surveiller', 'Suivi', ou 'Silencieux'.
-
-          Essayons de changer le niveau de notification pour ce sujet. En bas de ce sujet, vous trouverez un bouton qui vous indique que vous **Surveillez** ce sujet. Pouvez-vous changer le niveau de notification pour **Suivi**' ?
         not_found: |-
           Il semble que vous êtes encore en train de Surveillez :eyes: ce sujet ! Si vous avez des difficultés à le trouver, le bouton du niveau de notification est situé sous le sujet.
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index 51c9e33e44..0281b0adbf 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -286,10 +286,6 @@ id:
         reply: |-
           Hebat! Cara ini bisa digunakan pada categories _and_ tags, jika pelabelan diaktifkan.
       change_topic_notification_level:
-        instructions: |-
-          Setiap topik memiliki tingkat pemberitahuan. Pengaturan awalnya adalah tingkat tertinggi, yakni 'watching', artinya surel pemberitahuan langsung dikirim setiap ada balasan baru. Tapi Anda bisa mengatur tingkat pemberitahuan untuk _topik_ apa_saja untuk 'watch', 'tracking' atau 'muted'.
-
-          Mari coba ubah tingkat pemberitahuan untuk topik ini. Di topik paling bawah, Anda akan menemukan sebuah tombol yang menyatakan kalau anda **menyimak** atau watching topik ini. Bisakah anda mengubahnya menjadi **tracking** atau mengikuti?
         not_found: |-
           Sepertinya Anda masih menyimak :eyes: topik ini! Jika kesulitan mencari tombolnya, tombol tingkat pengaturan ada di bawah topik.
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 13a7470d18..0cf6d812b4 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -221,8 +221,6 @@ it:
 
           Selezionare un qualsiasi testo del mio messaggio farà apparire il pulsante <kbd>**Cita**</kbd>. E anche premere **Rispondi** con qualsiasi testo selezionato funzionerà! Puoi provare di nuovo?
       bookmark:
-        instructions: |-
-          Se vuoi saperne di più, seleziona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> qui sotto e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> per inserire **questo messaggio privato nei segnalibri**.  Se lo farai, ci potrebbe essere un :gift: in futuro!
         reply: |-
           Eccellente! Ora potrai tornare facilmente a questa conversazione privata in ogni momento, proprio dalla [scheda segnalibri sul tuo profilo](%{profile_page_url}/activity/bookmarks). Basta selezionare l'immagine del tuo profilo in alto a destra &#8599;
         not_found: |-
@@ -359,12 +357,6 @@ it:
         reply: |-
           Eccellente! Ricorda che questo funziona per le categorie _e_ le etichette, se le etichette sono abilitate.
       change_topic_notification_level:
-        instructions: |-
-          Ogni argomento ha un livello di notifica. Parte da 'normale', il che significa che riceverai una notifica quando qualcuno parlerà direttamente con te.
-
-          Per impostazione predefinita, il livello di notifica per un messaggio privato è impostato al livello più alto 'in osservazione', il che significa che riceverai una notifica ad ogni nuovo messaggio. Ma puoi sovrascrivere il livello di notifica per _ogni_ argomento su 'in osservazione', 'seguito' o 'silenziato'.
-
-          Prova a modificare il livello di notifica per questo argomento. In fondo alla discussione, troverai un pulsante che ti mostrerà che questo argomento è **in osservazione** . Puoi modificare il livello di notifica a **seguito**?
         not_found: |-
           Sembra che stia ancora in osservazione :eyes: di questo argomento! Se hai problemi a trovarlo, il pulsante relativo al livello della notifica è situato in fondo a questo argomento.
         reply: |-
@@ -393,20 +385,6 @@ it:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          Qualche volta potresti voler **nascondere dei dettagli** nelle tue risposte:
-
-          - Quando si stanno discutento punti della trama di un film o di uno show televisivo che potrebbero essere considerati degli spoiler.
-
-          - Quando il tuo messaggio necessita di molti dettagli opzionali che potrebbero intralciare la lettura se letti tutti in una volta.
-
-          [details=Seleziona questo per vedere come funziona!]
-          1. Seleziona il pulsante <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> opzioni nell'editor.
-          2. Seleziona "Nascondi Dettagli".
-          3. Modifica il sommario e aggiungi il tuo contenuto.
-          [/details]
-
-          Puoi usare il pulsante <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> opzioni nell'editor per aggiungere una sezione dettagli nella tua prossima risposta?
         not_found: |-
           Hai problemi a creare un widget con dei dettagli? Prova a includere quello che segue nella tua prossima risposta:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 6362aa6a5a..1ee4c2b9be 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -221,8 +221,6 @@ ko:
 
           내 포스트에서 아무 글이나 선택해도 <kbd>**인용하기**</kbd> 버튼이 뜰거야. 글을 선택하고 **답글쓰기** 를 눌러도 돼! 다시 한 번 해 볼래?
       bookmark:
-        instructions: |-
-          더 알고 싶다면 아래에 있는 이걸 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 선택한 다음 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **이 개인메시지 북마크**를 하렴.  미래의 너에게 보내는 좋은 선물:gift:이 되겠지!
         reply: |-
           대단해! 이제는 [프로필의 북마크 탭](%{profile_page_url}/activity/bookmarks)만 눌러도 우리의 개인적인 대화를 손쉽게 뒤돌아 볼 수 있어. 우측 상단에 있는 프로필 사진만 선택하면 돼. &#8599;
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
index 218cf89558..219f0cef40 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -25,7 +25,7 @@ nb_NO:
       long_description: |
         Dette merket er tildelt ved fullførelse av den interaktive opplæringen for avanserte brukere. Du har mestret de avanserte verktøyene for diskusjoner — og er nå fullstendig lisensiert!
   discourse_narrative_bot:
-    bio: "Hei, jeg er ikke en virkelig person. Jeg er en robot som kan lære deg om dette nettstedet. For å kommunisere med meg, send meg en melding eller nevn **`@%{discobot_username}`** hvor som helst."
+    bio: "Hei, jeg er ikke en virkelig person. Jeg er en robot som kan lære deg om dette nettstedet. For å kommunisere med meg send meg en melding eller nevn **`@%{discobot_username}`** hvor som helst."
     timeout:
       message: |-
         Hei @%{username}, jeg bare sjekker opp på deg fordi jeg har ikke hørt fra deg på en stund.
@@ -104,6 +104,11 @@ nb_NO:
       quoting:
         reply: |-
           Godt jobbet, du valgte mitt  favorittsitat! :left_speech_bubble:
+      mention:
+        instructions: |-
+          Av og til ønsker du kanskje tiltrekke noens oppmerksomhet selv om du ikke svarer dem direkte. Skriv `@` og fullfør deretter brukernavnet deres for å nevne dem.
+
+          Kan du nevne **`@%{discobot_username}`** i svaret ditt?
     advanced_user_narrative:
       reset_trigger: 'avansert bruker'
       title: ':arrow_up: Avanserte brukerfunksjoner'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
index 8d0e7d7915..75989af67d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -297,12 +297,6 @@ pl_PL:
         reply: |-
           Wspaniale! Pamiętaj, że działa to zarówno dla kategorii _i_ tagów, jeśli taka możliwość jest dostępna.
       change_topic_notification_level:
-        instructions: |-
-          Każdy temat ma swój poziom notyfikacji. Pierwszym poziomem jest "normalny', co oznacza, że będziesz informowany jedynie w przypadku, gdy ktoś zwróci się bezpośrednio do ciebie.
-
-          Domyślnie, poziom notyfikacji dla wiadomości prywatnych jest ustawiony na najwyższym poziomie, oznacza to, że będziesz informowany o każdej nowej odpowiedzi. Możesz zmienić poziom notyfikacji dla _każdego_ tematu na "obserwuj", "śledź" lub "wycisz".
-
-          Spróbujmy zmienić poziom notyfikacji dla tego tematu. Na dole każdego tematu znajdziesz przycisk, który pokaże, że **obserwujesz** ten temat. Czy możesz zmienić poziom notyfikacji na **śledź**?
         not_found: |-
           Wygląda na to, że ciągle obserwujesz :eyes: ten temat! Jeśli masz problem w znalezieniu, przycisk poziomu notyfikacji znajduję się na dole tego tematu.
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 6440cf48c3..9afd3a0343 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -292,12 +292,6 @@ ru:
         reply: |-
           Отлично! Это работает для всех категорий _и_ тегов, если теги включены.
       change_topic_notification_level:
-        instructions: |-
-          Каждая тема имеет уровень уведомлений. Она начинается на 'нормальный', что означает, что вы нормально будете только получать уведомления, когда кто-то обращается непосредственно к вам.
-
-          По умолчанию, уровень уведомления на личное сообщение находится на самом высоком уровне 'смотреть', что означает, что вы будете получать уведомления о каждом новом ответе. Но вы можете переопределить уровня уведомлений для _любой_ теме 'смотреть', 'отслеживания' или 'отключен'.
-
-          Давайте попробуем изменить уровень уведомления по этой теме. Внизу темы, Вы найдете кнопку, которая показывает, что вы **смотрите** эту тему. Вы можете изменить уровень уведомления на **отслеживание**?
         not_found: |-
           Похоже, вы еще ищите :eyes: эту кнопку! Это кнопка находится в нижней части этого раздела.
         reply: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sr.yml b/plugins/discourse-narrative-bot/config/locales/server.sr.yml
index 7e57a61dd2..b8ec0cf422 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sr.yml
@@ -5,4 +5,19 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sr: {}
+sr:
+  discourse_narrative_bot:
+    new_user_narrative:
+      hello:
+        title: ":robot: Pozdrav!"
+        message: |-
+          Hvala što učestvuješ i želimo ti dobrodošlicu na %{title}!
+
+          - Ja sam samo robot, ali naša [ekipa](/about) je tu da ti pomogne ako ti zatreba da kontaktiraš osobu.
+
+          - Zarad sigurnosti , ograničeno je šta novi korisnici mogu da rade. Sticaćeš nova prava (i [bedževe](/badges)) kako se vremenom budemo upoznavali.
+
+          - Verujemo u  [civilizovanu javnu raspravu](/guidelines).
+      bookmark:
+        instructions: |-
+          Ako želiš da saznaš više, klikni na <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> ispod i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **markiraj ovu privatnu poruku**.  Ako to uradiš, možda dobiješ jedan :gift: uskoro!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index 58bc9735bc..e1dc39a87e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -5,4 +5,423 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ur: {}
+ur:
+  site_settings:
+    discourse_narrative_bot_enabled: 'ڈِسکورس نَرَیٹِو بوٹ کو فعال کریں'
+    disable_discourse_narrative_bot_welcome_post: "ڈِسکورس نَرَیٹِو بوٹ کی طرف سے استقبالیہ پوسٹ غیر فعال کریں"
+    discourse_narrative_bot_ignored_usernames: "صارف نام جو ڈِسکورس نَرَیٹِو بوٹ نظر انداز کرے"
+    discourse_narrative_bot_disable_public_replies: "ڈِسکورس نَرَیٹِو بوٹ کی طرف سے عوامی جوابات غیر فعال کریں"
+    discourse_narrative_bot_welcome_post_type: "خوش آمدید پوسٹ کی قسم جو ڈِسکورس نَرَیٹِو بَوٹ بھیجے"
+    discourse_narrative_bot_welcome_post_delay: "ڈِسکورس نرَیٹِو بَوٹ کا خوش آمدید پوسٹ بھیجنے سے پہلے (ن) سیکنڈ کا انتظار کیا جائے"
+  badges:
+    certified:
+      name: مصدقہ
+      description: "ہمارا نیا صارف ٹیوٹوریل مکمل کیا"
+      long_description: |
+        یہ بَیج انٹرایکٹو نیا صارف ٹیوٹوریل کی کامیاب تکمیل پر دیا جاتا ہے۔ آپ نے بحث کے بنیادی اصول جاننے کے لئے پہل کی ہے، اور اب آپ تصدیق شدہ ہیں!
+    licensed:
+      name: لائسنس یافتہ
+      description: "ہمارا اَیڈوانسڈ ٹیوٹوریل مکمل کیا"
+      long_description: |
+        یہ بَیج انٹرایکٹِو اَیڈوانسڈ ٹیوٹوریل کی کامیاب تکمیل پر دیا جاتا ہے۔ آپ نے بحث کے اعلیٰ اصولوں پر مہارت حاصل کر لی ہے — اور اب آپ مکمل طور پر لائسنس یافتہ ہیں!
+  discourse_narrative_bot:
+    bio: "ہیلو، میں ایک حقیقی شخص نہیں ہوں۔ میں ایک بَوٹ ہوں جو آپ کو اس سائٹ کے بارے میں سکھا سکتا ہے۔ میرے ساتھ بات چیت کرنے کے لئے، مجھے ایک پیغام بھیجیں یا کہیں بھی **`@%{discobot_username}`** زکر کریں۔"
+    timeout:
+      message: |-
+        ارے @%{username}، بس چیک کر رہا ہوں کیونکہ میں نے کچھ دیر سے آپ سے نہیں سنا۔
+
+        - جاری رکھنے کیلئے، کسی بھی وقت مجھے جواب دیں۔
+
+        - اگر آپ اس مرحلے کو چھوڑنا چاہتے ہیں، تو `%{skip_trigger}` کہیے۔
+
+        - دوبارہ شروع کرنے کیلئے، `%{reset_trigger}` کہتیے۔
+
+        اگر آپ یہ نہیں کرنا چاہتے، تو یہ بھی ٹھیک ہے۔ میں ایک رَوبَوٹ ہوں۔ آپ میرے جذبات کو نقصان نہیں پہنچا سکتے۔ :sob:
+    dice:
+      trigger: "رول"
+      invalid: |-
+        معذرت، پانسہ کے اس مجموعہ کو چلانا ریاضی کے اصولوں کے حساب سے ناممکن ہے۔ :confounded:
+      not_enough_dice: |-
+        میرے پاس صرف %{num_of_dice} پانسہ ہیں۔ [شرمناک] (http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php)، میں جانتا ہوں!
+      out_of_range: |-
+        کیا آپ جانتے تھے کہ ریاضی کے حساب سے منصفانہ پانسہ کیلئے [اطراف کی زیادہ سے زیادہ تعداد] (https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) 120 ہے؟
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "اقتباس کریں"
+      '1':
+        quote: "ہر مشکل کے درمیان میں ایک سنہری موقع بھی موجود ہوتا ہے"
+        author: "البرٹ آئن سٹائین"
+      '2':
+        quote: "آزادی بے فائیدہ ہے اگر اِس میں غلطی کرنے کی آزادی شامل نہ ہو۔"
+        author: "مہاتما گاندھی"
+      '3':
+        quote: "رو مت کیونکہ یہ ختم ہوا، مسکراو کیونکہ یہ ہوا۔"
+        author: "ڈاکٹر سِیوُس"
+      '4':
+        quote: "اگر آپ چاہتے ہیں کہ کوئی کام ٹھیک ہو، تو اسے خود انجام دیں۔"
+        author: "چارلس-گویلوم ایتینی"
+      '5':
+        quote: "یقین کریں کہ آپ کر سکتے ہیں۔ اورآپ آدھا کر چکے ہیں۔"
+        author: "تھیوڈور روزویلٹ"
+      '6':
+        quote: "زندگی چاکلیٹس کے ایک ڈبے کی طرح ہے۔ آپ کبھی بھی نہیں جانتے کہ آپ کو کیا ملے گا۔"
+        author: "فَورَسٹ گَمپ کی والدہ"
+      '7':
+        quote: "یہ ایک انسان کے لئے ایک چھوٹا قدم، اور انسانیت کیلئے ایک بڑی چھلانگ۔"
+        author: "نیل آرمسٹرانگ"
+      '8':
+        quote: "ہر دن وہ ایک چیز کرو جس سے تم ڈرتے ہو۔"
+        author: "اَیلَینَور رُوزوَیلٹ"
+      '9':
+        quote: "غلطیاں ہمیشہ قابلِ بخشش ہوتی ہیں، اگر کوئی ان کا اعتراف کرنے کی جرأت رکھتا ہے۔"
+        author: "برُوس لی"
+      '10':
+        quote: "جو کچھ بھی انسان کا دماغ تصور اور یقین رکھ سکتا ہے، اسے حاصل کرسکتا ہے۔"
+        author: "نَیپَولِیَن ہِل"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
+    magic_8_ball:
+      trigger: 'قسمت'
+      answers:
+        '1': "یہ یقینی ھے"
+        '2': "واضع طور پر ایسا ہے"
+        '3': "بلا شبہ"
+        '4': "جی ہاں یقیناً"
+        '5': "آپ اس پر بھروسہ کر سکتے ہیں"
+        '6': "جیسا میں اسے دیکھتا ہوں، جی ہاں"
+        '7': "زیادہ تر امکان ہے"
+        '8': "انجام اچھا لگ رہا ہے"
+        '9': "جی ہاں"
+        '10': "نشانیاں ہاں کی طرف اشارہ کر رہی ہیں"
+        '11': "جواب دھندلا، دوبارہ کوشش کریں"
+        '12': "بعد میں دوبارہ پوچھیے"
+        '13': "بہتر ہو گا کہ آپ کو ابھی نہ بتایا جائے"
+        '14': "ابھی پیشن گوئی نہیں کی جاسکتی"
+        '15': "توجہ کریں اور دوبارہ پوچھیے"
+        '16': "اس پہ بھروسہ نہ کریں"
+        '17': "میرا جواب نہیں ہے"
+        '18': "میرے ذرائع کا کہنا ہے کہ نہیں"
+        '19': "انجام بہت اچھا نہیں لگ رہا"
+        '20': "کافی مشکوک"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'شروع کیجیے'
+      skip_trigger: 'سکِپ کیجیے'
+      help_trigger: 'مدد دکھائیں'
+      random_mention:
+        reply: |-
+          ہیلو! جاننے کیلئے کہ میں کیا کر سکتا ہوں، `@%{discobot_username} %{help_trigger}` کہیں۔
+        tracks: |-
+          میں فی الحال مندرجہ ذیل چیزوں کو کرنا جانتا ہوں:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > مندرجہ ذیل انٹرایکٹو نَیرَیٹِو میں سے ایک کو شروع کر دیتا ہے: %{tracks}۔
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3، 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _رحم کا ایک بلا سوچِ سمجھے عمل کریں، بغیر کسی انعام کی توقع کے ساتھ، یہ جان کر کہ ایک دن کوئی دوسرا بھی آپ کیلئے ویسا ہی کر سکتا ہے_ &mdash; شہزادی ڈیانا
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: آپ اس پر انحصار کر سکتے ہیں
+      do_not_understand:
+        first_response: |-
+          ارے، جواب کیلئے شکریہ!
+
+          بدقسمتی سے، ایک برا پروگرام شدہ بَوٹ ہونے کے طور پر، میں اس کو کچھ سمجھ نہیں پایا۔ :frowning:
+        track_response: 'آپ دوبارہ کوشش کر سکتے ہیں، یا اگر آپ اس قدم کو چھوڑنا چاہتے ہیں تو `%{skip_trigger}` کہیے۔ دوسری صورت میں، پھر سے شروع کرنے کے لئے، `%{reset_trigger}` کہیے۔ '
+        second_response: |-
+          اوہ، معذرت۔ میں ابھی بھی سمجھ نہیں پایا۔ :anguished:
+
+          میں صرف ایک بَوٹ ہوں، لیکن اگر آپ ایک حقیقی شخص تک پہنچنا چاہتے ہیں، تو [ہمارا رابطہ پیج] (/about) دیکھیے۔
+
+          اِس دوران، میں آپ کے راستے سے دور رہوں گا۔
+    new_user_narrative:
+      reset_trigger: "نیا صارف"
+      cert_title: "نیا صارف ٹیوٹوریل کی کامیاب تکمیل کے اعتراف میں"
+      hello:
+        title: ":robot: خوش آمدید!"
+        message: |-
+          %{title}میں شامل ہونے کیلئے شکریہ، اور خوش آمدید!
+
+          - میں صرف ایک رَوبَوٹ ہوں، اگر آپ کو کسی شخص سے رابطہ کرنے کی ضرورت ہو تو لیکن [ہمارا دوستانہ اسٹاف](/about) بھی یہاں موجود ہے۔
+
+          - حفاظتی وجوہات کی بنا پر، ہم عارضی طور پر نئے صارفین کی اِس سائیٹ پر کارروائیاں محدود کرتے ہیں۔ آپ کو نئی صلاحیتیں (اور [بَیج](/badges)) دیے جائیں گے جیسے جیسے ہم آپ کو بہتر جان پائیں گے۔
+
+          - ہم، ہر وقت [مہذب کمیونٹی رویے](/guidelines) پر یقین رکھتے ہیں۔
+      onebox:
+        instructions: |-
+          پھر، کیا آپ اِن لنکس میں سے ایک میرے ساتھ شئیر کر سکتے ہیں؟ **ایک لائن پر ایک لنک** کے طور پر جواب دیں، اور یہ خود بخود اُس کا ایک اچھا خلاصہ شامل کردے گا۔
+
+          ایک لنک کاپی کرنے کیلئے، موبائل پرٹَیپ اور ہولڈ کریں یا اپنے ماؤز پر دایاں کلک کریں:
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          -  https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          یہ زیادہ تر <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> لنکس کے لئے کام کرے گا۔ یاد رہے کہ یہ ایک لائن پر _صرف اکیلا_ ہونا چاہئے، بغیر اس کے سامنے یا پیچھے کچھ ہوے۔
+        not_found: |-
+          معذرت، میں آپ کے جواب میں لنک تلاش نہ کر سکا! :cry:
+
+          کیا آپ اپنے اگلے جواب میں، درج ذیل لنک، اکیلا اپنی لائن پر، شامل کر سکتے ہیں؟
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        instructions: |-
+          یہاں ایک یُونِیکارن کی تصویر ہے:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          اگر آپ اسے پسند کرتے ہیں (اور کون نہیں کرے گا) تو مجھے بتانے کیلئے، آگے بڑھیے اور اِس پوسٹ کے نیچے لائیک :heart: کا بٹن دبائیے۔
+
+          کیا آپ **ایک تصویر کے ساتھ جواب دے سکتے ہیں؟** کوئی بھی تصویر چلے گی! ڈریگ اور ڈراپ، اپ لوڈ کا بٹن دبائیں، یا اسے اندر کاپی اور پیسٹ بھی کر سکتے ہیں۔
+        reply: |-
+          اچھی تصویر - آپ کو بتانے کیلئے کہ یہ مجھے کتنی پسند ائی ہے میں نے لائیک :heart: کا بٹن دبایا :heart_eyes:
+        like_not_found: |-
+          کیا آپ میری [پوسٹ](%{url}) کو لائیک :heart: کرنا بھول گئے؟ :crying_cat_face:
+        not_found: |-
+          لگتا ہے کہ آپ نے کوئی تصویر اَپ لوڈ نہیں کی اِس لیے میں نے ایک تصویر کومنتخب کیا جو مجھے _یقین_ ہے کہ آپ کو لطف اندوز کرے گی۔
+          `%{image_url}`
+
+          پھر اس والی کو اَپ لوڈ کرنے کی کوشش کریں، یا لنک کو ایک لائین میں اکیلا پیسٹ کریں!
+      formatting:
+        instructions: |-
+          کیا آپ اپنے جواب میں کچھ الفاظ کو **بولڈ** یا _آئیٹیلک_ بنا سکتے ہیں؟
+
+          - `** بولڈ **` یا `_آئیٹیلک_` ٹائپ کریں
+
+          - یا، ایڈیٹر میں <kbd><b>B</b></kbd> یا <kbd><i>I</i></kbd>بٹن دبائیے
+        reply: |-
+          اعلیٰ کام! HTML اور BBCode بھی فارمَیٹِنگ کیلئے کام کرتے ہیں - مزید جاننے کے لئے، [اِس ٹیوٹوریل کو آزمائیں] (http://commonmark.org/help) :nerd:
+        not_found: |-
+          اوہ، مجھے آپ کے جواب میں کوئی فارمَیٹِنگ نظر نہیں آئی۔ :pencil2:
+
+          کیا آپ دوبارہ کوشش کر سکتے ہیں؟ اگر آپ پھنس جائیں تو ایڈیٹر میں <kbd><b>B</b></kbd> بولڈ یا <kbd><i>I</i></kbd>آئیٹیلک بٹن استعمال کریں۔
+      quoting:
+        instructions: |-
+          کیا آپ جواب دیتے وقت میری پوسٹ کا اقتباس دے سکتے ہیں، تاکہ میں جان سکوں کہ آپ کس خاص حصے کا جواب دے رہے ہیں؟
+
+          > اگر یہ کافی ہے، تو براہ مہربانی میرے لیے چائے لے آئیے؛ لیکن اگر یہ چائے ہے، تو براہ مہربانی میرے لیے کافی لے آئیے۔
+          >
+          > اپنے آپ سے بات کرنے کا ایک فائدہ یہ ہے کہ آپ کو پتہ ہے کہ کم از کم ایک شخص تو سن رہا ہے
+          >
+          > کچھ لوگوں کو الفاظ، اور دوسرے لوگوں کے ساتھ ایک سلیکہ آتا ہے... اوہ، اہ،سلیکہ نہیں آتا۔
+
+          اپنی مرضی کے متن کے جملوں کو سَلَیکٹ کریں &uarr; اور پھر **اقتباس** بٹن پر کلک کریں جو آپ کے انتخاب پر پاپ اَپ کرتا ہے - یا اِس پوسٹ کے نیچے **جواب** کا بٹن۔
+
+          اقتباس کے نیچے، کیونکہ مجھے تجسس ہے، ایک یا دو الفاظ لکھیں کہ آپ نے یہ کیوں منتخب کیا :thinking:
+        reply: |-
+          اعلیٰ کام، آپ نے میرا پسندیدہ اقتباس اٹھایا! :left_speech_bubble:
+        not_found: |-
+          ہمم، ایسا لگتا ہے جیسے آپ نے اپنے جواب میں مجھے اقتباس نہیں کیا؟
+
+          میری پوسٹ میں سے کسی بھی متن کو سَلَیکٹ کرنے پر <kbd>**اقتباس**</kbd> بٹن سامنے آجاَئے گا۔ اور سَلَیکٹ کردہ متن کے ہوتے ہوے **جواب دیں** دبانے سے بھی کام چل جائے گا! کیا آپ دوبارہ کوشش کر سکتے ہیں؟
+      bookmark:
+        instructions: |-
+          اگر آپ مزید جاننا چاہتے ہیں، تو ذیل میں <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> منتخب کریں اور <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **اِس ذاتی پیغام کو بُک مارک کریں**۔ اگر آپ ایسا کرتے ہیں، تو ہو سکتا ہے کہ آپ کے مستقبل میں ایک :gift: ہو!
+        reply: |-
+          بہترین! اَب آپ [اپنی پروفائل پر موجود بُک مارکس ٹَیب](%{profile_page_url}/activity/bookmarks) کے زریعے آسانی سے ہماری نجی بات چیت تک دوبارہ رسائی حاصل کر سکتے ہیں۔ صرف اوپری دائیں طرف پر اپنی پروفائل تصویر کو سَلَیکٹ کریں &#8599;
+        not_found: |-
+          اوہ، مجھے اس ٹاپک میں کوئی بک مارکس نظر نہیں آرہے۔ کیا آپ کو ہر پوسٹ کے نیچے بُک مارک ملا؟ اگر ضرورت ہو تو اضافی کارروائیوں کو ظاہر کرنے کیلئے مزید دکھایے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> کو استعمال کریں۔
+      emoji:
+        instructions: |-
+          آپ نے مجھے اپنے جوابات میں چھوٹی تصاویر استعمال کرتے دیکھا ہو گا :blue_car::dash: اِنہیں [اِیمَوجی](https://en.wikipedia.org/wiki/Emoji) کہا جاتا ہے۔ کیا آپ اپنے جواب کے ساتھ **ایک اِیمَوجی شامل** کر سکتے ہیں؟ ان میں سے کوئی بھی کام کرے گا:
+
+          - ٹائپ کریں `:) ;) :D :P :O`
+
+          - کالَن ٹائپ کریں <kbd>:</kbd> اور پھر اِیمَوجی کا نام مکمل کریں `:tada:`
+
+          - ایڈیٹر میں یا اپنے موبائل کی بورڈ پر اِیمَوجی بٹن <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> دبائیں
+        reply: |-
+          یہ :sparkles: _اِیمَوجِسٹَیٹِک!_ :sparkles: ہے
+        not_found: |-
+          اوہ، مجھے آپ کے جواب میں کوئی اِیمَوجی نظر نہیں آرہا؟ ارے نہیں! :sob:
+
+          اِیمَوجی چنائو کو لانے کیلۓ کالَن <kbd>:</kbd> ٹائپ کرنے کی کوشش کریں، پھر جو آپ چاہتے ہیں اس کے پہلے کچھ حروف ٹائپ کریں، جیسے کہ `:bird:`
+
+          یا، ایڈیٹر میں اِیمَوجی بٹن <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> دبائیں۔
+
+          (اگر آپ موبائل ڈیوائس پر ہیں، تو آپ براہ راست آپنے کی بورڈ سے بھی اِیمَوجی درج کر سکتے ہیں۔)
+      mention:
+        instructions: |-
+          جب آپ کسی شخص کو براہ راست جواب نہ دے رہے ہوں، تب بھی آپ کبھی کبھی اُن کو کی توجہ حاصل کرنا ہوسکتی ہے۔ `@` ٹائپ کریں پھر ان کا ذکر کرنے کیلئے اُن کا صارف نام مکمل کریں۔
+
+          کیا آپ اپنے جواب میں **`@%{discobot_username}`** کا ذکر کرسکتے ہیں؟
+        reply: |-
+          _کیا کسی نے میرا نام لیا!؟_ :raised_hand: میرے خیال میں آپ نے لیا! :wave: ٹھیک ہے، میں یہاں ہوں! میرا ذکر کرنے کیلئے شکریہ۔ :ok_hand:
+        not_found: |-
+          مجھے اپنا نام کہیں بھی نظر نہیں آرہا :frowning: کیا آپ مجھے `@%{discobot_username}` کے طور پر دوبارہ ذکر کرنے کی کوشش کر سکتے ہیں؟
+
+          (اور جی ہاں، میرا صارف نام 1970 کے رقص سنک کی طرح _ڈسکو_ ہجے کیا جاتا ہے۔ میں کرتا ہوں [رات کی زندگی سے محبت!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          ہمیں دوستانہ گفتگو پسند ہے، اور ہمیں [چیزوں کو مہذب رکھنے کیلئے](%{guidelines_url}) آپ کی مدد کی ضرورت ہے۔ اگر آپ کو کوئی مسئلہ نظر آتا ہے، تو براہ کرم مصنف کو، یا [ہمارے مددگار اسٹاف](%{about_url})، کو نجی طور پر اطلاع دینے کیلئے فلَیگ کریں۔
+
+          > :imp: میں نے کچھ گندا یہاں لکھا
+
+          آپ جانتے ہیں کہ آپ کو کیا کرنا ہے۔ آگے بڑھیں اور نامناسب کے طور پر **اِس پوسٹ کو فلَیگ کریں** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">!
+        reply: |-
+          [ہمارے اسٹاف](/groups/staff) کو آپ کے فلَیگ کے بارے میں نجی طور پر مطلع کیا جائے گا۔ اگر کافی کمیونٹی ممبران ایک پوسٹکو فلَیگ کرتے ہیں، تو یہ خود بخود احتیاط کے طور پر پوشیدہ کر دی جائے گا۔ (چونکہ میں نے اصل میں ایک گندی پوسٹ نہیں لکھی :angel:، میں نے ابھی فلَیگ کو ہٹا دیا ہے۔)
+        not_found: |-
+          اوہ نہیں، میری گندی پوسٹ ابھی تک فلَیگ نہیں ہوئی۔ :worried: کیا آپ **فلَیگ** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> کا استعمال کرتے ہوئے اسے غیر مناسب کے طور پر فلَیگ کر سکتے ہیں؟ ہر پوسٹ پر اضافی کارروائیوں کو ظاہر کرنے کیلئے مزید دکھایے بٹن <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> کا استعمال کرنا نہ بھولیے گا۔
+      search:
+        instructions: |-
+          _ارے_ ... میں نے اس ٹاپک میں سَرپرائیز چھپایا ہے۔ اگر آپ چیلنج کیلۓ تیار ہیں، تو اس کو تلاش کرنے کیلۓ اوپر دائیں جانب &#8599; ** سرچ کے آئکن کو سَلَیکٹ کریں** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">۔
+
+          اِس ٹاپک میں "کَیپی&#8203;بارا" اصطلاح سرچ کرنے کی کوشش کریں
+        hidden_message: |-
+          آپ نے یہ کَیپیبارا کیسے مِس کر دیا؟ :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          کیا آپ نے نوٹ کیا کہ اب آپ واپس شروع پر پہنچ گئے ہیں؟ اِس بیچارے بھوکے کَیپیبارا کو **`:herb:` اِیمَوجی سے جواب دے کر** کھانا کھلائیں اور آپ کو خود بخود آخر میں لے جایا جائے گا۔
+        reply: |-
+          شاباش آپ نے اسے ڈھونڈ لیا :tada:
+
+          - مزید تفصیلی سرچز کیلئے، [مکمل سرچ کے صفحے](%{search_url}) پر جائیں۔
+
+          - ایک طویل بحث میں کہیں بھی جانے کیلئے، دائیں پر (اور موبائل پر، سب سے نیچے) ٹاپک ٹائم لائن کنٹرولز کا اِستعمال کریں۔
+
+          - اگر آپ کے پاس اصل :keyboard: ہے، تو ہمارے آسان کی بورڈ شارٹ کٹس دیکھنے کیلئے <kbd>؟</kbd>دبائیں۔
+        not_found: |-
+          ہمم... لگتا ہے جیسے آپ کو کوئی مسئلہ درپیش ہے۔ اس کیلئے معذرت۔ کیا آپ نے اصطلاح **کَیپی&#8203;بارا** سرچ <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> کی؟
+      end:
+        message: |-
+          میرے ساتھ رہنے کا شکریہ @%{username}! میں نے آپ کیلئے یہ بنایا، میں سمجھتا ہوں کہ آپ اِس کے مستحق ہیں:
+          %{certificate}
+
+          ابھی کیلئے یہ کافی ہے! اب سب کے لئے! [** ہمارے تازہ ترین بحث کے ٹاپک**](/latest) یا [**بحث کے زمرہ جات**](/categories) چیک کریں۔ :sunglasses:
+
+          (اگر آپ مزید جاننے کیلئے مجھ سے دوبارہ بات کرنا چاہتے ہیں، تو کسی بھی وقت مجھے صرف پیغام بھیجیں یا `@%{discobot_username}` زکر کریں!)
+      certificate:
+        alt: 'کامیابی کا سرٹیفِکیٹ'
+    advanced_user_narrative:
+      reset_trigger: 'اَیڈوانسڈ صارف'
+      cert_title: "اَیڈوانسڈ صارف ٹیوٹوریل کی کامیاب تکمیل کے اعتراف میں"
+      title: ':arrow_up: اَیڈوانسڈ صارف کی صلاحیتیں'
+      start_message: |-
+        ایک _اَیڈوانسڈ_ صارف کے طور پر، کیا آپ نے ابھی تک [اپنے ترجیحات کے صفحے]() کا دورہ کیا ہے @%{username}؟ سائیٹ پر اپنے تجربے کو اپنی مرضی کے مطابق ڑھالنے کیلئے بہت سے طریقے ہیں، جیسے کہ سیاہ یا ہلکی تھِیم کو منتخب کیا جائے۔
+
+        لیکن میں اصل موضوع سے دور جا رہا ہوں، چلیں شروع کرتے ہیں!
+      edit:
+        bot_created_post_raw: "@%{discobot_username}، میری جان پہچان میں دور تک سب سے بہترین بَوٹ ہے :wink:"
+        instructions: |-
+          ہر کوئی غلطیاں کرتا ہے۔ لیکن پریشان ہوں، آپ اپنی پوسٹس ٹھیک کرنے کیلۓ ہمیشہ اُن میں ترمیم کر سکتے ہیں!
+
+          میں نے جو پوسٹ آپ کی جانب سے ابھی بنائی ہے کیا آپ اُسے **ترمیم** کر کہ شروعات کر سکتے ہیں؟
+        not_found: |-
+          لگتا ہے کہ جو [پوسٹ](%{url}) میں نے آپ کے لئے تیار کی تھی، ابھی تک آپ نے اُس میں ترمیم نہیں کی۔ کیا آپ دوبارہ کوشش کر سکتے ہیں؟
+          اَیڈیٹر کو سامنے لانے کیلئے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> آئکن کا استعمال کریں۔
+        reply: |-
+          شاندار کام!
+
+          نوٹ کریں کہ 5 منٹ کے بعد ہونے والی ترمیمیں، عوامی ترمیم رویثنز کے طور پر دکھائی جائیں گی، اور اوپر دائیں جانب رویثن شمار کے ساتھ ایک چھوٹا سا پنسل آئیکن ظاہر ہو جائے گا۔
+      delete:
+        instructions: |-
+          اگر آپ کی بنائی گئی کسی پوسٹ کو آپ واپس لینا چاہتے ہیں، تو آپ اسے حذف کرسکتے ہیں۔
+
+          آگے بڑھیے اور <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **حذف** کارروائی کا استعمال کرتے ہوے اپنی کسی بھی پوسٹ کو **حذف** کریں **۔ اگرچہ، پہلی پوسٹ کو حذف نہ کریے گا!
+        not_found: |-
+          مجھے ابھی تک کوئی حذف کردہ پوسٹ نظر نہیں آرہیں؟ یاد رکھیے کہ <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> مزید دکھایے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> حذف کو ظاہر کرے گا۔
+        reply: |-
+          اوہ! :boom:
+
+          گفتگو کے تسلسل کو برقرار رکھنے کیلئے، حذف فوری طور پر انجام نہیں ہوتا، لہٰذا پوسٹ کچھ وقت کے بعد ہٹا دیی جائے گی۔
+      recover:
+        deleted_post_raw: '%{discobot_username}نے میری پوسٹ کو کیوں حذف کردیا؟ :anguished:'
+        instructions: |-
+          ارے نہیں! لگتا ہے کہ جو پوسٹ میں نے آپ کیلئے بنائی تھی، اُسے غلطی سے میں نے حذف کر دیا۔
+
+          کیا آپ مجھ پر ایک احسان کر سکتے ہیں اور اُسے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **واپس بحال** کر دیں؟
+        not_found: |-
+          کوئی دشواری ہو رہی ہے؟ یاد رکھیے کہ <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> مزید دکھایے <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16">واپس بحال کو ظاہر کرے گا۔
+        reply: |-
+          شکر ہے، بال بال بچے! واپس درست کر دینے کیلئے شکریہ :wink:
+
+          نوٹ کریں کہ پوسٹ کو واپس بحال کرنے کیلئے آپ کے پاس صرف 24 گھنٹے ہوتے ہیں۔
+      category_hashtag:
+        instructions: |-
+          کیا آپ جانتے تھے کہ آپ اپنی پوسٹ میں زمرہ جات اور ٹیگز کا حوالہ دے سکتے ہیں؟ مثال کے طور پر، کیا آپ نے %{category} زمرہ دیکھا ہے؟
+
+          جملے کے درمیان میں `#` ٹائیپ کریں اور کسی بھی زمرہ یا ٹیگ کو منتخب کریں۔
+        not_found: |-
+          ہمم، مجھے وہاں کہیں بھی کوئی زمرہ نظر نہیں آرہا۔ نوٹ کریں کہ `#` پہلا حرف نہیں ہوسکتا۔ کیا آپ اِس کو اپنے اگلے جواب میں نقل کرسکتے ہیں؟
+
+          ```متن
+          میں # کے ذریعہ ایک زمرہ کا لنک بنا سکتا ہوں
+          ```
+        reply: |-
+          بہترین! یاد رکھیے کہ یہ دونوں زمروں _اور_ ٹیگز کیلئے کام کرتا ہے، اگر ٹیگز فعال کیے ہوے ہوں۔
+      change_topic_notification_level:
+        instructions: |-
+          ہر ٹاپک میں ایک نوٹیفکیشن لَیوَل ہوتا ہے۔ یہ 'نارمل' پر شروع ہوتا ہے، جس کا مطلب ہے کہ آپ عام طور پر صرف اِس صورت پر مطلع کیے جائیں گے جب کوئی براہ راست آپ سے بات کررہا ہو۔
+
+          پہلے سے طے شدہ طور پر، ایک نجی پیغام کے لئے نوٹیفیکیشن لَیوَل 'دیکھا جا رہا' کے اعلیٰ ترین درجے پر مقرر کی جاتی ہے، جس کا مطلب ہے کہ آپ کو ہر نئے جواب سے مطلع کیا جائے گا۔ لیکن آپ _کسی_ بھی ٹاپک کیلئے نوٹیفیکیشن لَیوَل کو 'دیکھیں'، 'ٹریکنگ' یا 'خاموش کردہ' پر تبدیل کرسکتے ہیں۔
+
+          آئیے، اِس ٹاپک کا نوٹیفیکیشن لَیوَل تبدیل کرنے کی کوشش کریں۔ ٹاپک کے نچلے حصے میں، آپ کو ایک بٹن ملے گا جس سے ظاہر ہوتا ہے کہ آپ اِس ٹاپک کو **دیکھ** رہے ہیں. کیا آپ نوٹیفیکیشن لَیوَل کو**ٹریکنگ** میں تبدیل کرسکتے ہیں؟
+        not_found: |-
+          لگتا ہے کہ آپ اب بھی اِس ٹاپک کو دیکھ :eyes: رہے ہیں! اگر آپ کو اسے تلاش کرنے میں دشواری ہوری ہے، نوٹیفیکیشن لَیوَل کا بٹن ٹاپک کے نچلے حصے میں واقع ہے۔
+        reply: |-
+          شاباش! مجھے امید ہے کہ آپ نے اس ٹاپک کو خاموش نہیں کردیا کیونکہ میں بعض اوقات تھوڑا سا باتونی ہو سکتا ہوں :grin:۔
+
+          نوٹ کریں کہ جب آپ کسی ٹاپک پر جواب دیتے ہیں یا چند منٹ سے زائد ایک ٹاپک کو پڑھتے ہیں، تو یہ خود کار طریقے سے 'ٹریکنگ' کے نوٹیفیکیشن لَیوَل پر سَیٹ کر دیا جاتا ہے۔ آپ اسے [اپنی صارف ترجیحات](/my/preferences) میں تبدیل کرسکتے ہیں۔
+      poll:
+        instructions: |-
+          کیا آپ جانتے تھے کہ آپ کسی بھی پوسٹ کو ساتھ ایک پَول شامل کرسکتے ہیں؟ **ایک پَول بنانے** کیلئے ایڈیٹر میں <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> گَیئر کا استعمال کریں۔
+        not_found: |-
+          اوہو! آپ کے جواب میں کوئی پَول نہیں تھا۔
+
+          ایڈیٹر میں <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> گَیئر آیکن کا استعمال کریں، یا یہ پَول اپنے اگلے جواب میں کاپی اور پیسٹ کریں:
+
+          ```متن
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+        reply: |-
+          ارے، اچھا پَول! میں آپ کو تعلیم دینے میں کیسا رہا؟
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          بعض اوقات آپ اپنے جوابات میں **تفصیلات چھپانا** چاہیں گے:
+
+          - جب آپ کسی فلم یا ٹی وی شو کے پلاٹ پوائنٹس، جو کہ سپائیلر سمجھے جائیں، پر بحث کررہے ہوں۔
+
+          - جب آپ کی پوسٹ کو بہت ساری اضافی تفصیلات کی ضرورت ہو لیکن وہ سب ایک بار میں ایک ساتھ پڑھنا بہت زیادہ لگے۔
+
+          [تفصیلات=اسے منتخب کریں دیکھنے کیلئے کہ یہ کیسے کام کرتا ہے!]
+          1. ایڈیٹر میں <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">گَیئر منتخب کریں۔
+          2. "تفصیلات چھپائیں" منتخب کریں۔
+          3. تفصیلات کا خلاصہ ترمیم کریں اور اپنے مواد کو شامل کریں۔
+          [/ تفصیلات]
+
+          کیا آپ <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> گَیئر کا استعمال کرکہ اپنے اگلے جواب میں ایک تفصیلات کا سیکشن شامل کرسکتے ہیں؟
+        not_found: |-
+          تفصیلات ویجَیٹ بنانے میں دشواری ہو رہی ہے؟ اپنے اگلے جواب میں درج ذیل شامل کرنے کی کوشش کریں:
+
+          ```متن
+          [تفصیلات=تفصیلات کے لیے مجھے منتخب کریں]
+          یہاں تفصیلات ہیں
+          [/ تفصیلات]
+          ```
+        reply: |-
+          عظیم کام - آپ کی _تفصیل_ پہ توجہ قابل ستائش ہے!
+      end:
+        message: |-
+          آپ یقیناً ایک _اَیڈوانسڈ صارف_ کی طرح سے اِس میں سے گزر گئے :bow:
+
+          %{certificate}
+
+          بس آپ کیلئے میرے پاس یہی ہے۔
+
+          ابھی کے لئے الوداع! اگر آپ دوبارہ میرے ساتھ بات کرنا چاہیں، تو مجھے کسی بھی وقت ایک پیغام بھیجیں :sunglasses:
+      certificate:
+        alt: 'اَیڈوانسڈ صارف ٹریک کا کامیابی کا سرٹیفِکیٹ'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
index a8e8036a40..ab6c420568 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -221,8 +221,6 @@ zh_CN:
 
           选择我帖子中的任何文字都会弹出<kbd>**引用**</kbd>按钮。然后选中文字的同时按下**回复**按钮也可以！你可以再试一次吗？
       bookmark:
-        instructions: |-
-          如果你想了解更多，请选择下方<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">并<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16">**收藏此私信**。如果你这样做，你一会可能收到份 :gift: ！
         reply: |-
           太棒了！现在你可以轻松地找到我们的私信了。它就在[你个人页面的收藏栏](%{profile_page_url}/activity/bookmarks)中。选择右上方你的个人头像  &#8599;
         not_found: |-
@@ -357,12 +355,6 @@ zh_CN:
         reply: |-
           漂亮！记住这对分类和标签（如果站点启用了它的话）都有用。
       change_topic_notification_level:
-        instructions: |-
-          每个主题都有通知等级。默认为“普通”，只有别人直接回复你的时候才会提醒你。
-
-          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以覆盖任意一个主题的通知等级至“监看”、“追踪”或“静音”。
-
-          让我们试试改变这个主题的通知等级。在主题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改到**追踪**吗？
         not_found: |-
           看起来你仍在监看 :eyes: 这个主题！没找到按钮？通知等级就在主题页面的最下方。
         reply: |-
@@ -391,20 +383,6 @@ zh_CN:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          有时你可能想在回复中**隐藏详情**：
-
-          - 当你讨论电影或者电视节目中可能剧透的情节时。
-
-          - 当你帖子中有大量一次性读完可能太困难的可选细节时。
-
-          [details=点这里看它如何工作！]
-          1. 点击编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标。
-          2. 选择“隐藏详情”。
-          3. 编辑详情概要并添加内容。
-          [/details]
-
-          你可以用编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标在下次回复中添加一节详情吗？
         not_found: |-
           添加详情控件时碰到麻烦了？试试在下个回复中包含下列文字：
 
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index cb95d19cba..22dede0bbc 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -112,6 +112,10 @@ after_initialize do
     end
   end
 
+  self.on(:user_unstaged) do |user|
+    user.enqueue_bot_welcome_post
+  end
+
   self.add_to_class(:user, :enqueue_bot_welcome_post) do
     return if SiteSetting.disable_discourse_narrative_bot_welcome_post
 
diff --git a/plugins/discourse-narrative-bot/server.sr.yml b/plugins/discourse-narrative-bot/server.sr.yml
deleted file mode 100644
index 5380c47005..0000000000
--- a/plugins/discourse-narrative-bot/server.sr.yml
+++ /dev/null
@@ -1 +0,0 @@
-sr: {}
diff --git a/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb b/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
index 5e2f58d84e..c635a357ca 100644
--- a/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
@@ -28,8 +28,8 @@ describe "Discobot Certificate" do
         }
 
         params.each do |key, _|
-          expect { get '/discobot/certificate.svg', params: params.except(key) }
-            .to raise_error(Discourse::InvalidParameters)
+          get '/discobot/certificate.svg', params: params.except(key)
+          expect(response.status).to eq(400)
         end
       end
     end
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
index bc5d6876f3..97936135d0 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
@@ -1,9 +1,10 @@
 {{#if shouldDisplay}}
   <div class="presence-users">
-    {{#each users as |user|}}
-      {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
-    {{/each}}
-
+    <div class="presence-avatars">
+      {{#each users as |user|}}
+        {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
+      {{/each}}
+    </div>
     <span class="presence-text">
       <span class="description">
         {{#if isReply ~}}
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
index a459527ff4..636ba39a26 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
@@ -1,9 +1,10 @@
 {{#if shouldDisplay}}
   <div class="presence-users">
-    {{#each users as |user|}}
-      {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
-    {{/each}}
-
+    <div class="presence-avatars">
+      {{#each users as |user|}}
+        {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
+      {{/each}}
+    </div>
     <span class="presence-text">
       <span class="description">{{i18n 'presence.replying_to_topic' count=users.length}}</span>{{!-- (using comment to stop whitespace)
   --}}<span class="wave"><span class="dot">.</span><span class="dot">.</span><span class="dot">.</span></span>
diff --git a/plugins/discourse-presence/assets/stylesheets/presence.scss b/plugins/discourse-presence/assets/stylesheets/presence.scss
index bd4612817f..3fc25f06a5 100644
--- a/plugins/discourse-presence/assets/stylesheets/presence.scss
+++ b/plugins/discourse-presence/assets/stylesheets/presence.scss
@@ -1,15 +1,24 @@
 .presence-users {
   background-color: $secondary;
   color: $primary-medium;
-  padding: 0px 5px;
   display: flex;
-  align-items: center;
   
   span.presence-text {
     margin-left: 5px;
+    margin-right: 2px;
+    flex: 0 0 auto;
+    padding-top: 3px;    
+  }
+
+  .presence-avatars {
+    display: flex;
+    overflow: hidden;
+    flex-wrap: wrap;    
   }
 
   .wave {
+    flex: 0 0 auto;
+    
     .dot {
       display: inline-block;
       animation: wave 1.8s linear infinite;
@@ -38,13 +47,26 @@
 .composer-fields .presence-users {
   position: absolute;
   top: 18px;
-  right: 35px;
+  right: 40px;
+  @media screen and (max-width: $small-width) {
+    max-width: 318px;    
+    .presence-avatars {
+      flex-wrap: nowrap;
+    }
+  }
 }
 
 .mobile-view {
+  .presence-users {
+    font-size: $font-down-1;
+  }
   .composer-fields .presence-users {
     top: 3px;
-    right: 54px;
+    right: 65px;
+    max-width: 70px;
+    .presence-avatars {
+      flex-wrap: nowrap;
+    }
     .description {
       display:none;
     }
diff --git a/plugins/discourse-presence/config/locales/client.et.yml b/plugins/discourse-presence/config/locales/client.et.yml
index 8c601aa1ed..76578a243f 100644
--- a/plugins/discourse-presence/config/locales/client.et.yml
+++ b/plugins/discourse-presence/config/locales/client.et.yml
@@ -5,4 +5,8 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-et: {}
+et:
+  js:
+    presence:
+      replying: "vastamine"
+      editing: "muutmine"
diff --git a/plugins/discourse-presence/config/locales/client.fa_IR.yml b/plugins/discourse-presence/config/locales/client.fa_IR.yml
index 3f564b2f11..3aa42abe81 100644
--- a/plugins/discourse-presence/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-presence/config/locales/client.fa_IR.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-fa_IR: {}
+fa_IR:
+  js:
+    presence:
+      replying: "در حال نوشتن پاسخ"
diff --git a/plugins/discourse-presence/config/locales/client.he.yml b/plugins/discourse-presence/config/locales/client.he.yml
index 96b15d6088..d7095845e9 100644
--- a/plugins/discourse-presence/config/locales/client.he.yml
+++ b/plugins/discourse-presence/config/locales/client.he.yml
@@ -5,4 +5,11 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-he: {}
+he:
+  js:
+    presence:
+      replying: "תגובה"
+      editing: "עריכה"
+      replying_to_topic:
+        one: "מגיב/ה"
+        other: "מגיבים"
diff --git a/plugins/discourse-presence/config/locales/client.it.yml b/plugins/discourse-presence/config/locales/client.it.yml
index 12c5162aab..2a9157a791 100644
--- a/plugins/discourse-presence/config/locales/client.it.yml
+++ b/plugins/discourse-presence/config/locales/client.it.yml
@@ -5,4 +5,11 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-it: {}
+it:
+  js:
+    presence:
+      replying: "sta rispondendo"
+      editing: "modificando"
+      replying_to_topic:
+        one: "sta rispondendo"
+        other: "stanno rispondendo"
diff --git a/plugins/discourse-presence/config/locales/client.ur.yml b/plugins/discourse-presence/config/locales/client.ur.yml
index 58bc9735bc..999335c728 100644
--- a/plugins/discourse-presence/config/locales/client.ur.yml
+++ b/plugins/discourse-presence/config/locales/client.ur.yml
@@ -5,4 +5,11 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ur: {}
+ur:
+  js:
+    presence:
+      replying: "جواب دے رہے ہیں"
+      editing: "ترمیم کر رہے ہیں"
+      replying_to_topic:
+        one: "جواب دے رہا ہے"
+        other: "جواب دے رہے ہیں"
diff --git a/plugins/discourse-presence/config/locales/server.en.yml b/plugins/discourse-presence/config/locales/server.en.yml
index 72768d3f25..1de132d696 100644
--- a/plugins/discourse-presence/config/locales/server.en.yml
+++ b/plugins/discourse-presence/config/locales/server.en.yml
@@ -1,3 +1,4 @@
 en:
   site_settings:
     presence_enabled: 'Show users that are currently replying to the current topic, or editing the current post?'
+    presence_max_users_shown: 'Maximum number of users shown.'
diff --git a/plugins/discourse-presence/config/locales/server.he.yml b/plugins/discourse-presence/config/locales/server.he.yml
index 96b15d6088..fffac3380d 100644
--- a/plugins/discourse-presence/config/locales/server.he.yml
+++ b/plugins/discourse-presence/config/locales/server.he.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-he: {}
+he:
+  site_settings:
+    presence_enabled: 'להציע משתמשים שמגיבים כרגע לנושא הנוכחי או עורכים את הרשומה הנוכחית?'
diff --git a/plugins/discourse-presence/config/locales/server.it.yml b/plugins/discourse-presence/config/locales/server.it.yml
index 12c5162aab..d946eb0ae0 100644
--- a/plugins/discourse-presence/config/locales/server.it.yml
+++ b/plugins/discourse-presence/config/locales/server.it.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-it: {}
+it:
+  site_settings:
+    presence_enabled: 'Mostrare gli utenti mentre stanno rispondendo ad un argomento oppure modificando il messaggio corrente?'
diff --git a/plugins/discourse-presence/config/locales/server.nb_NO.yml b/plugins/discourse-presence/config/locales/server.nb_NO.yml
index 508a3706c4..afe1baf128 100644
--- a/plugins/discourse-presence/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-presence/config/locales/server.nb_NO.yml
@@ -7,4 +7,4 @@
 
 nb_NO:
   site_settings:
-    presence_enabled: 'Vis brukere som akkurat nå svarer på gjeldende emne, eller redigerer gjeldende innlegg?'
+    presence_enabled: 'Vis brukere som akkurat nå svarer på gjeldende tråd, eller redigerer gjeldende innlegg?'
diff --git a/plugins/discourse-presence/config/locales/server.sk.yml b/plugins/discourse-presence/config/locales/server.sk.yml
index bcc3a93dc5..f1324fa754 100644
--- a/plugins/discourse-presence/config/locales/server.sk.yml
+++ b/plugins/discourse-presence/config/locales/server.sk.yml
@@ -5,4 +5,7 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sk: {}
+sk:
+  site_settings:
+    presence_enabled: 'Chcete zobraziť používateľov, ktorí momentálne odpovedajú na aktuálnu tému, alebo upravujú aktuálny príspevok?'
+    presence_max_users_shown: 'Mazimálny počet zobrazených používateľov.'
diff --git a/plugins/discourse-presence/config/locales/server.ur.yml b/plugins/discourse-presence/config/locales/server.ur.yml
index 58bc9735bc..e4c7d495ab 100644
--- a/plugins/discourse-presence/config/locales/server.ur.yml
+++ b/plugins/discourse-presence/config/locales/server.ur.yml
@@ -5,4 +5,6 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ur: {}
+ur:
+  site_settings:
+    presence_enabled: 'صارفین کو دکھائیں جو فی الحال موجودہ موضوع کا جواب دے رہے ہیں، یا موجودہ پوسٹ میں ترمیم کر رہے ہیں؟'
diff --git a/plugins/discourse-presence/config/settings.yml b/plugins/discourse-presence/config/settings.yml
index 56341eeea2..07c96c3d2b 100644
--- a/plugins/discourse-presence/config/settings.yml
+++ b/plugins/discourse-presence/config/settings.yml
@@ -2,3 +2,7 @@ plugins:
   presence_enabled:
     default: true
     client: true
+  presence_max_users_shown:
+    default: 5
+    min: 1
+    max: 50
diff --git a/plugins/discourse-presence/plugin.rb b/plugins/discourse-presence/plugin.rb
index f1e43f3f7e..fd6dc6a054 100644
--- a/plugins/discourse-presence/plugin.rb
+++ b/plugins/discourse-presence/plugin.rb
@@ -8,7 +8,7 @@ enabled_site_setting :presence_enabled
 
 register_asset 'stylesheets/presence.scss'
 
-PLUGIN_NAME ||= "discourse-presence".freeze
+PLUGIN_NAME ||= -"discourse-presence"
 
 after_initialize do
 
@@ -103,8 +103,7 @@ after_initialize do
     requires_plugin PLUGIN_NAME
     before_action :ensure_logged_in
 
-    ACTIONS   ||= %w{edit reply}.each(&:freeze)
-    MAX_USERS ||= 20
+    ACTIONS ||= [-"edit", -"reply"].freeze
 
     def publish
       data = params.permit(
@@ -158,7 +157,7 @@ after_initialize do
       {
         messagebus_channel: channel,
         messagebus_id: MessageBus.last_id(channel),
-        users: users.limit(MAX_USERS).map { |u| BasicUserSerializer.new(u, root: false) }
+        users: users.limit(SiteSetting.presence_max_users_shown).map { |u| BasicUserSerializer.new(u, root: false) }
       }
     end
 
diff --git a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
index 0184718bc6..8a003a9e4e 100644
--- a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
+++ b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
@@ -23,7 +23,8 @@ describe ::Presence::PresencesController do
 
   context 'when not logged in' do
     it 'should raise the right error' do
-      expect { post '/presence/publish.json' }.to raise_error(Discourse::NotLoggedIn)
+      post '/presence/publish.json'
+      expect(response.status).to eq(403)
     end
   end
 
diff --git a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
index 184cd20573..df121a8af6 100644
--- a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
+++ b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
@@ -1,5 +1,5 @@
 .poll-ui-builder-form {
-  margin: 0px;
+  margin: 0;
 
   .input-group {
     padding: 10px;
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index d52c6e1429..845a2a391a 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -4,7 +4,7 @@ $text-color: #9E9E9E;
 $option-background: dark-light-diff($primary, $secondary, 90%, -65%);
 
 div.poll {
-  margin: 10px 0px;
+  margin: 10px 0;
   border: 1px solid $border-color;
 
   @include unselectable;
diff --git a/plugins/poll/config/locales/client.he.yml b/plugins/poll/config/locales/client.he.yml
index 452e3b3ed3..73d725c0ed 100644
--- a/plugins/poll/config/locales/client.he.yml
+++ b/plugins/poll/config/locales/client.he.yml
@@ -55,6 +55,7 @@ he:
         help:
           options_count: הכניסו לפחות 2 אפשרויות
           invalid_values: ערך מינימלי חייב להיות קטן מערך מקסימלי.
+          min_step_value: ערך הצעד המזערי הוא 1
         poll_type:
           label: סוג
           regular: בחירה בודדת
diff --git a/plugins/poll/config/locales/client.ur.yml b/plugins/poll/config/locales/client.ur.yml
index e0ae607df4..e178e93312 100644
--- a/plugins/poll/config/locales/client.ur.yml
+++ b/plugins/poll/config/locales/client.ur.yml
@@ -54,6 +54,8 @@ ur:
         insert: پول شامل کریے
         help:
           options_count: کم از کم 2 آپشنس اینٹر کریں
+          invalid_values: کم از کم قدر زیادہ سے زیادہ قدر سے چھوٹا ہونا ضروری ہے۔
+          min_step_value: کم از کم اضافہ یا کمی کی قدر 1 ہے
         poll_type:
           label: قِسم
           regular: اکیلا انتخاب
diff --git a/plugins/poll/config/locales/server.fa_IR.yml b/plugins/poll/config/locales/server.fa_IR.yml
index 2ebc151a22..ea70d278cb 100644
--- a/plugins/poll/config/locales/server.fa_IR.yml
+++ b/plugins/poll/config/locales/server.fa_IR.yml
@@ -7,6 +7,7 @@
 
 fa_IR:
   site_settings:
+    poll_enabled: "نظرسنجی مجاز است؟"
     poll_maximum_options: "حداکثر تعداد گزینه برای نظرسنجی‌ها."
     poll_edit_window_mins: "چند دقیقه بعد از ارسال نظر می توان آن را ویرایش کرد"
   poll:
diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml
index 14ad1c92e9..25a3a2bd33 100644
--- a/plugins/poll/config/locales/server.it.yml
+++ b/plugins/poll/config/locales/server.it.yml
@@ -7,8 +7,10 @@
 
 it:
   site_settings:
+    poll_enabled: "Permettere i sondaggi?"
     poll_maximum_options: "Numero massimo di opzioni permesse in un sondaggio."
     poll_edit_window_mins: "Numero di minuti dopo la creazione di un messaggio durante i quali i sondaggi possono ancora essere modificati."
+    poll_minimum_trust_level_to_create: "Definisce il minimo livello di esperienza necessario per poter creare sondaggi."
   poll:
     multiple_polls_without_name: "Ci sono più sondaggi privi di nome. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
     multiple_polls_with_same_name: "Ci sono più sondaggi con lo stesso nome: <strong>%{name}</strong>. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
diff --git a/plugins/poll/config/locales/server.nb_NO.yml b/plugins/poll/config/locales/server.nb_NO.yml
index cf2ab43274..9b4e69efe0 100644
--- a/plugins/poll/config/locales/server.nb_NO.yml
+++ b/plugins/poll/config/locales/server.nb_NO.yml
@@ -32,14 +32,14 @@ nb_NO:
     edit_window_expired:
       cannot_change_polls: "Du kan ikke legge til, fjerne eller navne om avstemninger etter de første %{minutes}  minuttene."
       op_cannot_edit_options: "Du kan ikke legge til eller fjerne svaralternativer etter de første %{minutes} minuttene. Kontakt en moderator hvis du har behov for å redigere et svaralternativ."
-      staff_cannot_add_or_remove_options: "Du kan ikke lette til eller fjerne valgalternativer for avstemningen etter de første %{minutes} minuttene. Du bør stenge dette emnet og lage et nytt i stedet."
+      staff_cannot_add_or_remove_options: "Du kan ikke lette til eller fjerne valgalternativer for avstemningen etter de første %{minutes} minuttene. Du bør stenge denne tråden og lage et nytt i stedet."
     no_polls_associated_with_this_post: "Ingen avstemning er assosiert med dette innlegget."
     no_poll_with_this_name: "Ingen avstemning med navnet <strong>%{name}</strong> er assosiert med dette innlegget."
     post_is_deleted: "Kan ikke agere på et slettet innlegg."
-    topic_must_be_open_to_vote: "Emnet må være åpent for å kunne avgi stemme."
+    topic_must_be_open_to_vote: "Tråden må være åpen for å kunne avgi stemme."
     poll_must_be_open_to_vote: "Avstemningen må være åpen for å kunne avgi stemme."
-    topic_must_be_open_to_toggle_status: "Emnet må være åpent for å redigere status."
-    only_staff_or_op_can_toggle_status: "Kun forumpersonalet eller den forfatteren av emnet kan redigere status på avstemningen."
+    topic_must_be_open_to_toggle_status: "Tråden må være åpen for å endre status."
+    only_staff_or_op_can_toggle_status: "Kun et medlem av staben eller forfatteren av innlegget kan endre status for avstemningen."
     insufficient_rights_to_create: "Du har ikke lov til å opprette avstemninger."
     email:
       link_to_poll: "Klikk for å se avstemningen"
diff --git a/plugins/poll/config/locales/server.sk.yml b/plugins/poll/config/locales/server.sk.yml
index 31b9c1807a..9f6db5ba35 100644
--- a/plugins/poll/config/locales/server.sk.yml
+++ b/plugins/poll/config/locales/server.sk.yml
@@ -7,8 +7,10 @@
 
 sk:
   site_settings:
+    poll_enabled: "Povoliť hlasovania?"
     poll_maximum_options: "Maximálny počet povolených možností v hlasovaní."
     poll_edit_window_mins: "Počet minút po vytvorení hlasovania počas ktorých môže byť hlasovanie upravené."
+    poll_minimum_trust_level_to_create: "Definuj minimálny stupeň dôvery na vytvorenie hlasonia."
   poll:
     multiple_polls_without_name: "Existujú viaceré hlasovania bez mena. Použite atribút '<code>meno</code>', aby ste hlasovanie jednoznačne rozlíšili."
     multiple_polls_with_same_name: "Existujú viaceré hlasovania s rovnakým menom: <strong>%{name}</strong>. Použite atribút '<code>meno</code>', aby ste hlasovanie jednoznačne rozlíšili."
@@ -40,5 +42,6 @@ sk:
     poll_must_be_open_to_vote: "Na odovzdanie hlasu musí byť hlasovanie otvorené."
     topic_must_be_open_to_toggle_status: "Na zmenu stavu musí byť téma otvorená."
     only_staff_or_op_can_toggle_status: "Zmeniť stav hlasovania môže iba zamestnanec alebo pôvodný prispievateľ."
+    insufficient_rights_to_create: "Nemáš povolenie na vytvorenie hlasovania."
     email:
       link_to_poll: "Kliknite na zobrazenie hlasovania."
diff --git a/plugins/poll/config/locales/server.ur.yml b/plugins/poll/config/locales/server.ur.yml
index f3d29c5175..ab7dfb6492 100644
--- a/plugins/poll/config/locales/server.ur.yml
+++ b/plugins/poll/config/locales/server.ur.yml
@@ -7,8 +7,10 @@
 
 ur:
   site_settings:
+    poll_enabled: "کیا صارفین کو پول بنانے کی اجازت دی جاے؟"
     poll_maximum_options: "ایک پول میں رکھے جانے والی آپشنز کی زیادہ سے زیادہ تعداد۔"
     poll_edit_window_mins: "پوسٹ بنانے کے بعد کتنے منت تک پولز کی ترمیم کی جاسکتی ہے۔"
+    poll_minimum_trust_level_to_create: "پول بنانے کیلئے کم از کم ٹرسٹ لَیول واضح کریں۔"
   poll:
     multiple_polls_without_name: "نام کے بغیر ایک سے زیادہ پولزموجود ہیں۔ اپنے پولز کو منفرد شناخت دینے کیلیے '<code>نام</code>' صفت کا استعمال کریں۔"
     multiple_polls_with_same_name: "ایک ہی نام والے ایک سے زیادہ پولزموجود ہیں: <strong>%{نام}</strong>۔ اپنے پولز کو منفرد شناخت دینے کیلیے '<code>نام</code>' صفت کا استعمال کریں۔"
@@ -38,5 +40,6 @@ ur:
     poll_must_be_open_to_vote: "ووٹ کرنے کیلیے پول کا کھلا ہونا ضروری ہے۔"
     topic_must_be_open_to_toggle_status: "سٹیٹس بدلنے کیلیے ٹاپک کا کھلا ہونا ضروری ہے۔"
     only_staff_or_op_can_toggle_status: "صرف عملے کے رکن یا اصل پوسٹر ایک پول کا سٹیٹس تبدیل کر سکتے ہیں۔"
+    insufficient_rights_to_create: "آپ کو پول بنانے کی اجازت نہیں ہے۔"
     email:
       link_to_poll: "پول دیکھنے کیلیے کلک کریں۔"
diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb
index e4c8005a44..8e5e136534 100644
--- a/plugins/poll/spec/integration/poll_endpoints_spec.rb
+++ b/plugins/poll/spec/integration/poll_endpoints_spec.rb
@@ -57,34 +57,34 @@ describe "DiscoursePoll endpoints" do
 
     describe 'when post_id is blank' do
       it 'should raise the right error' do
-        expect { get "/polls/voters.json", params: { poll_name: DiscoursePoll::DEFAULT_POLL_NAME } }
-          .to raise_error(ActionController::ParameterMissing)
+        get "/polls/voters.json", params: { poll_name: DiscoursePoll::DEFAULT_POLL_NAME }
+        expect(response.status).to eq(400)
       end
     end
 
     describe 'when post_id is not valid' do
       it 'should raise the right error' do
-        expect do
-          get "/polls/voters.json", params: {
-            post_id: -1,
-            poll_name: DiscoursePoll::DEFAULT_POLL_NAME
-          }
-        end.to raise_error(Discourse::InvalidParameters, 'post_id is invalid')
+        get "/polls/voters.json", params: {
+          post_id: -1,
+          poll_name: DiscoursePoll::DEFAULT_POLL_NAME
+        }
+        expect(response.status).to eq(400)
+        expect(response.body).to include('post_id is invalid')
       end
     end
 
     describe 'when poll_name is blank' do
       it 'should raise the right error' do
-        expect { get "/polls/voters.json", params: { post_id: post.id } }
-          .to raise_error(ActionController::ParameterMissing)
+        get "/polls/voters.json", params: { post_id: post.id }
+        expect(response.status).to eq(400)
       end
     end
 
     describe 'when poll_name is not valid' do
       it 'should raise the right error' do
-        expect do
-          get "/polls/voters.json", params: { post_id: post.id, poll_name: 'wrongpoll' }
-        end.to raise_error(Discourse::InvalidParameters, 'poll_name is invalid')
+        get "/polls/voters.json", params: { post_id: post.id, poll_name: 'wrongpoll' }
+        expect(response.status).to eq(400)
+        expect(response.body).to include('poll_name is invalid')
       end
     end
 
diff --git a/public/403.nb_NO.html b/public/403.nb_NO.html
index b11c804fb8..1a7c01bea5 100644
--- a/public/403.nb_NO.html
+++ b/public/403.nb_NO.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Du har ikke tilgang til å gjøre dette (403)</title>
+<title>Du kan ikke gjøre det (403)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
diff --git a/public/images/emoji/apple/+1.png b/public/images/emoji/apple/+1.png
index 5df9bb8540..198f27c1c7 100644
Binary files a/public/images/emoji/apple/+1.png and b/public/images/emoji/apple/+1.png differ
diff --git a/public/images/emoji/apple/+1/2.png b/public/images/emoji/apple/+1/2.png
index f33655e094..59b976df91 100644
Binary files a/public/images/emoji/apple/+1/2.png and b/public/images/emoji/apple/+1/2.png differ
diff --git a/public/images/emoji/apple/+1/3.png b/public/images/emoji/apple/+1/3.png
index e611468260..70e9792bce 100644
Binary files a/public/images/emoji/apple/+1/3.png and b/public/images/emoji/apple/+1/3.png differ
diff --git a/public/images/emoji/apple/+1/4.png b/public/images/emoji/apple/+1/4.png
index c07e81b31e..4fe1614a80 100644
Binary files a/public/images/emoji/apple/+1/4.png and b/public/images/emoji/apple/+1/4.png differ
diff --git a/public/images/emoji/apple/+1/5.png b/public/images/emoji/apple/+1/5.png
index c04a6c2bd8..42b21c8b95 100644
Binary files a/public/images/emoji/apple/+1/5.png and b/public/images/emoji/apple/+1/5.png differ
diff --git a/public/images/emoji/apple/+1/6.png b/public/images/emoji/apple/+1/6.png
index 8fbc7fd36b..71ef363e83 100644
Binary files a/public/images/emoji/apple/+1/6.png and b/public/images/emoji/apple/+1/6.png differ
diff --git a/public/images/emoji/apple/-1.png b/public/images/emoji/apple/-1.png
index 74440b69c7..91955b2947 100644
Binary files a/public/images/emoji/apple/-1.png and b/public/images/emoji/apple/-1.png differ
diff --git a/public/images/emoji/apple/-1/2.png b/public/images/emoji/apple/-1/2.png
index 930faaf2a5..3e9b0c991b 100644
Binary files a/public/images/emoji/apple/-1/2.png and b/public/images/emoji/apple/-1/2.png differ
diff --git a/public/images/emoji/apple/-1/3.png b/public/images/emoji/apple/-1/3.png
index 29ebfe1eef..519a52c81e 100644
Binary files a/public/images/emoji/apple/-1/3.png and b/public/images/emoji/apple/-1/3.png differ
diff --git a/public/images/emoji/apple/-1/4.png b/public/images/emoji/apple/-1/4.png
index 0b46e9862c..09a1d90204 100644
Binary files a/public/images/emoji/apple/-1/4.png and b/public/images/emoji/apple/-1/4.png differ
diff --git a/public/images/emoji/apple/-1/5.png b/public/images/emoji/apple/-1/5.png
index 5ee7db294b..2a60b580c6 100644
Binary files a/public/images/emoji/apple/-1/5.png and b/public/images/emoji/apple/-1/5.png differ
diff --git a/public/images/emoji/apple/-1/6.png b/public/images/emoji/apple/-1/6.png
index edf1f180c8..169eee97d8 100644
Binary files a/public/images/emoji/apple/-1/6.png and b/public/images/emoji/apple/-1/6.png differ
diff --git a/public/images/emoji/apple/100.png b/public/images/emoji/apple/100.png
index d3ca5571c3..8794a5f51b 100644
Binary files a/public/images/emoji/apple/100.png and b/public/images/emoji/apple/100.png differ
diff --git a/public/images/emoji/apple/1234.png b/public/images/emoji/apple/1234.png
index 81ff81a469..c569f39500 100644
Binary files a/public/images/emoji/apple/1234.png and b/public/images/emoji/apple/1234.png differ
diff --git a/public/images/emoji/apple/1st_place_medal.png b/public/images/emoji/apple/1st_place_medal.png
index c131644ef8..b5b26ae046 100644
Binary files a/public/images/emoji/apple/1st_place_medal.png and b/public/images/emoji/apple/1st_place_medal.png differ
diff --git a/public/images/emoji/apple/2nd_place_medal.png b/public/images/emoji/apple/2nd_place_medal.png
index ac29b9fe47..fbc451f42b 100644
Binary files a/public/images/emoji/apple/2nd_place_medal.png and b/public/images/emoji/apple/2nd_place_medal.png differ
diff --git a/public/images/emoji/apple/3rd_place_medal.png b/public/images/emoji/apple/3rd_place_medal.png
index f34e6a3966..4a01b0a0f4 100644
Binary files a/public/images/emoji/apple/3rd_place_medal.png and b/public/images/emoji/apple/3rd_place_medal.png differ
diff --git a/public/images/emoji/apple/8ball.png b/public/images/emoji/apple/8ball.png
index 6eb89fb61e..37e63e24ea 100644
Binary files a/public/images/emoji/apple/8ball.png and b/public/images/emoji/apple/8ball.png differ
diff --git a/public/images/emoji/apple/a.png b/public/images/emoji/apple/a.png
index e9ce787982..f841b5e4fa 100644
Binary files a/public/images/emoji/apple/a.png and b/public/images/emoji/apple/a.png differ
diff --git a/public/images/emoji/apple/ab.png b/public/images/emoji/apple/ab.png
index 3c25fb8158..f30821f001 100644
Binary files a/public/images/emoji/apple/ab.png and b/public/images/emoji/apple/ab.png differ
diff --git a/public/images/emoji/apple/abc.png b/public/images/emoji/apple/abc.png
index 9178d96490..f1d6aa6430 100644
Binary files a/public/images/emoji/apple/abc.png and b/public/images/emoji/apple/abc.png differ
diff --git a/public/images/emoji/apple/abcd.png b/public/images/emoji/apple/abcd.png
index dbfd60ddd9..95b6d52497 100644
Binary files a/public/images/emoji/apple/abcd.png and b/public/images/emoji/apple/abcd.png differ
diff --git a/public/images/emoji/apple/accept.png b/public/images/emoji/apple/accept.png
index 95cee05ac4..f8e59c3b14 100644
Binary files a/public/images/emoji/apple/accept.png and b/public/images/emoji/apple/accept.png differ
diff --git a/public/images/emoji/apple/admission_tickets.png b/public/images/emoji/apple/admission_tickets.png
index fd35e2a4d0..f842a44caa 100644
Binary files a/public/images/emoji/apple/admission_tickets.png and b/public/images/emoji/apple/admission_tickets.png differ
diff --git a/public/images/emoji/apple/adult.png b/public/images/emoji/apple/adult.png
index 53a5eb2ccb..7b3dc4f97f 100644
Binary files a/public/images/emoji/apple/adult.png and b/public/images/emoji/apple/adult.png differ
diff --git a/public/images/emoji/apple/adult/2.png b/public/images/emoji/apple/adult/2.png
index 8f30fc9e38..d61c247a68 100644
Binary files a/public/images/emoji/apple/adult/2.png and b/public/images/emoji/apple/adult/2.png differ
diff --git a/public/images/emoji/apple/adult/3.png b/public/images/emoji/apple/adult/3.png
index 36a4e57d1f..bfc0b7d73e 100644
Binary files a/public/images/emoji/apple/adult/3.png and b/public/images/emoji/apple/adult/3.png differ
diff --git a/public/images/emoji/apple/adult/4.png b/public/images/emoji/apple/adult/4.png
index 77c57605e9..d8f8c123c2 100644
Binary files a/public/images/emoji/apple/adult/4.png and b/public/images/emoji/apple/adult/4.png differ
diff --git a/public/images/emoji/apple/adult/5.png b/public/images/emoji/apple/adult/5.png
index 58bcd6a2fc..e08401bfae 100644
Binary files a/public/images/emoji/apple/adult/5.png and b/public/images/emoji/apple/adult/5.png differ
diff --git a/public/images/emoji/apple/adult/6.png b/public/images/emoji/apple/adult/6.png
index 3bc6b5a57a..90bf566284 100644
Binary files a/public/images/emoji/apple/adult/6.png and b/public/images/emoji/apple/adult/6.png differ
diff --git a/public/images/emoji/apple/aerial_tramway.png b/public/images/emoji/apple/aerial_tramway.png
index b4e62dcc60..713558fc66 100644
Binary files a/public/images/emoji/apple/aerial_tramway.png and b/public/images/emoji/apple/aerial_tramway.png differ
diff --git a/public/images/emoji/apple/afghanistan.png b/public/images/emoji/apple/afghanistan.png
index be9171edf7..09e02bd009 100644
Binary files a/public/images/emoji/apple/afghanistan.png and b/public/images/emoji/apple/afghanistan.png differ
diff --git a/public/images/emoji/apple/airplane.png b/public/images/emoji/apple/airplane.png
index 5d7e55052d..48e3ab80c8 100644
Binary files a/public/images/emoji/apple/airplane.png and b/public/images/emoji/apple/airplane.png differ
diff --git a/public/images/emoji/apple/airplane_arriving.png b/public/images/emoji/apple/airplane_arriving.png
index c716ff2186..2482df5243 100644
Binary files a/public/images/emoji/apple/airplane_arriving.png and b/public/images/emoji/apple/airplane_arriving.png differ
diff --git a/public/images/emoji/apple/airplane_departure.png b/public/images/emoji/apple/airplane_departure.png
index d1fcea18b8..181c554b8c 100644
Binary files a/public/images/emoji/apple/airplane_departure.png and b/public/images/emoji/apple/airplane_departure.png differ
diff --git a/public/images/emoji/apple/airplane_small.png b/public/images/emoji/apple/airplane_small.png
index c5823b2577..9ff3bb7e8d 100644
Binary files a/public/images/emoji/apple/airplane_small.png and b/public/images/emoji/apple/airplane_small.png differ
diff --git a/public/images/emoji/apple/aland_islands.png b/public/images/emoji/apple/aland_islands.png
index 0073114703..e3e7ac78d3 100644
Binary files a/public/images/emoji/apple/aland_islands.png and b/public/images/emoji/apple/aland_islands.png differ
diff --git a/public/images/emoji/apple/alarm_clock.png b/public/images/emoji/apple/alarm_clock.png
index 696265eea7..cd35f79c94 100644
Binary files a/public/images/emoji/apple/alarm_clock.png and b/public/images/emoji/apple/alarm_clock.png differ
diff --git a/public/images/emoji/apple/albania.png b/public/images/emoji/apple/albania.png
index e4a013d54b..0c7712d31f 100644
Binary files a/public/images/emoji/apple/albania.png and b/public/images/emoji/apple/albania.png differ
diff --git a/public/images/emoji/apple/alembic.png b/public/images/emoji/apple/alembic.png
index 44b4283915..67bdffcc71 100644
Binary files a/public/images/emoji/apple/alembic.png and b/public/images/emoji/apple/alembic.png differ
diff --git a/public/images/emoji/apple/algeria.png b/public/images/emoji/apple/algeria.png
index 915ddb8fd9..734944aedb 100644
Binary files a/public/images/emoji/apple/algeria.png and b/public/images/emoji/apple/algeria.png differ
diff --git a/public/images/emoji/apple/alien.png b/public/images/emoji/apple/alien.png
index 80cfea90ce..0b08439844 100644
Binary files a/public/images/emoji/apple/alien.png and b/public/images/emoji/apple/alien.png differ
diff --git a/public/images/emoji/apple/ambulance.png b/public/images/emoji/apple/ambulance.png
index 9a35a42e93..4ac7a03c77 100644
Binary files a/public/images/emoji/apple/ambulance.png and b/public/images/emoji/apple/ambulance.png differ
diff --git a/public/images/emoji/apple/american_samoa.png b/public/images/emoji/apple/american_samoa.png
index 88fab81c2b..e20bf7cc6c 100644
Binary files a/public/images/emoji/apple/american_samoa.png and b/public/images/emoji/apple/american_samoa.png differ
diff --git a/public/images/emoji/apple/amphora.png b/public/images/emoji/apple/amphora.png
index 4f8112aebd..e06ed897a5 100644
Binary files a/public/images/emoji/apple/amphora.png and b/public/images/emoji/apple/amphora.png differ
diff --git a/public/images/emoji/apple/anchor.png b/public/images/emoji/apple/anchor.png
index 62437d7170..f40a313a7b 100644
Binary files a/public/images/emoji/apple/anchor.png and b/public/images/emoji/apple/anchor.png differ
diff --git a/public/images/emoji/apple/andorra.png b/public/images/emoji/apple/andorra.png
index 7d3b7fd179..b1466154d2 100644
Binary files a/public/images/emoji/apple/andorra.png and b/public/images/emoji/apple/andorra.png differ
diff --git a/public/images/emoji/apple/angel.png b/public/images/emoji/apple/angel.png
index d11e1912ed..2a4780844b 100644
Binary files a/public/images/emoji/apple/angel.png and b/public/images/emoji/apple/angel.png differ
diff --git a/public/images/emoji/apple/angel/2.png b/public/images/emoji/apple/angel/2.png
index 6f0a2fd462..0d59b8dffb 100644
Binary files a/public/images/emoji/apple/angel/2.png and b/public/images/emoji/apple/angel/2.png differ
diff --git a/public/images/emoji/apple/angel/3.png b/public/images/emoji/apple/angel/3.png
index 1e9ee78ca8..7534fe8101 100644
Binary files a/public/images/emoji/apple/angel/3.png and b/public/images/emoji/apple/angel/3.png differ
diff --git a/public/images/emoji/apple/angel/4.png b/public/images/emoji/apple/angel/4.png
index 0596fa0c4c..12248a3fec 100644
Binary files a/public/images/emoji/apple/angel/4.png and b/public/images/emoji/apple/angel/4.png differ
diff --git a/public/images/emoji/apple/angel/5.png b/public/images/emoji/apple/angel/5.png
index b588a1be5b..91af0686f1 100644
Binary files a/public/images/emoji/apple/angel/5.png and b/public/images/emoji/apple/angel/5.png differ
diff --git a/public/images/emoji/apple/angel/6.png b/public/images/emoji/apple/angel/6.png
index 2d25ee5254..052de98fcb 100644
Binary files a/public/images/emoji/apple/angel/6.png and b/public/images/emoji/apple/angel/6.png differ
diff --git a/public/images/emoji/apple/anger.png b/public/images/emoji/apple/anger.png
index feb23ff499..572c473496 100644
Binary files a/public/images/emoji/apple/anger.png and b/public/images/emoji/apple/anger.png differ
diff --git a/public/images/emoji/apple/anger_right.png b/public/images/emoji/apple/anger_right.png
index 95cf61d6dd..6e30c38ae1 100644
Binary files a/public/images/emoji/apple/anger_right.png and b/public/images/emoji/apple/anger_right.png differ
diff --git a/public/images/emoji/apple/angola.png b/public/images/emoji/apple/angola.png
index 5427740da4..473321d85a 100644
Binary files a/public/images/emoji/apple/angola.png and b/public/images/emoji/apple/angola.png differ
diff --git a/public/images/emoji/apple/angry.png b/public/images/emoji/apple/angry.png
index fbc2f33555..c8a1456df3 100644
Binary files a/public/images/emoji/apple/angry.png and b/public/images/emoji/apple/angry.png differ
diff --git a/public/images/emoji/apple/anguilla.png b/public/images/emoji/apple/anguilla.png
index 9fcc3912a9..33e692f3ef 100644
Binary files a/public/images/emoji/apple/anguilla.png and b/public/images/emoji/apple/anguilla.png differ
diff --git a/public/images/emoji/apple/anguished.png b/public/images/emoji/apple/anguished.png
index 260c467789..74be061bb3 100644
Binary files a/public/images/emoji/apple/anguished.png and b/public/images/emoji/apple/anguished.png differ
diff --git a/public/images/emoji/apple/ant.png b/public/images/emoji/apple/ant.png
index db3249a906..38205cef44 100644
Binary files a/public/images/emoji/apple/ant.png and b/public/images/emoji/apple/ant.png differ
diff --git a/public/images/emoji/apple/antarctica.png b/public/images/emoji/apple/antarctica.png
index cb0c40bd05..6bfcbab216 100644
Binary files a/public/images/emoji/apple/antarctica.png and b/public/images/emoji/apple/antarctica.png differ
diff --git a/public/images/emoji/apple/antigua_barbuda.png b/public/images/emoji/apple/antigua_barbuda.png
index 0bf69425b3..e3837b57d0 100644
Binary files a/public/images/emoji/apple/antigua_barbuda.png and b/public/images/emoji/apple/antigua_barbuda.png differ
diff --git a/public/images/emoji/apple/apple.png b/public/images/emoji/apple/apple.png
index 34a88220e3..12998fda4e 100644
Binary files a/public/images/emoji/apple/apple.png and b/public/images/emoji/apple/apple.png differ
diff --git a/public/images/emoji/apple/aquarius.png b/public/images/emoji/apple/aquarius.png
index cecfae493e..287cd10609 100644
Binary files a/public/images/emoji/apple/aquarius.png and b/public/images/emoji/apple/aquarius.png differ
diff --git a/public/images/emoji/apple/archery.png b/public/images/emoji/apple/archery.png
index 58c5e9f05a..d98b9cba33 100644
Binary files a/public/images/emoji/apple/archery.png and b/public/images/emoji/apple/archery.png differ
diff --git a/public/images/emoji/apple/argentina.png b/public/images/emoji/apple/argentina.png
index f8fa6a686e..7a55e5e678 100644
Binary files a/public/images/emoji/apple/argentina.png and b/public/images/emoji/apple/argentina.png differ
diff --git a/public/images/emoji/apple/aries.png b/public/images/emoji/apple/aries.png
index 88af27355c..8ce6d952d1 100644
Binary files a/public/images/emoji/apple/aries.png and b/public/images/emoji/apple/aries.png differ
diff --git a/public/images/emoji/apple/armenia.png b/public/images/emoji/apple/armenia.png
index eb12f476c2..c483b2b86a 100644
Binary files a/public/images/emoji/apple/armenia.png and b/public/images/emoji/apple/armenia.png differ
diff --git a/public/images/emoji/apple/arrow_backward.png b/public/images/emoji/apple/arrow_backward.png
index af4ccacf83..42405ea0f1 100644
Binary files a/public/images/emoji/apple/arrow_backward.png and b/public/images/emoji/apple/arrow_backward.png differ
diff --git a/public/images/emoji/apple/arrow_double_down.png b/public/images/emoji/apple/arrow_double_down.png
index c69979b71e..069797a354 100644
Binary files a/public/images/emoji/apple/arrow_double_down.png and b/public/images/emoji/apple/arrow_double_down.png differ
diff --git a/public/images/emoji/apple/arrow_double_up.png b/public/images/emoji/apple/arrow_double_up.png
index 2fae00bc74..375e6d2392 100644
Binary files a/public/images/emoji/apple/arrow_double_up.png and b/public/images/emoji/apple/arrow_double_up.png differ
diff --git a/public/images/emoji/apple/arrow_down.png b/public/images/emoji/apple/arrow_down.png
index 8e054f92f8..84d50414f0 100644
Binary files a/public/images/emoji/apple/arrow_down.png and b/public/images/emoji/apple/arrow_down.png differ
diff --git a/public/images/emoji/apple/arrow_down_small.png b/public/images/emoji/apple/arrow_down_small.png
index a97cf57eba..01f2fd2fea 100644
Binary files a/public/images/emoji/apple/arrow_down_small.png and b/public/images/emoji/apple/arrow_down_small.png differ
diff --git a/public/images/emoji/apple/arrow_forward.png b/public/images/emoji/apple/arrow_forward.png
index 778e5b0c50..fb040dfcd9 100644
Binary files a/public/images/emoji/apple/arrow_forward.png and b/public/images/emoji/apple/arrow_forward.png differ
diff --git a/public/images/emoji/apple/arrow_heading_down.png b/public/images/emoji/apple/arrow_heading_down.png
index 7fb1aca162..0d3a5961d6 100644
Binary files a/public/images/emoji/apple/arrow_heading_down.png and b/public/images/emoji/apple/arrow_heading_down.png differ
diff --git a/public/images/emoji/apple/arrow_heading_up.png b/public/images/emoji/apple/arrow_heading_up.png
index c4b6e863e2..0f9dbbf2f9 100644
Binary files a/public/images/emoji/apple/arrow_heading_up.png and b/public/images/emoji/apple/arrow_heading_up.png differ
diff --git a/public/images/emoji/apple/arrow_left.png b/public/images/emoji/apple/arrow_left.png
index 29a6bb5543..a29f6f43a1 100644
Binary files a/public/images/emoji/apple/arrow_left.png and b/public/images/emoji/apple/arrow_left.png differ
diff --git a/public/images/emoji/apple/arrow_lower_left.png b/public/images/emoji/apple/arrow_lower_left.png
index c736224c87..37674ce007 100644
Binary files a/public/images/emoji/apple/arrow_lower_left.png and b/public/images/emoji/apple/arrow_lower_left.png differ
diff --git a/public/images/emoji/apple/arrow_lower_right.png b/public/images/emoji/apple/arrow_lower_right.png
index c7f09fd49a..1b70adc20c 100644
Binary files a/public/images/emoji/apple/arrow_lower_right.png and b/public/images/emoji/apple/arrow_lower_right.png differ
diff --git a/public/images/emoji/apple/arrow_right.png b/public/images/emoji/apple/arrow_right.png
index 91db8b6de2..e2d0218e50 100644
Binary files a/public/images/emoji/apple/arrow_right.png and b/public/images/emoji/apple/arrow_right.png differ
diff --git a/public/images/emoji/apple/arrow_right_hook.png b/public/images/emoji/apple/arrow_right_hook.png
index afae92c32b..eb88fee589 100644
Binary files a/public/images/emoji/apple/arrow_right_hook.png and b/public/images/emoji/apple/arrow_right_hook.png differ
diff --git a/public/images/emoji/apple/arrow_up.png b/public/images/emoji/apple/arrow_up.png
index 6133c5b73b..280482e9a3 100644
Binary files a/public/images/emoji/apple/arrow_up.png and b/public/images/emoji/apple/arrow_up.png differ
diff --git a/public/images/emoji/apple/arrow_up_down.png b/public/images/emoji/apple/arrow_up_down.png
index 5d73776557..7c8d59c3bd 100644
Binary files a/public/images/emoji/apple/arrow_up_down.png and b/public/images/emoji/apple/arrow_up_down.png differ
diff --git a/public/images/emoji/apple/arrow_up_small.png b/public/images/emoji/apple/arrow_up_small.png
index 1d97b9c921..e614947119 100644
Binary files a/public/images/emoji/apple/arrow_up_small.png and b/public/images/emoji/apple/arrow_up_small.png differ
diff --git a/public/images/emoji/apple/arrow_upper_left.png b/public/images/emoji/apple/arrow_upper_left.png
index f276922c10..a2462df4c6 100644
Binary files a/public/images/emoji/apple/arrow_upper_left.png and b/public/images/emoji/apple/arrow_upper_left.png differ
diff --git a/public/images/emoji/apple/arrow_upper_right.png b/public/images/emoji/apple/arrow_upper_right.png
index 3488c4919f..a46e46387a 100644
Binary files a/public/images/emoji/apple/arrow_upper_right.png and b/public/images/emoji/apple/arrow_upper_right.png differ
diff --git a/public/images/emoji/apple/arrows_clockwise.png b/public/images/emoji/apple/arrows_clockwise.png
index 1435459099..a434abad94 100644
Binary files a/public/images/emoji/apple/arrows_clockwise.png and b/public/images/emoji/apple/arrows_clockwise.png differ
diff --git a/public/images/emoji/apple/arrows_counterclockwise.png b/public/images/emoji/apple/arrows_counterclockwise.png
index 8c96387267..53e85d7a96 100644
Binary files a/public/images/emoji/apple/arrows_counterclockwise.png and b/public/images/emoji/apple/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/apple/art.png b/public/images/emoji/apple/art.png
index 428b2c3697..c9f91a9ca8 100644
Binary files a/public/images/emoji/apple/art.png and b/public/images/emoji/apple/art.png differ
diff --git a/public/images/emoji/apple/articulated_lorry.png b/public/images/emoji/apple/articulated_lorry.png
index 7af21091c9..6136e8d50b 100644
Binary files a/public/images/emoji/apple/articulated_lorry.png and b/public/images/emoji/apple/articulated_lorry.png differ
diff --git a/public/images/emoji/apple/artificial_satellite.png b/public/images/emoji/apple/artificial_satellite.png
index 28b9ab2fd7..61a88816ab 100644
Binary files a/public/images/emoji/apple/artificial_satellite.png and b/public/images/emoji/apple/artificial_satellite.png differ
diff --git a/public/images/emoji/apple/aruba.png b/public/images/emoji/apple/aruba.png
index d3ccae8f3e..35cb691660 100644
Binary files a/public/images/emoji/apple/aruba.png and b/public/images/emoji/apple/aruba.png differ
diff --git a/public/images/emoji/apple/ascension_island.png b/public/images/emoji/apple/ascension_island.png
index 694a0b8510..b16a1f26a7 100644
Binary files a/public/images/emoji/apple/ascension_island.png and b/public/images/emoji/apple/ascension_island.png differ
diff --git a/public/images/emoji/apple/asterisk.png b/public/images/emoji/apple/asterisk.png
index f847acf58c..3a16a887bc 100644
Binary files a/public/images/emoji/apple/asterisk.png and b/public/images/emoji/apple/asterisk.png differ
diff --git a/public/images/emoji/apple/astonished.png b/public/images/emoji/apple/astonished.png
index 1718adf146..4e504c047d 100644
Binary files a/public/images/emoji/apple/astonished.png and b/public/images/emoji/apple/astonished.png differ
diff --git a/public/images/emoji/apple/athletic_shoe.png b/public/images/emoji/apple/athletic_shoe.png
index f72d3b7fce..2d929a3f3d 100644
Binary files a/public/images/emoji/apple/athletic_shoe.png and b/public/images/emoji/apple/athletic_shoe.png differ
diff --git a/public/images/emoji/apple/atm.png b/public/images/emoji/apple/atm.png
index 19e711fb49..9633f01a14 100644
Binary files a/public/images/emoji/apple/atm.png and b/public/images/emoji/apple/atm.png differ
diff --git a/public/images/emoji/apple/atom.png b/public/images/emoji/apple/atom.png
index f4debf825b..d3abae4426 100644
Binary files a/public/images/emoji/apple/atom.png and b/public/images/emoji/apple/atom.png differ
diff --git a/public/images/emoji/apple/atom_symbol.png b/public/images/emoji/apple/atom_symbol.png
index f4debf825b..d3abae4426 100644
Binary files a/public/images/emoji/apple/atom_symbol.png and b/public/images/emoji/apple/atom_symbol.png differ
diff --git a/public/images/emoji/apple/australia.png b/public/images/emoji/apple/australia.png
index 87eafc1fdc..b50920faa9 100644
Binary files a/public/images/emoji/apple/australia.png and b/public/images/emoji/apple/australia.png differ
diff --git a/public/images/emoji/apple/austria.png b/public/images/emoji/apple/austria.png
index 6cb27a834a..ccb21bf91e 100644
Binary files a/public/images/emoji/apple/austria.png and b/public/images/emoji/apple/austria.png differ
diff --git a/public/images/emoji/apple/automobile.png b/public/images/emoji/apple/automobile.png
index 80e24f234b..8e21911667 100644
Binary files a/public/images/emoji/apple/automobile.png and b/public/images/emoji/apple/automobile.png differ
diff --git a/public/images/emoji/apple/avocado.png b/public/images/emoji/apple/avocado.png
index 257ce74d2f..31060d6bd1 100644
Binary files a/public/images/emoji/apple/avocado.png and b/public/images/emoji/apple/avocado.png differ
diff --git a/public/images/emoji/apple/azerbaijan.png b/public/images/emoji/apple/azerbaijan.png
index 8b30f048f6..e32b6f1a3c 100644
Binary files a/public/images/emoji/apple/azerbaijan.png and b/public/images/emoji/apple/azerbaijan.png differ
diff --git a/public/images/emoji/apple/b.png b/public/images/emoji/apple/b.png
index 969e8c64b1..ef80cde4ff 100644
Binary files a/public/images/emoji/apple/b.png and b/public/images/emoji/apple/b.png differ
diff --git a/public/images/emoji/apple/baby.png b/public/images/emoji/apple/baby.png
index 53d8ea8e14..63d5a4a4cb 100644
Binary files a/public/images/emoji/apple/baby.png and b/public/images/emoji/apple/baby.png differ
diff --git a/public/images/emoji/apple/baby/2.png b/public/images/emoji/apple/baby/2.png
index 3c43a12250..40cf44f241 100644
Binary files a/public/images/emoji/apple/baby/2.png and b/public/images/emoji/apple/baby/2.png differ
diff --git a/public/images/emoji/apple/baby/3.png b/public/images/emoji/apple/baby/3.png
index 4d392a0f05..7e8db945e7 100644
Binary files a/public/images/emoji/apple/baby/3.png and b/public/images/emoji/apple/baby/3.png differ
diff --git a/public/images/emoji/apple/baby/4.png b/public/images/emoji/apple/baby/4.png
index 25c43a5273..1e7dbc7220 100644
Binary files a/public/images/emoji/apple/baby/4.png and b/public/images/emoji/apple/baby/4.png differ
diff --git a/public/images/emoji/apple/baby/5.png b/public/images/emoji/apple/baby/5.png
index 4d2148d64c..7ccbe2c26b 100644
Binary files a/public/images/emoji/apple/baby/5.png and b/public/images/emoji/apple/baby/5.png differ
diff --git a/public/images/emoji/apple/baby/6.png b/public/images/emoji/apple/baby/6.png
index 3dbb035f9a..d550b3040b 100644
Binary files a/public/images/emoji/apple/baby/6.png and b/public/images/emoji/apple/baby/6.png differ
diff --git a/public/images/emoji/apple/baby_bottle.png b/public/images/emoji/apple/baby_bottle.png
index e962c73856..bcccaa3d5f 100644
Binary files a/public/images/emoji/apple/baby_bottle.png and b/public/images/emoji/apple/baby_bottle.png differ
diff --git a/public/images/emoji/apple/baby_chick.png b/public/images/emoji/apple/baby_chick.png
index a6caf9dcfe..30c16d904e 100644
Binary files a/public/images/emoji/apple/baby_chick.png and b/public/images/emoji/apple/baby_chick.png differ
diff --git a/public/images/emoji/apple/baby_symbol.png b/public/images/emoji/apple/baby_symbol.png
index a89f7c9332..b2726081c0 100644
Binary files a/public/images/emoji/apple/baby_symbol.png and b/public/images/emoji/apple/baby_symbol.png differ
diff --git a/public/images/emoji/apple/back.png b/public/images/emoji/apple/back.png
index 85d4fcd35e..fe85594f27 100644
Binary files a/public/images/emoji/apple/back.png and b/public/images/emoji/apple/back.png differ
diff --git a/public/images/emoji/apple/bacon.png b/public/images/emoji/apple/bacon.png
index 4e07bcff2e..b7e5879558 100644
Binary files a/public/images/emoji/apple/bacon.png and b/public/images/emoji/apple/bacon.png differ
diff --git a/public/images/emoji/apple/badminton.png b/public/images/emoji/apple/badminton.png
index 75351047f3..48aa4d36f7 100644
Binary files a/public/images/emoji/apple/badminton.png and b/public/images/emoji/apple/badminton.png differ
diff --git a/public/images/emoji/apple/baggage_claim.png b/public/images/emoji/apple/baggage_claim.png
index 57dfec3a45..b84ce9df30 100644
Binary files a/public/images/emoji/apple/baggage_claim.png and b/public/images/emoji/apple/baggage_claim.png differ
diff --git a/public/images/emoji/apple/baguette_bread.png b/public/images/emoji/apple/baguette_bread.png
index f6b2159c23..4ef9f98657 100644
Binary files a/public/images/emoji/apple/baguette_bread.png and b/public/images/emoji/apple/baguette_bread.png differ
diff --git a/public/images/emoji/apple/bahamas.png b/public/images/emoji/apple/bahamas.png
index 3ccd6ebf95..2b63359384 100644
Binary files a/public/images/emoji/apple/bahamas.png and b/public/images/emoji/apple/bahamas.png differ
diff --git a/public/images/emoji/apple/bahrain.png b/public/images/emoji/apple/bahrain.png
index c3de96b0bb..1c669b8d30 100644
Binary files a/public/images/emoji/apple/bahrain.png and b/public/images/emoji/apple/bahrain.png differ
diff --git a/public/images/emoji/apple/balance_scale.png b/public/images/emoji/apple/balance_scale.png
index 5a49f802a7..bf4fb0b953 100644
Binary files a/public/images/emoji/apple/balance_scale.png and b/public/images/emoji/apple/balance_scale.png differ
diff --git a/public/images/emoji/apple/balloon.png b/public/images/emoji/apple/balloon.png
index e78b0e74d0..4ed69130e5 100644
Binary files a/public/images/emoji/apple/balloon.png and b/public/images/emoji/apple/balloon.png differ
diff --git a/public/images/emoji/apple/ballot_box.png b/public/images/emoji/apple/ballot_box.png
index a0894da6cd..021cfe3218 100644
Binary files a/public/images/emoji/apple/ballot_box.png and b/public/images/emoji/apple/ballot_box.png differ
diff --git a/public/images/emoji/apple/ballot_box_with_ballot.png b/public/images/emoji/apple/ballot_box_with_ballot.png
index a0894da6cd..021cfe3218 100644
Binary files a/public/images/emoji/apple/ballot_box_with_ballot.png and b/public/images/emoji/apple/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/apple/ballot_box_with_check.png b/public/images/emoji/apple/ballot_box_with_check.png
index d185b09e3a..99b17b6e41 100644
Binary files a/public/images/emoji/apple/ballot_box_with_check.png and b/public/images/emoji/apple/ballot_box_with_check.png differ
diff --git a/public/images/emoji/apple/bamboo.png b/public/images/emoji/apple/bamboo.png
index 2c1c4b1bb8..89ef46ab1f 100644
Binary files a/public/images/emoji/apple/bamboo.png and b/public/images/emoji/apple/bamboo.png differ
diff --git a/public/images/emoji/apple/banana.png b/public/images/emoji/apple/banana.png
index 782b22d665..5016786087 100644
Binary files a/public/images/emoji/apple/banana.png and b/public/images/emoji/apple/banana.png differ
diff --git a/public/images/emoji/apple/bangbang.png b/public/images/emoji/apple/bangbang.png
index 20cfbaf491..3985852962 100644
Binary files a/public/images/emoji/apple/bangbang.png and b/public/images/emoji/apple/bangbang.png differ
diff --git a/public/images/emoji/apple/bangladesh.png b/public/images/emoji/apple/bangladesh.png
index 80d8445398..3b6ea7d80c 100644
Binary files a/public/images/emoji/apple/bangladesh.png and b/public/images/emoji/apple/bangladesh.png differ
diff --git a/public/images/emoji/apple/bank.png b/public/images/emoji/apple/bank.png
index 49a1cffcd6..e24f02858b 100644
Binary files a/public/images/emoji/apple/bank.png and b/public/images/emoji/apple/bank.png differ
diff --git a/public/images/emoji/apple/bar_chart.png b/public/images/emoji/apple/bar_chart.png
index bab80b48cc..92ef9ac4ba 100644
Binary files a/public/images/emoji/apple/bar_chart.png and b/public/images/emoji/apple/bar_chart.png differ
diff --git a/public/images/emoji/apple/barbados.png b/public/images/emoji/apple/barbados.png
index 86d7b00878..c927e575b4 100644
Binary files a/public/images/emoji/apple/barbados.png and b/public/images/emoji/apple/barbados.png differ
diff --git a/public/images/emoji/apple/barber.png b/public/images/emoji/apple/barber.png
index 9e773ad2d9..786c077c9e 100644
Binary files a/public/images/emoji/apple/barber.png and b/public/images/emoji/apple/barber.png differ
diff --git a/public/images/emoji/apple/baseball.png b/public/images/emoji/apple/baseball.png
index dcea032156..1f530151b8 100644
Binary files a/public/images/emoji/apple/baseball.png and b/public/images/emoji/apple/baseball.png differ
diff --git a/public/images/emoji/apple/basketball.png b/public/images/emoji/apple/basketball.png
index c70ae0922e..8451348f71 100644
Binary files a/public/images/emoji/apple/basketball.png and b/public/images/emoji/apple/basketball.png differ
diff --git a/public/images/emoji/apple/basketball_man.png b/public/images/emoji/apple/basketball_man.png
index 2476fa9f0c..37eb75580c 100644
Binary files a/public/images/emoji/apple/basketball_man.png and b/public/images/emoji/apple/basketball_man.png differ
diff --git a/public/images/emoji/apple/basketball_man/2.png b/public/images/emoji/apple/basketball_man/2.png
index dbec120de0..16a66f785c 100644
Binary files a/public/images/emoji/apple/basketball_man/2.png and b/public/images/emoji/apple/basketball_man/2.png differ
diff --git a/public/images/emoji/apple/basketball_man/3.png b/public/images/emoji/apple/basketball_man/3.png
index a9ccd27462..37cd8fdc33 100644
Binary files a/public/images/emoji/apple/basketball_man/3.png and b/public/images/emoji/apple/basketball_man/3.png differ
diff --git a/public/images/emoji/apple/basketball_man/4.png b/public/images/emoji/apple/basketball_man/4.png
index 079cd2a900..36188263bc 100644
Binary files a/public/images/emoji/apple/basketball_man/4.png and b/public/images/emoji/apple/basketball_man/4.png differ
diff --git a/public/images/emoji/apple/basketball_man/5.png b/public/images/emoji/apple/basketball_man/5.png
index 905f5af468..2df54e3ea4 100644
Binary files a/public/images/emoji/apple/basketball_man/5.png and b/public/images/emoji/apple/basketball_man/5.png differ
diff --git a/public/images/emoji/apple/basketball_man/6.png b/public/images/emoji/apple/basketball_man/6.png
index c03789f5d0..0496483264 100644
Binary files a/public/images/emoji/apple/basketball_man/6.png and b/public/images/emoji/apple/basketball_man/6.png differ
diff --git a/public/images/emoji/apple/basketball_player.png b/public/images/emoji/apple/basketball_player.png
index 2476fa9f0c..37eb75580c 100644
Binary files a/public/images/emoji/apple/basketball_player.png and b/public/images/emoji/apple/basketball_player.png differ
diff --git a/public/images/emoji/apple/basketball_player/2.png b/public/images/emoji/apple/basketball_player/2.png
index dbec120de0..16a66f785c 100644
Binary files a/public/images/emoji/apple/basketball_player/2.png and b/public/images/emoji/apple/basketball_player/2.png differ
diff --git a/public/images/emoji/apple/basketball_player/3.png b/public/images/emoji/apple/basketball_player/3.png
index a9ccd27462..37cd8fdc33 100644
Binary files a/public/images/emoji/apple/basketball_player/3.png and b/public/images/emoji/apple/basketball_player/3.png differ
diff --git a/public/images/emoji/apple/basketball_player/4.png b/public/images/emoji/apple/basketball_player/4.png
index 079cd2a900..36188263bc 100644
Binary files a/public/images/emoji/apple/basketball_player/4.png and b/public/images/emoji/apple/basketball_player/4.png differ
diff --git a/public/images/emoji/apple/basketball_player/5.png b/public/images/emoji/apple/basketball_player/5.png
index 905f5af468..2df54e3ea4 100644
Binary files a/public/images/emoji/apple/basketball_player/5.png and b/public/images/emoji/apple/basketball_player/5.png differ
diff --git a/public/images/emoji/apple/basketball_player/6.png b/public/images/emoji/apple/basketball_player/6.png
index c03789f5d0..0496483264 100644
Binary files a/public/images/emoji/apple/basketball_player/6.png and b/public/images/emoji/apple/basketball_player/6.png differ
diff --git a/public/images/emoji/apple/basketball_woman.png b/public/images/emoji/apple/basketball_woman.png
index 306605a0f3..18ccad4199 100644
Binary files a/public/images/emoji/apple/basketball_woman.png and b/public/images/emoji/apple/basketball_woman.png differ
diff --git a/public/images/emoji/apple/bat.png b/public/images/emoji/apple/bat.png
index 09f7b29e62..7c6c77713b 100644
Binary files a/public/images/emoji/apple/bat.png and b/public/images/emoji/apple/bat.png differ
diff --git a/public/images/emoji/apple/bath.png b/public/images/emoji/apple/bath.png
index 9f53db4728..b2fd5788d2 100644
Binary files a/public/images/emoji/apple/bath.png and b/public/images/emoji/apple/bath.png differ
diff --git a/public/images/emoji/apple/bath/2.png b/public/images/emoji/apple/bath/2.png
index 6f10b75f66..eaddd93029 100644
Binary files a/public/images/emoji/apple/bath/2.png and b/public/images/emoji/apple/bath/2.png differ
diff --git a/public/images/emoji/apple/bath/3.png b/public/images/emoji/apple/bath/3.png
index e75d9ac22a..4de344d0a8 100644
Binary files a/public/images/emoji/apple/bath/3.png and b/public/images/emoji/apple/bath/3.png differ
diff --git a/public/images/emoji/apple/bath/4.png b/public/images/emoji/apple/bath/4.png
index 8b5d4a85e0..45e6fe8ca8 100644
Binary files a/public/images/emoji/apple/bath/4.png and b/public/images/emoji/apple/bath/4.png differ
diff --git a/public/images/emoji/apple/bath/5.png b/public/images/emoji/apple/bath/5.png
index d70dbc8b13..6c2d4a41bb 100644
Binary files a/public/images/emoji/apple/bath/5.png and b/public/images/emoji/apple/bath/5.png differ
diff --git a/public/images/emoji/apple/bath/6.png b/public/images/emoji/apple/bath/6.png
index be196ac2b4..e04ef7b165 100644
Binary files a/public/images/emoji/apple/bath/6.png and b/public/images/emoji/apple/bath/6.png differ
diff --git a/public/images/emoji/apple/bathtub.png b/public/images/emoji/apple/bathtub.png
index 247dbe1099..905094ff63 100644
Binary files a/public/images/emoji/apple/bathtub.png and b/public/images/emoji/apple/bathtub.png differ
diff --git a/public/images/emoji/apple/battery.png b/public/images/emoji/apple/battery.png
index e24a27246a..ac0ca5e37d 100644
Binary files a/public/images/emoji/apple/battery.png and b/public/images/emoji/apple/battery.png differ
diff --git a/public/images/emoji/apple/beach.png b/public/images/emoji/apple/beach.png
index 1bcdb8de9e..0e61ca38d1 100644
Binary files a/public/images/emoji/apple/beach.png and b/public/images/emoji/apple/beach.png differ
diff --git a/public/images/emoji/apple/beach_umbrella.png b/public/images/emoji/apple/beach_umbrella.png
index 1bcdb8de9e..0e61ca38d1 100644
Binary files a/public/images/emoji/apple/beach_umbrella.png and b/public/images/emoji/apple/beach_umbrella.png differ
diff --git a/public/images/emoji/apple/beach_with_umbrella.png b/public/images/emoji/apple/beach_with_umbrella.png
index 1bcdb8de9e..0e61ca38d1 100644
Binary files a/public/images/emoji/apple/beach_with_umbrella.png and b/public/images/emoji/apple/beach_with_umbrella.png differ
diff --git a/public/images/emoji/apple/bear.png b/public/images/emoji/apple/bear.png
index ec03928665..5b9186d95a 100644
Binary files a/public/images/emoji/apple/bear.png and b/public/images/emoji/apple/bear.png differ
diff --git a/public/images/emoji/apple/bearded_person.png b/public/images/emoji/apple/bearded_person.png
index ed22a6cb38..3acdfa1a1b 100644
Binary files a/public/images/emoji/apple/bearded_person.png and b/public/images/emoji/apple/bearded_person.png differ
diff --git a/public/images/emoji/apple/bearded_person/2.png b/public/images/emoji/apple/bearded_person/2.png
index 4a2fdeb304..e1d8f00038 100644
Binary files a/public/images/emoji/apple/bearded_person/2.png and b/public/images/emoji/apple/bearded_person/2.png differ
diff --git a/public/images/emoji/apple/bearded_person/3.png b/public/images/emoji/apple/bearded_person/3.png
index b1f6e168d7..1edcf21387 100644
Binary files a/public/images/emoji/apple/bearded_person/3.png and b/public/images/emoji/apple/bearded_person/3.png differ
diff --git a/public/images/emoji/apple/bearded_person/4.png b/public/images/emoji/apple/bearded_person/4.png
index f75b75a74e..8dc3c4f8a3 100644
Binary files a/public/images/emoji/apple/bearded_person/4.png and b/public/images/emoji/apple/bearded_person/4.png differ
diff --git a/public/images/emoji/apple/bearded_person/5.png b/public/images/emoji/apple/bearded_person/5.png
index a9665b318a..9f1c8557e8 100644
Binary files a/public/images/emoji/apple/bearded_person/5.png and b/public/images/emoji/apple/bearded_person/5.png differ
diff --git a/public/images/emoji/apple/bearded_person/6.png b/public/images/emoji/apple/bearded_person/6.png
index a42b3caf88..29aacd84f0 100644
Binary files a/public/images/emoji/apple/bearded_person/6.png and b/public/images/emoji/apple/bearded_person/6.png differ
diff --git a/public/images/emoji/apple/bed.png b/public/images/emoji/apple/bed.png
index e76eafea28..e0350d1ee6 100644
Binary files a/public/images/emoji/apple/bed.png and b/public/images/emoji/apple/bed.png differ
diff --git a/public/images/emoji/apple/bee.png b/public/images/emoji/apple/bee.png
index 82d7aa8a5a..36f0001ebe 100644
Binary files a/public/images/emoji/apple/bee.png and b/public/images/emoji/apple/bee.png differ
diff --git a/public/images/emoji/apple/beer.png b/public/images/emoji/apple/beer.png
index dee2a7426b..205f5b1d61 100644
Binary files a/public/images/emoji/apple/beer.png and b/public/images/emoji/apple/beer.png differ
diff --git a/public/images/emoji/apple/beers.png b/public/images/emoji/apple/beers.png
index 99347ea51f..dbedc6ae48 100644
Binary files a/public/images/emoji/apple/beers.png and b/public/images/emoji/apple/beers.png differ
diff --git a/public/images/emoji/apple/beetle.png b/public/images/emoji/apple/beetle.png
index 2c5f55b06f..03a739c819 100644
Binary files a/public/images/emoji/apple/beetle.png and b/public/images/emoji/apple/beetle.png differ
diff --git a/public/images/emoji/apple/beginner.png b/public/images/emoji/apple/beginner.png
index 6a4f8ce061..2e5d0a9300 100644
Binary files a/public/images/emoji/apple/beginner.png and b/public/images/emoji/apple/beginner.png differ
diff --git a/public/images/emoji/apple/belarus.png b/public/images/emoji/apple/belarus.png
index 359cf42af7..de34d85b2d 100644
Binary files a/public/images/emoji/apple/belarus.png and b/public/images/emoji/apple/belarus.png differ
diff --git a/public/images/emoji/apple/belgium.png b/public/images/emoji/apple/belgium.png
index 56c56c4fa9..3dcf648c68 100644
Binary files a/public/images/emoji/apple/belgium.png and b/public/images/emoji/apple/belgium.png differ
diff --git a/public/images/emoji/apple/belize.png b/public/images/emoji/apple/belize.png
index 891e7eafa3..273bf22a48 100644
Binary files a/public/images/emoji/apple/belize.png and b/public/images/emoji/apple/belize.png differ
diff --git a/public/images/emoji/apple/bell.png b/public/images/emoji/apple/bell.png
index b90bc772ed..ec4532bcaf 100644
Binary files a/public/images/emoji/apple/bell.png and b/public/images/emoji/apple/bell.png differ
diff --git a/public/images/emoji/apple/bellhop.png b/public/images/emoji/apple/bellhop.png
index 69432ddece..a758fd99a8 100644
Binary files a/public/images/emoji/apple/bellhop.png and b/public/images/emoji/apple/bellhop.png differ
diff --git a/public/images/emoji/apple/bellhop_bell.png b/public/images/emoji/apple/bellhop_bell.png
index 69432ddece..a758fd99a8 100644
Binary files a/public/images/emoji/apple/bellhop_bell.png and b/public/images/emoji/apple/bellhop_bell.png differ
diff --git a/public/images/emoji/apple/benin.png b/public/images/emoji/apple/benin.png
index f9e2d82420..6133f799e1 100644
Binary files a/public/images/emoji/apple/benin.png and b/public/images/emoji/apple/benin.png differ
diff --git a/public/images/emoji/apple/bento.png b/public/images/emoji/apple/bento.png
index 1f51db409f..e31a8626d7 100644
Binary files a/public/images/emoji/apple/bento.png and b/public/images/emoji/apple/bento.png differ
diff --git a/public/images/emoji/apple/bermuda.png b/public/images/emoji/apple/bermuda.png
index 396d2a914d..5b8842ab0a 100644
Binary files a/public/images/emoji/apple/bermuda.png and b/public/images/emoji/apple/bermuda.png differ
diff --git a/public/images/emoji/apple/bhutan.png b/public/images/emoji/apple/bhutan.png
index ab0b841e40..75838bf83a 100644
Binary files a/public/images/emoji/apple/bhutan.png and b/public/images/emoji/apple/bhutan.png differ
diff --git a/public/images/emoji/apple/bicyclist.png b/public/images/emoji/apple/bicyclist.png
index 433c9308a0..ebcd4d3f86 100644
Binary files a/public/images/emoji/apple/bicyclist.png and b/public/images/emoji/apple/bicyclist.png differ
diff --git a/public/images/emoji/apple/bicyclist/2.png b/public/images/emoji/apple/bicyclist/2.png
index 0c78d1fdfb..54e6777eec 100644
Binary files a/public/images/emoji/apple/bicyclist/2.png and b/public/images/emoji/apple/bicyclist/2.png differ
diff --git a/public/images/emoji/apple/bicyclist/3.png b/public/images/emoji/apple/bicyclist/3.png
index c624c80e90..eb446eaf08 100644
Binary files a/public/images/emoji/apple/bicyclist/3.png and b/public/images/emoji/apple/bicyclist/3.png differ
diff --git a/public/images/emoji/apple/bicyclist/4.png b/public/images/emoji/apple/bicyclist/4.png
index e80a3b687c..fa93447e84 100644
Binary files a/public/images/emoji/apple/bicyclist/4.png and b/public/images/emoji/apple/bicyclist/4.png differ
diff --git a/public/images/emoji/apple/bicyclist/5.png b/public/images/emoji/apple/bicyclist/5.png
index 2f1e0bdf29..be1bf84b4d 100644
Binary files a/public/images/emoji/apple/bicyclist/5.png and b/public/images/emoji/apple/bicyclist/5.png differ
diff --git a/public/images/emoji/apple/bicyclist/6.png b/public/images/emoji/apple/bicyclist/6.png
index c9c8b68318..957acf81cd 100644
Binary files a/public/images/emoji/apple/bicyclist/6.png and b/public/images/emoji/apple/bicyclist/6.png differ
diff --git a/public/images/emoji/apple/bike.png b/public/images/emoji/apple/bike.png
index fc80f8e85d..22285b8f62 100644
Binary files a/public/images/emoji/apple/bike.png and b/public/images/emoji/apple/bike.png differ
diff --git a/public/images/emoji/apple/biking_man.png b/public/images/emoji/apple/biking_man.png
index 433c9308a0..ebcd4d3f86 100644
Binary files a/public/images/emoji/apple/biking_man.png and b/public/images/emoji/apple/biking_man.png differ
diff --git a/public/images/emoji/apple/biking_man/2.png b/public/images/emoji/apple/biking_man/2.png
index 0c78d1fdfb..54e6777eec 100644
Binary files a/public/images/emoji/apple/biking_man/2.png and b/public/images/emoji/apple/biking_man/2.png differ
diff --git a/public/images/emoji/apple/biking_man/3.png b/public/images/emoji/apple/biking_man/3.png
index c624c80e90..eb446eaf08 100644
Binary files a/public/images/emoji/apple/biking_man/3.png and b/public/images/emoji/apple/biking_man/3.png differ
diff --git a/public/images/emoji/apple/biking_man/4.png b/public/images/emoji/apple/biking_man/4.png
index e80a3b687c..fa93447e84 100644
Binary files a/public/images/emoji/apple/biking_man/4.png and b/public/images/emoji/apple/biking_man/4.png differ
diff --git a/public/images/emoji/apple/biking_man/5.png b/public/images/emoji/apple/biking_man/5.png
index 2f1e0bdf29..be1bf84b4d 100644
Binary files a/public/images/emoji/apple/biking_man/5.png and b/public/images/emoji/apple/biking_man/5.png differ
diff --git a/public/images/emoji/apple/biking_man/6.png b/public/images/emoji/apple/biking_man/6.png
index c9c8b68318..957acf81cd 100644
Binary files a/public/images/emoji/apple/biking_man/6.png and b/public/images/emoji/apple/biking_man/6.png differ
diff --git a/public/images/emoji/apple/biking_woman.png b/public/images/emoji/apple/biking_woman.png
index d7a39f4be6..0628094b42 100644
Binary files a/public/images/emoji/apple/biking_woman.png and b/public/images/emoji/apple/biking_woman.png differ
diff --git a/public/images/emoji/apple/biking_woman/2.png b/public/images/emoji/apple/biking_woman/2.png
index e512f6918d..b8225f5c92 100644
Binary files a/public/images/emoji/apple/biking_woman/2.png and b/public/images/emoji/apple/biking_woman/2.png differ
diff --git a/public/images/emoji/apple/biking_woman/3.png b/public/images/emoji/apple/biking_woman/3.png
index 71cdc8a81b..30f2e34332 100644
Binary files a/public/images/emoji/apple/biking_woman/3.png and b/public/images/emoji/apple/biking_woman/3.png differ
diff --git a/public/images/emoji/apple/biking_woman/4.png b/public/images/emoji/apple/biking_woman/4.png
index b0b26f4d57..48a00403b1 100644
Binary files a/public/images/emoji/apple/biking_woman/4.png and b/public/images/emoji/apple/biking_woman/4.png differ
diff --git a/public/images/emoji/apple/biking_woman/5.png b/public/images/emoji/apple/biking_woman/5.png
index f978924aa0..90b96a8e5a 100644
Binary files a/public/images/emoji/apple/biking_woman/5.png and b/public/images/emoji/apple/biking_woman/5.png differ
diff --git a/public/images/emoji/apple/biking_woman/6.png b/public/images/emoji/apple/biking_woman/6.png
index 963e2127ee..8688e8fa46 100644
Binary files a/public/images/emoji/apple/biking_woman/6.png and b/public/images/emoji/apple/biking_woman/6.png differ
diff --git a/public/images/emoji/apple/bikini.png b/public/images/emoji/apple/bikini.png
index 68581f4ac1..cc2ef7a7b0 100644
Binary files a/public/images/emoji/apple/bikini.png and b/public/images/emoji/apple/bikini.png differ
diff --git a/public/images/emoji/apple/billed_cap.png b/public/images/emoji/apple/billed_cap.png
index 5cc92e307e..38816653e9 100644
Binary files a/public/images/emoji/apple/billed_cap.png and b/public/images/emoji/apple/billed_cap.png differ
diff --git a/public/images/emoji/apple/biohazard.png b/public/images/emoji/apple/biohazard.png
index f2e5aa7be1..3778512d88 100644
Binary files a/public/images/emoji/apple/biohazard.png and b/public/images/emoji/apple/biohazard.png differ
diff --git a/public/images/emoji/apple/biohazard_sign.png b/public/images/emoji/apple/biohazard_sign.png
index f2e5aa7be1..3778512d88 100644
Binary files a/public/images/emoji/apple/biohazard_sign.png and b/public/images/emoji/apple/biohazard_sign.png differ
diff --git a/public/images/emoji/apple/bird.png b/public/images/emoji/apple/bird.png
index 5eeaa1b195..0e95110396 100644
Binary files a/public/images/emoji/apple/bird.png and b/public/images/emoji/apple/bird.png differ
diff --git a/public/images/emoji/apple/birthday.png b/public/images/emoji/apple/birthday.png
index 7ff9d9ef73..65f37f9551 100644
Binary files a/public/images/emoji/apple/birthday.png and b/public/images/emoji/apple/birthday.png differ
diff --git a/public/images/emoji/apple/black_circle.png b/public/images/emoji/apple/black_circle.png
index 892b54bc76..22e68c5fcf 100644
Binary files a/public/images/emoji/apple/black_circle.png and b/public/images/emoji/apple/black_circle.png differ
diff --git a/public/images/emoji/apple/black_flag.png b/public/images/emoji/apple/black_flag.png
index 36a0a6987d..b8815fb9c2 100644
Binary files a/public/images/emoji/apple/black_flag.png and b/public/images/emoji/apple/black_flag.png differ
diff --git a/public/images/emoji/apple/black_heart.png b/public/images/emoji/apple/black_heart.png
index ccaf467692..87e742ff11 100644
Binary files a/public/images/emoji/apple/black_heart.png and b/public/images/emoji/apple/black_heart.png differ
diff --git a/public/images/emoji/apple/black_joker.png b/public/images/emoji/apple/black_joker.png
index 04612a7f1f..9ac47d5b3c 100644
Binary files a/public/images/emoji/apple/black_joker.png and b/public/images/emoji/apple/black_joker.png differ
diff --git a/public/images/emoji/apple/black_large_square.png b/public/images/emoji/apple/black_large_square.png
index b578a1bbc7..79883fcd10 100644
Binary files a/public/images/emoji/apple/black_large_square.png and b/public/images/emoji/apple/black_large_square.png differ
diff --git a/public/images/emoji/apple/black_medium_small_square.png b/public/images/emoji/apple/black_medium_small_square.png
index f1b82ecfd9..f8054d3ff5 100644
Binary files a/public/images/emoji/apple/black_medium_small_square.png and b/public/images/emoji/apple/black_medium_small_square.png differ
diff --git a/public/images/emoji/apple/black_medium_square.png b/public/images/emoji/apple/black_medium_square.png
index 7aa3111242..6b275be7c9 100644
Binary files a/public/images/emoji/apple/black_medium_square.png and b/public/images/emoji/apple/black_medium_square.png differ
diff --git a/public/images/emoji/apple/black_nib.png b/public/images/emoji/apple/black_nib.png
index a728708b97..cac0c90c06 100644
Binary files a/public/images/emoji/apple/black_nib.png and b/public/images/emoji/apple/black_nib.png differ
diff --git a/public/images/emoji/apple/black_small_square.png b/public/images/emoji/apple/black_small_square.png
index b49a1e165e..76ee1dad2c 100644
Binary files a/public/images/emoji/apple/black_small_square.png and b/public/images/emoji/apple/black_small_square.png differ
diff --git a/public/images/emoji/apple/black_square_button.png b/public/images/emoji/apple/black_square_button.png
index dada1ab8b8..5a1cc4ea5d 100644
Binary files a/public/images/emoji/apple/black_square_button.png and b/public/images/emoji/apple/black_square_button.png differ
diff --git a/public/images/emoji/apple/blonde_man.png b/public/images/emoji/apple/blonde_man.png
index 005aeefeda..744b7f88ec 100644
Binary files a/public/images/emoji/apple/blonde_man.png and b/public/images/emoji/apple/blonde_man.png differ
diff --git a/public/images/emoji/apple/blonde_man/2.png b/public/images/emoji/apple/blonde_man/2.png
index 9e43423fdb..76b7fe1064 100644
Binary files a/public/images/emoji/apple/blonde_man/2.png and b/public/images/emoji/apple/blonde_man/2.png differ
diff --git a/public/images/emoji/apple/blonde_man/3.png b/public/images/emoji/apple/blonde_man/3.png
index b36f1a69db..b30808566c 100644
Binary files a/public/images/emoji/apple/blonde_man/3.png and b/public/images/emoji/apple/blonde_man/3.png differ
diff --git a/public/images/emoji/apple/blonde_man/4.png b/public/images/emoji/apple/blonde_man/4.png
index 901dfcaa06..c8a08e7c86 100644
Binary files a/public/images/emoji/apple/blonde_man/4.png and b/public/images/emoji/apple/blonde_man/4.png differ
diff --git a/public/images/emoji/apple/blonde_man/5.png b/public/images/emoji/apple/blonde_man/5.png
index 5aaa84154a..af96a96fdb 100644
Binary files a/public/images/emoji/apple/blonde_man/5.png and b/public/images/emoji/apple/blonde_man/5.png differ
diff --git a/public/images/emoji/apple/blonde_man/6.png b/public/images/emoji/apple/blonde_man/6.png
index 261b2470e3..f51881cae1 100644
Binary files a/public/images/emoji/apple/blonde_man/6.png and b/public/images/emoji/apple/blonde_man/6.png differ
diff --git a/public/images/emoji/apple/blonde_woman.png b/public/images/emoji/apple/blonde_woman.png
index 1583be196e..b8e82dc01e 100644
Binary files a/public/images/emoji/apple/blonde_woman.png and b/public/images/emoji/apple/blonde_woman.png differ
diff --git a/public/images/emoji/apple/blonde_woman/2.png b/public/images/emoji/apple/blonde_woman/2.png
index 9c514ac5fb..67880d68d1 100644
Binary files a/public/images/emoji/apple/blonde_woman/2.png and b/public/images/emoji/apple/blonde_woman/2.png differ
diff --git a/public/images/emoji/apple/blonde_woman/3.png b/public/images/emoji/apple/blonde_woman/3.png
index 22de69e3d6..565dc60488 100644
Binary files a/public/images/emoji/apple/blonde_woman/3.png and b/public/images/emoji/apple/blonde_woman/3.png differ
diff --git a/public/images/emoji/apple/blonde_woman/4.png b/public/images/emoji/apple/blonde_woman/4.png
index 7ca9f739c3..ef806f04c8 100644
Binary files a/public/images/emoji/apple/blonde_woman/4.png and b/public/images/emoji/apple/blonde_woman/4.png differ
diff --git a/public/images/emoji/apple/blonde_woman/5.png b/public/images/emoji/apple/blonde_woman/5.png
index b2add0bfd7..8c9c8cc783 100644
Binary files a/public/images/emoji/apple/blonde_woman/5.png and b/public/images/emoji/apple/blonde_woman/5.png differ
diff --git a/public/images/emoji/apple/blonde_woman/6.png b/public/images/emoji/apple/blonde_woman/6.png
index 741e10610e..469c7130db 100644
Binary files a/public/images/emoji/apple/blonde_woman/6.png and b/public/images/emoji/apple/blonde_woman/6.png differ
diff --git a/public/images/emoji/apple/blossom.png b/public/images/emoji/apple/blossom.png
index 7f7f7dd87f..e227cbb5f0 100644
Binary files a/public/images/emoji/apple/blossom.png and b/public/images/emoji/apple/blossom.png differ
diff --git a/public/images/emoji/apple/blowfish.png b/public/images/emoji/apple/blowfish.png
index 21cea90fdf..e32be1c8cc 100644
Binary files a/public/images/emoji/apple/blowfish.png and b/public/images/emoji/apple/blowfish.png differ
diff --git a/public/images/emoji/apple/blue_book.png b/public/images/emoji/apple/blue_book.png
index 71b8ff1069..ceb1c3a30a 100644
Binary files a/public/images/emoji/apple/blue_book.png and b/public/images/emoji/apple/blue_book.png differ
diff --git a/public/images/emoji/apple/blue_car.png b/public/images/emoji/apple/blue_car.png
index 8fb4c4f630..de9f555a4f 100644
Binary files a/public/images/emoji/apple/blue_car.png and b/public/images/emoji/apple/blue_car.png differ
diff --git a/public/images/emoji/apple/blue_heart.png b/public/images/emoji/apple/blue_heart.png
index 40b4db9b90..3f7af24a67 100644
Binary files a/public/images/emoji/apple/blue_heart.png and b/public/images/emoji/apple/blue_heart.png differ
diff --git a/public/images/emoji/apple/blush.png b/public/images/emoji/apple/blush.png
index 4bb9798c5b..1f13896847 100644
Binary files a/public/images/emoji/apple/blush.png and b/public/images/emoji/apple/blush.png differ
diff --git a/public/images/emoji/apple/boar.png b/public/images/emoji/apple/boar.png
index 79cfdfedb8..80e7386b02 100644
Binary files a/public/images/emoji/apple/boar.png and b/public/images/emoji/apple/boar.png differ
diff --git a/public/images/emoji/apple/boat.png b/public/images/emoji/apple/boat.png
index 1fe5602cc5..8205806735 100644
Binary files a/public/images/emoji/apple/boat.png and b/public/images/emoji/apple/boat.png differ
diff --git a/public/images/emoji/apple/bolivia.png b/public/images/emoji/apple/bolivia.png
index ff8bc0a053..d526467c8b 100644
Binary files a/public/images/emoji/apple/bolivia.png and b/public/images/emoji/apple/bolivia.png differ
diff --git a/public/images/emoji/apple/bomb.png b/public/images/emoji/apple/bomb.png
index 52472c1632..c54a7cb49f 100644
Binary files a/public/images/emoji/apple/bomb.png and b/public/images/emoji/apple/bomb.png differ
diff --git a/public/images/emoji/apple/book.png b/public/images/emoji/apple/book.png
index fd8d428a74..ef0f597bea 100644
Binary files a/public/images/emoji/apple/book.png and b/public/images/emoji/apple/book.png differ
diff --git a/public/images/emoji/apple/bookmark.png b/public/images/emoji/apple/bookmark.png
index 7107c3db76..8b327d1566 100644
Binary files a/public/images/emoji/apple/bookmark.png and b/public/images/emoji/apple/bookmark.png differ
diff --git a/public/images/emoji/apple/bookmark_tabs.png b/public/images/emoji/apple/bookmark_tabs.png
index 1728a4e9f7..4d63e43e22 100644
Binary files a/public/images/emoji/apple/bookmark_tabs.png and b/public/images/emoji/apple/bookmark_tabs.png differ
diff --git a/public/images/emoji/apple/books.png b/public/images/emoji/apple/books.png
index 77198ad195..c372aac7e1 100644
Binary files a/public/images/emoji/apple/books.png and b/public/images/emoji/apple/books.png differ
diff --git a/public/images/emoji/apple/boom.png b/public/images/emoji/apple/boom.png
index 9028c3d9fd..ef538b3b4f 100644
Binary files a/public/images/emoji/apple/boom.png and b/public/images/emoji/apple/boom.png differ
diff --git a/public/images/emoji/apple/boot.png b/public/images/emoji/apple/boot.png
index 2af53fd8c1..c928dcf6ab 100644
Binary files a/public/images/emoji/apple/boot.png and b/public/images/emoji/apple/boot.png differ
diff --git a/public/images/emoji/apple/bosnia_herzegovina.png b/public/images/emoji/apple/bosnia_herzegovina.png
index 9dde1447db..73221aeb78 100644
Binary files a/public/images/emoji/apple/bosnia_herzegovina.png and b/public/images/emoji/apple/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/apple/botswana.png b/public/images/emoji/apple/botswana.png
index b9daaed050..e59a5b0f39 100644
Binary files a/public/images/emoji/apple/botswana.png and b/public/images/emoji/apple/botswana.png differ
diff --git a/public/images/emoji/apple/bottle_with_popping_cork.png b/public/images/emoji/apple/bottle_with_popping_cork.png
index 897fc5b341..969e063bd3 100644
Binary files a/public/images/emoji/apple/bottle_with_popping_cork.png and b/public/images/emoji/apple/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/apple/bouquet.png b/public/images/emoji/apple/bouquet.png
index 7267e7ca70..c4f8137d4e 100644
Binary files a/public/images/emoji/apple/bouquet.png and b/public/images/emoji/apple/bouquet.png differ
diff --git a/public/images/emoji/apple/bouvet_island.png b/public/images/emoji/apple/bouvet_island.png
index 5827a3d376..4bb670001a 100644
Binary files a/public/images/emoji/apple/bouvet_island.png and b/public/images/emoji/apple/bouvet_island.png differ
diff --git a/public/images/emoji/apple/bow.png b/public/images/emoji/apple/bow.png
index fa7f186924..0d881a7fa6 100644
Binary files a/public/images/emoji/apple/bow.png and b/public/images/emoji/apple/bow.png differ
diff --git a/public/images/emoji/apple/bow/2.png b/public/images/emoji/apple/bow/2.png
index e484dc4efe..f033f16805 100644
Binary files a/public/images/emoji/apple/bow/2.png and b/public/images/emoji/apple/bow/2.png differ
diff --git a/public/images/emoji/apple/bow/3.png b/public/images/emoji/apple/bow/3.png
index 952f744efe..5bfa73a946 100644
Binary files a/public/images/emoji/apple/bow/3.png and b/public/images/emoji/apple/bow/3.png differ
diff --git a/public/images/emoji/apple/bow/4.png b/public/images/emoji/apple/bow/4.png
index 7e7b4cc6f1..258175984a 100644
Binary files a/public/images/emoji/apple/bow/4.png and b/public/images/emoji/apple/bow/4.png differ
diff --git a/public/images/emoji/apple/bow/5.png b/public/images/emoji/apple/bow/5.png
index 6e317e21b8..bb55d7779a 100644
Binary files a/public/images/emoji/apple/bow/5.png and b/public/images/emoji/apple/bow/5.png differ
diff --git a/public/images/emoji/apple/bow/6.png b/public/images/emoji/apple/bow/6.png
index 8162c9ec2b..030326934f 100644
Binary files a/public/images/emoji/apple/bow/6.png and b/public/images/emoji/apple/bow/6.png differ
diff --git a/public/images/emoji/apple/bow_and_arrow.png b/public/images/emoji/apple/bow_and_arrow.png
index 58c5e9f05a..d98b9cba33 100644
Binary files a/public/images/emoji/apple/bow_and_arrow.png and b/public/images/emoji/apple/bow_and_arrow.png differ
diff --git a/public/images/emoji/apple/bowing_man.png b/public/images/emoji/apple/bowing_man.png
index fa7f186924..0d881a7fa6 100644
Binary files a/public/images/emoji/apple/bowing_man.png and b/public/images/emoji/apple/bowing_man.png differ
diff --git a/public/images/emoji/apple/bowing_man/2.png b/public/images/emoji/apple/bowing_man/2.png
index e484dc4efe..f033f16805 100644
Binary files a/public/images/emoji/apple/bowing_man/2.png and b/public/images/emoji/apple/bowing_man/2.png differ
diff --git a/public/images/emoji/apple/bowing_man/3.png b/public/images/emoji/apple/bowing_man/3.png
index 952f744efe..5bfa73a946 100644
Binary files a/public/images/emoji/apple/bowing_man/3.png and b/public/images/emoji/apple/bowing_man/3.png differ
diff --git a/public/images/emoji/apple/bowing_man/4.png b/public/images/emoji/apple/bowing_man/4.png
index 7e7b4cc6f1..258175984a 100644
Binary files a/public/images/emoji/apple/bowing_man/4.png and b/public/images/emoji/apple/bowing_man/4.png differ
diff --git a/public/images/emoji/apple/bowing_man/5.png b/public/images/emoji/apple/bowing_man/5.png
index 6e317e21b8..bb55d7779a 100644
Binary files a/public/images/emoji/apple/bowing_man/5.png and b/public/images/emoji/apple/bowing_man/5.png differ
diff --git a/public/images/emoji/apple/bowing_man/6.png b/public/images/emoji/apple/bowing_man/6.png
index 8162c9ec2b..030326934f 100644
Binary files a/public/images/emoji/apple/bowing_man/6.png and b/public/images/emoji/apple/bowing_man/6.png differ
diff --git a/public/images/emoji/apple/bowing_woman.png b/public/images/emoji/apple/bowing_woman.png
index b791781755..54749437d1 100644
Binary files a/public/images/emoji/apple/bowing_woman.png and b/public/images/emoji/apple/bowing_woman.png differ
diff --git a/public/images/emoji/apple/bowing_woman/2.png b/public/images/emoji/apple/bowing_woman/2.png
index 887b1e699b..6876636993 100644
Binary files a/public/images/emoji/apple/bowing_woman/2.png and b/public/images/emoji/apple/bowing_woman/2.png differ
diff --git a/public/images/emoji/apple/bowing_woman/3.png b/public/images/emoji/apple/bowing_woman/3.png
index 9a8210b8a2..ce44c9576f 100644
Binary files a/public/images/emoji/apple/bowing_woman/3.png and b/public/images/emoji/apple/bowing_woman/3.png differ
diff --git a/public/images/emoji/apple/bowing_woman/4.png b/public/images/emoji/apple/bowing_woman/4.png
index f91db44496..2818854fe0 100644
Binary files a/public/images/emoji/apple/bowing_woman/4.png and b/public/images/emoji/apple/bowing_woman/4.png differ
diff --git a/public/images/emoji/apple/bowing_woman/5.png b/public/images/emoji/apple/bowing_woman/5.png
index cb0a227139..b21b63bb04 100644
Binary files a/public/images/emoji/apple/bowing_woman/5.png and b/public/images/emoji/apple/bowing_woman/5.png differ
diff --git a/public/images/emoji/apple/bowing_woman/6.png b/public/images/emoji/apple/bowing_woman/6.png
index 87c4e450eb..62d9f57a21 100644
Binary files a/public/images/emoji/apple/bowing_woman/6.png and b/public/images/emoji/apple/bowing_woman/6.png differ
diff --git a/public/images/emoji/apple/bowl_with_spoon.png b/public/images/emoji/apple/bowl_with_spoon.png
index b0d88a73b9..670549a10d 100644
Binary files a/public/images/emoji/apple/bowl_with_spoon.png and b/public/images/emoji/apple/bowl_with_spoon.png differ
diff --git a/public/images/emoji/apple/bowling.png b/public/images/emoji/apple/bowling.png
index bb1166501e..912dcc4193 100644
Binary files a/public/images/emoji/apple/bowling.png and b/public/images/emoji/apple/bowling.png differ
diff --git a/public/images/emoji/apple/boxing_glove.png b/public/images/emoji/apple/boxing_glove.png
index 7d96edb1b3..94b1122796 100644
Binary files a/public/images/emoji/apple/boxing_glove.png and b/public/images/emoji/apple/boxing_glove.png differ
diff --git a/public/images/emoji/apple/boy.png b/public/images/emoji/apple/boy.png
index 13a327586d..15d4bf0ff5 100644
Binary files a/public/images/emoji/apple/boy.png and b/public/images/emoji/apple/boy.png differ
diff --git a/public/images/emoji/apple/boy/2.png b/public/images/emoji/apple/boy/2.png
index 8dfe24684a..c83f3e3ffc 100644
Binary files a/public/images/emoji/apple/boy/2.png and b/public/images/emoji/apple/boy/2.png differ
diff --git a/public/images/emoji/apple/boy/3.png b/public/images/emoji/apple/boy/3.png
index 6eb54dbe51..01202d7ccf 100644
Binary files a/public/images/emoji/apple/boy/3.png and b/public/images/emoji/apple/boy/3.png differ
diff --git a/public/images/emoji/apple/boy/4.png b/public/images/emoji/apple/boy/4.png
index 5b4dcc1c08..2c364082ba 100644
Binary files a/public/images/emoji/apple/boy/4.png and b/public/images/emoji/apple/boy/4.png differ
diff --git a/public/images/emoji/apple/boy/5.png b/public/images/emoji/apple/boy/5.png
index dba107efaf..d6c31e7582 100644
Binary files a/public/images/emoji/apple/boy/5.png and b/public/images/emoji/apple/boy/5.png differ
diff --git a/public/images/emoji/apple/boy/6.png b/public/images/emoji/apple/boy/6.png
index 59c5d57bb7..7ae80cd19c 100644
Binary files a/public/images/emoji/apple/boy/6.png and b/public/images/emoji/apple/boy/6.png differ
diff --git a/public/images/emoji/apple/brain.png b/public/images/emoji/apple/brain.png
index c8e889faec..8592c6f780 100644
Binary files a/public/images/emoji/apple/brain.png and b/public/images/emoji/apple/brain.png differ
diff --git a/public/images/emoji/apple/brazil.png b/public/images/emoji/apple/brazil.png
index d14af58f54..7f60c62971 100644
Binary files a/public/images/emoji/apple/brazil.png and b/public/images/emoji/apple/brazil.png differ
diff --git a/public/images/emoji/apple/bread.png b/public/images/emoji/apple/bread.png
index 50c753d962..c1dd6268a8 100644
Binary files a/public/images/emoji/apple/bread.png and b/public/images/emoji/apple/bread.png differ
diff --git a/public/images/emoji/apple/breast_feeding.png b/public/images/emoji/apple/breast_feeding.png
index 815538138b..453f92fdc3 100644
Binary files a/public/images/emoji/apple/breast_feeding.png and b/public/images/emoji/apple/breast_feeding.png differ
diff --git a/public/images/emoji/apple/breast_feeding/2.png b/public/images/emoji/apple/breast_feeding/2.png
index fb591aa4fb..8d7a66b293 100644
Binary files a/public/images/emoji/apple/breast_feeding/2.png and b/public/images/emoji/apple/breast_feeding/2.png differ
diff --git a/public/images/emoji/apple/breast_feeding/3.png b/public/images/emoji/apple/breast_feeding/3.png
index 5adcffa4b9..d151babb5b 100644
Binary files a/public/images/emoji/apple/breast_feeding/3.png and b/public/images/emoji/apple/breast_feeding/3.png differ
diff --git a/public/images/emoji/apple/breast_feeding/4.png b/public/images/emoji/apple/breast_feeding/4.png
index d166f981b2..4a01910b08 100644
Binary files a/public/images/emoji/apple/breast_feeding/4.png and b/public/images/emoji/apple/breast_feeding/4.png differ
diff --git a/public/images/emoji/apple/breast_feeding/5.png b/public/images/emoji/apple/breast_feeding/5.png
index 7c8cb50a78..b8bea5001c 100644
Binary files a/public/images/emoji/apple/breast_feeding/5.png and b/public/images/emoji/apple/breast_feeding/5.png differ
diff --git a/public/images/emoji/apple/breast_feeding/6.png b/public/images/emoji/apple/breast_feeding/6.png
index e113d8cb42..f57adc0a8b 100644
Binary files a/public/images/emoji/apple/breast_feeding/6.png and b/public/images/emoji/apple/breast_feeding/6.png differ
diff --git a/public/images/emoji/apple/bride_with_veil.png b/public/images/emoji/apple/bride_with_veil.png
index f9ce59af3b..cb622f5890 100644
Binary files a/public/images/emoji/apple/bride_with_veil.png and b/public/images/emoji/apple/bride_with_veil.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/2.png b/public/images/emoji/apple/bride_with_veil/2.png
index 5cd877c475..0e84a87346 100644
Binary files a/public/images/emoji/apple/bride_with_veil/2.png and b/public/images/emoji/apple/bride_with_veil/2.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/3.png b/public/images/emoji/apple/bride_with_veil/3.png
index be044be6e7..19da261bd6 100644
Binary files a/public/images/emoji/apple/bride_with_veil/3.png and b/public/images/emoji/apple/bride_with_veil/3.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/4.png b/public/images/emoji/apple/bride_with_veil/4.png
index bb2f7557b0..3de8a0ef24 100644
Binary files a/public/images/emoji/apple/bride_with_veil/4.png and b/public/images/emoji/apple/bride_with_veil/4.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/5.png b/public/images/emoji/apple/bride_with_veil/5.png
index 3e8f677695..b828e3eb65 100644
Binary files a/public/images/emoji/apple/bride_with_veil/5.png and b/public/images/emoji/apple/bride_with_veil/5.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/6.png b/public/images/emoji/apple/bride_with_veil/6.png
index 32aa1a28b9..76ee319696 100644
Binary files a/public/images/emoji/apple/bride_with_veil/6.png and b/public/images/emoji/apple/bride_with_veil/6.png differ
diff --git a/public/images/emoji/apple/bridge_at_night.png b/public/images/emoji/apple/bridge_at_night.png
index da38bbb900..e8b6b7b1b9 100644
Binary files a/public/images/emoji/apple/bridge_at_night.png and b/public/images/emoji/apple/bridge_at_night.png differ
diff --git a/public/images/emoji/apple/briefcase.png b/public/images/emoji/apple/briefcase.png
index 81d3772345..7ff36dc530 100644
Binary files a/public/images/emoji/apple/briefcase.png and b/public/images/emoji/apple/briefcase.png differ
diff --git a/public/images/emoji/apple/british_indian_ocean_territory.png b/public/images/emoji/apple/british_indian_ocean_territory.png
index 1008c45a45..21e6a16e3b 100644
Binary files a/public/images/emoji/apple/british_indian_ocean_territory.png and b/public/images/emoji/apple/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/apple/british_virgin_islands.png b/public/images/emoji/apple/british_virgin_islands.png
index 4731279793..2a96cb70ae 100644
Binary files a/public/images/emoji/apple/british_virgin_islands.png and b/public/images/emoji/apple/british_virgin_islands.png differ
diff --git a/public/images/emoji/apple/broccoli.png b/public/images/emoji/apple/broccoli.png
index 5e03a6d23b..3095b3adde 100644
Binary files a/public/images/emoji/apple/broccoli.png and b/public/images/emoji/apple/broccoli.png differ
diff --git a/public/images/emoji/apple/broken_heart.png b/public/images/emoji/apple/broken_heart.png
index 86e08db519..e7151b4139 100644
Binary files a/public/images/emoji/apple/broken_heart.png and b/public/images/emoji/apple/broken_heart.png differ
diff --git a/public/images/emoji/apple/brunei.png b/public/images/emoji/apple/brunei.png
index 0bc99e219b..19f01d09b8 100644
Binary files a/public/images/emoji/apple/brunei.png and b/public/images/emoji/apple/brunei.png differ
diff --git a/public/images/emoji/apple/bug.png b/public/images/emoji/apple/bug.png
index 3bb41a0c2c..ab1ff2071a 100644
Binary files a/public/images/emoji/apple/bug.png and b/public/images/emoji/apple/bug.png differ
diff --git a/public/images/emoji/apple/building_construction.png b/public/images/emoji/apple/building_construction.png
index caad1ac128..813ae6ebe7 100644
Binary files a/public/images/emoji/apple/building_construction.png and b/public/images/emoji/apple/building_construction.png differ
diff --git a/public/images/emoji/apple/bulb.png b/public/images/emoji/apple/bulb.png
index 3a0343e133..d39a763b0e 100644
Binary files a/public/images/emoji/apple/bulb.png and b/public/images/emoji/apple/bulb.png differ
diff --git a/public/images/emoji/apple/bulgaria.png b/public/images/emoji/apple/bulgaria.png
index 92bad97fab..1c886ef85a 100644
Binary files a/public/images/emoji/apple/bulgaria.png and b/public/images/emoji/apple/bulgaria.png differ
diff --git a/public/images/emoji/apple/bullettrain_front.png b/public/images/emoji/apple/bullettrain_front.png
index 55752567d5..f1227c45ef 100644
Binary files a/public/images/emoji/apple/bullettrain_front.png and b/public/images/emoji/apple/bullettrain_front.png differ
diff --git a/public/images/emoji/apple/bullettrain_side.png b/public/images/emoji/apple/bullettrain_side.png
index 7fe88b489d..dd7091d911 100644
Binary files a/public/images/emoji/apple/bullettrain_side.png and b/public/images/emoji/apple/bullettrain_side.png differ
diff --git a/public/images/emoji/apple/burkina_faso.png b/public/images/emoji/apple/burkina_faso.png
index 61fac3c669..9e3dc1fac6 100644
Binary files a/public/images/emoji/apple/burkina_faso.png and b/public/images/emoji/apple/burkina_faso.png differ
diff --git a/public/images/emoji/apple/burrito.png b/public/images/emoji/apple/burrito.png
index c85491514d..b470c0cb4a 100644
Binary files a/public/images/emoji/apple/burrito.png and b/public/images/emoji/apple/burrito.png differ
diff --git a/public/images/emoji/apple/burundi.png b/public/images/emoji/apple/burundi.png
index e029433553..701bccdc17 100644
Binary files a/public/images/emoji/apple/burundi.png and b/public/images/emoji/apple/burundi.png differ
diff --git a/public/images/emoji/apple/bus.png b/public/images/emoji/apple/bus.png
index 5a47f74a09..729f995cc9 100644
Binary files a/public/images/emoji/apple/bus.png and b/public/images/emoji/apple/bus.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating.png b/public/images/emoji/apple/business_suit_levitating.png
index 00ae1282f1..18cd801da6 100644
Binary files a/public/images/emoji/apple/business_suit_levitating.png and b/public/images/emoji/apple/business_suit_levitating.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/2.png b/public/images/emoji/apple/business_suit_levitating/2.png
index 369be94783..6609e435cb 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/2.png and b/public/images/emoji/apple/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/3.png b/public/images/emoji/apple/business_suit_levitating/3.png
index f81f47f274..77db5393d7 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/3.png and b/public/images/emoji/apple/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/4.png b/public/images/emoji/apple/business_suit_levitating/4.png
index b355778d9f..e9d1ad046a 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/4.png and b/public/images/emoji/apple/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/5.png b/public/images/emoji/apple/business_suit_levitating/5.png
index f348ca68e3..16ac6699bf 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/5.png and b/public/images/emoji/apple/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/6.png b/public/images/emoji/apple/business_suit_levitating/6.png
index 232f1c2dc2..68d5680a93 100644
Binary files a/public/images/emoji/apple/business_suit_levitating/6.png and b/public/images/emoji/apple/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/apple/busstop.png b/public/images/emoji/apple/busstop.png
index af813ce4aa..a254a24465 100644
Binary files a/public/images/emoji/apple/busstop.png and b/public/images/emoji/apple/busstop.png differ
diff --git a/public/images/emoji/apple/bust_in_silhouette.png b/public/images/emoji/apple/bust_in_silhouette.png
index cc514eac84..f764fd0f99 100644
Binary files a/public/images/emoji/apple/bust_in_silhouette.png and b/public/images/emoji/apple/bust_in_silhouette.png differ
diff --git a/public/images/emoji/apple/busts_in_silhouette.png b/public/images/emoji/apple/busts_in_silhouette.png
index e6b1ae0783..0970cb488a 100644
Binary files a/public/images/emoji/apple/busts_in_silhouette.png and b/public/images/emoji/apple/busts_in_silhouette.png differ
diff --git a/public/images/emoji/apple/butterfly.png b/public/images/emoji/apple/butterfly.png
index baf3480c1b..fa1460b54c 100644
Binary files a/public/images/emoji/apple/butterfly.png and b/public/images/emoji/apple/butterfly.png differ
diff --git a/public/images/emoji/apple/cactus.png b/public/images/emoji/apple/cactus.png
index 4ae0cca3cd..6da0ebc71a 100644
Binary files a/public/images/emoji/apple/cactus.png and b/public/images/emoji/apple/cactus.png differ
diff --git a/public/images/emoji/apple/cake.png b/public/images/emoji/apple/cake.png
index 61ed440e75..b5baee3093 100644
Binary files a/public/images/emoji/apple/cake.png and b/public/images/emoji/apple/cake.png differ
diff --git a/public/images/emoji/apple/calendar.png b/public/images/emoji/apple/calendar.png
index a98cef1cd4..112d5b3e4c 100644
Binary files a/public/images/emoji/apple/calendar.png and b/public/images/emoji/apple/calendar.png differ
diff --git a/public/images/emoji/apple/calendar_spiral.png b/public/images/emoji/apple/calendar_spiral.png
index 74b98132dd..b287a2598c 100644
Binary files a/public/images/emoji/apple/calendar_spiral.png and b/public/images/emoji/apple/calendar_spiral.png differ
diff --git a/public/images/emoji/apple/call_me_hand.png b/public/images/emoji/apple/call_me_hand.png
index 0c58183e41..8c04ccf84a 100644
Binary files a/public/images/emoji/apple/call_me_hand.png and b/public/images/emoji/apple/call_me_hand.png differ
diff --git a/public/images/emoji/apple/call_me_hand/2.png b/public/images/emoji/apple/call_me_hand/2.png
index b29d9c3a9c..7c52421341 100644
Binary files a/public/images/emoji/apple/call_me_hand/2.png and b/public/images/emoji/apple/call_me_hand/2.png differ
diff --git a/public/images/emoji/apple/call_me_hand/3.png b/public/images/emoji/apple/call_me_hand/3.png
index 6f30225e3a..8e746a1807 100644
Binary files a/public/images/emoji/apple/call_me_hand/3.png and b/public/images/emoji/apple/call_me_hand/3.png differ
diff --git a/public/images/emoji/apple/call_me_hand/4.png b/public/images/emoji/apple/call_me_hand/4.png
index 42ac3f1063..71b37e7e68 100644
Binary files a/public/images/emoji/apple/call_me_hand/4.png and b/public/images/emoji/apple/call_me_hand/4.png differ
diff --git a/public/images/emoji/apple/call_me_hand/5.png b/public/images/emoji/apple/call_me_hand/5.png
index 1f766292fa..6feffc9256 100644
Binary files a/public/images/emoji/apple/call_me_hand/5.png and b/public/images/emoji/apple/call_me_hand/5.png differ
diff --git a/public/images/emoji/apple/call_me_hand/6.png b/public/images/emoji/apple/call_me_hand/6.png
index ff0ce24b2b..ad28e87bde 100644
Binary files a/public/images/emoji/apple/call_me_hand/6.png and b/public/images/emoji/apple/call_me_hand/6.png differ
diff --git a/public/images/emoji/apple/calling.png b/public/images/emoji/apple/calling.png
index ae1e525fea..38c5c2e276 100644
Binary files a/public/images/emoji/apple/calling.png and b/public/images/emoji/apple/calling.png differ
diff --git a/public/images/emoji/apple/cambodia.png b/public/images/emoji/apple/cambodia.png
index c5ee376139..784b7778a6 100644
Binary files a/public/images/emoji/apple/cambodia.png and b/public/images/emoji/apple/cambodia.png differ
diff --git a/public/images/emoji/apple/camel.png b/public/images/emoji/apple/camel.png
index 315595b24f..6bbc624ba5 100644
Binary files a/public/images/emoji/apple/camel.png and b/public/images/emoji/apple/camel.png differ
diff --git a/public/images/emoji/apple/camera.png b/public/images/emoji/apple/camera.png
index 14ef5fd476..7edf3c714c 100644
Binary files a/public/images/emoji/apple/camera.png and b/public/images/emoji/apple/camera.png differ
diff --git a/public/images/emoji/apple/camera_flash.png b/public/images/emoji/apple/camera_flash.png
index dcaac46221..ad2ffe7e76 100644
Binary files a/public/images/emoji/apple/camera_flash.png and b/public/images/emoji/apple/camera_flash.png differ
diff --git a/public/images/emoji/apple/camera_with_flash.png b/public/images/emoji/apple/camera_with_flash.png
index dcaac46221..ad2ffe7e76 100644
Binary files a/public/images/emoji/apple/camera_with_flash.png and b/public/images/emoji/apple/camera_with_flash.png differ
diff --git a/public/images/emoji/apple/cameroon.png b/public/images/emoji/apple/cameroon.png
index dc6e3db418..c1d957f8d5 100644
Binary files a/public/images/emoji/apple/cameroon.png and b/public/images/emoji/apple/cameroon.png differ
diff --git a/public/images/emoji/apple/camping.png b/public/images/emoji/apple/camping.png
index 008e2a2d8e..1a0393f0e8 100644
Binary files a/public/images/emoji/apple/camping.png and b/public/images/emoji/apple/camping.png differ
diff --git a/public/images/emoji/apple/canada.png b/public/images/emoji/apple/canada.png
index 85be8280f8..e3b63844ae 100644
Binary files a/public/images/emoji/apple/canada.png and b/public/images/emoji/apple/canada.png differ
diff --git a/public/images/emoji/apple/canary_islands.png b/public/images/emoji/apple/canary_islands.png
index 9e8edf40ad..b3ccac2070 100644
Binary files a/public/images/emoji/apple/canary_islands.png and b/public/images/emoji/apple/canary_islands.png differ
diff --git a/public/images/emoji/apple/cancer.png b/public/images/emoji/apple/cancer.png
index d081129bbc..22eceabf31 100644
Binary files a/public/images/emoji/apple/cancer.png and b/public/images/emoji/apple/cancer.png differ
diff --git a/public/images/emoji/apple/candle.png b/public/images/emoji/apple/candle.png
index 5c0b463ff3..9ffbe938f1 100644
Binary files a/public/images/emoji/apple/candle.png and b/public/images/emoji/apple/candle.png differ
diff --git a/public/images/emoji/apple/candy.png b/public/images/emoji/apple/candy.png
index 2e91629c5f..68679a1a2f 100644
Binary files a/public/images/emoji/apple/candy.png and b/public/images/emoji/apple/candy.png differ
diff --git a/public/images/emoji/apple/canned_food.png b/public/images/emoji/apple/canned_food.png
index 2e5976e9d2..d52a5b11ff 100644
Binary files a/public/images/emoji/apple/canned_food.png and b/public/images/emoji/apple/canned_food.png differ
diff --git a/public/images/emoji/apple/canoe.png b/public/images/emoji/apple/canoe.png
index fcac299cfa..1e357ef891 100644
Binary files a/public/images/emoji/apple/canoe.png and b/public/images/emoji/apple/canoe.png differ
diff --git a/public/images/emoji/apple/cape_verde.png b/public/images/emoji/apple/cape_verde.png
index b6f59e377d..42b6937a96 100644
Binary files a/public/images/emoji/apple/cape_verde.png and b/public/images/emoji/apple/cape_verde.png differ
diff --git a/public/images/emoji/apple/capital_abcd.png b/public/images/emoji/apple/capital_abcd.png
index 813ebc7886..a112d385b1 100644
Binary files a/public/images/emoji/apple/capital_abcd.png and b/public/images/emoji/apple/capital_abcd.png differ
diff --git a/public/images/emoji/apple/capricorn.png b/public/images/emoji/apple/capricorn.png
index 8d4950b182..92ad8b4c60 100644
Binary files a/public/images/emoji/apple/capricorn.png and b/public/images/emoji/apple/capricorn.png differ
diff --git a/public/images/emoji/apple/car.png b/public/images/emoji/apple/car.png
index 80e24f234b..8e21911667 100644
Binary files a/public/images/emoji/apple/car.png and b/public/images/emoji/apple/car.png differ
diff --git a/public/images/emoji/apple/card_box.png b/public/images/emoji/apple/card_box.png
index a0a547ebaf..f4abbf03fc 100644
Binary files a/public/images/emoji/apple/card_box.png and b/public/images/emoji/apple/card_box.png differ
diff --git a/public/images/emoji/apple/card_file_box.png b/public/images/emoji/apple/card_file_box.png
index a0a547ebaf..f4abbf03fc 100644
Binary files a/public/images/emoji/apple/card_file_box.png and b/public/images/emoji/apple/card_file_box.png differ
diff --git a/public/images/emoji/apple/card_index.png b/public/images/emoji/apple/card_index.png
index 6e30338fb6..adc4b1e866 100644
Binary files a/public/images/emoji/apple/card_index.png and b/public/images/emoji/apple/card_index.png differ
diff --git a/public/images/emoji/apple/card_index_dividers.png b/public/images/emoji/apple/card_index_dividers.png
index 688e41bb2f..32ae4bace0 100644
Binary files a/public/images/emoji/apple/card_index_dividers.png and b/public/images/emoji/apple/card_index_dividers.png differ
diff --git a/public/images/emoji/apple/caribbean_netherlands.png b/public/images/emoji/apple/caribbean_netherlands.png
index f24d3ab5da..7210a55cfe 100644
Binary files a/public/images/emoji/apple/caribbean_netherlands.png and b/public/images/emoji/apple/caribbean_netherlands.png differ
diff --git a/public/images/emoji/apple/carousel_horse.png b/public/images/emoji/apple/carousel_horse.png
index 84cc6f420f..b09053d39c 100644
Binary files a/public/images/emoji/apple/carousel_horse.png and b/public/images/emoji/apple/carousel_horse.png differ
diff --git a/public/images/emoji/apple/carrot.png b/public/images/emoji/apple/carrot.png
index 8d88ed1579..0bef20023f 100644
Binary files a/public/images/emoji/apple/carrot.png and b/public/images/emoji/apple/carrot.png differ
diff --git a/public/images/emoji/apple/cat.png b/public/images/emoji/apple/cat.png
index e106ea5da3..88de683470 100644
Binary files a/public/images/emoji/apple/cat.png and b/public/images/emoji/apple/cat.png differ
diff --git a/public/images/emoji/apple/cat2.png b/public/images/emoji/apple/cat2.png
index d644a17077..b9017962e3 100644
Binary files a/public/images/emoji/apple/cat2.png and b/public/images/emoji/apple/cat2.png differ
diff --git a/public/images/emoji/apple/cayman_islands.png b/public/images/emoji/apple/cayman_islands.png
index b78af60104..ac46a80c16 100644
Binary files a/public/images/emoji/apple/cayman_islands.png and b/public/images/emoji/apple/cayman_islands.png differ
diff --git a/public/images/emoji/apple/cd.png b/public/images/emoji/apple/cd.png
index e14cd808bc..5a3deee770 100644
Binary files a/public/images/emoji/apple/cd.png and b/public/images/emoji/apple/cd.png differ
diff --git a/public/images/emoji/apple/central_african_republic.png b/public/images/emoji/apple/central_african_republic.png
index 7ead04d8e8..6ac98e11aa 100644
Binary files a/public/images/emoji/apple/central_african_republic.png and b/public/images/emoji/apple/central_african_republic.png differ
diff --git a/public/images/emoji/apple/ceuta_and_melilla.png b/public/images/emoji/apple/ceuta_and_melilla.png
index 8fca1f0390..73e3231afb 100644
Binary files a/public/images/emoji/apple/ceuta_and_melilla.png and b/public/images/emoji/apple/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/apple/chad.png b/public/images/emoji/apple/chad.png
index 9c6d1cce2b..1b9e08a5b9 100644
Binary files a/public/images/emoji/apple/chad.png and b/public/images/emoji/apple/chad.png differ
diff --git a/public/images/emoji/apple/chains.png b/public/images/emoji/apple/chains.png
index a223561da7..eb7f24c3e8 100644
Binary files a/public/images/emoji/apple/chains.png and b/public/images/emoji/apple/chains.png differ
diff --git a/public/images/emoji/apple/champagne.png b/public/images/emoji/apple/champagne.png
index 897fc5b341..969e063bd3 100644
Binary files a/public/images/emoji/apple/champagne.png and b/public/images/emoji/apple/champagne.png differ
diff --git a/public/images/emoji/apple/chart.png b/public/images/emoji/apple/chart.png
index 87f66213e0..31db79e63b 100644
Binary files a/public/images/emoji/apple/chart.png and b/public/images/emoji/apple/chart.png differ
diff --git a/public/images/emoji/apple/chart_with_downwards_trend.png b/public/images/emoji/apple/chart_with_downwards_trend.png
index a592a3b697..5a444af4fe 100644
Binary files a/public/images/emoji/apple/chart_with_downwards_trend.png and b/public/images/emoji/apple/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/apple/chart_with_upwards_trend.png b/public/images/emoji/apple/chart_with_upwards_trend.png
index 37d888ecea..9856980925 100644
Binary files a/public/images/emoji/apple/chart_with_upwards_trend.png and b/public/images/emoji/apple/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/apple/checkered_flag.png b/public/images/emoji/apple/checkered_flag.png
index 0838044fbd..3a138ef9f5 100644
Binary files a/public/images/emoji/apple/checkered_flag.png and b/public/images/emoji/apple/checkered_flag.png differ
diff --git a/public/images/emoji/apple/cheese.png b/public/images/emoji/apple/cheese.png
index 7b457c211a..97164d9069 100644
Binary files a/public/images/emoji/apple/cheese.png and b/public/images/emoji/apple/cheese.png differ
diff --git a/public/images/emoji/apple/cheese_wedge.png b/public/images/emoji/apple/cheese_wedge.png
index 7b457c211a..97164d9069 100644
Binary files a/public/images/emoji/apple/cheese_wedge.png and b/public/images/emoji/apple/cheese_wedge.png differ
diff --git a/public/images/emoji/apple/cherries.png b/public/images/emoji/apple/cherries.png
index 3c3684ca2a..bb3bd48328 100644
Binary files a/public/images/emoji/apple/cherries.png and b/public/images/emoji/apple/cherries.png differ
diff --git a/public/images/emoji/apple/cherry_blossom.png b/public/images/emoji/apple/cherry_blossom.png
index 749e0109ff..80ff872c0c 100644
Binary files a/public/images/emoji/apple/cherry_blossom.png and b/public/images/emoji/apple/cherry_blossom.png differ
diff --git a/public/images/emoji/apple/chestnut.png b/public/images/emoji/apple/chestnut.png
index a427eeb898..8b5e9408c7 100644
Binary files a/public/images/emoji/apple/chestnut.png and b/public/images/emoji/apple/chestnut.png differ
diff --git a/public/images/emoji/apple/chicken.png b/public/images/emoji/apple/chicken.png
index f7b9bde9bc..217731cb10 100644
Binary files a/public/images/emoji/apple/chicken.png and b/public/images/emoji/apple/chicken.png differ
diff --git a/public/images/emoji/apple/child.png b/public/images/emoji/apple/child.png
index 33e50494a3..4070e53fad 100644
Binary files a/public/images/emoji/apple/child.png and b/public/images/emoji/apple/child.png differ
diff --git a/public/images/emoji/apple/child/2.png b/public/images/emoji/apple/child/2.png
index 7a0e4f1cb7..b1d4f2b2fc 100644
Binary files a/public/images/emoji/apple/child/2.png and b/public/images/emoji/apple/child/2.png differ
diff --git a/public/images/emoji/apple/child/3.png b/public/images/emoji/apple/child/3.png
index 81a69110e9..e9bc850f35 100644
Binary files a/public/images/emoji/apple/child/3.png and b/public/images/emoji/apple/child/3.png differ
diff --git a/public/images/emoji/apple/child/4.png b/public/images/emoji/apple/child/4.png
index b5c64c9cc8..d3f60ed13c 100644
Binary files a/public/images/emoji/apple/child/4.png and b/public/images/emoji/apple/child/4.png differ
diff --git a/public/images/emoji/apple/child/5.png b/public/images/emoji/apple/child/5.png
index 0763a8bd94..db838a97f3 100644
Binary files a/public/images/emoji/apple/child/5.png and b/public/images/emoji/apple/child/5.png differ
diff --git a/public/images/emoji/apple/child/6.png b/public/images/emoji/apple/child/6.png
index 3ed705b902..c10b15aa35 100644
Binary files a/public/images/emoji/apple/child/6.png and b/public/images/emoji/apple/child/6.png differ
diff --git a/public/images/emoji/apple/children_crossing.png b/public/images/emoji/apple/children_crossing.png
index f19495f8ce..0a766d59fd 100644
Binary files a/public/images/emoji/apple/children_crossing.png and b/public/images/emoji/apple/children_crossing.png differ
diff --git a/public/images/emoji/apple/chile.png b/public/images/emoji/apple/chile.png
index 0f26ed2a65..90ad217dce 100644
Binary files a/public/images/emoji/apple/chile.png and b/public/images/emoji/apple/chile.png differ
diff --git a/public/images/emoji/apple/chipmunk.png b/public/images/emoji/apple/chipmunk.png
index 80de702c1b..4d41eaea53 100644
Binary files a/public/images/emoji/apple/chipmunk.png and b/public/images/emoji/apple/chipmunk.png differ
diff --git a/public/images/emoji/apple/chocolate_bar.png b/public/images/emoji/apple/chocolate_bar.png
index 0632498930..665105e2c7 100644
Binary files a/public/images/emoji/apple/chocolate_bar.png and b/public/images/emoji/apple/chocolate_bar.png differ
diff --git a/public/images/emoji/apple/chopsticks.png b/public/images/emoji/apple/chopsticks.png
index 5706420297..40d4cdc8ff 100644
Binary files a/public/images/emoji/apple/chopsticks.png and b/public/images/emoji/apple/chopsticks.png differ
diff --git a/public/images/emoji/apple/christmas_island.png b/public/images/emoji/apple/christmas_island.png
index 290b1bf6ad..b28e0b8b6e 100644
Binary files a/public/images/emoji/apple/christmas_island.png and b/public/images/emoji/apple/christmas_island.png differ
diff --git a/public/images/emoji/apple/christmas_tree.png b/public/images/emoji/apple/christmas_tree.png
index b0faf71d11..7570e66343 100644
Binary files a/public/images/emoji/apple/christmas_tree.png and b/public/images/emoji/apple/christmas_tree.png differ
diff --git a/public/images/emoji/apple/church.png b/public/images/emoji/apple/church.png
index 646fa92546..f567ff55ec 100644
Binary files a/public/images/emoji/apple/church.png and b/public/images/emoji/apple/church.png differ
diff --git a/public/images/emoji/apple/cinema.png b/public/images/emoji/apple/cinema.png
index 186d25a795..795d47a926 100644
Binary files a/public/images/emoji/apple/cinema.png and b/public/images/emoji/apple/cinema.png differ
diff --git a/public/images/emoji/apple/circus_tent.png b/public/images/emoji/apple/circus_tent.png
index 3825c35f99..ca6e23f919 100644
Binary files a/public/images/emoji/apple/circus_tent.png and b/public/images/emoji/apple/circus_tent.png differ
diff --git a/public/images/emoji/apple/city_dusk.png b/public/images/emoji/apple/city_dusk.png
index afd1d52ccb..92b6ac6a2e 100644
Binary files a/public/images/emoji/apple/city_dusk.png and b/public/images/emoji/apple/city_dusk.png differ
diff --git a/public/images/emoji/apple/city_sunrise.png b/public/images/emoji/apple/city_sunrise.png
index fad18ff1da..ef223aadf1 100644
Binary files a/public/images/emoji/apple/city_sunrise.png and b/public/images/emoji/apple/city_sunrise.png differ
diff --git a/public/images/emoji/apple/city_sunset.png b/public/images/emoji/apple/city_sunset.png
index afd1d52ccb..92b6ac6a2e 100644
Binary files a/public/images/emoji/apple/city_sunset.png and b/public/images/emoji/apple/city_sunset.png differ
diff --git a/public/images/emoji/apple/cityscape.png b/public/images/emoji/apple/cityscape.png
index 11a4ef192b..4ee7ac1326 100644
Binary files a/public/images/emoji/apple/cityscape.png and b/public/images/emoji/apple/cityscape.png differ
diff --git a/public/images/emoji/apple/cl.png b/public/images/emoji/apple/cl.png
index 874f19c7b7..1695a3aabe 100644
Binary files a/public/images/emoji/apple/cl.png and b/public/images/emoji/apple/cl.png differ
diff --git a/public/images/emoji/apple/clamp.png b/public/images/emoji/apple/clamp.png
index 575a7a0789..0f6c441e43 100644
Binary files a/public/images/emoji/apple/clamp.png and b/public/images/emoji/apple/clamp.png differ
diff --git a/public/images/emoji/apple/clap.png b/public/images/emoji/apple/clap.png
index 151907c90d..26d9838a8c 100644
Binary files a/public/images/emoji/apple/clap.png and b/public/images/emoji/apple/clap.png differ
diff --git a/public/images/emoji/apple/clap/2.png b/public/images/emoji/apple/clap/2.png
index 28ded81d6b..0dc582d0fc 100644
Binary files a/public/images/emoji/apple/clap/2.png and b/public/images/emoji/apple/clap/2.png differ
diff --git a/public/images/emoji/apple/clap/3.png b/public/images/emoji/apple/clap/3.png
index d29bd3baf2..00bb58218a 100644
Binary files a/public/images/emoji/apple/clap/3.png and b/public/images/emoji/apple/clap/3.png differ
diff --git a/public/images/emoji/apple/clap/4.png b/public/images/emoji/apple/clap/4.png
index e1be837a3a..d439f227de 100644
Binary files a/public/images/emoji/apple/clap/4.png and b/public/images/emoji/apple/clap/4.png differ
diff --git a/public/images/emoji/apple/clap/5.png b/public/images/emoji/apple/clap/5.png
index 4e1dfa2647..34d3130a7a 100644
Binary files a/public/images/emoji/apple/clap/5.png and b/public/images/emoji/apple/clap/5.png differ
diff --git a/public/images/emoji/apple/clap/6.png b/public/images/emoji/apple/clap/6.png
index 4545ab4de9..54a558991c 100644
Binary files a/public/images/emoji/apple/clap/6.png and b/public/images/emoji/apple/clap/6.png differ
diff --git a/public/images/emoji/apple/clapper.png b/public/images/emoji/apple/clapper.png
index 6c8d97bdf2..87d35d204f 100644
Binary files a/public/images/emoji/apple/clapper.png and b/public/images/emoji/apple/clapper.png differ
diff --git a/public/images/emoji/apple/classical_building.png b/public/images/emoji/apple/classical_building.png
index fb4aa8b6b1..394fa8a21c 100644
Binary files a/public/images/emoji/apple/classical_building.png and b/public/images/emoji/apple/classical_building.png differ
diff --git a/public/images/emoji/apple/clinking_glasses.png b/public/images/emoji/apple/clinking_glasses.png
index 88c2bd94be..172d3aca24 100644
Binary files a/public/images/emoji/apple/clinking_glasses.png and b/public/images/emoji/apple/clinking_glasses.png differ
diff --git a/public/images/emoji/apple/clipboard.png b/public/images/emoji/apple/clipboard.png
index bd7a1aba2a..6b7048010e 100644
Binary files a/public/images/emoji/apple/clipboard.png and b/public/images/emoji/apple/clipboard.png differ
diff --git a/public/images/emoji/apple/clipperton_island.png b/public/images/emoji/apple/clipperton_island.png
index efcd5fff75..37c587fd61 100644
Binary files a/public/images/emoji/apple/clipperton_island.png and b/public/images/emoji/apple/clipperton_island.png differ
diff --git a/public/images/emoji/apple/clock.png b/public/images/emoji/apple/clock.png
index bc63b3ffb2..b53d6b5de1 100644
Binary files a/public/images/emoji/apple/clock.png and b/public/images/emoji/apple/clock.png differ
diff --git a/public/images/emoji/apple/clock1.png b/public/images/emoji/apple/clock1.png
index 653f4cf632..fed100be34 100644
Binary files a/public/images/emoji/apple/clock1.png and b/public/images/emoji/apple/clock1.png differ
diff --git a/public/images/emoji/apple/clock10.png b/public/images/emoji/apple/clock10.png
index 8fb74fa6d4..54cf99b1e3 100644
Binary files a/public/images/emoji/apple/clock10.png and b/public/images/emoji/apple/clock10.png differ
diff --git a/public/images/emoji/apple/clock1030.png b/public/images/emoji/apple/clock1030.png
index af110b300e..f2602054c6 100644
Binary files a/public/images/emoji/apple/clock1030.png and b/public/images/emoji/apple/clock1030.png differ
diff --git a/public/images/emoji/apple/clock11.png b/public/images/emoji/apple/clock11.png
index 8fe7595b61..bbc0adb697 100644
Binary files a/public/images/emoji/apple/clock11.png and b/public/images/emoji/apple/clock11.png differ
diff --git a/public/images/emoji/apple/clock1130.png b/public/images/emoji/apple/clock1130.png
index dc1e6833b2..39924b0115 100644
Binary files a/public/images/emoji/apple/clock1130.png and b/public/images/emoji/apple/clock1130.png differ
diff --git a/public/images/emoji/apple/clock12.png b/public/images/emoji/apple/clock12.png
index 25a5f9f347..fc73405996 100644
Binary files a/public/images/emoji/apple/clock12.png and b/public/images/emoji/apple/clock12.png differ
diff --git a/public/images/emoji/apple/clock1230.png b/public/images/emoji/apple/clock1230.png
index 095d024ed6..c667c1c279 100644
Binary files a/public/images/emoji/apple/clock1230.png and b/public/images/emoji/apple/clock1230.png differ
diff --git a/public/images/emoji/apple/clock130.png b/public/images/emoji/apple/clock130.png
index 8df93f1706..4f4bcdae79 100644
Binary files a/public/images/emoji/apple/clock130.png and b/public/images/emoji/apple/clock130.png differ
diff --git a/public/images/emoji/apple/clock2.png b/public/images/emoji/apple/clock2.png
index 80eff85051..5d266ab715 100644
Binary files a/public/images/emoji/apple/clock2.png and b/public/images/emoji/apple/clock2.png differ
diff --git a/public/images/emoji/apple/clock230.png b/public/images/emoji/apple/clock230.png
index 6dc0e845e5..3a2a7e5262 100644
Binary files a/public/images/emoji/apple/clock230.png and b/public/images/emoji/apple/clock230.png differ
diff --git a/public/images/emoji/apple/clock3.png b/public/images/emoji/apple/clock3.png
index 6f22b9d3e5..f463d2a218 100644
Binary files a/public/images/emoji/apple/clock3.png and b/public/images/emoji/apple/clock3.png differ
diff --git a/public/images/emoji/apple/clock330.png b/public/images/emoji/apple/clock330.png
index c07bcde8d8..3946d065b5 100644
Binary files a/public/images/emoji/apple/clock330.png and b/public/images/emoji/apple/clock330.png differ
diff --git a/public/images/emoji/apple/clock4.png b/public/images/emoji/apple/clock4.png
index e43c206941..c73159cd22 100644
Binary files a/public/images/emoji/apple/clock4.png and b/public/images/emoji/apple/clock4.png differ
diff --git a/public/images/emoji/apple/clock430.png b/public/images/emoji/apple/clock430.png
index a5e896d94a..03b87ea683 100644
Binary files a/public/images/emoji/apple/clock430.png and b/public/images/emoji/apple/clock430.png differ
diff --git a/public/images/emoji/apple/clock5.png b/public/images/emoji/apple/clock5.png
index 29c5a9b2ed..2ae819342f 100644
Binary files a/public/images/emoji/apple/clock5.png and b/public/images/emoji/apple/clock5.png differ
diff --git a/public/images/emoji/apple/clock530.png b/public/images/emoji/apple/clock530.png
index 66f8a71ff5..1e139cc963 100644
Binary files a/public/images/emoji/apple/clock530.png and b/public/images/emoji/apple/clock530.png differ
diff --git a/public/images/emoji/apple/clock6.png b/public/images/emoji/apple/clock6.png
index 51f6c3da69..7fbcde56fe 100644
Binary files a/public/images/emoji/apple/clock6.png and b/public/images/emoji/apple/clock6.png differ
diff --git a/public/images/emoji/apple/clock630.png b/public/images/emoji/apple/clock630.png
index bc141c25dc..c751624f2e 100644
Binary files a/public/images/emoji/apple/clock630.png and b/public/images/emoji/apple/clock630.png differ
diff --git a/public/images/emoji/apple/clock7.png b/public/images/emoji/apple/clock7.png
index efa19c9213..686fab65fc 100644
Binary files a/public/images/emoji/apple/clock7.png and b/public/images/emoji/apple/clock7.png differ
diff --git a/public/images/emoji/apple/clock730.png b/public/images/emoji/apple/clock730.png
index 77fcc1eacd..b11eeeaa2f 100644
Binary files a/public/images/emoji/apple/clock730.png and b/public/images/emoji/apple/clock730.png differ
diff --git a/public/images/emoji/apple/clock8.png b/public/images/emoji/apple/clock8.png
index 5311b00131..551e79b8d5 100644
Binary files a/public/images/emoji/apple/clock8.png and b/public/images/emoji/apple/clock8.png differ
diff --git a/public/images/emoji/apple/clock830.png b/public/images/emoji/apple/clock830.png
index 4c6239ba6d..0e389b8e57 100644
Binary files a/public/images/emoji/apple/clock830.png and b/public/images/emoji/apple/clock830.png differ
diff --git a/public/images/emoji/apple/clock9.png b/public/images/emoji/apple/clock9.png
index c279d82838..a0737ac16c 100644
Binary files a/public/images/emoji/apple/clock9.png and b/public/images/emoji/apple/clock9.png differ
diff --git a/public/images/emoji/apple/clock930.png b/public/images/emoji/apple/clock930.png
index b0f015d731..f787212df7 100644
Binary files a/public/images/emoji/apple/clock930.png and b/public/images/emoji/apple/clock930.png differ
diff --git a/public/images/emoji/apple/closed_book.png b/public/images/emoji/apple/closed_book.png
index e8793e41e7..e4a9f871c5 100644
Binary files a/public/images/emoji/apple/closed_book.png and b/public/images/emoji/apple/closed_book.png differ
diff --git a/public/images/emoji/apple/closed_lock_with_key.png b/public/images/emoji/apple/closed_lock_with_key.png
index f1d583dee9..eb5f15e092 100644
Binary files a/public/images/emoji/apple/closed_lock_with_key.png and b/public/images/emoji/apple/closed_lock_with_key.png differ
diff --git a/public/images/emoji/apple/closed_umbrella.png b/public/images/emoji/apple/closed_umbrella.png
index a28d55a800..059eb7a99e 100644
Binary files a/public/images/emoji/apple/closed_umbrella.png and b/public/images/emoji/apple/closed_umbrella.png differ
diff --git a/public/images/emoji/apple/cloud.png b/public/images/emoji/apple/cloud.png
index 7f3b4be998..24861c096c 100644
Binary files a/public/images/emoji/apple/cloud.png and b/public/images/emoji/apple/cloud.png differ
diff --git a/public/images/emoji/apple/cloud_lightning.png b/public/images/emoji/apple/cloud_lightning.png
index 13845accbf..20c72c6208 100644
Binary files a/public/images/emoji/apple/cloud_lightning.png and b/public/images/emoji/apple/cloud_lightning.png differ
diff --git a/public/images/emoji/apple/cloud_rain.png b/public/images/emoji/apple/cloud_rain.png
index c8a987cf00..9db3c454d7 100644
Binary files a/public/images/emoji/apple/cloud_rain.png and b/public/images/emoji/apple/cloud_rain.png differ
diff --git a/public/images/emoji/apple/cloud_snow.png b/public/images/emoji/apple/cloud_snow.png
index 87287a2bc0..edfaac12ad 100644
Binary files a/public/images/emoji/apple/cloud_snow.png and b/public/images/emoji/apple/cloud_snow.png differ
diff --git a/public/images/emoji/apple/cloud_tornado.png b/public/images/emoji/apple/cloud_tornado.png
index 0d3985f119..8782d602e8 100644
Binary files a/public/images/emoji/apple/cloud_tornado.png and b/public/images/emoji/apple/cloud_tornado.png differ
diff --git a/public/images/emoji/apple/cloud_with_lightning.png b/public/images/emoji/apple/cloud_with_lightning.png
index 13845accbf..20c72c6208 100644
Binary files a/public/images/emoji/apple/cloud_with_lightning.png and b/public/images/emoji/apple/cloud_with_lightning.png differ
diff --git a/public/images/emoji/apple/cloud_with_lightning_and_rain.png b/public/images/emoji/apple/cloud_with_lightning_and_rain.png
index 8f44a7726e..34aec3c66c 100644
Binary files a/public/images/emoji/apple/cloud_with_lightning_and_rain.png and b/public/images/emoji/apple/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/apple/cloud_with_rain.png b/public/images/emoji/apple/cloud_with_rain.png
index c8a987cf00..9db3c454d7 100644
Binary files a/public/images/emoji/apple/cloud_with_rain.png and b/public/images/emoji/apple/cloud_with_rain.png differ
diff --git a/public/images/emoji/apple/cloud_with_snow.png b/public/images/emoji/apple/cloud_with_snow.png
index 87287a2bc0..edfaac12ad 100644
Binary files a/public/images/emoji/apple/cloud_with_snow.png and b/public/images/emoji/apple/cloud_with_snow.png differ
diff --git a/public/images/emoji/apple/cloud_with_tornado.png b/public/images/emoji/apple/cloud_with_tornado.png
index 0d3985f119..8782d602e8 100644
Binary files a/public/images/emoji/apple/cloud_with_tornado.png and b/public/images/emoji/apple/cloud_with_tornado.png differ
diff --git a/public/images/emoji/apple/clown_face.png b/public/images/emoji/apple/clown_face.png
index f091b23b6b..06a615cf28 100644
Binary files a/public/images/emoji/apple/clown_face.png and b/public/images/emoji/apple/clown_face.png differ
diff --git a/public/images/emoji/apple/clubs.png b/public/images/emoji/apple/clubs.png
index c7957fb3db..f2e226eac0 100644
Binary files a/public/images/emoji/apple/clubs.png and b/public/images/emoji/apple/clubs.png differ
diff --git a/public/images/emoji/apple/cn.png b/public/images/emoji/apple/cn.png
index 9c969f94c5..6bf42b037d 100644
Binary files a/public/images/emoji/apple/cn.png and b/public/images/emoji/apple/cn.png differ
diff --git a/public/images/emoji/apple/coat.png b/public/images/emoji/apple/coat.png
index c409f9f4c4..9069e41e85 100644
Binary files a/public/images/emoji/apple/coat.png and b/public/images/emoji/apple/coat.png differ
diff --git a/public/images/emoji/apple/cocktail.png b/public/images/emoji/apple/cocktail.png
index 89199f28df..a3ea176b90 100644
Binary files a/public/images/emoji/apple/cocktail.png and b/public/images/emoji/apple/cocktail.png differ
diff --git a/public/images/emoji/apple/coconut.png b/public/images/emoji/apple/coconut.png
index e76b533149..77fbdc29ae 100644
Binary files a/public/images/emoji/apple/coconut.png and b/public/images/emoji/apple/coconut.png differ
diff --git a/public/images/emoji/apple/cocos_islands.png b/public/images/emoji/apple/cocos_islands.png
index 177872ece5..f9d4ce0294 100644
Binary files a/public/images/emoji/apple/cocos_islands.png and b/public/images/emoji/apple/cocos_islands.png differ
diff --git a/public/images/emoji/apple/coffee.png b/public/images/emoji/apple/coffee.png
index 07de70653a..a48831a3e2 100644
Binary files a/public/images/emoji/apple/coffee.png and b/public/images/emoji/apple/coffee.png differ
diff --git a/public/images/emoji/apple/coffin.png b/public/images/emoji/apple/coffin.png
index d29067750c..0f5d2e68e4 100644
Binary files a/public/images/emoji/apple/coffin.png and b/public/images/emoji/apple/coffin.png differ
diff --git a/public/images/emoji/apple/cold_sweat.png b/public/images/emoji/apple/cold_sweat.png
index 744fa14e01..8104c67c92 100644
Binary files a/public/images/emoji/apple/cold_sweat.png and b/public/images/emoji/apple/cold_sweat.png differ
diff --git a/public/images/emoji/apple/colombia.png b/public/images/emoji/apple/colombia.png
index cee9fe65c3..d5987ba94b 100644
Binary files a/public/images/emoji/apple/colombia.png and b/public/images/emoji/apple/colombia.png differ
diff --git a/public/images/emoji/apple/comet.png b/public/images/emoji/apple/comet.png
index 2bcbf89601..8cf7a5cfb3 100644
Binary files a/public/images/emoji/apple/comet.png and b/public/images/emoji/apple/comet.png differ
diff --git a/public/images/emoji/apple/comoros.png b/public/images/emoji/apple/comoros.png
index 7e77d80006..5f540b333c 100644
Binary files a/public/images/emoji/apple/comoros.png and b/public/images/emoji/apple/comoros.png differ
diff --git a/public/images/emoji/apple/compression.png b/public/images/emoji/apple/compression.png
index 575a7a0789..0f6c441e43 100644
Binary files a/public/images/emoji/apple/compression.png and b/public/images/emoji/apple/compression.png differ
diff --git a/public/images/emoji/apple/computer.png b/public/images/emoji/apple/computer.png
index f68c545485..043fc62af6 100644
Binary files a/public/images/emoji/apple/computer.png and b/public/images/emoji/apple/computer.png differ
diff --git a/public/images/emoji/apple/computer_mouse.png b/public/images/emoji/apple/computer_mouse.png
index 3899171edc..60317c6d44 100644
Binary files a/public/images/emoji/apple/computer_mouse.png and b/public/images/emoji/apple/computer_mouse.png differ
diff --git a/public/images/emoji/apple/confetti_ball.png b/public/images/emoji/apple/confetti_ball.png
index 13c22c9c62..e4521806fe 100644
Binary files a/public/images/emoji/apple/confetti_ball.png and b/public/images/emoji/apple/confetti_ball.png differ
diff --git a/public/images/emoji/apple/confounded.png b/public/images/emoji/apple/confounded.png
index bd4b017957..3e8ed88d56 100644
Binary files a/public/images/emoji/apple/confounded.png and b/public/images/emoji/apple/confounded.png differ
diff --git a/public/images/emoji/apple/confused.png b/public/images/emoji/apple/confused.png
index a3b5de92cb..3a77f7c41b 100644
Binary files a/public/images/emoji/apple/confused.png and b/public/images/emoji/apple/confused.png differ
diff --git a/public/images/emoji/apple/congo_brazzaville.png b/public/images/emoji/apple/congo_brazzaville.png
index 4c0d656ff2..9c1e775673 100644
Binary files a/public/images/emoji/apple/congo_brazzaville.png and b/public/images/emoji/apple/congo_brazzaville.png differ
diff --git a/public/images/emoji/apple/congo_kinshasa.png b/public/images/emoji/apple/congo_kinshasa.png
index c933cb5659..e25fd654a3 100644
Binary files a/public/images/emoji/apple/congo_kinshasa.png and b/public/images/emoji/apple/congo_kinshasa.png differ
diff --git a/public/images/emoji/apple/congratulations.png b/public/images/emoji/apple/congratulations.png
index 5b983b52b1..c3535620d4 100644
Binary files a/public/images/emoji/apple/congratulations.png and b/public/images/emoji/apple/congratulations.png differ
diff --git a/public/images/emoji/apple/construction.png b/public/images/emoji/apple/construction.png
index 744cb5fe94..4cd7acefcb 100644
Binary files a/public/images/emoji/apple/construction.png and b/public/images/emoji/apple/construction.png differ
diff --git a/public/images/emoji/apple/construction_site.png b/public/images/emoji/apple/construction_site.png
index caad1ac128..813ae6ebe7 100644
Binary files a/public/images/emoji/apple/construction_site.png and b/public/images/emoji/apple/construction_site.png differ
diff --git a/public/images/emoji/apple/construction_worker.png b/public/images/emoji/apple/construction_worker.png
index ab08591eb3..1d84be18bd 100644
Binary files a/public/images/emoji/apple/construction_worker.png and b/public/images/emoji/apple/construction_worker.png differ
diff --git a/public/images/emoji/apple/construction_worker/2.png b/public/images/emoji/apple/construction_worker/2.png
index 0c2079a72d..0c48ac8e7b 100644
Binary files a/public/images/emoji/apple/construction_worker/2.png and b/public/images/emoji/apple/construction_worker/2.png differ
diff --git a/public/images/emoji/apple/construction_worker/3.png b/public/images/emoji/apple/construction_worker/3.png
index e4133c8ce9..27730cdefe 100644
Binary files a/public/images/emoji/apple/construction_worker/3.png and b/public/images/emoji/apple/construction_worker/3.png differ
diff --git a/public/images/emoji/apple/construction_worker/4.png b/public/images/emoji/apple/construction_worker/4.png
index 4175bd541e..8a9852ba20 100644
Binary files a/public/images/emoji/apple/construction_worker/4.png and b/public/images/emoji/apple/construction_worker/4.png differ
diff --git a/public/images/emoji/apple/construction_worker/5.png b/public/images/emoji/apple/construction_worker/5.png
index f52f410a90..901ec756f2 100644
Binary files a/public/images/emoji/apple/construction_worker/5.png and b/public/images/emoji/apple/construction_worker/5.png differ
diff --git a/public/images/emoji/apple/construction_worker/6.png b/public/images/emoji/apple/construction_worker/6.png
index b1976d0925..c489af8776 100644
Binary files a/public/images/emoji/apple/construction_worker/6.png and b/public/images/emoji/apple/construction_worker/6.png differ
diff --git a/public/images/emoji/apple/construction_worker_man.png b/public/images/emoji/apple/construction_worker_man.png
index ab08591eb3..1d84be18bd 100644
Binary files a/public/images/emoji/apple/construction_worker_man.png and b/public/images/emoji/apple/construction_worker_man.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/2.png b/public/images/emoji/apple/construction_worker_man/2.png
index 0c2079a72d..0c48ac8e7b 100644
Binary files a/public/images/emoji/apple/construction_worker_man/2.png and b/public/images/emoji/apple/construction_worker_man/2.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/3.png b/public/images/emoji/apple/construction_worker_man/3.png
index e4133c8ce9..27730cdefe 100644
Binary files a/public/images/emoji/apple/construction_worker_man/3.png and b/public/images/emoji/apple/construction_worker_man/3.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/4.png b/public/images/emoji/apple/construction_worker_man/4.png
index 4175bd541e..8a9852ba20 100644
Binary files a/public/images/emoji/apple/construction_worker_man/4.png and b/public/images/emoji/apple/construction_worker_man/4.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/5.png b/public/images/emoji/apple/construction_worker_man/5.png
index f52f410a90..901ec756f2 100644
Binary files a/public/images/emoji/apple/construction_worker_man/5.png and b/public/images/emoji/apple/construction_worker_man/5.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/6.png b/public/images/emoji/apple/construction_worker_man/6.png
index b1976d0925..c489af8776 100644
Binary files a/public/images/emoji/apple/construction_worker_man/6.png and b/public/images/emoji/apple/construction_worker_man/6.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman.png b/public/images/emoji/apple/construction_worker_woman.png
index add71a28ef..e99d8a8f4e 100644
Binary files a/public/images/emoji/apple/construction_worker_woman.png and b/public/images/emoji/apple/construction_worker_woman.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/2.png b/public/images/emoji/apple/construction_worker_woman/2.png
index b33354210d..0e0f0457bf 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/2.png and b/public/images/emoji/apple/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/3.png b/public/images/emoji/apple/construction_worker_woman/3.png
index 5d7b89ca85..6919f29585 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/3.png and b/public/images/emoji/apple/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/4.png b/public/images/emoji/apple/construction_worker_woman/4.png
index 8f65218544..7b30c9ef72 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/4.png and b/public/images/emoji/apple/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/5.png b/public/images/emoji/apple/construction_worker_woman/5.png
index 796b99e1eb..e6e71e7b0a 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/5.png and b/public/images/emoji/apple/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/6.png b/public/images/emoji/apple/construction_worker_woman/6.png
index 7a6ead711b..79f93b57a2 100644
Binary files a/public/images/emoji/apple/construction_worker_woman/6.png and b/public/images/emoji/apple/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/apple/control_knobs.png b/public/images/emoji/apple/control_knobs.png
index 1f5bb218fc..6da331c978 100644
Binary files a/public/images/emoji/apple/control_knobs.png and b/public/images/emoji/apple/control_knobs.png differ
diff --git a/public/images/emoji/apple/convenience_store.png b/public/images/emoji/apple/convenience_store.png
index 3de249f523..c33137c90f 100644
Binary files a/public/images/emoji/apple/convenience_store.png and b/public/images/emoji/apple/convenience_store.png differ
diff --git a/public/images/emoji/apple/cook_islands.png b/public/images/emoji/apple/cook_islands.png
index 1dae1bcd01..661cfdde07 100644
Binary files a/public/images/emoji/apple/cook_islands.png and b/public/images/emoji/apple/cook_islands.png differ
diff --git a/public/images/emoji/apple/cookie.png b/public/images/emoji/apple/cookie.png
index 507c92c244..c6e5fdc52d 100644
Binary files a/public/images/emoji/apple/cookie.png and b/public/images/emoji/apple/cookie.png differ
diff --git a/public/images/emoji/apple/cool.png b/public/images/emoji/apple/cool.png
index c0aabdd494..473860d1a5 100644
Binary files a/public/images/emoji/apple/cool.png and b/public/images/emoji/apple/cool.png differ
diff --git a/public/images/emoji/apple/cop.png b/public/images/emoji/apple/cop.png
index 78591caa50..59fa74d41d 100644
Binary files a/public/images/emoji/apple/cop.png and b/public/images/emoji/apple/cop.png differ
diff --git a/public/images/emoji/apple/cop/2.png b/public/images/emoji/apple/cop/2.png
index 63db5721c1..e47743a83f 100644
Binary files a/public/images/emoji/apple/cop/2.png and b/public/images/emoji/apple/cop/2.png differ
diff --git a/public/images/emoji/apple/cop/3.png b/public/images/emoji/apple/cop/3.png
index 7922a9dd3d..2f5df8dc82 100644
Binary files a/public/images/emoji/apple/cop/3.png and b/public/images/emoji/apple/cop/3.png differ
diff --git a/public/images/emoji/apple/cop/4.png b/public/images/emoji/apple/cop/4.png
index 16292b3eb0..1e3a460afb 100644
Binary files a/public/images/emoji/apple/cop/4.png and b/public/images/emoji/apple/cop/4.png differ
diff --git a/public/images/emoji/apple/cop/5.png b/public/images/emoji/apple/cop/5.png
index 41cdd83a94..9cc43c4c79 100644
Binary files a/public/images/emoji/apple/cop/5.png and b/public/images/emoji/apple/cop/5.png differ
diff --git a/public/images/emoji/apple/cop/6.png b/public/images/emoji/apple/cop/6.png
index e2ce8f11b5..4037fac7a0 100644
Binary files a/public/images/emoji/apple/cop/6.png and b/public/images/emoji/apple/cop/6.png differ
diff --git a/public/images/emoji/apple/copyright.png b/public/images/emoji/apple/copyright.png
index e99004dcf6..c0534e27fa 100644
Binary files a/public/images/emoji/apple/copyright.png and b/public/images/emoji/apple/copyright.png differ
diff --git a/public/images/emoji/apple/corn.png b/public/images/emoji/apple/corn.png
index 89d311d36e..6fefcd4f1c 100644
Binary files a/public/images/emoji/apple/corn.png and b/public/images/emoji/apple/corn.png differ
diff --git a/public/images/emoji/apple/costa_rica.png b/public/images/emoji/apple/costa_rica.png
index 8a84b171e2..9c066bcf9d 100644
Binary files a/public/images/emoji/apple/costa_rica.png and b/public/images/emoji/apple/costa_rica.png differ
diff --git a/public/images/emoji/apple/cote_divoire.png b/public/images/emoji/apple/cote_divoire.png
index f39c2bcfcf..e872fe93e1 100644
Binary files a/public/images/emoji/apple/cote_divoire.png and b/public/images/emoji/apple/cote_divoire.png differ
diff --git a/public/images/emoji/apple/couch.png b/public/images/emoji/apple/couch.png
index bc593ea9c9..dc1d6c4b82 100644
Binary files a/public/images/emoji/apple/couch.png and b/public/images/emoji/apple/couch.png differ
diff --git a/public/images/emoji/apple/couch_and_lamp.png b/public/images/emoji/apple/couch_and_lamp.png
index bc593ea9c9..dc1d6c4b82 100644
Binary files a/public/images/emoji/apple/couch_and_lamp.png and b/public/images/emoji/apple/couch_and_lamp.png differ
diff --git a/public/images/emoji/apple/couple.png b/public/images/emoji/apple/couple.png
index 8532888498..5da4edb09a 100644
Binary files a/public/images/emoji/apple/couple.png and b/public/images/emoji/apple/couple.png differ
diff --git a/public/images/emoji/apple/couple_with_heart.png b/public/images/emoji/apple/couple_with_heart.png
index b7eafd58df..d326f964ab 100644
Binary files a/public/images/emoji/apple/couple_with_heart.png and b/public/images/emoji/apple/couple_with_heart.png differ
diff --git a/public/images/emoji/apple/couple_with_heart_man_man.png b/public/images/emoji/apple/couple_with_heart_man_man.png
index 41f436aa54..8071276915 100644
Binary files a/public/images/emoji/apple/couple_with_heart_man_man.png and b/public/images/emoji/apple/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/apple/couple_with_heart_woman_man.png b/public/images/emoji/apple/couple_with_heart_woman_man.png
index b7eafd58df..d326f964ab 100644
Binary files a/public/images/emoji/apple/couple_with_heart_woman_man.png and b/public/images/emoji/apple/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/apple/couple_with_heart_woman_woman.png b/public/images/emoji/apple/couple_with_heart_woman_woman.png
index 8f924c75cf..235ec695f5 100644
Binary files a/public/images/emoji/apple/couple_with_heart_woman_woman.png and b/public/images/emoji/apple/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/apple/couplekiss.png b/public/images/emoji/apple/couplekiss.png
index b1b5bdc9c5..3b7400de5a 100644
Binary files a/public/images/emoji/apple/couplekiss.png and b/public/images/emoji/apple/couplekiss.png differ
diff --git a/public/images/emoji/apple/couplekiss_man_man.png b/public/images/emoji/apple/couplekiss_man_man.png
index 87fd1ce113..ae212c3277 100644
Binary files a/public/images/emoji/apple/couplekiss_man_man.png and b/public/images/emoji/apple/couplekiss_man_man.png differ
diff --git a/public/images/emoji/apple/couplekiss_man_woman.png b/public/images/emoji/apple/couplekiss_man_woman.png
index b1b5bdc9c5..3b7400de5a 100644
Binary files a/public/images/emoji/apple/couplekiss_man_woman.png and b/public/images/emoji/apple/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/apple/couplekiss_woman_woman.png b/public/images/emoji/apple/couplekiss_woman_woman.png
index 13d6801c47..8c1d3f6e06 100644
Binary files a/public/images/emoji/apple/couplekiss_woman_woman.png and b/public/images/emoji/apple/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/apple/cow.png b/public/images/emoji/apple/cow.png
index 8f90b5c37f..0c3a2ffdd3 100644
Binary files a/public/images/emoji/apple/cow.png and b/public/images/emoji/apple/cow.png differ
diff --git a/public/images/emoji/apple/cow2.png b/public/images/emoji/apple/cow2.png
index a44afd7213..dfa3836937 100644
Binary files a/public/images/emoji/apple/cow2.png and b/public/images/emoji/apple/cow2.png differ
diff --git a/public/images/emoji/apple/cowboy_hat_face.png b/public/images/emoji/apple/cowboy_hat_face.png
index 6515c8360b..f9d90a3d4d 100644
Binary files a/public/images/emoji/apple/cowboy_hat_face.png and b/public/images/emoji/apple/cowboy_hat_face.png differ
diff --git a/public/images/emoji/apple/crab.png b/public/images/emoji/apple/crab.png
index c300979a99..f5fc5f95a5 100644
Binary files a/public/images/emoji/apple/crab.png and b/public/images/emoji/apple/crab.png differ
diff --git a/public/images/emoji/apple/crayon.png b/public/images/emoji/apple/crayon.png
index eaf918c81f..5d0d3713e1 100644
Binary files a/public/images/emoji/apple/crayon.png and b/public/images/emoji/apple/crayon.png differ
diff --git a/public/images/emoji/apple/crazy_face.png b/public/images/emoji/apple/crazy_face.png
index 0aaa1cf765..2ebbb9fb47 100644
Binary files a/public/images/emoji/apple/crazy_face.png and b/public/images/emoji/apple/crazy_face.png differ
diff --git a/public/images/emoji/apple/credit_card.png b/public/images/emoji/apple/credit_card.png
index 47d4436b9b..ff44d64cfb 100644
Binary files a/public/images/emoji/apple/credit_card.png and b/public/images/emoji/apple/credit_card.png differ
diff --git a/public/images/emoji/apple/crescent_moon.png b/public/images/emoji/apple/crescent_moon.png
index 5d1ec6baab..3c2b85eb8c 100644
Binary files a/public/images/emoji/apple/crescent_moon.png and b/public/images/emoji/apple/crescent_moon.png differ
diff --git a/public/images/emoji/apple/cricket.png b/public/images/emoji/apple/cricket.png
index 798f0499e9..2a30f521fc 100644
Binary files a/public/images/emoji/apple/cricket.png and b/public/images/emoji/apple/cricket.png differ
diff --git a/public/images/emoji/apple/cricket_bat_and_ball.png b/public/images/emoji/apple/cricket_bat_and_ball.png
index 798f0499e9..ff47e1ef90 100644
Binary files a/public/images/emoji/apple/cricket_bat_and_ball.png and b/public/images/emoji/apple/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/apple/cricket_bat_ball.png b/public/images/emoji/apple/cricket_bat_ball.png
index 798f0499e9..ff47e1ef90 100644
Binary files a/public/images/emoji/apple/cricket_bat_ball.png and b/public/images/emoji/apple/cricket_bat_ball.png differ
diff --git a/public/images/emoji/apple/croatia.png b/public/images/emoji/apple/croatia.png
index a93f35de73..718a55515b 100644
Binary files a/public/images/emoji/apple/croatia.png and b/public/images/emoji/apple/croatia.png differ
diff --git a/public/images/emoji/apple/crocodile.png b/public/images/emoji/apple/crocodile.png
index 9e3e8460e3..9571b6ad51 100644
Binary files a/public/images/emoji/apple/crocodile.png and b/public/images/emoji/apple/crocodile.png differ
diff --git a/public/images/emoji/apple/croissant.png b/public/images/emoji/apple/croissant.png
index 96e4b6e173..fadcd3a1a0 100644
Binary files a/public/images/emoji/apple/croissant.png and b/public/images/emoji/apple/croissant.png differ
diff --git a/public/images/emoji/apple/cross.png b/public/images/emoji/apple/cross.png
index efc7a79034..065b124fd3 100644
Binary files a/public/images/emoji/apple/cross.png and b/public/images/emoji/apple/cross.png differ
diff --git a/public/images/emoji/apple/crossed_fingers.png b/public/images/emoji/apple/crossed_fingers.png
index 76cdcabf10..c6337cecea 100644
Binary files a/public/images/emoji/apple/crossed_fingers.png and b/public/images/emoji/apple/crossed_fingers.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/2.png b/public/images/emoji/apple/crossed_fingers/2.png
index f1efc6fd4d..743d1b0192 100644
Binary files a/public/images/emoji/apple/crossed_fingers/2.png and b/public/images/emoji/apple/crossed_fingers/2.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/3.png b/public/images/emoji/apple/crossed_fingers/3.png
index e4de73ffb8..fe89fe9797 100644
Binary files a/public/images/emoji/apple/crossed_fingers/3.png and b/public/images/emoji/apple/crossed_fingers/3.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/4.png b/public/images/emoji/apple/crossed_fingers/4.png
index e4b72cb1c2..67db52b895 100644
Binary files a/public/images/emoji/apple/crossed_fingers/4.png and b/public/images/emoji/apple/crossed_fingers/4.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/5.png b/public/images/emoji/apple/crossed_fingers/5.png
index 37585e00ac..d54d7be06e 100644
Binary files a/public/images/emoji/apple/crossed_fingers/5.png and b/public/images/emoji/apple/crossed_fingers/5.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/6.png b/public/images/emoji/apple/crossed_fingers/6.png
index 63061bea7a..b979d652ab 100644
Binary files a/public/images/emoji/apple/crossed_fingers/6.png and b/public/images/emoji/apple/crossed_fingers/6.png differ
diff --git a/public/images/emoji/apple/crossed_flags.png b/public/images/emoji/apple/crossed_flags.png
index 0a325b514f..ec0fee63b1 100644
Binary files a/public/images/emoji/apple/crossed_flags.png and b/public/images/emoji/apple/crossed_flags.png differ
diff --git a/public/images/emoji/apple/crossed_swords.png b/public/images/emoji/apple/crossed_swords.png
index 39f21de50d..c37501006f 100644
Binary files a/public/images/emoji/apple/crossed_swords.png and b/public/images/emoji/apple/crossed_swords.png differ
diff --git a/public/images/emoji/apple/crown.png b/public/images/emoji/apple/crown.png
index 293ad24fd6..7756fb20a4 100644
Binary files a/public/images/emoji/apple/crown.png and b/public/images/emoji/apple/crown.png differ
diff --git a/public/images/emoji/apple/cruise_ship.png b/public/images/emoji/apple/cruise_ship.png
index 3bb64de0d3..062c764d6a 100644
Binary files a/public/images/emoji/apple/cruise_ship.png and b/public/images/emoji/apple/cruise_ship.png differ
diff --git a/public/images/emoji/apple/cry.png b/public/images/emoji/apple/cry.png
index 212674d33f..93711c033f 100644
Binary files a/public/images/emoji/apple/cry.png and b/public/images/emoji/apple/cry.png differ
diff --git a/public/images/emoji/apple/crying_cat_face.png b/public/images/emoji/apple/crying_cat_face.png
index 1902821eea..7858ac6543 100644
Binary files a/public/images/emoji/apple/crying_cat_face.png and b/public/images/emoji/apple/crying_cat_face.png differ
diff --git a/public/images/emoji/apple/crystal_ball.png b/public/images/emoji/apple/crystal_ball.png
index 8b777fdcea..af74f7a61c 100644
Binary files a/public/images/emoji/apple/crystal_ball.png and b/public/images/emoji/apple/crystal_ball.png differ
diff --git a/public/images/emoji/apple/cuba.png b/public/images/emoji/apple/cuba.png
index 159170fa3d..ea9d64ff45 100644
Binary files a/public/images/emoji/apple/cuba.png and b/public/images/emoji/apple/cuba.png differ
diff --git a/public/images/emoji/apple/cucumber.png b/public/images/emoji/apple/cucumber.png
index ece1ce7d99..50cb6d6006 100644
Binary files a/public/images/emoji/apple/cucumber.png and b/public/images/emoji/apple/cucumber.png differ
diff --git a/public/images/emoji/apple/cup_with_straw.png b/public/images/emoji/apple/cup_with_straw.png
index 4b2f313f9b..b19dd3fbe1 100644
Binary files a/public/images/emoji/apple/cup_with_straw.png and b/public/images/emoji/apple/cup_with_straw.png differ
diff --git a/public/images/emoji/apple/cupid.png b/public/images/emoji/apple/cupid.png
index 65630291ab..2e69fab679 100644
Binary files a/public/images/emoji/apple/cupid.png and b/public/images/emoji/apple/cupid.png differ
diff --git a/public/images/emoji/apple/curacao.png b/public/images/emoji/apple/curacao.png
index 004ae5eb63..ef9c2a2a5e 100644
Binary files a/public/images/emoji/apple/curacao.png and b/public/images/emoji/apple/curacao.png differ
diff --git a/public/images/emoji/apple/curling_stone.png b/public/images/emoji/apple/curling_stone.png
index 09027a2fb2..50a9b70ee1 100644
Binary files a/public/images/emoji/apple/curling_stone.png and b/public/images/emoji/apple/curling_stone.png differ
diff --git a/public/images/emoji/apple/curly_loop.png b/public/images/emoji/apple/curly_loop.png
index e6257ad8cd..a2f3dc0427 100644
Binary files a/public/images/emoji/apple/curly_loop.png and b/public/images/emoji/apple/curly_loop.png differ
diff --git a/public/images/emoji/apple/currency_exchange.png b/public/images/emoji/apple/currency_exchange.png
index f5591d2bbf..dd57ed83f7 100644
Binary files a/public/images/emoji/apple/currency_exchange.png and b/public/images/emoji/apple/currency_exchange.png differ
diff --git a/public/images/emoji/apple/curry.png b/public/images/emoji/apple/curry.png
index f2a8e54b6f..f6423a06df 100644
Binary files a/public/images/emoji/apple/curry.png and b/public/images/emoji/apple/curry.png differ
diff --git a/public/images/emoji/apple/custard.png b/public/images/emoji/apple/custard.png
index dac6fa58e7..11fa0fd0f1 100644
Binary files a/public/images/emoji/apple/custard.png and b/public/images/emoji/apple/custard.png differ
diff --git a/public/images/emoji/apple/customs.png b/public/images/emoji/apple/customs.png
index 53e0066017..9aa9999df8 100644
Binary files a/public/images/emoji/apple/customs.png and b/public/images/emoji/apple/customs.png differ
diff --git a/public/images/emoji/apple/cut_of_meat.png b/public/images/emoji/apple/cut_of_meat.png
index b66d427e09..1cb0787786 100644
Binary files a/public/images/emoji/apple/cut_of_meat.png and b/public/images/emoji/apple/cut_of_meat.png differ
diff --git a/public/images/emoji/apple/cyclone.png b/public/images/emoji/apple/cyclone.png
index 5a6dc22b51..15bb6acc98 100644
Binary files a/public/images/emoji/apple/cyclone.png and b/public/images/emoji/apple/cyclone.png differ
diff --git a/public/images/emoji/apple/cyprus.png b/public/images/emoji/apple/cyprus.png
index cfebdb9e6f..9c20b14e7c 100644
Binary files a/public/images/emoji/apple/cyprus.png and b/public/images/emoji/apple/cyprus.png differ
diff --git a/public/images/emoji/apple/czech_republic.png b/public/images/emoji/apple/czech_republic.png
index 33fa4c2c80..aeea12ceb3 100644
Binary files a/public/images/emoji/apple/czech_republic.png and b/public/images/emoji/apple/czech_republic.png differ
diff --git a/public/images/emoji/apple/dagger.png b/public/images/emoji/apple/dagger.png
index 0b35842bea..f392357646 100644
Binary files a/public/images/emoji/apple/dagger.png and b/public/images/emoji/apple/dagger.png differ
diff --git a/public/images/emoji/apple/dagger_knife.png b/public/images/emoji/apple/dagger_knife.png
index 0b35842bea..f392357646 100644
Binary files a/public/images/emoji/apple/dagger_knife.png and b/public/images/emoji/apple/dagger_knife.png differ
diff --git a/public/images/emoji/apple/dancer.png b/public/images/emoji/apple/dancer.png
index 5ea2c10f9e..6be6b8308b 100644
Binary files a/public/images/emoji/apple/dancer.png and b/public/images/emoji/apple/dancer.png differ
diff --git a/public/images/emoji/apple/dancer/2.png b/public/images/emoji/apple/dancer/2.png
index 7c7f527dbe..6070f881c4 100644
Binary files a/public/images/emoji/apple/dancer/2.png and b/public/images/emoji/apple/dancer/2.png differ
diff --git a/public/images/emoji/apple/dancer/3.png b/public/images/emoji/apple/dancer/3.png
index 5c44306803..cf41accc6e 100644
Binary files a/public/images/emoji/apple/dancer/3.png and b/public/images/emoji/apple/dancer/3.png differ
diff --git a/public/images/emoji/apple/dancer/4.png b/public/images/emoji/apple/dancer/4.png
index e1f0389b01..533221f215 100644
Binary files a/public/images/emoji/apple/dancer/4.png and b/public/images/emoji/apple/dancer/4.png differ
diff --git a/public/images/emoji/apple/dancer/5.png b/public/images/emoji/apple/dancer/5.png
index cba934193f..1cd9930b2c 100644
Binary files a/public/images/emoji/apple/dancer/5.png and b/public/images/emoji/apple/dancer/5.png differ
diff --git a/public/images/emoji/apple/dancer/6.png b/public/images/emoji/apple/dancer/6.png
index cc8af5bc89..d54a79ba71 100644
Binary files a/public/images/emoji/apple/dancer/6.png and b/public/images/emoji/apple/dancer/6.png differ
diff --git a/public/images/emoji/apple/dancers.png b/public/images/emoji/apple/dancers.png
index 0d07c4318b..a9b2f59529 100644
Binary files a/public/images/emoji/apple/dancers.png and b/public/images/emoji/apple/dancers.png differ
diff --git a/public/images/emoji/apple/dancing_men.png b/public/images/emoji/apple/dancing_men.png
index e5951ce334..4fe2a2ef88 100644
Binary files a/public/images/emoji/apple/dancing_men.png and b/public/images/emoji/apple/dancing_men.png differ
diff --git a/public/images/emoji/apple/dancing_women.png b/public/images/emoji/apple/dancing_women.png
index 0d07c4318b..a9b2f59529 100644
Binary files a/public/images/emoji/apple/dancing_women.png and b/public/images/emoji/apple/dancing_women.png differ
diff --git a/public/images/emoji/apple/dango.png b/public/images/emoji/apple/dango.png
index ecaf15737e..13f32edc16 100644
Binary files a/public/images/emoji/apple/dango.png and b/public/images/emoji/apple/dango.png differ
diff --git a/public/images/emoji/apple/dark_sunglasses.png b/public/images/emoji/apple/dark_sunglasses.png
index 0b4696027d..9d25b907ef 100644
Binary files a/public/images/emoji/apple/dark_sunglasses.png and b/public/images/emoji/apple/dark_sunglasses.png differ
diff --git a/public/images/emoji/apple/dart.png b/public/images/emoji/apple/dart.png
index 1bdcca7068..a7714b6cac 100644
Binary files a/public/images/emoji/apple/dart.png and b/public/images/emoji/apple/dart.png differ
diff --git a/public/images/emoji/apple/dash.png b/public/images/emoji/apple/dash.png
index 36dbc3f444..2f49ba9616 100644
Binary files a/public/images/emoji/apple/dash.png and b/public/images/emoji/apple/dash.png differ
diff --git a/public/images/emoji/apple/date.png b/public/images/emoji/apple/date.png
index db76fcfc1d..4ca4f85475 100644
Binary files a/public/images/emoji/apple/date.png and b/public/images/emoji/apple/date.png differ
diff --git a/public/images/emoji/apple/de.png b/public/images/emoji/apple/de.png
index e732741286..26cd6aefef 100644
Binary files a/public/images/emoji/apple/de.png and b/public/images/emoji/apple/de.png differ
diff --git a/public/images/emoji/apple/deciduous_tree.png b/public/images/emoji/apple/deciduous_tree.png
index 50e388a7c3..6554eb5bb3 100644
Binary files a/public/images/emoji/apple/deciduous_tree.png and b/public/images/emoji/apple/deciduous_tree.png differ
diff --git a/public/images/emoji/apple/deer.png b/public/images/emoji/apple/deer.png
index 0cf37942c9..60e1a4d52b 100644
Binary files a/public/images/emoji/apple/deer.png and b/public/images/emoji/apple/deer.png differ
diff --git a/public/images/emoji/apple/denmark.png b/public/images/emoji/apple/denmark.png
index 17d683203c..fb3e9827f6 100644
Binary files a/public/images/emoji/apple/denmark.png and b/public/images/emoji/apple/denmark.png differ
diff --git a/public/images/emoji/apple/department_store.png b/public/images/emoji/apple/department_store.png
index 07ee6e93e0..e853130911 100644
Binary files a/public/images/emoji/apple/department_store.png and b/public/images/emoji/apple/department_store.png differ
diff --git a/public/images/emoji/apple/derelict_house.png b/public/images/emoji/apple/derelict_house.png
index f6c4251884..1d07668a0c 100644
Binary files a/public/images/emoji/apple/derelict_house.png and b/public/images/emoji/apple/derelict_house.png differ
diff --git a/public/images/emoji/apple/derelict_house_building.png b/public/images/emoji/apple/derelict_house_building.png
index f6c4251884..1d07668a0c 100644
Binary files a/public/images/emoji/apple/derelict_house_building.png and b/public/images/emoji/apple/derelict_house_building.png differ
diff --git a/public/images/emoji/apple/desert.png b/public/images/emoji/apple/desert.png
index 5839c71e7f..649bb7a81e 100644
Binary files a/public/images/emoji/apple/desert.png and b/public/images/emoji/apple/desert.png differ
diff --git a/public/images/emoji/apple/desert_island.png b/public/images/emoji/apple/desert_island.png
index 8b98bbead1..7295d513b5 100644
Binary files a/public/images/emoji/apple/desert_island.png and b/public/images/emoji/apple/desert_island.png differ
diff --git a/public/images/emoji/apple/desktop.png b/public/images/emoji/apple/desktop.png
index e1057cb3d0..233b0563df 100644
Binary files a/public/images/emoji/apple/desktop.png and b/public/images/emoji/apple/desktop.png differ
diff --git a/public/images/emoji/apple/desktop_computer.png b/public/images/emoji/apple/desktop_computer.png
index e1057cb3d0..233b0563df 100644
Binary files a/public/images/emoji/apple/desktop_computer.png and b/public/images/emoji/apple/desktop_computer.png differ
diff --git a/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png b/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png
index 86bcc8cbbd..289547870a 100644
Binary files a/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/apple/diamonds.png b/public/images/emoji/apple/diamonds.png
index 7d7a55b489..ed8191d5ef 100644
Binary files a/public/images/emoji/apple/diamonds.png and b/public/images/emoji/apple/diamonds.png differ
diff --git a/public/images/emoji/apple/diego_garcia.png b/public/images/emoji/apple/diego_garcia.png
index 1008c45a45..21e6a16e3b 100644
Binary files a/public/images/emoji/apple/diego_garcia.png and b/public/images/emoji/apple/diego_garcia.png differ
diff --git a/public/images/emoji/apple/disappointed.png b/public/images/emoji/apple/disappointed.png
index 5fd6b7f39c..6b8e865ca1 100644
Binary files a/public/images/emoji/apple/disappointed.png and b/public/images/emoji/apple/disappointed.png differ
diff --git a/public/images/emoji/apple/disappointed_relieved.png b/public/images/emoji/apple/disappointed_relieved.png
index 2f59bd508f..06a6f9bc33 100644
Binary files a/public/images/emoji/apple/disappointed_relieved.png and b/public/images/emoji/apple/disappointed_relieved.png differ
diff --git a/public/images/emoji/apple/dividers.png b/public/images/emoji/apple/dividers.png
index 688e41bb2f..32ae4bace0 100644
Binary files a/public/images/emoji/apple/dividers.png and b/public/images/emoji/apple/dividers.png differ
diff --git a/public/images/emoji/apple/dizzy.png b/public/images/emoji/apple/dizzy.png
index e006576d51..924ff66543 100644
Binary files a/public/images/emoji/apple/dizzy.png and b/public/images/emoji/apple/dizzy.png differ
diff --git a/public/images/emoji/apple/dizzy_face.png b/public/images/emoji/apple/dizzy_face.png
index 53dc38507e..b7be2c2bb3 100644
Binary files a/public/images/emoji/apple/dizzy_face.png and b/public/images/emoji/apple/dizzy_face.png differ
diff --git a/public/images/emoji/apple/djibouti.png b/public/images/emoji/apple/djibouti.png
index 8581bbc7d8..4c1df02354 100644
Binary files a/public/images/emoji/apple/djibouti.png and b/public/images/emoji/apple/djibouti.png differ
diff --git a/public/images/emoji/apple/do_not_litter.png b/public/images/emoji/apple/do_not_litter.png
index b4208f83f8..a27f9563d0 100644
Binary files a/public/images/emoji/apple/do_not_litter.png and b/public/images/emoji/apple/do_not_litter.png differ
diff --git a/public/images/emoji/apple/dog.png b/public/images/emoji/apple/dog.png
index a2145e68b5..674321b7b6 100644
Binary files a/public/images/emoji/apple/dog.png and b/public/images/emoji/apple/dog.png differ
diff --git a/public/images/emoji/apple/dog2.png b/public/images/emoji/apple/dog2.png
index e0a134d464..317d407657 100644
Binary files a/public/images/emoji/apple/dog2.png and b/public/images/emoji/apple/dog2.png differ
diff --git a/public/images/emoji/apple/dollar.png b/public/images/emoji/apple/dollar.png
index d98a38f496..ef27df38d9 100644
Binary files a/public/images/emoji/apple/dollar.png and b/public/images/emoji/apple/dollar.png differ
diff --git a/public/images/emoji/apple/dolls.png b/public/images/emoji/apple/dolls.png
index 0e7e1bf910..8deacd3bef 100644
Binary files a/public/images/emoji/apple/dolls.png and b/public/images/emoji/apple/dolls.png differ
diff --git a/public/images/emoji/apple/dolphin.png b/public/images/emoji/apple/dolphin.png
index ab393900ec..0939aef14a 100644
Binary files a/public/images/emoji/apple/dolphin.png and b/public/images/emoji/apple/dolphin.png differ
diff --git a/public/images/emoji/apple/dominica.png b/public/images/emoji/apple/dominica.png
index b2183a0bde..e01dbbaeb9 100644
Binary files a/public/images/emoji/apple/dominica.png and b/public/images/emoji/apple/dominica.png differ
diff --git a/public/images/emoji/apple/dominican_republic.png b/public/images/emoji/apple/dominican_republic.png
index 3848b2a930..6b1482d7f9 100644
Binary files a/public/images/emoji/apple/dominican_republic.png and b/public/images/emoji/apple/dominican_republic.png differ
diff --git a/public/images/emoji/apple/door.png b/public/images/emoji/apple/door.png
index e8e2c50219..a982dcfb8c 100644
Binary files a/public/images/emoji/apple/door.png and b/public/images/emoji/apple/door.png differ
diff --git a/public/images/emoji/apple/double_vertical_bar.png b/public/images/emoji/apple/double_vertical_bar.png
index 7f788fbb76..c4af9abe3c 100644
Binary files a/public/images/emoji/apple/double_vertical_bar.png and b/public/images/emoji/apple/double_vertical_bar.png differ
diff --git a/public/images/emoji/apple/doughnut.png b/public/images/emoji/apple/doughnut.png
index 4a767f03fb..c5f3cfbf71 100644
Binary files a/public/images/emoji/apple/doughnut.png and b/public/images/emoji/apple/doughnut.png differ
diff --git a/public/images/emoji/apple/dove.png b/public/images/emoji/apple/dove.png
index 59e34ff912..7833a68a2e 100644
Binary files a/public/images/emoji/apple/dove.png and b/public/images/emoji/apple/dove.png differ
diff --git a/public/images/emoji/apple/dove_of_peace.png b/public/images/emoji/apple/dove_of_peace.png
index 59e34ff912..7833a68a2e 100644
Binary files a/public/images/emoji/apple/dove_of_peace.png and b/public/images/emoji/apple/dove_of_peace.png differ
diff --git a/public/images/emoji/apple/dragon.png b/public/images/emoji/apple/dragon.png
index 14420b8e03..4bb08d325f 100644
Binary files a/public/images/emoji/apple/dragon.png and b/public/images/emoji/apple/dragon.png differ
diff --git a/public/images/emoji/apple/dragon_face.png b/public/images/emoji/apple/dragon_face.png
index 1133b42256..8bf8f89f31 100644
Binary files a/public/images/emoji/apple/dragon_face.png and b/public/images/emoji/apple/dragon_face.png differ
diff --git a/public/images/emoji/apple/dress.png b/public/images/emoji/apple/dress.png
index 64d792e8d8..3680c67d47 100644
Binary files a/public/images/emoji/apple/dress.png and b/public/images/emoji/apple/dress.png differ
diff --git a/public/images/emoji/apple/dromedary_camel.png b/public/images/emoji/apple/dromedary_camel.png
index 7c42f7b8e5..e1e5423d76 100644
Binary files a/public/images/emoji/apple/dromedary_camel.png and b/public/images/emoji/apple/dromedary_camel.png differ
diff --git a/public/images/emoji/apple/drooling_face.png b/public/images/emoji/apple/drooling_face.png
index 3c8fe7b900..064cfe96e0 100644
Binary files a/public/images/emoji/apple/drooling_face.png and b/public/images/emoji/apple/drooling_face.png differ
diff --git a/public/images/emoji/apple/droplet.png b/public/images/emoji/apple/droplet.png
index e5a511f5c5..cff08bd8cc 100644
Binary files a/public/images/emoji/apple/droplet.png and b/public/images/emoji/apple/droplet.png differ
diff --git a/public/images/emoji/apple/drum.png b/public/images/emoji/apple/drum.png
index 4de7a5ba7e..fc884ff84c 100644
Binary files a/public/images/emoji/apple/drum.png and b/public/images/emoji/apple/drum.png differ
diff --git a/public/images/emoji/apple/duck.png b/public/images/emoji/apple/duck.png
index e0a5705214..94b1577bc5 100644
Binary files a/public/images/emoji/apple/duck.png and b/public/images/emoji/apple/duck.png differ
diff --git a/public/images/emoji/apple/dumpling.png b/public/images/emoji/apple/dumpling.png
index 489a779bf6..df5ad3ea35 100644
Binary files a/public/images/emoji/apple/dumpling.png and b/public/images/emoji/apple/dumpling.png differ
diff --git a/public/images/emoji/apple/dvd.png b/public/images/emoji/apple/dvd.png
index 09d9c415f5..15d05812ae 100644
Binary files a/public/images/emoji/apple/dvd.png and b/public/images/emoji/apple/dvd.png differ
diff --git a/public/images/emoji/apple/e-mail.png b/public/images/emoji/apple/e-mail.png
index 511be647ad..f38cc997d1 100644
Binary files a/public/images/emoji/apple/e-mail.png and b/public/images/emoji/apple/e-mail.png differ
diff --git a/public/images/emoji/apple/eagle.png b/public/images/emoji/apple/eagle.png
index 445c707c0b..0633e1ddb2 100644
Binary files a/public/images/emoji/apple/eagle.png and b/public/images/emoji/apple/eagle.png differ
diff --git a/public/images/emoji/apple/ear.png b/public/images/emoji/apple/ear.png
index b6c7ea1c25..9c71776ccd 100644
Binary files a/public/images/emoji/apple/ear.png and b/public/images/emoji/apple/ear.png differ
diff --git a/public/images/emoji/apple/ear/2.png b/public/images/emoji/apple/ear/2.png
index ca5ccc4723..00f201997c 100644
Binary files a/public/images/emoji/apple/ear/2.png and b/public/images/emoji/apple/ear/2.png differ
diff --git a/public/images/emoji/apple/ear/3.png b/public/images/emoji/apple/ear/3.png
index 19728dcd78..b69bc4880f 100644
Binary files a/public/images/emoji/apple/ear/3.png and b/public/images/emoji/apple/ear/3.png differ
diff --git a/public/images/emoji/apple/ear/4.png b/public/images/emoji/apple/ear/4.png
index 8fb3fff357..2dd16f1bd1 100644
Binary files a/public/images/emoji/apple/ear/4.png and b/public/images/emoji/apple/ear/4.png differ
diff --git a/public/images/emoji/apple/ear/5.png b/public/images/emoji/apple/ear/5.png
index b70cc56420..14e8988284 100644
Binary files a/public/images/emoji/apple/ear/5.png and b/public/images/emoji/apple/ear/5.png differ
diff --git a/public/images/emoji/apple/ear/6.png b/public/images/emoji/apple/ear/6.png
index 59b7bcc95a..5a15b71f70 100644
Binary files a/public/images/emoji/apple/ear/6.png and b/public/images/emoji/apple/ear/6.png differ
diff --git a/public/images/emoji/apple/ear_of_rice.png b/public/images/emoji/apple/ear_of_rice.png
index 3efff57063..de626d9be1 100644
Binary files a/public/images/emoji/apple/ear_of_rice.png and b/public/images/emoji/apple/ear_of_rice.png differ
diff --git a/public/images/emoji/apple/earth_africa.png b/public/images/emoji/apple/earth_africa.png
index 19c0e25028..e76067ce10 100644
Binary files a/public/images/emoji/apple/earth_africa.png and b/public/images/emoji/apple/earth_africa.png differ
diff --git a/public/images/emoji/apple/earth_americas.png b/public/images/emoji/apple/earth_americas.png
index f6ab1f616b..8f2c7b3fd5 100644
Binary files a/public/images/emoji/apple/earth_americas.png and b/public/images/emoji/apple/earth_americas.png differ
diff --git a/public/images/emoji/apple/earth_asia.png b/public/images/emoji/apple/earth_asia.png
index 3e7b8e6178..a5b887d2d9 100644
Binary files a/public/images/emoji/apple/earth_asia.png and b/public/images/emoji/apple/earth_asia.png differ
diff --git a/public/images/emoji/apple/ecuador.png b/public/images/emoji/apple/ecuador.png
index 755cb28027..bbb52f2d71 100644
Binary files a/public/images/emoji/apple/ecuador.png and b/public/images/emoji/apple/ecuador.png differ
diff --git a/public/images/emoji/apple/egg.png b/public/images/emoji/apple/egg.png
index fb78dad239..5f7d8d8030 100644
Binary files a/public/images/emoji/apple/egg.png and b/public/images/emoji/apple/egg.png differ
diff --git a/public/images/emoji/apple/eggplant.png b/public/images/emoji/apple/eggplant.png
index f0b76c34ca..976dfbaa13 100644
Binary files a/public/images/emoji/apple/eggplant.png and b/public/images/emoji/apple/eggplant.png differ
diff --git a/public/images/emoji/apple/egypt.png b/public/images/emoji/apple/egypt.png
index 81d5764df1..9924d1151c 100644
Binary files a/public/images/emoji/apple/egypt.png and b/public/images/emoji/apple/egypt.png differ
diff --git a/public/images/emoji/apple/eight.png b/public/images/emoji/apple/eight.png
index 6269d3b91a..20fb21cf8e 100644
Binary files a/public/images/emoji/apple/eight.png and b/public/images/emoji/apple/eight.png differ
diff --git a/public/images/emoji/apple/eight_pointed_black_star.png b/public/images/emoji/apple/eight_pointed_black_star.png
index 231d6abc89..3b5929ea60 100644
Binary files a/public/images/emoji/apple/eight_pointed_black_star.png and b/public/images/emoji/apple/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/apple/eight_spoked_asterisk.png b/public/images/emoji/apple/eight_spoked_asterisk.png
index 1f094d2de5..cb38d5d434 100644
Binary files a/public/images/emoji/apple/eight_spoked_asterisk.png and b/public/images/emoji/apple/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/apple/el_salvador.png b/public/images/emoji/apple/el_salvador.png
index 268812d605..e9c658d02a 100644
Binary files a/public/images/emoji/apple/el_salvador.png and b/public/images/emoji/apple/el_salvador.png differ
diff --git a/public/images/emoji/apple/electric_plug.png b/public/images/emoji/apple/electric_plug.png
index 5be3a492f2..6025e0bc83 100644
Binary files a/public/images/emoji/apple/electric_plug.png and b/public/images/emoji/apple/electric_plug.png differ
diff --git a/public/images/emoji/apple/elephant.png b/public/images/emoji/apple/elephant.png
index 04454bb1aa..09d67aeaaf 100644
Binary files a/public/images/emoji/apple/elephant.png and b/public/images/emoji/apple/elephant.png differ
diff --git a/public/images/emoji/apple/elf.png b/public/images/emoji/apple/elf.png
index f8b6dd873e..bf467ba19a 100644
Binary files a/public/images/emoji/apple/elf.png and b/public/images/emoji/apple/elf.png differ
diff --git a/public/images/emoji/apple/elf/2.png b/public/images/emoji/apple/elf/2.png
index 15984024f2..363c9e1f15 100644
Binary files a/public/images/emoji/apple/elf/2.png and b/public/images/emoji/apple/elf/2.png differ
diff --git a/public/images/emoji/apple/elf/3.png b/public/images/emoji/apple/elf/3.png
index 4689243a17..f403eb924c 100644
Binary files a/public/images/emoji/apple/elf/3.png and b/public/images/emoji/apple/elf/3.png differ
diff --git a/public/images/emoji/apple/elf/4.png b/public/images/emoji/apple/elf/4.png
index 861cbf808c..31f52c6f4e 100644
Binary files a/public/images/emoji/apple/elf/4.png and b/public/images/emoji/apple/elf/4.png differ
diff --git a/public/images/emoji/apple/elf/5.png b/public/images/emoji/apple/elf/5.png
index 5074876010..1caeefb161 100644
Binary files a/public/images/emoji/apple/elf/5.png and b/public/images/emoji/apple/elf/5.png differ
diff --git a/public/images/emoji/apple/elf/6.png b/public/images/emoji/apple/elf/6.png
index 505c908b18..c81c11eaf1 100644
Binary files a/public/images/emoji/apple/elf/6.png and b/public/images/emoji/apple/elf/6.png differ
diff --git a/public/images/emoji/apple/email.png b/public/images/emoji/apple/email.png
index 511be647ad..f38cc997d1 100644
Binary files a/public/images/emoji/apple/email.png and b/public/images/emoji/apple/email.png differ
diff --git a/public/images/emoji/apple/end.png b/public/images/emoji/apple/end.png
index 55820b7bf9..e5dadca276 100644
Binary files a/public/images/emoji/apple/end.png and b/public/images/emoji/apple/end.png differ
diff --git a/public/images/emoji/apple/envelope.png b/public/images/emoji/apple/envelope.png
index 511be647ad..f38cc997d1 100644
Binary files a/public/images/emoji/apple/envelope.png and b/public/images/emoji/apple/envelope.png differ
diff --git a/public/images/emoji/apple/envelope_with_arrow.png b/public/images/emoji/apple/envelope_with_arrow.png
index 68e1334683..23b1c352ee 100644
Binary files a/public/images/emoji/apple/envelope_with_arrow.png and b/public/images/emoji/apple/envelope_with_arrow.png differ
diff --git a/public/images/emoji/apple/equatorial_guinea.png b/public/images/emoji/apple/equatorial_guinea.png
index 4f4becc0d4..a0a43e768b 100644
Binary files a/public/images/emoji/apple/equatorial_guinea.png and b/public/images/emoji/apple/equatorial_guinea.png differ
diff --git a/public/images/emoji/apple/eritrea.png b/public/images/emoji/apple/eritrea.png
index 41397be692..3b24998bb4 100644
Binary files a/public/images/emoji/apple/eritrea.png and b/public/images/emoji/apple/eritrea.png differ
diff --git a/public/images/emoji/apple/es.png b/public/images/emoji/apple/es.png
index 8fca1f0390..73e3231afb 100644
Binary files a/public/images/emoji/apple/es.png and b/public/images/emoji/apple/es.png differ
diff --git a/public/images/emoji/apple/estonia.png b/public/images/emoji/apple/estonia.png
index 30255a2433..ada1d2354b 100644
Binary files a/public/images/emoji/apple/estonia.png and b/public/images/emoji/apple/estonia.png differ
diff --git a/public/images/emoji/apple/ethiopia.png b/public/images/emoji/apple/ethiopia.png
index 5c62e06a71..1ab69d5773 100644
Binary files a/public/images/emoji/apple/ethiopia.png and b/public/images/emoji/apple/ethiopia.png differ
diff --git a/public/images/emoji/apple/eu.png b/public/images/emoji/apple/eu.png
index 67f0608497..05a4afb095 100644
Binary files a/public/images/emoji/apple/eu.png and b/public/images/emoji/apple/eu.png differ
diff --git a/public/images/emoji/apple/euro.png b/public/images/emoji/apple/euro.png
index 83a1a7018f..dd2705a371 100644
Binary files a/public/images/emoji/apple/euro.png and b/public/images/emoji/apple/euro.png differ
diff --git a/public/images/emoji/apple/european_castle.png b/public/images/emoji/apple/european_castle.png
index 97fe6bad2d..944409b7f0 100644
Binary files a/public/images/emoji/apple/european_castle.png and b/public/images/emoji/apple/european_castle.png differ
diff --git a/public/images/emoji/apple/european_post_office.png b/public/images/emoji/apple/european_post_office.png
index c1ab53657c..9becb2e74a 100644
Binary files a/public/images/emoji/apple/european_post_office.png and b/public/images/emoji/apple/european_post_office.png differ
diff --git a/public/images/emoji/apple/evergreen_tree.png b/public/images/emoji/apple/evergreen_tree.png
index 4609b01c50..9b6761e2cd 100644
Binary files a/public/images/emoji/apple/evergreen_tree.png and b/public/images/emoji/apple/evergreen_tree.png differ
diff --git a/public/images/emoji/apple/exclamation.png b/public/images/emoji/apple/exclamation.png
index d074b414f8..60d34cefe0 100644
Binary files a/public/images/emoji/apple/exclamation.png and b/public/images/emoji/apple/exclamation.png differ
diff --git a/public/images/emoji/apple/exploding_head.png b/public/images/emoji/apple/exploding_head.png
index 85532dadc7..f74bec2547 100644
Binary files a/public/images/emoji/apple/exploding_head.png and b/public/images/emoji/apple/exploding_head.png differ
diff --git a/public/images/emoji/apple/expressionless.png b/public/images/emoji/apple/expressionless.png
index 41cedf753e..d30bed2a80 100644
Binary files a/public/images/emoji/apple/expressionless.png and b/public/images/emoji/apple/expressionless.png differ
diff --git a/public/images/emoji/apple/eye.png b/public/images/emoji/apple/eye.png
index a3f3dd64f6..fcf1194eb2 100644
Binary files a/public/images/emoji/apple/eye.png and b/public/images/emoji/apple/eye.png differ
diff --git a/public/images/emoji/apple/eyeglasses.png b/public/images/emoji/apple/eyeglasses.png
index 8c5c74e74c..155c380f2e 100644
Binary files a/public/images/emoji/apple/eyeglasses.png and b/public/images/emoji/apple/eyeglasses.png differ
diff --git a/public/images/emoji/apple/eyes.png b/public/images/emoji/apple/eyes.png
index b28ffc8d7a..17ca6e5e69 100644
Binary files a/public/images/emoji/apple/eyes.png and b/public/images/emoji/apple/eyes.png differ
diff --git a/public/images/emoji/apple/face_vomiting.png b/public/images/emoji/apple/face_vomiting.png
index cd7c3d1f2b..2eae8d3328 100644
Binary files a/public/images/emoji/apple/face_vomiting.png and b/public/images/emoji/apple/face_vomiting.png differ
diff --git a/public/images/emoji/apple/face_with_hand_over_mouth.png b/public/images/emoji/apple/face_with_hand_over_mouth.png
index aed8f62e0b..19637ed375 100644
Binary files a/public/images/emoji/apple/face_with_hand_over_mouth.png and b/public/images/emoji/apple/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/apple/face_with_head_bandage.png b/public/images/emoji/apple/face_with_head_bandage.png
index 953be45438..0e79c6d84e 100644
Binary files a/public/images/emoji/apple/face_with_head_bandage.png and b/public/images/emoji/apple/face_with_head_bandage.png differ
diff --git a/public/images/emoji/apple/face_with_monocle.png b/public/images/emoji/apple/face_with_monocle.png
index c6fbb4481d..745e1051fc 100644
Binary files a/public/images/emoji/apple/face_with_monocle.png and b/public/images/emoji/apple/face_with_monocle.png differ
diff --git a/public/images/emoji/apple/face_with_raised_eyebrow.png b/public/images/emoji/apple/face_with_raised_eyebrow.png
index 887f70e365..47446da1d8 100644
Binary files a/public/images/emoji/apple/face_with_raised_eyebrow.png and b/public/images/emoji/apple/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/apple/face_with_rolling_eyes.png b/public/images/emoji/apple/face_with_rolling_eyes.png
index 4da789951a..4c87d28410 100644
Binary files a/public/images/emoji/apple/face_with_rolling_eyes.png and b/public/images/emoji/apple/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/apple/face_with_symbols_over_mouth.png b/public/images/emoji/apple/face_with_symbols_over_mouth.png
index 84bb9ec9c5..de32848c03 100644
Binary files a/public/images/emoji/apple/face_with_symbols_over_mouth.png and b/public/images/emoji/apple/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/apple/face_with_thermometer.png b/public/images/emoji/apple/face_with_thermometer.png
index bc7076dfa3..1ed6dd07f8 100644
Binary files a/public/images/emoji/apple/face_with_thermometer.png and b/public/images/emoji/apple/face_with_thermometer.png differ
diff --git a/public/images/emoji/apple/facepunch.png b/public/images/emoji/apple/facepunch.png
index c01cab21b5..2fe281b064 100644
Binary files a/public/images/emoji/apple/facepunch.png and b/public/images/emoji/apple/facepunch.png differ
diff --git a/public/images/emoji/apple/facepunch/2.png b/public/images/emoji/apple/facepunch/2.png
index 1c8dd8dbf3..187e09db39 100644
Binary files a/public/images/emoji/apple/facepunch/2.png and b/public/images/emoji/apple/facepunch/2.png differ
diff --git a/public/images/emoji/apple/facepunch/3.png b/public/images/emoji/apple/facepunch/3.png
index 39deb2c7e8..20b4eaf9b2 100644
Binary files a/public/images/emoji/apple/facepunch/3.png and b/public/images/emoji/apple/facepunch/3.png differ
diff --git a/public/images/emoji/apple/facepunch/4.png b/public/images/emoji/apple/facepunch/4.png
index ef6df0b933..8161cf6151 100644
Binary files a/public/images/emoji/apple/facepunch/4.png and b/public/images/emoji/apple/facepunch/4.png differ
diff --git a/public/images/emoji/apple/facepunch/5.png b/public/images/emoji/apple/facepunch/5.png
index 8552732ad4..946f68e20a 100644
Binary files a/public/images/emoji/apple/facepunch/5.png and b/public/images/emoji/apple/facepunch/5.png differ
diff --git a/public/images/emoji/apple/facepunch/6.png b/public/images/emoji/apple/facepunch/6.png
index 24f4a3071a..7805cd98db 100644
Binary files a/public/images/emoji/apple/facepunch/6.png and b/public/images/emoji/apple/facepunch/6.png differ
diff --git a/public/images/emoji/apple/factory.png b/public/images/emoji/apple/factory.png
index 28ff6cc73d..12eb9444bb 100644
Binary files a/public/images/emoji/apple/factory.png and b/public/images/emoji/apple/factory.png differ
diff --git a/public/images/emoji/apple/fairy.png b/public/images/emoji/apple/fairy.png
index 429938294b..70ae9a0141 100644
Binary files a/public/images/emoji/apple/fairy.png and b/public/images/emoji/apple/fairy.png differ
diff --git a/public/images/emoji/apple/fairy/2.png b/public/images/emoji/apple/fairy/2.png
index 91e1de4e5d..29367f5924 100644
Binary files a/public/images/emoji/apple/fairy/2.png and b/public/images/emoji/apple/fairy/2.png differ
diff --git a/public/images/emoji/apple/fairy/3.png b/public/images/emoji/apple/fairy/3.png
index 42821806e9..015e4fe908 100644
Binary files a/public/images/emoji/apple/fairy/3.png and b/public/images/emoji/apple/fairy/3.png differ
diff --git a/public/images/emoji/apple/fairy/4.png b/public/images/emoji/apple/fairy/4.png
index 9e8d3adb89..d58be6db41 100644
Binary files a/public/images/emoji/apple/fairy/4.png and b/public/images/emoji/apple/fairy/4.png differ
diff --git a/public/images/emoji/apple/fairy/5.png b/public/images/emoji/apple/fairy/5.png
index 88d190e392..6ae4853a59 100644
Binary files a/public/images/emoji/apple/fairy/5.png and b/public/images/emoji/apple/fairy/5.png differ
diff --git a/public/images/emoji/apple/fairy/6.png b/public/images/emoji/apple/fairy/6.png
index e6ab8ade74..9cd4fff381 100644
Binary files a/public/images/emoji/apple/fairy/6.png and b/public/images/emoji/apple/fairy/6.png differ
diff --git a/public/images/emoji/apple/falkland_islands.png b/public/images/emoji/apple/falkland_islands.png
index 74f9b4ddf4..64ffd8d47d 100644
Binary files a/public/images/emoji/apple/falkland_islands.png and b/public/images/emoji/apple/falkland_islands.png differ
diff --git a/public/images/emoji/apple/fallen_leaf.png b/public/images/emoji/apple/fallen_leaf.png
index 62054c42fa..04fdee35e6 100644
Binary files a/public/images/emoji/apple/fallen_leaf.png and b/public/images/emoji/apple/fallen_leaf.png differ
diff --git a/public/images/emoji/apple/family.png b/public/images/emoji/apple/family.png
index 100c01bda8..c8398e7352 100644
Binary files a/public/images/emoji/apple/family.png and b/public/images/emoji/apple/family.png differ
diff --git a/public/images/emoji/apple/family_man_boy.png b/public/images/emoji/apple/family_man_boy.png
index d5e6e2a58e..50139cad94 100644
Binary files a/public/images/emoji/apple/family_man_boy.png and b/public/images/emoji/apple/family_man_boy.png differ
diff --git a/public/images/emoji/apple/family_man_boy_boy.png b/public/images/emoji/apple/family_man_boy_boy.png
index 1a9f21b2a3..20a0ad5f2e 100644
Binary files a/public/images/emoji/apple/family_man_boy_boy.png and b/public/images/emoji/apple/family_man_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_man_girl.png b/public/images/emoji/apple/family_man_girl.png
index 9af1f5af57..e8028eec56 100644
Binary files a/public/images/emoji/apple/family_man_girl.png and b/public/images/emoji/apple/family_man_girl.png differ
diff --git a/public/images/emoji/apple/family_man_girl_boy.png b/public/images/emoji/apple/family_man_girl_boy.png
index c5900031b8..369d58410e 100644
Binary files a/public/images/emoji/apple/family_man_girl_boy.png and b/public/images/emoji/apple/family_man_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_man_girl_girl.png b/public/images/emoji/apple/family_man_girl_girl.png
index 1f9a1557d5..456fac2475 100644
Binary files a/public/images/emoji/apple/family_man_girl_girl.png and b/public/images/emoji/apple/family_man_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_man_man_boy.png b/public/images/emoji/apple/family_man_man_boy.png
index 40020601cb..d5ad3cca94 100644
Binary files a/public/images/emoji/apple/family_man_man_boy.png and b/public/images/emoji/apple/family_man_man_boy.png differ
diff --git a/public/images/emoji/apple/family_man_man_boy_boy.png b/public/images/emoji/apple/family_man_man_boy_boy.png
index 57c7b97657..89c1db6983 100644
Binary files a/public/images/emoji/apple/family_man_man_boy_boy.png and b/public/images/emoji/apple/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_man_man_girl.png b/public/images/emoji/apple/family_man_man_girl.png
index 158384d6e3..88e059ee02 100644
Binary files a/public/images/emoji/apple/family_man_man_girl.png and b/public/images/emoji/apple/family_man_man_girl.png differ
diff --git a/public/images/emoji/apple/family_man_man_girl_boy.png b/public/images/emoji/apple/family_man_man_girl_boy.png
index 3394121d14..e8535f0c36 100644
Binary files a/public/images/emoji/apple/family_man_man_girl_boy.png and b/public/images/emoji/apple/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_man_man_girl_girl.png b/public/images/emoji/apple/family_man_man_girl_girl.png
index 97c1f26473..d0d527ae76 100644
Binary files a/public/images/emoji/apple/family_man_man_girl_girl.png and b/public/images/emoji/apple/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_man_woman_boy.png b/public/images/emoji/apple/family_man_woman_boy.png
index 4d0ef0c5b0..bc20011f82 100644
Binary files a/public/images/emoji/apple/family_man_woman_boy.png and b/public/images/emoji/apple/family_man_woman_boy.png differ
diff --git a/public/images/emoji/apple/family_man_woman_boy_boy.png b/public/images/emoji/apple/family_man_woman_boy_boy.png
index 213af3e02d..adfd2540c5 100644
Binary files a/public/images/emoji/apple/family_man_woman_boy_boy.png and b/public/images/emoji/apple/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_man_woman_boys.png b/public/images/emoji/apple/family_man_woman_boys.png
index 213af3e02d..adfd2540c5 100644
Binary files a/public/images/emoji/apple/family_man_woman_boys.png and b/public/images/emoji/apple/family_man_woman_boys.png differ
diff --git a/public/images/emoji/apple/family_man_woman_girl.png b/public/images/emoji/apple/family_man_woman_girl.png
index c94e760b7a..2ca5f71fbe 100644
Binary files a/public/images/emoji/apple/family_man_woman_girl.png and b/public/images/emoji/apple/family_man_woman_girl.png differ
diff --git a/public/images/emoji/apple/family_man_woman_girl_boy.png b/public/images/emoji/apple/family_man_woman_girl_boy.png
index 100c01bda8..c8398e7352 100644
Binary files a/public/images/emoji/apple/family_man_woman_girl_boy.png and b/public/images/emoji/apple/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_man_woman_girl_girl.png b/public/images/emoji/apple/family_man_woman_girl_girl.png
index 004ec8f427..fc0e818662 100644
Binary files a/public/images/emoji/apple/family_man_woman_girl_girl.png and b/public/images/emoji/apple/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_man_woman_girls.png b/public/images/emoji/apple/family_man_woman_girls.png
index 004ec8f427..fc0e818662 100644
Binary files a/public/images/emoji/apple/family_man_woman_girls.png and b/public/images/emoji/apple/family_man_woman_girls.png differ
diff --git a/public/images/emoji/apple/family_men_boy.png b/public/images/emoji/apple/family_men_boy.png
index 40020601cb..d5ad3cca94 100644
Binary files a/public/images/emoji/apple/family_men_boy.png and b/public/images/emoji/apple/family_men_boy.png differ
diff --git a/public/images/emoji/apple/family_men_boys.png b/public/images/emoji/apple/family_men_boys.png
index 57c7b97657..89c1db6983 100644
Binary files a/public/images/emoji/apple/family_men_boys.png and b/public/images/emoji/apple/family_men_boys.png differ
diff --git a/public/images/emoji/apple/family_men_girl.png b/public/images/emoji/apple/family_men_girl.png
index 158384d6e3..88e059ee02 100644
Binary files a/public/images/emoji/apple/family_men_girl.png and b/public/images/emoji/apple/family_men_girl.png differ
diff --git a/public/images/emoji/apple/family_men_girl_boy.png b/public/images/emoji/apple/family_men_girl_boy.png
index 3394121d14..e8535f0c36 100644
Binary files a/public/images/emoji/apple/family_men_girl_boy.png and b/public/images/emoji/apple/family_men_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_men_girls.png b/public/images/emoji/apple/family_men_girls.png
index 97c1f26473..d0d527ae76 100644
Binary files a/public/images/emoji/apple/family_men_girls.png and b/public/images/emoji/apple/family_men_girls.png differ
diff --git a/public/images/emoji/apple/family_woman_boy.png b/public/images/emoji/apple/family_woman_boy.png
index 4d16c60773..f789b000e3 100644
Binary files a/public/images/emoji/apple/family_woman_boy.png and b/public/images/emoji/apple/family_woman_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_boy_boy.png b/public/images/emoji/apple/family_woman_boy_boy.png
index 8713aa91e1..e39b2febf8 100644
Binary files a/public/images/emoji/apple/family_woman_boy_boy.png and b/public/images/emoji/apple/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_girl.png b/public/images/emoji/apple/family_woman_girl.png
index da7c991131..eb315f6276 100644
Binary files a/public/images/emoji/apple/family_woman_girl.png and b/public/images/emoji/apple/family_woman_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_girl_boy.png b/public/images/emoji/apple/family_woman_girl_boy.png
index 0c28c1f894..5e31cbd4b4 100644
Binary files a/public/images/emoji/apple/family_woman_girl_boy.png and b/public/images/emoji/apple/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_girl_girl.png b/public/images/emoji/apple/family_woman_girl_girl.png
index ac197a85fe..b26e9575b6 100644
Binary files a/public/images/emoji/apple/family_woman_girl_girl.png and b/public/images/emoji/apple/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_boy.png b/public/images/emoji/apple/family_woman_woman_boy.png
index 039d152d5b..a7618ea16d 100644
Binary files a/public/images/emoji/apple/family_woman_woman_boy.png and b/public/images/emoji/apple/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_boy_boy.png b/public/images/emoji/apple/family_woman_woman_boy_boy.png
index e70b13476b..5e3920011b 100644
Binary files a/public/images/emoji/apple/family_woman_woman_boy_boy.png and b/public/images/emoji/apple/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_girl.png b/public/images/emoji/apple/family_woman_woman_girl.png
index c71257738d..801e37bf23 100644
Binary files a/public/images/emoji/apple/family_woman_woman_girl.png and b/public/images/emoji/apple/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_girl_boy.png b/public/images/emoji/apple/family_woman_woman_girl_boy.png
index 85f7db3657..0fc0f444f3 100644
Binary files a/public/images/emoji/apple/family_woman_woman_girl_boy.png and b/public/images/emoji/apple/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_girl_girl.png b/public/images/emoji/apple/family_woman_woman_girl_girl.png
index aa6768144c..24e50c0eb7 100644
Binary files a/public/images/emoji/apple/family_woman_woman_girl_girl.png and b/public/images/emoji/apple/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_women_boy.png b/public/images/emoji/apple/family_women_boy.png
index 039d152d5b..a7618ea16d 100644
Binary files a/public/images/emoji/apple/family_women_boy.png and b/public/images/emoji/apple/family_women_boy.png differ
diff --git a/public/images/emoji/apple/family_women_boys.png b/public/images/emoji/apple/family_women_boys.png
index e70b13476b..5e3920011b 100644
Binary files a/public/images/emoji/apple/family_women_boys.png and b/public/images/emoji/apple/family_women_boys.png differ
diff --git a/public/images/emoji/apple/family_women_girl.png b/public/images/emoji/apple/family_women_girl.png
index c71257738d..801e37bf23 100644
Binary files a/public/images/emoji/apple/family_women_girl.png and b/public/images/emoji/apple/family_women_girl.png differ
diff --git a/public/images/emoji/apple/family_women_girl_boy.png b/public/images/emoji/apple/family_women_girl_boy.png
index 85f7db3657..0fc0f444f3 100644
Binary files a/public/images/emoji/apple/family_women_girl_boy.png and b/public/images/emoji/apple/family_women_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_women_girls.png b/public/images/emoji/apple/family_women_girls.png
index aa6768144c..24e50c0eb7 100644
Binary files a/public/images/emoji/apple/family_women_girls.png and b/public/images/emoji/apple/family_women_girls.png differ
diff --git a/public/images/emoji/apple/faroe_islands.png b/public/images/emoji/apple/faroe_islands.png
index d25d24ead6..812e569104 100644
Binary files a/public/images/emoji/apple/faroe_islands.png and b/public/images/emoji/apple/faroe_islands.png differ
diff --git a/public/images/emoji/apple/fast_forward.png b/public/images/emoji/apple/fast_forward.png
index b572d4c18f..f781945539 100644
Binary files a/public/images/emoji/apple/fast_forward.png and b/public/images/emoji/apple/fast_forward.png differ
diff --git a/public/images/emoji/apple/fax.png b/public/images/emoji/apple/fax.png
index 17a81c529a..77545b4d81 100644
Binary files a/public/images/emoji/apple/fax.png and b/public/images/emoji/apple/fax.png differ
diff --git a/public/images/emoji/apple/fearful.png b/public/images/emoji/apple/fearful.png
index 34420892eb..b0a2ac1b6a 100644
Binary files a/public/images/emoji/apple/fearful.png and b/public/images/emoji/apple/fearful.png differ
diff --git a/public/images/emoji/apple/feet.png b/public/images/emoji/apple/feet.png
index 90e0440afc..bad02e9cc2 100644
Binary files a/public/images/emoji/apple/feet.png and b/public/images/emoji/apple/feet.png differ
diff --git a/public/images/emoji/apple/female_couple_with_heart.png b/public/images/emoji/apple/female_couple_with_heart.png
index 8f924c75cf..235ec695f5 100644
Binary files a/public/images/emoji/apple/female_couple_with_heart.png and b/public/images/emoji/apple/female_couple_with_heart.png differ
diff --git a/public/images/emoji/apple/female_couplekiss.png b/public/images/emoji/apple/female_couplekiss.png
index 13d6801c47..8c1d3f6e06 100644
Binary files a/public/images/emoji/apple/female_couplekiss.png and b/public/images/emoji/apple/female_couplekiss.png differ
diff --git a/public/images/emoji/apple/female_detective.png b/public/images/emoji/apple/female_detective.png
index 975fdf28c9..a8f0cbdeb4 100644
Binary files a/public/images/emoji/apple/female_detective.png and b/public/images/emoji/apple/female_detective.png differ
diff --git a/public/images/emoji/apple/ferris_wheel.png b/public/images/emoji/apple/ferris_wheel.png
index a7e1395cad..e54cc631d2 100644
Binary files a/public/images/emoji/apple/ferris_wheel.png and b/public/images/emoji/apple/ferris_wheel.png differ
diff --git a/public/images/emoji/apple/ferry.png b/public/images/emoji/apple/ferry.png
index ee0b0e5e7a..6b24c9fe36 100644
Binary files a/public/images/emoji/apple/ferry.png and b/public/images/emoji/apple/ferry.png differ
diff --git a/public/images/emoji/apple/field_hockey.png b/public/images/emoji/apple/field_hockey.png
index bccfae6657..3e49a88112 100644
Binary files a/public/images/emoji/apple/field_hockey.png and b/public/images/emoji/apple/field_hockey.png differ
diff --git a/public/images/emoji/apple/fiji.png b/public/images/emoji/apple/fiji.png
index ed75e1a7db..a56201ab0b 100644
Binary files a/public/images/emoji/apple/fiji.png and b/public/images/emoji/apple/fiji.png differ
diff --git a/public/images/emoji/apple/file_cabinet.png b/public/images/emoji/apple/file_cabinet.png
index 0f2f79c9db..ae6420b59f 100644
Binary files a/public/images/emoji/apple/file_cabinet.png and b/public/images/emoji/apple/file_cabinet.png differ
diff --git a/public/images/emoji/apple/file_folder.png b/public/images/emoji/apple/file_folder.png
index bc88b6c48c..1be274369b 100644
Binary files a/public/images/emoji/apple/file_folder.png and b/public/images/emoji/apple/file_folder.png differ
diff --git a/public/images/emoji/apple/film_frames.png b/public/images/emoji/apple/film_frames.png
index 043221da53..51fe33e92b 100644
Binary files a/public/images/emoji/apple/film_frames.png and b/public/images/emoji/apple/film_frames.png differ
diff --git a/public/images/emoji/apple/film_projector.png b/public/images/emoji/apple/film_projector.png
index add4400d04..4d9c61a844 100644
Binary files a/public/images/emoji/apple/film_projector.png and b/public/images/emoji/apple/film_projector.png differ
diff --git a/public/images/emoji/apple/film_strip.png b/public/images/emoji/apple/film_strip.png
index 043221da53..51fe33e92b 100644
Binary files a/public/images/emoji/apple/film_strip.png and b/public/images/emoji/apple/film_strip.png differ
diff --git a/public/images/emoji/apple/finland.png b/public/images/emoji/apple/finland.png
index 89e088c584..155cfcafaa 100644
Binary files a/public/images/emoji/apple/finland.png and b/public/images/emoji/apple/finland.png differ
diff --git a/public/images/emoji/apple/fire.png b/public/images/emoji/apple/fire.png
index a82ae1ee4f..6766a6a03a 100644
Binary files a/public/images/emoji/apple/fire.png and b/public/images/emoji/apple/fire.png differ
diff --git a/public/images/emoji/apple/fire_engine.png b/public/images/emoji/apple/fire_engine.png
index 40552da1e8..937d10e643 100644
Binary files a/public/images/emoji/apple/fire_engine.png and b/public/images/emoji/apple/fire_engine.png differ
diff --git a/public/images/emoji/apple/fireworks.png b/public/images/emoji/apple/fireworks.png
index de37ce8bcf..869c643a3d 100644
Binary files a/public/images/emoji/apple/fireworks.png and b/public/images/emoji/apple/fireworks.png differ
diff --git a/public/images/emoji/apple/first_quarter_moon.png b/public/images/emoji/apple/first_quarter_moon.png
index c7f8ed43b5..a0c459324c 100644
Binary files a/public/images/emoji/apple/first_quarter_moon.png and b/public/images/emoji/apple/first_quarter_moon.png differ
diff --git a/public/images/emoji/apple/first_quarter_moon_with_face.png b/public/images/emoji/apple/first_quarter_moon_with_face.png
index dc0c46be80..99a89685df 100644
Binary files a/public/images/emoji/apple/first_quarter_moon_with_face.png and b/public/images/emoji/apple/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/apple/fish.png b/public/images/emoji/apple/fish.png
index 0a927f8202..5b34d2c822 100644
Binary files a/public/images/emoji/apple/fish.png and b/public/images/emoji/apple/fish.png differ
diff --git a/public/images/emoji/apple/fish_cake.png b/public/images/emoji/apple/fish_cake.png
index 2babbb0dd9..ae44c470a2 100644
Binary files a/public/images/emoji/apple/fish_cake.png and b/public/images/emoji/apple/fish_cake.png differ
diff --git a/public/images/emoji/apple/fishing_pole_and_fish.png b/public/images/emoji/apple/fishing_pole_and_fish.png
index cdece2b307..b2ce8db7b9 100644
Binary files a/public/images/emoji/apple/fishing_pole_and_fish.png and b/public/images/emoji/apple/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/apple/fist.png b/public/images/emoji/apple/fist.png
index 354355676d..497ac5a113 100644
Binary files a/public/images/emoji/apple/fist.png and b/public/images/emoji/apple/fist.png differ
diff --git a/public/images/emoji/apple/fist/2.png b/public/images/emoji/apple/fist/2.png
index 56285b20a8..0a6dc730a1 100644
Binary files a/public/images/emoji/apple/fist/2.png and b/public/images/emoji/apple/fist/2.png differ
diff --git a/public/images/emoji/apple/fist/3.png b/public/images/emoji/apple/fist/3.png
index 6540764590..7c61c61351 100644
Binary files a/public/images/emoji/apple/fist/3.png and b/public/images/emoji/apple/fist/3.png differ
diff --git a/public/images/emoji/apple/fist/4.png b/public/images/emoji/apple/fist/4.png
index 1ab8f2389d..cfa2acf254 100644
Binary files a/public/images/emoji/apple/fist/4.png and b/public/images/emoji/apple/fist/4.png differ
diff --git a/public/images/emoji/apple/fist/5.png b/public/images/emoji/apple/fist/5.png
index 59bf4d8663..bf60474f06 100644
Binary files a/public/images/emoji/apple/fist/5.png and b/public/images/emoji/apple/fist/5.png differ
diff --git a/public/images/emoji/apple/fist/6.png b/public/images/emoji/apple/fist/6.png
index 8f30f67936..0e2555e956 100644
Binary files a/public/images/emoji/apple/fist/6.png and b/public/images/emoji/apple/fist/6.png differ
diff --git a/public/images/emoji/apple/fist_left.png b/public/images/emoji/apple/fist_left.png
index e42595f193..64de1b45c8 100644
Binary files a/public/images/emoji/apple/fist_left.png and b/public/images/emoji/apple/fist_left.png differ
diff --git a/public/images/emoji/apple/fist_left/2.png b/public/images/emoji/apple/fist_left/2.png
index 82e6f4dc74..9c7ecd46cc 100644
Binary files a/public/images/emoji/apple/fist_left/2.png and b/public/images/emoji/apple/fist_left/2.png differ
diff --git a/public/images/emoji/apple/fist_left/3.png b/public/images/emoji/apple/fist_left/3.png
index b478c30cbe..bbdc7da3b7 100644
Binary files a/public/images/emoji/apple/fist_left/3.png and b/public/images/emoji/apple/fist_left/3.png differ
diff --git a/public/images/emoji/apple/fist_left/4.png b/public/images/emoji/apple/fist_left/4.png
index c8784ff961..3a3c35f78d 100644
Binary files a/public/images/emoji/apple/fist_left/4.png and b/public/images/emoji/apple/fist_left/4.png differ
diff --git a/public/images/emoji/apple/fist_left/5.png b/public/images/emoji/apple/fist_left/5.png
index 4fa222dcf9..d4e6d5e749 100644
Binary files a/public/images/emoji/apple/fist_left/5.png and b/public/images/emoji/apple/fist_left/5.png differ
diff --git a/public/images/emoji/apple/fist_left/6.png b/public/images/emoji/apple/fist_left/6.png
index 8b21664f07..0bd860ae71 100644
Binary files a/public/images/emoji/apple/fist_left/6.png and b/public/images/emoji/apple/fist_left/6.png differ
diff --git a/public/images/emoji/apple/fist_right.png b/public/images/emoji/apple/fist_right.png
index 297aca7b8f..9d3a9c82d8 100644
Binary files a/public/images/emoji/apple/fist_right.png and b/public/images/emoji/apple/fist_right.png differ
diff --git a/public/images/emoji/apple/fist_right/2.png b/public/images/emoji/apple/fist_right/2.png
index ca9bd453dc..341f08a0bd 100644
Binary files a/public/images/emoji/apple/fist_right/2.png and b/public/images/emoji/apple/fist_right/2.png differ
diff --git a/public/images/emoji/apple/fist_right/3.png b/public/images/emoji/apple/fist_right/3.png
index e95c238d06..0b8bf83999 100644
Binary files a/public/images/emoji/apple/fist_right/3.png and b/public/images/emoji/apple/fist_right/3.png differ
diff --git a/public/images/emoji/apple/fist_right/4.png b/public/images/emoji/apple/fist_right/4.png
index 787f7fdd80..aa08ed55f5 100644
Binary files a/public/images/emoji/apple/fist_right/4.png and b/public/images/emoji/apple/fist_right/4.png differ
diff --git a/public/images/emoji/apple/fist_right/5.png b/public/images/emoji/apple/fist_right/5.png
index a32f3128f8..896e23bd93 100644
Binary files a/public/images/emoji/apple/fist_right/5.png and b/public/images/emoji/apple/fist_right/5.png differ
diff --git a/public/images/emoji/apple/fist_right/6.png b/public/images/emoji/apple/fist_right/6.png
index ca7be414ac..b783d59ea4 100644
Binary files a/public/images/emoji/apple/fist_right/6.png and b/public/images/emoji/apple/fist_right/6.png differ
diff --git a/public/images/emoji/apple/five.png b/public/images/emoji/apple/five.png
index 5c85432a26..89931ad9f3 100644
Binary files a/public/images/emoji/apple/five.png and b/public/images/emoji/apple/five.png differ
diff --git a/public/images/emoji/apple/flag_black.png b/public/images/emoji/apple/flag_black.png
index 36a0a6987d..b8815fb9c2 100644
Binary files a/public/images/emoji/apple/flag_black.png and b/public/images/emoji/apple/flag_black.png differ
diff --git a/public/images/emoji/apple/flag_cn.png b/public/images/emoji/apple/flag_cn.png
index 9c969f94c5..6bf42b037d 100644
Binary files a/public/images/emoji/apple/flag_cn.png and b/public/images/emoji/apple/flag_cn.png differ
diff --git a/public/images/emoji/apple/flag_de.png b/public/images/emoji/apple/flag_de.png
index e732741286..26cd6aefef 100644
Binary files a/public/images/emoji/apple/flag_de.png and b/public/images/emoji/apple/flag_de.png differ
diff --git a/public/images/emoji/apple/flag_es.png b/public/images/emoji/apple/flag_es.png
index 8fca1f0390..73e3231afb 100644
Binary files a/public/images/emoji/apple/flag_es.png and b/public/images/emoji/apple/flag_es.png differ
diff --git a/public/images/emoji/apple/flag_fr.png b/public/images/emoji/apple/flag_fr.png
index efcd5fff75..37c587fd61 100644
Binary files a/public/images/emoji/apple/flag_fr.png and b/public/images/emoji/apple/flag_fr.png differ
diff --git a/public/images/emoji/apple/flag_gb.png b/public/images/emoji/apple/flag_gb.png
index 1d15d6cb96..4ca275e08f 100644
Binary files a/public/images/emoji/apple/flag_gb.png and b/public/images/emoji/apple/flag_gb.png differ
diff --git a/public/images/emoji/apple/flag_it.png b/public/images/emoji/apple/flag_it.png
index 0e5bc29dad..32b426d8aa 100644
Binary files a/public/images/emoji/apple/flag_it.png and b/public/images/emoji/apple/flag_it.png differ
diff --git a/public/images/emoji/apple/flag_jp.png b/public/images/emoji/apple/flag_jp.png
index 4462748e58..ae7398cb37 100644
Binary files a/public/images/emoji/apple/flag_jp.png and b/public/images/emoji/apple/flag_jp.png differ
diff --git a/public/images/emoji/apple/flag_kr.png b/public/images/emoji/apple/flag_kr.png
index d63cf96b43..36cdb61482 100644
Binary files a/public/images/emoji/apple/flag_kr.png and b/public/images/emoji/apple/flag_kr.png differ
diff --git a/public/images/emoji/apple/flag_ru.png b/public/images/emoji/apple/flag_ru.png
index ebd82f4a52..f5ca16dd7a 100644
Binary files a/public/images/emoji/apple/flag_ru.png and b/public/images/emoji/apple/flag_ru.png differ
diff --git a/public/images/emoji/apple/flag_us.png b/public/images/emoji/apple/flag_us.png
index 64a5e528d9..cc5a722bc7 100644
Binary files a/public/images/emoji/apple/flag_us.png and b/public/images/emoji/apple/flag_us.png differ
diff --git a/public/images/emoji/apple/flag_white.png b/public/images/emoji/apple/flag_white.png
index 16ed8e6169..6f9b833d7e 100644
Binary files a/public/images/emoji/apple/flag_white.png and b/public/images/emoji/apple/flag_white.png differ
diff --git a/public/images/emoji/apple/flags.png b/public/images/emoji/apple/flags.png
index 30d7cf3070..3059d72017 100644
Binary files a/public/images/emoji/apple/flags.png and b/public/images/emoji/apple/flags.png differ
diff --git a/public/images/emoji/apple/flame.png b/public/images/emoji/apple/flame.png
index a82ae1ee4f..6766a6a03a 100644
Binary files a/public/images/emoji/apple/flame.png and b/public/images/emoji/apple/flame.png differ
diff --git a/public/images/emoji/apple/flashlight.png b/public/images/emoji/apple/flashlight.png
index 0bc1f97f79..5eb3b03390 100644
Binary files a/public/images/emoji/apple/flashlight.png and b/public/images/emoji/apple/flashlight.png differ
diff --git a/public/images/emoji/apple/fleur-de-lis.png b/public/images/emoji/apple/fleur-de-lis.png
index d0cf7fc227..d899bb6656 100644
Binary files a/public/images/emoji/apple/fleur-de-lis.png and b/public/images/emoji/apple/fleur-de-lis.png differ
diff --git a/public/images/emoji/apple/fleur_de_lis.png b/public/images/emoji/apple/fleur_de_lis.png
index d0cf7fc227..d899bb6656 100644
Binary files a/public/images/emoji/apple/fleur_de_lis.png and b/public/images/emoji/apple/fleur_de_lis.png differ
diff --git a/public/images/emoji/apple/flight_arrival.png b/public/images/emoji/apple/flight_arrival.png
index c716ff2186..2482df5243 100644
Binary files a/public/images/emoji/apple/flight_arrival.png and b/public/images/emoji/apple/flight_arrival.png differ
diff --git a/public/images/emoji/apple/flight_departure.png b/public/images/emoji/apple/flight_departure.png
index d1fcea18b8..181c554b8c 100644
Binary files a/public/images/emoji/apple/flight_departure.png and b/public/images/emoji/apple/flight_departure.png differ
diff --git a/public/images/emoji/apple/floppy_disk.png b/public/images/emoji/apple/floppy_disk.png
index 75b06ec087..680d1ee534 100644
Binary files a/public/images/emoji/apple/floppy_disk.png and b/public/images/emoji/apple/floppy_disk.png differ
diff --git a/public/images/emoji/apple/flower_playing_cards.png b/public/images/emoji/apple/flower_playing_cards.png
index e3db650f43..b6b1e03578 100644
Binary files a/public/images/emoji/apple/flower_playing_cards.png and b/public/images/emoji/apple/flower_playing_cards.png differ
diff --git a/public/images/emoji/apple/flushed.png b/public/images/emoji/apple/flushed.png
index a67fccb60e..be569f9ebd 100644
Binary files a/public/images/emoji/apple/flushed.png and b/public/images/emoji/apple/flushed.png differ
diff --git a/public/images/emoji/apple/flying_saucer.png b/public/images/emoji/apple/flying_saucer.png
index 7d5c862855..7d7d9166f9 100644
Binary files a/public/images/emoji/apple/flying_saucer.png and b/public/images/emoji/apple/flying_saucer.png differ
diff --git a/public/images/emoji/apple/fog.png b/public/images/emoji/apple/fog.png
index 7dd185d50f..4c02ed27ad 100644
Binary files a/public/images/emoji/apple/fog.png and b/public/images/emoji/apple/fog.png differ
diff --git a/public/images/emoji/apple/foggy.png b/public/images/emoji/apple/foggy.png
index 32200d7f8e..2c6972ccb4 100644
Binary files a/public/images/emoji/apple/foggy.png and b/public/images/emoji/apple/foggy.png differ
diff --git a/public/images/emoji/apple/football.png b/public/images/emoji/apple/football.png
index 40a806bd97..c600402e76 100644
Binary files a/public/images/emoji/apple/football.png and b/public/images/emoji/apple/football.png differ
diff --git a/public/images/emoji/apple/footprints.png b/public/images/emoji/apple/footprints.png
index 90e0440afc..bad02e9cc2 100644
Binary files a/public/images/emoji/apple/footprints.png and b/public/images/emoji/apple/footprints.png differ
diff --git a/public/images/emoji/apple/fork_and_knife.png b/public/images/emoji/apple/fork_and_knife.png
index a01e82ebcf..c3bdba3f62 100644
Binary files a/public/images/emoji/apple/fork_and_knife.png and b/public/images/emoji/apple/fork_and_knife.png differ
diff --git a/public/images/emoji/apple/fork_and_knife_with_plate.png b/public/images/emoji/apple/fork_and_knife_with_plate.png
index 54bd5dc10a..98353aca87 100644
Binary files a/public/images/emoji/apple/fork_and_knife_with_plate.png and b/public/images/emoji/apple/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/apple/fork_knife_plate.png b/public/images/emoji/apple/fork_knife_plate.png
index 54bd5dc10a..98353aca87 100644
Binary files a/public/images/emoji/apple/fork_knife_plate.png and b/public/images/emoji/apple/fork_knife_plate.png differ
diff --git a/public/images/emoji/apple/fortune_cookie.png b/public/images/emoji/apple/fortune_cookie.png
index 94a8cdca40..67f0d2ac19 100644
Binary files a/public/images/emoji/apple/fortune_cookie.png and b/public/images/emoji/apple/fortune_cookie.png differ
diff --git a/public/images/emoji/apple/fountain.png b/public/images/emoji/apple/fountain.png
index c6fa8ddb0c..e584ea2a1f 100644
Binary files a/public/images/emoji/apple/fountain.png and b/public/images/emoji/apple/fountain.png differ
diff --git a/public/images/emoji/apple/fountain_pen.png b/public/images/emoji/apple/fountain_pen.png
index a9a947848d..b224d353a9 100644
Binary files a/public/images/emoji/apple/fountain_pen.png and b/public/images/emoji/apple/fountain_pen.png differ
diff --git a/public/images/emoji/apple/four.png b/public/images/emoji/apple/four.png
index 3800d04076..059799c7b7 100644
Binary files a/public/images/emoji/apple/four.png and b/public/images/emoji/apple/four.png differ
diff --git a/public/images/emoji/apple/four_leaf_clover.png b/public/images/emoji/apple/four_leaf_clover.png
index 48483d4c4c..ec2eaaa3ba 100644
Binary files a/public/images/emoji/apple/four_leaf_clover.png and b/public/images/emoji/apple/four_leaf_clover.png differ
diff --git a/public/images/emoji/apple/fox_face.png b/public/images/emoji/apple/fox_face.png
index d07aefd842..e2c58392f9 100644
Binary files a/public/images/emoji/apple/fox_face.png and b/public/images/emoji/apple/fox_face.png differ
diff --git a/public/images/emoji/apple/fr.png b/public/images/emoji/apple/fr.png
index efcd5fff75..37c587fd61 100644
Binary files a/public/images/emoji/apple/fr.png and b/public/images/emoji/apple/fr.png differ
diff --git a/public/images/emoji/apple/frame_photo.png b/public/images/emoji/apple/frame_photo.png
index aaca2338d6..f81289020d 100644
Binary files a/public/images/emoji/apple/frame_photo.png and b/public/images/emoji/apple/frame_photo.png differ
diff --git a/public/images/emoji/apple/frame_with_picture.png b/public/images/emoji/apple/frame_with_picture.png
index aaca2338d6..f81289020d 100644
Binary files a/public/images/emoji/apple/frame_with_picture.png and b/public/images/emoji/apple/frame_with_picture.png differ
diff --git a/public/images/emoji/apple/framed_picture.png b/public/images/emoji/apple/framed_picture.png
index aaca2338d6..f81289020d 100644
Binary files a/public/images/emoji/apple/framed_picture.png and b/public/images/emoji/apple/framed_picture.png differ
diff --git a/public/images/emoji/apple/free.png b/public/images/emoji/apple/free.png
index 846f230e27..0835423a1c 100644
Binary files a/public/images/emoji/apple/free.png and b/public/images/emoji/apple/free.png differ
diff --git a/public/images/emoji/apple/french_guiana.png b/public/images/emoji/apple/french_guiana.png
index a816d9029b..8da07cbeb2 100644
Binary files a/public/images/emoji/apple/french_guiana.png and b/public/images/emoji/apple/french_guiana.png differ
diff --git a/public/images/emoji/apple/french_polynesia.png b/public/images/emoji/apple/french_polynesia.png
index 995998a816..d932500ce0 100644
Binary files a/public/images/emoji/apple/french_polynesia.png and b/public/images/emoji/apple/french_polynesia.png differ
diff --git a/public/images/emoji/apple/french_southern_territories.png b/public/images/emoji/apple/french_southern_territories.png
index a80ba97496..bff3784fed 100644
Binary files a/public/images/emoji/apple/french_southern_territories.png and b/public/images/emoji/apple/french_southern_territories.png differ
diff --git a/public/images/emoji/apple/fried_egg.png b/public/images/emoji/apple/fried_egg.png
index 3479598fdc..69fb1e82bf 100644
Binary files a/public/images/emoji/apple/fried_egg.png and b/public/images/emoji/apple/fried_egg.png differ
diff --git a/public/images/emoji/apple/fried_shrimp.png b/public/images/emoji/apple/fried_shrimp.png
index b72fcc4d8d..8a966397c3 100644
Binary files a/public/images/emoji/apple/fried_shrimp.png and b/public/images/emoji/apple/fried_shrimp.png differ
diff --git a/public/images/emoji/apple/fries.png b/public/images/emoji/apple/fries.png
index a0c633dab4..d58fffde60 100644
Binary files a/public/images/emoji/apple/fries.png and b/public/images/emoji/apple/fries.png differ
diff --git a/public/images/emoji/apple/frog.png b/public/images/emoji/apple/frog.png
index 2143534e9a..61a58c287d 100644
Binary files a/public/images/emoji/apple/frog.png and b/public/images/emoji/apple/frog.png differ
diff --git a/public/images/emoji/apple/frowning.png b/public/images/emoji/apple/frowning.png
index b890f3162a..ee6463c8ff 100644
Binary files a/public/images/emoji/apple/frowning.png and b/public/images/emoji/apple/frowning.png differ
diff --git a/public/images/emoji/apple/frowning2.png b/public/images/emoji/apple/frowning2.png
index ad1715f8a4..cbac2e6098 100644
Binary files a/public/images/emoji/apple/frowning2.png and b/public/images/emoji/apple/frowning2.png differ
diff --git a/public/images/emoji/apple/frowning_face.png b/public/images/emoji/apple/frowning_face.png
index ad1715f8a4..cbac2e6098 100644
Binary files a/public/images/emoji/apple/frowning_face.png and b/public/images/emoji/apple/frowning_face.png differ
diff --git a/public/images/emoji/apple/frowning_man.png b/public/images/emoji/apple/frowning_man.png
index 3beb9a2f2d..b19574dc2a 100644
Binary files a/public/images/emoji/apple/frowning_man.png and b/public/images/emoji/apple/frowning_man.png differ
diff --git a/public/images/emoji/apple/frowning_man/2.png b/public/images/emoji/apple/frowning_man/2.png
index 8081a99c5f..dad772404f 100644
Binary files a/public/images/emoji/apple/frowning_man/2.png and b/public/images/emoji/apple/frowning_man/2.png differ
diff --git a/public/images/emoji/apple/frowning_man/3.png b/public/images/emoji/apple/frowning_man/3.png
index 515f0a219b..c640ba84e9 100644
Binary files a/public/images/emoji/apple/frowning_man/3.png and b/public/images/emoji/apple/frowning_man/3.png differ
diff --git a/public/images/emoji/apple/frowning_man/4.png b/public/images/emoji/apple/frowning_man/4.png
index 6d12858131..23670674dc 100644
Binary files a/public/images/emoji/apple/frowning_man/4.png and b/public/images/emoji/apple/frowning_man/4.png differ
diff --git a/public/images/emoji/apple/frowning_man/5.png b/public/images/emoji/apple/frowning_man/5.png
index 95d1122106..393775c6a6 100644
Binary files a/public/images/emoji/apple/frowning_man/5.png and b/public/images/emoji/apple/frowning_man/5.png differ
diff --git a/public/images/emoji/apple/frowning_man/6.png b/public/images/emoji/apple/frowning_man/6.png
index d1282dd94b..634a0221b9 100644
Binary files a/public/images/emoji/apple/frowning_man/6.png and b/public/images/emoji/apple/frowning_man/6.png differ
diff --git a/public/images/emoji/apple/frowning_woman.png b/public/images/emoji/apple/frowning_woman.png
index d06a0aa733..62658226ba 100644
Binary files a/public/images/emoji/apple/frowning_woman.png and b/public/images/emoji/apple/frowning_woman.png differ
diff --git a/public/images/emoji/apple/frowning_woman/2.png b/public/images/emoji/apple/frowning_woman/2.png
index aa34de2094..181f2aef8f 100644
Binary files a/public/images/emoji/apple/frowning_woman/2.png and b/public/images/emoji/apple/frowning_woman/2.png differ
diff --git a/public/images/emoji/apple/frowning_woman/3.png b/public/images/emoji/apple/frowning_woman/3.png
index 638e52f05c..b9447acf56 100644
Binary files a/public/images/emoji/apple/frowning_woman/3.png and b/public/images/emoji/apple/frowning_woman/3.png differ
diff --git a/public/images/emoji/apple/frowning_woman/4.png b/public/images/emoji/apple/frowning_woman/4.png
index 25be6800ca..2a738ec5a5 100644
Binary files a/public/images/emoji/apple/frowning_woman/4.png and b/public/images/emoji/apple/frowning_woman/4.png differ
diff --git a/public/images/emoji/apple/frowning_woman/5.png b/public/images/emoji/apple/frowning_woman/5.png
index b9efb3d134..cb47086cca 100644
Binary files a/public/images/emoji/apple/frowning_woman/5.png and b/public/images/emoji/apple/frowning_woman/5.png differ
diff --git a/public/images/emoji/apple/frowning_woman/6.png b/public/images/emoji/apple/frowning_woman/6.png
index f5485b2843..5e5be81f83 100644
Binary files a/public/images/emoji/apple/frowning_woman/6.png and b/public/images/emoji/apple/frowning_woman/6.png differ
diff --git a/public/images/emoji/apple/fu.png b/public/images/emoji/apple/fu.png
index e869cf97d1..1ca0197644 100644
Binary files a/public/images/emoji/apple/fu.png and b/public/images/emoji/apple/fu.png differ
diff --git a/public/images/emoji/apple/fu/2.png b/public/images/emoji/apple/fu/2.png
index ce95c6a8be..b6868ba362 100644
Binary files a/public/images/emoji/apple/fu/2.png and b/public/images/emoji/apple/fu/2.png differ
diff --git a/public/images/emoji/apple/fu/3.png b/public/images/emoji/apple/fu/3.png
index 33eec03fd4..0a2e09e996 100644
Binary files a/public/images/emoji/apple/fu/3.png and b/public/images/emoji/apple/fu/3.png differ
diff --git a/public/images/emoji/apple/fu/4.png b/public/images/emoji/apple/fu/4.png
index 1048765292..0b45f9c3f1 100644
Binary files a/public/images/emoji/apple/fu/4.png and b/public/images/emoji/apple/fu/4.png differ
diff --git a/public/images/emoji/apple/fu/5.png b/public/images/emoji/apple/fu/5.png
index 6f577d03de..41a3a0dc0c 100644
Binary files a/public/images/emoji/apple/fu/5.png and b/public/images/emoji/apple/fu/5.png differ
diff --git a/public/images/emoji/apple/fu/6.png b/public/images/emoji/apple/fu/6.png
index 58349f45b1..a8a0694971 100644
Binary files a/public/images/emoji/apple/fu/6.png and b/public/images/emoji/apple/fu/6.png differ
diff --git a/public/images/emoji/apple/fuelpump.png b/public/images/emoji/apple/fuelpump.png
index 67faaf9884..b60c4d542d 100644
Binary files a/public/images/emoji/apple/fuelpump.png and b/public/images/emoji/apple/fuelpump.png differ
diff --git a/public/images/emoji/apple/full_moon.png b/public/images/emoji/apple/full_moon.png
index 749787daeb..fda4f4aac5 100644
Binary files a/public/images/emoji/apple/full_moon.png and b/public/images/emoji/apple/full_moon.png differ
diff --git a/public/images/emoji/apple/full_moon_with_face.png b/public/images/emoji/apple/full_moon_with_face.png
index 54a7f73dc7..174292b7a5 100644
Binary files a/public/images/emoji/apple/full_moon_with_face.png and b/public/images/emoji/apple/full_moon_with_face.png differ
diff --git a/public/images/emoji/apple/funeral_urn.png b/public/images/emoji/apple/funeral_urn.png
index d1af59ed33..26b206c156 100644
Binary files a/public/images/emoji/apple/funeral_urn.png and b/public/images/emoji/apple/funeral_urn.png differ
diff --git a/public/images/emoji/apple/gabon.png b/public/images/emoji/apple/gabon.png
index b32827cd18..ed1a37b362 100644
Binary files a/public/images/emoji/apple/gabon.png and b/public/images/emoji/apple/gabon.png differ
diff --git a/public/images/emoji/apple/gambia.png b/public/images/emoji/apple/gambia.png
index ea03e0abda..6cf4983143 100644
Binary files a/public/images/emoji/apple/gambia.png and b/public/images/emoji/apple/gambia.png differ
diff --git a/public/images/emoji/apple/game_die.png b/public/images/emoji/apple/game_die.png
index 9a7763f542..550581bbf5 100644
Binary files a/public/images/emoji/apple/game_die.png and b/public/images/emoji/apple/game_die.png differ
diff --git a/public/images/emoji/apple/gb.png b/public/images/emoji/apple/gb.png
index 1d15d6cb96..4ca275e08f 100644
Binary files a/public/images/emoji/apple/gb.png and b/public/images/emoji/apple/gb.png differ
diff --git a/public/images/emoji/apple/gear.png b/public/images/emoji/apple/gear.png
index 8c3241117f..e2f218a123 100644
Binary files a/public/images/emoji/apple/gear.png and b/public/images/emoji/apple/gear.png differ
diff --git a/public/images/emoji/apple/gem.png b/public/images/emoji/apple/gem.png
index ab538189b4..2ae088cfe6 100644
Binary files a/public/images/emoji/apple/gem.png and b/public/images/emoji/apple/gem.png differ
diff --git a/public/images/emoji/apple/gemini.png b/public/images/emoji/apple/gemini.png
index c9ad704d3c..6595d70b8c 100644
Binary files a/public/images/emoji/apple/gemini.png and b/public/images/emoji/apple/gemini.png differ
diff --git a/public/images/emoji/apple/genie.png b/public/images/emoji/apple/genie.png
index f0eddcc91a..e5cc01cef4 100644
Binary files a/public/images/emoji/apple/genie.png and b/public/images/emoji/apple/genie.png differ
diff --git a/public/images/emoji/apple/georgia.png b/public/images/emoji/apple/georgia.png
index 9dc6417dee..c97dcfbf5e 100644
Binary files a/public/images/emoji/apple/georgia.png and b/public/images/emoji/apple/georgia.png differ
diff --git a/public/images/emoji/apple/ghana.png b/public/images/emoji/apple/ghana.png
index aa8883b16b..f1292a69b3 100644
Binary files a/public/images/emoji/apple/ghana.png and b/public/images/emoji/apple/ghana.png differ
diff --git a/public/images/emoji/apple/ghost.png b/public/images/emoji/apple/ghost.png
index 76c779eea0..39e4a69fc2 100644
Binary files a/public/images/emoji/apple/ghost.png and b/public/images/emoji/apple/ghost.png differ
diff --git a/public/images/emoji/apple/gibraltar.png b/public/images/emoji/apple/gibraltar.png
index 9842b9f5fd..e05478799a 100644
Binary files a/public/images/emoji/apple/gibraltar.png and b/public/images/emoji/apple/gibraltar.png differ
diff --git a/public/images/emoji/apple/gift.png b/public/images/emoji/apple/gift.png
index 1618c5808c..a08c71076c 100644
Binary files a/public/images/emoji/apple/gift.png and b/public/images/emoji/apple/gift.png differ
diff --git a/public/images/emoji/apple/gift_heart.png b/public/images/emoji/apple/gift_heart.png
index 5967ff8ddc..813c7ff57f 100644
Binary files a/public/images/emoji/apple/gift_heart.png and b/public/images/emoji/apple/gift_heart.png differ
diff --git a/public/images/emoji/apple/giraffe.png b/public/images/emoji/apple/giraffe.png
index be0e85d289..f991d10bce 100644
Binary files a/public/images/emoji/apple/giraffe.png and b/public/images/emoji/apple/giraffe.png differ
diff --git a/public/images/emoji/apple/girl.png b/public/images/emoji/apple/girl.png
index 43cddda1d3..6454d4173e 100644
Binary files a/public/images/emoji/apple/girl.png and b/public/images/emoji/apple/girl.png differ
diff --git a/public/images/emoji/apple/girl/2.png b/public/images/emoji/apple/girl/2.png
index fd19994a6b..c17924ba84 100644
Binary files a/public/images/emoji/apple/girl/2.png and b/public/images/emoji/apple/girl/2.png differ
diff --git a/public/images/emoji/apple/girl/3.png b/public/images/emoji/apple/girl/3.png
index 486cfee579..909cab31e0 100644
Binary files a/public/images/emoji/apple/girl/3.png and b/public/images/emoji/apple/girl/3.png differ
diff --git a/public/images/emoji/apple/girl/4.png b/public/images/emoji/apple/girl/4.png
index 2e4bb4b243..26ce9f3262 100644
Binary files a/public/images/emoji/apple/girl/4.png and b/public/images/emoji/apple/girl/4.png differ
diff --git a/public/images/emoji/apple/girl/5.png b/public/images/emoji/apple/girl/5.png
index 1c984843ba..fcde0a9da9 100644
Binary files a/public/images/emoji/apple/girl/5.png and b/public/images/emoji/apple/girl/5.png differ
diff --git a/public/images/emoji/apple/girl/6.png b/public/images/emoji/apple/girl/6.png
index 66a87a8008..27070f700e 100644
Binary files a/public/images/emoji/apple/girl/6.png and b/public/images/emoji/apple/girl/6.png differ
diff --git a/public/images/emoji/apple/globe_with_meridians.png b/public/images/emoji/apple/globe_with_meridians.png
index 8b868ee5e5..f60969803f 100644
Binary files a/public/images/emoji/apple/globe_with_meridians.png and b/public/images/emoji/apple/globe_with_meridians.png differ
diff --git a/public/images/emoji/apple/gloves.png b/public/images/emoji/apple/gloves.png
index 1a11dd2c56..5539116fed 100644
Binary files a/public/images/emoji/apple/gloves.png and b/public/images/emoji/apple/gloves.png differ
diff --git a/public/images/emoji/apple/goal_net.png b/public/images/emoji/apple/goal_net.png
index 1c27b02c4d..c059356c96 100644
Binary files a/public/images/emoji/apple/goal_net.png and b/public/images/emoji/apple/goal_net.png differ
diff --git a/public/images/emoji/apple/goat.png b/public/images/emoji/apple/goat.png
index 4a261e2527..d9fbb2c309 100644
Binary files a/public/images/emoji/apple/goat.png and b/public/images/emoji/apple/goat.png differ
diff --git a/public/images/emoji/apple/golf.png b/public/images/emoji/apple/golf.png
index 48dcf66863..0a56d9d09e 100644
Binary files a/public/images/emoji/apple/golf.png and b/public/images/emoji/apple/golf.png differ
diff --git a/public/images/emoji/apple/golfer.png b/public/images/emoji/apple/golfer.png
index 4225252a50..89e2004b27 100644
Binary files a/public/images/emoji/apple/golfer.png and b/public/images/emoji/apple/golfer.png differ
diff --git a/public/images/emoji/apple/golfer/2.png b/public/images/emoji/apple/golfer/2.png
index a55b51262b..48d622d338 100644
Binary files a/public/images/emoji/apple/golfer/2.png and b/public/images/emoji/apple/golfer/2.png differ
diff --git a/public/images/emoji/apple/golfer/3.png b/public/images/emoji/apple/golfer/3.png
index 490cdfe84b..df96f3db2c 100644
Binary files a/public/images/emoji/apple/golfer/3.png and b/public/images/emoji/apple/golfer/3.png differ
diff --git a/public/images/emoji/apple/golfer/4.png b/public/images/emoji/apple/golfer/4.png
index 5600715526..6a488c2f55 100644
Binary files a/public/images/emoji/apple/golfer/4.png and b/public/images/emoji/apple/golfer/4.png differ
diff --git a/public/images/emoji/apple/golfer/5.png b/public/images/emoji/apple/golfer/5.png
index 8218dd5872..ef78687eed 100644
Binary files a/public/images/emoji/apple/golfer/5.png and b/public/images/emoji/apple/golfer/5.png differ
diff --git a/public/images/emoji/apple/golfer/6.png b/public/images/emoji/apple/golfer/6.png
index 7f863e40dc..200a8fff6e 100644
Binary files a/public/images/emoji/apple/golfer/6.png and b/public/images/emoji/apple/golfer/6.png differ
diff --git a/public/images/emoji/apple/golfing_man.png b/public/images/emoji/apple/golfing_man.png
index 4225252a50..89e2004b27 100644
Binary files a/public/images/emoji/apple/golfing_man.png and b/public/images/emoji/apple/golfing_man.png differ
diff --git a/public/images/emoji/apple/golfing_man/2.png b/public/images/emoji/apple/golfing_man/2.png
index a55b51262b..48d622d338 100644
Binary files a/public/images/emoji/apple/golfing_man/2.png and b/public/images/emoji/apple/golfing_man/2.png differ
diff --git a/public/images/emoji/apple/golfing_man/3.png b/public/images/emoji/apple/golfing_man/3.png
index 490cdfe84b..df96f3db2c 100644
Binary files a/public/images/emoji/apple/golfing_man/3.png and b/public/images/emoji/apple/golfing_man/3.png differ
diff --git a/public/images/emoji/apple/golfing_man/4.png b/public/images/emoji/apple/golfing_man/4.png
index 5600715526..6a488c2f55 100644
Binary files a/public/images/emoji/apple/golfing_man/4.png and b/public/images/emoji/apple/golfing_man/4.png differ
diff --git a/public/images/emoji/apple/golfing_man/5.png b/public/images/emoji/apple/golfing_man/5.png
index 8218dd5872..ef78687eed 100644
Binary files a/public/images/emoji/apple/golfing_man/5.png and b/public/images/emoji/apple/golfing_man/5.png differ
diff --git a/public/images/emoji/apple/golfing_man/6.png b/public/images/emoji/apple/golfing_man/6.png
index 7f863e40dc..200a8fff6e 100644
Binary files a/public/images/emoji/apple/golfing_man/6.png and b/public/images/emoji/apple/golfing_man/6.png differ
diff --git a/public/images/emoji/apple/golfing_woman.png b/public/images/emoji/apple/golfing_woman.png
index eaa7e01ed5..f5c52c3e72 100644
Binary files a/public/images/emoji/apple/golfing_woman.png and b/public/images/emoji/apple/golfing_woman.png differ
diff --git a/public/images/emoji/apple/gorilla.png b/public/images/emoji/apple/gorilla.png
index 271b4305bc..d64caff2cf 100644
Binary files a/public/images/emoji/apple/gorilla.png and b/public/images/emoji/apple/gorilla.png differ
diff --git a/public/images/emoji/apple/grandma.png b/public/images/emoji/apple/grandma.png
index 3aa8954a88..3643cb1152 100644
Binary files a/public/images/emoji/apple/grandma.png and b/public/images/emoji/apple/grandma.png differ
diff --git a/public/images/emoji/apple/grandma/2.png b/public/images/emoji/apple/grandma/2.png
index 0338c484a1..df00cc44ae 100644
Binary files a/public/images/emoji/apple/grandma/2.png and b/public/images/emoji/apple/grandma/2.png differ
diff --git a/public/images/emoji/apple/grandma/3.png b/public/images/emoji/apple/grandma/3.png
index eb68885c38..9c4d7e2be0 100644
Binary files a/public/images/emoji/apple/grandma/3.png and b/public/images/emoji/apple/grandma/3.png differ
diff --git a/public/images/emoji/apple/grandma/4.png b/public/images/emoji/apple/grandma/4.png
index b0ec0d5864..82c254aa22 100644
Binary files a/public/images/emoji/apple/grandma/4.png and b/public/images/emoji/apple/grandma/4.png differ
diff --git a/public/images/emoji/apple/grandma/5.png b/public/images/emoji/apple/grandma/5.png
index e9778d3e96..00eb898b52 100644
Binary files a/public/images/emoji/apple/grandma/5.png and b/public/images/emoji/apple/grandma/5.png differ
diff --git a/public/images/emoji/apple/grandma/6.png b/public/images/emoji/apple/grandma/6.png
index af461aed00..1db59fd049 100644
Binary files a/public/images/emoji/apple/grandma/6.png and b/public/images/emoji/apple/grandma/6.png differ
diff --git a/public/images/emoji/apple/grapes.png b/public/images/emoji/apple/grapes.png
index 9578699cd1..94be6997da 100644
Binary files a/public/images/emoji/apple/grapes.png and b/public/images/emoji/apple/grapes.png differ
diff --git a/public/images/emoji/apple/greece.png b/public/images/emoji/apple/greece.png
index adeaf2a858..38903b1423 100644
Binary files a/public/images/emoji/apple/greece.png and b/public/images/emoji/apple/greece.png differ
diff --git a/public/images/emoji/apple/green_apple.png b/public/images/emoji/apple/green_apple.png
index 7b64adc98b..80da1057a7 100644
Binary files a/public/images/emoji/apple/green_apple.png and b/public/images/emoji/apple/green_apple.png differ
diff --git a/public/images/emoji/apple/green_book.png b/public/images/emoji/apple/green_book.png
index cf380f4970..cedd0cecb2 100644
Binary files a/public/images/emoji/apple/green_book.png and b/public/images/emoji/apple/green_book.png differ
diff --git a/public/images/emoji/apple/green_heart.png b/public/images/emoji/apple/green_heart.png
index 70df64a3f1..3b02a6cd1a 100644
Binary files a/public/images/emoji/apple/green_heart.png and b/public/images/emoji/apple/green_heart.png differ
diff --git a/public/images/emoji/apple/green_salad.png b/public/images/emoji/apple/green_salad.png
index 16b2c1644f..e9f000c376 100644
Binary files a/public/images/emoji/apple/green_salad.png and b/public/images/emoji/apple/green_salad.png differ
diff --git a/public/images/emoji/apple/greenland.png b/public/images/emoji/apple/greenland.png
index e561bb86c5..10ddcbec5a 100644
Binary files a/public/images/emoji/apple/greenland.png and b/public/images/emoji/apple/greenland.png differ
diff --git a/public/images/emoji/apple/grenada.png b/public/images/emoji/apple/grenada.png
index ed812a6c05..5a57114dc0 100644
Binary files a/public/images/emoji/apple/grenada.png and b/public/images/emoji/apple/grenada.png differ
diff --git a/public/images/emoji/apple/grey_exclamation.png b/public/images/emoji/apple/grey_exclamation.png
index 0ac75a3b12..48ba079d7f 100644
Binary files a/public/images/emoji/apple/grey_exclamation.png and b/public/images/emoji/apple/grey_exclamation.png differ
diff --git a/public/images/emoji/apple/grey_question.png b/public/images/emoji/apple/grey_question.png
index d1b8431a07..1038be0772 100644
Binary files a/public/images/emoji/apple/grey_question.png and b/public/images/emoji/apple/grey_question.png differ
diff --git a/public/images/emoji/apple/grimacing.png b/public/images/emoji/apple/grimacing.png
index 58df57b80f..32e830a99c 100644
Binary files a/public/images/emoji/apple/grimacing.png and b/public/images/emoji/apple/grimacing.png differ
diff --git a/public/images/emoji/apple/grin.png b/public/images/emoji/apple/grin.png
index 56ac5e5f6c..9760413d1a 100644
Binary files a/public/images/emoji/apple/grin.png and b/public/images/emoji/apple/grin.png differ
diff --git a/public/images/emoji/apple/grinning.png b/public/images/emoji/apple/grinning.png
index b8f34e83ef..aec4028ae7 100644
Binary files a/public/images/emoji/apple/grinning.png and b/public/images/emoji/apple/grinning.png differ
diff --git a/public/images/emoji/apple/guadeloupe.png b/public/images/emoji/apple/guadeloupe.png
index 9f34c1158d..6e4e3c2151 100644
Binary files a/public/images/emoji/apple/guadeloupe.png and b/public/images/emoji/apple/guadeloupe.png differ
diff --git a/public/images/emoji/apple/guam.png b/public/images/emoji/apple/guam.png
index 735472abe2..2d8456a6ae 100644
Binary files a/public/images/emoji/apple/guam.png and b/public/images/emoji/apple/guam.png differ
diff --git a/public/images/emoji/apple/guardsman.png b/public/images/emoji/apple/guardsman.png
index bed85fc6bb..eed50a1520 100644
Binary files a/public/images/emoji/apple/guardsman.png and b/public/images/emoji/apple/guardsman.png differ
diff --git a/public/images/emoji/apple/guardsman/2.png b/public/images/emoji/apple/guardsman/2.png
index 6c2d298e4c..4286cf459d 100644
Binary files a/public/images/emoji/apple/guardsman/2.png and b/public/images/emoji/apple/guardsman/2.png differ
diff --git a/public/images/emoji/apple/guardsman/3.png b/public/images/emoji/apple/guardsman/3.png
index a52f6f3ca3..8a44966461 100644
Binary files a/public/images/emoji/apple/guardsman/3.png and b/public/images/emoji/apple/guardsman/3.png differ
diff --git a/public/images/emoji/apple/guardsman/4.png b/public/images/emoji/apple/guardsman/4.png
index 1e4a128fc0..da2cbf785f 100644
Binary files a/public/images/emoji/apple/guardsman/4.png and b/public/images/emoji/apple/guardsman/4.png differ
diff --git a/public/images/emoji/apple/guardsman/5.png b/public/images/emoji/apple/guardsman/5.png
index 103245ac4b..848c913e3f 100644
Binary files a/public/images/emoji/apple/guardsman/5.png and b/public/images/emoji/apple/guardsman/5.png differ
diff --git a/public/images/emoji/apple/guardsman/6.png b/public/images/emoji/apple/guardsman/6.png
index cc69ea6372..1afeb6da89 100644
Binary files a/public/images/emoji/apple/guardsman/6.png and b/public/images/emoji/apple/guardsman/6.png differ
diff --git a/public/images/emoji/apple/guardswoman.png b/public/images/emoji/apple/guardswoman.png
index f4d3ba9c58..60ba12bdac 100644
Binary files a/public/images/emoji/apple/guardswoman.png and b/public/images/emoji/apple/guardswoman.png differ
diff --git a/public/images/emoji/apple/guardswoman/2.png b/public/images/emoji/apple/guardswoman/2.png
index 314e41bcb3..d5f0176d45 100644
Binary files a/public/images/emoji/apple/guardswoman/2.png and b/public/images/emoji/apple/guardswoman/2.png differ
diff --git a/public/images/emoji/apple/guardswoman/3.png b/public/images/emoji/apple/guardswoman/3.png
index 7ce9264c0f..31f44f3e5d 100644
Binary files a/public/images/emoji/apple/guardswoman/3.png and b/public/images/emoji/apple/guardswoman/3.png differ
diff --git a/public/images/emoji/apple/guardswoman/4.png b/public/images/emoji/apple/guardswoman/4.png
index 267d5ace8d..e6deb43377 100644
Binary files a/public/images/emoji/apple/guardswoman/4.png and b/public/images/emoji/apple/guardswoman/4.png differ
diff --git a/public/images/emoji/apple/guardswoman/5.png b/public/images/emoji/apple/guardswoman/5.png
index f7c1e8826d..05efbb690a 100644
Binary files a/public/images/emoji/apple/guardswoman/5.png and b/public/images/emoji/apple/guardswoman/5.png differ
diff --git a/public/images/emoji/apple/guardswoman/6.png b/public/images/emoji/apple/guardswoman/6.png
index 1082318e26..3069bb0c71 100644
Binary files a/public/images/emoji/apple/guardswoman/6.png and b/public/images/emoji/apple/guardswoman/6.png differ
diff --git a/public/images/emoji/apple/guatemala.png b/public/images/emoji/apple/guatemala.png
index bab42f5675..0696e09349 100644
Binary files a/public/images/emoji/apple/guatemala.png and b/public/images/emoji/apple/guatemala.png differ
diff --git a/public/images/emoji/apple/guernsey.png b/public/images/emoji/apple/guernsey.png
index 4039048d06..8b5e98e938 100644
Binary files a/public/images/emoji/apple/guernsey.png and b/public/images/emoji/apple/guernsey.png differ
diff --git a/public/images/emoji/apple/guinea.png b/public/images/emoji/apple/guinea.png
index 6dcabb1e8e..b480cb4269 100644
Binary files a/public/images/emoji/apple/guinea.png and b/public/images/emoji/apple/guinea.png differ
diff --git a/public/images/emoji/apple/guinea_bissau.png b/public/images/emoji/apple/guinea_bissau.png
index 361842d05b..47af24a83d 100644
Binary files a/public/images/emoji/apple/guinea_bissau.png and b/public/images/emoji/apple/guinea_bissau.png differ
diff --git a/public/images/emoji/apple/guitar.png b/public/images/emoji/apple/guitar.png
index 98e58d68cd..dc712dae08 100644
Binary files a/public/images/emoji/apple/guitar.png and b/public/images/emoji/apple/guitar.png differ
diff --git a/public/images/emoji/apple/gun.png b/public/images/emoji/apple/gun.png
index e72df0c1a3..d60e3f09b9 100644
Binary files a/public/images/emoji/apple/gun.png and b/public/images/emoji/apple/gun.png differ
diff --git a/public/images/emoji/apple/guyana.png b/public/images/emoji/apple/guyana.png
index 80fac519d8..7d524ed1cb 100644
Binary files a/public/images/emoji/apple/guyana.png and b/public/images/emoji/apple/guyana.png differ
diff --git a/public/images/emoji/apple/haircut.png b/public/images/emoji/apple/haircut.png
index ceac9642aa..8fe64d1203 100644
Binary files a/public/images/emoji/apple/haircut.png and b/public/images/emoji/apple/haircut.png differ
diff --git a/public/images/emoji/apple/haircut/2.png b/public/images/emoji/apple/haircut/2.png
index e9f7dfdbaa..9dac946a0e 100644
Binary files a/public/images/emoji/apple/haircut/2.png and b/public/images/emoji/apple/haircut/2.png differ
diff --git a/public/images/emoji/apple/haircut/3.png b/public/images/emoji/apple/haircut/3.png
index 435b4fa32c..35537b3923 100644
Binary files a/public/images/emoji/apple/haircut/3.png and b/public/images/emoji/apple/haircut/3.png differ
diff --git a/public/images/emoji/apple/haircut/4.png b/public/images/emoji/apple/haircut/4.png
index 50019797f4..dcf68bc115 100644
Binary files a/public/images/emoji/apple/haircut/4.png and b/public/images/emoji/apple/haircut/4.png differ
diff --git a/public/images/emoji/apple/haircut/5.png b/public/images/emoji/apple/haircut/5.png
index 2bd103d6d2..6a9fc15c3b 100644
Binary files a/public/images/emoji/apple/haircut/5.png and b/public/images/emoji/apple/haircut/5.png differ
diff --git a/public/images/emoji/apple/haircut/6.png b/public/images/emoji/apple/haircut/6.png
index 4d7b1d5033..3a02410e25 100644
Binary files a/public/images/emoji/apple/haircut/6.png and b/public/images/emoji/apple/haircut/6.png differ
diff --git a/public/images/emoji/apple/haircut_man.png b/public/images/emoji/apple/haircut_man.png
index c44aea56b9..7517f27d60 100644
Binary files a/public/images/emoji/apple/haircut_man.png and b/public/images/emoji/apple/haircut_man.png differ
diff --git a/public/images/emoji/apple/haircut_man/2.png b/public/images/emoji/apple/haircut_man/2.png
index 2965fde656..4370554edc 100644
Binary files a/public/images/emoji/apple/haircut_man/2.png and b/public/images/emoji/apple/haircut_man/2.png differ
diff --git a/public/images/emoji/apple/haircut_man/3.png b/public/images/emoji/apple/haircut_man/3.png
index 224e4f4799..d2ad5b7644 100644
Binary files a/public/images/emoji/apple/haircut_man/3.png and b/public/images/emoji/apple/haircut_man/3.png differ
diff --git a/public/images/emoji/apple/haircut_man/4.png b/public/images/emoji/apple/haircut_man/4.png
index 046cc155ff..1661b822b0 100644
Binary files a/public/images/emoji/apple/haircut_man/4.png and b/public/images/emoji/apple/haircut_man/4.png differ
diff --git a/public/images/emoji/apple/haircut_man/5.png b/public/images/emoji/apple/haircut_man/5.png
index 612cb34821..d8e1038391 100644
Binary files a/public/images/emoji/apple/haircut_man/5.png and b/public/images/emoji/apple/haircut_man/5.png differ
diff --git a/public/images/emoji/apple/haircut_man/6.png b/public/images/emoji/apple/haircut_man/6.png
index 941ba5a56d..1a673a385c 100644
Binary files a/public/images/emoji/apple/haircut_man/6.png and b/public/images/emoji/apple/haircut_man/6.png differ
diff --git a/public/images/emoji/apple/haircut_woman.png b/public/images/emoji/apple/haircut_woman.png
index ceac9642aa..8fe64d1203 100644
Binary files a/public/images/emoji/apple/haircut_woman.png and b/public/images/emoji/apple/haircut_woman.png differ
diff --git a/public/images/emoji/apple/haircut_woman/2.png b/public/images/emoji/apple/haircut_woman/2.png
index e9f7dfdbaa..9dac946a0e 100644
Binary files a/public/images/emoji/apple/haircut_woman/2.png and b/public/images/emoji/apple/haircut_woman/2.png differ
diff --git a/public/images/emoji/apple/haircut_woman/3.png b/public/images/emoji/apple/haircut_woman/3.png
index 435b4fa32c..35537b3923 100644
Binary files a/public/images/emoji/apple/haircut_woman/3.png and b/public/images/emoji/apple/haircut_woman/3.png differ
diff --git a/public/images/emoji/apple/haircut_woman/4.png b/public/images/emoji/apple/haircut_woman/4.png
index 50019797f4..dcf68bc115 100644
Binary files a/public/images/emoji/apple/haircut_woman/4.png and b/public/images/emoji/apple/haircut_woman/4.png differ
diff --git a/public/images/emoji/apple/haircut_woman/5.png b/public/images/emoji/apple/haircut_woman/5.png
index 2bd103d6d2..6a9fc15c3b 100644
Binary files a/public/images/emoji/apple/haircut_woman/5.png and b/public/images/emoji/apple/haircut_woman/5.png differ
diff --git a/public/images/emoji/apple/haircut_woman/6.png b/public/images/emoji/apple/haircut_woman/6.png
index 4d7b1d5033..3a02410e25 100644
Binary files a/public/images/emoji/apple/haircut_woman/6.png and b/public/images/emoji/apple/haircut_woman/6.png differ
diff --git a/public/images/emoji/apple/haiti.png b/public/images/emoji/apple/haiti.png
index 174b5cbe3c..a509c0a024 100644
Binary files a/public/images/emoji/apple/haiti.png and b/public/images/emoji/apple/haiti.png differ
diff --git a/public/images/emoji/apple/hamburger.png b/public/images/emoji/apple/hamburger.png
index 77ef207968..7cff8b55de 100644
Binary files a/public/images/emoji/apple/hamburger.png and b/public/images/emoji/apple/hamburger.png differ
diff --git a/public/images/emoji/apple/hammer.png b/public/images/emoji/apple/hammer.png
index 5c5a3b7052..288090e810 100644
Binary files a/public/images/emoji/apple/hammer.png and b/public/images/emoji/apple/hammer.png differ
diff --git a/public/images/emoji/apple/hammer_and_pick.png b/public/images/emoji/apple/hammer_and_pick.png
index ec76955fd6..70d5747be8 100644
Binary files a/public/images/emoji/apple/hammer_and_pick.png and b/public/images/emoji/apple/hammer_and_pick.png differ
diff --git a/public/images/emoji/apple/hammer_and_wrench.png b/public/images/emoji/apple/hammer_and_wrench.png
index daef26722c..2d470b412d 100644
Binary files a/public/images/emoji/apple/hammer_and_wrench.png and b/public/images/emoji/apple/hammer_and_wrench.png differ
diff --git a/public/images/emoji/apple/hammer_pick.png b/public/images/emoji/apple/hammer_pick.png
index ec76955fd6..70d5747be8 100644
Binary files a/public/images/emoji/apple/hammer_pick.png and b/public/images/emoji/apple/hammer_pick.png differ
diff --git a/public/images/emoji/apple/hamster.png b/public/images/emoji/apple/hamster.png
index 01450947c7..6d2d159a27 100644
Binary files a/public/images/emoji/apple/hamster.png and b/public/images/emoji/apple/hamster.png differ
diff --git a/public/images/emoji/apple/hand.png b/public/images/emoji/apple/hand.png
index 8b60686eeb..043ab0612c 100644
Binary files a/public/images/emoji/apple/hand.png and b/public/images/emoji/apple/hand.png differ
diff --git a/public/images/emoji/apple/hand/2.png b/public/images/emoji/apple/hand/2.png
index f0fd83faaa..2015a5661d 100644
Binary files a/public/images/emoji/apple/hand/2.png and b/public/images/emoji/apple/hand/2.png differ
diff --git a/public/images/emoji/apple/hand/3.png b/public/images/emoji/apple/hand/3.png
index 7df90232ae..e3386aa3e1 100644
Binary files a/public/images/emoji/apple/hand/3.png and b/public/images/emoji/apple/hand/3.png differ
diff --git a/public/images/emoji/apple/hand/4.png b/public/images/emoji/apple/hand/4.png
index 979c0c414d..c3bb0003f4 100644
Binary files a/public/images/emoji/apple/hand/4.png and b/public/images/emoji/apple/hand/4.png differ
diff --git a/public/images/emoji/apple/hand/5.png b/public/images/emoji/apple/hand/5.png
index dee9188f4d..712bc4b385 100644
Binary files a/public/images/emoji/apple/hand/5.png and b/public/images/emoji/apple/hand/5.png differ
diff --git a/public/images/emoji/apple/hand/6.png b/public/images/emoji/apple/hand/6.png
index 9ae2da2c02..5728d25dc0 100644
Binary files a/public/images/emoji/apple/hand/6.png and b/public/images/emoji/apple/hand/6.png differ
diff --git a/public/images/emoji/apple/hand_splayed.png b/public/images/emoji/apple/hand_splayed.png
index c05031e50a..b50a32c5a7 100644
Binary files a/public/images/emoji/apple/hand_splayed.png and b/public/images/emoji/apple/hand_splayed.png differ
diff --git a/public/images/emoji/apple/hand_splayed/2.png b/public/images/emoji/apple/hand_splayed/2.png
index 35c3b9b350..efe22a889a 100644
Binary files a/public/images/emoji/apple/hand_splayed/2.png and b/public/images/emoji/apple/hand_splayed/2.png differ
diff --git a/public/images/emoji/apple/hand_splayed/3.png b/public/images/emoji/apple/hand_splayed/3.png
index 6757e8a1e2..e05f8623c2 100644
Binary files a/public/images/emoji/apple/hand_splayed/3.png and b/public/images/emoji/apple/hand_splayed/3.png differ
diff --git a/public/images/emoji/apple/hand_splayed/4.png b/public/images/emoji/apple/hand_splayed/4.png
index 2583736a58..4a50d74fac 100644
Binary files a/public/images/emoji/apple/hand_splayed/4.png and b/public/images/emoji/apple/hand_splayed/4.png differ
diff --git a/public/images/emoji/apple/hand_splayed/5.png b/public/images/emoji/apple/hand_splayed/5.png
index 11cb8caa11..145cc99610 100644
Binary files a/public/images/emoji/apple/hand_splayed/5.png and b/public/images/emoji/apple/hand_splayed/5.png differ
diff --git a/public/images/emoji/apple/hand_splayed/6.png b/public/images/emoji/apple/hand_splayed/6.png
index eed63072bd..fa7a6641cd 100644
Binary files a/public/images/emoji/apple/hand_splayed/6.png and b/public/images/emoji/apple/hand_splayed/6.png differ
diff --git a/public/images/emoji/apple/handbag.png b/public/images/emoji/apple/handbag.png
index 1eaac97227..a387b41808 100644
Binary files a/public/images/emoji/apple/handbag.png and b/public/images/emoji/apple/handbag.png differ
diff --git a/public/images/emoji/apple/handshake.png b/public/images/emoji/apple/handshake.png
index 630d17f421..42269efcab 100644
Binary files a/public/images/emoji/apple/handshake.png and b/public/images/emoji/apple/handshake.png differ
diff --git a/public/images/emoji/apple/hankey.png b/public/images/emoji/apple/hankey.png
index a025f43002..18c33a1371 100644
Binary files a/public/images/emoji/apple/hankey.png and b/public/images/emoji/apple/hankey.png differ
diff --git a/public/images/emoji/apple/hash.png b/public/images/emoji/apple/hash.png
index 64f9f55964..27120d00a2 100644
Binary files a/public/images/emoji/apple/hash.png and b/public/images/emoji/apple/hash.png differ
diff --git a/public/images/emoji/apple/hatched_chick.png b/public/images/emoji/apple/hatched_chick.png
index 5f51f69249..e54f085174 100644
Binary files a/public/images/emoji/apple/hatched_chick.png and b/public/images/emoji/apple/hatched_chick.png differ
diff --git a/public/images/emoji/apple/hatching_chick.png b/public/images/emoji/apple/hatching_chick.png
index c7b2e6f048..caa865ee29 100644
Binary files a/public/images/emoji/apple/hatching_chick.png and b/public/images/emoji/apple/hatching_chick.png differ
diff --git a/public/images/emoji/apple/head_bandage.png b/public/images/emoji/apple/head_bandage.png
index 953be45438..0e79c6d84e 100644
Binary files a/public/images/emoji/apple/head_bandage.png and b/public/images/emoji/apple/head_bandage.png differ
diff --git a/public/images/emoji/apple/headphones.png b/public/images/emoji/apple/headphones.png
index 62997da266..b65b0d7a04 100644
Binary files a/public/images/emoji/apple/headphones.png and b/public/images/emoji/apple/headphones.png differ
diff --git a/public/images/emoji/apple/hear_no_evil.png b/public/images/emoji/apple/hear_no_evil.png
index 72e9e2f37e..9595da5367 100644
Binary files a/public/images/emoji/apple/hear_no_evil.png and b/public/images/emoji/apple/hear_no_evil.png differ
diff --git a/public/images/emoji/apple/heard_and_mc_donald_islands.png b/public/images/emoji/apple/heard_and_mc_donald_islands.png
index 87eafc1fdc..b50920faa9 100644
Binary files a/public/images/emoji/apple/heard_and_mc_donald_islands.png and b/public/images/emoji/apple/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/apple/heart.png b/public/images/emoji/apple/heart.png
index 462824db64..d17a4fc5bb 100644
Binary files a/public/images/emoji/apple/heart.png and b/public/images/emoji/apple/heart.png differ
diff --git a/public/images/emoji/apple/heart_decoration.png b/public/images/emoji/apple/heart_decoration.png
index 16b43b1983..44176bd084 100644
Binary files a/public/images/emoji/apple/heart_decoration.png and b/public/images/emoji/apple/heart_decoration.png differ
diff --git a/public/images/emoji/apple/heart_exclamation.png b/public/images/emoji/apple/heart_exclamation.png
index 2b277ffc0d..6f093e60eb 100644
Binary files a/public/images/emoji/apple/heart_exclamation.png and b/public/images/emoji/apple/heart_exclamation.png differ
diff --git a/public/images/emoji/apple/heart_eyes.png b/public/images/emoji/apple/heart_eyes.png
index 182e30518f..72205585fc 100644
Binary files a/public/images/emoji/apple/heart_eyes.png and b/public/images/emoji/apple/heart_eyes.png differ
diff --git a/public/images/emoji/apple/heart_eyes_cat.png b/public/images/emoji/apple/heart_eyes_cat.png
index 36ff74b5a9..4f65df5886 100644
Binary files a/public/images/emoji/apple/heart_eyes_cat.png and b/public/images/emoji/apple/heart_eyes_cat.png differ
diff --git a/public/images/emoji/apple/heartbeat.png b/public/images/emoji/apple/heartbeat.png
index 66e29a6367..bc13b12b5d 100644
Binary files a/public/images/emoji/apple/heartbeat.png and b/public/images/emoji/apple/heartbeat.png differ
diff --git a/public/images/emoji/apple/heartpulse.png b/public/images/emoji/apple/heartpulse.png
index 72685c4665..d18fa40384 100644
Binary files a/public/images/emoji/apple/heartpulse.png and b/public/images/emoji/apple/heartpulse.png differ
diff --git a/public/images/emoji/apple/hearts.png b/public/images/emoji/apple/hearts.png
index 3894fbc178..9440dcd9a4 100644
Binary files a/public/images/emoji/apple/hearts.png and b/public/images/emoji/apple/hearts.png differ
diff --git a/public/images/emoji/apple/heavy_check_mark.png b/public/images/emoji/apple/heavy_check_mark.png
index 6a4fc91c9d..416dd35664 100644
Binary files a/public/images/emoji/apple/heavy_check_mark.png and b/public/images/emoji/apple/heavy_check_mark.png differ
diff --git a/public/images/emoji/apple/heavy_division_sign.png b/public/images/emoji/apple/heavy_division_sign.png
index 728e8fd7f5..3520cab8ef 100644
Binary files a/public/images/emoji/apple/heavy_division_sign.png and b/public/images/emoji/apple/heavy_division_sign.png differ
diff --git a/public/images/emoji/apple/heavy_dollar_sign.png b/public/images/emoji/apple/heavy_dollar_sign.png
index 256c942bba..4b0730182c 100644
Binary files a/public/images/emoji/apple/heavy_dollar_sign.png and b/public/images/emoji/apple/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/apple/heavy_heart_exclamation.png b/public/images/emoji/apple/heavy_heart_exclamation.png
index 2b277ffc0d..6f093e60eb 100644
Binary files a/public/images/emoji/apple/heavy_heart_exclamation.png and b/public/images/emoji/apple/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png
index 2b277ffc0d..6f093e60eb 100644
Binary files a/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/apple/heavy_minus_sign.png b/public/images/emoji/apple/heavy_minus_sign.png
index fb4909f9dd..05297a6a89 100644
Binary files a/public/images/emoji/apple/heavy_minus_sign.png and b/public/images/emoji/apple/heavy_minus_sign.png differ
diff --git a/public/images/emoji/apple/heavy_multiplication_x.png b/public/images/emoji/apple/heavy_multiplication_x.png
index 0b0e7d88fb..aa728cbffb 100644
Binary files a/public/images/emoji/apple/heavy_multiplication_x.png and b/public/images/emoji/apple/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/apple/heavy_plus_sign.png b/public/images/emoji/apple/heavy_plus_sign.png
index 4557910d54..027f21f131 100644
Binary files a/public/images/emoji/apple/heavy_plus_sign.png and b/public/images/emoji/apple/heavy_plus_sign.png differ
diff --git a/public/images/emoji/apple/hedgehog.png b/public/images/emoji/apple/hedgehog.png
index 9b978b3540..7bc650cfac 100644
Binary files a/public/images/emoji/apple/hedgehog.png and b/public/images/emoji/apple/hedgehog.png differ
diff --git a/public/images/emoji/apple/helicopter.png b/public/images/emoji/apple/helicopter.png
index 78472fce50..e8d6ad84cb 100644
Binary files a/public/images/emoji/apple/helicopter.png and b/public/images/emoji/apple/helicopter.png differ
diff --git a/public/images/emoji/apple/helmet_with_cross.png b/public/images/emoji/apple/helmet_with_cross.png
index 6440b55c34..f096d9ce43 100644
Binary files a/public/images/emoji/apple/helmet_with_cross.png and b/public/images/emoji/apple/helmet_with_cross.png differ
diff --git a/public/images/emoji/apple/helmet_with_white_cross.png b/public/images/emoji/apple/helmet_with_white_cross.png
index 6440b55c34..f096d9ce43 100644
Binary files a/public/images/emoji/apple/helmet_with_white_cross.png and b/public/images/emoji/apple/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/apple/herb.png b/public/images/emoji/apple/herb.png
index 863fbff4b5..a237195bf8 100644
Binary files a/public/images/emoji/apple/herb.png and b/public/images/emoji/apple/herb.png differ
diff --git a/public/images/emoji/apple/hibiscus.png b/public/images/emoji/apple/hibiscus.png
index c3fa3384ae..d5ba7bb32d 100644
Binary files a/public/images/emoji/apple/hibiscus.png and b/public/images/emoji/apple/hibiscus.png differ
diff --git a/public/images/emoji/apple/high_brightness.png b/public/images/emoji/apple/high_brightness.png
index e7e067344f..7d931e3195 100644
Binary files a/public/images/emoji/apple/high_brightness.png and b/public/images/emoji/apple/high_brightness.png differ
diff --git a/public/images/emoji/apple/high_heel.png b/public/images/emoji/apple/high_heel.png
index da1e800d37..b4d5f37a64 100644
Binary files a/public/images/emoji/apple/high_heel.png and b/public/images/emoji/apple/high_heel.png differ
diff --git a/public/images/emoji/apple/hocho.png b/public/images/emoji/apple/hocho.png
index c8a63cfddd..cfe2988f90 100644
Binary files a/public/images/emoji/apple/hocho.png and b/public/images/emoji/apple/hocho.png differ
diff --git a/public/images/emoji/apple/hockey.png b/public/images/emoji/apple/hockey.png
index e2198826de..8bb9c4b240 100644
Binary files a/public/images/emoji/apple/hockey.png and b/public/images/emoji/apple/hockey.png differ
diff --git a/public/images/emoji/apple/hole.png b/public/images/emoji/apple/hole.png
index abdc40ae63..c7fe6aa3c4 100644
Binary files a/public/images/emoji/apple/hole.png and b/public/images/emoji/apple/hole.png differ
diff --git a/public/images/emoji/apple/homes.png b/public/images/emoji/apple/homes.png
index 5c9e59d132..8145f968eb 100644
Binary files a/public/images/emoji/apple/homes.png and b/public/images/emoji/apple/homes.png differ
diff --git a/public/images/emoji/apple/honduras.png b/public/images/emoji/apple/honduras.png
index a49bc9e6db..d9aaa75711 100644
Binary files a/public/images/emoji/apple/honduras.png and b/public/images/emoji/apple/honduras.png differ
diff --git a/public/images/emoji/apple/honey_pot.png b/public/images/emoji/apple/honey_pot.png
index 630a7b744b..4615c2b58c 100644
Binary files a/public/images/emoji/apple/honey_pot.png and b/public/images/emoji/apple/honey_pot.png differ
diff --git a/public/images/emoji/apple/honeybee.png b/public/images/emoji/apple/honeybee.png
index 82d7aa8a5a..36f0001ebe 100644
Binary files a/public/images/emoji/apple/honeybee.png and b/public/images/emoji/apple/honeybee.png differ
diff --git a/public/images/emoji/apple/hong_kong.png b/public/images/emoji/apple/hong_kong.png
index ad46b58eb0..5a8e91b9c2 100644
Binary files a/public/images/emoji/apple/hong_kong.png and b/public/images/emoji/apple/hong_kong.png differ
diff --git a/public/images/emoji/apple/horse.png b/public/images/emoji/apple/horse.png
index dcdc5ff658..a2e9e9cf12 100644
Binary files a/public/images/emoji/apple/horse.png and b/public/images/emoji/apple/horse.png differ
diff --git a/public/images/emoji/apple/horse_racing.png b/public/images/emoji/apple/horse_racing.png
index 2e3388c806..f5b1f76232 100644
Binary files a/public/images/emoji/apple/horse_racing.png and b/public/images/emoji/apple/horse_racing.png differ
diff --git a/public/images/emoji/apple/horse_racing/2.png b/public/images/emoji/apple/horse_racing/2.png
index 1e6ab0e0ac..22dd2ab776 100644
Binary files a/public/images/emoji/apple/horse_racing/2.png and b/public/images/emoji/apple/horse_racing/2.png differ
diff --git a/public/images/emoji/apple/horse_racing/3.png b/public/images/emoji/apple/horse_racing/3.png
index 60a02fa671..1875bd478b 100644
Binary files a/public/images/emoji/apple/horse_racing/3.png and b/public/images/emoji/apple/horse_racing/3.png differ
diff --git a/public/images/emoji/apple/horse_racing/4.png b/public/images/emoji/apple/horse_racing/4.png
index df92a7f7ca..3978e638e4 100644
Binary files a/public/images/emoji/apple/horse_racing/4.png and b/public/images/emoji/apple/horse_racing/4.png differ
diff --git a/public/images/emoji/apple/horse_racing/5.png b/public/images/emoji/apple/horse_racing/5.png
index 174fe7b5cb..b831f24975 100644
Binary files a/public/images/emoji/apple/horse_racing/5.png and b/public/images/emoji/apple/horse_racing/5.png differ
diff --git a/public/images/emoji/apple/horse_racing/6.png b/public/images/emoji/apple/horse_racing/6.png
index d46a863b60..566ba4b254 100644
Binary files a/public/images/emoji/apple/horse_racing/6.png and b/public/images/emoji/apple/horse_racing/6.png differ
diff --git a/public/images/emoji/apple/hospital.png b/public/images/emoji/apple/hospital.png
index 9cb06311ce..bf90e59dde 100644
Binary files a/public/images/emoji/apple/hospital.png and b/public/images/emoji/apple/hospital.png differ
diff --git a/public/images/emoji/apple/hot_dog.png b/public/images/emoji/apple/hot_dog.png
index f8d63c366d..9f0ea9207c 100644
Binary files a/public/images/emoji/apple/hot_dog.png and b/public/images/emoji/apple/hot_dog.png differ
diff --git a/public/images/emoji/apple/hot_pepper.png b/public/images/emoji/apple/hot_pepper.png
index 793f6e0210..9c6de787e3 100644
Binary files a/public/images/emoji/apple/hot_pepper.png and b/public/images/emoji/apple/hot_pepper.png differ
diff --git a/public/images/emoji/apple/hotdog.png b/public/images/emoji/apple/hotdog.png
index f8d63c366d..9f0ea9207c 100644
Binary files a/public/images/emoji/apple/hotdog.png and b/public/images/emoji/apple/hotdog.png differ
diff --git a/public/images/emoji/apple/hotel.png b/public/images/emoji/apple/hotel.png
index 7321778f17..27a9a5bb44 100644
Binary files a/public/images/emoji/apple/hotel.png and b/public/images/emoji/apple/hotel.png differ
diff --git a/public/images/emoji/apple/hotsprings.png b/public/images/emoji/apple/hotsprings.png
index 8fd9889c58..dcf520a64f 100644
Binary files a/public/images/emoji/apple/hotsprings.png and b/public/images/emoji/apple/hotsprings.png differ
diff --git a/public/images/emoji/apple/hourglass.png b/public/images/emoji/apple/hourglass.png
index fce767913a..91d1c07a4d 100644
Binary files a/public/images/emoji/apple/hourglass.png and b/public/images/emoji/apple/hourglass.png differ
diff --git a/public/images/emoji/apple/hourglass_flowing_sand.png b/public/images/emoji/apple/hourglass_flowing_sand.png
index 842c74c9ef..dbee04dc15 100644
Binary files a/public/images/emoji/apple/hourglass_flowing_sand.png and b/public/images/emoji/apple/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/apple/house.png b/public/images/emoji/apple/house.png
index 8b7e87943c..896d8b59dc 100644
Binary files a/public/images/emoji/apple/house.png and b/public/images/emoji/apple/house.png differ
diff --git a/public/images/emoji/apple/house_abandoned.png b/public/images/emoji/apple/house_abandoned.png
index f6c4251884..1d07668a0c 100644
Binary files a/public/images/emoji/apple/house_abandoned.png and b/public/images/emoji/apple/house_abandoned.png differ
diff --git a/public/images/emoji/apple/house_buildings.png b/public/images/emoji/apple/house_buildings.png
index 5c9e59d132..8145f968eb 100644
Binary files a/public/images/emoji/apple/house_buildings.png and b/public/images/emoji/apple/house_buildings.png differ
diff --git a/public/images/emoji/apple/house_with_garden.png b/public/images/emoji/apple/house_with_garden.png
index 78c604a69a..1ad60112d2 100644
Binary files a/public/images/emoji/apple/house_with_garden.png and b/public/images/emoji/apple/house_with_garden.png differ
diff --git a/public/images/emoji/apple/houses.png b/public/images/emoji/apple/houses.png
index 5c9e59d132..8145f968eb 100644
Binary files a/public/images/emoji/apple/houses.png and b/public/images/emoji/apple/houses.png differ
diff --git a/public/images/emoji/apple/hugging.png b/public/images/emoji/apple/hugging.png
index 3bbffdd26f..dba2e10798 100644
Binary files a/public/images/emoji/apple/hugging.png and b/public/images/emoji/apple/hugging.png differ
diff --git a/public/images/emoji/apple/hugging_face.png b/public/images/emoji/apple/hugging_face.png
index 3bbffdd26f..dba2e10798 100644
Binary files a/public/images/emoji/apple/hugging_face.png and b/public/images/emoji/apple/hugging_face.png differ
diff --git a/public/images/emoji/apple/hugs.png b/public/images/emoji/apple/hugs.png
index 3bbffdd26f..dba2e10798 100644
Binary files a/public/images/emoji/apple/hugs.png and b/public/images/emoji/apple/hugs.png differ
diff --git a/public/images/emoji/apple/hungary.png b/public/images/emoji/apple/hungary.png
index 56e8d4eda4..d827815ad3 100644
Binary files a/public/images/emoji/apple/hungary.png and b/public/images/emoji/apple/hungary.png differ
diff --git a/public/images/emoji/apple/hushed.png b/public/images/emoji/apple/hushed.png
index 062f12fa26..fa5dabbec6 100644
Binary files a/public/images/emoji/apple/hushed.png and b/public/images/emoji/apple/hushed.png differ
diff --git a/public/images/emoji/apple/ice_cream.png b/public/images/emoji/apple/ice_cream.png
index 1324a5ecbc..d8cc69112f 100644
Binary files a/public/images/emoji/apple/ice_cream.png and b/public/images/emoji/apple/ice_cream.png differ
diff --git a/public/images/emoji/apple/ice_hockey.png b/public/images/emoji/apple/ice_hockey.png
index e2198826de..8bb9c4b240 100644
Binary files a/public/images/emoji/apple/ice_hockey.png and b/public/images/emoji/apple/ice_hockey.png differ
diff --git a/public/images/emoji/apple/ice_skate.png b/public/images/emoji/apple/ice_skate.png
index 1ce8b7220a..4d8b388d4c 100644
Binary files a/public/images/emoji/apple/ice_skate.png and b/public/images/emoji/apple/ice_skate.png differ
diff --git a/public/images/emoji/apple/icecream.png b/public/images/emoji/apple/icecream.png
index 20df9b4d38..133e327546 100644
Binary files a/public/images/emoji/apple/icecream.png and b/public/images/emoji/apple/icecream.png differ
diff --git a/public/images/emoji/apple/iceland.png b/public/images/emoji/apple/iceland.png
index c5741f9410..eeef71f453 100644
Binary files a/public/images/emoji/apple/iceland.png and b/public/images/emoji/apple/iceland.png differ
diff --git a/public/images/emoji/apple/id.png b/public/images/emoji/apple/id.png
index a663a2a794..9b6f5d63d4 100644
Binary files a/public/images/emoji/apple/id.png and b/public/images/emoji/apple/id.png differ
diff --git a/public/images/emoji/apple/ideograph_advantage.png b/public/images/emoji/apple/ideograph_advantage.png
index 3572e30770..8f3cd6354b 100644
Binary files a/public/images/emoji/apple/ideograph_advantage.png and b/public/images/emoji/apple/ideograph_advantage.png differ
diff --git a/public/images/emoji/apple/imp.png b/public/images/emoji/apple/imp.png
index 37f9ff7fde..949154dc13 100644
Binary files a/public/images/emoji/apple/imp.png and b/public/images/emoji/apple/imp.png differ
diff --git a/public/images/emoji/apple/inbox_tray.png b/public/images/emoji/apple/inbox_tray.png
index b0f49b1d66..ced61d0fac 100644
Binary files a/public/images/emoji/apple/inbox_tray.png and b/public/images/emoji/apple/inbox_tray.png differ
diff --git a/public/images/emoji/apple/incoming_envelope.png b/public/images/emoji/apple/incoming_envelope.png
index e8013ab7a3..556af3cb8f 100644
Binary files a/public/images/emoji/apple/incoming_envelope.png and b/public/images/emoji/apple/incoming_envelope.png differ
diff --git a/public/images/emoji/apple/india.png b/public/images/emoji/apple/india.png
index 8f9167c025..92f3147981 100644
Binary files a/public/images/emoji/apple/india.png and b/public/images/emoji/apple/india.png differ
diff --git a/public/images/emoji/apple/indonesia.png b/public/images/emoji/apple/indonesia.png
index ca96fd3d96..418cc3a430 100644
Binary files a/public/images/emoji/apple/indonesia.png and b/public/images/emoji/apple/indonesia.png differ
diff --git a/public/images/emoji/apple/information_desk_person.png b/public/images/emoji/apple/information_desk_person.png
index 4424423fa3..d68910b6f4 100644
Binary files a/public/images/emoji/apple/information_desk_person.png and b/public/images/emoji/apple/information_desk_person.png differ
diff --git a/public/images/emoji/apple/information_desk_person/2.png b/public/images/emoji/apple/information_desk_person/2.png
index 115198e563..b1001a29fd 100644
Binary files a/public/images/emoji/apple/information_desk_person/2.png and b/public/images/emoji/apple/information_desk_person/2.png differ
diff --git a/public/images/emoji/apple/information_desk_person/3.png b/public/images/emoji/apple/information_desk_person/3.png
index d0593f87fb..df2f213ba1 100644
Binary files a/public/images/emoji/apple/information_desk_person/3.png and b/public/images/emoji/apple/information_desk_person/3.png differ
diff --git a/public/images/emoji/apple/information_desk_person/4.png b/public/images/emoji/apple/information_desk_person/4.png
index a2f5d0294f..b8529aa2a7 100644
Binary files a/public/images/emoji/apple/information_desk_person/4.png and b/public/images/emoji/apple/information_desk_person/4.png differ
diff --git a/public/images/emoji/apple/information_desk_person/5.png b/public/images/emoji/apple/information_desk_person/5.png
index 63d9338057..4f36a7083a 100644
Binary files a/public/images/emoji/apple/information_desk_person/5.png and b/public/images/emoji/apple/information_desk_person/5.png differ
diff --git a/public/images/emoji/apple/information_desk_person/6.png b/public/images/emoji/apple/information_desk_person/6.png
index 30b2bd891a..1cc974bd59 100644
Binary files a/public/images/emoji/apple/information_desk_person/6.png and b/public/images/emoji/apple/information_desk_person/6.png differ
diff --git a/public/images/emoji/apple/information_source.png b/public/images/emoji/apple/information_source.png
index f9e686ee2d..2c63bb9518 100644
Binary files a/public/images/emoji/apple/information_source.png and b/public/images/emoji/apple/information_source.png differ
diff --git a/public/images/emoji/apple/innocent.png b/public/images/emoji/apple/innocent.png
index 2c454ee0d3..6d22a0a2c4 100644
Binary files a/public/images/emoji/apple/innocent.png and b/public/images/emoji/apple/innocent.png differ
diff --git a/public/images/emoji/apple/interrobang.png b/public/images/emoji/apple/interrobang.png
index 818b6ac1a5..df25a331f9 100644
Binary files a/public/images/emoji/apple/interrobang.png and b/public/images/emoji/apple/interrobang.png differ
diff --git a/public/images/emoji/apple/iphone.png b/public/images/emoji/apple/iphone.png
index 33ebfac21f..5b10e25ada 100644
Binary files a/public/images/emoji/apple/iphone.png and b/public/images/emoji/apple/iphone.png differ
diff --git a/public/images/emoji/apple/iran.png b/public/images/emoji/apple/iran.png
index 3d9e1356ea..1d0336bef7 100644
Binary files a/public/images/emoji/apple/iran.png and b/public/images/emoji/apple/iran.png differ
diff --git a/public/images/emoji/apple/iraq.png b/public/images/emoji/apple/iraq.png
index 3c833ecc88..079f7770b9 100644
Binary files a/public/images/emoji/apple/iraq.png and b/public/images/emoji/apple/iraq.png differ
diff --git a/public/images/emoji/apple/ireland.png b/public/images/emoji/apple/ireland.png
index ffe6c6f333..847ec875df 100644
Binary files a/public/images/emoji/apple/ireland.png and b/public/images/emoji/apple/ireland.png differ
diff --git a/public/images/emoji/apple/island.png b/public/images/emoji/apple/island.png
index 8b98bbead1..7295d513b5 100644
Binary files a/public/images/emoji/apple/island.png and b/public/images/emoji/apple/island.png differ
diff --git a/public/images/emoji/apple/isle_of_man.png b/public/images/emoji/apple/isle_of_man.png
index b4a3ff3ef4..b98603c22a 100644
Binary files a/public/images/emoji/apple/isle_of_man.png and b/public/images/emoji/apple/isle_of_man.png differ
diff --git a/public/images/emoji/apple/israel.png b/public/images/emoji/apple/israel.png
index 20d0124b36..4a00c68b7b 100644
Binary files a/public/images/emoji/apple/israel.png and b/public/images/emoji/apple/israel.png differ
diff --git a/public/images/emoji/apple/it.png b/public/images/emoji/apple/it.png
index 0e5bc29dad..32b426d8aa 100644
Binary files a/public/images/emoji/apple/it.png and b/public/images/emoji/apple/it.png differ
diff --git a/public/images/emoji/apple/izakaya_lantern.png b/public/images/emoji/apple/izakaya_lantern.png
index 6b6a8fa327..94c9eccd17 100644
Binary files a/public/images/emoji/apple/izakaya_lantern.png and b/public/images/emoji/apple/izakaya_lantern.png differ
diff --git a/public/images/emoji/apple/jack_o_lantern.png b/public/images/emoji/apple/jack_o_lantern.png
index dc7f30477c..1b5e16edc4 100644
Binary files a/public/images/emoji/apple/jack_o_lantern.png and b/public/images/emoji/apple/jack_o_lantern.png differ
diff --git a/public/images/emoji/apple/jamaica.png b/public/images/emoji/apple/jamaica.png
index 8fe27974c5..953c92c715 100644
Binary files a/public/images/emoji/apple/jamaica.png and b/public/images/emoji/apple/jamaica.png differ
diff --git a/public/images/emoji/apple/japan.png b/public/images/emoji/apple/japan.png
index a5ac5b6df2..bc96c4bdea 100644
Binary files a/public/images/emoji/apple/japan.png and b/public/images/emoji/apple/japan.png differ
diff --git a/public/images/emoji/apple/japanese_castle.png b/public/images/emoji/apple/japanese_castle.png
index c70e0448b5..21d1d96250 100644
Binary files a/public/images/emoji/apple/japanese_castle.png and b/public/images/emoji/apple/japanese_castle.png differ
diff --git a/public/images/emoji/apple/japanese_goblin.png b/public/images/emoji/apple/japanese_goblin.png
index 87e48f4a06..758d8848de 100644
Binary files a/public/images/emoji/apple/japanese_goblin.png and b/public/images/emoji/apple/japanese_goblin.png differ
diff --git a/public/images/emoji/apple/japanese_ogre.png b/public/images/emoji/apple/japanese_ogre.png
index eff2422cc3..fd297e00dc 100644
Binary files a/public/images/emoji/apple/japanese_ogre.png and b/public/images/emoji/apple/japanese_ogre.png differ
diff --git a/public/images/emoji/apple/jeans.png b/public/images/emoji/apple/jeans.png
index 621a6dd337..09261e9f00 100644
Binary files a/public/images/emoji/apple/jeans.png and b/public/images/emoji/apple/jeans.png differ
diff --git a/public/images/emoji/apple/jersey.png b/public/images/emoji/apple/jersey.png
index 5cdb9f597c..04c04a49ca 100644
Binary files a/public/images/emoji/apple/jersey.png and b/public/images/emoji/apple/jersey.png differ
diff --git a/public/images/emoji/apple/jordan.png b/public/images/emoji/apple/jordan.png
index 7db4f23d1d..115245feeb 100644
Binary files a/public/images/emoji/apple/jordan.png and b/public/images/emoji/apple/jordan.png differ
diff --git a/public/images/emoji/apple/joy.png b/public/images/emoji/apple/joy.png
index 89fab99cd4..4308d98177 100644
Binary files a/public/images/emoji/apple/joy.png and b/public/images/emoji/apple/joy.png differ
diff --git a/public/images/emoji/apple/joy_cat.png b/public/images/emoji/apple/joy_cat.png
index 86730e80e7..140ab0a785 100644
Binary files a/public/images/emoji/apple/joy_cat.png and b/public/images/emoji/apple/joy_cat.png differ
diff --git a/public/images/emoji/apple/joystick.png b/public/images/emoji/apple/joystick.png
index 76220db9c2..11b3cd42cf 100644
Binary files a/public/images/emoji/apple/joystick.png and b/public/images/emoji/apple/joystick.png differ
diff --git a/public/images/emoji/apple/jp.png b/public/images/emoji/apple/jp.png
index 4462748e58..ae7398cb37 100644
Binary files a/public/images/emoji/apple/jp.png and b/public/images/emoji/apple/jp.png differ
diff --git a/public/images/emoji/apple/kaaba.png b/public/images/emoji/apple/kaaba.png
index 383bab379e..87aa23d023 100644
Binary files a/public/images/emoji/apple/kaaba.png and b/public/images/emoji/apple/kaaba.png differ
diff --git a/public/images/emoji/apple/kazakhstan.png b/public/images/emoji/apple/kazakhstan.png
index d3b98efcde..b55463a001 100644
Binary files a/public/images/emoji/apple/kazakhstan.png and b/public/images/emoji/apple/kazakhstan.png differ
diff --git a/public/images/emoji/apple/kenya.png b/public/images/emoji/apple/kenya.png
index ad1e52279b..4c22ca5e60 100644
Binary files a/public/images/emoji/apple/kenya.png and b/public/images/emoji/apple/kenya.png differ
diff --git a/public/images/emoji/apple/key.png b/public/images/emoji/apple/key.png
index 4a1779e24f..7577ce3d77 100644
Binary files a/public/images/emoji/apple/key.png and b/public/images/emoji/apple/key.png differ
diff --git a/public/images/emoji/apple/key2.png b/public/images/emoji/apple/key2.png
index 05715332b1..d0dbadedf1 100644
Binary files a/public/images/emoji/apple/key2.png and b/public/images/emoji/apple/key2.png differ
diff --git a/public/images/emoji/apple/keyboard.png b/public/images/emoji/apple/keyboard.png
index 835950ccf7..290f55ca39 100644
Binary files a/public/images/emoji/apple/keyboard.png and b/public/images/emoji/apple/keyboard.png differ
diff --git a/public/images/emoji/apple/keycap_star.png b/public/images/emoji/apple/keycap_star.png
index f847acf58c..3a16a887bc 100644
Binary files a/public/images/emoji/apple/keycap_star.png and b/public/images/emoji/apple/keycap_star.png differ
diff --git a/public/images/emoji/apple/keycap_ten.png b/public/images/emoji/apple/keycap_ten.png
index 59d013decc..e39aaa77bd 100644
Binary files a/public/images/emoji/apple/keycap_ten.png and b/public/images/emoji/apple/keycap_ten.png differ
diff --git a/public/images/emoji/apple/kick_scooter.png b/public/images/emoji/apple/kick_scooter.png
index e04c09e543..aeeff854a0 100644
Binary files a/public/images/emoji/apple/kick_scooter.png and b/public/images/emoji/apple/kick_scooter.png differ
diff --git a/public/images/emoji/apple/kimono.png b/public/images/emoji/apple/kimono.png
index af5be0c80c..14bee1fbfa 100644
Binary files a/public/images/emoji/apple/kimono.png and b/public/images/emoji/apple/kimono.png differ
diff --git a/public/images/emoji/apple/kiribati.png b/public/images/emoji/apple/kiribati.png
index 2f0769690b..a0d8fe34d4 100644
Binary files a/public/images/emoji/apple/kiribati.png and b/public/images/emoji/apple/kiribati.png differ
diff --git a/public/images/emoji/apple/kiss.png b/public/images/emoji/apple/kiss.png
index 0c2ef0e3db..f8799bfc50 100644
Binary files a/public/images/emoji/apple/kiss.png and b/public/images/emoji/apple/kiss.png differ
diff --git a/public/images/emoji/apple/kissing.png b/public/images/emoji/apple/kissing.png
index 7fe9b7a3d1..a91daf44e7 100644
Binary files a/public/images/emoji/apple/kissing.png and b/public/images/emoji/apple/kissing.png differ
diff --git a/public/images/emoji/apple/kissing_cat.png b/public/images/emoji/apple/kissing_cat.png
index 3e76c73e54..e10b551039 100644
Binary files a/public/images/emoji/apple/kissing_cat.png and b/public/images/emoji/apple/kissing_cat.png differ
diff --git a/public/images/emoji/apple/kissing_closed_eyes.png b/public/images/emoji/apple/kissing_closed_eyes.png
index 5c65b1da38..5b4921a506 100644
Binary files a/public/images/emoji/apple/kissing_closed_eyes.png and b/public/images/emoji/apple/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/apple/kissing_heart.png b/public/images/emoji/apple/kissing_heart.png
index 170e9fe110..630fd6c6a2 100644
Binary files a/public/images/emoji/apple/kissing_heart.png and b/public/images/emoji/apple/kissing_heart.png differ
diff --git a/public/images/emoji/apple/kissing_smiling_eyes.png b/public/images/emoji/apple/kissing_smiling_eyes.png
index c558e5b4c8..eed93a1a4e 100644
Binary files a/public/images/emoji/apple/kissing_smiling_eyes.png and b/public/images/emoji/apple/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/apple/kiwi_fruit.png b/public/images/emoji/apple/kiwi_fruit.png
index fb4cd38885..643445bc22 100644
Binary files a/public/images/emoji/apple/kiwi_fruit.png and b/public/images/emoji/apple/kiwi_fruit.png differ
diff --git a/public/images/emoji/apple/knife.png b/public/images/emoji/apple/knife.png
index c8a63cfddd..cfe2988f90 100644
Binary files a/public/images/emoji/apple/knife.png and b/public/images/emoji/apple/knife.png differ
diff --git a/public/images/emoji/apple/koala.png b/public/images/emoji/apple/koala.png
index 9c12e14d15..84a9a4bf44 100644
Binary files a/public/images/emoji/apple/koala.png and b/public/images/emoji/apple/koala.png differ
diff --git a/public/images/emoji/apple/koko.png b/public/images/emoji/apple/koko.png
index 30a390e8e6..7cf6c10b42 100644
Binary files a/public/images/emoji/apple/koko.png and b/public/images/emoji/apple/koko.png differ
diff --git a/public/images/emoji/apple/kosovo.png b/public/images/emoji/apple/kosovo.png
index 1d72143848..f96f1c1c14 100644
Binary files a/public/images/emoji/apple/kosovo.png and b/public/images/emoji/apple/kosovo.png differ
diff --git a/public/images/emoji/apple/kr.png b/public/images/emoji/apple/kr.png
index d63cf96b43..36cdb61482 100644
Binary files a/public/images/emoji/apple/kr.png and b/public/images/emoji/apple/kr.png differ
diff --git a/public/images/emoji/apple/kuwait.png b/public/images/emoji/apple/kuwait.png
index 506e7c4249..2452feede3 100644
Binary files a/public/images/emoji/apple/kuwait.png and b/public/images/emoji/apple/kuwait.png differ
diff --git a/public/images/emoji/apple/kyrgyzstan.png b/public/images/emoji/apple/kyrgyzstan.png
index 8d7ae07d91..78cb263636 100644
Binary files a/public/images/emoji/apple/kyrgyzstan.png and b/public/images/emoji/apple/kyrgyzstan.png differ
diff --git a/public/images/emoji/apple/label.png b/public/images/emoji/apple/label.png
index ec8d4de319..e08884b2c8 100644
Binary files a/public/images/emoji/apple/label.png and b/public/images/emoji/apple/label.png differ
diff --git a/public/images/emoji/apple/laos.png b/public/images/emoji/apple/laos.png
index 40db675d1c..94f2eaa18c 100644
Binary files a/public/images/emoji/apple/laos.png and b/public/images/emoji/apple/laos.png differ
diff --git a/public/images/emoji/apple/large_blue_circle.png b/public/images/emoji/apple/large_blue_circle.png
index 6a2062451c..0c6f72c397 100644
Binary files a/public/images/emoji/apple/large_blue_circle.png and b/public/images/emoji/apple/large_blue_circle.png differ
diff --git a/public/images/emoji/apple/large_blue_diamond.png b/public/images/emoji/apple/large_blue_diamond.png
index fd2f2178ae..2e52cd6733 100644
Binary files a/public/images/emoji/apple/large_blue_diamond.png and b/public/images/emoji/apple/large_blue_diamond.png differ
diff --git a/public/images/emoji/apple/large_orange_diamond.png b/public/images/emoji/apple/large_orange_diamond.png
index ab97bd6c12..d1e443cbdd 100644
Binary files a/public/images/emoji/apple/large_orange_diamond.png and b/public/images/emoji/apple/large_orange_diamond.png differ
diff --git a/public/images/emoji/apple/last_quarter_moon.png b/public/images/emoji/apple/last_quarter_moon.png
index 19f454d522..7c031018bb 100644
Binary files a/public/images/emoji/apple/last_quarter_moon.png and b/public/images/emoji/apple/last_quarter_moon.png differ
diff --git a/public/images/emoji/apple/last_quarter_moon_with_face.png b/public/images/emoji/apple/last_quarter_moon_with_face.png
index 09d75033d7..3f78e254f3 100644
Binary files a/public/images/emoji/apple/last_quarter_moon_with_face.png and b/public/images/emoji/apple/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/apple/latin_cross.png b/public/images/emoji/apple/latin_cross.png
index efc7a79034..065b124fd3 100644
Binary files a/public/images/emoji/apple/latin_cross.png and b/public/images/emoji/apple/latin_cross.png differ
diff --git a/public/images/emoji/apple/latvia.png b/public/images/emoji/apple/latvia.png
index b941fdcd4c..e982daced2 100644
Binary files a/public/images/emoji/apple/latvia.png and b/public/images/emoji/apple/latvia.png differ
diff --git a/public/images/emoji/apple/laughing.png b/public/images/emoji/apple/laughing.png
index 7dd973daef..714f6d5835 100644
Binary files a/public/images/emoji/apple/laughing.png and b/public/images/emoji/apple/laughing.png differ
diff --git a/public/images/emoji/apple/leaves.png b/public/images/emoji/apple/leaves.png
index 5a9d9c8024..8adbeefa0d 100644
Binary files a/public/images/emoji/apple/leaves.png and b/public/images/emoji/apple/leaves.png differ
diff --git a/public/images/emoji/apple/lebanon.png b/public/images/emoji/apple/lebanon.png
index b83364c167..380a6f6b3b 100644
Binary files a/public/images/emoji/apple/lebanon.png and b/public/images/emoji/apple/lebanon.png differ
diff --git a/public/images/emoji/apple/ledger.png b/public/images/emoji/apple/ledger.png
index 73744147ce..e5c475a022 100644
Binary files a/public/images/emoji/apple/ledger.png and b/public/images/emoji/apple/ledger.png differ
diff --git a/public/images/emoji/apple/left_luggage.png b/public/images/emoji/apple/left_luggage.png
index a27f78ca0e..c84a09f0c5 100644
Binary files a/public/images/emoji/apple/left_luggage.png and b/public/images/emoji/apple/left_luggage.png differ
diff --git a/public/images/emoji/apple/left_right_arrow.png b/public/images/emoji/apple/left_right_arrow.png
index ae4e53f32e..e7558ab2a7 100644
Binary files a/public/images/emoji/apple/left_right_arrow.png and b/public/images/emoji/apple/left_right_arrow.png differ
diff --git a/public/images/emoji/apple/left_speech_bubble.png b/public/images/emoji/apple/left_speech_bubble.png
index 69a18462b7..18419968c6 100644
Binary files a/public/images/emoji/apple/left_speech_bubble.png and b/public/images/emoji/apple/left_speech_bubble.png differ
diff --git a/public/images/emoji/apple/leftwards_arrow_with_hook.png b/public/images/emoji/apple/leftwards_arrow_with_hook.png
index 336a408388..2d2407437e 100644
Binary files a/public/images/emoji/apple/leftwards_arrow_with_hook.png and b/public/images/emoji/apple/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/apple/lemon.png b/public/images/emoji/apple/lemon.png
index 2d827455fc..cd7bbeb7a9 100644
Binary files a/public/images/emoji/apple/lemon.png and b/public/images/emoji/apple/lemon.png differ
diff --git a/public/images/emoji/apple/leo.png b/public/images/emoji/apple/leo.png
index 1556f8345f..dbaa3de628 100644
Binary files a/public/images/emoji/apple/leo.png and b/public/images/emoji/apple/leo.png differ
diff --git a/public/images/emoji/apple/leopard.png b/public/images/emoji/apple/leopard.png
index 0ece19dbb2..e4386c4234 100644
Binary files a/public/images/emoji/apple/leopard.png and b/public/images/emoji/apple/leopard.png differ
diff --git a/public/images/emoji/apple/lesotho.png b/public/images/emoji/apple/lesotho.png
index e4f431dad8..e124dca10f 100644
Binary files a/public/images/emoji/apple/lesotho.png and b/public/images/emoji/apple/lesotho.png differ
diff --git a/public/images/emoji/apple/level_slider.png b/public/images/emoji/apple/level_slider.png
index 99a962dcc1..9d6d9d75b8 100644
Binary files a/public/images/emoji/apple/level_slider.png and b/public/images/emoji/apple/level_slider.png differ
diff --git a/public/images/emoji/apple/levitate.png b/public/images/emoji/apple/levitate.png
index 00ae1282f1..18cd801da6 100644
Binary files a/public/images/emoji/apple/levitate.png and b/public/images/emoji/apple/levitate.png differ
diff --git a/public/images/emoji/apple/levitate/2.png b/public/images/emoji/apple/levitate/2.png
index 369be94783..6609e435cb 100644
Binary files a/public/images/emoji/apple/levitate/2.png and b/public/images/emoji/apple/levitate/2.png differ
diff --git a/public/images/emoji/apple/levitate/3.png b/public/images/emoji/apple/levitate/3.png
index f81f47f274..77db5393d7 100644
Binary files a/public/images/emoji/apple/levitate/3.png and b/public/images/emoji/apple/levitate/3.png differ
diff --git a/public/images/emoji/apple/levitate/4.png b/public/images/emoji/apple/levitate/4.png
index b355778d9f..e9d1ad046a 100644
Binary files a/public/images/emoji/apple/levitate/4.png and b/public/images/emoji/apple/levitate/4.png differ
diff --git a/public/images/emoji/apple/levitate/5.png b/public/images/emoji/apple/levitate/5.png
index f348ca68e3..16ac6699bf 100644
Binary files a/public/images/emoji/apple/levitate/5.png and b/public/images/emoji/apple/levitate/5.png differ
diff --git a/public/images/emoji/apple/levitate/6.png b/public/images/emoji/apple/levitate/6.png
index 232f1c2dc2..68d5680a93 100644
Binary files a/public/images/emoji/apple/levitate/6.png and b/public/images/emoji/apple/levitate/6.png differ
diff --git a/public/images/emoji/apple/liberia.png b/public/images/emoji/apple/liberia.png
index de7b2a957a..3c1e22dacf 100644
Binary files a/public/images/emoji/apple/liberia.png and b/public/images/emoji/apple/liberia.png differ
diff --git a/public/images/emoji/apple/libra.png b/public/images/emoji/apple/libra.png
index 5fb39d7ca2..8385fd76be 100644
Binary files a/public/images/emoji/apple/libra.png and b/public/images/emoji/apple/libra.png differ
diff --git a/public/images/emoji/apple/libya.png b/public/images/emoji/apple/libya.png
index 30437ab1fb..d7f997a2af 100644
Binary files a/public/images/emoji/apple/libya.png and b/public/images/emoji/apple/libya.png differ
diff --git a/public/images/emoji/apple/liechtenstein.png b/public/images/emoji/apple/liechtenstein.png
index 6046b94e9f..edaeee24e5 100644
Binary files a/public/images/emoji/apple/liechtenstein.png and b/public/images/emoji/apple/liechtenstein.png differ
diff --git a/public/images/emoji/apple/lifter.png b/public/images/emoji/apple/lifter.png
index 9cebc0e16d..c5407cdcbb 100644
Binary files a/public/images/emoji/apple/lifter.png and b/public/images/emoji/apple/lifter.png differ
diff --git a/public/images/emoji/apple/lifter/2.png b/public/images/emoji/apple/lifter/2.png
index df54bd55f9..1f80bc4259 100644
Binary files a/public/images/emoji/apple/lifter/2.png and b/public/images/emoji/apple/lifter/2.png differ
diff --git a/public/images/emoji/apple/lifter/3.png b/public/images/emoji/apple/lifter/3.png
index dafe388c95..f6615f540e 100644
Binary files a/public/images/emoji/apple/lifter/3.png and b/public/images/emoji/apple/lifter/3.png differ
diff --git a/public/images/emoji/apple/lifter/4.png b/public/images/emoji/apple/lifter/4.png
index ecf9101aa9..5c3a2d7ffb 100644
Binary files a/public/images/emoji/apple/lifter/4.png and b/public/images/emoji/apple/lifter/4.png differ
diff --git a/public/images/emoji/apple/lifter/5.png b/public/images/emoji/apple/lifter/5.png
index cd1c9aad39..d2d765acaa 100644
Binary files a/public/images/emoji/apple/lifter/5.png and b/public/images/emoji/apple/lifter/5.png differ
diff --git a/public/images/emoji/apple/lifter/6.png b/public/images/emoji/apple/lifter/6.png
index 1afa3bea2c..9a9f4f1656 100644
Binary files a/public/images/emoji/apple/lifter/6.png and b/public/images/emoji/apple/lifter/6.png differ
diff --git a/public/images/emoji/apple/light_rail.png b/public/images/emoji/apple/light_rail.png
index 591c3c6614..d4f9743a23 100644
Binary files a/public/images/emoji/apple/light_rail.png and b/public/images/emoji/apple/light_rail.png differ
diff --git a/public/images/emoji/apple/link.png b/public/images/emoji/apple/link.png
index d24ae9054b..6f8c91d95c 100644
Binary files a/public/images/emoji/apple/link.png and b/public/images/emoji/apple/link.png differ
diff --git a/public/images/emoji/apple/linked_paperclips.png b/public/images/emoji/apple/linked_paperclips.png
index 235e2049c3..2ecf66a569 100644
Binary files a/public/images/emoji/apple/linked_paperclips.png and b/public/images/emoji/apple/linked_paperclips.png differ
diff --git a/public/images/emoji/apple/lion.png b/public/images/emoji/apple/lion.png
index f07e438beb..0b8bbf0f51 100644
Binary files a/public/images/emoji/apple/lion.png and b/public/images/emoji/apple/lion.png differ
diff --git a/public/images/emoji/apple/lion_face.png b/public/images/emoji/apple/lion_face.png
index f07e438beb..0b8bbf0f51 100644
Binary files a/public/images/emoji/apple/lion_face.png and b/public/images/emoji/apple/lion_face.png differ
diff --git a/public/images/emoji/apple/lips.png b/public/images/emoji/apple/lips.png
index bf3850fa06..eda374fb31 100644
Binary files a/public/images/emoji/apple/lips.png and b/public/images/emoji/apple/lips.png differ
diff --git a/public/images/emoji/apple/lipstick.png b/public/images/emoji/apple/lipstick.png
index d4ee8baa40..ea7e204a53 100644
Binary files a/public/images/emoji/apple/lipstick.png and b/public/images/emoji/apple/lipstick.png differ
diff --git a/public/images/emoji/apple/lithuania.png b/public/images/emoji/apple/lithuania.png
index c6cf99bf21..a9021c57b8 100644
Binary files a/public/images/emoji/apple/lithuania.png and b/public/images/emoji/apple/lithuania.png differ
diff --git a/public/images/emoji/apple/lizard.png b/public/images/emoji/apple/lizard.png
index 0eaa196dc1..7f3c8220ab 100644
Binary files a/public/images/emoji/apple/lizard.png and b/public/images/emoji/apple/lizard.png differ
diff --git a/public/images/emoji/apple/lock.png b/public/images/emoji/apple/lock.png
index da37d71257..b7679b1af5 100644
Binary files a/public/images/emoji/apple/lock.png and b/public/images/emoji/apple/lock.png differ
diff --git a/public/images/emoji/apple/lock_with_ink_pen.png b/public/images/emoji/apple/lock_with_ink_pen.png
index 04f26eae33..65f6c0f879 100644
Binary files a/public/images/emoji/apple/lock_with_ink_pen.png and b/public/images/emoji/apple/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/apple/lollipop.png b/public/images/emoji/apple/lollipop.png
index 67fa99b23e..b3961d35fa 100644
Binary files a/public/images/emoji/apple/lollipop.png and b/public/images/emoji/apple/lollipop.png differ
diff --git a/public/images/emoji/apple/loop.png b/public/images/emoji/apple/loop.png
index 5546184289..5f3a78b728 100644
Binary files a/public/images/emoji/apple/loop.png and b/public/images/emoji/apple/loop.png differ
diff --git a/public/images/emoji/apple/loud_sound.png b/public/images/emoji/apple/loud_sound.png
index b5d6232286..e3ed324e86 100644
Binary files a/public/images/emoji/apple/loud_sound.png and b/public/images/emoji/apple/loud_sound.png differ
diff --git a/public/images/emoji/apple/loudspeaker.png b/public/images/emoji/apple/loudspeaker.png
index 532254bb10..c8c163e41e 100644
Binary files a/public/images/emoji/apple/loudspeaker.png and b/public/images/emoji/apple/loudspeaker.png differ
diff --git a/public/images/emoji/apple/love_hotel.png b/public/images/emoji/apple/love_hotel.png
index a31a8f40a4..04b72394f2 100644
Binary files a/public/images/emoji/apple/love_hotel.png and b/public/images/emoji/apple/love_hotel.png differ
diff --git a/public/images/emoji/apple/love_letter.png b/public/images/emoji/apple/love_letter.png
index 452d90564a..4e95460aa4 100644
Binary files a/public/images/emoji/apple/love_letter.png and b/public/images/emoji/apple/love_letter.png differ
diff --git a/public/images/emoji/apple/love_you_gesture.png b/public/images/emoji/apple/love_you_gesture.png
index 14ef7c72b2..ca8b5578ef 100644
Binary files a/public/images/emoji/apple/love_you_gesture.png and b/public/images/emoji/apple/love_you_gesture.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/2.png b/public/images/emoji/apple/love_you_gesture/2.png
index b70217e894..8332caa9a2 100644
Binary files a/public/images/emoji/apple/love_you_gesture/2.png and b/public/images/emoji/apple/love_you_gesture/2.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/3.png b/public/images/emoji/apple/love_you_gesture/3.png
index aa984ea926..01c92dcb9a 100644
Binary files a/public/images/emoji/apple/love_you_gesture/3.png and b/public/images/emoji/apple/love_you_gesture/3.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/4.png b/public/images/emoji/apple/love_you_gesture/4.png
index 5decb0e800..51108e500d 100644
Binary files a/public/images/emoji/apple/love_you_gesture/4.png and b/public/images/emoji/apple/love_you_gesture/4.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/5.png b/public/images/emoji/apple/love_you_gesture/5.png
index e0bb218cc0..5f19e705c5 100644
Binary files a/public/images/emoji/apple/love_you_gesture/5.png and b/public/images/emoji/apple/love_you_gesture/5.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/6.png b/public/images/emoji/apple/love_you_gesture/6.png
index bb51bde8bb..35f9516f30 100644
Binary files a/public/images/emoji/apple/love_you_gesture/6.png and b/public/images/emoji/apple/love_you_gesture/6.png differ
diff --git a/public/images/emoji/apple/low_brightness.png b/public/images/emoji/apple/low_brightness.png
index 3602ba9cf7..9a6ddfd52a 100644
Binary files a/public/images/emoji/apple/low_brightness.png and b/public/images/emoji/apple/low_brightness.png differ
diff --git a/public/images/emoji/apple/lower_left_ballpoint_pen.png b/public/images/emoji/apple/lower_left_ballpoint_pen.png
index b9e79ad214..1b7c4d629e 100644
Binary files a/public/images/emoji/apple/lower_left_ballpoint_pen.png and b/public/images/emoji/apple/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/apple/lower_left_crayon.png b/public/images/emoji/apple/lower_left_crayon.png
index eaf918c81f..5d0d3713e1 100644
Binary files a/public/images/emoji/apple/lower_left_crayon.png and b/public/images/emoji/apple/lower_left_crayon.png differ
diff --git a/public/images/emoji/apple/lower_left_fountain_pen.png b/public/images/emoji/apple/lower_left_fountain_pen.png
index a9a947848d..b224d353a9 100644
Binary files a/public/images/emoji/apple/lower_left_fountain_pen.png and b/public/images/emoji/apple/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/apple/lower_left_paintbrush.png b/public/images/emoji/apple/lower_left_paintbrush.png
index 2b02f0ad03..8fe075ea8a 100644
Binary files a/public/images/emoji/apple/lower_left_paintbrush.png and b/public/images/emoji/apple/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/apple/luxembourg.png b/public/images/emoji/apple/luxembourg.png
index 3a2bba0528..369c07d9bf 100644
Binary files a/public/images/emoji/apple/luxembourg.png and b/public/images/emoji/apple/luxembourg.png differ
diff --git a/public/images/emoji/apple/lying_face.png b/public/images/emoji/apple/lying_face.png
index 2df4a358d3..aa2c35ac68 100644
Binary files a/public/images/emoji/apple/lying_face.png and b/public/images/emoji/apple/lying_face.png differ
diff --git a/public/images/emoji/apple/m.png b/public/images/emoji/apple/m.png
index e7c67de00e..0efcfaa43c 100644
Binary files a/public/images/emoji/apple/m.png and b/public/images/emoji/apple/m.png differ
diff --git a/public/images/emoji/apple/macau.png b/public/images/emoji/apple/macau.png
index 6199face70..3401e90dd2 100644
Binary files a/public/images/emoji/apple/macau.png and b/public/images/emoji/apple/macau.png differ
diff --git a/public/images/emoji/apple/macedonia.png b/public/images/emoji/apple/macedonia.png
index 4e6457d2d5..cc77700035 100644
Binary files a/public/images/emoji/apple/macedonia.png and b/public/images/emoji/apple/macedonia.png differ
diff --git a/public/images/emoji/apple/madagascar.png b/public/images/emoji/apple/madagascar.png
index a4e779a2c9..04c19c4dc2 100644
Binary files a/public/images/emoji/apple/madagascar.png and b/public/images/emoji/apple/madagascar.png differ
diff --git a/public/images/emoji/apple/mag.png b/public/images/emoji/apple/mag.png
index fda41d19b8..f80564eb44 100644
Binary files a/public/images/emoji/apple/mag.png and b/public/images/emoji/apple/mag.png differ
diff --git a/public/images/emoji/apple/mag_right.png b/public/images/emoji/apple/mag_right.png
index 8ac9ef1617..ac293dd469 100644
Binary files a/public/images/emoji/apple/mag_right.png and b/public/images/emoji/apple/mag_right.png differ
diff --git a/public/images/emoji/apple/mage.png b/public/images/emoji/apple/mage.png
index 71c1b13f92..5bb0d7fc6a 100644
Binary files a/public/images/emoji/apple/mage.png and b/public/images/emoji/apple/mage.png differ
diff --git a/public/images/emoji/apple/mage/2.png b/public/images/emoji/apple/mage/2.png
index 823f6843fa..b68c921de5 100644
Binary files a/public/images/emoji/apple/mage/2.png and b/public/images/emoji/apple/mage/2.png differ
diff --git a/public/images/emoji/apple/mage/3.png b/public/images/emoji/apple/mage/3.png
index c2ff6622a0..4c56b628e2 100644
Binary files a/public/images/emoji/apple/mage/3.png and b/public/images/emoji/apple/mage/3.png differ
diff --git a/public/images/emoji/apple/mage/4.png b/public/images/emoji/apple/mage/4.png
index 76d0a52e37..7d40792aa3 100644
Binary files a/public/images/emoji/apple/mage/4.png and b/public/images/emoji/apple/mage/4.png differ
diff --git a/public/images/emoji/apple/mage/5.png b/public/images/emoji/apple/mage/5.png
index ddb5de5580..d4f50c6490 100644
Binary files a/public/images/emoji/apple/mage/5.png and b/public/images/emoji/apple/mage/5.png differ
diff --git a/public/images/emoji/apple/mage/6.png b/public/images/emoji/apple/mage/6.png
index 302dd62dfb..c2e41ba5d3 100644
Binary files a/public/images/emoji/apple/mage/6.png and b/public/images/emoji/apple/mage/6.png differ
diff --git a/public/images/emoji/apple/mahjong.png b/public/images/emoji/apple/mahjong.png
index 1bdcdec664..9e9470642a 100644
Binary files a/public/images/emoji/apple/mahjong.png and b/public/images/emoji/apple/mahjong.png differ
diff --git a/public/images/emoji/apple/mailbox.png b/public/images/emoji/apple/mailbox.png
index 28f703c8ed..0942161dfb 100644
Binary files a/public/images/emoji/apple/mailbox.png and b/public/images/emoji/apple/mailbox.png differ
diff --git a/public/images/emoji/apple/mailbox_closed.png b/public/images/emoji/apple/mailbox_closed.png
index 6750b24177..e24fa5abc8 100644
Binary files a/public/images/emoji/apple/mailbox_closed.png and b/public/images/emoji/apple/mailbox_closed.png differ
diff --git a/public/images/emoji/apple/mailbox_with_mail.png b/public/images/emoji/apple/mailbox_with_mail.png
index adf3a8218f..36e6bbbfd4 100644
Binary files a/public/images/emoji/apple/mailbox_with_mail.png and b/public/images/emoji/apple/mailbox_with_mail.png differ
diff --git a/public/images/emoji/apple/mailbox_with_no_mail.png b/public/images/emoji/apple/mailbox_with_no_mail.png
index eaa5134360..5623196e87 100644
Binary files a/public/images/emoji/apple/mailbox_with_no_mail.png and b/public/images/emoji/apple/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/apple/malawi.png b/public/images/emoji/apple/malawi.png
index dea46a2af0..5488b461aa 100644
Binary files a/public/images/emoji/apple/malawi.png and b/public/images/emoji/apple/malawi.png differ
diff --git a/public/images/emoji/apple/malaysia.png b/public/images/emoji/apple/malaysia.png
index 01bd5a75bd..42634362b8 100644
Binary files a/public/images/emoji/apple/malaysia.png and b/public/images/emoji/apple/malaysia.png differ
diff --git a/public/images/emoji/apple/maldives.png b/public/images/emoji/apple/maldives.png
index 757cf7ec8d..a064111fbe 100644
Binary files a/public/images/emoji/apple/maldives.png and b/public/images/emoji/apple/maldives.png differ
diff --git a/public/images/emoji/apple/male_couple_with_heart.png b/public/images/emoji/apple/male_couple_with_heart.png
index 41f436aa54..8071276915 100644
Binary files a/public/images/emoji/apple/male_couple_with_heart.png and b/public/images/emoji/apple/male_couple_with_heart.png differ
diff --git a/public/images/emoji/apple/male_couplekiss.png b/public/images/emoji/apple/male_couplekiss.png
index 87fd1ce113..ae212c3277 100644
Binary files a/public/images/emoji/apple/male_couplekiss.png and b/public/images/emoji/apple/male_couplekiss.png differ
diff --git a/public/images/emoji/apple/male_detective.png b/public/images/emoji/apple/male_detective.png
index 6a7e53aff0..60344f7f62 100644
Binary files a/public/images/emoji/apple/male_detective.png and b/public/images/emoji/apple/male_detective.png differ
diff --git a/public/images/emoji/apple/male_detective/2.png b/public/images/emoji/apple/male_detective/2.png
index 229e7c2986..52517d9f74 100644
Binary files a/public/images/emoji/apple/male_detective/2.png and b/public/images/emoji/apple/male_detective/2.png differ
diff --git a/public/images/emoji/apple/male_detective/3.png b/public/images/emoji/apple/male_detective/3.png
index 58ee54ac88..33d8bb3606 100644
Binary files a/public/images/emoji/apple/male_detective/3.png and b/public/images/emoji/apple/male_detective/3.png differ
diff --git a/public/images/emoji/apple/male_detective/4.png b/public/images/emoji/apple/male_detective/4.png
index 0ce63e8b7d..0643cf4fe5 100644
Binary files a/public/images/emoji/apple/male_detective/4.png and b/public/images/emoji/apple/male_detective/4.png differ
diff --git a/public/images/emoji/apple/male_detective/5.png b/public/images/emoji/apple/male_detective/5.png
index 838cf318fe..70405882ea 100644
Binary files a/public/images/emoji/apple/male_detective/5.png and b/public/images/emoji/apple/male_detective/5.png differ
diff --git a/public/images/emoji/apple/male_detective/6.png b/public/images/emoji/apple/male_detective/6.png
index e0cb2a0d2a..bb334320aa 100644
Binary files a/public/images/emoji/apple/male_detective/6.png and b/public/images/emoji/apple/male_detective/6.png differ
diff --git a/public/images/emoji/apple/mali.png b/public/images/emoji/apple/mali.png
index c24e4ee765..2d356bd49a 100644
Binary files a/public/images/emoji/apple/mali.png and b/public/images/emoji/apple/mali.png differ
diff --git a/public/images/emoji/apple/malta.png b/public/images/emoji/apple/malta.png
index 22e114c435..0997ca71b1 100644
Binary files a/public/images/emoji/apple/malta.png and b/public/images/emoji/apple/malta.png differ
diff --git a/public/images/emoji/apple/man.png b/public/images/emoji/apple/man.png
index d0a76900dd..3d437cfb22 100644
Binary files a/public/images/emoji/apple/man.png and b/public/images/emoji/apple/man.png differ
diff --git a/public/images/emoji/apple/man/2.png b/public/images/emoji/apple/man/2.png
index 3e2e9ec418..9512c86b92 100644
Binary files a/public/images/emoji/apple/man/2.png and b/public/images/emoji/apple/man/2.png differ
diff --git a/public/images/emoji/apple/man/3.png b/public/images/emoji/apple/man/3.png
index f43bf4122f..60338bca87 100644
Binary files a/public/images/emoji/apple/man/3.png and b/public/images/emoji/apple/man/3.png differ
diff --git a/public/images/emoji/apple/man/4.png b/public/images/emoji/apple/man/4.png
index ad967fa052..3bbb623f72 100644
Binary files a/public/images/emoji/apple/man/4.png and b/public/images/emoji/apple/man/4.png differ
diff --git a/public/images/emoji/apple/man/5.png b/public/images/emoji/apple/man/5.png
index 8156d59cdb..00d5963187 100644
Binary files a/public/images/emoji/apple/man/5.png and b/public/images/emoji/apple/man/5.png differ
diff --git a/public/images/emoji/apple/man/6.png b/public/images/emoji/apple/man/6.png
index 5ebceb4900..4ce801740a 100644
Binary files a/public/images/emoji/apple/man/6.png and b/public/images/emoji/apple/man/6.png differ
diff --git a/public/images/emoji/apple/man_artist.png b/public/images/emoji/apple/man_artist.png
index 8825c9dfbd..4c50caaaaa 100644
Binary files a/public/images/emoji/apple/man_artist.png and b/public/images/emoji/apple/man_artist.png differ
diff --git a/public/images/emoji/apple/man_artist/2.png b/public/images/emoji/apple/man_artist/2.png
index afbf7f49d7..f0e1359522 100644
Binary files a/public/images/emoji/apple/man_artist/2.png and b/public/images/emoji/apple/man_artist/2.png differ
diff --git a/public/images/emoji/apple/man_artist/3.png b/public/images/emoji/apple/man_artist/3.png
index 0cdc7cb931..0353c4a894 100644
Binary files a/public/images/emoji/apple/man_artist/3.png and b/public/images/emoji/apple/man_artist/3.png differ
diff --git a/public/images/emoji/apple/man_artist/4.png b/public/images/emoji/apple/man_artist/4.png
index 6470b26527..c50a7f9b0f 100644
Binary files a/public/images/emoji/apple/man_artist/4.png and b/public/images/emoji/apple/man_artist/4.png differ
diff --git a/public/images/emoji/apple/man_artist/5.png b/public/images/emoji/apple/man_artist/5.png
index f365388e81..fab595be20 100644
Binary files a/public/images/emoji/apple/man_artist/5.png and b/public/images/emoji/apple/man_artist/5.png differ
diff --git a/public/images/emoji/apple/man_artist/6.png b/public/images/emoji/apple/man_artist/6.png
index ef1df03198..3d0e88488d 100644
Binary files a/public/images/emoji/apple/man_artist/6.png and b/public/images/emoji/apple/man_artist/6.png differ
diff --git a/public/images/emoji/apple/man_astronaut.png b/public/images/emoji/apple/man_astronaut.png
index db6c2cf7f1..67c2aedab8 100644
Binary files a/public/images/emoji/apple/man_astronaut.png and b/public/images/emoji/apple/man_astronaut.png differ
diff --git a/public/images/emoji/apple/man_astronaut/2.png b/public/images/emoji/apple/man_astronaut/2.png
index 3409623591..b6f68722a9 100644
Binary files a/public/images/emoji/apple/man_astronaut/2.png and b/public/images/emoji/apple/man_astronaut/2.png differ
diff --git a/public/images/emoji/apple/man_astronaut/3.png b/public/images/emoji/apple/man_astronaut/3.png
index 5764d5d897..eace4256d8 100644
Binary files a/public/images/emoji/apple/man_astronaut/3.png and b/public/images/emoji/apple/man_astronaut/3.png differ
diff --git a/public/images/emoji/apple/man_astronaut/4.png b/public/images/emoji/apple/man_astronaut/4.png
index 45b6438095..ca62d764e3 100644
Binary files a/public/images/emoji/apple/man_astronaut/4.png and b/public/images/emoji/apple/man_astronaut/4.png differ
diff --git a/public/images/emoji/apple/man_astronaut/5.png b/public/images/emoji/apple/man_astronaut/5.png
index 6d255ce511..7b326564f7 100644
Binary files a/public/images/emoji/apple/man_astronaut/5.png and b/public/images/emoji/apple/man_astronaut/5.png differ
diff --git a/public/images/emoji/apple/man_astronaut/6.png b/public/images/emoji/apple/man_astronaut/6.png
index 21bcecc02e..8b41809f48 100644
Binary files a/public/images/emoji/apple/man_astronaut/6.png and b/public/images/emoji/apple/man_astronaut/6.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling.png b/public/images/emoji/apple/man_cartwheeling.png
index 3ae0143de5..d4d46603b8 100644
Binary files a/public/images/emoji/apple/man_cartwheeling.png and b/public/images/emoji/apple/man_cartwheeling.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/2.png b/public/images/emoji/apple/man_cartwheeling/2.png
index 8b0bc4ccb4..bb76deed91 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/2.png and b/public/images/emoji/apple/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/3.png b/public/images/emoji/apple/man_cartwheeling/3.png
index 70a34fab0d..0d4be46537 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/3.png and b/public/images/emoji/apple/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/4.png b/public/images/emoji/apple/man_cartwheeling/4.png
index 2b1c7918fa..3ce949bcc3 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/4.png and b/public/images/emoji/apple/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/5.png b/public/images/emoji/apple/man_cartwheeling/5.png
index 6b8e66c1e7..c62ac6a148 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/5.png and b/public/images/emoji/apple/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/6.png b/public/images/emoji/apple/man_cartwheeling/6.png
index 000ce582f5..b03df5a76c 100644
Binary files a/public/images/emoji/apple/man_cartwheeling/6.png and b/public/images/emoji/apple/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/apple/man_cook.png b/public/images/emoji/apple/man_cook.png
index a011061836..019dfae88a 100644
Binary files a/public/images/emoji/apple/man_cook.png and b/public/images/emoji/apple/man_cook.png differ
diff --git a/public/images/emoji/apple/man_cook/2.png b/public/images/emoji/apple/man_cook/2.png
index ad08f530f9..9b33357a44 100644
Binary files a/public/images/emoji/apple/man_cook/2.png and b/public/images/emoji/apple/man_cook/2.png differ
diff --git a/public/images/emoji/apple/man_cook/3.png b/public/images/emoji/apple/man_cook/3.png
index f99f2eab1d..2654f75180 100644
Binary files a/public/images/emoji/apple/man_cook/3.png and b/public/images/emoji/apple/man_cook/3.png differ
diff --git a/public/images/emoji/apple/man_cook/4.png b/public/images/emoji/apple/man_cook/4.png
index 982cbe9d8b..1f4817ed87 100644
Binary files a/public/images/emoji/apple/man_cook/4.png and b/public/images/emoji/apple/man_cook/4.png differ
diff --git a/public/images/emoji/apple/man_cook/5.png b/public/images/emoji/apple/man_cook/5.png
index e81965aa08..5698802389 100644
Binary files a/public/images/emoji/apple/man_cook/5.png and b/public/images/emoji/apple/man_cook/5.png differ
diff --git a/public/images/emoji/apple/man_cook/6.png b/public/images/emoji/apple/man_cook/6.png
index 8879029ef8..d2ae0eca5c 100644
Binary files a/public/images/emoji/apple/man_cook/6.png and b/public/images/emoji/apple/man_cook/6.png differ
diff --git a/public/images/emoji/apple/man_dancing.png b/public/images/emoji/apple/man_dancing.png
index 0af681bdae..ec1bcd3b2d 100644
Binary files a/public/images/emoji/apple/man_dancing.png and b/public/images/emoji/apple/man_dancing.png differ
diff --git a/public/images/emoji/apple/man_dancing/2.png b/public/images/emoji/apple/man_dancing/2.png
index 1dfccb36c7..94ac567f42 100644
Binary files a/public/images/emoji/apple/man_dancing/2.png and b/public/images/emoji/apple/man_dancing/2.png differ
diff --git a/public/images/emoji/apple/man_dancing/3.png b/public/images/emoji/apple/man_dancing/3.png
index 04a83acaff..26459ca18a 100644
Binary files a/public/images/emoji/apple/man_dancing/3.png and b/public/images/emoji/apple/man_dancing/3.png differ
diff --git a/public/images/emoji/apple/man_dancing/4.png b/public/images/emoji/apple/man_dancing/4.png
index 33b8a9427c..a1c632b595 100644
Binary files a/public/images/emoji/apple/man_dancing/4.png and b/public/images/emoji/apple/man_dancing/4.png differ
diff --git a/public/images/emoji/apple/man_dancing/5.png b/public/images/emoji/apple/man_dancing/5.png
index 02c985dcf0..c958651756 100644
Binary files a/public/images/emoji/apple/man_dancing/5.png and b/public/images/emoji/apple/man_dancing/5.png differ
diff --git a/public/images/emoji/apple/man_dancing/6.png b/public/images/emoji/apple/man_dancing/6.png
index 68e4dcd550..222b091dc2 100644
Binary files a/public/images/emoji/apple/man_dancing/6.png and b/public/images/emoji/apple/man_dancing/6.png differ
diff --git a/public/images/emoji/apple/man_facepalming.png b/public/images/emoji/apple/man_facepalming.png
index 543ef7e646..f1dd18c8bc 100644
Binary files a/public/images/emoji/apple/man_facepalming.png and b/public/images/emoji/apple/man_facepalming.png differ
diff --git a/public/images/emoji/apple/man_facepalming/2.png b/public/images/emoji/apple/man_facepalming/2.png
index ad95734385..4ab51cf578 100644
Binary files a/public/images/emoji/apple/man_facepalming/2.png and b/public/images/emoji/apple/man_facepalming/2.png differ
diff --git a/public/images/emoji/apple/man_facepalming/3.png b/public/images/emoji/apple/man_facepalming/3.png
index ef4d91dd2f..308e327687 100644
Binary files a/public/images/emoji/apple/man_facepalming/3.png and b/public/images/emoji/apple/man_facepalming/3.png differ
diff --git a/public/images/emoji/apple/man_facepalming/4.png b/public/images/emoji/apple/man_facepalming/4.png
index 365d50bf7d..834e64bb0a 100644
Binary files a/public/images/emoji/apple/man_facepalming/4.png and b/public/images/emoji/apple/man_facepalming/4.png differ
diff --git a/public/images/emoji/apple/man_facepalming/5.png b/public/images/emoji/apple/man_facepalming/5.png
index b72399279b..e47fb9ecf5 100644
Binary files a/public/images/emoji/apple/man_facepalming/5.png and b/public/images/emoji/apple/man_facepalming/5.png differ
diff --git a/public/images/emoji/apple/man_facepalming/6.png b/public/images/emoji/apple/man_facepalming/6.png
index f9020c975a..b32e629c18 100644
Binary files a/public/images/emoji/apple/man_facepalming/6.png and b/public/images/emoji/apple/man_facepalming/6.png differ
diff --git a/public/images/emoji/apple/man_factory_worker.png b/public/images/emoji/apple/man_factory_worker.png
index a6c98168ef..0c97c7a77e 100644
Binary files a/public/images/emoji/apple/man_factory_worker.png and b/public/images/emoji/apple/man_factory_worker.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/2.png b/public/images/emoji/apple/man_factory_worker/2.png
index 85e4c58177..cec0761dc3 100644
Binary files a/public/images/emoji/apple/man_factory_worker/2.png and b/public/images/emoji/apple/man_factory_worker/2.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/3.png b/public/images/emoji/apple/man_factory_worker/3.png
index 2768e7c782..d7dca71f74 100644
Binary files a/public/images/emoji/apple/man_factory_worker/3.png and b/public/images/emoji/apple/man_factory_worker/3.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/4.png b/public/images/emoji/apple/man_factory_worker/4.png
index 5057d5ca9c..82c6f1f12b 100644
Binary files a/public/images/emoji/apple/man_factory_worker/4.png and b/public/images/emoji/apple/man_factory_worker/4.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/5.png b/public/images/emoji/apple/man_factory_worker/5.png
index bb55256aff..b205dcefa1 100644
Binary files a/public/images/emoji/apple/man_factory_worker/5.png and b/public/images/emoji/apple/man_factory_worker/5.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/6.png b/public/images/emoji/apple/man_factory_worker/6.png
index a1c8677fdb..d20ecbb5d3 100644
Binary files a/public/images/emoji/apple/man_factory_worker/6.png and b/public/images/emoji/apple/man_factory_worker/6.png differ
diff --git a/public/images/emoji/apple/man_farmer.png b/public/images/emoji/apple/man_farmer.png
index a6d9c8f88f..e08c9f4137 100644
Binary files a/public/images/emoji/apple/man_farmer.png and b/public/images/emoji/apple/man_farmer.png differ
diff --git a/public/images/emoji/apple/man_farmer/2.png b/public/images/emoji/apple/man_farmer/2.png
index 252e6be1bc..01b9ae6bfb 100644
Binary files a/public/images/emoji/apple/man_farmer/2.png and b/public/images/emoji/apple/man_farmer/2.png differ
diff --git a/public/images/emoji/apple/man_farmer/3.png b/public/images/emoji/apple/man_farmer/3.png
index 0ceac01ec9..3ac2988f5b 100644
Binary files a/public/images/emoji/apple/man_farmer/3.png and b/public/images/emoji/apple/man_farmer/3.png differ
diff --git a/public/images/emoji/apple/man_farmer/4.png b/public/images/emoji/apple/man_farmer/4.png
index 85ae21b240..f6745ade49 100644
Binary files a/public/images/emoji/apple/man_farmer/4.png and b/public/images/emoji/apple/man_farmer/4.png differ
diff --git a/public/images/emoji/apple/man_farmer/5.png b/public/images/emoji/apple/man_farmer/5.png
index e38b0704e1..68942651e3 100644
Binary files a/public/images/emoji/apple/man_farmer/5.png and b/public/images/emoji/apple/man_farmer/5.png differ
diff --git a/public/images/emoji/apple/man_farmer/6.png b/public/images/emoji/apple/man_farmer/6.png
index f204cf6de8..873114c1eb 100644
Binary files a/public/images/emoji/apple/man_farmer/6.png and b/public/images/emoji/apple/man_farmer/6.png differ
diff --git a/public/images/emoji/apple/man_firefighter.png b/public/images/emoji/apple/man_firefighter.png
index ca4f97c0dc..a11cee8c6f 100644
Binary files a/public/images/emoji/apple/man_firefighter.png and b/public/images/emoji/apple/man_firefighter.png differ
diff --git a/public/images/emoji/apple/man_firefighter/2.png b/public/images/emoji/apple/man_firefighter/2.png
index 17d673e75e..53b04f9237 100644
Binary files a/public/images/emoji/apple/man_firefighter/2.png and b/public/images/emoji/apple/man_firefighter/2.png differ
diff --git a/public/images/emoji/apple/man_firefighter/3.png b/public/images/emoji/apple/man_firefighter/3.png
index c91a3d9a5b..f4ad8ce0b7 100644
Binary files a/public/images/emoji/apple/man_firefighter/3.png and b/public/images/emoji/apple/man_firefighter/3.png differ
diff --git a/public/images/emoji/apple/man_firefighter/4.png b/public/images/emoji/apple/man_firefighter/4.png
index b55329cb03..35602c5d10 100644
Binary files a/public/images/emoji/apple/man_firefighter/4.png and b/public/images/emoji/apple/man_firefighter/4.png differ
diff --git a/public/images/emoji/apple/man_firefighter/5.png b/public/images/emoji/apple/man_firefighter/5.png
index b6424288c9..04bbac1a44 100644
Binary files a/public/images/emoji/apple/man_firefighter/5.png and b/public/images/emoji/apple/man_firefighter/5.png differ
diff --git a/public/images/emoji/apple/man_firefighter/6.png b/public/images/emoji/apple/man_firefighter/6.png
index 767f788ad7..42ac72b439 100644
Binary files a/public/images/emoji/apple/man_firefighter/6.png and b/public/images/emoji/apple/man_firefighter/6.png differ
diff --git a/public/images/emoji/apple/man_health_worker.png b/public/images/emoji/apple/man_health_worker.png
index 34c3c1b819..d2eff7440f 100644
Binary files a/public/images/emoji/apple/man_health_worker.png and b/public/images/emoji/apple/man_health_worker.png differ
diff --git a/public/images/emoji/apple/man_health_worker/2.png b/public/images/emoji/apple/man_health_worker/2.png
index d2f8d9bd9a..e4c35112c3 100644
Binary files a/public/images/emoji/apple/man_health_worker/2.png and b/public/images/emoji/apple/man_health_worker/2.png differ
diff --git a/public/images/emoji/apple/man_health_worker/3.png b/public/images/emoji/apple/man_health_worker/3.png
index 63ac74f7cb..0a55d59450 100644
Binary files a/public/images/emoji/apple/man_health_worker/3.png and b/public/images/emoji/apple/man_health_worker/3.png differ
diff --git a/public/images/emoji/apple/man_health_worker/4.png b/public/images/emoji/apple/man_health_worker/4.png
index 977149a3ee..54ddc07155 100644
Binary files a/public/images/emoji/apple/man_health_worker/4.png and b/public/images/emoji/apple/man_health_worker/4.png differ
diff --git a/public/images/emoji/apple/man_health_worker/5.png b/public/images/emoji/apple/man_health_worker/5.png
index 822639db0c..27dc910785 100644
Binary files a/public/images/emoji/apple/man_health_worker/5.png and b/public/images/emoji/apple/man_health_worker/5.png differ
diff --git a/public/images/emoji/apple/man_health_worker/6.png b/public/images/emoji/apple/man_health_worker/6.png
index 0c92a8d57c..0e047ec8b1 100644
Binary files a/public/images/emoji/apple/man_health_worker/6.png and b/public/images/emoji/apple/man_health_worker/6.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating.png b/public/images/emoji/apple/man_in_business_suit_levitating.png
index 00ae1282f1..18cd801da6 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating.png and b/public/images/emoji/apple/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/2.png b/public/images/emoji/apple/man_in_business_suit_levitating/2.png
index 369be94783..6609e435cb 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/2.png and b/public/images/emoji/apple/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/3.png b/public/images/emoji/apple/man_in_business_suit_levitating/3.png
index f81f47f274..77db5393d7 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/3.png and b/public/images/emoji/apple/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/4.png b/public/images/emoji/apple/man_in_business_suit_levitating/4.png
index b355778d9f..e9d1ad046a 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/4.png and b/public/images/emoji/apple/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/5.png b/public/images/emoji/apple/man_in_business_suit_levitating/5.png
index f348ca68e3..16ac6699bf 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/5.png and b/public/images/emoji/apple/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/6.png b/public/images/emoji/apple/man_in_business_suit_levitating/6.png
index 232f1c2dc2..68d5680a93 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating/6.png and b/public/images/emoji/apple/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo.png b/public/images/emoji/apple/man_in_tuxedo.png
index d26c5ab748..618d9a2a95 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo.png and b/public/images/emoji/apple/man_in_tuxedo.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/2.png b/public/images/emoji/apple/man_in_tuxedo/2.png
index e111b35e4b..afafd7f4d4 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/2.png and b/public/images/emoji/apple/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/3.png b/public/images/emoji/apple/man_in_tuxedo/3.png
index 3f77f7170e..1870172c09 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/3.png and b/public/images/emoji/apple/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/4.png b/public/images/emoji/apple/man_in_tuxedo/4.png
index b5f066bfc4..a71f7c94fa 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/4.png and b/public/images/emoji/apple/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/5.png b/public/images/emoji/apple/man_in_tuxedo/5.png
index 0af5ba30e4..f3366ed7c2 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/5.png and b/public/images/emoji/apple/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/6.png b/public/images/emoji/apple/man_in_tuxedo/6.png
index d88356fae6..7a934fa81d 100644
Binary files a/public/images/emoji/apple/man_in_tuxedo/6.png and b/public/images/emoji/apple/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/apple/man_judge.png b/public/images/emoji/apple/man_judge.png
index 28a239d66f..5bfe70ba3c 100644
Binary files a/public/images/emoji/apple/man_judge.png and b/public/images/emoji/apple/man_judge.png differ
diff --git a/public/images/emoji/apple/man_judge/2.png b/public/images/emoji/apple/man_judge/2.png
index ca388ecaaf..e77b6be700 100644
Binary files a/public/images/emoji/apple/man_judge/2.png and b/public/images/emoji/apple/man_judge/2.png differ
diff --git a/public/images/emoji/apple/man_judge/3.png b/public/images/emoji/apple/man_judge/3.png
index 5108fa862a..17e3aa92be 100644
Binary files a/public/images/emoji/apple/man_judge/3.png and b/public/images/emoji/apple/man_judge/3.png differ
diff --git a/public/images/emoji/apple/man_judge/4.png b/public/images/emoji/apple/man_judge/4.png
index ece8bf3bbe..3cf300c258 100644
Binary files a/public/images/emoji/apple/man_judge/4.png and b/public/images/emoji/apple/man_judge/4.png differ
diff --git a/public/images/emoji/apple/man_judge/5.png b/public/images/emoji/apple/man_judge/5.png
index 2948e55052..41873d2023 100644
Binary files a/public/images/emoji/apple/man_judge/5.png and b/public/images/emoji/apple/man_judge/5.png differ
diff --git a/public/images/emoji/apple/man_judge/6.png b/public/images/emoji/apple/man_judge/6.png
index 1dcaa33a48..0a22e81d71 100644
Binary files a/public/images/emoji/apple/man_judge/6.png and b/public/images/emoji/apple/man_judge/6.png differ
diff --git a/public/images/emoji/apple/man_juggling.png b/public/images/emoji/apple/man_juggling.png
index 522e573120..126fea39d2 100644
Binary files a/public/images/emoji/apple/man_juggling.png and b/public/images/emoji/apple/man_juggling.png differ
diff --git a/public/images/emoji/apple/man_juggling/2.png b/public/images/emoji/apple/man_juggling/2.png
index c2c687f6c1..c94090420e 100644
Binary files a/public/images/emoji/apple/man_juggling/2.png and b/public/images/emoji/apple/man_juggling/2.png differ
diff --git a/public/images/emoji/apple/man_juggling/3.png b/public/images/emoji/apple/man_juggling/3.png
index feb24708d5..11287ed1fe 100644
Binary files a/public/images/emoji/apple/man_juggling/3.png and b/public/images/emoji/apple/man_juggling/3.png differ
diff --git a/public/images/emoji/apple/man_juggling/4.png b/public/images/emoji/apple/man_juggling/4.png
index 2a414e5c38..6869666051 100644
Binary files a/public/images/emoji/apple/man_juggling/4.png and b/public/images/emoji/apple/man_juggling/4.png differ
diff --git a/public/images/emoji/apple/man_juggling/5.png b/public/images/emoji/apple/man_juggling/5.png
index eb5d2b8d63..f3882c2476 100644
Binary files a/public/images/emoji/apple/man_juggling/5.png and b/public/images/emoji/apple/man_juggling/5.png differ
diff --git a/public/images/emoji/apple/man_juggling/6.png b/public/images/emoji/apple/man_juggling/6.png
index cd2f51c6cd..6f992ff65f 100644
Binary files a/public/images/emoji/apple/man_juggling/6.png and b/public/images/emoji/apple/man_juggling/6.png differ
diff --git a/public/images/emoji/apple/man_mechanic.png b/public/images/emoji/apple/man_mechanic.png
index 434741acd9..1b11da93f9 100644
Binary files a/public/images/emoji/apple/man_mechanic.png and b/public/images/emoji/apple/man_mechanic.png differ
diff --git a/public/images/emoji/apple/man_mechanic/2.png b/public/images/emoji/apple/man_mechanic/2.png
index 4bd7e9831a..c3baa325b8 100644
Binary files a/public/images/emoji/apple/man_mechanic/2.png and b/public/images/emoji/apple/man_mechanic/2.png differ
diff --git a/public/images/emoji/apple/man_mechanic/3.png b/public/images/emoji/apple/man_mechanic/3.png
index 27efe79466..f02df92728 100644
Binary files a/public/images/emoji/apple/man_mechanic/3.png and b/public/images/emoji/apple/man_mechanic/3.png differ
diff --git a/public/images/emoji/apple/man_mechanic/4.png b/public/images/emoji/apple/man_mechanic/4.png
index 8180cb61e1..98cfa58b7f 100644
Binary files a/public/images/emoji/apple/man_mechanic/4.png and b/public/images/emoji/apple/man_mechanic/4.png differ
diff --git a/public/images/emoji/apple/man_mechanic/5.png b/public/images/emoji/apple/man_mechanic/5.png
index bddf8cd8aa..d9a116ee7d 100644
Binary files a/public/images/emoji/apple/man_mechanic/5.png and b/public/images/emoji/apple/man_mechanic/5.png differ
diff --git a/public/images/emoji/apple/man_mechanic/6.png b/public/images/emoji/apple/man_mechanic/6.png
index 6524bc6892..886f6527c3 100644
Binary files a/public/images/emoji/apple/man_mechanic/6.png and b/public/images/emoji/apple/man_mechanic/6.png differ
diff --git a/public/images/emoji/apple/man_office_worker.png b/public/images/emoji/apple/man_office_worker.png
index f571c9515b..581130f900 100644
Binary files a/public/images/emoji/apple/man_office_worker.png and b/public/images/emoji/apple/man_office_worker.png differ
diff --git a/public/images/emoji/apple/man_office_worker/2.png b/public/images/emoji/apple/man_office_worker/2.png
index 35881b6c56..65a172396d 100644
Binary files a/public/images/emoji/apple/man_office_worker/2.png and b/public/images/emoji/apple/man_office_worker/2.png differ
diff --git a/public/images/emoji/apple/man_office_worker/3.png b/public/images/emoji/apple/man_office_worker/3.png
index 4b64ae8c6e..e3294def94 100644
Binary files a/public/images/emoji/apple/man_office_worker/3.png and b/public/images/emoji/apple/man_office_worker/3.png differ
diff --git a/public/images/emoji/apple/man_office_worker/4.png b/public/images/emoji/apple/man_office_worker/4.png
index c4a81e9368..eed43b979a 100644
Binary files a/public/images/emoji/apple/man_office_worker/4.png and b/public/images/emoji/apple/man_office_worker/4.png differ
diff --git a/public/images/emoji/apple/man_office_worker/5.png b/public/images/emoji/apple/man_office_worker/5.png
index 84cc0fcf8b..936b76b0ac 100644
Binary files a/public/images/emoji/apple/man_office_worker/5.png and b/public/images/emoji/apple/man_office_worker/5.png differ
diff --git a/public/images/emoji/apple/man_office_worker/6.png b/public/images/emoji/apple/man_office_worker/6.png
index 4b86047b61..b0a079e650 100644
Binary files a/public/images/emoji/apple/man_office_worker/6.png and b/public/images/emoji/apple/man_office_worker/6.png differ
diff --git a/public/images/emoji/apple/man_pilot.png b/public/images/emoji/apple/man_pilot.png
index 9a64881605..3f7e2eebc1 100644
Binary files a/public/images/emoji/apple/man_pilot.png and b/public/images/emoji/apple/man_pilot.png differ
diff --git a/public/images/emoji/apple/man_pilot/2.png b/public/images/emoji/apple/man_pilot/2.png
index 14bdcec1ce..962642845f 100644
Binary files a/public/images/emoji/apple/man_pilot/2.png and b/public/images/emoji/apple/man_pilot/2.png differ
diff --git a/public/images/emoji/apple/man_pilot/3.png b/public/images/emoji/apple/man_pilot/3.png
index 5966125a95..7ea447a85f 100644
Binary files a/public/images/emoji/apple/man_pilot/3.png and b/public/images/emoji/apple/man_pilot/3.png differ
diff --git a/public/images/emoji/apple/man_pilot/4.png b/public/images/emoji/apple/man_pilot/4.png
index d49ed4cecc..e6c9b927ca 100644
Binary files a/public/images/emoji/apple/man_pilot/4.png and b/public/images/emoji/apple/man_pilot/4.png differ
diff --git a/public/images/emoji/apple/man_pilot/5.png b/public/images/emoji/apple/man_pilot/5.png
index 0cc121d284..0d793e4bc8 100644
Binary files a/public/images/emoji/apple/man_pilot/5.png and b/public/images/emoji/apple/man_pilot/5.png differ
diff --git a/public/images/emoji/apple/man_pilot/6.png b/public/images/emoji/apple/man_pilot/6.png
index d0db4df14d..97d4f802a5 100644
Binary files a/public/images/emoji/apple/man_pilot/6.png and b/public/images/emoji/apple/man_pilot/6.png differ
diff --git a/public/images/emoji/apple/man_playing_handball.png b/public/images/emoji/apple/man_playing_handball.png
index 0564955254..c0121b4e0a 100644
Binary files a/public/images/emoji/apple/man_playing_handball.png and b/public/images/emoji/apple/man_playing_handball.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/2.png b/public/images/emoji/apple/man_playing_handball/2.png
index 58c4200728..5fd819894c 100644
Binary files a/public/images/emoji/apple/man_playing_handball/2.png and b/public/images/emoji/apple/man_playing_handball/2.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/3.png b/public/images/emoji/apple/man_playing_handball/3.png
index b3dd093946..d8fdb1d60c 100644
Binary files a/public/images/emoji/apple/man_playing_handball/3.png and b/public/images/emoji/apple/man_playing_handball/3.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/4.png b/public/images/emoji/apple/man_playing_handball/4.png
index 04f2941f2a..28f2ba2c77 100644
Binary files a/public/images/emoji/apple/man_playing_handball/4.png and b/public/images/emoji/apple/man_playing_handball/4.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/5.png b/public/images/emoji/apple/man_playing_handball/5.png
index 1b77719760..c7da1e9dbf 100644
Binary files a/public/images/emoji/apple/man_playing_handball/5.png and b/public/images/emoji/apple/man_playing_handball/5.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/6.png b/public/images/emoji/apple/man_playing_handball/6.png
index 596c061174..59bfab7181 100644
Binary files a/public/images/emoji/apple/man_playing_handball/6.png and b/public/images/emoji/apple/man_playing_handball/6.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo.png b/public/images/emoji/apple/man_playing_water_polo.png
index d7f9416a7c..3e427860cc 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo.png and b/public/images/emoji/apple/man_playing_water_polo.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/2.png b/public/images/emoji/apple/man_playing_water_polo/2.png
index ea882c2467..4c9fa2d7a4 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/2.png and b/public/images/emoji/apple/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/3.png b/public/images/emoji/apple/man_playing_water_polo/3.png
index 239daf01b4..2da7669ac2 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/3.png and b/public/images/emoji/apple/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/4.png b/public/images/emoji/apple/man_playing_water_polo/4.png
index 3c2cdc9844..f2f14f8513 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/4.png and b/public/images/emoji/apple/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/5.png b/public/images/emoji/apple/man_playing_water_polo/5.png
index 2601d91449..7f93f6e9a3 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/5.png and b/public/images/emoji/apple/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/6.png b/public/images/emoji/apple/man_playing_water_polo/6.png
index 0fb0a97049..769dfa8ce0 100644
Binary files a/public/images/emoji/apple/man_playing_water_polo/6.png and b/public/images/emoji/apple/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/apple/man_scientist.png b/public/images/emoji/apple/man_scientist.png
index bf534a9a09..27d677fcb0 100644
Binary files a/public/images/emoji/apple/man_scientist.png and b/public/images/emoji/apple/man_scientist.png differ
diff --git a/public/images/emoji/apple/man_scientist/2.png b/public/images/emoji/apple/man_scientist/2.png
index 5d4a941e81..800170f72e 100644
Binary files a/public/images/emoji/apple/man_scientist/2.png and b/public/images/emoji/apple/man_scientist/2.png differ
diff --git a/public/images/emoji/apple/man_scientist/3.png b/public/images/emoji/apple/man_scientist/3.png
index 75f2274b25..6fcf7b1d89 100644
Binary files a/public/images/emoji/apple/man_scientist/3.png and b/public/images/emoji/apple/man_scientist/3.png differ
diff --git a/public/images/emoji/apple/man_scientist/4.png b/public/images/emoji/apple/man_scientist/4.png
index dcc91d5323..8d08c7fe52 100644
Binary files a/public/images/emoji/apple/man_scientist/4.png and b/public/images/emoji/apple/man_scientist/4.png differ
diff --git a/public/images/emoji/apple/man_scientist/5.png b/public/images/emoji/apple/man_scientist/5.png
index eca94862e2..c867e5fe7c 100644
Binary files a/public/images/emoji/apple/man_scientist/5.png and b/public/images/emoji/apple/man_scientist/5.png differ
diff --git a/public/images/emoji/apple/man_scientist/6.png b/public/images/emoji/apple/man_scientist/6.png
index 17a3730055..ed1ef13ac7 100644
Binary files a/public/images/emoji/apple/man_scientist/6.png and b/public/images/emoji/apple/man_scientist/6.png differ
diff --git a/public/images/emoji/apple/man_shrugging.png b/public/images/emoji/apple/man_shrugging.png
index 50739842d3..94d71cd41a 100644
Binary files a/public/images/emoji/apple/man_shrugging.png and b/public/images/emoji/apple/man_shrugging.png differ
diff --git a/public/images/emoji/apple/man_shrugging/2.png b/public/images/emoji/apple/man_shrugging/2.png
index 6c2939783e..7c9e25d46a 100644
Binary files a/public/images/emoji/apple/man_shrugging/2.png and b/public/images/emoji/apple/man_shrugging/2.png differ
diff --git a/public/images/emoji/apple/man_shrugging/3.png b/public/images/emoji/apple/man_shrugging/3.png
index 73e4357b30..24a7a05079 100644
Binary files a/public/images/emoji/apple/man_shrugging/3.png and b/public/images/emoji/apple/man_shrugging/3.png differ
diff --git a/public/images/emoji/apple/man_shrugging/4.png b/public/images/emoji/apple/man_shrugging/4.png
index 1f05b6a518..a5e92edeeb 100644
Binary files a/public/images/emoji/apple/man_shrugging/4.png and b/public/images/emoji/apple/man_shrugging/4.png differ
diff --git a/public/images/emoji/apple/man_shrugging/5.png b/public/images/emoji/apple/man_shrugging/5.png
index 2ac6087681..1841518825 100644
Binary files a/public/images/emoji/apple/man_shrugging/5.png and b/public/images/emoji/apple/man_shrugging/5.png differ
diff --git a/public/images/emoji/apple/man_shrugging/6.png b/public/images/emoji/apple/man_shrugging/6.png
index c0f6f9b958..8fecc2a47b 100644
Binary files a/public/images/emoji/apple/man_shrugging/6.png and b/public/images/emoji/apple/man_shrugging/6.png differ
diff --git a/public/images/emoji/apple/man_singer.png b/public/images/emoji/apple/man_singer.png
index 7407d166f8..104aebc24f 100644
Binary files a/public/images/emoji/apple/man_singer.png and b/public/images/emoji/apple/man_singer.png differ
diff --git a/public/images/emoji/apple/man_singer/2.png b/public/images/emoji/apple/man_singer/2.png
index 90b2dba035..3b9c737055 100644
Binary files a/public/images/emoji/apple/man_singer/2.png and b/public/images/emoji/apple/man_singer/2.png differ
diff --git a/public/images/emoji/apple/man_singer/3.png b/public/images/emoji/apple/man_singer/3.png
index 97d24670a2..ff9c459efb 100644
Binary files a/public/images/emoji/apple/man_singer/3.png and b/public/images/emoji/apple/man_singer/3.png differ
diff --git a/public/images/emoji/apple/man_singer/4.png b/public/images/emoji/apple/man_singer/4.png
index 1986fce029..1bca7601de 100644
Binary files a/public/images/emoji/apple/man_singer/4.png and b/public/images/emoji/apple/man_singer/4.png differ
diff --git a/public/images/emoji/apple/man_singer/5.png b/public/images/emoji/apple/man_singer/5.png
index 4135d1d783..62552b6719 100644
Binary files a/public/images/emoji/apple/man_singer/5.png and b/public/images/emoji/apple/man_singer/5.png differ
diff --git a/public/images/emoji/apple/man_singer/6.png b/public/images/emoji/apple/man_singer/6.png
index 9477f2f0db..2be8423ca7 100644
Binary files a/public/images/emoji/apple/man_singer/6.png and b/public/images/emoji/apple/man_singer/6.png differ
diff --git a/public/images/emoji/apple/man_student.png b/public/images/emoji/apple/man_student.png
index 6231cdce8b..fa6b5a612d 100644
Binary files a/public/images/emoji/apple/man_student.png and b/public/images/emoji/apple/man_student.png differ
diff --git a/public/images/emoji/apple/man_student/2.png b/public/images/emoji/apple/man_student/2.png
index 7749120c38..020e2980f9 100644
Binary files a/public/images/emoji/apple/man_student/2.png and b/public/images/emoji/apple/man_student/2.png differ
diff --git a/public/images/emoji/apple/man_student/3.png b/public/images/emoji/apple/man_student/3.png
index 353f394418..a7f25f8761 100644
Binary files a/public/images/emoji/apple/man_student/3.png and b/public/images/emoji/apple/man_student/3.png differ
diff --git a/public/images/emoji/apple/man_student/4.png b/public/images/emoji/apple/man_student/4.png
index e920689633..d74f936ed7 100644
Binary files a/public/images/emoji/apple/man_student/4.png and b/public/images/emoji/apple/man_student/4.png differ
diff --git a/public/images/emoji/apple/man_student/5.png b/public/images/emoji/apple/man_student/5.png
index 5586d6d512..908107f0e1 100644
Binary files a/public/images/emoji/apple/man_student/5.png and b/public/images/emoji/apple/man_student/5.png differ
diff --git a/public/images/emoji/apple/man_student/6.png b/public/images/emoji/apple/man_student/6.png
index f08a91b6be..95199f83d1 100644
Binary files a/public/images/emoji/apple/man_student/6.png and b/public/images/emoji/apple/man_student/6.png differ
diff --git a/public/images/emoji/apple/man_teacher.png b/public/images/emoji/apple/man_teacher.png
index d858b598e3..b5ab5dcce5 100644
Binary files a/public/images/emoji/apple/man_teacher.png and b/public/images/emoji/apple/man_teacher.png differ
diff --git a/public/images/emoji/apple/man_teacher/2.png b/public/images/emoji/apple/man_teacher/2.png
index 30ec2ec53f..e50068caa2 100644
Binary files a/public/images/emoji/apple/man_teacher/2.png and b/public/images/emoji/apple/man_teacher/2.png differ
diff --git a/public/images/emoji/apple/man_teacher/3.png b/public/images/emoji/apple/man_teacher/3.png
index de33ccd471..3b7372437f 100644
Binary files a/public/images/emoji/apple/man_teacher/3.png and b/public/images/emoji/apple/man_teacher/3.png differ
diff --git a/public/images/emoji/apple/man_teacher/4.png b/public/images/emoji/apple/man_teacher/4.png
index c7ffb9d274..22a3f57a3b 100644
Binary files a/public/images/emoji/apple/man_teacher/4.png and b/public/images/emoji/apple/man_teacher/4.png differ
diff --git a/public/images/emoji/apple/man_teacher/5.png b/public/images/emoji/apple/man_teacher/5.png
index d9ade329a2..1f206b8146 100644
Binary files a/public/images/emoji/apple/man_teacher/5.png and b/public/images/emoji/apple/man_teacher/5.png differ
diff --git a/public/images/emoji/apple/man_teacher/6.png b/public/images/emoji/apple/man_teacher/6.png
index 4f809387b0..f3502a8017 100644
Binary files a/public/images/emoji/apple/man_teacher/6.png and b/public/images/emoji/apple/man_teacher/6.png differ
diff --git a/public/images/emoji/apple/man_technologist.png b/public/images/emoji/apple/man_technologist.png
index b33d84dcad..de7c6da9d2 100644
Binary files a/public/images/emoji/apple/man_technologist.png and b/public/images/emoji/apple/man_technologist.png differ
diff --git a/public/images/emoji/apple/man_technologist/2.png b/public/images/emoji/apple/man_technologist/2.png
index 8465d27e43..f49e61bc0e 100644
Binary files a/public/images/emoji/apple/man_technologist/2.png and b/public/images/emoji/apple/man_technologist/2.png differ
diff --git a/public/images/emoji/apple/man_technologist/3.png b/public/images/emoji/apple/man_technologist/3.png
index 1ee89fcdab..0df4216869 100644
Binary files a/public/images/emoji/apple/man_technologist/3.png and b/public/images/emoji/apple/man_technologist/3.png differ
diff --git a/public/images/emoji/apple/man_technologist/4.png b/public/images/emoji/apple/man_technologist/4.png
index 3efb91d3ec..9f737bf7cb 100644
Binary files a/public/images/emoji/apple/man_technologist/4.png and b/public/images/emoji/apple/man_technologist/4.png differ
diff --git a/public/images/emoji/apple/man_technologist/5.png b/public/images/emoji/apple/man_technologist/5.png
index c3c4b1326c..60448bbe19 100644
Binary files a/public/images/emoji/apple/man_technologist/5.png and b/public/images/emoji/apple/man_technologist/5.png differ
diff --git a/public/images/emoji/apple/man_technologist/6.png b/public/images/emoji/apple/man_technologist/6.png
index 4a13c2317e..efde00719e 100644
Binary files a/public/images/emoji/apple/man_technologist/6.png and b/public/images/emoji/apple/man_technologist/6.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao.png b/public/images/emoji/apple/man_with_gua_pi_mao.png
index 0cd4b17a9c..39d95340da 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao.png and b/public/images/emoji/apple/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/2.png b/public/images/emoji/apple/man_with_gua_pi_mao/2.png
index 893e4c6228..571c3c2fea 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/2.png and b/public/images/emoji/apple/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/3.png b/public/images/emoji/apple/man_with_gua_pi_mao/3.png
index 1e39f76ff7..f502fc3aec 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/3.png and b/public/images/emoji/apple/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/4.png b/public/images/emoji/apple/man_with_gua_pi_mao/4.png
index 170f9805fb..dd01f4d2b1 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/4.png and b/public/images/emoji/apple/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/5.png b/public/images/emoji/apple/man_with_gua_pi_mao/5.png
index ab169544bf..e80dcefe07 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/5.png and b/public/images/emoji/apple/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/6.png b/public/images/emoji/apple/man_with_gua_pi_mao/6.png
index 3a5e157eae..cbec7ac864 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao/6.png and b/public/images/emoji/apple/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/apple/man_with_turban.png b/public/images/emoji/apple/man_with_turban.png
index 07906a0ee2..70acefa11c 100644
Binary files a/public/images/emoji/apple/man_with_turban.png and b/public/images/emoji/apple/man_with_turban.png differ
diff --git a/public/images/emoji/apple/man_with_turban/2.png b/public/images/emoji/apple/man_with_turban/2.png
index ec579744b8..87ae1d5734 100644
Binary files a/public/images/emoji/apple/man_with_turban/2.png and b/public/images/emoji/apple/man_with_turban/2.png differ
diff --git a/public/images/emoji/apple/man_with_turban/3.png b/public/images/emoji/apple/man_with_turban/3.png
index 813f977ae6..4e12f89fa3 100644
Binary files a/public/images/emoji/apple/man_with_turban/3.png and b/public/images/emoji/apple/man_with_turban/3.png differ
diff --git a/public/images/emoji/apple/man_with_turban/4.png b/public/images/emoji/apple/man_with_turban/4.png
index 53d8be863f..4dbf866ca1 100644
Binary files a/public/images/emoji/apple/man_with_turban/4.png and b/public/images/emoji/apple/man_with_turban/4.png differ
diff --git a/public/images/emoji/apple/man_with_turban/5.png b/public/images/emoji/apple/man_with_turban/5.png
index d09a21950c..a5b2c0b506 100644
Binary files a/public/images/emoji/apple/man_with_turban/5.png and b/public/images/emoji/apple/man_with_turban/5.png differ
diff --git a/public/images/emoji/apple/man_with_turban/6.png b/public/images/emoji/apple/man_with_turban/6.png
index 8646fde515..bcc8b48d5b 100644
Binary files a/public/images/emoji/apple/man_with_turban/6.png and b/public/images/emoji/apple/man_with_turban/6.png differ
diff --git a/public/images/emoji/apple/mans_shoe.png b/public/images/emoji/apple/mans_shoe.png
index 99ec342c85..5edb77ca44 100644
Binary files a/public/images/emoji/apple/mans_shoe.png and b/public/images/emoji/apple/mans_shoe.png differ
diff --git a/public/images/emoji/apple/mantelpiece_clock.png b/public/images/emoji/apple/mantelpiece_clock.png
index bc63b3ffb2..b53d6b5de1 100644
Binary files a/public/images/emoji/apple/mantelpiece_clock.png and b/public/images/emoji/apple/mantelpiece_clock.png differ
diff --git a/public/images/emoji/apple/map.png b/public/images/emoji/apple/map.png
index 9cd3f7decf..0f62ad91dd 100644
Binary files a/public/images/emoji/apple/map.png and b/public/images/emoji/apple/map.png differ
diff --git a/public/images/emoji/apple/maple_leaf.png b/public/images/emoji/apple/maple_leaf.png
index 95be453edd..2055c83516 100644
Binary files a/public/images/emoji/apple/maple_leaf.png and b/public/images/emoji/apple/maple_leaf.png differ
diff --git a/public/images/emoji/apple/marshall_islands.png b/public/images/emoji/apple/marshall_islands.png
index fd5931d303..2f5e3e1c26 100644
Binary files a/public/images/emoji/apple/marshall_islands.png and b/public/images/emoji/apple/marshall_islands.png differ
diff --git a/public/images/emoji/apple/martial_arts_uniform.png b/public/images/emoji/apple/martial_arts_uniform.png
index fef9e7243d..2684f0799a 100644
Binary files a/public/images/emoji/apple/martial_arts_uniform.png and b/public/images/emoji/apple/martial_arts_uniform.png differ
diff --git a/public/images/emoji/apple/martinique.png b/public/images/emoji/apple/martinique.png
index a0a6cfc7b6..21b6e08891 100644
Binary files a/public/images/emoji/apple/martinique.png and b/public/images/emoji/apple/martinique.png differ
diff --git a/public/images/emoji/apple/mask.png b/public/images/emoji/apple/mask.png
index 5100104ec4..586d953d29 100644
Binary files a/public/images/emoji/apple/mask.png and b/public/images/emoji/apple/mask.png differ
diff --git a/public/images/emoji/apple/massage.png b/public/images/emoji/apple/massage.png
index 4f7540d4d9..64bbddf8cb 100644
Binary files a/public/images/emoji/apple/massage.png and b/public/images/emoji/apple/massage.png differ
diff --git a/public/images/emoji/apple/massage/2.png b/public/images/emoji/apple/massage/2.png
index f94c4d1120..4d1b85faa4 100644
Binary files a/public/images/emoji/apple/massage/2.png and b/public/images/emoji/apple/massage/2.png differ
diff --git a/public/images/emoji/apple/massage/3.png b/public/images/emoji/apple/massage/3.png
index df6b30ee77..68cf38f784 100644
Binary files a/public/images/emoji/apple/massage/3.png and b/public/images/emoji/apple/massage/3.png differ
diff --git a/public/images/emoji/apple/massage/4.png b/public/images/emoji/apple/massage/4.png
index 54b33592cf..7bc6b6d2f0 100644
Binary files a/public/images/emoji/apple/massage/4.png and b/public/images/emoji/apple/massage/4.png differ
diff --git a/public/images/emoji/apple/massage/5.png b/public/images/emoji/apple/massage/5.png
index 8db521b992..9fca29eb81 100644
Binary files a/public/images/emoji/apple/massage/5.png and b/public/images/emoji/apple/massage/5.png differ
diff --git a/public/images/emoji/apple/massage/6.png b/public/images/emoji/apple/massage/6.png
index 2e34703916..728c680803 100644
Binary files a/public/images/emoji/apple/massage/6.png and b/public/images/emoji/apple/massage/6.png differ
diff --git a/public/images/emoji/apple/massage_man.png b/public/images/emoji/apple/massage_man.png
index 95cc9b5a73..6702452a4d 100644
Binary files a/public/images/emoji/apple/massage_man.png and b/public/images/emoji/apple/massage_man.png differ
diff --git a/public/images/emoji/apple/massage_man/2.png b/public/images/emoji/apple/massage_man/2.png
index bf004f61b2..7834c37d11 100644
Binary files a/public/images/emoji/apple/massage_man/2.png and b/public/images/emoji/apple/massage_man/2.png differ
diff --git a/public/images/emoji/apple/massage_man/3.png b/public/images/emoji/apple/massage_man/3.png
index 666232c3a7..b8e8b8c3b4 100644
Binary files a/public/images/emoji/apple/massage_man/3.png and b/public/images/emoji/apple/massage_man/3.png differ
diff --git a/public/images/emoji/apple/massage_man/4.png b/public/images/emoji/apple/massage_man/4.png
index a03d7b7af6..daaba14210 100644
Binary files a/public/images/emoji/apple/massage_man/4.png and b/public/images/emoji/apple/massage_man/4.png differ
diff --git a/public/images/emoji/apple/massage_man/5.png b/public/images/emoji/apple/massage_man/5.png
index 8092a3dbb4..1bfdd6ac26 100644
Binary files a/public/images/emoji/apple/massage_man/5.png and b/public/images/emoji/apple/massage_man/5.png differ
diff --git a/public/images/emoji/apple/massage_man/6.png b/public/images/emoji/apple/massage_man/6.png
index 3913f8834a..7647586b44 100644
Binary files a/public/images/emoji/apple/massage_man/6.png and b/public/images/emoji/apple/massage_man/6.png differ
diff --git a/public/images/emoji/apple/massage_woman.png b/public/images/emoji/apple/massage_woman.png
index 4f7540d4d9..64bbddf8cb 100644
Binary files a/public/images/emoji/apple/massage_woman.png and b/public/images/emoji/apple/massage_woman.png differ
diff --git a/public/images/emoji/apple/massage_woman/2.png b/public/images/emoji/apple/massage_woman/2.png
index f94c4d1120..4d1b85faa4 100644
Binary files a/public/images/emoji/apple/massage_woman/2.png and b/public/images/emoji/apple/massage_woman/2.png differ
diff --git a/public/images/emoji/apple/massage_woman/3.png b/public/images/emoji/apple/massage_woman/3.png
index df6b30ee77..68cf38f784 100644
Binary files a/public/images/emoji/apple/massage_woman/3.png and b/public/images/emoji/apple/massage_woman/3.png differ
diff --git a/public/images/emoji/apple/massage_woman/4.png b/public/images/emoji/apple/massage_woman/4.png
index 54b33592cf..7bc6b6d2f0 100644
Binary files a/public/images/emoji/apple/massage_woman/4.png and b/public/images/emoji/apple/massage_woman/4.png differ
diff --git a/public/images/emoji/apple/massage_woman/5.png b/public/images/emoji/apple/massage_woman/5.png
index 8db521b992..9fca29eb81 100644
Binary files a/public/images/emoji/apple/massage_woman/5.png and b/public/images/emoji/apple/massage_woman/5.png differ
diff --git a/public/images/emoji/apple/massage_woman/6.png b/public/images/emoji/apple/massage_woman/6.png
index 2e34703916..728c680803 100644
Binary files a/public/images/emoji/apple/massage_woman/6.png and b/public/images/emoji/apple/massage_woman/6.png differ
diff --git a/public/images/emoji/apple/mauritania.png b/public/images/emoji/apple/mauritania.png
index e65b5af0e9..53013b5a82 100644
Binary files a/public/images/emoji/apple/mauritania.png and b/public/images/emoji/apple/mauritania.png differ
diff --git a/public/images/emoji/apple/mauritius.png b/public/images/emoji/apple/mauritius.png
index 75cc6eebad..f8458f1fff 100644
Binary files a/public/images/emoji/apple/mauritius.png and b/public/images/emoji/apple/mauritius.png differ
diff --git a/public/images/emoji/apple/mayotte.png b/public/images/emoji/apple/mayotte.png
index cf20209f5e..e74edc0ffe 100644
Binary files a/public/images/emoji/apple/mayotte.png and b/public/images/emoji/apple/mayotte.png differ
diff --git a/public/images/emoji/apple/meat_on_bone.png b/public/images/emoji/apple/meat_on_bone.png
index 8de6f79bd8..b6eb0f29fe 100644
Binary files a/public/images/emoji/apple/meat_on_bone.png and b/public/images/emoji/apple/meat_on_bone.png differ
diff --git a/public/images/emoji/apple/medal.png b/public/images/emoji/apple/medal.png
index 6e66f14386..413a2089b2 100644
Binary files a/public/images/emoji/apple/medal.png and b/public/images/emoji/apple/medal.png differ
diff --git a/public/images/emoji/apple/medal_military.png b/public/images/emoji/apple/medal_military.png
index 1e4a132d37..d84fdd0cd1 100644
Binary files a/public/images/emoji/apple/medal_military.png and b/public/images/emoji/apple/medal_military.png differ
diff --git a/public/images/emoji/apple/medal_sports.png b/public/images/emoji/apple/medal_sports.png
index 6e66f14386..413a2089b2 100644
Binary files a/public/images/emoji/apple/medal_sports.png and b/public/images/emoji/apple/medal_sports.png differ
diff --git a/public/images/emoji/apple/mega.png b/public/images/emoji/apple/mega.png
index 8b3ee6c262..f4a9c3a0c5 100644
Binary files a/public/images/emoji/apple/mega.png and b/public/images/emoji/apple/mega.png differ
diff --git a/public/images/emoji/apple/melon.png b/public/images/emoji/apple/melon.png
index 5006362d76..1ec2c6c49b 100644
Binary files a/public/images/emoji/apple/melon.png and b/public/images/emoji/apple/melon.png differ
diff --git a/public/images/emoji/apple/memo.png b/public/images/emoji/apple/memo.png
index b738536bdc..add07c279e 100644
Binary files a/public/images/emoji/apple/memo.png and b/public/images/emoji/apple/memo.png differ
diff --git a/public/images/emoji/apple/men_wrestling.png b/public/images/emoji/apple/men_wrestling.png
index 178fd73c86..f12cacb880 100644
Binary files a/public/images/emoji/apple/men_wrestling.png and b/public/images/emoji/apple/men_wrestling.png differ
diff --git a/public/images/emoji/apple/menorah.png b/public/images/emoji/apple/menorah.png
index d6f382d016..8520a23d67 100644
Binary files a/public/images/emoji/apple/menorah.png and b/public/images/emoji/apple/menorah.png differ
diff --git a/public/images/emoji/apple/mens.png b/public/images/emoji/apple/mens.png
index 1fb3f77aef..b49263f487 100644
Binary files a/public/images/emoji/apple/mens.png and b/public/images/emoji/apple/mens.png differ
diff --git a/public/images/emoji/apple/merperson.png b/public/images/emoji/apple/merperson.png
index ee1b999e0d..8e1b4b2794 100644
Binary files a/public/images/emoji/apple/merperson.png and b/public/images/emoji/apple/merperson.png differ
diff --git a/public/images/emoji/apple/merperson/2.png b/public/images/emoji/apple/merperson/2.png
index b97fbf42e3..c14e9814ba 100644
Binary files a/public/images/emoji/apple/merperson/2.png and b/public/images/emoji/apple/merperson/2.png differ
diff --git a/public/images/emoji/apple/merperson/3.png b/public/images/emoji/apple/merperson/3.png
index 9079f60b81..e4f2c5975b 100644
Binary files a/public/images/emoji/apple/merperson/3.png and b/public/images/emoji/apple/merperson/3.png differ
diff --git a/public/images/emoji/apple/merperson/4.png b/public/images/emoji/apple/merperson/4.png
index decc0b5892..9f03f01d4f 100644
Binary files a/public/images/emoji/apple/merperson/4.png and b/public/images/emoji/apple/merperson/4.png differ
diff --git a/public/images/emoji/apple/merperson/5.png b/public/images/emoji/apple/merperson/5.png
index e3e3e89cb1..d5ae2dd59c 100644
Binary files a/public/images/emoji/apple/merperson/5.png and b/public/images/emoji/apple/merperson/5.png differ
diff --git a/public/images/emoji/apple/merperson/6.png b/public/images/emoji/apple/merperson/6.png
index 5a5f36684e..d20964e4e8 100644
Binary files a/public/images/emoji/apple/merperson/6.png and b/public/images/emoji/apple/merperson/6.png differ
diff --git a/public/images/emoji/apple/metal.png b/public/images/emoji/apple/metal.png
index 7518952e87..c83009fefc 100644
Binary files a/public/images/emoji/apple/metal.png and b/public/images/emoji/apple/metal.png differ
diff --git a/public/images/emoji/apple/metal/2.png b/public/images/emoji/apple/metal/2.png
index 46006766ae..6937c225c2 100644
Binary files a/public/images/emoji/apple/metal/2.png and b/public/images/emoji/apple/metal/2.png differ
diff --git a/public/images/emoji/apple/metal/3.png b/public/images/emoji/apple/metal/3.png
index 85aa93e844..8fdeb26418 100644
Binary files a/public/images/emoji/apple/metal/3.png and b/public/images/emoji/apple/metal/3.png differ
diff --git a/public/images/emoji/apple/metal/4.png b/public/images/emoji/apple/metal/4.png
index ff67325213..c01102ad00 100644
Binary files a/public/images/emoji/apple/metal/4.png and b/public/images/emoji/apple/metal/4.png differ
diff --git a/public/images/emoji/apple/metal/5.png b/public/images/emoji/apple/metal/5.png
index 8f48f33a83..04d6a6646b 100644
Binary files a/public/images/emoji/apple/metal/5.png and b/public/images/emoji/apple/metal/5.png differ
diff --git a/public/images/emoji/apple/metal/6.png b/public/images/emoji/apple/metal/6.png
index beec4708b8..3aeba2a9ce 100644
Binary files a/public/images/emoji/apple/metal/6.png and b/public/images/emoji/apple/metal/6.png differ
diff --git a/public/images/emoji/apple/metro.png b/public/images/emoji/apple/metro.png
index 885ed77882..36bec0f782 100644
Binary files a/public/images/emoji/apple/metro.png and b/public/images/emoji/apple/metro.png differ
diff --git a/public/images/emoji/apple/mexico.png b/public/images/emoji/apple/mexico.png
index 6debb7f70d..bd468a23e0 100644
Binary files a/public/images/emoji/apple/mexico.png and b/public/images/emoji/apple/mexico.png differ
diff --git a/public/images/emoji/apple/micronesia.png b/public/images/emoji/apple/micronesia.png
index 7d6874acff..433b4db4b5 100644
Binary files a/public/images/emoji/apple/micronesia.png and b/public/images/emoji/apple/micronesia.png differ
diff --git a/public/images/emoji/apple/microphone.png b/public/images/emoji/apple/microphone.png
index 22b067d365..76f1171451 100644
Binary files a/public/images/emoji/apple/microphone.png and b/public/images/emoji/apple/microphone.png differ
diff --git a/public/images/emoji/apple/microphone2.png b/public/images/emoji/apple/microphone2.png
index 6f6e1dc3c9..27dd16dc6e 100644
Binary files a/public/images/emoji/apple/microphone2.png and b/public/images/emoji/apple/microphone2.png differ
diff --git a/public/images/emoji/apple/microscope.png b/public/images/emoji/apple/microscope.png
index 12f6aa3de1..53017e7098 100644
Binary files a/public/images/emoji/apple/microscope.png and b/public/images/emoji/apple/microscope.png differ
diff --git a/public/images/emoji/apple/middle_finger.png b/public/images/emoji/apple/middle_finger.png
index e869cf97d1..1ca0197644 100644
Binary files a/public/images/emoji/apple/middle_finger.png and b/public/images/emoji/apple/middle_finger.png differ
diff --git a/public/images/emoji/apple/middle_finger/2.png b/public/images/emoji/apple/middle_finger/2.png
index ce95c6a8be..b6868ba362 100644
Binary files a/public/images/emoji/apple/middle_finger/2.png and b/public/images/emoji/apple/middle_finger/2.png differ
diff --git a/public/images/emoji/apple/middle_finger/3.png b/public/images/emoji/apple/middle_finger/3.png
index 33eec03fd4..0a2e09e996 100644
Binary files a/public/images/emoji/apple/middle_finger/3.png and b/public/images/emoji/apple/middle_finger/3.png differ
diff --git a/public/images/emoji/apple/middle_finger/4.png b/public/images/emoji/apple/middle_finger/4.png
index 1048765292..0b45f9c3f1 100644
Binary files a/public/images/emoji/apple/middle_finger/4.png and b/public/images/emoji/apple/middle_finger/4.png differ
diff --git a/public/images/emoji/apple/middle_finger/5.png b/public/images/emoji/apple/middle_finger/5.png
index 6f577d03de..41a3a0dc0c 100644
Binary files a/public/images/emoji/apple/middle_finger/5.png and b/public/images/emoji/apple/middle_finger/5.png differ
diff --git a/public/images/emoji/apple/middle_finger/6.png b/public/images/emoji/apple/middle_finger/6.png
index 58349f45b1..a8a0694971 100644
Binary files a/public/images/emoji/apple/middle_finger/6.png and b/public/images/emoji/apple/middle_finger/6.png differ
diff --git a/public/images/emoji/apple/military_medal.png b/public/images/emoji/apple/military_medal.png
index 1e4a132d37..d84fdd0cd1 100644
Binary files a/public/images/emoji/apple/military_medal.png and b/public/images/emoji/apple/military_medal.png differ
diff --git a/public/images/emoji/apple/milk_glass.png b/public/images/emoji/apple/milk_glass.png
index 29991a49a7..8ece4c9eb9 100644
Binary files a/public/images/emoji/apple/milk_glass.png and b/public/images/emoji/apple/milk_glass.png differ
diff --git a/public/images/emoji/apple/milky_way.png b/public/images/emoji/apple/milky_way.png
index ecf711eb36..8300865f62 100644
Binary files a/public/images/emoji/apple/milky_way.png and b/public/images/emoji/apple/milky_way.png differ
diff --git a/public/images/emoji/apple/minibus.png b/public/images/emoji/apple/minibus.png
index f0cabe3c80..2c582177ae 100644
Binary files a/public/images/emoji/apple/minibus.png and b/public/images/emoji/apple/minibus.png differ
diff --git a/public/images/emoji/apple/minidisc.png b/public/images/emoji/apple/minidisc.png
index b65d83439a..b09fc0c01d 100644
Binary files a/public/images/emoji/apple/minidisc.png and b/public/images/emoji/apple/minidisc.png differ
diff --git a/public/images/emoji/apple/mobile_phone_off.png b/public/images/emoji/apple/mobile_phone_off.png
index 7df7f6001f..d762515cef 100644
Binary files a/public/images/emoji/apple/mobile_phone_off.png and b/public/images/emoji/apple/mobile_phone_off.png differ
diff --git a/public/images/emoji/apple/moldova.png b/public/images/emoji/apple/moldova.png
index caec098bd8..7a384a1c2e 100644
Binary files a/public/images/emoji/apple/moldova.png and b/public/images/emoji/apple/moldova.png differ
diff --git a/public/images/emoji/apple/monaco.png b/public/images/emoji/apple/monaco.png
index 2ec6ee610e..0f0eed85ce 100644
Binary files a/public/images/emoji/apple/monaco.png and b/public/images/emoji/apple/monaco.png differ
diff --git a/public/images/emoji/apple/money_mouth.png b/public/images/emoji/apple/money_mouth.png
index 3be4b911d4..e068ea8061 100644
Binary files a/public/images/emoji/apple/money_mouth.png and b/public/images/emoji/apple/money_mouth.png differ
diff --git a/public/images/emoji/apple/money_mouth_face.png b/public/images/emoji/apple/money_mouth_face.png
index 3be4b911d4..e068ea8061 100644
Binary files a/public/images/emoji/apple/money_mouth_face.png and b/public/images/emoji/apple/money_mouth_face.png differ
diff --git a/public/images/emoji/apple/money_with_wings.png b/public/images/emoji/apple/money_with_wings.png
index 44cabf40de..6c2f885620 100644
Binary files a/public/images/emoji/apple/money_with_wings.png and b/public/images/emoji/apple/money_with_wings.png differ
diff --git a/public/images/emoji/apple/moneybag.png b/public/images/emoji/apple/moneybag.png
index 481d7239a1..f395d154ff 100644
Binary files a/public/images/emoji/apple/moneybag.png and b/public/images/emoji/apple/moneybag.png differ
diff --git a/public/images/emoji/apple/mongolia.png b/public/images/emoji/apple/mongolia.png
index 82021a2dca..8fb753d153 100644
Binary files a/public/images/emoji/apple/mongolia.png and b/public/images/emoji/apple/mongolia.png differ
diff --git a/public/images/emoji/apple/monkey.png b/public/images/emoji/apple/monkey.png
index 3d08e6ee9c..571b1b607e 100644
Binary files a/public/images/emoji/apple/monkey.png and b/public/images/emoji/apple/monkey.png differ
diff --git a/public/images/emoji/apple/monkey_face.png b/public/images/emoji/apple/monkey_face.png
index 913047f794..20f1bd2816 100644
Binary files a/public/images/emoji/apple/monkey_face.png and b/public/images/emoji/apple/monkey_face.png differ
diff --git a/public/images/emoji/apple/monorail.png b/public/images/emoji/apple/monorail.png
index d62e600933..ae171fc2fd 100644
Binary files a/public/images/emoji/apple/monorail.png and b/public/images/emoji/apple/monorail.png differ
diff --git a/public/images/emoji/apple/montenegro.png b/public/images/emoji/apple/montenegro.png
index 0aa72733ac..f2c8d2e5c4 100644
Binary files a/public/images/emoji/apple/montenegro.png and b/public/images/emoji/apple/montenegro.png differ
diff --git a/public/images/emoji/apple/montserrat.png b/public/images/emoji/apple/montserrat.png
index 6d3074592a..9b7c6da588 100644
Binary files a/public/images/emoji/apple/montserrat.png and b/public/images/emoji/apple/montserrat.png differ
diff --git a/public/images/emoji/apple/moon.png b/public/images/emoji/apple/moon.png
index 482946e48d..9607958ca1 100644
Binary files a/public/images/emoji/apple/moon.png and b/public/images/emoji/apple/moon.png differ
diff --git a/public/images/emoji/apple/morocco.png b/public/images/emoji/apple/morocco.png
index 061d597cd6..8d8be5cd79 100644
Binary files a/public/images/emoji/apple/morocco.png and b/public/images/emoji/apple/morocco.png differ
diff --git a/public/images/emoji/apple/mortar_board.png b/public/images/emoji/apple/mortar_board.png
index b75b4c2d95..f34be514a0 100644
Binary files a/public/images/emoji/apple/mortar_board.png and b/public/images/emoji/apple/mortar_board.png differ
diff --git a/public/images/emoji/apple/mosque.png b/public/images/emoji/apple/mosque.png
index a6888cdada..57a0766b29 100644
Binary files a/public/images/emoji/apple/mosque.png and b/public/images/emoji/apple/mosque.png differ
diff --git a/public/images/emoji/apple/motor_boat.png b/public/images/emoji/apple/motor_boat.png
index 1fe5602cc5..8205806735 100644
Binary files a/public/images/emoji/apple/motor_boat.png and b/public/images/emoji/apple/motor_boat.png differ
diff --git a/public/images/emoji/apple/motor_scooter.png b/public/images/emoji/apple/motor_scooter.png
index 6f384bbc50..068bc02b2b 100644
Binary files a/public/images/emoji/apple/motor_scooter.png and b/public/images/emoji/apple/motor_scooter.png differ
diff --git a/public/images/emoji/apple/motorboat.png b/public/images/emoji/apple/motorboat.png
index 1fe5602cc5..8205806735 100644
Binary files a/public/images/emoji/apple/motorboat.png and b/public/images/emoji/apple/motorboat.png differ
diff --git a/public/images/emoji/apple/motorcycle.png b/public/images/emoji/apple/motorcycle.png
index 4ae8f0c685..f125cf361e 100644
Binary files a/public/images/emoji/apple/motorcycle.png and b/public/images/emoji/apple/motorcycle.png differ
diff --git a/public/images/emoji/apple/motorway.png b/public/images/emoji/apple/motorway.png
index 2f5cf97feb..fb577fb49a 100644
Binary files a/public/images/emoji/apple/motorway.png and b/public/images/emoji/apple/motorway.png differ
diff --git a/public/images/emoji/apple/mount_fuji.png b/public/images/emoji/apple/mount_fuji.png
index 61beec0664..2143c7f96b 100644
Binary files a/public/images/emoji/apple/mount_fuji.png and b/public/images/emoji/apple/mount_fuji.png differ
diff --git a/public/images/emoji/apple/mountain.png b/public/images/emoji/apple/mountain.png
index 5b85ecfeb6..97577d3efb 100644
Binary files a/public/images/emoji/apple/mountain.png and b/public/images/emoji/apple/mountain.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist.png b/public/images/emoji/apple/mountain_bicyclist.png
index 456f84a0b4..7929bf7ca5 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist.png and b/public/images/emoji/apple/mountain_bicyclist.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/2.png b/public/images/emoji/apple/mountain_bicyclist/2.png
index 8bc94cbd8f..b3fc7dce91 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/2.png and b/public/images/emoji/apple/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/3.png b/public/images/emoji/apple/mountain_bicyclist/3.png
index 0d4f1dbea3..cf48fdc516 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/3.png and b/public/images/emoji/apple/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/4.png b/public/images/emoji/apple/mountain_bicyclist/4.png
index dbf96f05c5..cb9c054e6d 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/4.png and b/public/images/emoji/apple/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/5.png b/public/images/emoji/apple/mountain_bicyclist/5.png
index 23d9f6755c..4fb941865c 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/5.png and b/public/images/emoji/apple/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/6.png b/public/images/emoji/apple/mountain_bicyclist/6.png
index aa1562b962..f45ed463cc 100644
Binary files a/public/images/emoji/apple/mountain_bicyclist/6.png and b/public/images/emoji/apple/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man.png b/public/images/emoji/apple/mountain_biking_man.png
index 456f84a0b4..7929bf7ca5 100644
Binary files a/public/images/emoji/apple/mountain_biking_man.png and b/public/images/emoji/apple/mountain_biking_man.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/2.png b/public/images/emoji/apple/mountain_biking_man/2.png
index 8bc94cbd8f..b3fc7dce91 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/2.png and b/public/images/emoji/apple/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/3.png b/public/images/emoji/apple/mountain_biking_man/3.png
index 0d4f1dbea3..cf48fdc516 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/3.png and b/public/images/emoji/apple/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/4.png b/public/images/emoji/apple/mountain_biking_man/4.png
index dbf96f05c5..cb9c054e6d 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/4.png and b/public/images/emoji/apple/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/5.png b/public/images/emoji/apple/mountain_biking_man/5.png
index 23d9f6755c..4fb941865c 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/5.png and b/public/images/emoji/apple/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/6.png b/public/images/emoji/apple/mountain_biking_man/6.png
index aa1562b962..f45ed463cc 100644
Binary files a/public/images/emoji/apple/mountain_biking_man/6.png and b/public/images/emoji/apple/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman.png b/public/images/emoji/apple/mountain_biking_woman.png
index b7dca39da4..49ef1812bc 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman.png and b/public/images/emoji/apple/mountain_biking_woman.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/2.png b/public/images/emoji/apple/mountain_biking_woman/2.png
index 4af0a88046..54ab15349a 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/2.png and b/public/images/emoji/apple/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/3.png b/public/images/emoji/apple/mountain_biking_woman/3.png
index b2fc069d4f..d4e3c6a8f5 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/3.png and b/public/images/emoji/apple/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/4.png b/public/images/emoji/apple/mountain_biking_woman/4.png
index 9e6d50755a..898ebdc841 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/4.png and b/public/images/emoji/apple/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/5.png b/public/images/emoji/apple/mountain_biking_woman/5.png
index 647dbae611..7b57375179 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/5.png and b/public/images/emoji/apple/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/6.png b/public/images/emoji/apple/mountain_biking_woman/6.png
index 6f60da7a84..34369367da 100644
Binary files a/public/images/emoji/apple/mountain_biking_woman/6.png and b/public/images/emoji/apple/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/apple/mountain_cableway.png b/public/images/emoji/apple/mountain_cableway.png
index 82ac6f30e2..53d784bd86 100644
Binary files a/public/images/emoji/apple/mountain_cableway.png and b/public/images/emoji/apple/mountain_cableway.png differ
diff --git a/public/images/emoji/apple/mountain_railway.png b/public/images/emoji/apple/mountain_railway.png
index 98b481d141..d3099a26c8 100644
Binary files a/public/images/emoji/apple/mountain_railway.png and b/public/images/emoji/apple/mountain_railway.png differ
diff --git a/public/images/emoji/apple/mountain_snow.png b/public/images/emoji/apple/mountain_snow.png
index 0be1ad5fee..1f06191ad5 100644
Binary files a/public/images/emoji/apple/mountain_snow.png and b/public/images/emoji/apple/mountain_snow.png differ
diff --git a/public/images/emoji/apple/mouse.png b/public/images/emoji/apple/mouse.png
index 7807bd36f1..82d45ee6dc 100644
Binary files a/public/images/emoji/apple/mouse.png and b/public/images/emoji/apple/mouse.png differ
diff --git a/public/images/emoji/apple/mouse2.png b/public/images/emoji/apple/mouse2.png
index bf321dee2e..78c359fe4e 100644
Binary files a/public/images/emoji/apple/mouse2.png and b/public/images/emoji/apple/mouse2.png differ
diff --git a/public/images/emoji/apple/mouse_three_button.png b/public/images/emoji/apple/mouse_three_button.png
index 3899171edc..60317c6d44 100644
Binary files a/public/images/emoji/apple/mouse_three_button.png and b/public/images/emoji/apple/mouse_three_button.png differ
diff --git a/public/images/emoji/apple/movie_camera.png b/public/images/emoji/apple/movie_camera.png
index 56bd490359..7992738a1e 100644
Binary files a/public/images/emoji/apple/movie_camera.png and b/public/images/emoji/apple/movie_camera.png differ
diff --git a/public/images/emoji/apple/moyai.png b/public/images/emoji/apple/moyai.png
index 7964d5a356..0e7a22900c 100644
Binary files a/public/images/emoji/apple/moyai.png and b/public/images/emoji/apple/moyai.png differ
diff --git a/public/images/emoji/apple/mozambique.png b/public/images/emoji/apple/mozambique.png
index 7648e58091..f5a8c83a1b 100644
Binary files a/public/images/emoji/apple/mozambique.png and b/public/images/emoji/apple/mozambique.png differ
diff --git a/public/images/emoji/apple/mrs_claus.png b/public/images/emoji/apple/mrs_claus.png
index 3b97123426..72e741e1e6 100644
Binary files a/public/images/emoji/apple/mrs_claus.png and b/public/images/emoji/apple/mrs_claus.png differ
diff --git a/public/images/emoji/apple/mrs_claus/2.png b/public/images/emoji/apple/mrs_claus/2.png
index 759284bbd4..b80a2d216c 100644
Binary files a/public/images/emoji/apple/mrs_claus/2.png and b/public/images/emoji/apple/mrs_claus/2.png differ
diff --git a/public/images/emoji/apple/mrs_claus/3.png b/public/images/emoji/apple/mrs_claus/3.png
index 1b12a39f4e..9fc351b17b 100644
Binary files a/public/images/emoji/apple/mrs_claus/3.png and b/public/images/emoji/apple/mrs_claus/3.png differ
diff --git a/public/images/emoji/apple/mrs_claus/4.png b/public/images/emoji/apple/mrs_claus/4.png
index 3d1504ec6a..2a5e732629 100644
Binary files a/public/images/emoji/apple/mrs_claus/4.png and b/public/images/emoji/apple/mrs_claus/4.png differ
diff --git a/public/images/emoji/apple/mrs_claus/5.png b/public/images/emoji/apple/mrs_claus/5.png
index f770e3863e..edffaacf80 100644
Binary files a/public/images/emoji/apple/mrs_claus/5.png and b/public/images/emoji/apple/mrs_claus/5.png differ
diff --git a/public/images/emoji/apple/mrs_claus/6.png b/public/images/emoji/apple/mrs_claus/6.png
index 2df5811c70..d9741dbc0c 100644
Binary files a/public/images/emoji/apple/mrs_claus/6.png and b/public/images/emoji/apple/mrs_claus/6.png differ
diff --git a/public/images/emoji/apple/muscle.png b/public/images/emoji/apple/muscle.png
index 8349486e1c..9bba05e2ae 100644
Binary files a/public/images/emoji/apple/muscle.png and b/public/images/emoji/apple/muscle.png differ
diff --git a/public/images/emoji/apple/muscle/2.png b/public/images/emoji/apple/muscle/2.png
index 190d692860..c8804887a1 100644
Binary files a/public/images/emoji/apple/muscle/2.png and b/public/images/emoji/apple/muscle/2.png differ
diff --git a/public/images/emoji/apple/muscle/3.png b/public/images/emoji/apple/muscle/3.png
index e706e319e6..ba4ca2cd40 100644
Binary files a/public/images/emoji/apple/muscle/3.png and b/public/images/emoji/apple/muscle/3.png differ
diff --git a/public/images/emoji/apple/muscle/4.png b/public/images/emoji/apple/muscle/4.png
index d2b75ec199..093688efe3 100644
Binary files a/public/images/emoji/apple/muscle/4.png and b/public/images/emoji/apple/muscle/4.png differ
diff --git a/public/images/emoji/apple/muscle/5.png b/public/images/emoji/apple/muscle/5.png
index ca8614dafd..2e34e464aa 100644
Binary files a/public/images/emoji/apple/muscle/5.png and b/public/images/emoji/apple/muscle/5.png differ
diff --git a/public/images/emoji/apple/muscle/6.png b/public/images/emoji/apple/muscle/6.png
index 156c4dbb0c..a6ee2add5e 100644
Binary files a/public/images/emoji/apple/muscle/6.png and b/public/images/emoji/apple/muscle/6.png differ
diff --git a/public/images/emoji/apple/mushroom.png b/public/images/emoji/apple/mushroom.png
index 3b3c88bbb2..4f649bb68f 100644
Binary files a/public/images/emoji/apple/mushroom.png and b/public/images/emoji/apple/mushroom.png differ
diff --git a/public/images/emoji/apple/musical_keyboard.png b/public/images/emoji/apple/musical_keyboard.png
index b9fcadf652..781395528a 100644
Binary files a/public/images/emoji/apple/musical_keyboard.png and b/public/images/emoji/apple/musical_keyboard.png differ
diff --git a/public/images/emoji/apple/musical_note.png b/public/images/emoji/apple/musical_note.png
index c5ea389e5e..d5389853bb 100644
Binary files a/public/images/emoji/apple/musical_note.png and b/public/images/emoji/apple/musical_note.png differ
diff --git a/public/images/emoji/apple/musical_score.png b/public/images/emoji/apple/musical_score.png
index dd9eec6b83..a1644370d4 100644
Binary files a/public/images/emoji/apple/musical_score.png and b/public/images/emoji/apple/musical_score.png differ
diff --git a/public/images/emoji/apple/mute.png b/public/images/emoji/apple/mute.png
index 05ae12c7a8..f608b7aa5f 100644
Binary files a/public/images/emoji/apple/mute.png and b/public/images/emoji/apple/mute.png differ
diff --git a/public/images/emoji/apple/myanmar.png b/public/images/emoji/apple/myanmar.png
index 147b7b0e4e..f8b071cc85 100644
Binary files a/public/images/emoji/apple/myanmar.png and b/public/images/emoji/apple/myanmar.png differ
diff --git a/public/images/emoji/apple/nail_care.png b/public/images/emoji/apple/nail_care.png
index 256a7c9689..e9bbdaec76 100644
Binary files a/public/images/emoji/apple/nail_care.png and b/public/images/emoji/apple/nail_care.png differ
diff --git a/public/images/emoji/apple/nail_care/2.png b/public/images/emoji/apple/nail_care/2.png
index 509d805eb8..6121b27e15 100644
Binary files a/public/images/emoji/apple/nail_care/2.png and b/public/images/emoji/apple/nail_care/2.png differ
diff --git a/public/images/emoji/apple/nail_care/3.png b/public/images/emoji/apple/nail_care/3.png
index 42285ce132..9ae8b9b395 100644
Binary files a/public/images/emoji/apple/nail_care/3.png and b/public/images/emoji/apple/nail_care/3.png differ
diff --git a/public/images/emoji/apple/nail_care/4.png b/public/images/emoji/apple/nail_care/4.png
index c0d5cce984..4920346eeb 100644
Binary files a/public/images/emoji/apple/nail_care/4.png and b/public/images/emoji/apple/nail_care/4.png differ
diff --git a/public/images/emoji/apple/nail_care/5.png b/public/images/emoji/apple/nail_care/5.png
index 9bd1a2437e..8c31471e21 100644
Binary files a/public/images/emoji/apple/nail_care/5.png and b/public/images/emoji/apple/nail_care/5.png differ
diff --git a/public/images/emoji/apple/nail_care/6.png b/public/images/emoji/apple/nail_care/6.png
index f7d3b38127..cdab83f5ee 100644
Binary files a/public/images/emoji/apple/nail_care/6.png and b/public/images/emoji/apple/nail_care/6.png differ
diff --git a/public/images/emoji/apple/name_badge.png b/public/images/emoji/apple/name_badge.png
index 1020a8381c..0f21d513e7 100644
Binary files a/public/images/emoji/apple/name_badge.png and b/public/images/emoji/apple/name_badge.png differ
diff --git a/public/images/emoji/apple/namibia.png b/public/images/emoji/apple/namibia.png
index 46327a29ba..d1c11a5413 100644
Binary files a/public/images/emoji/apple/namibia.png and b/public/images/emoji/apple/namibia.png differ
diff --git a/public/images/emoji/apple/national_park.png b/public/images/emoji/apple/national_park.png
index 902d5ec8ea..7afea4ebcd 100644
Binary files a/public/images/emoji/apple/national_park.png and b/public/images/emoji/apple/national_park.png differ
diff --git a/public/images/emoji/apple/nauru.png b/public/images/emoji/apple/nauru.png
index 58e819dfc7..a2081a8760 100644
Binary files a/public/images/emoji/apple/nauru.png and b/public/images/emoji/apple/nauru.png differ
diff --git a/public/images/emoji/apple/nauseated_face.png b/public/images/emoji/apple/nauseated_face.png
index 6b2889b71a..a412eb7cb3 100644
Binary files a/public/images/emoji/apple/nauseated_face.png and b/public/images/emoji/apple/nauseated_face.png differ
diff --git a/public/images/emoji/apple/necktie.png b/public/images/emoji/apple/necktie.png
index 41b1cc08f7..08410cdc7e 100644
Binary files a/public/images/emoji/apple/necktie.png and b/public/images/emoji/apple/necktie.png differ
diff --git a/public/images/emoji/apple/negative_squared_cross_mark.png b/public/images/emoji/apple/negative_squared_cross_mark.png
index 4e6039bdd2..1c0959a111 100644
Binary files a/public/images/emoji/apple/negative_squared_cross_mark.png and b/public/images/emoji/apple/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/apple/nepal.png b/public/images/emoji/apple/nepal.png
index 358ea54522..3ac7c4e194 100644
Binary files a/public/images/emoji/apple/nepal.png and b/public/images/emoji/apple/nepal.png differ
diff --git a/public/images/emoji/apple/nerd.png b/public/images/emoji/apple/nerd.png
index 8065a61909..a6bee8738f 100644
Binary files a/public/images/emoji/apple/nerd.png and b/public/images/emoji/apple/nerd.png differ
diff --git a/public/images/emoji/apple/nerd_face.png b/public/images/emoji/apple/nerd_face.png
index 8065a61909..a6bee8738f 100644
Binary files a/public/images/emoji/apple/nerd_face.png and b/public/images/emoji/apple/nerd_face.png differ
diff --git a/public/images/emoji/apple/netherlands.png b/public/images/emoji/apple/netherlands.png
index 5848433e27..3a92cbd6db 100644
Binary files a/public/images/emoji/apple/netherlands.png and b/public/images/emoji/apple/netherlands.png differ
diff --git a/public/images/emoji/apple/neutral_face.png b/public/images/emoji/apple/neutral_face.png
index 45683f5149..7d88c66453 100644
Binary files a/public/images/emoji/apple/neutral_face.png and b/public/images/emoji/apple/neutral_face.png differ
diff --git a/public/images/emoji/apple/new.png b/public/images/emoji/apple/new.png
index 1d386399fe..7ac11141fa 100644
Binary files a/public/images/emoji/apple/new.png and b/public/images/emoji/apple/new.png differ
diff --git a/public/images/emoji/apple/new_caledonia.png b/public/images/emoji/apple/new_caledonia.png
index f9a1087cb3..a5443bb1fa 100644
Binary files a/public/images/emoji/apple/new_caledonia.png and b/public/images/emoji/apple/new_caledonia.png differ
diff --git a/public/images/emoji/apple/new_moon.png b/public/images/emoji/apple/new_moon.png
index 482946e48d..9607958ca1 100644
Binary files a/public/images/emoji/apple/new_moon.png and b/public/images/emoji/apple/new_moon.png differ
diff --git a/public/images/emoji/apple/new_moon_with_face.png b/public/images/emoji/apple/new_moon_with_face.png
index 006c6791d7..5a4f568b76 100644
Binary files a/public/images/emoji/apple/new_moon_with_face.png and b/public/images/emoji/apple/new_moon_with_face.png differ
diff --git a/public/images/emoji/apple/new_zealand.png b/public/images/emoji/apple/new_zealand.png
index bbf96fc33f..1fdd9d89d6 100644
Binary files a/public/images/emoji/apple/new_zealand.png and b/public/images/emoji/apple/new_zealand.png differ
diff --git a/public/images/emoji/apple/newspaper.png b/public/images/emoji/apple/newspaper.png
index c05c0ede5b..0ee8e51a15 100644
Binary files a/public/images/emoji/apple/newspaper.png and b/public/images/emoji/apple/newspaper.png differ
diff --git a/public/images/emoji/apple/newspaper2.png b/public/images/emoji/apple/newspaper2.png
index 400b080569..b6ef5fb796 100644
Binary files a/public/images/emoji/apple/newspaper2.png and b/public/images/emoji/apple/newspaper2.png differ
diff --git a/public/images/emoji/apple/newspaper_roll.png b/public/images/emoji/apple/newspaper_roll.png
index 400b080569..b6ef5fb796 100644
Binary files a/public/images/emoji/apple/newspaper_roll.png and b/public/images/emoji/apple/newspaper_roll.png differ
diff --git a/public/images/emoji/apple/next_track.png b/public/images/emoji/apple/next_track.png
index c6c645c86d..5f6efec485 100644
Binary files a/public/images/emoji/apple/next_track.png and b/public/images/emoji/apple/next_track.png differ
diff --git a/public/images/emoji/apple/next_track_button.png b/public/images/emoji/apple/next_track_button.png
index c6c645c86d..5f6efec485 100644
Binary files a/public/images/emoji/apple/next_track_button.png and b/public/images/emoji/apple/next_track_button.png differ
diff --git a/public/images/emoji/apple/ng.png b/public/images/emoji/apple/ng.png
index d28ce65270..482d592053 100644
Binary files a/public/images/emoji/apple/ng.png and b/public/images/emoji/apple/ng.png differ
diff --git a/public/images/emoji/apple/nicaragua.png b/public/images/emoji/apple/nicaragua.png
index f99f191636..ed0b90df2f 100644
Binary files a/public/images/emoji/apple/nicaragua.png and b/public/images/emoji/apple/nicaragua.png differ
diff --git a/public/images/emoji/apple/niger.png b/public/images/emoji/apple/niger.png
index 2d5530dd62..860fd4f350 100644
Binary files a/public/images/emoji/apple/niger.png and b/public/images/emoji/apple/niger.png differ
diff --git a/public/images/emoji/apple/nigeria.png b/public/images/emoji/apple/nigeria.png
index 1bbfb8e586..4d2272ae5a 100644
Binary files a/public/images/emoji/apple/nigeria.png and b/public/images/emoji/apple/nigeria.png differ
diff --git a/public/images/emoji/apple/night_with_stars.png b/public/images/emoji/apple/night_with_stars.png
index ee92a63cee..dd075cc053 100644
Binary files a/public/images/emoji/apple/night_with_stars.png and b/public/images/emoji/apple/night_with_stars.png differ
diff --git a/public/images/emoji/apple/nine.png b/public/images/emoji/apple/nine.png
index f68cbedc51..b13fee1cf6 100644
Binary files a/public/images/emoji/apple/nine.png and b/public/images/emoji/apple/nine.png differ
diff --git a/public/images/emoji/apple/niue.png b/public/images/emoji/apple/niue.png
index 15f12b061c..daa7dc9cfe 100644
Binary files a/public/images/emoji/apple/niue.png and b/public/images/emoji/apple/niue.png differ
diff --git a/public/images/emoji/apple/no_bell.png b/public/images/emoji/apple/no_bell.png
index 7f6f2283e2..b7b686544f 100644
Binary files a/public/images/emoji/apple/no_bell.png and b/public/images/emoji/apple/no_bell.png differ
diff --git a/public/images/emoji/apple/no_bicycles.png b/public/images/emoji/apple/no_bicycles.png
index 877ad857c1..1d2dc734cd 100644
Binary files a/public/images/emoji/apple/no_bicycles.png and b/public/images/emoji/apple/no_bicycles.png differ
diff --git a/public/images/emoji/apple/no_entry.png b/public/images/emoji/apple/no_entry.png
index 2190e5290f..efb08a3671 100644
Binary files a/public/images/emoji/apple/no_entry.png and b/public/images/emoji/apple/no_entry.png differ
diff --git a/public/images/emoji/apple/no_entry_sign.png b/public/images/emoji/apple/no_entry_sign.png
index d22e5eef38..0f0cd7f63a 100644
Binary files a/public/images/emoji/apple/no_entry_sign.png and b/public/images/emoji/apple/no_entry_sign.png differ
diff --git a/public/images/emoji/apple/no_good.png b/public/images/emoji/apple/no_good.png
index 429fc1ba92..a95dc1c3f5 100644
Binary files a/public/images/emoji/apple/no_good.png and b/public/images/emoji/apple/no_good.png differ
diff --git a/public/images/emoji/apple/no_good/2.png b/public/images/emoji/apple/no_good/2.png
index 1fba8c40e4..6ed8cb02d5 100644
Binary files a/public/images/emoji/apple/no_good/2.png and b/public/images/emoji/apple/no_good/2.png differ
diff --git a/public/images/emoji/apple/no_good/3.png b/public/images/emoji/apple/no_good/3.png
index d533bd34fa..c8197d8eeb 100644
Binary files a/public/images/emoji/apple/no_good/3.png and b/public/images/emoji/apple/no_good/3.png differ
diff --git a/public/images/emoji/apple/no_good/4.png b/public/images/emoji/apple/no_good/4.png
index 55ca1de655..1dd7a5e751 100644
Binary files a/public/images/emoji/apple/no_good/4.png and b/public/images/emoji/apple/no_good/4.png differ
diff --git a/public/images/emoji/apple/no_good/5.png b/public/images/emoji/apple/no_good/5.png
index df889c3d3b..0f4f3b78d4 100644
Binary files a/public/images/emoji/apple/no_good/5.png and b/public/images/emoji/apple/no_good/5.png differ
diff --git a/public/images/emoji/apple/no_good/6.png b/public/images/emoji/apple/no_good/6.png
index 198d8d0828..233cc49994 100644
Binary files a/public/images/emoji/apple/no_good/6.png and b/public/images/emoji/apple/no_good/6.png differ
diff --git a/public/images/emoji/apple/no_good_man.png b/public/images/emoji/apple/no_good_man.png
index c7e959db49..79e85ef95a 100644
Binary files a/public/images/emoji/apple/no_good_man.png and b/public/images/emoji/apple/no_good_man.png differ
diff --git a/public/images/emoji/apple/no_good_man/2.png b/public/images/emoji/apple/no_good_man/2.png
index 07de44c916..d9f41fbd2f 100644
Binary files a/public/images/emoji/apple/no_good_man/2.png and b/public/images/emoji/apple/no_good_man/2.png differ
diff --git a/public/images/emoji/apple/no_good_man/3.png b/public/images/emoji/apple/no_good_man/3.png
index 7194eba931..ef3d5824db 100644
Binary files a/public/images/emoji/apple/no_good_man/3.png and b/public/images/emoji/apple/no_good_man/3.png differ
diff --git a/public/images/emoji/apple/no_good_man/4.png b/public/images/emoji/apple/no_good_man/4.png
index 9ba6bbb3a7..fa258cf20b 100644
Binary files a/public/images/emoji/apple/no_good_man/4.png and b/public/images/emoji/apple/no_good_man/4.png differ
diff --git a/public/images/emoji/apple/no_good_man/5.png b/public/images/emoji/apple/no_good_man/5.png
index 88b5985156..a9a4e1c077 100644
Binary files a/public/images/emoji/apple/no_good_man/5.png and b/public/images/emoji/apple/no_good_man/5.png differ
diff --git a/public/images/emoji/apple/no_good_man/6.png b/public/images/emoji/apple/no_good_man/6.png
index 235c3371e8..b20ec60fe3 100644
Binary files a/public/images/emoji/apple/no_good_man/6.png and b/public/images/emoji/apple/no_good_man/6.png differ
diff --git a/public/images/emoji/apple/no_good_woman.png b/public/images/emoji/apple/no_good_woman.png
index 429fc1ba92..a95dc1c3f5 100644
Binary files a/public/images/emoji/apple/no_good_woman.png and b/public/images/emoji/apple/no_good_woman.png differ
diff --git a/public/images/emoji/apple/no_good_woman/2.png b/public/images/emoji/apple/no_good_woman/2.png
index 1fba8c40e4..6ed8cb02d5 100644
Binary files a/public/images/emoji/apple/no_good_woman/2.png and b/public/images/emoji/apple/no_good_woman/2.png differ
diff --git a/public/images/emoji/apple/no_good_woman/3.png b/public/images/emoji/apple/no_good_woman/3.png
index d533bd34fa..c8197d8eeb 100644
Binary files a/public/images/emoji/apple/no_good_woman/3.png and b/public/images/emoji/apple/no_good_woman/3.png differ
diff --git a/public/images/emoji/apple/no_good_woman/4.png b/public/images/emoji/apple/no_good_woman/4.png
index 55ca1de655..1dd7a5e751 100644
Binary files a/public/images/emoji/apple/no_good_woman/4.png and b/public/images/emoji/apple/no_good_woman/4.png differ
diff --git a/public/images/emoji/apple/no_good_woman/5.png b/public/images/emoji/apple/no_good_woman/5.png
index df889c3d3b..0f4f3b78d4 100644
Binary files a/public/images/emoji/apple/no_good_woman/5.png and b/public/images/emoji/apple/no_good_woman/5.png differ
diff --git a/public/images/emoji/apple/no_good_woman/6.png b/public/images/emoji/apple/no_good_woman/6.png
index 198d8d0828..233cc49994 100644
Binary files a/public/images/emoji/apple/no_good_woman/6.png and b/public/images/emoji/apple/no_good_woman/6.png differ
diff --git a/public/images/emoji/apple/no_mobile_phones.png b/public/images/emoji/apple/no_mobile_phones.png
index c11b08bc2b..cc34bac1f3 100644
Binary files a/public/images/emoji/apple/no_mobile_phones.png and b/public/images/emoji/apple/no_mobile_phones.png differ
diff --git a/public/images/emoji/apple/no_mouth.png b/public/images/emoji/apple/no_mouth.png
index 5560276cba..ce7f505110 100644
Binary files a/public/images/emoji/apple/no_mouth.png and b/public/images/emoji/apple/no_mouth.png differ
diff --git a/public/images/emoji/apple/no_pedestrians.png b/public/images/emoji/apple/no_pedestrians.png
index c4fcc420ad..c0f86ec509 100644
Binary files a/public/images/emoji/apple/no_pedestrians.png and b/public/images/emoji/apple/no_pedestrians.png differ
diff --git a/public/images/emoji/apple/no_smoking.png b/public/images/emoji/apple/no_smoking.png
index b16caf6a8b..5d9b51ebac 100644
Binary files a/public/images/emoji/apple/no_smoking.png and b/public/images/emoji/apple/no_smoking.png differ
diff --git a/public/images/emoji/apple/non-potable_water.png b/public/images/emoji/apple/non-potable_water.png
index 425a8c6eef..6a9497c427 100644
Binary files a/public/images/emoji/apple/non-potable_water.png and b/public/images/emoji/apple/non-potable_water.png differ
diff --git a/public/images/emoji/apple/norfolk_island.png b/public/images/emoji/apple/norfolk_island.png
index 04a9904c8b..c380b4c32e 100644
Binary files a/public/images/emoji/apple/norfolk_island.png and b/public/images/emoji/apple/norfolk_island.png differ
diff --git a/public/images/emoji/apple/north_korea.png b/public/images/emoji/apple/north_korea.png
index 8b74a9f83c..8674ddc0cc 100644
Binary files a/public/images/emoji/apple/north_korea.png and b/public/images/emoji/apple/north_korea.png differ
diff --git a/public/images/emoji/apple/northern_mariana_islands.png b/public/images/emoji/apple/northern_mariana_islands.png
index bcfc406dd5..0a0949c6ef 100644
Binary files a/public/images/emoji/apple/northern_mariana_islands.png and b/public/images/emoji/apple/northern_mariana_islands.png differ
diff --git a/public/images/emoji/apple/norway.png b/public/images/emoji/apple/norway.png
index 5827a3d376..4bb670001a 100644
Binary files a/public/images/emoji/apple/norway.png and b/public/images/emoji/apple/norway.png differ
diff --git a/public/images/emoji/apple/nose.png b/public/images/emoji/apple/nose.png
index 5489cc0bb5..85e25b3905 100644
Binary files a/public/images/emoji/apple/nose.png and b/public/images/emoji/apple/nose.png differ
diff --git a/public/images/emoji/apple/nose/2.png b/public/images/emoji/apple/nose/2.png
index 5029910fe7..ed13a87a36 100644
Binary files a/public/images/emoji/apple/nose/2.png and b/public/images/emoji/apple/nose/2.png differ
diff --git a/public/images/emoji/apple/nose/3.png b/public/images/emoji/apple/nose/3.png
index 84406ef480..028a855acf 100644
Binary files a/public/images/emoji/apple/nose/3.png and b/public/images/emoji/apple/nose/3.png differ
diff --git a/public/images/emoji/apple/nose/4.png b/public/images/emoji/apple/nose/4.png
index 8c3d71db4a..ecaa467c5d 100644
Binary files a/public/images/emoji/apple/nose/4.png and b/public/images/emoji/apple/nose/4.png differ
diff --git a/public/images/emoji/apple/nose/5.png b/public/images/emoji/apple/nose/5.png
index e1ed779ae6..ca2b338125 100644
Binary files a/public/images/emoji/apple/nose/5.png and b/public/images/emoji/apple/nose/5.png differ
diff --git a/public/images/emoji/apple/nose/6.png b/public/images/emoji/apple/nose/6.png
index 59fb8938e2..553c7372ae 100644
Binary files a/public/images/emoji/apple/nose/6.png and b/public/images/emoji/apple/nose/6.png differ
diff --git a/public/images/emoji/apple/notebook.png b/public/images/emoji/apple/notebook.png
index 974f211892..28b8f66624 100644
Binary files a/public/images/emoji/apple/notebook.png and b/public/images/emoji/apple/notebook.png differ
diff --git a/public/images/emoji/apple/notebook_with_decorative_cover.png b/public/images/emoji/apple/notebook_with_decorative_cover.png
index 9bdbe23bb4..2fb252ece8 100644
Binary files a/public/images/emoji/apple/notebook_with_decorative_cover.png and b/public/images/emoji/apple/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/apple/notepad_spiral.png b/public/images/emoji/apple/notepad_spiral.png
index 5e4c3a2d0e..c7d2bfcca8 100644
Binary files a/public/images/emoji/apple/notepad_spiral.png and b/public/images/emoji/apple/notepad_spiral.png differ
diff --git a/public/images/emoji/apple/notes.png b/public/images/emoji/apple/notes.png
index 284f7eebbd..cf7db38d1b 100644
Binary files a/public/images/emoji/apple/notes.png and b/public/images/emoji/apple/notes.png differ
diff --git a/public/images/emoji/apple/nut_and_bolt.png b/public/images/emoji/apple/nut_and_bolt.png
index 1890dc87bc..1d60d4b712 100644
Binary files a/public/images/emoji/apple/nut_and_bolt.png and b/public/images/emoji/apple/nut_and_bolt.png differ
diff --git a/public/images/emoji/apple/o.png b/public/images/emoji/apple/o.png
index fa8b79521d..83fa12216f 100644
Binary files a/public/images/emoji/apple/o.png and b/public/images/emoji/apple/o.png differ
diff --git a/public/images/emoji/apple/o2.png b/public/images/emoji/apple/o2.png
index 5a11ac81c5..c3a8ebe5c4 100644
Binary files a/public/images/emoji/apple/o2.png and b/public/images/emoji/apple/o2.png differ
diff --git a/public/images/emoji/apple/ocean.png b/public/images/emoji/apple/ocean.png
index a619c11c48..08987dbcfc 100644
Binary files a/public/images/emoji/apple/ocean.png and b/public/images/emoji/apple/ocean.png differ
diff --git a/public/images/emoji/apple/octopus.png b/public/images/emoji/apple/octopus.png
index 1e40b5892d..2142ed1541 100644
Binary files a/public/images/emoji/apple/octopus.png and b/public/images/emoji/apple/octopus.png differ
diff --git a/public/images/emoji/apple/oden.png b/public/images/emoji/apple/oden.png
index 78979edcbb..184e02b1de 100644
Binary files a/public/images/emoji/apple/oden.png and b/public/images/emoji/apple/oden.png differ
diff --git a/public/images/emoji/apple/office.png b/public/images/emoji/apple/office.png
index 6fb5b10e9a..6310ee2320 100644
Binary files a/public/images/emoji/apple/office.png and b/public/images/emoji/apple/office.png differ
diff --git a/public/images/emoji/apple/oil.png b/public/images/emoji/apple/oil.png
index f63443d6a4..e7c21706f7 100644
Binary files a/public/images/emoji/apple/oil.png and b/public/images/emoji/apple/oil.png differ
diff --git a/public/images/emoji/apple/oil_drum.png b/public/images/emoji/apple/oil_drum.png
index f63443d6a4..e7c21706f7 100644
Binary files a/public/images/emoji/apple/oil_drum.png and b/public/images/emoji/apple/oil_drum.png differ
diff --git a/public/images/emoji/apple/ok.png b/public/images/emoji/apple/ok.png
index c448030e13..c7e9178d30 100644
Binary files a/public/images/emoji/apple/ok.png and b/public/images/emoji/apple/ok.png differ
diff --git a/public/images/emoji/apple/ok_hand.png b/public/images/emoji/apple/ok_hand.png
index db32febd5c..848959b6d3 100644
Binary files a/public/images/emoji/apple/ok_hand.png and b/public/images/emoji/apple/ok_hand.png differ
diff --git a/public/images/emoji/apple/ok_hand/2.png b/public/images/emoji/apple/ok_hand/2.png
index 846b068ecb..6708ed02fb 100644
Binary files a/public/images/emoji/apple/ok_hand/2.png and b/public/images/emoji/apple/ok_hand/2.png differ
diff --git a/public/images/emoji/apple/ok_hand/3.png b/public/images/emoji/apple/ok_hand/3.png
index 5106321993..b2c26ca5a5 100644
Binary files a/public/images/emoji/apple/ok_hand/3.png and b/public/images/emoji/apple/ok_hand/3.png differ
diff --git a/public/images/emoji/apple/ok_hand/4.png b/public/images/emoji/apple/ok_hand/4.png
index bcc412fb85..6856d792f9 100644
Binary files a/public/images/emoji/apple/ok_hand/4.png and b/public/images/emoji/apple/ok_hand/4.png differ
diff --git a/public/images/emoji/apple/ok_hand/5.png b/public/images/emoji/apple/ok_hand/5.png
index 1690724e43..09d3fd0985 100644
Binary files a/public/images/emoji/apple/ok_hand/5.png and b/public/images/emoji/apple/ok_hand/5.png differ
diff --git a/public/images/emoji/apple/ok_hand/6.png b/public/images/emoji/apple/ok_hand/6.png
index de9da6b79e..4b18992055 100644
Binary files a/public/images/emoji/apple/ok_hand/6.png and b/public/images/emoji/apple/ok_hand/6.png differ
diff --git a/public/images/emoji/apple/ok_man.png b/public/images/emoji/apple/ok_man.png
index ea8c3efa38..9a940cf5a5 100644
Binary files a/public/images/emoji/apple/ok_man.png and b/public/images/emoji/apple/ok_man.png differ
diff --git a/public/images/emoji/apple/ok_man/2.png b/public/images/emoji/apple/ok_man/2.png
index fc088678c8..3c6873df05 100644
Binary files a/public/images/emoji/apple/ok_man/2.png and b/public/images/emoji/apple/ok_man/2.png differ
diff --git a/public/images/emoji/apple/ok_man/3.png b/public/images/emoji/apple/ok_man/3.png
index d355137b7e..ce0b3393e1 100644
Binary files a/public/images/emoji/apple/ok_man/3.png and b/public/images/emoji/apple/ok_man/3.png differ
diff --git a/public/images/emoji/apple/ok_man/4.png b/public/images/emoji/apple/ok_man/4.png
index 86b6289c2b..b100826455 100644
Binary files a/public/images/emoji/apple/ok_man/4.png and b/public/images/emoji/apple/ok_man/4.png differ
diff --git a/public/images/emoji/apple/ok_man/5.png b/public/images/emoji/apple/ok_man/5.png
index c807bcf02c..7630650a2d 100644
Binary files a/public/images/emoji/apple/ok_man/5.png and b/public/images/emoji/apple/ok_man/5.png differ
diff --git a/public/images/emoji/apple/ok_man/6.png b/public/images/emoji/apple/ok_man/6.png
index 6d6e7935d8..0b7e8fd3ec 100644
Binary files a/public/images/emoji/apple/ok_man/6.png and b/public/images/emoji/apple/ok_man/6.png differ
diff --git a/public/images/emoji/apple/ok_woman.png b/public/images/emoji/apple/ok_woman.png
index b0e2f9d0f3..c97bdf7be8 100644
Binary files a/public/images/emoji/apple/ok_woman.png and b/public/images/emoji/apple/ok_woman.png differ
diff --git a/public/images/emoji/apple/ok_woman/2.png b/public/images/emoji/apple/ok_woman/2.png
index bd3834c91e..19cd338fb1 100644
Binary files a/public/images/emoji/apple/ok_woman/2.png and b/public/images/emoji/apple/ok_woman/2.png differ
diff --git a/public/images/emoji/apple/ok_woman/3.png b/public/images/emoji/apple/ok_woman/3.png
index c8320428ed..0b81d930ce 100644
Binary files a/public/images/emoji/apple/ok_woman/3.png and b/public/images/emoji/apple/ok_woman/3.png differ
diff --git a/public/images/emoji/apple/ok_woman/4.png b/public/images/emoji/apple/ok_woman/4.png
index c7865487f2..c202475221 100644
Binary files a/public/images/emoji/apple/ok_woman/4.png and b/public/images/emoji/apple/ok_woman/4.png differ
diff --git a/public/images/emoji/apple/ok_woman/5.png b/public/images/emoji/apple/ok_woman/5.png
index afb43cda70..1a4790ac09 100644
Binary files a/public/images/emoji/apple/ok_woman/5.png and b/public/images/emoji/apple/ok_woman/5.png differ
diff --git a/public/images/emoji/apple/ok_woman/6.png b/public/images/emoji/apple/ok_woman/6.png
index cc400e7f1e..f23bc66a27 100644
Binary files a/public/images/emoji/apple/ok_woman/6.png and b/public/images/emoji/apple/ok_woman/6.png differ
diff --git a/public/images/emoji/apple/old_key.png b/public/images/emoji/apple/old_key.png
index 05715332b1..d0dbadedf1 100644
Binary files a/public/images/emoji/apple/old_key.png and b/public/images/emoji/apple/old_key.png differ
diff --git a/public/images/emoji/apple/older_adult.png b/public/images/emoji/apple/older_adult.png
index 8796829b87..7623fec74b 100644
Binary files a/public/images/emoji/apple/older_adult.png and b/public/images/emoji/apple/older_adult.png differ
diff --git a/public/images/emoji/apple/older_adult/2.png b/public/images/emoji/apple/older_adult/2.png
index b36f41960e..77dc0f913d 100644
Binary files a/public/images/emoji/apple/older_adult/2.png and b/public/images/emoji/apple/older_adult/2.png differ
diff --git a/public/images/emoji/apple/older_adult/3.png b/public/images/emoji/apple/older_adult/3.png
index dc1441fea5..cd7df7477e 100644
Binary files a/public/images/emoji/apple/older_adult/3.png and b/public/images/emoji/apple/older_adult/3.png differ
diff --git a/public/images/emoji/apple/older_adult/4.png b/public/images/emoji/apple/older_adult/4.png
index abc19e06c7..f794b8d8a1 100644
Binary files a/public/images/emoji/apple/older_adult/4.png and b/public/images/emoji/apple/older_adult/4.png differ
diff --git a/public/images/emoji/apple/older_adult/5.png b/public/images/emoji/apple/older_adult/5.png
index c90549f681..2660378807 100644
Binary files a/public/images/emoji/apple/older_adult/5.png and b/public/images/emoji/apple/older_adult/5.png differ
diff --git a/public/images/emoji/apple/older_adult/6.png b/public/images/emoji/apple/older_adult/6.png
index 5152c9c1a3..3b456ba97e 100644
Binary files a/public/images/emoji/apple/older_adult/6.png and b/public/images/emoji/apple/older_adult/6.png differ
diff --git a/public/images/emoji/apple/older_man.png b/public/images/emoji/apple/older_man.png
index 7d61e185f6..2cd110bea2 100644
Binary files a/public/images/emoji/apple/older_man.png and b/public/images/emoji/apple/older_man.png differ
diff --git a/public/images/emoji/apple/older_man/2.png b/public/images/emoji/apple/older_man/2.png
index 5bce0f8719..292a52f3c5 100644
Binary files a/public/images/emoji/apple/older_man/2.png and b/public/images/emoji/apple/older_man/2.png differ
diff --git a/public/images/emoji/apple/older_man/3.png b/public/images/emoji/apple/older_man/3.png
index abb4fbd880..f34f4e0108 100644
Binary files a/public/images/emoji/apple/older_man/3.png and b/public/images/emoji/apple/older_man/3.png differ
diff --git a/public/images/emoji/apple/older_man/4.png b/public/images/emoji/apple/older_man/4.png
index db548d5f68..79e72f76e9 100644
Binary files a/public/images/emoji/apple/older_man/4.png and b/public/images/emoji/apple/older_man/4.png differ
diff --git a/public/images/emoji/apple/older_man/5.png b/public/images/emoji/apple/older_man/5.png
index 6b6a9d922d..e3dcc8afe3 100644
Binary files a/public/images/emoji/apple/older_man/5.png and b/public/images/emoji/apple/older_man/5.png differ
diff --git a/public/images/emoji/apple/older_man/6.png b/public/images/emoji/apple/older_man/6.png
index dcb090572f..84414f7184 100644
Binary files a/public/images/emoji/apple/older_man/6.png and b/public/images/emoji/apple/older_man/6.png differ
diff --git a/public/images/emoji/apple/older_woman.png b/public/images/emoji/apple/older_woman.png
index 3aa8954a88..3643cb1152 100644
Binary files a/public/images/emoji/apple/older_woman.png and b/public/images/emoji/apple/older_woman.png differ
diff --git a/public/images/emoji/apple/older_woman/2.png b/public/images/emoji/apple/older_woman/2.png
index 0338c484a1..df00cc44ae 100644
Binary files a/public/images/emoji/apple/older_woman/2.png and b/public/images/emoji/apple/older_woman/2.png differ
diff --git a/public/images/emoji/apple/older_woman/3.png b/public/images/emoji/apple/older_woman/3.png
index eb68885c38..9c4d7e2be0 100644
Binary files a/public/images/emoji/apple/older_woman/3.png and b/public/images/emoji/apple/older_woman/3.png differ
diff --git a/public/images/emoji/apple/older_woman/4.png b/public/images/emoji/apple/older_woman/4.png
index b0ec0d5864..82c254aa22 100644
Binary files a/public/images/emoji/apple/older_woman/4.png and b/public/images/emoji/apple/older_woman/4.png differ
diff --git a/public/images/emoji/apple/older_woman/5.png b/public/images/emoji/apple/older_woman/5.png
index e9778d3e96..00eb898b52 100644
Binary files a/public/images/emoji/apple/older_woman/5.png and b/public/images/emoji/apple/older_woman/5.png differ
diff --git a/public/images/emoji/apple/older_woman/6.png b/public/images/emoji/apple/older_woman/6.png
index af461aed00..1db59fd049 100644
Binary files a/public/images/emoji/apple/older_woman/6.png and b/public/images/emoji/apple/older_woman/6.png differ
diff --git a/public/images/emoji/apple/om.png b/public/images/emoji/apple/om.png
index b5b1a233e6..daf8025d82 100644
Binary files a/public/images/emoji/apple/om.png and b/public/images/emoji/apple/om.png differ
diff --git a/public/images/emoji/apple/om_symbol.png b/public/images/emoji/apple/om_symbol.png
index b5b1a233e6..daf8025d82 100644
Binary files a/public/images/emoji/apple/om_symbol.png and b/public/images/emoji/apple/om_symbol.png differ
diff --git a/public/images/emoji/apple/oman.png b/public/images/emoji/apple/oman.png
index de17cf8477..db9caa5a08 100644
Binary files a/public/images/emoji/apple/oman.png and b/public/images/emoji/apple/oman.png differ
diff --git a/public/images/emoji/apple/on.png b/public/images/emoji/apple/on.png
index 46dafb2eae..ea7965f08e 100644
Binary files a/public/images/emoji/apple/on.png and b/public/images/emoji/apple/on.png differ
diff --git a/public/images/emoji/apple/oncoming_automobile.png b/public/images/emoji/apple/oncoming_automobile.png
index 80e24f234b..8e21911667 100644
Binary files a/public/images/emoji/apple/oncoming_automobile.png and b/public/images/emoji/apple/oncoming_automobile.png differ
diff --git a/public/images/emoji/apple/oncoming_bus.png b/public/images/emoji/apple/oncoming_bus.png
index 53769420d9..c854cf1212 100644
Binary files a/public/images/emoji/apple/oncoming_bus.png and b/public/images/emoji/apple/oncoming_bus.png differ
diff --git a/public/images/emoji/apple/oncoming_police_car.png b/public/images/emoji/apple/oncoming_police_car.png
index 0e9d3eff9b..9a6220ec4a 100644
Binary files a/public/images/emoji/apple/oncoming_police_car.png and b/public/images/emoji/apple/oncoming_police_car.png differ
diff --git a/public/images/emoji/apple/oncoming_taxi.png b/public/images/emoji/apple/oncoming_taxi.png
index 7b3d37c264..8c4512dd05 100644
Binary files a/public/images/emoji/apple/oncoming_taxi.png and b/public/images/emoji/apple/oncoming_taxi.png differ
diff --git a/public/images/emoji/apple/one.png b/public/images/emoji/apple/one.png
index 04153a940f..5baddfbee3 100644
Binary files a/public/images/emoji/apple/one.png and b/public/images/emoji/apple/one.png differ
diff --git a/public/images/emoji/apple/open_book.png b/public/images/emoji/apple/open_book.png
index fd8d428a74..ef0f597bea 100644
Binary files a/public/images/emoji/apple/open_book.png and b/public/images/emoji/apple/open_book.png differ
diff --git a/public/images/emoji/apple/open_file_folder.png b/public/images/emoji/apple/open_file_folder.png
index a55476e3b1..7556d98f63 100644
Binary files a/public/images/emoji/apple/open_file_folder.png and b/public/images/emoji/apple/open_file_folder.png differ
diff --git a/public/images/emoji/apple/open_hands.png b/public/images/emoji/apple/open_hands.png
index 5124bfbb92..cd9809e644 100644
Binary files a/public/images/emoji/apple/open_hands.png and b/public/images/emoji/apple/open_hands.png differ
diff --git a/public/images/emoji/apple/open_hands/2.png b/public/images/emoji/apple/open_hands/2.png
index a34b319c25..f064ee7152 100644
Binary files a/public/images/emoji/apple/open_hands/2.png and b/public/images/emoji/apple/open_hands/2.png differ
diff --git a/public/images/emoji/apple/open_hands/3.png b/public/images/emoji/apple/open_hands/3.png
index 01678c5ca7..06e8ba396f 100644
Binary files a/public/images/emoji/apple/open_hands/3.png and b/public/images/emoji/apple/open_hands/3.png differ
diff --git a/public/images/emoji/apple/open_hands/4.png b/public/images/emoji/apple/open_hands/4.png
index 21d7feef15..8f3c45c83b 100644
Binary files a/public/images/emoji/apple/open_hands/4.png and b/public/images/emoji/apple/open_hands/4.png differ
diff --git a/public/images/emoji/apple/open_hands/5.png b/public/images/emoji/apple/open_hands/5.png
index eb7ba22d58..07140c1677 100644
Binary files a/public/images/emoji/apple/open_hands/5.png and b/public/images/emoji/apple/open_hands/5.png differ
diff --git a/public/images/emoji/apple/open_hands/6.png b/public/images/emoji/apple/open_hands/6.png
index 363204276b..092b3b367f 100644
Binary files a/public/images/emoji/apple/open_hands/6.png and b/public/images/emoji/apple/open_hands/6.png differ
diff --git a/public/images/emoji/apple/open_mouth.png b/public/images/emoji/apple/open_mouth.png
index f4b4ae9b79..c2b2a651b8 100644
Binary files a/public/images/emoji/apple/open_mouth.png and b/public/images/emoji/apple/open_mouth.png differ
diff --git a/public/images/emoji/apple/open_umbrella.png b/public/images/emoji/apple/open_umbrella.png
index 1d7d1c6a5f..df4299aa97 100644
Binary files a/public/images/emoji/apple/open_umbrella.png and b/public/images/emoji/apple/open_umbrella.png differ
diff --git a/public/images/emoji/apple/ophiuchus.png b/public/images/emoji/apple/ophiuchus.png
index bbcaa98be9..d8e5f423e5 100644
Binary files a/public/images/emoji/apple/ophiuchus.png and b/public/images/emoji/apple/ophiuchus.png differ
diff --git a/public/images/emoji/apple/orange_book.png b/public/images/emoji/apple/orange_book.png
index bfd48b8c07..e56b2ddebc 100644
Binary files a/public/images/emoji/apple/orange_book.png and b/public/images/emoji/apple/orange_book.png differ
diff --git a/public/images/emoji/apple/orange_heart.png b/public/images/emoji/apple/orange_heart.png
index f217c930a7..1cbfadd93d 100644
Binary files a/public/images/emoji/apple/orange_heart.png and b/public/images/emoji/apple/orange_heart.png differ
diff --git a/public/images/emoji/apple/orthodox_cross.png b/public/images/emoji/apple/orthodox_cross.png
index ea6955e09a..2304378c82 100644
Binary files a/public/images/emoji/apple/orthodox_cross.png and b/public/images/emoji/apple/orthodox_cross.png differ
diff --git a/public/images/emoji/apple/outbox_tray.png b/public/images/emoji/apple/outbox_tray.png
index af879adaba..7bdc83e09d 100644
Binary files a/public/images/emoji/apple/outbox_tray.png and b/public/images/emoji/apple/outbox_tray.png differ
diff --git a/public/images/emoji/apple/owl.png b/public/images/emoji/apple/owl.png
index 79b86eba80..d5c41a09f6 100644
Binary files a/public/images/emoji/apple/owl.png and b/public/images/emoji/apple/owl.png differ
diff --git a/public/images/emoji/apple/ox.png b/public/images/emoji/apple/ox.png
index 33a2801ef1..40c128a2d9 100644
Binary files a/public/images/emoji/apple/ox.png and b/public/images/emoji/apple/ox.png differ
diff --git a/public/images/emoji/apple/package.png b/public/images/emoji/apple/package.png
index 385a4b61e7..0dcb2d8ef9 100644
Binary files a/public/images/emoji/apple/package.png and b/public/images/emoji/apple/package.png differ
diff --git a/public/images/emoji/apple/page_facing_up.png b/public/images/emoji/apple/page_facing_up.png
index f296109488..6c18e38cb1 100644
Binary files a/public/images/emoji/apple/page_facing_up.png and b/public/images/emoji/apple/page_facing_up.png differ
diff --git a/public/images/emoji/apple/page_with_curl.png b/public/images/emoji/apple/page_with_curl.png
index 70c773c9e4..bed864d638 100644
Binary files a/public/images/emoji/apple/page_with_curl.png and b/public/images/emoji/apple/page_with_curl.png differ
diff --git a/public/images/emoji/apple/pager.png b/public/images/emoji/apple/pager.png
index 7cb85607e3..9941385a58 100644
Binary files a/public/images/emoji/apple/pager.png and b/public/images/emoji/apple/pager.png differ
diff --git a/public/images/emoji/apple/paintbrush.png b/public/images/emoji/apple/paintbrush.png
index 2b02f0ad03..8fe075ea8a 100644
Binary files a/public/images/emoji/apple/paintbrush.png and b/public/images/emoji/apple/paintbrush.png differ
diff --git a/public/images/emoji/apple/pakistan.png b/public/images/emoji/apple/pakistan.png
index 38f68498fb..d68cc0fbf2 100644
Binary files a/public/images/emoji/apple/pakistan.png and b/public/images/emoji/apple/pakistan.png differ
diff --git a/public/images/emoji/apple/palau.png b/public/images/emoji/apple/palau.png
index fead277711..3e1747eeec 100644
Binary files a/public/images/emoji/apple/palau.png and b/public/images/emoji/apple/palau.png differ
diff --git a/public/images/emoji/apple/palestinian_territories.png b/public/images/emoji/apple/palestinian_territories.png
index 8ec31337f4..d15125bc0f 100644
Binary files a/public/images/emoji/apple/palestinian_territories.png and b/public/images/emoji/apple/palestinian_territories.png differ
diff --git a/public/images/emoji/apple/palm_tree.png b/public/images/emoji/apple/palm_tree.png
index 3f96889285..39e4b61ab6 100644
Binary files a/public/images/emoji/apple/palm_tree.png and b/public/images/emoji/apple/palm_tree.png differ
diff --git a/public/images/emoji/apple/palms_up_together.png b/public/images/emoji/apple/palms_up_together.png
index fb66ba11c4..6026b4ec58 100644
Binary files a/public/images/emoji/apple/palms_up_together.png and b/public/images/emoji/apple/palms_up_together.png differ
diff --git a/public/images/emoji/apple/palms_up_together/2.png b/public/images/emoji/apple/palms_up_together/2.png
index 6d9b2fc8cc..534d8ddc6f 100644
Binary files a/public/images/emoji/apple/palms_up_together/2.png and b/public/images/emoji/apple/palms_up_together/2.png differ
diff --git a/public/images/emoji/apple/palms_up_together/3.png b/public/images/emoji/apple/palms_up_together/3.png
index c5d52f5c7a..8023014e23 100644
Binary files a/public/images/emoji/apple/palms_up_together/3.png and b/public/images/emoji/apple/palms_up_together/3.png differ
diff --git a/public/images/emoji/apple/palms_up_together/4.png b/public/images/emoji/apple/palms_up_together/4.png
index 3d4288d10d..405d31578d 100644
Binary files a/public/images/emoji/apple/palms_up_together/4.png and b/public/images/emoji/apple/palms_up_together/4.png differ
diff --git a/public/images/emoji/apple/palms_up_together/5.png b/public/images/emoji/apple/palms_up_together/5.png
index 6ff36c07cb..5563dd553b 100644
Binary files a/public/images/emoji/apple/palms_up_together/5.png and b/public/images/emoji/apple/palms_up_together/5.png differ
diff --git a/public/images/emoji/apple/palms_up_together/6.png b/public/images/emoji/apple/palms_up_together/6.png
index c25d42927d..36abd7312a 100644
Binary files a/public/images/emoji/apple/palms_up_together/6.png and b/public/images/emoji/apple/palms_up_together/6.png differ
diff --git a/public/images/emoji/apple/panama.png b/public/images/emoji/apple/panama.png
index 582030b969..06ffa7818a 100644
Binary files a/public/images/emoji/apple/panama.png and b/public/images/emoji/apple/panama.png differ
diff --git a/public/images/emoji/apple/pancakes.png b/public/images/emoji/apple/pancakes.png
index b666d15cd0..7fcb615808 100644
Binary files a/public/images/emoji/apple/pancakes.png and b/public/images/emoji/apple/pancakes.png differ
diff --git a/public/images/emoji/apple/panda_face.png b/public/images/emoji/apple/panda_face.png
index 27847603d9..602f675149 100644
Binary files a/public/images/emoji/apple/panda_face.png and b/public/images/emoji/apple/panda_face.png differ
diff --git a/public/images/emoji/apple/paperclip.png b/public/images/emoji/apple/paperclip.png
index a2c50ff235..a047e41d31 100644
Binary files a/public/images/emoji/apple/paperclip.png and b/public/images/emoji/apple/paperclip.png differ
diff --git a/public/images/emoji/apple/paperclips.png b/public/images/emoji/apple/paperclips.png
index 235e2049c3..2ecf66a569 100644
Binary files a/public/images/emoji/apple/paperclips.png and b/public/images/emoji/apple/paperclips.png differ
diff --git a/public/images/emoji/apple/papua_new_guinea.png b/public/images/emoji/apple/papua_new_guinea.png
index 08fc839433..51c741f2a2 100644
Binary files a/public/images/emoji/apple/papua_new_guinea.png and b/public/images/emoji/apple/papua_new_guinea.png differ
diff --git a/public/images/emoji/apple/paraguay.png b/public/images/emoji/apple/paraguay.png
index e885b82111..345144c6da 100644
Binary files a/public/images/emoji/apple/paraguay.png and b/public/images/emoji/apple/paraguay.png differ
diff --git a/public/images/emoji/apple/parasol_on_ground.png b/public/images/emoji/apple/parasol_on_ground.png
index 95b1ae9fdd..e42ee9ac52 100644
Binary files a/public/images/emoji/apple/parasol_on_ground.png and b/public/images/emoji/apple/parasol_on_ground.png differ
diff --git a/public/images/emoji/apple/park.png b/public/images/emoji/apple/park.png
index 902d5ec8ea..7afea4ebcd 100644
Binary files a/public/images/emoji/apple/park.png and b/public/images/emoji/apple/park.png differ
diff --git a/public/images/emoji/apple/parking.png b/public/images/emoji/apple/parking.png
index 3ba3b779fd..d01967127d 100644
Binary files a/public/images/emoji/apple/parking.png and b/public/images/emoji/apple/parking.png differ
diff --git a/public/images/emoji/apple/part_alternation_mark.png b/public/images/emoji/apple/part_alternation_mark.png
index 6b87aac3ef..88d6f48f92 100644
Binary files a/public/images/emoji/apple/part_alternation_mark.png and b/public/images/emoji/apple/part_alternation_mark.png differ
diff --git a/public/images/emoji/apple/partly_sunny.png b/public/images/emoji/apple/partly_sunny.png
index b31de05a28..b87741933b 100644
Binary files a/public/images/emoji/apple/partly_sunny.png and b/public/images/emoji/apple/partly_sunny.png differ
diff --git a/public/images/emoji/apple/passenger_ship.png b/public/images/emoji/apple/passenger_ship.png
index 3bb64de0d3..062c764d6a 100644
Binary files a/public/images/emoji/apple/passenger_ship.png and b/public/images/emoji/apple/passenger_ship.png differ
diff --git a/public/images/emoji/apple/passport_control.png b/public/images/emoji/apple/passport_control.png
index 5f9b37f631..aa8a803872 100644
Binary files a/public/images/emoji/apple/passport_control.png and b/public/images/emoji/apple/passport_control.png differ
diff --git a/public/images/emoji/apple/pause_button.png b/public/images/emoji/apple/pause_button.png
index 7f788fbb76..c4af9abe3c 100644
Binary files a/public/images/emoji/apple/pause_button.png and b/public/images/emoji/apple/pause_button.png differ
diff --git a/public/images/emoji/apple/paw_prints.png b/public/images/emoji/apple/paw_prints.png
index 26fe02e01e..753303e9cd 100644
Binary files a/public/images/emoji/apple/paw_prints.png and b/public/images/emoji/apple/paw_prints.png differ
diff --git a/public/images/emoji/apple/peace.png b/public/images/emoji/apple/peace.png
index c8567db838..a8342b27c4 100644
Binary files a/public/images/emoji/apple/peace.png and b/public/images/emoji/apple/peace.png differ
diff --git a/public/images/emoji/apple/peace_symbol.png b/public/images/emoji/apple/peace_symbol.png
index c8567db838..a8342b27c4 100644
Binary files a/public/images/emoji/apple/peace_symbol.png and b/public/images/emoji/apple/peace_symbol.png differ
diff --git a/public/images/emoji/apple/peach.png b/public/images/emoji/apple/peach.png
index a9b5b7e3d4..0a24e1bbee 100644
Binary files a/public/images/emoji/apple/peach.png and b/public/images/emoji/apple/peach.png differ
diff --git a/public/images/emoji/apple/peanuts.png b/public/images/emoji/apple/peanuts.png
index a405729d16..d54166ae2c 100644
Binary files a/public/images/emoji/apple/peanuts.png and b/public/images/emoji/apple/peanuts.png differ
diff --git a/public/images/emoji/apple/pear.png b/public/images/emoji/apple/pear.png
index 0e8ead81cb..1f6329c2d3 100644
Binary files a/public/images/emoji/apple/pear.png and b/public/images/emoji/apple/pear.png differ
diff --git a/public/images/emoji/apple/pen.png b/public/images/emoji/apple/pen.png
index b9e79ad214..1b7c4d629e 100644
Binary files a/public/images/emoji/apple/pen.png and b/public/images/emoji/apple/pen.png differ
diff --git a/public/images/emoji/apple/pen_ballpoint.png b/public/images/emoji/apple/pen_ballpoint.png
index b9e79ad214..1b7c4d629e 100644
Binary files a/public/images/emoji/apple/pen_ballpoint.png and b/public/images/emoji/apple/pen_ballpoint.png differ
diff --git a/public/images/emoji/apple/pen_fountain.png b/public/images/emoji/apple/pen_fountain.png
index a9a947848d..b224d353a9 100644
Binary files a/public/images/emoji/apple/pen_fountain.png and b/public/images/emoji/apple/pen_fountain.png differ
diff --git a/public/images/emoji/apple/pencil.png b/public/images/emoji/apple/pencil.png
index b738536bdc..add07c279e 100644
Binary files a/public/images/emoji/apple/pencil.png and b/public/images/emoji/apple/pencil.png differ
diff --git a/public/images/emoji/apple/pencil2.png b/public/images/emoji/apple/pencil2.png
index 2929860824..2d18c550b6 100644
Binary files a/public/images/emoji/apple/pencil2.png and b/public/images/emoji/apple/pencil2.png differ
diff --git a/public/images/emoji/apple/penguin.png b/public/images/emoji/apple/penguin.png
index de389660ec..a7ddc78360 100644
Binary files a/public/images/emoji/apple/penguin.png and b/public/images/emoji/apple/penguin.png differ
diff --git a/public/images/emoji/apple/pensive.png b/public/images/emoji/apple/pensive.png
index b5134a4d69..9459caa5bc 100644
Binary files a/public/images/emoji/apple/pensive.png and b/public/images/emoji/apple/pensive.png differ
diff --git a/public/images/emoji/apple/performing_arts.png b/public/images/emoji/apple/performing_arts.png
index 0b40da7f01..1d4bd6d894 100644
Binary files a/public/images/emoji/apple/performing_arts.png and b/public/images/emoji/apple/performing_arts.png differ
diff --git a/public/images/emoji/apple/persevere.png b/public/images/emoji/apple/persevere.png
index d300caafad..aa41eab0b6 100644
Binary files a/public/images/emoji/apple/persevere.png and b/public/images/emoji/apple/persevere.png differ
diff --git a/public/images/emoji/apple/person_climbing.png b/public/images/emoji/apple/person_climbing.png
index d8a6229d6b..f9382ba8f0 100644
Binary files a/public/images/emoji/apple/person_climbing.png and b/public/images/emoji/apple/person_climbing.png differ
diff --git a/public/images/emoji/apple/person_climbing/2.png b/public/images/emoji/apple/person_climbing/2.png
index 71330d66a8..b1878c3257 100644
Binary files a/public/images/emoji/apple/person_climbing/2.png and b/public/images/emoji/apple/person_climbing/2.png differ
diff --git a/public/images/emoji/apple/person_climbing/3.png b/public/images/emoji/apple/person_climbing/3.png
index a1345ecbd2..e9ce56ceff 100644
Binary files a/public/images/emoji/apple/person_climbing/3.png and b/public/images/emoji/apple/person_climbing/3.png differ
diff --git a/public/images/emoji/apple/person_climbing/4.png b/public/images/emoji/apple/person_climbing/4.png
index 016b920bcd..4fc59b12c9 100644
Binary files a/public/images/emoji/apple/person_climbing/4.png and b/public/images/emoji/apple/person_climbing/4.png differ
diff --git a/public/images/emoji/apple/person_climbing/5.png b/public/images/emoji/apple/person_climbing/5.png
index 4591eb5290..984dce8de3 100644
Binary files a/public/images/emoji/apple/person_climbing/5.png and b/public/images/emoji/apple/person_climbing/5.png differ
diff --git a/public/images/emoji/apple/person_climbing/6.png b/public/images/emoji/apple/person_climbing/6.png
index 19be3236ae..1efebfcfd5 100644
Binary files a/public/images/emoji/apple/person_climbing/6.png and b/public/images/emoji/apple/person_climbing/6.png differ
diff --git a/public/images/emoji/apple/person_fencing.png b/public/images/emoji/apple/person_fencing.png
index 38293ffc2b..3bfd360c66 100644
Binary files a/public/images/emoji/apple/person_fencing.png and b/public/images/emoji/apple/person_fencing.png differ
diff --git a/public/images/emoji/apple/person_frowning.png b/public/images/emoji/apple/person_frowning.png
index d06a0aa733..62658226ba 100644
Binary files a/public/images/emoji/apple/person_frowning.png and b/public/images/emoji/apple/person_frowning.png differ
diff --git a/public/images/emoji/apple/person_frowning/2.png b/public/images/emoji/apple/person_frowning/2.png
index aa34de2094..181f2aef8f 100644
Binary files a/public/images/emoji/apple/person_frowning/2.png and b/public/images/emoji/apple/person_frowning/2.png differ
diff --git a/public/images/emoji/apple/person_frowning/3.png b/public/images/emoji/apple/person_frowning/3.png
index 638e52f05c..b9447acf56 100644
Binary files a/public/images/emoji/apple/person_frowning/3.png and b/public/images/emoji/apple/person_frowning/3.png differ
diff --git a/public/images/emoji/apple/person_frowning/4.png b/public/images/emoji/apple/person_frowning/4.png
index 25be6800ca..2a738ec5a5 100644
Binary files a/public/images/emoji/apple/person_frowning/4.png and b/public/images/emoji/apple/person_frowning/4.png differ
diff --git a/public/images/emoji/apple/person_frowning/5.png b/public/images/emoji/apple/person_frowning/5.png
index b9efb3d134..cb47086cca 100644
Binary files a/public/images/emoji/apple/person_frowning/5.png and b/public/images/emoji/apple/person_frowning/5.png differ
diff --git a/public/images/emoji/apple/person_frowning/6.png b/public/images/emoji/apple/person_frowning/6.png
index f5485b2843..5e5be81f83 100644
Binary files a/public/images/emoji/apple/person_frowning/6.png and b/public/images/emoji/apple/person_frowning/6.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position.png b/public/images/emoji/apple/person_in_lotus_position.png
index e9404fd525..1a87c8876b 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position.png and b/public/images/emoji/apple/person_in_lotus_position.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/2.png b/public/images/emoji/apple/person_in_lotus_position/2.png
index 8817578cf0..be541a6a78 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/2.png and b/public/images/emoji/apple/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/3.png b/public/images/emoji/apple/person_in_lotus_position/3.png
index 0e9bf46e0b..fca52d3a2f 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/3.png and b/public/images/emoji/apple/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/4.png b/public/images/emoji/apple/person_in_lotus_position/4.png
index 918e3d435a..ba62f2f782 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/4.png and b/public/images/emoji/apple/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/5.png b/public/images/emoji/apple/person_in_lotus_position/5.png
index 0c01143530..13982fb2bf 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/5.png and b/public/images/emoji/apple/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/6.png b/public/images/emoji/apple/person_in_lotus_position/6.png
index fed226dac2..f97613bf2c 100644
Binary files a/public/images/emoji/apple/person_in_lotus_position/6.png and b/public/images/emoji/apple/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room.png b/public/images/emoji/apple/person_in_steamy_room.png
index 65a0790d92..bd7c4ee967 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room.png and b/public/images/emoji/apple/person_in_steamy_room.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/2.png b/public/images/emoji/apple/person_in_steamy_room/2.png
index 7260df1d15..7575658023 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/2.png and b/public/images/emoji/apple/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/3.png b/public/images/emoji/apple/person_in_steamy_room/3.png
index d14580a3db..35a15b9312 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/3.png and b/public/images/emoji/apple/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/4.png b/public/images/emoji/apple/person_in_steamy_room/4.png
index 9313ab2116..f2343837ff 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/4.png and b/public/images/emoji/apple/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/5.png b/public/images/emoji/apple/person_in_steamy_room/5.png
index f432b554b3..6464dc88a9 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/5.png and b/public/images/emoji/apple/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/6.png b/public/images/emoji/apple/person_in_steamy_room/6.png
index dc7087e028..3693f71eea 100644
Binary files a/public/images/emoji/apple/person_in_steamy_room/6.png and b/public/images/emoji/apple/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/apple/person_with_ball.png b/public/images/emoji/apple/person_with_ball.png
index 2476fa9f0c..37eb75580c 100644
Binary files a/public/images/emoji/apple/person_with_ball.png and b/public/images/emoji/apple/person_with_ball.png differ
diff --git a/public/images/emoji/apple/person_with_ball/2.png b/public/images/emoji/apple/person_with_ball/2.png
index dbec120de0..16a66f785c 100644
Binary files a/public/images/emoji/apple/person_with_ball/2.png and b/public/images/emoji/apple/person_with_ball/2.png differ
diff --git a/public/images/emoji/apple/person_with_ball/3.png b/public/images/emoji/apple/person_with_ball/3.png
index a9ccd27462..37cd8fdc33 100644
Binary files a/public/images/emoji/apple/person_with_ball/3.png and b/public/images/emoji/apple/person_with_ball/3.png differ
diff --git a/public/images/emoji/apple/person_with_ball/4.png b/public/images/emoji/apple/person_with_ball/4.png
index 079cd2a900..36188263bc 100644
Binary files a/public/images/emoji/apple/person_with_ball/4.png and b/public/images/emoji/apple/person_with_ball/4.png differ
diff --git a/public/images/emoji/apple/person_with_ball/5.png b/public/images/emoji/apple/person_with_ball/5.png
index 905f5af468..2df54e3ea4 100644
Binary files a/public/images/emoji/apple/person_with_ball/5.png and b/public/images/emoji/apple/person_with_ball/5.png differ
diff --git a/public/images/emoji/apple/person_with_ball/6.png b/public/images/emoji/apple/person_with_ball/6.png
index c03789f5d0..0496483264 100644
Binary files a/public/images/emoji/apple/person_with_ball/6.png and b/public/images/emoji/apple/person_with_ball/6.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair.png b/public/images/emoji/apple/person_with_blond_hair.png
index 005aeefeda..744b7f88ec 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair.png and b/public/images/emoji/apple/person_with_blond_hair.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/2.png b/public/images/emoji/apple/person_with_blond_hair/2.png
index 9e43423fdb..76b7fe1064 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/2.png and b/public/images/emoji/apple/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/3.png b/public/images/emoji/apple/person_with_blond_hair/3.png
index b36f1a69db..b30808566c 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/3.png and b/public/images/emoji/apple/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/4.png b/public/images/emoji/apple/person_with_blond_hair/4.png
index 901dfcaa06..c8a08e7c86 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/4.png and b/public/images/emoji/apple/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/5.png b/public/images/emoji/apple/person_with_blond_hair/5.png
index 5aaa84154a..af96a96fdb 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/5.png and b/public/images/emoji/apple/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/6.png b/public/images/emoji/apple/person_with_blond_hair/6.png
index 261b2470e3..f51881cae1 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair/6.png and b/public/images/emoji/apple/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face.png b/public/images/emoji/apple/person_with_pouting_face.png
index 48baa70cd7..35224ba75e 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face.png and b/public/images/emoji/apple/person_with_pouting_face.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/2.png b/public/images/emoji/apple/person_with_pouting_face/2.png
index afaf1da3bc..ee5bc2bcb2 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/2.png and b/public/images/emoji/apple/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/3.png b/public/images/emoji/apple/person_with_pouting_face/3.png
index fd78d2ab4d..1b16869e56 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/3.png and b/public/images/emoji/apple/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/4.png b/public/images/emoji/apple/person_with_pouting_face/4.png
index 3f525031d9..922f145b52 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/4.png and b/public/images/emoji/apple/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/5.png b/public/images/emoji/apple/person_with_pouting_face/5.png
index bf7bacdb73..15c8e550d7 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/5.png and b/public/images/emoji/apple/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/6.png b/public/images/emoji/apple/person_with_pouting_face/6.png
index dbe2ffeb2e..4905dc7b23 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face/6.png and b/public/images/emoji/apple/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/apple/peru.png b/public/images/emoji/apple/peru.png
index c4c3cf63fe..9ad0b9e8db 100644
Binary files a/public/images/emoji/apple/peru.png and b/public/images/emoji/apple/peru.png differ
diff --git a/public/images/emoji/apple/philippines.png b/public/images/emoji/apple/philippines.png
index 8059dccef1..285629f31d 100644
Binary files a/public/images/emoji/apple/philippines.png and b/public/images/emoji/apple/philippines.png differ
diff --git a/public/images/emoji/apple/phone.png b/public/images/emoji/apple/phone.png
index 60538e8770..7087cad8c1 100644
Binary files a/public/images/emoji/apple/phone.png and b/public/images/emoji/apple/phone.png differ
diff --git a/public/images/emoji/apple/pick.png b/public/images/emoji/apple/pick.png
index 1cd6abf550..691ea4c38e 100644
Binary files a/public/images/emoji/apple/pick.png and b/public/images/emoji/apple/pick.png differ
diff --git a/public/images/emoji/apple/pie.png b/public/images/emoji/apple/pie.png
index 4f5f474d82..8fceade3be 100644
Binary files a/public/images/emoji/apple/pie.png and b/public/images/emoji/apple/pie.png differ
diff --git a/public/images/emoji/apple/pig.png b/public/images/emoji/apple/pig.png
index d124fd7b8f..72dc8da5ae 100644
Binary files a/public/images/emoji/apple/pig.png and b/public/images/emoji/apple/pig.png differ
diff --git a/public/images/emoji/apple/pig2.png b/public/images/emoji/apple/pig2.png
index 0a32a4668c..48ec47c0f8 100644
Binary files a/public/images/emoji/apple/pig2.png and b/public/images/emoji/apple/pig2.png differ
diff --git a/public/images/emoji/apple/pig_nose.png b/public/images/emoji/apple/pig_nose.png
index 184594644f..b2931d9787 100644
Binary files a/public/images/emoji/apple/pig_nose.png and b/public/images/emoji/apple/pig_nose.png differ
diff --git a/public/images/emoji/apple/pill.png b/public/images/emoji/apple/pill.png
index 419fc999d6..bc205cfde0 100644
Binary files a/public/images/emoji/apple/pill.png and b/public/images/emoji/apple/pill.png differ
diff --git a/public/images/emoji/apple/pineapple.png b/public/images/emoji/apple/pineapple.png
index 28a1a8803f..cb11f2c339 100644
Binary files a/public/images/emoji/apple/pineapple.png and b/public/images/emoji/apple/pineapple.png differ
diff --git a/public/images/emoji/apple/ping_pong.png b/public/images/emoji/apple/ping_pong.png
index 26d40fa920..9aa5e0129e 100644
Binary files a/public/images/emoji/apple/ping_pong.png and b/public/images/emoji/apple/ping_pong.png differ
diff --git a/public/images/emoji/apple/pisces.png b/public/images/emoji/apple/pisces.png
index 3101dec9df..ae8635b8d9 100644
Binary files a/public/images/emoji/apple/pisces.png and b/public/images/emoji/apple/pisces.png differ
diff --git a/public/images/emoji/apple/pitcairn_islands.png b/public/images/emoji/apple/pitcairn_islands.png
index 971137f5b5..1a15b3eb54 100644
Binary files a/public/images/emoji/apple/pitcairn_islands.png and b/public/images/emoji/apple/pitcairn_islands.png differ
diff --git a/public/images/emoji/apple/pizza.png b/public/images/emoji/apple/pizza.png
index 13d8433a35..4f7cbe9d22 100644
Binary files a/public/images/emoji/apple/pizza.png and b/public/images/emoji/apple/pizza.png differ
diff --git a/public/images/emoji/apple/place_of_worship.png b/public/images/emoji/apple/place_of_worship.png
index c8e1cecd39..43a2461763 100644
Binary files a/public/images/emoji/apple/place_of_worship.png and b/public/images/emoji/apple/place_of_worship.png differ
diff --git a/public/images/emoji/apple/plate_with_cutlery.png b/public/images/emoji/apple/plate_with_cutlery.png
index 54bd5dc10a..98353aca87 100644
Binary files a/public/images/emoji/apple/plate_with_cutlery.png and b/public/images/emoji/apple/plate_with_cutlery.png differ
diff --git a/public/images/emoji/apple/play_or_pause_button.png b/public/images/emoji/apple/play_or_pause_button.png
index 9eb4c375bc..a62858fe14 100644
Binary files a/public/images/emoji/apple/play_or_pause_button.png and b/public/images/emoji/apple/play_or_pause_button.png differ
diff --git a/public/images/emoji/apple/play_pause.png b/public/images/emoji/apple/play_pause.png
index 9eb4c375bc..a62858fe14 100644
Binary files a/public/images/emoji/apple/play_pause.png and b/public/images/emoji/apple/play_pause.png differ
diff --git a/public/images/emoji/apple/point_down.png b/public/images/emoji/apple/point_down.png
index 572a145a28..2feeccca48 100644
Binary files a/public/images/emoji/apple/point_down.png and b/public/images/emoji/apple/point_down.png differ
diff --git a/public/images/emoji/apple/point_down/2.png b/public/images/emoji/apple/point_down/2.png
index 8ce6dcdeba..6889056c34 100644
Binary files a/public/images/emoji/apple/point_down/2.png and b/public/images/emoji/apple/point_down/2.png differ
diff --git a/public/images/emoji/apple/point_down/3.png b/public/images/emoji/apple/point_down/3.png
index 666127f346..1e8dbda2ff 100644
Binary files a/public/images/emoji/apple/point_down/3.png and b/public/images/emoji/apple/point_down/3.png differ
diff --git a/public/images/emoji/apple/point_down/4.png b/public/images/emoji/apple/point_down/4.png
index e54187bc55..f6c4b4583c 100644
Binary files a/public/images/emoji/apple/point_down/4.png and b/public/images/emoji/apple/point_down/4.png differ
diff --git a/public/images/emoji/apple/point_down/5.png b/public/images/emoji/apple/point_down/5.png
index a45feddac8..7e19e3efb1 100644
Binary files a/public/images/emoji/apple/point_down/5.png and b/public/images/emoji/apple/point_down/5.png differ
diff --git a/public/images/emoji/apple/point_down/6.png b/public/images/emoji/apple/point_down/6.png
index 19143c345f..8ad1c1860a 100644
Binary files a/public/images/emoji/apple/point_down/6.png and b/public/images/emoji/apple/point_down/6.png differ
diff --git a/public/images/emoji/apple/point_left.png b/public/images/emoji/apple/point_left.png
index 32e16ba611..07f43a5239 100644
Binary files a/public/images/emoji/apple/point_left.png and b/public/images/emoji/apple/point_left.png differ
diff --git a/public/images/emoji/apple/point_left/2.png b/public/images/emoji/apple/point_left/2.png
index 25757b1732..6876798a3d 100644
Binary files a/public/images/emoji/apple/point_left/2.png and b/public/images/emoji/apple/point_left/2.png differ
diff --git a/public/images/emoji/apple/point_left/3.png b/public/images/emoji/apple/point_left/3.png
index d8870f6fda..052ee86424 100644
Binary files a/public/images/emoji/apple/point_left/3.png and b/public/images/emoji/apple/point_left/3.png differ
diff --git a/public/images/emoji/apple/point_left/4.png b/public/images/emoji/apple/point_left/4.png
index 1806237eb2..1552faebab 100644
Binary files a/public/images/emoji/apple/point_left/4.png and b/public/images/emoji/apple/point_left/4.png differ
diff --git a/public/images/emoji/apple/point_left/5.png b/public/images/emoji/apple/point_left/5.png
index ef6da3f3cc..0082da8073 100644
Binary files a/public/images/emoji/apple/point_left/5.png and b/public/images/emoji/apple/point_left/5.png differ
diff --git a/public/images/emoji/apple/point_left/6.png b/public/images/emoji/apple/point_left/6.png
index c5145d2019..dd5ced13ae 100644
Binary files a/public/images/emoji/apple/point_left/6.png and b/public/images/emoji/apple/point_left/6.png differ
diff --git a/public/images/emoji/apple/point_right.png b/public/images/emoji/apple/point_right.png
index 84de2651a4..3b82220a71 100644
Binary files a/public/images/emoji/apple/point_right.png and b/public/images/emoji/apple/point_right.png differ
diff --git a/public/images/emoji/apple/point_right/2.png b/public/images/emoji/apple/point_right/2.png
index 62f00a7a6f..35fe097f25 100644
Binary files a/public/images/emoji/apple/point_right/2.png and b/public/images/emoji/apple/point_right/2.png differ
diff --git a/public/images/emoji/apple/point_right/3.png b/public/images/emoji/apple/point_right/3.png
index 7917a13842..bae1398d01 100644
Binary files a/public/images/emoji/apple/point_right/3.png and b/public/images/emoji/apple/point_right/3.png differ
diff --git a/public/images/emoji/apple/point_right/4.png b/public/images/emoji/apple/point_right/4.png
index 9b7fffdb42..09a8f631a1 100644
Binary files a/public/images/emoji/apple/point_right/4.png and b/public/images/emoji/apple/point_right/4.png differ
diff --git a/public/images/emoji/apple/point_right/5.png b/public/images/emoji/apple/point_right/5.png
index d9f0768c66..30b7364157 100644
Binary files a/public/images/emoji/apple/point_right/5.png and b/public/images/emoji/apple/point_right/5.png differ
diff --git a/public/images/emoji/apple/point_right/6.png b/public/images/emoji/apple/point_right/6.png
index 001d1dbcdc..ade8e4a124 100644
Binary files a/public/images/emoji/apple/point_right/6.png and b/public/images/emoji/apple/point_right/6.png differ
diff --git a/public/images/emoji/apple/point_up.png b/public/images/emoji/apple/point_up.png
index 75c81795df..0eaa0aee15 100644
Binary files a/public/images/emoji/apple/point_up.png and b/public/images/emoji/apple/point_up.png differ
diff --git a/public/images/emoji/apple/point_up/2.png b/public/images/emoji/apple/point_up/2.png
index 7d1e85ae36..1f4f087f14 100644
Binary files a/public/images/emoji/apple/point_up/2.png and b/public/images/emoji/apple/point_up/2.png differ
diff --git a/public/images/emoji/apple/point_up/3.png b/public/images/emoji/apple/point_up/3.png
index be661ba35a..2771fb6fed 100644
Binary files a/public/images/emoji/apple/point_up/3.png and b/public/images/emoji/apple/point_up/3.png differ
diff --git a/public/images/emoji/apple/point_up/4.png b/public/images/emoji/apple/point_up/4.png
index 8e8818d005..9edd573585 100644
Binary files a/public/images/emoji/apple/point_up/4.png and b/public/images/emoji/apple/point_up/4.png differ
diff --git a/public/images/emoji/apple/point_up/5.png b/public/images/emoji/apple/point_up/5.png
index d85940f9db..df939534d6 100644
Binary files a/public/images/emoji/apple/point_up/5.png and b/public/images/emoji/apple/point_up/5.png differ
diff --git a/public/images/emoji/apple/point_up/6.png b/public/images/emoji/apple/point_up/6.png
index 86c38835ea..8e4202bd61 100644
Binary files a/public/images/emoji/apple/point_up/6.png and b/public/images/emoji/apple/point_up/6.png differ
diff --git a/public/images/emoji/apple/point_up_2.png b/public/images/emoji/apple/point_up_2.png
index 3a2b1e5f42..980fcce7de 100644
Binary files a/public/images/emoji/apple/point_up_2.png and b/public/images/emoji/apple/point_up_2.png differ
diff --git a/public/images/emoji/apple/point_up_2/2.png b/public/images/emoji/apple/point_up_2/2.png
index dc15fc83d4..792e25a9f2 100644
Binary files a/public/images/emoji/apple/point_up_2/2.png and b/public/images/emoji/apple/point_up_2/2.png differ
diff --git a/public/images/emoji/apple/point_up_2/3.png b/public/images/emoji/apple/point_up_2/3.png
index c064485f4f..7dcc3f09e6 100644
Binary files a/public/images/emoji/apple/point_up_2/3.png and b/public/images/emoji/apple/point_up_2/3.png differ
diff --git a/public/images/emoji/apple/point_up_2/4.png b/public/images/emoji/apple/point_up_2/4.png
index 65a4b98ad1..b85757d22f 100644
Binary files a/public/images/emoji/apple/point_up_2/4.png and b/public/images/emoji/apple/point_up_2/4.png differ
diff --git a/public/images/emoji/apple/point_up_2/5.png b/public/images/emoji/apple/point_up_2/5.png
index 3c4f31d205..4d85639d98 100644
Binary files a/public/images/emoji/apple/point_up_2/5.png and b/public/images/emoji/apple/point_up_2/5.png differ
diff --git a/public/images/emoji/apple/point_up_2/6.png b/public/images/emoji/apple/point_up_2/6.png
index 48ed3f567b..440994b415 100644
Binary files a/public/images/emoji/apple/point_up_2/6.png and b/public/images/emoji/apple/point_up_2/6.png differ
diff --git a/public/images/emoji/apple/poland.png b/public/images/emoji/apple/poland.png
index e2fcd6dce5..f2e9a6244c 100644
Binary files a/public/images/emoji/apple/poland.png and b/public/images/emoji/apple/poland.png differ
diff --git a/public/images/emoji/apple/police_car.png b/public/images/emoji/apple/police_car.png
index a45562b4bc..55b951c9ba 100644
Binary files a/public/images/emoji/apple/police_car.png and b/public/images/emoji/apple/police_car.png differ
diff --git a/public/images/emoji/apple/policeman.png b/public/images/emoji/apple/policeman.png
index 78591caa50..59fa74d41d 100644
Binary files a/public/images/emoji/apple/policeman.png and b/public/images/emoji/apple/policeman.png differ
diff --git a/public/images/emoji/apple/policeman/2.png b/public/images/emoji/apple/policeman/2.png
index 63db5721c1..e47743a83f 100644
Binary files a/public/images/emoji/apple/policeman/2.png and b/public/images/emoji/apple/policeman/2.png differ
diff --git a/public/images/emoji/apple/policeman/3.png b/public/images/emoji/apple/policeman/3.png
index 7922a9dd3d..2f5df8dc82 100644
Binary files a/public/images/emoji/apple/policeman/3.png and b/public/images/emoji/apple/policeman/3.png differ
diff --git a/public/images/emoji/apple/policeman/4.png b/public/images/emoji/apple/policeman/4.png
index 16292b3eb0..1e3a460afb 100644
Binary files a/public/images/emoji/apple/policeman/4.png and b/public/images/emoji/apple/policeman/4.png differ
diff --git a/public/images/emoji/apple/policeman/5.png b/public/images/emoji/apple/policeman/5.png
index 41cdd83a94..9cc43c4c79 100644
Binary files a/public/images/emoji/apple/policeman/5.png and b/public/images/emoji/apple/policeman/5.png differ
diff --git a/public/images/emoji/apple/policeman/6.png b/public/images/emoji/apple/policeman/6.png
index e2ce8f11b5..4037fac7a0 100644
Binary files a/public/images/emoji/apple/policeman/6.png and b/public/images/emoji/apple/policeman/6.png differ
diff --git a/public/images/emoji/apple/policewoman.png b/public/images/emoji/apple/policewoman.png
index 25c6e2edd8..5a78527383 100644
Binary files a/public/images/emoji/apple/policewoman.png and b/public/images/emoji/apple/policewoman.png differ
diff --git a/public/images/emoji/apple/policewoman/2.png b/public/images/emoji/apple/policewoman/2.png
index 6a639ef226..be14ca0d81 100644
Binary files a/public/images/emoji/apple/policewoman/2.png and b/public/images/emoji/apple/policewoman/2.png differ
diff --git a/public/images/emoji/apple/policewoman/3.png b/public/images/emoji/apple/policewoman/3.png
index fbc5b41c90..e2ff2ed071 100644
Binary files a/public/images/emoji/apple/policewoman/3.png and b/public/images/emoji/apple/policewoman/3.png differ
diff --git a/public/images/emoji/apple/policewoman/4.png b/public/images/emoji/apple/policewoman/4.png
index 35b1501470..4671c312ce 100644
Binary files a/public/images/emoji/apple/policewoman/4.png and b/public/images/emoji/apple/policewoman/4.png differ
diff --git a/public/images/emoji/apple/policewoman/5.png b/public/images/emoji/apple/policewoman/5.png
index 504fc56fdb..de72eec308 100644
Binary files a/public/images/emoji/apple/policewoman/5.png and b/public/images/emoji/apple/policewoman/5.png differ
diff --git a/public/images/emoji/apple/policewoman/6.png b/public/images/emoji/apple/policewoman/6.png
index dc46fe34ad..a3f67c75fb 100644
Binary files a/public/images/emoji/apple/policewoman/6.png and b/public/images/emoji/apple/policewoman/6.png differ
diff --git a/public/images/emoji/apple/poo.png b/public/images/emoji/apple/poo.png
index a025f43002..18c33a1371 100644
Binary files a/public/images/emoji/apple/poo.png and b/public/images/emoji/apple/poo.png differ
diff --git a/public/images/emoji/apple/poodle.png b/public/images/emoji/apple/poodle.png
index 86bd66154f..de5c381586 100644
Binary files a/public/images/emoji/apple/poodle.png and b/public/images/emoji/apple/poodle.png differ
diff --git a/public/images/emoji/apple/poop.png b/public/images/emoji/apple/poop.png
index a025f43002..18c33a1371 100644
Binary files a/public/images/emoji/apple/poop.png and b/public/images/emoji/apple/poop.png differ
diff --git a/public/images/emoji/apple/popcorn.png b/public/images/emoji/apple/popcorn.png
index 58bb404582..e2fcb4b059 100644
Binary files a/public/images/emoji/apple/popcorn.png and b/public/images/emoji/apple/popcorn.png differ
diff --git a/public/images/emoji/apple/portugal.png b/public/images/emoji/apple/portugal.png
index 6df64adaac..4cf6396214 100644
Binary files a/public/images/emoji/apple/portugal.png and b/public/images/emoji/apple/portugal.png differ
diff --git a/public/images/emoji/apple/post_office.png b/public/images/emoji/apple/post_office.png
index 53704929e2..b0891b9221 100644
Binary files a/public/images/emoji/apple/post_office.png and b/public/images/emoji/apple/post_office.png differ
diff --git a/public/images/emoji/apple/postal_horn.png b/public/images/emoji/apple/postal_horn.png
index 5360c36fef..a101bdb706 100644
Binary files a/public/images/emoji/apple/postal_horn.png and b/public/images/emoji/apple/postal_horn.png differ
diff --git a/public/images/emoji/apple/postbox.png b/public/images/emoji/apple/postbox.png
index 789fbf83eb..2d96c9a930 100644
Binary files a/public/images/emoji/apple/postbox.png and b/public/images/emoji/apple/postbox.png differ
diff --git a/public/images/emoji/apple/potable_water.png b/public/images/emoji/apple/potable_water.png
index 9be9f1d272..15e604b29d 100644
Binary files a/public/images/emoji/apple/potable_water.png and b/public/images/emoji/apple/potable_water.png differ
diff --git a/public/images/emoji/apple/potato.png b/public/images/emoji/apple/potato.png
index 3ce42b2396..a48f552c7c 100644
Binary files a/public/images/emoji/apple/potato.png and b/public/images/emoji/apple/potato.png differ
diff --git a/public/images/emoji/apple/pouch.png b/public/images/emoji/apple/pouch.png
index b052acbdbe..dab3538ca4 100644
Binary files a/public/images/emoji/apple/pouch.png and b/public/images/emoji/apple/pouch.png differ
diff --git a/public/images/emoji/apple/poultry_leg.png b/public/images/emoji/apple/poultry_leg.png
index f18565b513..1411f94766 100644
Binary files a/public/images/emoji/apple/poultry_leg.png and b/public/images/emoji/apple/poultry_leg.png differ
diff --git a/public/images/emoji/apple/pound.png b/public/images/emoji/apple/pound.png
index 4ae46e379c..08f3d8759f 100644
Binary files a/public/images/emoji/apple/pound.png and b/public/images/emoji/apple/pound.png differ
diff --git a/public/images/emoji/apple/pouting_cat.png b/public/images/emoji/apple/pouting_cat.png
index f885063e91..3f181b281c 100644
Binary files a/public/images/emoji/apple/pouting_cat.png and b/public/images/emoji/apple/pouting_cat.png differ
diff --git a/public/images/emoji/apple/pouting_man.png b/public/images/emoji/apple/pouting_man.png
index da4378f1ca..dd3367433f 100644
Binary files a/public/images/emoji/apple/pouting_man.png and b/public/images/emoji/apple/pouting_man.png differ
diff --git a/public/images/emoji/apple/pouting_man/2.png b/public/images/emoji/apple/pouting_man/2.png
index 3709015052..5295e88d0a 100644
Binary files a/public/images/emoji/apple/pouting_man/2.png and b/public/images/emoji/apple/pouting_man/2.png differ
diff --git a/public/images/emoji/apple/pouting_man/3.png b/public/images/emoji/apple/pouting_man/3.png
index 575b0d548c..e4486fe153 100644
Binary files a/public/images/emoji/apple/pouting_man/3.png and b/public/images/emoji/apple/pouting_man/3.png differ
diff --git a/public/images/emoji/apple/pouting_man/4.png b/public/images/emoji/apple/pouting_man/4.png
index 874ed1a246..51e296d11f 100644
Binary files a/public/images/emoji/apple/pouting_man/4.png and b/public/images/emoji/apple/pouting_man/4.png differ
diff --git a/public/images/emoji/apple/pouting_man/5.png b/public/images/emoji/apple/pouting_man/5.png
index b2e792cb09..39e8ed934e 100644
Binary files a/public/images/emoji/apple/pouting_man/5.png and b/public/images/emoji/apple/pouting_man/5.png differ
diff --git a/public/images/emoji/apple/pouting_man/6.png b/public/images/emoji/apple/pouting_man/6.png
index 43e4977526..652b6960e2 100644
Binary files a/public/images/emoji/apple/pouting_man/6.png and b/public/images/emoji/apple/pouting_man/6.png differ
diff --git a/public/images/emoji/apple/pouting_woman.png b/public/images/emoji/apple/pouting_woman.png
index 48baa70cd7..35224ba75e 100644
Binary files a/public/images/emoji/apple/pouting_woman.png and b/public/images/emoji/apple/pouting_woman.png differ
diff --git a/public/images/emoji/apple/pouting_woman/2.png b/public/images/emoji/apple/pouting_woman/2.png
index afaf1da3bc..ee5bc2bcb2 100644
Binary files a/public/images/emoji/apple/pouting_woman/2.png and b/public/images/emoji/apple/pouting_woman/2.png differ
diff --git a/public/images/emoji/apple/pouting_woman/3.png b/public/images/emoji/apple/pouting_woman/3.png
index fd78d2ab4d..1b16869e56 100644
Binary files a/public/images/emoji/apple/pouting_woman/3.png and b/public/images/emoji/apple/pouting_woman/3.png differ
diff --git a/public/images/emoji/apple/pouting_woman/4.png b/public/images/emoji/apple/pouting_woman/4.png
index 3f525031d9..922f145b52 100644
Binary files a/public/images/emoji/apple/pouting_woman/4.png and b/public/images/emoji/apple/pouting_woman/4.png differ
diff --git a/public/images/emoji/apple/pouting_woman/5.png b/public/images/emoji/apple/pouting_woman/5.png
index bf7bacdb73..15c8e550d7 100644
Binary files a/public/images/emoji/apple/pouting_woman/5.png and b/public/images/emoji/apple/pouting_woman/5.png differ
diff --git a/public/images/emoji/apple/pouting_woman/6.png b/public/images/emoji/apple/pouting_woman/6.png
index dbe2ffeb2e..4905dc7b23 100644
Binary files a/public/images/emoji/apple/pouting_woman/6.png and b/public/images/emoji/apple/pouting_woman/6.png differ
diff --git a/public/images/emoji/apple/pray.png b/public/images/emoji/apple/pray.png
index 344fc0df48..866bdf53cc 100644
Binary files a/public/images/emoji/apple/pray.png and b/public/images/emoji/apple/pray.png differ
diff --git a/public/images/emoji/apple/pray/2.png b/public/images/emoji/apple/pray/2.png
index 7f8fa8e3c8..c018f683aa 100644
Binary files a/public/images/emoji/apple/pray/2.png and b/public/images/emoji/apple/pray/2.png differ
diff --git a/public/images/emoji/apple/pray/3.png b/public/images/emoji/apple/pray/3.png
index ed1fb5987b..7a1ca3c94c 100644
Binary files a/public/images/emoji/apple/pray/3.png and b/public/images/emoji/apple/pray/3.png differ
diff --git a/public/images/emoji/apple/pray/4.png b/public/images/emoji/apple/pray/4.png
index 0037c50a87..821989e43d 100644
Binary files a/public/images/emoji/apple/pray/4.png and b/public/images/emoji/apple/pray/4.png differ
diff --git a/public/images/emoji/apple/pray/5.png b/public/images/emoji/apple/pray/5.png
index 7be7121077..472cf64240 100644
Binary files a/public/images/emoji/apple/pray/5.png and b/public/images/emoji/apple/pray/5.png differ
diff --git a/public/images/emoji/apple/pray/6.png b/public/images/emoji/apple/pray/6.png
index 171e9171e7..a05a98ea90 100644
Binary files a/public/images/emoji/apple/pray/6.png and b/public/images/emoji/apple/pray/6.png differ
diff --git a/public/images/emoji/apple/prayer_beads.png b/public/images/emoji/apple/prayer_beads.png
index 7ef58aaec7..435a2561f6 100644
Binary files a/public/images/emoji/apple/prayer_beads.png and b/public/images/emoji/apple/prayer_beads.png differ
diff --git a/public/images/emoji/apple/pregnant_woman.png b/public/images/emoji/apple/pregnant_woman.png
index 64908a8d90..33e3d9087b 100644
Binary files a/public/images/emoji/apple/pregnant_woman.png and b/public/images/emoji/apple/pregnant_woman.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/2.png b/public/images/emoji/apple/pregnant_woman/2.png
index d50b195260..bc51358d85 100644
Binary files a/public/images/emoji/apple/pregnant_woman/2.png and b/public/images/emoji/apple/pregnant_woman/2.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/3.png b/public/images/emoji/apple/pregnant_woman/3.png
index 97d8297097..e500c58e7a 100644
Binary files a/public/images/emoji/apple/pregnant_woman/3.png and b/public/images/emoji/apple/pregnant_woman/3.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/4.png b/public/images/emoji/apple/pregnant_woman/4.png
index ef17d7c6ea..36d05405bb 100644
Binary files a/public/images/emoji/apple/pregnant_woman/4.png and b/public/images/emoji/apple/pregnant_woman/4.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/5.png b/public/images/emoji/apple/pregnant_woman/5.png
index b4d981d645..ddaeeea8d9 100644
Binary files a/public/images/emoji/apple/pregnant_woman/5.png and b/public/images/emoji/apple/pregnant_woman/5.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/6.png b/public/images/emoji/apple/pregnant_woman/6.png
index 5c1b82cb2d..e731d48bc6 100644
Binary files a/public/images/emoji/apple/pregnant_woman/6.png and b/public/images/emoji/apple/pregnant_woman/6.png differ
diff --git a/public/images/emoji/apple/pretzel.png b/public/images/emoji/apple/pretzel.png
index 9116d6ee9a..af58362da8 100644
Binary files a/public/images/emoji/apple/pretzel.png and b/public/images/emoji/apple/pretzel.png differ
diff --git a/public/images/emoji/apple/previous_track.png b/public/images/emoji/apple/previous_track.png
index 881bf59b29..1399a94650 100644
Binary files a/public/images/emoji/apple/previous_track.png and b/public/images/emoji/apple/previous_track.png differ
diff --git a/public/images/emoji/apple/previous_track_button.png b/public/images/emoji/apple/previous_track_button.png
index 881bf59b29..1399a94650 100644
Binary files a/public/images/emoji/apple/previous_track_button.png and b/public/images/emoji/apple/previous_track_button.png differ
diff --git a/public/images/emoji/apple/prince.png b/public/images/emoji/apple/prince.png
index 5dc77f3fdc..afe40448e8 100644
Binary files a/public/images/emoji/apple/prince.png and b/public/images/emoji/apple/prince.png differ
diff --git a/public/images/emoji/apple/prince/2.png b/public/images/emoji/apple/prince/2.png
index 38a259bee4..230e965ff6 100644
Binary files a/public/images/emoji/apple/prince/2.png and b/public/images/emoji/apple/prince/2.png differ
diff --git a/public/images/emoji/apple/prince/3.png b/public/images/emoji/apple/prince/3.png
index 21878b6a2b..a449df0ffe 100644
Binary files a/public/images/emoji/apple/prince/3.png and b/public/images/emoji/apple/prince/3.png differ
diff --git a/public/images/emoji/apple/prince/4.png b/public/images/emoji/apple/prince/4.png
index 54c1aa3bc0..d9b5a9cbbc 100644
Binary files a/public/images/emoji/apple/prince/4.png and b/public/images/emoji/apple/prince/4.png differ
diff --git a/public/images/emoji/apple/prince/5.png b/public/images/emoji/apple/prince/5.png
index 108d577bf2..8db24fe2d6 100644
Binary files a/public/images/emoji/apple/prince/5.png and b/public/images/emoji/apple/prince/5.png differ
diff --git a/public/images/emoji/apple/prince/6.png b/public/images/emoji/apple/prince/6.png
index 0de534fc1e..48b4f55385 100644
Binary files a/public/images/emoji/apple/prince/6.png and b/public/images/emoji/apple/prince/6.png differ
diff --git a/public/images/emoji/apple/princess.png b/public/images/emoji/apple/princess.png
index 86cb4bd51a..f49fa6ea36 100644
Binary files a/public/images/emoji/apple/princess.png and b/public/images/emoji/apple/princess.png differ
diff --git a/public/images/emoji/apple/princess/2.png b/public/images/emoji/apple/princess/2.png
index fd032d30e4..44b31cc6db 100644
Binary files a/public/images/emoji/apple/princess/2.png and b/public/images/emoji/apple/princess/2.png differ
diff --git a/public/images/emoji/apple/princess/3.png b/public/images/emoji/apple/princess/3.png
index 7adb956f02..86be453558 100644
Binary files a/public/images/emoji/apple/princess/3.png and b/public/images/emoji/apple/princess/3.png differ
diff --git a/public/images/emoji/apple/princess/4.png b/public/images/emoji/apple/princess/4.png
index ea48b643f7..bc1d455c9f 100644
Binary files a/public/images/emoji/apple/princess/4.png and b/public/images/emoji/apple/princess/4.png differ
diff --git a/public/images/emoji/apple/princess/5.png b/public/images/emoji/apple/princess/5.png
index 10caffb58b..ac6c020bc8 100644
Binary files a/public/images/emoji/apple/princess/5.png and b/public/images/emoji/apple/princess/5.png differ
diff --git a/public/images/emoji/apple/princess/6.png b/public/images/emoji/apple/princess/6.png
index f9d5eb42c5..6cf01c241b 100644
Binary files a/public/images/emoji/apple/princess/6.png and b/public/images/emoji/apple/princess/6.png differ
diff --git a/public/images/emoji/apple/printer.png b/public/images/emoji/apple/printer.png
index 3ce50192db..a73c2a06b8 100644
Binary files a/public/images/emoji/apple/printer.png and b/public/images/emoji/apple/printer.png differ
diff --git a/public/images/emoji/apple/projector.png b/public/images/emoji/apple/projector.png
index add4400d04..4d9c61a844 100644
Binary files a/public/images/emoji/apple/projector.png and b/public/images/emoji/apple/projector.png differ
diff --git a/public/images/emoji/apple/puerto_rico.png b/public/images/emoji/apple/puerto_rico.png
index 748dff1869..42f8c21475 100644
Binary files a/public/images/emoji/apple/puerto_rico.png and b/public/images/emoji/apple/puerto_rico.png differ
diff --git a/public/images/emoji/apple/punch.png b/public/images/emoji/apple/punch.png
index c01cab21b5..2fe281b064 100644
Binary files a/public/images/emoji/apple/punch.png and b/public/images/emoji/apple/punch.png differ
diff --git a/public/images/emoji/apple/punch/2.png b/public/images/emoji/apple/punch/2.png
index 1c8dd8dbf3..187e09db39 100644
Binary files a/public/images/emoji/apple/punch/2.png and b/public/images/emoji/apple/punch/2.png differ
diff --git a/public/images/emoji/apple/punch/3.png b/public/images/emoji/apple/punch/3.png
index 39deb2c7e8..20b4eaf9b2 100644
Binary files a/public/images/emoji/apple/punch/3.png and b/public/images/emoji/apple/punch/3.png differ
diff --git a/public/images/emoji/apple/punch/4.png b/public/images/emoji/apple/punch/4.png
index ef6df0b933..8161cf6151 100644
Binary files a/public/images/emoji/apple/punch/4.png and b/public/images/emoji/apple/punch/4.png differ
diff --git a/public/images/emoji/apple/punch/5.png b/public/images/emoji/apple/punch/5.png
index 8552732ad4..946f68e20a 100644
Binary files a/public/images/emoji/apple/punch/5.png and b/public/images/emoji/apple/punch/5.png differ
diff --git a/public/images/emoji/apple/punch/6.png b/public/images/emoji/apple/punch/6.png
index 24f4a3071a..7805cd98db 100644
Binary files a/public/images/emoji/apple/punch/6.png and b/public/images/emoji/apple/punch/6.png differ
diff --git a/public/images/emoji/apple/purple_heart.png b/public/images/emoji/apple/purple_heart.png
index 6ebc2e5419..3b5feb3d8f 100644
Binary files a/public/images/emoji/apple/purple_heart.png and b/public/images/emoji/apple/purple_heart.png differ
diff --git a/public/images/emoji/apple/purse.png b/public/images/emoji/apple/purse.png
index e208e933bf..66ef4a1cc9 100644
Binary files a/public/images/emoji/apple/purse.png and b/public/images/emoji/apple/purse.png differ
diff --git a/public/images/emoji/apple/pushpin.png b/public/images/emoji/apple/pushpin.png
index ab89e75001..b4fae6a02f 100644
Binary files a/public/images/emoji/apple/pushpin.png and b/public/images/emoji/apple/pushpin.png differ
diff --git a/public/images/emoji/apple/put_litter_in_its_place.png b/public/images/emoji/apple/put_litter_in_its_place.png
index bae7da4db6..43d84521a8 100644
Binary files a/public/images/emoji/apple/put_litter_in_its_place.png and b/public/images/emoji/apple/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/apple/qatar.png b/public/images/emoji/apple/qatar.png
index c73ce36292..522759c973 100644
Binary files a/public/images/emoji/apple/qatar.png and b/public/images/emoji/apple/qatar.png differ
diff --git a/public/images/emoji/apple/question.png b/public/images/emoji/apple/question.png
index 6136129e08..d6139e4922 100644
Binary files a/public/images/emoji/apple/question.png and b/public/images/emoji/apple/question.png differ
diff --git a/public/images/emoji/apple/rabbit.png b/public/images/emoji/apple/rabbit.png
index 33cdc5e1e8..788bd901ee 100644
Binary files a/public/images/emoji/apple/rabbit.png and b/public/images/emoji/apple/rabbit.png differ
diff --git a/public/images/emoji/apple/rabbit2.png b/public/images/emoji/apple/rabbit2.png
index 77ae0528f9..851bc74c8b 100644
Binary files a/public/images/emoji/apple/rabbit2.png and b/public/images/emoji/apple/rabbit2.png differ
diff --git a/public/images/emoji/apple/race_car.png b/public/images/emoji/apple/race_car.png
index f49f95cbbd..8b066e8cb9 100644
Binary files a/public/images/emoji/apple/race_car.png and b/public/images/emoji/apple/race_car.png differ
diff --git a/public/images/emoji/apple/racehorse.png b/public/images/emoji/apple/racehorse.png
index fcd23dd300..c1701972dc 100644
Binary files a/public/images/emoji/apple/racehorse.png and b/public/images/emoji/apple/racehorse.png differ
diff --git a/public/images/emoji/apple/racing_car.png b/public/images/emoji/apple/racing_car.png
index f49f95cbbd..8b066e8cb9 100644
Binary files a/public/images/emoji/apple/racing_car.png and b/public/images/emoji/apple/racing_car.png differ
diff --git a/public/images/emoji/apple/racing_motorcycle.png b/public/images/emoji/apple/racing_motorcycle.png
index 4ae8f0c685..f125cf361e 100644
Binary files a/public/images/emoji/apple/racing_motorcycle.png and b/public/images/emoji/apple/racing_motorcycle.png differ
diff --git a/public/images/emoji/apple/radio.png b/public/images/emoji/apple/radio.png
index 89a4c7f99e..978dcabefe 100644
Binary files a/public/images/emoji/apple/radio.png and b/public/images/emoji/apple/radio.png differ
diff --git a/public/images/emoji/apple/radio_button.png b/public/images/emoji/apple/radio_button.png
index 8ef670a114..11f39fc603 100644
Binary files a/public/images/emoji/apple/radio_button.png and b/public/images/emoji/apple/radio_button.png differ
diff --git a/public/images/emoji/apple/radioactive.png b/public/images/emoji/apple/radioactive.png
index 377a1f98da..e22cfd6b0e 100644
Binary files a/public/images/emoji/apple/radioactive.png and b/public/images/emoji/apple/radioactive.png differ
diff --git a/public/images/emoji/apple/radioactive_sign.png b/public/images/emoji/apple/radioactive_sign.png
index 377a1f98da..e22cfd6b0e 100644
Binary files a/public/images/emoji/apple/radioactive_sign.png and b/public/images/emoji/apple/radioactive_sign.png differ
diff --git a/public/images/emoji/apple/rage.png b/public/images/emoji/apple/rage.png
index d15681ce60..9bab329466 100644
Binary files a/public/images/emoji/apple/rage.png and b/public/images/emoji/apple/rage.png differ
diff --git a/public/images/emoji/apple/railroad_track.png b/public/images/emoji/apple/railroad_track.png
index e5d9b45d90..addaca1c2c 100644
Binary files a/public/images/emoji/apple/railroad_track.png and b/public/images/emoji/apple/railroad_track.png differ
diff --git a/public/images/emoji/apple/railway_car.png b/public/images/emoji/apple/railway_car.png
index d75fb01377..dce82071b1 100644
Binary files a/public/images/emoji/apple/railway_car.png and b/public/images/emoji/apple/railway_car.png differ
diff --git a/public/images/emoji/apple/railway_track.png b/public/images/emoji/apple/railway_track.png
index e5d9b45d90..addaca1c2c 100644
Binary files a/public/images/emoji/apple/railway_track.png and b/public/images/emoji/apple/railway_track.png differ
diff --git a/public/images/emoji/apple/rainbow.png b/public/images/emoji/apple/rainbow.png
index d547ce1edc..4ee14687a9 100644
Binary files a/public/images/emoji/apple/rainbow.png and b/public/images/emoji/apple/rainbow.png differ
diff --git a/public/images/emoji/apple/rainbow_flag.png b/public/images/emoji/apple/rainbow_flag.png
index 7f6e0d9516..5c3f6726cc 100644
Binary files a/public/images/emoji/apple/rainbow_flag.png and b/public/images/emoji/apple/rainbow_flag.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand.png b/public/images/emoji/apple/raised_back_of_hand.png
index 298328446a..5ba9424d61 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand.png and b/public/images/emoji/apple/raised_back_of_hand.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/2.png b/public/images/emoji/apple/raised_back_of_hand/2.png
index cd2aa88ab9..639b30c735 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/2.png and b/public/images/emoji/apple/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/3.png b/public/images/emoji/apple/raised_back_of_hand/3.png
index ddbf05d1ee..01a09c28d5 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/3.png and b/public/images/emoji/apple/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/4.png b/public/images/emoji/apple/raised_back_of_hand/4.png
index c6ab99cb9a..3eae48c6be 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/4.png and b/public/images/emoji/apple/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/5.png b/public/images/emoji/apple/raised_back_of_hand/5.png
index e4ec5fc11e..206056dc13 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/5.png and b/public/images/emoji/apple/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/6.png b/public/images/emoji/apple/raised_back_of_hand/6.png
index c9fe1ea37b..7a9888c478 100644
Binary files a/public/images/emoji/apple/raised_back_of_hand/6.png and b/public/images/emoji/apple/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/apple/raised_hand.png b/public/images/emoji/apple/raised_hand.png
index 8b60686eeb..043ab0612c 100644
Binary files a/public/images/emoji/apple/raised_hand.png and b/public/images/emoji/apple/raised_hand.png differ
diff --git a/public/images/emoji/apple/raised_hand/2.png b/public/images/emoji/apple/raised_hand/2.png
index f0fd83faaa..2015a5661d 100644
Binary files a/public/images/emoji/apple/raised_hand/2.png and b/public/images/emoji/apple/raised_hand/2.png differ
diff --git a/public/images/emoji/apple/raised_hand/3.png b/public/images/emoji/apple/raised_hand/3.png
index 7df90232ae..e3386aa3e1 100644
Binary files a/public/images/emoji/apple/raised_hand/3.png and b/public/images/emoji/apple/raised_hand/3.png differ
diff --git a/public/images/emoji/apple/raised_hand/4.png b/public/images/emoji/apple/raised_hand/4.png
index 979c0c414d..c3bb0003f4 100644
Binary files a/public/images/emoji/apple/raised_hand/4.png and b/public/images/emoji/apple/raised_hand/4.png differ
diff --git a/public/images/emoji/apple/raised_hand/5.png b/public/images/emoji/apple/raised_hand/5.png
index dee9188f4d..712bc4b385 100644
Binary files a/public/images/emoji/apple/raised_hand/5.png and b/public/images/emoji/apple/raised_hand/5.png differ
diff --git a/public/images/emoji/apple/raised_hand/6.png b/public/images/emoji/apple/raised_hand/6.png
index 9ae2da2c02..5728d25dc0 100644
Binary files a/public/images/emoji/apple/raised_hand/6.png and b/public/images/emoji/apple/raised_hand/6.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed.png
index c05031e50a..b50a32c5a7 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png
index 35c3b9b350..efe22a889a 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png
index 6757e8a1e2..e05f8623c2 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png
index 2583736a58..4a50d74fac 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png
index 11cb8caa11..145cc99610 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png
index eed63072bd..fa7a6641cd 100644
Binary files a/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers.png
index 89fd1859fe..de1b78b311 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png
index 9c277890ad..b20e107c81 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png
index 8d6940ee24..a54bee3211 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png
index fe549c3e2c..a851bc95ab 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png
index 4ad8b9df45..d3053b5e1a 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png
index af23814474..4aababec2d 100644
Binary files a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/apple/raised_hands.png b/public/images/emoji/apple/raised_hands.png
index dd497694e6..5d9c87b16c 100644
Binary files a/public/images/emoji/apple/raised_hands.png and b/public/images/emoji/apple/raised_hands.png differ
diff --git a/public/images/emoji/apple/raised_hands/2.png b/public/images/emoji/apple/raised_hands/2.png
index b365d34692..12d222a6ab 100644
Binary files a/public/images/emoji/apple/raised_hands/2.png and b/public/images/emoji/apple/raised_hands/2.png differ
diff --git a/public/images/emoji/apple/raised_hands/3.png b/public/images/emoji/apple/raised_hands/3.png
index f504e7e9f8..437c14d39e 100644
Binary files a/public/images/emoji/apple/raised_hands/3.png and b/public/images/emoji/apple/raised_hands/3.png differ
diff --git a/public/images/emoji/apple/raised_hands/4.png b/public/images/emoji/apple/raised_hands/4.png
index af3dc8af63..e53737ad30 100644
Binary files a/public/images/emoji/apple/raised_hands/4.png and b/public/images/emoji/apple/raised_hands/4.png differ
diff --git a/public/images/emoji/apple/raised_hands/5.png b/public/images/emoji/apple/raised_hands/5.png
index 9ba1a0c65e..161fc3d9b0 100644
Binary files a/public/images/emoji/apple/raised_hands/5.png and b/public/images/emoji/apple/raised_hands/5.png differ
diff --git a/public/images/emoji/apple/raised_hands/6.png b/public/images/emoji/apple/raised_hands/6.png
index 35e4fb95e8..ca3683dd03 100644
Binary files a/public/images/emoji/apple/raised_hands/6.png and b/public/images/emoji/apple/raised_hands/6.png differ
diff --git a/public/images/emoji/apple/raising_hand.png b/public/images/emoji/apple/raising_hand.png
index c66b9820a3..13421f0e9f 100644
Binary files a/public/images/emoji/apple/raising_hand.png and b/public/images/emoji/apple/raising_hand.png differ
diff --git a/public/images/emoji/apple/raising_hand/2.png b/public/images/emoji/apple/raising_hand/2.png
index 2345134342..41af8b0262 100644
Binary files a/public/images/emoji/apple/raising_hand/2.png and b/public/images/emoji/apple/raising_hand/2.png differ
diff --git a/public/images/emoji/apple/raising_hand/3.png b/public/images/emoji/apple/raising_hand/3.png
index 2534233309..ea3521aa11 100644
Binary files a/public/images/emoji/apple/raising_hand/3.png and b/public/images/emoji/apple/raising_hand/3.png differ
diff --git a/public/images/emoji/apple/raising_hand/4.png b/public/images/emoji/apple/raising_hand/4.png
index a7ea94e72e..cf17f5b30d 100644
Binary files a/public/images/emoji/apple/raising_hand/4.png and b/public/images/emoji/apple/raising_hand/4.png differ
diff --git a/public/images/emoji/apple/raising_hand/5.png b/public/images/emoji/apple/raising_hand/5.png
index 4a2d2775fa..b8b1a2aa38 100644
Binary files a/public/images/emoji/apple/raising_hand/5.png and b/public/images/emoji/apple/raising_hand/5.png differ
diff --git a/public/images/emoji/apple/raising_hand/6.png b/public/images/emoji/apple/raising_hand/6.png
index f5dfa976cb..131c19dc85 100644
Binary files a/public/images/emoji/apple/raising_hand/6.png and b/public/images/emoji/apple/raising_hand/6.png differ
diff --git a/public/images/emoji/apple/raising_hand_man.png b/public/images/emoji/apple/raising_hand_man.png
index aed3b88527..b0a73ed105 100644
Binary files a/public/images/emoji/apple/raising_hand_man.png and b/public/images/emoji/apple/raising_hand_man.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/2.png b/public/images/emoji/apple/raising_hand_man/2.png
index afa72a8c87..d5fd7c744a 100644
Binary files a/public/images/emoji/apple/raising_hand_man/2.png and b/public/images/emoji/apple/raising_hand_man/2.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/3.png b/public/images/emoji/apple/raising_hand_man/3.png
index 78cb3fe314..7ef9c45366 100644
Binary files a/public/images/emoji/apple/raising_hand_man/3.png and b/public/images/emoji/apple/raising_hand_man/3.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/4.png b/public/images/emoji/apple/raising_hand_man/4.png
index f47160bb3b..e4d576afb7 100644
Binary files a/public/images/emoji/apple/raising_hand_man/4.png and b/public/images/emoji/apple/raising_hand_man/4.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/5.png b/public/images/emoji/apple/raising_hand_man/5.png
index 096e8e7424..0fd4c60af6 100644
Binary files a/public/images/emoji/apple/raising_hand_man/5.png and b/public/images/emoji/apple/raising_hand_man/5.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/6.png b/public/images/emoji/apple/raising_hand_man/6.png
index 3aa54e5a81..1e3a8518c4 100644
Binary files a/public/images/emoji/apple/raising_hand_man/6.png and b/public/images/emoji/apple/raising_hand_man/6.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman.png b/public/images/emoji/apple/raising_hand_woman.png
index c66b9820a3..13421f0e9f 100644
Binary files a/public/images/emoji/apple/raising_hand_woman.png and b/public/images/emoji/apple/raising_hand_woman.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/2.png b/public/images/emoji/apple/raising_hand_woman/2.png
index 2345134342..41af8b0262 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/2.png and b/public/images/emoji/apple/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/3.png b/public/images/emoji/apple/raising_hand_woman/3.png
index 2534233309..ea3521aa11 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/3.png and b/public/images/emoji/apple/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/4.png b/public/images/emoji/apple/raising_hand_woman/4.png
index a7ea94e72e..cf17f5b30d 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/4.png and b/public/images/emoji/apple/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/5.png b/public/images/emoji/apple/raising_hand_woman/5.png
index 4a2d2775fa..b8b1a2aa38 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/5.png and b/public/images/emoji/apple/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/6.png b/public/images/emoji/apple/raising_hand_woman/6.png
index f5dfa976cb..131c19dc85 100644
Binary files a/public/images/emoji/apple/raising_hand_woman/6.png and b/public/images/emoji/apple/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/apple/ram.png b/public/images/emoji/apple/ram.png
index 3b745d612c..bd20d28d18 100644
Binary files a/public/images/emoji/apple/ram.png and b/public/images/emoji/apple/ram.png differ
diff --git a/public/images/emoji/apple/ramen.png b/public/images/emoji/apple/ramen.png
index 76688ab65d..4a375cc217 100644
Binary files a/public/images/emoji/apple/ramen.png and b/public/images/emoji/apple/ramen.png differ
diff --git a/public/images/emoji/apple/rat.png b/public/images/emoji/apple/rat.png
index 04d33163d6..e1b34bc07d 100644
Binary files a/public/images/emoji/apple/rat.png and b/public/images/emoji/apple/rat.png differ
diff --git a/public/images/emoji/apple/record_button.png b/public/images/emoji/apple/record_button.png
index 3f27cae7ba..79e3150deb 100644
Binary files a/public/images/emoji/apple/record_button.png and b/public/images/emoji/apple/record_button.png differ
diff --git a/public/images/emoji/apple/recycle.png b/public/images/emoji/apple/recycle.png
index 26000942ba..d7de43b858 100644
Binary files a/public/images/emoji/apple/recycle.png and b/public/images/emoji/apple/recycle.png differ
diff --git a/public/images/emoji/apple/red_car.png b/public/images/emoji/apple/red_car.png
index 2b59419e4b..672310df40 100644
Binary files a/public/images/emoji/apple/red_car.png and b/public/images/emoji/apple/red_car.png differ
diff --git a/public/images/emoji/apple/red_circle.png b/public/images/emoji/apple/red_circle.png
index 83ac229144..c790e13f00 100644
Binary files a/public/images/emoji/apple/red_circle.png and b/public/images/emoji/apple/red_circle.png differ
diff --git a/public/images/emoji/apple/registered.png b/public/images/emoji/apple/registered.png
index e90bf656b9..6e84d6cd78 100644
Binary files a/public/images/emoji/apple/registered.png and b/public/images/emoji/apple/registered.png differ
diff --git a/public/images/emoji/apple/relaxed.png b/public/images/emoji/apple/relaxed.png
index 3cc28f81a3..d210619d62 100644
Binary files a/public/images/emoji/apple/relaxed.png and b/public/images/emoji/apple/relaxed.png differ
diff --git a/public/images/emoji/apple/relieved.png b/public/images/emoji/apple/relieved.png
index fcfcea5b74..8f91070297 100644
Binary files a/public/images/emoji/apple/relieved.png and b/public/images/emoji/apple/relieved.png differ
diff --git a/public/images/emoji/apple/reminder_ribbon.png b/public/images/emoji/apple/reminder_ribbon.png
index b79ce8b83f..44b1f9caec 100644
Binary files a/public/images/emoji/apple/reminder_ribbon.png and b/public/images/emoji/apple/reminder_ribbon.png differ
diff --git a/public/images/emoji/apple/repeat.png b/public/images/emoji/apple/repeat.png
index ea778f215d..496fd7f765 100644
Binary files a/public/images/emoji/apple/repeat.png and b/public/images/emoji/apple/repeat.png differ
diff --git a/public/images/emoji/apple/repeat_one.png b/public/images/emoji/apple/repeat_one.png
index 660a4298dc..b100959bac 100644
Binary files a/public/images/emoji/apple/repeat_one.png and b/public/images/emoji/apple/repeat_one.png differ
diff --git a/public/images/emoji/apple/rescue_worker_helmet.png b/public/images/emoji/apple/rescue_worker_helmet.png
index 6440b55c34..f096d9ce43 100644
Binary files a/public/images/emoji/apple/rescue_worker_helmet.png and b/public/images/emoji/apple/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/apple/restroom.png b/public/images/emoji/apple/restroom.png
index 7d5bef7cec..cec5b1012c 100644
Binary files a/public/images/emoji/apple/restroom.png and b/public/images/emoji/apple/restroom.png differ
diff --git a/public/images/emoji/apple/reunion.png b/public/images/emoji/apple/reunion.png
index 6efb29e5bf..b87706d5d2 100644
Binary files a/public/images/emoji/apple/reunion.png and b/public/images/emoji/apple/reunion.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended.png
index e869cf97d1..1ca0197644 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png
index ce95c6a8be..b6868ba362 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png
index 33eec03fd4..0a2e09e996 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png
index 1048765292..0b45f9c3f1 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png
index 6f577d03de..41a3a0dc0c 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png
index 58349f45b1..a8a0694971 100644
Binary files a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/apple/revolving_hearts.png b/public/images/emoji/apple/revolving_hearts.png
index 2d1cd36200..2d4d99e02d 100644
Binary files a/public/images/emoji/apple/revolving_hearts.png and b/public/images/emoji/apple/revolving_hearts.png differ
diff --git a/public/images/emoji/apple/rewind.png b/public/images/emoji/apple/rewind.png
index 8703e2c503..7ed5b035da 100644
Binary files a/public/images/emoji/apple/rewind.png and b/public/images/emoji/apple/rewind.png differ
diff --git a/public/images/emoji/apple/rhinoceros.png b/public/images/emoji/apple/rhinoceros.png
index 9e01ebe47e..cd2ac1e83a 100644
Binary files a/public/images/emoji/apple/rhinoceros.png and b/public/images/emoji/apple/rhinoceros.png differ
diff --git a/public/images/emoji/apple/ribbon.png b/public/images/emoji/apple/ribbon.png
index 4d898d1526..ff98c3f0e3 100644
Binary files a/public/images/emoji/apple/ribbon.png and b/public/images/emoji/apple/ribbon.png differ
diff --git a/public/images/emoji/apple/rice.png b/public/images/emoji/apple/rice.png
index c4271c4399..4d7c1c26bd 100644
Binary files a/public/images/emoji/apple/rice.png and b/public/images/emoji/apple/rice.png differ
diff --git a/public/images/emoji/apple/rice_ball.png b/public/images/emoji/apple/rice_ball.png
index 7444782a08..67678db8e1 100644
Binary files a/public/images/emoji/apple/rice_ball.png and b/public/images/emoji/apple/rice_ball.png differ
diff --git a/public/images/emoji/apple/rice_cracker.png b/public/images/emoji/apple/rice_cracker.png
index 1b7155898c..1fb577ae42 100644
Binary files a/public/images/emoji/apple/rice_cracker.png and b/public/images/emoji/apple/rice_cracker.png differ
diff --git a/public/images/emoji/apple/rice_scene.png b/public/images/emoji/apple/rice_scene.png
index b3bbecd88e..344364e7c6 100644
Binary files a/public/images/emoji/apple/rice_scene.png and b/public/images/emoji/apple/rice_scene.png differ
diff --git a/public/images/emoji/apple/right_anger_bubble.png b/public/images/emoji/apple/right_anger_bubble.png
index 95cf61d6dd..6e30c38ae1 100644
Binary files a/public/images/emoji/apple/right_anger_bubble.png and b/public/images/emoji/apple/right_anger_bubble.png differ
diff --git a/public/images/emoji/apple/ring.png b/public/images/emoji/apple/ring.png
index e70850a170..5057f7b0e6 100644
Binary files a/public/images/emoji/apple/ring.png and b/public/images/emoji/apple/ring.png differ
diff --git a/public/images/emoji/apple/robot.png b/public/images/emoji/apple/robot.png
index f337f9b7a5..d47a10348b 100644
Binary files a/public/images/emoji/apple/robot.png and b/public/images/emoji/apple/robot.png differ
diff --git a/public/images/emoji/apple/robot_face.png b/public/images/emoji/apple/robot_face.png
index f337f9b7a5..d47a10348b 100644
Binary files a/public/images/emoji/apple/robot_face.png and b/public/images/emoji/apple/robot_face.png differ
diff --git a/public/images/emoji/apple/rocket.png b/public/images/emoji/apple/rocket.png
index 8ae60dfcaa..a908790f34 100644
Binary files a/public/images/emoji/apple/rocket.png and b/public/images/emoji/apple/rocket.png differ
diff --git a/public/images/emoji/apple/rofl.png b/public/images/emoji/apple/rofl.png
index 59488bcf37..0e58af2001 100644
Binary files a/public/images/emoji/apple/rofl.png and b/public/images/emoji/apple/rofl.png differ
diff --git a/public/images/emoji/apple/roll_eyes.png b/public/images/emoji/apple/roll_eyes.png
index 4da789951a..4c87d28410 100644
Binary files a/public/images/emoji/apple/roll_eyes.png and b/public/images/emoji/apple/roll_eyes.png differ
diff --git a/public/images/emoji/apple/rolled_up_newspaper.png b/public/images/emoji/apple/rolled_up_newspaper.png
index 400b080569..b6ef5fb796 100644
Binary files a/public/images/emoji/apple/rolled_up_newspaper.png and b/public/images/emoji/apple/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/apple/roller_coaster.png b/public/images/emoji/apple/roller_coaster.png
index e44cc5e734..5d26b983e0 100644
Binary files a/public/images/emoji/apple/roller_coaster.png and b/public/images/emoji/apple/roller_coaster.png differ
diff --git a/public/images/emoji/apple/rolling_eyes.png b/public/images/emoji/apple/rolling_eyes.png
index 4da789951a..4c87d28410 100644
Binary files a/public/images/emoji/apple/rolling_eyes.png and b/public/images/emoji/apple/rolling_eyes.png differ
diff --git a/public/images/emoji/apple/romania.png b/public/images/emoji/apple/romania.png
index 2cf4dca9a1..74d3926936 100644
Binary files a/public/images/emoji/apple/romania.png and b/public/images/emoji/apple/romania.png differ
diff --git a/public/images/emoji/apple/rooster.png b/public/images/emoji/apple/rooster.png
index 9811e82dde..32be609c39 100644
Binary files a/public/images/emoji/apple/rooster.png and b/public/images/emoji/apple/rooster.png differ
diff --git a/public/images/emoji/apple/rose.png b/public/images/emoji/apple/rose.png
index 1b4808817b..34e3ddbe3b 100644
Binary files a/public/images/emoji/apple/rose.png and b/public/images/emoji/apple/rose.png differ
diff --git a/public/images/emoji/apple/rosette.png b/public/images/emoji/apple/rosette.png
index ddd064e4e7..60792d7c73 100644
Binary files a/public/images/emoji/apple/rosette.png and b/public/images/emoji/apple/rosette.png differ
diff --git a/public/images/emoji/apple/rotating_light.png b/public/images/emoji/apple/rotating_light.png
index d33e164550..dc39091090 100644
Binary files a/public/images/emoji/apple/rotating_light.png and b/public/images/emoji/apple/rotating_light.png differ
diff --git a/public/images/emoji/apple/round_pushpin.png b/public/images/emoji/apple/round_pushpin.png
index 27ecb89da1..b0644e6eb9 100644
Binary files a/public/images/emoji/apple/round_pushpin.png and b/public/images/emoji/apple/round_pushpin.png differ
diff --git a/public/images/emoji/apple/rowboat.png b/public/images/emoji/apple/rowboat.png
index 412e6ed7f3..768d74a961 100644
Binary files a/public/images/emoji/apple/rowboat.png and b/public/images/emoji/apple/rowboat.png differ
diff --git a/public/images/emoji/apple/rowboat/2.png b/public/images/emoji/apple/rowboat/2.png
index d390d56ad1..6a0fb46ddc 100644
Binary files a/public/images/emoji/apple/rowboat/2.png and b/public/images/emoji/apple/rowboat/2.png differ
diff --git a/public/images/emoji/apple/rowboat/3.png b/public/images/emoji/apple/rowboat/3.png
index 6ef5342a64..97fc27be63 100644
Binary files a/public/images/emoji/apple/rowboat/3.png and b/public/images/emoji/apple/rowboat/3.png differ
diff --git a/public/images/emoji/apple/rowboat/4.png b/public/images/emoji/apple/rowboat/4.png
index bfc368477e..fd182ca091 100644
Binary files a/public/images/emoji/apple/rowboat/4.png and b/public/images/emoji/apple/rowboat/4.png differ
diff --git a/public/images/emoji/apple/rowboat/5.png b/public/images/emoji/apple/rowboat/5.png
index a1473188e9..f5619689e3 100644
Binary files a/public/images/emoji/apple/rowboat/5.png and b/public/images/emoji/apple/rowboat/5.png differ
diff --git a/public/images/emoji/apple/rowboat/6.png b/public/images/emoji/apple/rowboat/6.png
index 93cfe0f87f..77e7a018a5 100644
Binary files a/public/images/emoji/apple/rowboat/6.png and b/public/images/emoji/apple/rowboat/6.png differ
diff --git a/public/images/emoji/apple/rowing_man.png b/public/images/emoji/apple/rowing_man.png
index 412e6ed7f3..768d74a961 100644
Binary files a/public/images/emoji/apple/rowing_man.png and b/public/images/emoji/apple/rowing_man.png differ
diff --git a/public/images/emoji/apple/rowing_man/2.png b/public/images/emoji/apple/rowing_man/2.png
index d390d56ad1..6a0fb46ddc 100644
Binary files a/public/images/emoji/apple/rowing_man/2.png and b/public/images/emoji/apple/rowing_man/2.png differ
diff --git a/public/images/emoji/apple/rowing_man/3.png b/public/images/emoji/apple/rowing_man/3.png
index 6ef5342a64..97fc27be63 100644
Binary files a/public/images/emoji/apple/rowing_man/3.png and b/public/images/emoji/apple/rowing_man/3.png differ
diff --git a/public/images/emoji/apple/rowing_man/4.png b/public/images/emoji/apple/rowing_man/4.png
index bfc368477e..fd182ca091 100644
Binary files a/public/images/emoji/apple/rowing_man/4.png and b/public/images/emoji/apple/rowing_man/4.png differ
diff --git a/public/images/emoji/apple/rowing_man/5.png b/public/images/emoji/apple/rowing_man/5.png
index a1473188e9..f5619689e3 100644
Binary files a/public/images/emoji/apple/rowing_man/5.png and b/public/images/emoji/apple/rowing_man/5.png differ
diff --git a/public/images/emoji/apple/rowing_man/6.png b/public/images/emoji/apple/rowing_man/6.png
index 93cfe0f87f..77e7a018a5 100644
Binary files a/public/images/emoji/apple/rowing_man/6.png and b/public/images/emoji/apple/rowing_man/6.png differ
diff --git a/public/images/emoji/apple/rowing_woman.png b/public/images/emoji/apple/rowing_woman.png
index 06d080bf6f..04917c89dd 100644
Binary files a/public/images/emoji/apple/rowing_woman.png and b/public/images/emoji/apple/rowing_woman.png differ
diff --git a/public/images/emoji/apple/rowing_woman/2.png b/public/images/emoji/apple/rowing_woman/2.png
index 6ba3fb0c1c..89e7eb6172 100644
Binary files a/public/images/emoji/apple/rowing_woman/2.png and b/public/images/emoji/apple/rowing_woman/2.png differ
diff --git a/public/images/emoji/apple/rowing_woman/3.png b/public/images/emoji/apple/rowing_woman/3.png
index bc3b1647a1..eb1f887be7 100644
Binary files a/public/images/emoji/apple/rowing_woman/3.png and b/public/images/emoji/apple/rowing_woman/3.png differ
diff --git a/public/images/emoji/apple/rowing_woman/4.png b/public/images/emoji/apple/rowing_woman/4.png
index 872e2d3433..06d9c0be94 100644
Binary files a/public/images/emoji/apple/rowing_woman/4.png and b/public/images/emoji/apple/rowing_woman/4.png differ
diff --git a/public/images/emoji/apple/rowing_woman/5.png b/public/images/emoji/apple/rowing_woman/5.png
index b0466da8e4..52a269ff3f 100644
Binary files a/public/images/emoji/apple/rowing_woman/5.png and b/public/images/emoji/apple/rowing_woman/5.png differ
diff --git a/public/images/emoji/apple/rowing_woman/6.png b/public/images/emoji/apple/rowing_woman/6.png
index 90854899ff..2fcf455f93 100644
Binary files a/public/images/emoji/apple/rowing_woman/6.png and b/public/images/emoji/apple/rowing_woman/6.png differ
diff --git a/public/images/emoji/apple/ru.png b/public/images/emoji/apple/ru.png
index ebd82f4a52..f5ca16dd7a 100644
Binary files a/public/images/emoji/apple/ru.png and b/public/images/emoji/apple/ru.png differ
diff --git a/public/images/emoji/apple/rugby_football.png b/public/images/emoji/apple/rugby_football.png
index 6e05e18f43..2c815f4231 100644
Binary files a/public/images/emoji/apple/rugby_football.png and b/public/images/emoji/apple/rugby_football.png differ
diff --git a/public/images/emoji/apple/runner.png b/public/images/emoji/apple/runner.png
index a54c9f58e9..8484bacfc0 100644
Binary files a/public/images/emoji/apple/runner.png and b/public/images/emoji/apple/runner.png differ
diff --git a/public/images/emoji/apple/runner/2.png b/public/images/emoji/apple/runner/2.png
index d3efc0f73d..f31d3c5359 100644
Binary files a/public/images/emoji/apple/runner/2.png and b/public/images/emoji/apple/runner/2.png differ
diff --git a/public/images/emoji/apple/runner/3.png b/public/images/emoji/apple/runner/3.png
index 3647d58222..ce4ee259ab 100644
Binary files a/public/images/emoji/apple/runner/3.png and b/public/images/emoji/apple/runner/3.png differ
diff --git a/public/images/emoji/apple/runner/4.png b/public/images/emoji/apple/runner/4.png
index 1c09cf1ec4..aa7df4dc9e 100644
Binary files a/public/images/emoji/apple/runner/4.png and b/public/images/emoji/apple/runner/4.png differ
diff --git a/public/images/emoji/apple/runner/5.png b/public/images/emoji/apple/runner/5.png
index 4a9e54bd18..e5afa9d6d8 100644
Binary files a/public/images/emoji/apple/runner/5.png and b/public/images/emoji/apple/runner/5.png differ
diff --git a/public/images/emoji/apple/runner/6.png b/public/images/emoji/apple/runner/6.png
index 79c08ed0b7..1faf86868d 100644
Binary files a/public/images/emoji/apple/runner/6.png and b/public/images/emoji/apple/runner/6.png differ
diff --git a/public/images/emoji/apple/running_man.png b/public/images/emoji/apple/running_man.png
index a54c9f58e9..8484bacfc0 100644
Binary files a/public/images/emoji/apple/running_man.png and b/public/images/emoji/apple/running_man.png differ
diff --git a/public/images/emoji/apple/running_man/2.png b/public/images/emoji/apple/running_man/2.png
index d3efc0f73d..f31d3c5359 100644
Binary files a/public/images/emoji/apple/running_man/2.png and b/public/images/emoji/apple/running_man/2.png differ
diff --git a/public/images/emoji/apple/running_man/3.png b/public/images/emoji/apple/running_man/3.png
index 3647d58222..ce4ee259ab 100644
Binary files a/public/images/emoji/apple/running_man/3.png and b/public/images/emoji/apple/running_man/3.png differ
diff --git a/public/images/emoji/apple/running_man/4.png b/public/images/emoji/apple/running_man/4.png
index 1c09cf1ec4..aa7df4dc9e 100644
Binary files a/public/images/emoji/apple/running_man/4.png and b/public/images/emoji/apple/running_man/4.png differ
diff --git a/public/images/emoji/apple/running_man/5.png b/public/images/emoji/apple/running_man/5.png
index 4a9e54bd18..e5afa9d6d8 100644
Binary files a/public/images/emoji/apple/running_man/5.png and b/public/images/emoji/apple/running_man/5.png differ
diff --git a/public/images/emoji/apple/running_man/6.png b/public/images/emoji/apple/running_man/6.png
index 79c08ed0b7..1faf86868d 100644
Binary files a/public/images/emoji/apple/running_man/6.png and b/public/images/emoji/apple/running_man/6.png differ
diff --git a/public/images/emoji/apple/running_shirt_with_sash.png b/public/images/emoji/apple/running_shirt_with_sash.png
index bc14ee0a36..ebc8addaf1 100644
Binary files a/public/images/emoji/apple/running_shirt_with_sash.png and b/public/images/emoji/apple/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/apple/running_woman.png b/public/images/emoji/apple/running_woman.png
index 593cef257a..bf3cc6a5aa 100644
Binary files a/public/images/emoji/apple/running_woman.png and b/public/images/emoji/apple/running_woman.png differ
diff --git a/public/images/emoji/apple/running_woman/2.png b/public/images/emoji/apple/running_woman/2.png
index 6611c5ffaf..57af47e8a2 100644
Binary files a/public/images/emoji/apple/running_woman/2.png and b/public/images/emoji/apple/running_woman/2.png differ
diff --git a/public/images/emoji/apple/running_woman/3.png b/public/images/emoji/apple/running_woman/3.png
index 7324b8214c..9e09876d3c 100644
Binary files a/public/images/emoji/apple/running_woman/3.png and b/public/images/emoji/apple/running_woman/3.png differ
diff --git a/public/images/emoji/apple/running_woman/4.png b/public/images/emoji/apple/running_woman/4.png
index bf45719ea0..02a3837fbb 100644
Binary files a/public/images/emoji/apple/running_woman/4.png and b/public/images/emoji/apple/running_woman/4.png differ
diff --git a/public/images/emoji/apple/running_woman/5.png b/public/images/emoji/apple/running_woman/5.png
index d08dacb1b3..27ae797856 100644
Binary files a/public/images/emoji/apple/running_woman/5.png and b/public/images/emoji/apple/running_woman/5.png differ
diff --git a/public/images/emoji/apple/running_woman/6.png b/public/images/emoji/apple/running_woman/6.png
index 3e061ca8ed..04c5780f14 100644
Binary files a/public/images/emoji/apple/running_woman/6.png and b/public/images/emoji/apple/running_woman/6.png differ
diff --git a/public/images/emoji/apple/rwanda.png b/public/images/emoji/apple/rwanda.png
index 736d4cb1ef..0457d9b608 100644
Binary files a/public/images/emoji/apple/rwanda.png and b/public/images/emoji/apple/rwanda.png differ
diff --git a/public/images/emoji/apple/sa.png b/public/images/emoji/apple/sa.png
index c4c202a7ad..4776b88a56 100644
Binary files a/public/images/emoji/apple/sa.png and b/public/images/emoji/apple/sa.png differ
diff --git a/public/images/emoji/apple/sagittarius.png b/public/images/emoji/apple/sagittarius.png
index 5038b3f0bf..6e644934ad 100644
Binary files a/public/images/emoji/apple/sagittarius.png and b/public/images/emoji/apple/sagittarius.png differ
diff --git a/public/images/emoji/apple/sailboat.png b/public/images/emoji/apple/sailboat.png
index 5da9fee696..fd1f80dd54 100644
Binary files a/public/images/emoji/apple/sailboat.png and b/public/images/emoji/apple/sailboat.png differ
diff --git a/public/images/emoji/apple/sake.png b/public/images/emoji/apple/sake.png
index e532106692..a80dc343bd 100644
Binary files a/public/images/emoji/apple/sake.png and b/public/images/emoji/apple/sake.png differ
diff --git a/public/images/emoji/apple/samoa.png b/public/images/emoji/apple/samoa.png
index e0bed73bf5..347c2d74a3 100644
Binary files a/public/images/emoji/apple/samoa.png and b/public/images/emoji/apple/samoa.png differ
diff --git a/public/images/emoji/apple/san_marino.png b/public/images/emoji/apple/san_marino.png
index 6dc935be3e..68d4370805 100644
Binary files a/public/images/emoji/apple/san_marino.png and b/public/images/emoji/apple/san_marino.png differ
diff --git a/public/images/emoji/apple/sandal.png b/public/images/emoji/apple/sandal.png
index d9945f8fea..b123ac3890 100644
Binary files a/public/images/emoji/apple/sandal.png and b/public/images/emoji/apple/sandal.png differ
diff --git a/public/images/emoji/apple/sandwich.png b/public/images/emoji/apple/sandwich.png
index ba3f9a1cdb..f527af76cf 100644
Binary files a/public/images/emoji/apple/sandwich.png and b/public/images/emoji/apple/sandwich.png differ
diff --git a/public/images/emoji/apple/santa.png b/public/images/emoji/apple/santa.png
index f7ddb9bcd8..1200abda14 100644
Binary files a/public/images/emoji/apple/santa.png and b/public/images/emoji/apple/santa.png differ
diff --git a/public/images/emoji/apple/santa/2.png b/public/images/emoji/apple/santa/2.png
index f80ae96d00..bbf670db69 100644
Binary files a/public/images/emoji/apple/santa/2.png and b/public/images/emoji/apple/santa/2.png differ
diff --git a/public/images/emoji/apple/santa/3.png b/public/images/emoji/apple/santa/3.png
index 8912ad6bec..0351823260 100644
Binary files a/public/images/emoji/apple/santa/3.png and b/public/images/emoji/apple/santa/3.png differ
diff --git a/public/images/emoji/apple/santa/4.png b/public/images/emoji/apple/santa/4.png
index cf828d4db6..3f9ffee161 100644
Binary files a/public/images/emoji/apple/santa/4.png and b/public/images/emoji/apple/santa/4.png differ
diff --git a/public/images/emoji/apple/santa/5.png b/public/images/emoji/apple/santa/5.png
index 341545fb2a..a35152d5e9 100644
Binary files a/public/images/emoji/apple/santa/5.png and b/public/images/emoji/apple/santa/5.png differ
diff --git a/public/images/emoji/apple/santa/6.png b/public/images/emoji/apple/santa/6.png
index e9eb712028..25841d754b 100644
Binary files a/public/images/emoji/apple/santa/6.png and b/public/images/emoji/apple/santa/6.png differ
diff --git a/public/images/emoji/apple/sao_tome_principe.png b/public/images/emoji/apple/sao_tome_principe.png
index e52b743de9..38644e5020 100644
Binary files a/public/images/emoji/apple/sao_tome_principe.png and b/public/images/emoji/apple/sao_tome_principe.png differ
diff --git a/public/images/emoji/apple/satellite.png b/public/images/emoji/apple/satellite.png
index c408d5f745..6c3d8495b3 100644
Binary files a/public/images/emoji/apple/satellite.png and b/public/images/emoji/apple/satellite.png differ
diff --git a/public/images/emoji/apple/satellite_orbital.png b/public/images/emoji/apple/satellite_orbital.png
index 28b9ab2fd7..61a88816ab 100644
Binary files a/public/images/emoji/apple/satellite_orbital.png and b/public/images/emoji/apple/satellite_orbital.png differ
diff --git a/public/images/emoji/apple/satisfied.png b/public/images/emoji/apple/satisfied.png
index 7dd973daef..714f6d5835 100644
Binary files a/public/images/emoji/apple/satisfied.png and b/public/images/emoji/apple/satisfied.png differ
diff --git a/public/images/emoji/apple/saudi_arabia.png b/public/images/emoji/apple/saudi_arabia.png
index a58c32dc2d..ac582e969b 100644
Binary files a/public/images/emoji/apple/saudi_arabia.png and b/public/images/emoji/apple/saudi_arabia.png differ
diff --git a/public/images/emoji/apple/sauropod.png b/public/images/emoji/apple/sauropod.png
index 2f4d619997..f312a3920b 100644
Binary files a/public/images/emoji/apple/sauropod.png and b/public/images/emoji/apple/sauropod.png differ
diff --git a/public/images/emoji/apple/saxophone.png b/public/images/emoji/apple/saxophone.png
index 51fa21f2de..d997df97d0 100644
Binary files a/public/images/emoji/apple/saxophone.png and b/public/images/emoji/apple/saxophone.png differ
diff --git a/public/images/emoji/apple/scales.png b/public/images/emoji/apple/scales.png
index 5a49f802a7..bf4fb0b953 100644
Binary files a/public/images/emoji/apple/scales.png and b/public/images/emoji/apple/scales.png differ
diff --git a/public/images/emoji/apple/scarf.png b/public/images/emoji/apple/scarf.png
index 73653eee2b..66ea3f89a2 100644
Binary files a/public/images/emoji/apple/scarf.png and b/public/images/emoji/apple/scarf.png differ
diff --git a/public/images/emoji/apple/school.png b/public/images/emoji/apple/school.png
index a35e8e9d88..7ee2d24f4f 100644
Binary files a/public/images/emoji/apple/school.png and b/public/images/emoji/apple/school.png differ
diff --git a/public/images/emoji/apple/school_satchel.png b/public/images/emoji/apple/school_satchel.png
index 4147b98ba6..685b1d8e3b 100644
Binary files a/public/images/emoji/apple/school_satchel.png and b/public/images/emoji/apple/school_satchel.png differ
diff --git a/public/images/emoji/apple/scissors.png b/public/images/emoji/apple/scissors.png
index 7b7692a2c8..390dac4bc4 100644
Binary files a/public/images/emoji/apple/scissors.png and b/public/images/emoji/apple/scissors.png differ
diff --git a/public/images/emoji/apple/scorpion.png b/public/images/emoji/apple/scorpion.png
index b76754f6df..87f7205d31 100644
Binary files a/public/images/emoji/apple/scorpion.png and b/public/images/emoji/apple/scorpion.png differ
diff --git a/public/images/emoji/apple/scorpius.png b/public/images/emoji/apple/scorpius.png
index 07960c5184..9019ddfe7a 100644
Binary files a/public/images/emoji/apple/scorpius.png and b/public/images/emoji/apple/scorpius.png differ
diff --git a/public/images/emoji/apple/scream.png b/public/images/emoji/apple/scream.png
index 14c1f0d858..977e8ebbad 100644
Binary files a/public/images/emoji/apple/scream.png and b/public/images/emoji/apple/scream.png differ
diff --git a/public/images/emoji/apple/scream_cat.png b/public/images/emoji/apple/scream_cat.png
index a750f130ec..1138964a85 100644
Binary files a/public/images/emoji/apple/scream_cat.png and b/public/images/emoji/apple/scream_cat.png differ
diff --git a/public/images/emoji/apple/scroll.png b/public/images/emoji/apple/scroll.png
index 270de39487..788820c7a8 100644
Binary files a/public/images/emoji/apple/scroll.png and b/public/images/emoji/apple/scroll.png differ
diff --git a/public/images/emoji/apple/seat.png b/public/images/emoji/apple/seat.png
index fbcefcac4c..c9fcf61a80 100644
Binary files a/public/images/emoji/apple/seat.png and b/public/images/emoji/apple/seat.png differ
diff --git a/public/images/emoji/apple/secret.png b/public/images/emoji/apple/secret.png
index b434115e63..0e35050dae 100644
Binary files a/public/images/emoji/apple/secret.png and b/public/images/emoji/apple/secret.png differ
diff --git a/public/images/emoji/apple/see_no_evil.png b/public/images/emoji/apple/see_no_evil.png
index 113d3c8186..05a37ddf66 100644
Binary files a/public/images/emoji/apple/see_no_evil.png and b/public/images/emoji/apple/see_no_evil.png differ
diff --git a/public/images/emoji/apple/seedling.png b/public/images/emoji/apple/seedling.png
index 5f83d7530a..00badb935f 100644
Binary files a/public/images/emoji/apple/seedling.png and b/public/images/emoji/apple/seedling.png differ
diff --git a/public/images/emoji/apple/selfie.png b/public/images/emoji/apple/selfie.png
index 0b36f4c531..1e18c1a813 100644
Binary files a/public/images/emoji/apple/selfie.png and b/public/images/emoji/apple/selfie.png differ
diff --git a/public/images/emoji/apple/selfie/2.png b/public/images/emoji/apple/selfie/2.png
index d867f24f87..592413017c 100644
Binary files a/public/images/emoji/apple/selfie/2.png and b/public/images/emoji/apple/selfie/2.png differ
diff --git a/public/images/emoji/apple/selfie/3.png b/public/images/emoji/apple/selfie/3.png
index 69c7037eba..c4eea35fd9 100644
Binary files a/public/images/emoji/apple/selfie/3.png and b/public/images/emoji/apple/selfie/3.png differ
diff --git a/public/images/emoji/apple/selfie/4.png b/public/images/emoji/apple/selfie/4.png
index fff11d76b1..42992778db 100644
Binary files a/public/images/emoji/apple/selfie/4.png and b/public/images/emoji/apple/selfie/4.png differ
diff --git a/public/images/emoji/apple/selfie/5.png b/public/images/emoji/apple/selfie/5.png
index e499dd49b5..c8496f3d01 100644
Binary files a/public/images/emoji/apple/selfie/5.png and b/public/images/emoji/apple/selfie/5.png differ
diff --git a/public/images/emoji/apple/selfie/6.png b/public/images/emoji/apple/selfie/6.png
index a5fe385971..2b2867cb1c 100644
Binary files a/public/images/emoji/apple/selfie/6.png and b/public/images/emoji/apple/selfie/6.png differ
diff --git a/public/images/emoji/apple/senegal.png b/public/images/emoji/apple/senegal.png
index 41cdb2886b..a1b8b71158 100644
Binary files a/public/images/emoji/apple/senegal.png and b/public/images/emoji/apple/senegal.png differ
diff --git a/public/images/emoji/apple/serbia.png b/public/images/emoji/apple/serbia.png
index 22d8d0b757..863b9a96dd 100644
Binary files a/public/images/emoji/apple/serbia.png and b/public/images/emoji/apple/serbia.png differ
diff --git a/public/images/emoji/apple/seven.png b/public/images/emoji/apple/seven.png
index 8e280d07c4..51e45e9214 100644
Binary files a/public/images/emoji/apple/seven.png and b/public/images/emoji/apple/seven.png differ
diff --git a/public/images/emoji/apple/seychelles.png b/public/images/emoji/apple/seychelles.png
index 498e8ae1b6..d203e6b300 100644
Binary files a/public/images/emoji/apple/seychelles.png and b/public/images/emoji/apple/seychelles.png differ
diff --git a/public/images/emoji/apple/shallow_pan_of_food.png b/public/images/emoji/apple/shallow_pan_of_food.png
index e076ea5be2..ed9e2cbfe0 100644
Binary files a/public/images/emoji/apple/shallow_pan_of_food.png and b/public/images/emoji/apple/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/apple/shamrock.png b/public/images/emoji/apple/shamrock.png
index 596e05a130..d8022ad15d 100644
Binary files a/public/images/emoji/apple/shamrock.png and b/public/images/emoji/apple/shamrock.png differ
diff --git a/public/images/emoji/apple/shark.png b/public/images/emoji/apple/shark.png
index 4e10f0ddab..96cd280cae 100644
Binary files a/public/images/emoji/apple/shark.png and b/public/images/emoji/apple/shark.png differ
diff --git a/public/images/emoji/apple/shaved_ice.png b/public/images/emoji/apple/shaved_ice.png
index 3756ff5b72..537970da85 100644
Binary files a/public/images/emoji/apple/shaved_ice.png and b/public/images/emoji/apple/shaved_ice.png differ
diff --git a/public/images/emoji/apple/sheep.png b/public/images/emoji/apple/sheep.png
index e5b60f919d..9fec9ca3f2 100644
Binary files a/public/images/emoji/apple/sheep.png and b/public/images/emoji/apple/sheep.png differ
diff --git a/public/images/emoji/apple/shell.png b/public/images/emoji/apple/shell.png
index 6585fb6a7e..665aa98588 100644
Binary files a/public/images/emoji/apple/shell.png and b/public/images/emoji/apple/shell.png differ
diff --git a/public/images/emoji/apple/shield.png b/public/images/emoji/apple/shield.png
index c5ee6e4069..5e0335ff37 100644
Binary files a/public/images/emoji/apple/shield.png and b/public/images/emoji/apple/shield.png differ
diff --git a/public/images/emoji/apple/shinto_shrine.png b/public/images/emoji/apple/shinto_shrine.png
index c124fe9a4a..862033c9f2 100644
Binary files a/public/images/emoji/apple/shinto_shrine.png and b/public/images/emoji/apple/shinto_shrine.png differ
diff --git a/public/images/emoji/apple/ship.png b/public/images/emoji/apple/ship.png
index decc0e851a..c103615235 100644
Binary files a/public/images/emoji/apple/ship.png and b/public/images/emoji/apple/ship.png differ
diff --git a/public/images/emoji/apple/shirt.png b/public/images/emoji/apple/shirt.png
index 68a0867f0a..a975e92c06 100644
Binary files a/public/images/emoji/apple/shirt.png and b/public/images/emoji/apple/shirt.png differ
diff --git a/public/images/emoji/apple/shit.png b/public/images/emoji/apple/shit.png
index a025f43002..18c33a1371 100644
Binary files a/public/images/emoji/apple/shit.png and b/public/images/emoji/apple/shit.png differ
diff --git a/public/images/emoji/apple/shopping.png b/public/images/emoji/apple/shopping.png
index a53082f3cd..d96817c2f2 100644
Binary files a/public/images/emoji/apple/shopping.png and b/public/images/emoji/apple/shopping.png differ
diff --git a/public/images/emoji/apple/shopping_bags.png b/public/images/emoji/apple/shopping_bags.png
index a53082f3cd..d96817c2f2 100644
Binary files a/public/images/emoji/apple/shopping_bags.png and b/public/images/emoji/apple/shopping_bags.png differ
diff --git a/public/images/emoji/apple/shopping_cart.png b/public/images/emoji/apple/shopping_cart.png
index 5601253eab..cbab863bdd 100644
Binary files a/public/images/emoji/apple/shopping_cart.png and b/public/images/emoji/apple/shopping_cart.png differ
diff --git a/public/images/emoji/apple/shower.png b/public/images/emoji/apple/shower.png
index 43e1a1b5b9..d111de7591 100644
Binary files a/public/images/emoji/apple/shower.png and b/public/images/emoji/apple/shower.png differ
diff --git a/public/images/emoji/apple/shrimp.png b/public/images/emoji/apple/shrimp.png
index 68d4997195..686a96afe2 100644
Binary files a/public/images/emoji/apple/shrimp.png and b/public/images/emoji/apple/shrimp.png differ
diff --git a/public/images/emoji/apple/shushing_face.png b/public/images/emoji/apple/shushing_face.png
new file mode 100644
index 0000000000..222a912f11
Binary files /dev/null and b/public/images/emoji/apple/shushing_face.png differ
diff --git a/public/images/emoji/apple/sierra_leone.png b/public/images/emoji/apple/sierra_leone.png
index 9f97f49ecf..188e886858 100644
Binary files a/public/images/emoji/apple/sierra_leone.png and b/public/images/emoji/apple/sierra_leone.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns.png b/public/images/emoji/apple/sign_of_the_horns.png
index 7518952e87..c83009fefc 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns.png and b/public/images/emoji/apple/sign_of_the_horns.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/2.png b/public/images/emoji/apple/sign_of_the_horns/2.png
index 46006766ae..6937c225c2 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/2.png and b/public/images/emoji/apple/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/3.png b/public/images/emoji/apple/sign_of_the_horns/3.png
index 85aa93e844..8fdeb26418 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/3.png and b/public/images/emoji/apple/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/4.png b/public/images/emoji/apple/sign_of_the_horns/4.png
index ff67325213..c01102ad00 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/4.png and b/public/images/emoji/apple/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/5.png b/public/images/emoji/apple/sign_of_the_horns/5.png
index 8f48f33a83..04d6a6646b 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/5.png and b/public/images/emoji/apple/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/6.png b/public/images/emoji/apple/sign_of_the_horns/6.png
index beec4708b8..3aeba2a9ce 100644
Binary files a/public/images/emoji/apple/sign_of_the_horns/6.png and b/public/images/emoji/apple/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/apple/signal_strength.png b/public/images/emoji/apple/signal_strength.png
index c058c63eaf..c729e27635 100644
Binary files a/public/images/emoji/apple/signal_strength.png and b/public/images/emoji/apple/signal_strength.png differ
diff --git a/public/images/emoji/apple/singapore.png b/public/images/emoji/apple/singapore.png
index b959a26b64..b3fe4b869e 100644
Binary files a/public/images/emoji/apple/singapore.png and b/public/images/emoji/apple/singapore.png differ
diff --git a/public/images/emoji/apple/sint_maarten.png b/public/images/emoji/apple/sint_maarten.png
index d56216fa0c..0c63f9f5fa 100644
Binary files a/public/images/emoji/apple/sint_maarten.png and b/public/images/emoji/apple/sint_maarten.png differ
diff --git a/public/images/emoji/apple/six.png b/public/images/emoji/apple/six.png
index 230e33849b..a8140e5afc 100644
Binary files a/public/images/emoji/apple/six.png and b/public/images/emoji/apple/six.png differ
diff --git a/public/images/emoji/apple/six_pointed_star.png b/public/images/emoji/apple/six_pointed_star.png
index f6f610d44c..0b3cac610f 100644
Binary files a/public/images/emoji/apple/six_pointed_star.png and b/public/images/emoji/apple/six_pointed_star.png differ
diff --git a/public/images/emoji/apple/skeleton.png b/public/images/emoji/apple/skeleton.png
index 9fff97187a..3085e4eff1 100644
Binary files a/public/images/emoji/apple/skeleton.png and b/public/images/emoji/apple/skeleton.png differ
diff --git a/public/images/emoji/apple/ski.png b/public/images/emoji/apple/ski.png
index 5bd13a803b..64a15852b7 100644
Binary files a/public/images/emoji/apple/ski.png and b/public/images/emoji/apple/ski.png differ
diff --git a/public/images/emoji/apple/skier.png b/public/images/emoji/apple/skier.png
index 940aadb0af..f3196f1cf9 100644
Binary files a/public/images/emoji/apple/skier.png and b/public/images/emoji/apple/skier.png differ
diff --git a/public/images/emoji/apple/skull.png b/public/images/emoji/apple/skull.png
index 9fff97187a..3085e4eff1 100644
Binary files a/public/images/emoji/apple/skull.png and b/public/images/emoji/apple/skull.png differ
diff --git a/public/images/emoji/apple/skull_and_crossbones.png b/public/images/emoji/apple/skull_and_crossbones.png
index e819de8ce2..e57e14decd 100644
Binary files a/public/images/emoji/apple/skull_and_crossbones.png and b/public/images/emoji/apple/skull_and_crossbones.png differ
diff --git a/public/images/emoji/apple/skull_crossbones.png b/public/images/emoji/apple/skull_crossbones.png
index e819de8ce2..e57e14decd 100644
Binary files a/public/images/emoji/apple/skull_crossbones.png and b/public/images/emoji/apple/skull_crossbones.png differ
diff --git a/public/images/emoji/apple/sled.png b/public/images/emoji/apple/sled.png
index 01805b1fe7..13e1134302 100644
Binary files a/public/images/emoji/apple/sled.png and b/public/images/emoji/apple/sled.png differ
diff --git a/public/images/emoji/apple/sleeping.png b/public/images/emoji/apple/sleeping.png
index 6e50f02bf2..4e3358e49c 100644
Binary files a/public/images/emoji/apple/sleeping.png and b/public/images/emoji/apple/sleeping.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation.png b/public/images/emoji/apple/sleeping_accommodation.png
index 724d29e260..e40bf8fba7 100644
Binary files a/public/images/emoji/apple/sleeping_accommodation.png and b/public/images/emoji/apple/sleeping_accommodation.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/2.png b/public/images/emoji/apple/sleeping_accommodation/2.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/3.png b/public/images/emoji/apple/sleeping_accommodation/3.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/4.png b/public/images/emoji/apple/sleeping_accommodation/4.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/5.png b/public/images/emoji/apple/sleeping_accommodation/5.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation/6.png b/public/images/emoji/apple/sleeping_accommodation/6.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/apple/sleeping_bed.png b/public/images/emoji/apple/sleeping_bed.png
index 724d29e260..e40bf8fba7 100644
Binary files a/public/images/emoji/apple/sleeping_bed.png and b/public/images/emoji/apple/sleeping_bed.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/2.png b/public/images/emoji/apple/sleeping_bed/2.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/2.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/3.png b/public/images/emoji/apple/sleeping_bed/3.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/3.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/4.png b/public/images/emoji/apple/sleeping_bed/4.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/4.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/5.png b/public/images/emoji/apple/sleeping_bed/5.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/5.png differ
diff --git a/public/images/emoji/apple/sleeping_bed/6.png b/public/images/emoji/apple/sleeping_bed/6.png
new file mode 100644
index 0000000000..e40bf8fba7
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed/6.png differ
diff --git a/public/images/emoji/apple/sleepy.png b/public/images/emoji/apple/sleepy.png
index 43de408a0a..857f588930 100644
Binary files a/public/images/emoji/apple/sleepy.png and b/public/images/emoji/apple/sleepy.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy.png b/public/images/emoji/apple/sleuth_or_spy.png
index 6a7e53aff0..60344f7f62 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy.png and b/public/images/emoji/apple/sleuth_or_spy.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/2.png b/public/images/emoji/apple/sleuth_or_spy/2.png
index 229e7c2986..52517d9f74 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/2.png and b/public/images/emoji/apple/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/3.png b/public/images/emoji/apple/sleuth_or_spy/3.png
index 58ee54ac88..33d8bb3606 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/3.png and b/public/images/emoji/apple/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/4.png b/public/images/emoji/apple/sleuth_or_spy/4.png
index 0ce63e8b7d..0643cf4fe5 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/4.png and b/public/images/emoji/apple/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/5.png b/public/images/emoji/apple/sleuth_or_spy/5.png
index 838cf318fe..70405882ea 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/5.png and b/public/images/emoji/apple/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/6.png b/public/images/emoji/apple/sleuth_or_spy/6.png
index e0cb2a0d2a..bb334320aa 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy/6.png and b/public/images/emoji/apple/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/apple/slight_frown.png b/public/images/emoji/apple/slight_frown.png
index f70c3de713..7ee17d210e 100644
Binary files a/public/images/emoji/apple/slight_frown.png and b/public/images/emoji/apple/slight_frown.png differ
diff --git a/public/images/emoji/apple/slight_smile.png b/public/images/emoji/apple/slight_smile.png
index 02756b99cb..b4a3ffbb88 100644
Binary files a/public/images/emoji/apple/slight_smile.png and b/public/images/emoji/apple/slight_smile.png differ
diff --git a/public/images/emoji/apple/slightly_frowning_face.png b/public/images/emoji/apple/slightly_frowning_face.png
index f70c3de713..7ee17d210e 100644
Binary files a/public/images/emoji/apple/slightly_frowning_face.png and b/public/images/emoji/apple/slightly_frowning_face.png differ
diff --git a/public/images/emoji/apple/slightly_smiling.png b/public/images/emoji/apple/slightly_smiling.png
index 02756b99cb..b4a3ffbb88 100644
Binary files a/public/images/emoji/apple/slightly_smiling.png and b/public/images/emoji/apple/slightly_smiling.png differ
diff --git a/public/images/emoji/apple/slightly_smiling_face.png b/public/images/emoji/apple/slightly_smiling_face.png
index 02756b99cb..b4a3ffbb88 100644
Binary files a/public/images/emoji/apple/slightly_smiling_face.png and b/public/images/emoji/apple/slightly_smiling_face.png differ
diff --git a/public/images/emoji/apple/slot_machine.png b/public/images/emoji/apple/slot_machine.png
index 26feee545c..2d0fd68165 100644
Binary files a/public/images/emoji/apple/slot_machine.png and b/public/images/emoji/apple/slot_machine.png differ
diff --git a/public/images/emoji/apple/slovakia.png b/public/images/emoji/apple/slovakia.png
index 287b40bb24..9c1f90e25d 100644
Binary files a/public/images/emoji/apple/slovakia.png and b/public/images/emoji/apple/slovakia.png differ
diff --git a/public/images/emoji/apple/slovenia.png b/public/images/emoji/apple/slovenia.png
index cf29751edf..708d4440aa 100644
Binary files a/public/images/emoji/apple/slovenia.png and b/public/images/emoji/apple/slovenia.png differ
diff --git a/public/images/emoji/apple/small_airplane.png b/public/images/emoji/apple/small_airplane.png
index c5823b2577..9ff3bb7e8d 100644
Binary files a/public/images/emoji/apple/small_airplane.png and b/public/images/emoji/apple/small_airplane.png differ
diff --git a/public/images/emoji/apple/small_blue_diamond.png b/public/images/emoji/apple/small_blue_diamond.png
index cda760ab65..06726d939b 100644
Binary files a/public/images/emoji/apple/small_blue_diamond.png and b/public/images/emoji/apple/small_blue_diamond.png differ
diff --git a/public/images/emoji/apple/small_orange_diamond.png b/public/images/emoji/apple/small_orange_diamond.png
index b173ef91ed..871766aa40 100644
Binary files a/public/images/emoji/apple/small_orange_diamond.png and b/public/images/emoji/apple/small_orange_diamond.png differ
diff --git a/public/images/emoji/apple/small_red_triangle.png b/public/images/emoji/apple/small_red_triangle.png
index cbac1b1f3a..519c4646f9 100644
Binary files a/public/images/emoji/apple/small_red_triangle.png and b/public/images/emoji/apple/small_red_triangle.png differ
diff --git a/public/images/emoji/apple/small_red_triangle_down.png b/public/images/emoji/apple/small_red_triangle_down.png
index 36a0b74835..4b75b36bf1 100644
Binary files a/public/images/emoji/apple/small_red_triangle_down.png and b/public/images/emoji/apple/small_red_triangle_down.png differ
diff --git a/public/images/emoji/apple/smile.png b/public/images/emoji/apple/smile.png
index ec96ecb13c..a9568985a7 100644
Binary files a/public/images/emoji/apple/smile.png and b/public/images/emoji/apple/smile.png differ
diff --git a/public/images/emoji/apple/smile_cat.png b/public/images/emoji/apple/smile_cat.png
index e5d138b04c..12c200a3dd 100644
Binary files a/public/images/emoji/apple/smile_cat.png and b/public/images/emoji/apple/smile_cat.png differ
diff --git a/public/images/emoji/apple/smiley.png b/public/images/emoji/apple/smiley.png
index 3e8d067f09..deee054772 100644
Binary files a/public/images/emoji/apple/smiley.png and b/public/images/emoji/apple/smiley.png differ
diff --git a/public/images/emoji/apple/smiley_cat.png b/public/images/emoji/apple/smiley_cat.png
index 0ebf0a3f26..0e402d73db 100644
Binary files a/public/images/emoji/apple/smiley_cat.png and b/public/images/emoji/apple/smiley_cat.png differ
diff --git a/public/images/emoji/apple/smiling_imp.png b/public/images/emoji/apple/smiling_imp.png
index 2505aca4a0..9e43a8fc74 100644
Binary files a/public/images/emoji/apple/smiling_imp.png and b/public/images/emoji/apple/smiling_imp.png differ
diff --git a/public/images/emoji/apple/smirk.png b/public/images/emoji/apple/smirk.png
index e7e894ab78..1d3518fc06 100644
Binary files a/public/images/emoji/apple/smirk.png and b/public/images/emoji/apple/smirk.png differ
diff --git a/public/images/emoji/apple/smirk_cat.png b/public/images/emoji/apple/smirk_cat.png
index 5d7a656c1e..89598acc10 100644
Binary files a/public/images/emoji/apple/smirk_cat.png and b/public/images/emoji/apple/smirk_cat.png differ
diff --git a/public/images/emoji/apple/smoking.png b/public/images/emoji/apple/smoking.png
index 6daba327ee..0673a767f7 100644
Binary files a/public/images/emoji/apple/smoking.png and b/public/images/emoji/apple/smoking.png differ
diff --git a/public/images/emoji/apple/snail.png b/public/images/emoji/apple/snail.png
index 38c1eae3a2..d9aeffe11f 100644
Binary files a/public/images/emoji/apple/snail.png and b/public/images/emoji/apple/snail.png differ
diff --git a/public/images/emoji/apple/snake.png b/public/images/emoji/apple/snake.png
index ea94d95836..a7b1488ad3 100644
Binary files a/public/images/emoji/apple/snake.png and b/public/images/emoji/apple/snake.png differ
diff --git a/public/images/emoji/apple/sneezing_face.png b/public/images/emoji/apple/sneezing_face.png
index f190bf0cb8..19ccd23dff 100644
Binary files a/public/images/emoji/apple/sneezing_face.png and b/public/images/emoji/apple/sneezing_face.png differ
diff --git a/public/images/emoji/apple/snow_capped_mountain.png b/public/images/emoji/apple/snow_capped_mountain.png
index 0be1ad5fee..1f06191ad5 100644
Binary files a/public/images/emoji/apple/snow_capped_mountain.png and b/public/images/emoji/apple/snow_capped_mountain.png differ
diff --git a/public/images/emoji/apple/snowboarder/2.png b/public/images/emoji/apple/snowboarder/2.png
index a4f4993821..799886a0b6 100644
Binary files a/public/images/emoji/apple/snowboarder/2.png and b/public/images/emoji/apple/snowboarder/2.png differ
diff --git a/public/images/emoji/apple/snowboarder/3.png b/public/images/emoji/apple/snowboarder/3.png
index f18d508430..799886a0b6 100644
Binary files a/public/images/emoji/apple/snowboarder/3.png and b/public/images/emoji/apple/snowboarder/3.png differ
diff --git a/public/images/emoji/apple/snowboarder/4.png b/public/images/emoji/apple/snowboarder/4.png
index 7218327420..799886a0b6 100644
Binary files a/public/images/emoji/apple/snowboarder/4.png and b/public/images/emoji/apple/snowboarder/4.png differ
diff --git a/public/images/emoji/apple/snowboarder/5.png b/public/images/emoji/apple/snowboarder/5.png
index b3372f66d7..799886a0b6 100644
Binary files a/public/images/emoji/apple/snowboarder/5.png and b/public/images/emoji/apple/snowboarder/5.png differ
diff --git a/public/images/emoji/apple/snowboarder/6.png b/public/images/emoji/apple/snowboarder/6.png
index 245ed27301..799886a0b6 100644
Binary files a/public/images/emoji/apple/snowboarder/6.png and b/public/images/emoji/apple/snowboarder/6.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/2.png b/public/images/emoji/apple/snowboarder/snowboarder/2.png
new file mode 100644
index 0000000000..a4f4993821
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/2.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/3.png b/public/images/emoji/apple/snowboarder/snowboarder/3.png
new file mode 100644
index 0000000000..f18d508430
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/3.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/4.png b/public/images/emoji/apple/snowboarder/snowboarder/4.png
new file mode 100644
index 0000000000..7218327420
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/4.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/5.png b/public/images/emoji/apple/snowboarder/snowboarder/5.png
new file mode 100644
index 0000000000..b3372f66d7
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/5.png differ
diff --git a/public/images/emoji/apple/snowboarder/snowboarder/6.png b/public/images/emoji/apple/snowboarder/snowboarder/6.png
new file mode 100644
index 0000000000..245ed27301
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/snowboarder/6.png differ
diff --git a/public/images/emoji/apple/snowflake.png b/public/images/emoji/apple/snowflake.png
index 4745565c4c..a363a08ef9 100644
Binary files a/public/images/emoji/apple/snowflake.png and b/public/images/emoji/apple/snowflake.png differ
diff --git a/public/images/emoji/apple/snowman.png b/public/images/emoji/apple/snowman.png
index 13a88d60ef..87ca5c1d86 100644
Binary files a/public/images/emoji/apple/snowman.png and b/public/images/emoji/apple/snowman.png differ
diff --git a/public/images/emoji/apple/snowman2.png b/public/images/emoji/apple/snowman2.png
index 4ae1cfb955..73e4c39399 100644
Binary files a/public/images/emoji/apple/snowman2.png and b/public/images/emoji/apple/snowman2.png differ
diff --git a/public/images/emoji/apple/snowman_with_snow.png b/public/images/emoji/apple/snowman_with_snow.png
index 4ae1cfb955..73e4c39399 100644
Binary files a/public/images/emoji/apple/snowman_with_snow.png and b/public/images/emoji/apple/snowman_with_snow.png differ
diff --git a/public/images/emoji/apple/sob.png b/public/images/emoji/apple/sob.png
index 5674beaff2..acd4b22d12 100644
Binary files a/public/images/emoji/apple/sob.png and b/public/images/emoji/apple/sob.png differ
diff --git a/public/images/emoji/apple/soccer.png b/public/images/emoji/apple/soccer.png
index b67be4121d..717e13fee3 100644
Binary files a/public/images/emoji/apple/soccer.png and b/public/images/emoji/apple/soccer.png differ
diff --git a/public/images/emoji/apple/socks.png b/public/images/emoji/apple/socks.png
index 8f2b9bbe9e..ed8ab43cc2 100644
Binary files a/public/images/emoji/apple/socks.png and b/public/images/emoji/apple/socks.png differ
diff --git a/public/images/emoji/apple/solomon_islands.png b/public/images/emoji/apple/solomon_islands.png
index 32fd718c87..1b66ba3e69 100644
Binary files a/public/images/emoji/apple/solomon_islands.png and b/public/images/emoji/apple/solomon_islands.png differ
diff --git a/public/images/emoji/apple/somalia.png b/public/images/emoji/apple/somalia.png
index 01ec1737ff..ba29f90b5a 100644
Binary files a/public/images/emoji/apple/somalia.png and b/public/images/emoji/apple/somalia.png differ
diff --git a/public/images/emoji/apple/soon.png b/public/images/emoji/apple/soon.png
index 237fd661c5..add1f60085 100644
Binary files a/public/images/emoji/apple/soon.png and b/public/images/emoji/apple/soon.png differ
diff --git a/public/images/emoji/apple/sos.png b/public/images/emoji/apple/sos.png
index d5dd10cd6b..cbe9026140 100644
Binary files a/public/images/emoji/apple/sos.png and b/public/images/emoji/apple/sos.png differ
diff --git a/public/images/emoji/apple/sound.png b/public/images/emoji/apple/sound.png
index 2497fe0d31..afa744fece 100644
Binary files a/public/images/emoji/apple/sound.png and b/public/images/emoji/apple/sound.png differ
diff --git a/public/images/emoji/apple/south_africa.png b/public/images/emoji/apple/south_africa.png
index e4bc22da62..8ee4c79d2c 100644
Binary files a/public/images/emoji/apple/south_africa.png and b/public/images/emoji/apple/south_africa.png differ
diff --git a/public/images/emoji/apple/south_georgia_south_sandwich_islands.png b/public/images/emoji/apple/south_georgia_south_sandwich_islands.png
index 55476e920c..a54fb0b62f 100644
Binary files a/public/images/emoji/apple/south_georgia_south_sandwich_islands.png and b/public/images/emoji/apple/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/apple/south_sudan.png b/public/images/emoji/apple/south_sudan.png
index 725a527adc..10a5db318b 100644
Binary files a/public/images/emoji/apple/south_sudan.png and b/public/images/emoji/apple/south_sudan.png differ
diff --git a/public/images/emoji/apple/space_invader.png b/public/images/emoji/apple/space_invader.png
index ce6123859c..8d5b560c9e 100644
Binary files a/public/images/emoji/apple/space_invader.png and b/public/images/emoji/apple/space_invader.png differ
diff --git a/public/images/emoji/apple/spades.png b/public/images/emoji/apple/spades.png
index e27b29fc4b..30a2b1c738 100644
Binary files a/public/images/emoji/apple/spades.png and b/public/images/emoji/apple/spades.png differ
diff --git a/public/images/emoji/apple/spaghetti.png b/public/images/emoji/apple/spaghetti.png
index d2f02f77f5..ea91ddf1b3 100644
Binary files a/public/images/emoji/apple/spaghetti.png and b/public/images/emoji/apple/spaghetti.png differ
diff --git a/public/images/emoji/apple/sparkle.png b/public/images/emoji/apple/sparkle.png
index 8951f218b3..315fb317c0 100644
Binary files a/public/images/emoji/apple/sparkle.png and b/public/images/emoji/apple/sparkle.png differ
diff --git a/public/images/emoji/apple/sparkler.png b/public/images/emoji/apple/sparkler.png
index 177b189a9c..a6849876d5 100644
Binary files a/public/images/emoji/apple/sparkler.png and b/public/images/emoji/apple/sparkler.png differ
diff --git a/public/images/emoji/apple/sparkles.png b/public/images/emoji/apple/sparkles.png
index b08bcfafdd..c6c4eff6b9 100644
Binary files a/public/images/emoji/apple/sparkles.png and b/public/images/emoji/apple/sparkles.png differ
diff --git a/public/images/emoji/apple/sparkling_heart.png b/public/images/emoji/apple/sparkling_heart.png
index 26d8ae6198..f9a0812cf4 100644
Binary files a/public/images/emoji/apple/sparkling_heart.png and b/public/images/emoji/apple/sparkling_heart.png differ
diff --git a/public/images/emoji/apple/speak_no_evil.png b/public/images/emoji/apple/speak_no_evil.png
index e52642249d..8fac748784 100644
Binary files a/public/images/emoji/apple/speak_no_evil.png and b/public/images/emoji/apple/speak_no_evil.png differ
diff --git a/public/images/emoji/apple/speaker.png b/public/images/emoji/apple/speaker.png
index 9ef912ee4d..11170ad035 100644
Binary files a/public/images/emoji/apple/speaker.png and b/public/images/emoji/apple/speaker.png differ
diff --git a/public/images/emoji/apple/speaking_head.png b/public/images/emoji/apple/speaking_head.png
index e11319ddc2..332e48b10e 100644
Binary files a/public/images/emoji/apple/speaking_head.png and b/public/images/emoji/apple/speaking_head.png differ
diff --git a/public/images/emoji/apple/speaking_head_in_silhouette.png b/public/images/emoji/apple/speaking_head_in_silhouette.png
index e11319ddc2..332e48b10e 100644
Binary files a/public/images/emoji/apple/speaking_head_in_silhouette.png and b/public/images/emoji/apple/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/apple/speech_balloon.png b/public/images/emoji/apple/speech_balloon.png
index d668842060..6a37cc7537 100644
Binary files a/public/images/emoji/apple/speech_balloon.png and b/public/images/emoji/apple/speech_balloon.png differ
diff --git a/public/images/emoji/apple/speedboat.png b/public/images/emoji/apple/speedboat.png
index 34000044bd..2dc0e7a339 100644
Binary files a/public/images/emoji/apple/speedboat.png and b/public/images/emoji/apple/speedboat.png differ
diff --git a/public/images/emoji/apple/spider.png b/public/images/emoji/apple/spider.png
index 742a820d2a..2be7c90827 100644
Binary files a/public/images/emoji/apple/spider.png and b/public/images/emoji/apple/spider.png differ
diff --git a/public/images/emoji/apple/spider_web.png b/public/images/emoji/apple/spider_web.png
index 2e2f9e0bae..6a891624b5 100644
Binary files a/public/images/emoji/apple/spider_web.png and b/public/images/emoji/apple/spider_web.png differ
diff --git a/public/images/emoji/apple/spiral_calendar.png b/public/images/emoji/apple/spiral_calendar.png
index 74b98132dd..b287a2598c 100644
Binary files a/public/images/emoji/apple/spiral_calendar.png and b/public/images/emoji/apple/spiral_calendar.png differ
diff --git a/public/images/emoji/apple/spiral_calendar_pad.png b/public/images/emoji/apple/spiral_calendar_pad.png
index 74b98132dd..b287a2598c 100644
Binary files a/public/images/emoji/apple/spiral_calendar_pad.png and b/public/images/emoji/apple/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/apple/spiral_note_pad.png b/public/images/emoji/apple/spiral_note_pad.png
index 5e4c3a2d0e..c7d2bfcca8 100644
Binary files a/public/images/emoji/apple/spiral_note_pad.png and b/public/images/emoji/apple/spiral_note_pad.png differ
diff --git a/public/images/emoji/apple/spiral_notepad.png b/public/images/emoji/apple/spiral_notepad.png
index 5e4c3a2d0e..c7d2bfcca8 100644
Binary files a/public/images/emoji/apple/spiral_notepad.png and b/public/images/emoji/apple/spiral_notepad.png differ
diff --git a/public/images/emoji/apple/spoon.png b/public/images/emoji/apple/spoon.png
index 0d7ccd11fe..7e40354636 100644
Binary files a/public/images/emoji/apple/spoon.png and b/public/images/emoji/apple/spoon.png differ
diff --git a/public/images/emoji/apple/sports_medal.png b/public/images/emoji/apple/sports_medal.png
index 6e66f14386..413a2089b2 100644
Binary files a/public/images/emoji/apple/sports_medal.png and b/public/images/emoji/apple/sports_medal.png differ
diff --git a/public/images/emoji/apple/spy.png b/public/images/emoji/apple/spy.png
index 6a7e53aff0..60344f7f62 100644
Binary files a/public/images/emoji/apple/spy.png and b/public/images/emoji/apple/spy.png differ
diff --git a/public/images/emoji/apple/spy/2.png b/public/images/emoji/apple/spy/2.png
index 229e7c2986..52517d9f74 100644
Binary files a/public/images/emoji/apple/spy/2.png and b/public/images/emoji/apple/spy/2.png differ
diff --git a/public/images/emoji/apple/spy/3.png b/public/images/emoji/apple/spy/3.png
index 58ee54ac88..33d8bb3606 100644
Binary files a/public/images/emoji/apple/spy/3.png and b/public/images/emoji/apple/spy/3.png differ
diff --git a/public/images/emoji/apple/spy/4.png b/public/images/emoji/apple/spy/4.png
index 0ce63e8b7d..0643cf4fe5 100644
Binary files a/public/images/emoji/apple/spy/4.png and b/public/images/emoji/apple/spy/4.png differ
diff --git a/public/images/emoji/apple/spy/5.png b/public/images/emoji/apple/spy/5.png
index 838cf318fe..70405882ea 100644
Binary files a/public/images/emoji/apple/spy/5.png and b/public/images/emoji/apple/spy/5.png differ
diff --git a/public/images/emoji/apple/spy/6.png b/public/images/emoji/apple/spy/6.png
index e0cb2a0d2a..bb334320aa 100644
Binary files a/public/images/emoji/apple/spy/6.png and b/public/images/emoji/apple/spy/6.png differ
diff --git a/public/images/emoji/apple/squid.png b/public/images/emoji/apple/squid.png
index 2c06de8797..a0d9d53dc7 100644
Binary files a/public/images/emoji/apple/squid.png and b/public/images/emoji/apple/squid.png differ
diff --git a/public/images/emoji/apple/sri_lanka.png b/public/images/emoji/apple/sri_lanka.png
index 9e13db4ab6..f503386b16 100644
Binary files a/public/images/emoji/apple/sri_lanka.png and b/public/images/emoji/apple/sri_lanka.png differ
diff --git a/public/images/emoji/apple/st_barthelemy.png b/public/images/emoji/apple/st_barthelemy.png
index daca6aa34a..5561564233 100644
Binary files a/public/images/emoji/apple/st_barthelemy.png and b/public/images/emoji/apple/st_barthelemy.png differ
diff --git a/public/images/emoji/apple/st_helena.png b/public/images/emoji/apple/st_helena.png
index 694a0b8510..b16a1f26a7 100644
Binary files a/public/images/emoji/apple/st_helena.png and b/public/images/emoji/apple/st_helena.png differ
diff --git a/public/images/emoji/apple/st_kitts_nevis.png b/public/images/emoji/apple/st_kitts_nevis.png
index 18dda8f654..e2d1db4e61 100644
Binary files a/public/images/emoji/apple/st_kitts_nevis.png and b/public/images/emoji/apple/st_kitts_nevis.png differ
diff --git a/public/images/emoji/apple/st_lucia.png b/public/images/emoji/apple/st_lucia.png
index 5d2d00f4db..ada0c371f4 100644
Binary files a/public/images/emoji/apple/st_lucia.png and b/public/images/emoji/apple/st_lucia.png differ
diff --git a/public/images/emoji/apple/st_martin.png b/public/images/emoji/apple/st_martin.png
index efcd5fff75..37c587fd61 100644
Binary files a/public/images/emoji/apple/st_martin.png and b/public/images/emoji/apple/st_martin.png differ
diff --git a/public/images/emoji/apple/st_pierre_miquelon.png b/public/images/emoji/apple/st_pierre_miquelon.png
index 699bcf1899..513c085e32 100644
Binary files a/public/images/emoji/apple/st_pierre_miquelon.png and b/public/images/emoji/apple/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/apple/st_vincent_grenadines.png b/public/images/emoji/apple/st_vincent_grenadines.png
index e06af20e14..47f9fd88f0 100644
Binary files a/public/images/emoji/apple/st_vincent_grenadines.png and b/public/images/emoji/apple/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/apple/stadium.png b/public/images/emoji/apple/stadium.png
index bdff0d70cc..7de90ca022 100644
Binary files a/public/images/emoji/apple/stadium.png and b/public/images/emoji/apple/stadium.png differ
diff --git a/public/images/emoji/apple/star.png b/public/images/emoji/apple/star.png
index 2778f4a5e4..ce54314818 100644
Binary files a/public/images/emoji/apple/star.png and b/public/images/emoji/apple/star.png differ
diff --git a/public/images/emoji/apple/star2.png b/public/images/emoji/apple/star2.png
index 37c8d2b0a8..c59a114fab 100644
Binary files a/public/images/emoji/apple/star2.png and b/public/images/emoji/apple/star2.png differ
diff --git a/public/images/emoji/apple/star_and_crescent.png b/public/images/emoji/apple/star_and_crescent.png
index 720237b3ca..6e1b839053 100644
Binary files a/public/images/emoji/apple/star_and_crescent.png and b/public/images/emoji/apple/star_and_crescent.png differ
diff --git a/public/images/emoji/apple/star_of_david.png b/public/images/emoji/apple/star_of_david.png
index be2ddc89ce..6d2d5f2047 100644
Binary files a/public/images/emoji/apple/star_of_david.png and b/public/images/emoji/apple/star_of_david.png differ
diff --git a/public/images/emoji/apple/star_struck.png b/public/images/emoji/apple/star_struck.png
index 7da8183f39..3883a7aadf 100644
Binary files a/public/images/emoji/apple/star_struck.png and b/public/images/emoji/apple/star_struck.png differ
diff --git a/public/images/emoji/apple/stars.png b/public/images/emoji/apple/stars.png
index b48e69b820..e44041f61c 100644
Binary files a/public/images/emoji/apple/stars.png and b/public/images/emoji/apple/stars.png differ
diff --git a/public/images/emoji/apple/station.png b/public/images/emoji/apple/station.png
index eaa21c05e7..f31966c994 100644
Binary files a/public/images/emoji/apple/station.png and b/public/images/emoji/apple/station.png differ
diff --git a/public/images/emoji/apple/statue_of_liberty.png b/public/images/emoji/apple/statue_of_liberty.png
index 58e1f0e546..80d5e5a8b9 100644
Binary files a/public/images/emoji/apple/statue_of_liberty.png and b/public/images/emoji/apple/statue_of_liberty.png differ
diff --git a/public/images/emoji/apple/steam_locomotive.png b/public/images/emoji/apple/steam_locomotive.png
index 362fe4c2e6..399ca2fc11 100644
Binary files a/public/images/emoji/apple/steam_locomotive.png and b/public/images/emoji/apple/steam_locomotive.png differ
diff --git a/public/images/emoji/apple/stew.png b/public/images/emoji/apple/stew.png
index fad912a0e5..a477629ecc 100644
Binary files a/public/images/emoji/apple/stew.png and b/public/images/emoji/apple/stew.png differ
diff --git a/public/images/emoji/apple/stop_button.png b/public/images/emoji/apple/stop_button.png
index 3d64cca051..8dc9fb47cb 100644
Binary files a/public/images/emoji/apple/stop_button.png and b/public/images/emoji/apple/stop_button.png differ
diff --git a/public/images/emoji/apple/stop_sign.png b/public/images/emoji/apple/stop_sign.png
index 917da78ce6..7dae52c03a 100644
Binary files a/public/images/emoji/apple/stop_sign.png and b/public/images/emoji/apple/stop_sign.png differ
diff --git a/public/images/emoji/apple/stopwatch.png b/public/images/emoji/apple/stopwatch.png
index 8661924183..031b2ca8ab 100644
Binary files a/public/images/emoji/apple/stopwatch.png and b/public/images/emoji/apple/stopwatch.png differ
diff --git a/public/images/emoji/apple/straight_ruler.png b/public/images/emoji/apple/straight_ruler.png
index 01fa924400..56ba9e7acc 100644
Binary files a/public/images/emoji/apple/straight_ruler.png and b/public/images/emoji/apple/straight_ruler.png differ
diff --git a/public/images/emoji/apple/strawberry.png b/public/images/emoji/apple/strawberry.png
index 2316a8bb4e..f08c711ac8 100644
Binary files a/public/images/emoji/apple/strawberry.png and b/public/images/emoji/apple/strawberry.png differ
diff --git a/public/images/emoji/apple/stuck_out_tongue.png b/public/images/emoji/apple/stuck_out_tongue.png
index baef9b5c0e..1da8147827 100644
Binary files a/public/images/emoji/apple/stuck_out_tongue.png and b/public/images/emoji/apple/stuck_out_tongue.png differ
diff --git a/public/images/emoji/apple/stuck_out_tongue_closed_eyes.png b/public/images/emoji/apple/stuck_out_tongue_closed_eyes.png
index a8ee962b46..d109de8b72 100644
Binary files a/public/images/emoji/apple/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/apple/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/apple/stuck_out_tongue_winking_eye.png b/public/images/emoji/apple/stuck_out_tongue_winking_eye.png
index e9a0f3c0a0..0e4d0f5113 100644
Binary files a/public/images/emoji/apple/stuck_out_tongue_winking_eye.png and b/public/images/emoji/apple/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/apple/studio_microphone.png b/public/images/emoji/apple/studio_microphone.png
index 6f6e1dc3c9..27dd16dc6e 100644
Binary files a/public/images/emoji/apple/studio_microphone.png and b/public/images/emoji/apple/studio_microphone.png differ
diff --git a/public/images/emoji/apple/stuffed_flatbread.png b/public/images/emoji/apple/stuffed_flatbread.png
index c6d649fad7..b0749b94c8 100644
Binary files a/public/images/emoji/apple/stuffed_flatbread.png and b/public/images/emoji/apple/stuffed_flatbread.png differ
diff --git a/public/images/emoji/apple/sudan.png b/public/images/emoji/apple/sudan.png
index 7444db0904..43e33de6a2 100644
Binary files a/public/images/emoji/apple/sudan.png and b/public/images/emoji/apple/sudan.png differ
diff --git a/public/images/emoji/apple/sun_behind_large_cloud.png b/public/images/emoji/apple/sun_behind_large_cloud.png
index 8632921373..04814464d2 100644
Binary files a/public/images/emoji/apple/sun_behind_large_cloud.png and b/public/images/emoji/apple/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/apple/sun_behind_rain_cloud.png b/public/images/emoji/apple/sun_behind_rain_cloud.png
index 16324c90c4..056c26538b 100644
Binary files a/public/images/emoji/apple/sun_behind_rain_cloud.png and b/public/images/emoji/apple/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/apple/sun_behind_small_cloud.png b/public/images/emoji/apple/sun_behind_small_cloud.png
index aaaf576a06..2aa7543872 100644
Binary files a/public/images/emoji/apple/sun_behind_small_cloud.png and b/public/images/emoji/apple/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/apple/sun_with_face.png b/public/images/emoji/apple/sun_with_face.png
index 22c7765db3..becd07c5f6 100644
Binary files a/public/images/emoji/apple/sun_with_face.png and b/public/images/emoji/apple/sun_with_face.png differ
diff --git a/public/images/emoji/apple/sunflower.png b/public/images/emoji/apple/sunflower.png
index 3a36efe239..c53ee72160 100644
Binary files a/public/images/emoji/apple/sunflower.png and b/public/images/emoji/apple/sunflower.png differ
diff --git a/public/images/emoji/apple/sunglasses.png b/public/images/emoji/apple/sunglasses.png
index 1c02e7737b..a3d5848f91 100644
Binary files a/public/images/emoji/apple/sunglasses.png and b/public/images/emoji/apple/sunglasses.png differ
diff --git a/public/images/emoji/apple/sunny.png b/public/images/emoji/apple/sunny.png
index c19f975639..bf75656937 100644
Binary files a/public/images/emoji/apple/sunny.png and b/public/images/emoji/apple/sunny.png differ
diff --git a/public/images/emoji/apple/sunrise.png b/public/images/emoji/apple/sunrise.png
index b66b8e5567..6bd1c42935 100644
Binary files a/public/images/emoji/apple/sunrise.png and b/public/images/emoji/apple/sunrise.png differ
diff --git a/public/images/emoji/apple/sunrise_over_mountains.png b/public/images/emoji/apple/sunrise_over_mountains.png
index d6cdfd3680..b2b084d39a 100644
Binary files a/public/images/emoji/apple/sunrise_over_mountains.png and b/public/images/emoji/apple/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/apple/surfer.png b/public/images/emoji/apple/surfer.png
index 476e43df4e..f204fcf451 100644
Binary files a/public/images/emoji/apple/surfer.png and b/public/images/emoji/apple/surfer.png differ
diff --git a/public/images/emoji/apple/surfer/2.png b/public/images/emoji/apple/surfer/2.png
index a0482f4819..3d956c2b76 100644
Binary files a/public/images/emoji/apple/surfer/2.png and b/public/images/emoji/apple/surfer/2.png differ
diff --git a/public/images/emoji/apple/surfer/3.png b/public/images/emoji/apple/surfer/3.png
index e4e3fe4bd3..e0707825d3 100644
Binary files a/public/images/emoji/apple/surfer/3.png and b/public/images/emoji/apple/surfer/3.png differ
diff --git a/public/images/emoji/apple/surfer/4.png b/public/images/emoji/apple/surfer/4.png
index 33401ea804..8ab4242ba8 100644
Binary files a/public/images/emoji/apple/surfer/4.png and b/public/images/emoji/apple/surfer/4.png differ
diff --git a/public/images/emoji/apple/surfer/5.png b/public/images/emoji/apple/surfer/5.png
index a565a32f31..97df837699 100644
Binary files a/public/images/emoji/apple/surfer/5.png and b/public/images/emoji/apple/surfer/5.png differ
diff --git a/public/images/emoji/apple/surfer/6.png b/public/images/emoji/apple/surfer/6.png
index 560070c2a1..63b99c18f0 100644
Binary files a/public/images/emoji/apple/surfer/6.png and b/public/images/emoji/apple/surfer/6.png differ
diff --git a/public/images/emoji/apple/surfing_man.png b/public/images/emoji/apple/surfing_man.png
index 476e43df4e..f204fcf451 100644
Binary files a/public/images/emoji/apple/surfing_man.png and b/public/images/emoji/apple/surfing_man.png differ
diff --git a/public/images/emoji/apple/surfing_man/2.png b/public/images/emoji/apple/surfing_man/2.png
index a0482f4819..3d956c2b76 100644
Binary files a/public/images/emoji/apple/surfing_man/2.png and b/public/images/emoji/apple/surfing_man/2.png differ
diff --git a/public/images/emoji/apple/surfing_man/3.png b/public/images/emoji/apple/surfing_man/3.png
index e4e3fe4bd3..e0707825d3 100644
Binary files a/public/images/emoji/apple/surfing_man/3.png and b/public/images/emoji/apple/surfing_man/3.png differ
diff --git a/public/images/emoji/apple/surfing_man/4.png b/public/images/emoji/apple/surfing_man/4.png
index 33401ea804..8ab4242ba8 100644
Binary files a/public/images/emoji/apple/surfing_man/4.png and b/public/images/emoji/apple/surfing_man/4.png differ
diff --git a/public/images/emoji/apple/surfing_man/5.png b/public/images/emoji/apple/surfing_man/5.png
index a565a32f31..97df837699 100644
Binary files a/public/images/emoji/apple/surfing_man/5.png and b/public/images/emoji/apple/surfing_man/5.png differ
diff --git a/public/images/emoji/apple/surfing_man/6.png b/public/images/emoji/apple/surfing_man/6.png
index 560070c2a1..63b99c18f0 100644
Binary files a/public/images/emoji/apple/surfing_man/6.png and b/public/images/emoji/apple/surfing_man/6.png differ
diff --git a/public/images/emoji/apple/surfing_woman.png b/public/images/emoji/apple/surfing_woman.png
index 2b4606fe7c..9cf181c9d0 100644
Binary files a/public/images/emoji/apple/surfing_woman.png and b/public/images/emoji/apple/surfing_woman.png differ
diff --git a/public/images/emoji/apple/surfing_woman/2.png b/public/images/emoji/apple/surfing_woman/2.png
index 8065c6f666..13cfc202a1 100644
Binary files a/public/images/emoji/apple/surfing_woman/2.png and b/public/images/emoji/apple/surfing_woman/2.png differ
diff --git a/public/images/emoji/apple/surfing_woman/3.png b/public/images/emoji/apple/surfing_woman/3.png
index 6a94c33b27..30ec0d971f 100644
Binary files a/public/images/emoji/apple/surfing_woman/3.png and b/public/images/emoji/apple/surfing_woman/3.png differ
diff --git a/public/images/emoji/apple/surfing_woman/4.png b/public/images/emoji/apple/surfing_woman/4.png
index 20388425a2..a06199a068 100644
Binary files a/public/images/emoji/apple/surfing_woman/4.png and b/public/images/emoji/apple/surfing_woman/4.png differ
diff --git a/public/images/emoji/apple/surfing_woman/5.png b/public/images/emoji/apple/surfing_woman/5.png
index b89c8b8b2d..ce8637bba2 100644
Binary files a/public/images/emoji/apple/surfing_woman/5.png and b/public/images/emoji/apple/surfing_woman/5.png differ
diff --git a/public/images/emoji/apple/surfing_woman/6.png b/public/images/emoji/apple/surfing_woman/6.png
index 8cdf1ee6f9..a744d4baa1 100644
Binary files a/public/images/emoji/apple/surfing_woman/6.png and b/public/images/emoji/apple/surfing_woman/6.png differ
diff --git a/public/images/emoji/apple/suriname.png b/public/images/emoji/apple/suriname.png
index 5d733dba9b..0ddb77c7d2 100644
Binary files a/public/images/emoji/apple/suriname.png and b/public/images/emoji/apple/suriname.png differ
diff --git a/public/images/emoji/apple/sushi.png b/public/images/emoji/apple/sushi.png
index 90c513ca69..91dd6423f0 100644
Binary files a/public/images/emoji/apple/sushi.png and b/public/images/emoji/apple/sushi.png differ
diff --git a/public/images/emoji/apple/suspension_railway.png b/public/images/emoji/apple/suspension_railway.png
index 1fb5eaac10..0db52f3b0f 100644
Binary files a/public/images/emoji/apple/suspension_railway.png and b/public/images/emoji/apple/suspension_railway.png differ
diff --git a/public/images/emoji/apple/svalbard_and_jan_mayen.png b/public/images/emoji/apple/svalbard_and_jan_mayen.png
index 5827a3d376..4bb670001a 100644
Binary files a/public/images/emoji/apple/svalbard_and_jan_mayen.png and b/public/images/emoji/apple/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/apple/swaziland.png b/public/images/emoji/apple/swaziland.png
index 40b243ee99..ebea3045e0 100644
Binary files a/public/images/emoji/apple/swaziland.png and b/public/images/emoji/apple/swaziland.png differ
diff --git a/public/images/emoji/apple/sweat.png b/public/images/emoji/apple/sweat.png
index 755dfe2ce2..9bdf8899bb 100644
Binary files a/public/images/emoji/apple/sweat.png and b/public/images/emoji/apple/sweat.png differ
diff --git a/public/images/emoji/apple/sweat_drops.png b/public/images/emoji/apple/sweat_drops.png
index 285e5876ef..076fe6609b 100644
Binary files a/public/images/emoji/apple/sweat_drops.png and b/public/images/emoji/apple/sweat_drops.png differ
diff --git a/public/images/emoji/apple/sweat_smile.png b/public/images/emoji/apple/sweat_smile.png
index 586fcdb381..2cd17f455c 100644
Binary files a/public/images/emoji/apple/sweat_smile.png and b/public/images/emoji/apple/sweat_smile.png differ
diff --git a/public/images/emoji/apple/sweden.png b/public/images/emoji/apple/sweden.png
index 2c266bf169..303535379a 100644
Binary files a/public/images/emoji/apple/sweden.png and b/public/images/emoji/apple/sweden.png differ
diff --git a/public/images/emoji/apple/sweet_potato.png b/public/images/emoji/apple/sweet_potato.png
index c793a324c8..0c1ec6a00a 100644
Binary files a/public/images/emoji/apple/sweet_potato.png and b/public/images/emoji/apple/sweet_potato.png differ
diff --git a/public/images/emoji/apple/swimmer.png b/public/images/emoji/apple/swimmer.png
index 152e42f485..c3dab6e162 100644
Binary files a/public/images/emoji/apple/swimmer.png and b/public/images/emoji/apple/swimmer.png differ
diff --git a/public/images/emoji/apple/swimmer/2.png b/public/images/emoji/apple/swimmer/2.png
index f5f60e3018..9c127e71fb 100644
Binary files a/public/images/emoji/apple/swimmer/2.png and b/public/images/emoji/apple/swimmer/2.png differ
diff --git a/public/images/emoji/apple/swimmer/3.png b/public/images/emoji/apple/swimmer/3.png
index 488222d221..9dc1e47290 100644
Binary files a/public/images/emoji/apple/swimmer/3.png and b/public/images/emoji/apple/swimmer/3.png differ
diff --git a/public/images/emoji/apple/swimmer/4.png b/public/images/emoji/apple/swimmer/4.png
index eb2bcd180a..31f9d728ea 100644
Binary files a/public/images/emoji/apple/swimmer/4.png and b/public/images/emoji/apple/swimmer/4.png differ
diff --git a/public/images/emoji/apple/swimmer/5.png b/public/images/emoji/apple/swimmer/5.png
index fc0f52b9da..1048ef8cc3 100644
Binary files a/public/images/emoji/apple/swimmer/5.png and b/public/images/emoji/apple/swimmer/5.png differ
diff --git a/public/images/emoji/apple/swimmer/6.png b/public/images/emoji/apple/swimmer/6.png
index 2a48fdc951..a227893fc8 100644
Binary files a/public/images/emoji/apple/swimmer/6.png and b/public/images/emoji/apple/swimmer/6.png differ
diff --git a/public/images/emoji/apple/swimming_man.png b/public/images/emoji/apple/swimming_man.png
index 152e42f485..c3dab6e162 100644
Binary files a/public/images/emoji/apple/swimming_man.png and b/public/images/emoji/apple/swimming_man.png differ
diff --git a/public/images/emoji/apple/swimming_man/2.png b/public/images/emoji/apple/swimming_man/2.png
index f5f60e3018..9c127e71fb 100644
Binary files a/public/images/emoji/apple/swimming_man/2.png and b/public/images/emoji/apple/swimming_man/2.png differ
diff --git a/public/images/emoji/apple/swimming_man/3.png b/public/images/emoji/apple/swimming_man/3.png
index 488222d221..9dc1e47290 100644
Binary files a/public/images/emoji/apple/swimming_man/3.png and b/public/images/emoji/apple/swimming_man/3.png differ
diff --git a/public/images/emoji/apple/swimming_man/4.png b/public/images/emoji/apple/swimming_man/4.png
index eb2bcd180a..31f9d728ea 100644
Binary files a/public/images/emoji/apple/swimming_man/4.png and b/public/images/emoji/apple/swimming_man/4.png differ
diff --git a/public/images/emoji/apple/swimming_man/5.png b/public/images/emoji/apple/swimming_man/5.png
index fc0f52b9da..1048ef8cc3 100644
Binary files a/public/images/emoji/apple/swimming_man/5.png and b/public/images/emoji/apple/swimming_man/5.png differ
diff --git a/public/images/emoji/apple/swimming_man/6.png b/public/images/emoji/apple/swimming_man/6.png
index 2a48fdc951..a227893fc8 100644
Binary files a/public/images/emoji/apple/swimming_man/6.png and b/public/images/emoji/apple/swimming_man/6.png differ
diff --git a/public/images/emoji/apple/swimming_woman.png b/public/images/emoji/apple/swimming_woman.png
index c8439064e4..3af93f6376 100644
Binary files a/public/images/emoji/apple/swimming_woman.png and b/public/images/emoji/apple/swimming_woman.png differ
diff --git a/public/images/emoji/apple/swimming_woman/2.png b/public/images/emoji/apple/swimming_woman/2.png
index 357daa34c1..2941b6a684 100644
Binary files a/public/images/emoji/apple/swimming_woman/2.png and b/public/images/emoji/apple/swimming_woman/2.png differ
diff --git a/public/images/emoji/apple/swimming_woman/3.png b/public/images/emoji/apple/swimming_woman/3.png
index 0d831c336f..d598195ad0 100644
Binary files a/public/images/emoji/apple/swimming_woman/3.png and b/public/images/emoji/apple/swimming_woman/3.png differ
diff --git a/public/images/emoji/apple/swimming_woman/4.png b/public/images/emoji/apple/swimming_woman/4.png
index 2fbc28284b..38c517735b 100644
Binary files a/public/images/emoji/apple/swimming_woman/4.png and b/public/images/emoji/apple/swimming_woman/4.png differ
diff --git a/public/images/emoji/apple/swimming_woman/5.png b/public/images/emoji/apple/swimming_woman/5.png
index 5523af7553..82187ee896 100644
Binary files a/public/images/emoji/apple/swimming_woman/5.png and b/public/images/emoji/apple/swimming_woman/5.png differ
diff --git a/public/images/emoji/apple/swimming_woman/6.png b/public/images/emoji/apple/swimming_woman/6.png
index 584b88b78d..a51f122c59 100644
Binary files a/public/images/emoji/apple/swimming_woman/6.png and b/public/images/emoji/apple/swimming_woman/6.png differ
diff --git a/public/images/emoji/apple/switzerland.png b/public/images/emoji/apple/switzerland.png
index 50ccd594b8..f0341e5251 100644
Binary files a/public/images/emoji/apple/switzerland.png and b/public/images/emoji/apple/switzerland.png differ
diff --git a/public/images/emoji/apple/symbols.png b/public/images/emoji/apple/symbols.png
index e2849c52e1..74988567fb 100644
Binary files a/public/images/emoji/apple/symbols.png and b/public/images/emoji/apple/symbols.png differ
diff --git a/public/images/emoji/apple/synagogue.png b/public/images/emoji/apple/synagogue.png
index 5ceaf0f630..08800e358c 100644
Binary files a/public/images/emoji/apple/synagogue.png and b/public/images/emoji/apple/synagogue.png differ
diff --git a/public/images/emoji/apple/syria.png b/public/images/emoji/apple/syria.png
index f14db54b40..43a519ecee 100644
Binary files a/public/images/emoji/apple/syria.png and b/public/images/emoji/apple/syria.png differ
diff --git a/public/images/emoji/apple/syringe.png b/public/images/emoji/apple/syringe.png
index aeea9520a4..8567ea2cd1 100644
Binary files a/public/images/emoji/apple/syringe.png and b/public/images/emoji/apple/syringe.png differ
diff --git a/public/images/emoji/apple/t_rex.png b/public/images/emoji/apple/t_rex.png
index d8811a5638..aaf3e6a756 100644
Binary files a/public/images/emoji/apple/t_rex.png and b/public/images/emoji/apple/t_rex.png differ
diff --git a/public/images/emoji/apple/table_tennis.png b/public/images/emoji/apple/table_tennis.png
index 26d40fa920..9aa5e0129e 100644
Binary files a/public/images/emoji/apple/table_tennis.png and b/public/images/emoji/apple/table_tennis.png differ
diff --git a/public/images/emoji/apple/taco.png b/public/images/emoji/apple/taco.png
index c4adea0e0a..8882b3feed 100644
Binary files a/public/images/emoji/apple/taco.png and b/public/images/emoji/apple/taco.png differ
diff --git a/public/images/emoji/apple/tada.png b/public/images/emoji/apple/tada.png
index f08377f394..e2db2f6e24 100644
Binary files a/public/images/emoji/apple/tada.png and b/public/images/emoji/apple/tada.png differ
diff --git a/public/images/emoji/apple/taiwan.png b/public/images/emoji/apple/taiwan.png
index 70d71de7e6..c255ef1364 100644
Binary files a/public/images/emoji/apple/taiwan.png and b/public/images/emoji/apple/taiwan.png differ
diff --git a/public/images/emoji/apple/tajikistan.png b/public/images/emoji/apple/tajikistan.png
index 89eb0e30ee..78557aa28a 100644
Binary files a/public/images/emoji/apple/tajikistan.png and b/public/images/emoji/apple/tajikistan.png differ
diff --git a/public/images/emoji/apple/takeout_box.png b/public/images/emoji/apple/takeout_box.png
index 08aa6a4843..f0f6f416f3 100644
Binary files a/public/images/emoji/apple/takeout_box.png and b/public/images/emoji/apple/takeout_box.png differ
diff --git a/public/images/emoji/apple/tanabata_tree.png b/public/images/emoji/apple/tanabata_tree.png
index fd1c87e338..620e621840 100644
Binary files a/public/images/emoji/apple/tanabata_tree.png and b/public/images/emoji/apple/tanabata_tree.png differ
diff --git a/public/images/emoji/apple/tangerine.png b/public/images/emoji/apple/tangerine.png
index e4ddd1955f..aeb7da8910 100644
Binary files a/public/images/emoji/apple/tangerine.png and b/public/images/emoji/apple/tangerine.png differ
diff --git a/public/images/emoji/apple/tanzania.png b/public/images/emoji/apple/tanzania.png
index 3cd7aba2ec..f93aeb0ca6 100644
Binary files a/public/images/emoji/apple/tanzania.png and b/public/images/emoji/apple/tanzania.png differ
diff --git a/public/images/emoji/apple/taurus.png b/public/images/emoji/apple/taurus.png
index a57184d9f3..1f751b179a 100644
Binary files a/public/images/emoji/apple/taurus.png and b/public/images/emoji/apple/taurus.png differ
diff --git a/public/images/emoji/apple/taxi.png b/public/images/emoji/apple/taxi.png
index 99fc7add6e..26b91b9fc9 100644
Binary files a/public/images/emoji/apple/taxi.png and b/public/images/emoji/apple/taxi.png differ
diff --git a/public/images/emoji/apple/tea.png b/public/images/emoji/apple/tea.png
index a2fafef7f9..48295ea02e 100644
Binary files a/public/images/emoji/apple/tea.png and b/public/images/emoji/apple/tea.png differ
diff --git a/public/images/emoji/apple/telephone.png b/public/images/emoji/apple/telephone.png
index 60538e8770..7087cad8c1 100644
Binary files a/public/images/emoji/apple/telephone.png and b/public/images/emoji/apple/telephone.png differ
diff --git a/public/images/emoji/apple/telephone_receiver.png b/public/images/emoji/apple/telephone_receiver.png
index a6128b5315..0b176b51d7 100644
Binary files a/public/images/emoji/apple/telephone_receiver.png and b/public/images/emoji/apple/telephone_receiver.png differ
diff --git a/public/images/emoji/apple/telescope.png b/public/images/emoji/apple/telescope.png
index 026a270cc1..233c63b23c 100644
Binary files a/public/images/emoji/apple/telescope.png and b/public/images/emoji/apple/telescope.png differ
diff --git a/public/images/emoji/apple/ten.png b/public/images/emoji/apple/ten.png
index 59d013decc..e39aaa77bd 100644
Binary files a/public/images/emoji/apple/ten.png and b/public/images/emoji/apple/ten.png differ
diff --git a/public/images/emoji/apple/tennis.png b/public/images/emoji/apple/tennis.png
index 32f01c115c..2f29e5311e 100644
Binary files a/public/images/emoji/apple/tennis.png and b/public/images/emoji/apple/tennis.png differ
diff --git a/public/images/emoji/apple/tent.png b/public/images/emoji/apple/tent.png
index 163a5621a7..54486c6b88 100644
Binary files a/public/images/emoji/apple/tent.png and b/public/images/emoji/apple/tent.png differ
diff --git a/public/images/emoji/apple/thailand.png b/public/images/emoji/apple/thailand.png
index f6e7620ff9..382d43d6f4 100644
Binary files a/public/images/emoji/apple/thailand.png and b/public/images/emoji/apple/thailand.png differ
diff --git a/public/images/emoji/apple/thermometer.png b/public/images/emoji/apple/thermometer.png
index a807d4cac4..3ba15a8377 100644
Binary files a/public/images/emoji/apple/thermometer.png and b/public/images/emoji/apple/thermometer.png differ
diff --git a/public/images/emoji/apple/thermometer_face.png b/public/images/emoji/apple/thermometer_face.png
index bc7076dfa3..1ed6dd07f8 100644
Binary files a/public/images/emoji/apple/thermometer_face.png and b/public/images/emoji/apple/thermometer_face.png differ
diff --git a/public/images/emoji/apple/thinking.png b/public/images/emoji/apple/thinking.png
index df9001d067..7d1e312dbd 100644
Binary files a/public/images/emoji/apple/thinking.png and b/public/images/emoji/apple/thinking.png differ
diff --git a/public/images/emoji/apple/thinking_face.png b/public/images/emoji/apple/thinking_face.png
index df9001d067..7d1e312dbd 100644
Binary files a/public/images/emoji/apple/thinking_face.png and b/public/images/emoji/apple/thinking_face.png differ
diff --git a/public/images/emoji/apple/thought_balloon.png b/public/images/emoji/apple/thought_balloon.png
index 1fddc6e582..bd2b5ea7c5 100644
Binary files a/public/images/emoji/apple/thought_balloon.png and b/public/images/emoji/apple/thought_balloon.png differ
diff --git a/public/images/emoji/apple/three.png b/public/images/emoji/apple/three.png
index 2b641df50a..f7c1ffa143 100644
Binary files a/public/images/emoji/apple/three.png and b/public/images/emoji/apple/three.png differ
diff --git a/public/images/emoji/apple/three_button_mouse.png b/public/images/emoji/apple/three_button_mouse.png
index 3899171edc..60317c6d44 100644
Binary files a/public/images/emoji/apple/three_button_mouse.png and b/public/images/emoji/apple/three_button_mouse.png differ
diff --git a/public/images/emoji/apple/thumbsdown.png b/public/images/emoji/apple/thumbsdown.png
index 74440b69c7..91955b2947 100644
Binary files a/public/images/emoji/apple/thumbsdown.png and b/public/images/emoji/apple/thumbsdown.png differ
diff --git a/public/images/emoji/apple/thumbsdown/2.png b/public/images/emoji/apple/thumbsdown/2.png
index 930faaf2a5..3e9b0c991b 100644
Binary files a/public/images/emoji/apple/thumbsdown/2.png and b/public/images/emoji/apple/thumbsdown/2.png differ
diff --git a/public/images/emoji/apple/thumbsdown/3.png b/public/images/emoji/apple/thumbsdown/3.png
index 29ebfe1eef..519a52c81e 100644
Binary files a/public/images/emoji/apple/thumbsdown/3.png and b/public/images/emoji/apple/thumbsdown/3.png differ
diff --git a/public/images/emoji/apple/thumbsdown/4.png b/public/images/emoji/apple/thumbsdown/4.png
index 0b46e9862c..09a1d90204 100644
Binary files a/public/images/emoji/apple/thumbsdown/4.png and b/public/images/emoji/apple/thumbsdown/4.png differ
diff --git a/public/images/emoji/apple/thumbsdown/5.png b/public/images/emoji/apple/thumbsdown/5.png
index 5ee7db294b..2a60b580c6 100644
Binary files a/public/images/emoji/apple/thumbsdown/5.png and b/public/images/emoji/apple/thumbsdown/5.png differ
diff --git a/public/images/emoji/apple/thumbsdown/6.png b/public/images/emoji/apple/thumbsdown/6.png
index edf1f180c8..169eee97d8 100644
Binary files a/public/images/emoji/apple/thumbsdown/6.png and b/public/images/emoji/apple/thumbsdown/6.png differ
diff --git a/public/images/emoji/apple/thumbsup.png b/public/images/emoji/apple/thumbsup.png
index 5df9bb8540..198f27c1c7 100644
Binary files a/public/images/emoji/apple/thumbsup.png and b/public/images/emoji/apple/thumbsup.png differ
diff --git a/public/images/emoji/apple/thumbsup/2.png b/public/images/emoji/apple/thumbsup/2.png
index f33655e094..59b976df91 100644
Binary files a/public/images/emoji/apple/thumbsup/2.png and b/public/images/emoji/apple/thumbsup/2.png differ
diff --git a/public/images/emoji/apple/thumbsup/3.png b/public/images/emoji/apple/thumbsup/3.png
index e611468260..70e9792bce 100644
Binary files a/public/images/emoji/apple/thumbsup/3.png and b/public/images/emoji/apple/thumbsup/3.png differ
diff --git a/public/images/emoji/apple/thumbsup/4.png b/public/images/emoji/apple/thumbsup/4.png
index c07e81b31e..4fe1614a80 100644
Binary files a/public/images/emoji/apple/thumbsup/4.png and b/public/images/emoji/apple/thumbsup/4.png differ
diff --git a/public/images/emoji/apple/thumbsup/5.png b/public/images/emoji/apple/thumbsup/5.png
index c04a6c2bd8..42b21c8b95 100644
Binary files a/public/images/emoji/apple/thumbsup/5.png and b/public/images/emoji/apple/thumbsup/5.png differ
diff --git a/public/images/emoji/apple/thumbsup/6.png b/public/images/emoji/apple/thumbsup/6.png
index 8fbc7fd36b..71ef363e83 100644
Binary files a/public/images/emoji/apple/thumbsup/6.png and b/public/images/emoji/apple/thumbsup/6.png differ
diff --git a/public/images/emoji/apple/thunder_cloud_and_rain.png b/public/images/emoji/apple/thunder_cloud_and_rain.png
index 8f44a7726e..34aec3c66c 100644
Binary files a/public/images/emoji/apple/thunder_cloud_and_rain.png and b/public/images/emoji/apple/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/apple/thunder_cloud_rain.png b/public/images/emoji/apple/thunder_cloud_rain.png
index 8f44a7726e..34aec3c66c 100644
Binary files a/public/images/emoji/apple/thunder_cloud_rain.png and b/public/images/emoji/apple/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/apple/ticket.png b/public/images/emoji/apple/ticket.png
index 73a7b007c2..e4cb3ec34e 100644
Binary files a/public/images/emoji/apple/ticket.png and b/public/images/emoji/apple/ticket.png differ
diff --git a/public/images/emoji/apple/tickets.png b/public/images/emoji/apple/tickets.png
index fd35e2a4d0..f842a44caa 100644
Binary files a/public/images/emoji/apple/tickets.png and b/public/images/emoji/apple/tickets.png differ
diff --git a/public/images/emoji/apple/tiger.png b/public/images/emoji/apple/tiger.png
index d9b0fbb758..68e6567e5d 100644
Binary files a/public/images/emoji/apple/tiger.png and b/public/images/emoji/apple/tiger.png differ
diff --git a/public/images/emoji/apple/tiger2.png b/public/images/emoji/apple/tiger2.png
index 080125274a..32f68b1da4 100644
Binary files a/public/images/emoji/apple/tiger2.png and b/public/images/emoji/apple/tiger2.png differ
diff --git a/public/images/emoji/apple/timer.png b/public/images/emoji/apple/timer.png
index 306fb222cf..669ff79c0e 100644
Binary files a/public/images/emoji/apple/timer.png and b/public/images/emoji/apple/timer.png differ
diff --git a/public/images/emoji/apple/timer_clock.png b/public/images/emoji/apple/timer_clock.png
index 306fb222cf..669ff79c0e 100644
Binary files a/public/images/emoji/apple/timer_clock.png and b/public/images/emoji/apple/timer_clock.png differ
diff --git a/public/images/emoji/apple/timor_leste.png b/public/images/emoji/apple/timor_leste.png
index 25fdf935ed..d968a1db69 100644
Binary files a/public/images/emoji/apple/timor_leste.png and b/public/images/emoji/apple/timor_leste.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man.png b/public/images/emoji/apple/tipping_hand_man.png
index 6a4098a9d3..d765e63d90 100644
Binary files a/public/images/emoji/apple/tipping_hand_man.png and b/public/images/emoji/apple/tipping_hand_man.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/2.png b/public/images/emoji/apple/tipping_hand_man/2.png
index 1dd416fb2f..1ef08839e2 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/2.png and b/public/images/emoji/apple/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/3.png b/public/images/emoji/apple/tipping_hand_man/3.png
index f97238add3..85269e1e8b 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/3.png and b/public/images/emoji/apple/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/4.png b/public/images/emoji/apple/tipping_hand_man/4.png
index 4e8505eb57..3fbc5d7cdb 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/4.png and b/public/images/emoji/apple/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/5.png b/public/images/emoji/apple/tipping_hand_man/5.png
index ee1174f3b4..a6bb68d610 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/5.png and b/public/images/emoji/apple/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/6.png b/public/images/emoji/apple/tipping_hand_man/6.png
index 2198ef8ba1..b968dc5310 100644
Binary files a/public/images/emoji/apple/tipping_hand_man/6.png and b/public/images/emoji/apple/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman.png b/public/images/emoji/apple/tipping_hand_woman.png
index 4424423fa3..d68910b6f4 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman.png and b/public/images/emoji/apple/tipping_hand_woman.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/2.png b/public/images/emoji/apple/tipping_hand_woman/2.png
index 115198e563..b1001a29fd 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/2.png and b/public/images/emoji/apple/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/3.png b/public/images/emoji/apple/tipping_hand_woman/3.png
index d0593f87fb..df2f213ba1 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/3.png and b/public/images/emoji/apple/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/4.png b/public/images/emoji/apple/tipping_hand_woman/4.png
index a2f5d0294f..b8529aa2a7 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/4.png and b/public/images/emoji/apple/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/5.png b/public/images/emoji/apple/tipping_hand_woman/5.png
index 63d9338057..4f36a7083a 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/5.png and b/public/images/emoji/apple/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/6.png b/public/images/emoji/apple/tipping_hand_woman/6.png
index 30b2bd891a..1cc974bd59 100644
Binary files a/public/images/emoji/apple/tipping_hand_woman/6.png and b/public/images/emoji/apple/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/apple/tired_face.png b/public/images/emoji/apple/tired_face.png
index f1806a26fd..81b9f71eac 100644
Binary files a/public/images/emoji/apple/tired_face.png and b/public/images/emoji/apple/tired_face.png differ
diff --git a/public/images/emoji/apple/tm.png b/public/images/emoji/apple/tm.png
index 03952783bb..8526a1ca23 100644
Binary files a/public/images/emoji/apple/tm.png and b/public/images/emoji/apple/tm.png differ
diff --git a/public/images/emoji/apple/togo.png b/public/images/emoji/apple/togo.png
index 6dc60ec10d..f273ce502b 100644
Binary files a/public/images/emoji/apple/togo.png and b/public/images/emoji/apple/togo.png differ
diff --git a/public/images/emoji/apple/toilet.png b/public/images/emoji/apple/toilet.png
index ab7e58aa72..a1aa52afd7 100644
Binary files a/public/images/emoji/apple/toilet.png and b/public/images/emoji/apple/toilet.png differ
diff --git a/public/images/emoji/apple/tokelau.png b/public/images/emoji/apple/tokelau.png
index 18cbb256ea..1f4079e2d6 100644
Binary files a/public/images/emoji/apple/tokelau.png and b/public/images/emoji/apple/tokelau.png differ
diff --git a/public/images/emoji/apple/tokyo_tower.png b/public/images/emoji/apple/tokyo_tower.png
index 3c3f33124c..44e2008fc4 100644
Binary files a/public/images/emoji/apple/tokyo_tower.png and b/public/images/emoji/apple/tokyo_tower.png differ
diff --git a/public/images/emoji/apple/tomato.png b/public/images/emoji/apple/tomato.png
index 0b100a4639..693fb3729e 100644
Binary files a/public/images/emoji/apple/tomato.png and b/public/images/emoji/apple/tomato.png differ
diff --git a/public/images/emoji/apple/tonga.png b/public/images/emoji/apple/tonga.png
index d7e19e4a11..47332b0102 100644
Binary files a/public/images/emoji/apple/tonga.png and b/public/images/emoji/apple/tonga.png differ
diff --git a/public/images/emoji/apple/tongue.png b/public/images/emoji/apple/tongue.png
index 0f5e837862..7b5724c3f3 100644
Binary files a/public/images/emoji/apple/tongue.png and b/public/images/emoji/apple/tongue.png differ
diff --git a/public/images/emoji/apple/tools.png b/public/images/emoji/apple/tools.png
index daef26722c..2d470b412d 100644
Binary files a/public/images/emoji/apple/tools.png and b/public/images/emoji/apple/tools.png differ
diff --git a/public/images/emoji/apple/top.png b/public/images/emoji/apple/top.png
index 5a64e2a0b5..a52e8d931f 100644
Binary files a/public/images/emoji/apple/top.png and b/public/images/emoji/apple/top.png differ
diff --git a/public/images/emoji/apple/tophat.png b/public/images/emoji/apple/tophat.png
index 4e7fbd6852..7607ed73e0 100644
Binary files a/public/images/emoji/apple/tophat.png and b/public/images/emoji/apple/tophat.png differ
diff --git a/public/images/emoji/apple/tornado.png b/public/images/emoji/apple/tornado.png
index 0d3985f119..8782d602e8 100644
Binary files a/public/images/emoji/apple/tornado.png and b/public/images/emoji/apple/tornado.png differ
diff --git a/public/images/emoji/apple/tr.png b/public/images/emoji/apple/tr.png
index 00411e5a49..cf8a04e621 100644
Binary files a/public/images/emoji/apple/tr.png and b/public/images/emoji/apple/tr.png differ
diff --git a/public/images/emoji/apple/track_next.png b/public/images/emoji/apple/track_next.png
index c6c645c86d..5f6efec485 100644
Binary files a/public/images/emoji/apple/track_next.png and b/public/images/emoji/apple/track_next.png differ
diff --git a/public/images/emoji/apple/track_previous.png b/public/images/emoji/apple/track_previous.png
index 881bf59b29..1399a94650 100644
Binary files a/public/images/emoji/apple/track_previous.png and b/public/images/emoji/apple/track_previous.png differ
diff --git a/public/images/emoji/apple/trackball.png b/public/images/emoji/apple/trackball.png
index 2801e64c8d..4f4f5a79b6 100644
Binary files a/public/images/emoji/apple/trackball.png and b/public/images/emoji/apple/trackball.png differ
diff --git a/public/images/emoji/apple/tractor.png b/public/images/emoji/apple/tractor.png
index fd57e2bf3b..f513451ac8 100644
Binary files a/public/images/emoji/apple/tractor.png and b/public/images/emoji/apple/tractor.png differ
diff --git a/public/images/emoji/apple/traffic_light.png b/public/images/emoji/apple/traffic_light.png
index 80519d2e62..f9c7169122 100644
Binary files a/public/images/emoji/apple/traffic_light.png and b/public/images/emoji/apple/traffic_light.png differ
diff --git a/public/images/emoji/apple/train.png b/public/images/emoji/apple/train.png
index ee6a95d50a..ea5b831ca1 100644
Binary files a/public/images/emoji/apple/train.png and b/public/images/emoji/apple/train.png differ
diff --git a/public/images/emoji/apple/train2.png b/public/images/emoji/apple/train2.png
index fe2107cc7e..7044c2f923 100644
Binary files a/public/images/emoji/apple/train2.png and b/public/images/emoji/apple/train2.png differ
diff --git a/public/images/emoji/apple/tram.png b/public/images/emoji/apple/tram.png
index 1d5bcef502..e7f4270181 100644
Binary files a/public/images/emoji/apple/tram.png and b/public/images/emoji/apple/tram.png differ
diff --git a/public/images/emoji/apple/triangular_flag_on_post.png b/public/images/emoji/apple/triangular_flag_on_post.png
index ec0d3dfd8c..a4d63d348a 100644
Binary files a/public/images/emoji/apple/triangular_flag_on_post.png and b/public/images/emoji/apple/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/apple/triangular_ruler.png b/public/images/emoji/apple/triangular_ruler.png
index 5cb2b5d500..b5d4d5dd5e 100644
Binary files a/public/images/emoji/apple/triangular_ruler.png and b/public/images/emoji/apple/triangular_ruler.png differ
diff --git a/public/images/emoji/apple/trident.png b/public/images/emoji/apple/trident.png
index b1abb2d01f..c4853e663b 100644
Binary files a/public/images/emoji/apple/trident.png and b/public/images/emoji/apple/trident.png differ
diff --git a/public/images/emoji/apple/trinidad_tobago.png b/public/images/emoji/apple/trinidad_tobago.png
index e7fa4c6183..0c6f42757b 100644
Binary files a/public/images/emoji/apple/trinidad_tobago.png and b/public/images/emoji/apple/trinidad_tobago.png differ
diff --git a/public/images/emoji/apple/tristan_da_cunha.png b/public/images/emoji/apple/tristan_da_cunha.png
index 694a0b8510..b16a1f26a7 100644
Binary files a/public/images/emoji/apple/tristan_da_cunha.png and b/public/images/emoji/apple/tristan_da_cunha.png differ
diff --git a/public/images/emoji/apple/triumph.png b/public/images/emoji/apple/triumph.png
index 6cd8030c4f..19afe1dbe4 100644
Binary files a/public/images/emoji/apple/triumph.png and b/public/images/emoji/apple/triumph.png differ
diff --git a/public/images/emoji/apple/trolleybus.png b/public/images/emoji/apple/trolleybus.png
index b0aea215bb..3917015d72 100644
Binary files a/public/images/emoji/apple/trolleybus.png and b/public/images/emoji/apple/trolleybus.png differ
diff --git a/public/images/emoji/apple/trophy.png b/public/images/emoji/apple/trophy.png
index f8a2286efe..4ca7e8c2b3 100644
Binary files a/public/images/emoji/apple/trophy.png and b/public/images/emoji/apple/trophy.png differ
diff --git a/public/images/emoji/apple/tropical_drink.png b/public/images/emoji/apple/tropical_drink.png
index af0543b461..f6ec3d650d 100644
Binary files a/public/images/emoji/apple/tropical_drink.png and b/public/images/emoji/apple/tropical_drink.png differ
diff --git a/public/images/emoji/apple/tropical_fish.png b/public/images/emoji/apple/tropical_fish.png
index 71d76b95de..2f3becd03f 100644
Binary files a/public/images/emoji/apple/tropical_fish.png and b/public/images/emoji/apple/tropical_fish.png differ
diff --git a/public/images/emoji/apple/truck.png b/public/images/emoji/apple/truck.png
index 1d507c6133..c438b39417 100644
Binary files a/public/images/emoji/apple/truck.png and b/public/images/emoji/apple/truck.png differ
diff --git a/public/images/emoji/apple/trumpet.png b/public/images/emoji/apple/trumpet.png
index a03fbba25f..97826e07a8 100644
Binary files a/public/images/emoji/apple/trumpet.png and b/public/images/emoji/apple/trumpet.png differ
diff --git a/public/images/emoji/apple/tshirt.png b/public/images/emoji/apple/tshirt.png
index 68a0867f0a..a975e92c06 100644
Binary files a/public/images/emoji/apple/tshirt.png and b/public/images/emoji/apple/tshirt.png differ
diff --git a/public/images/emoji/apple/tulip.png b/public/images/emoji/apple/tulip.png
index ef9742c6c1..1723692268 100644
Binary files a/public/images/emoji/apple/tulip.png and b/public/images/emoji/apple/tulip.png differ
diff --git a/public/images/emoji/apple/tumbler_glass.png b/public/images/emoji/apple/tumbler_glass.png
index b2663a8953..6ff13dfa2c 100644
Binary files a/public/images/emoji/apple/tumbler_glass.png and b/public/images/emoji/apple/tumbler_glass.png differ
diff --git a/public/images/emoji/apple/tunisia.png b/public/images/emoji/apple/tunisia.png
index e6e933b4fc..1873011df3 100644
Binary files a/public/images/emoji/apple/tunisia.png and b/public/images/emoji/apple/tunisia.png differ
diff --git a/public/images/emoji/apple/turkey.png b/public/images/emoji/apple/turkey.png
index 9d302e2f34..57664f27e9 100644
Binary files a/public/images/emoji/apple/turkey.png and b/public/images/emoji/apple/turkey.png differ
diff --git a/public/images/emoji/apple/turkmenistan.png b/public/images/emoji/apple/turkmenistan.png
index 96caa4ddf5..83bbf134d7 100644
Binary files a/public/images/emoji/apple/turkmenistan.png and b/public/images/emoji/apple/turkmenistan.png differ
diff --git a/public/images/emoji/apple/turks_caicos_islands.png b/public/images/emoji/apple/turks_caicos_islands.png
index 9cd6d02a4b..a28309278a 100644
Binary files a/public/images/emoji/apple/turks_caicos_islands.png and b/public/images/emoji/apple/turks_caicos_islands.png differ
diff --git a/public/images/emoji/apple/turtle.png b/public/images/emoji/apple/turtle.png
index ae80acb3f0..c43402c4b4 100644
Binary files a/public/images/emoji/apple/turtle.png and b/public/images/emoji/apple/turtle.png differ
diff --git a/public/images/emoji/apple/tuvalu.png b/public/images/emoji/apple/tuvalu.png
index 2f943390da..601dab7d46 100644
Binary files a/public/images/emoji/apple/tuvalu.png and b/public/images/emoji/apple/tuvalu.png differ
diff --git a/public/images/emoji/apple/tv.png b/public/images/emoji/apple/tv.png
index 629d8504c7..2b838a52cf 100644
Binary files a/public/images/emoji/apple/tv.png and b/public/images/emoji/apple/tv.png differ
diff --git a/public/images/emoji/apple/twisted_rightwards_arrows.png b/public/images/emoji/apple/twisted_rightwards_arrows.png
index 4d4b63a6aa..e5ef869e7e 100644
Binary files a/public/images/emoji/apple/twisted_rightwards_arrows.png and b/public/images/emoji/apple/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/apple/two.png b/public/images/emoji/apple/two.png
index 6740511b38..d5e9edc4e5 100644
Binary files a/public/images/emoji/apple/two.png and b/public/images/emoji/apple/two.png differ
diff --git a/public/images/emoji/apple/two_hearts.png b/public/images/emoji/apple/two_hearts.png
index 0854acf430..48552be99a 100644
Binary files a/public/images/emoji/apple/two_hearts.png and b/public/images/emoji/apple/two_hearts.png differ
diff --git a/public/images/emoji/apple/two_men_holding_hands.png b/public/images/emoji/apple/two_men_holding_hands.png
index ed684ce6cd..1b756d6f6e 100644
Binary files a/public/images/emoji/apple/two_men_holding_hands.png and b/public/images/emoji/apple/two_men_holding_hands.png differ
diff --git a/public/images/emoji/apple/two_women_holding_hands.png b/public/images/emoji/apple/two_women_holding_hands.png
index 6208271544..a0f2637f66 100644
Binary files a/public/images/emoji/apple/two_women_holding_hands.png and b/public/images/emoji/apple/two_women_holding_hands.png differ
diff --git a/public/images/emoji/apple/u5272.png b/public/images/emoji/apple/u5272.png
index 049665f4dd..26c8095798 100644
Binary files a/public/images/emoji/apple/u5272.png and b/public/images/emoji/apple/u5272.png differ
diff --git a/public/images/emoji/apple/u5408.png b/public/images/emoji/apple/u5408.png
index dd2e396699..85b3b75aa1 100644
Binary files a/public/images/emoji/apple/u5408.png and b/public/images/emoji/apple/u5408.png differ
diff --git a/public/images/emoji/apple/u55b6.png b/public/images/emoji/apple/u55b6.png
index 245284a11f..94c1163d3d 100644
Binary files a/public/images/emoji/apple/u55b6.png and b/public/images/emoji/apple/u55b6.png differ
diff --git a/public/images/emoji/apple/u6307.png b/public/images/emoji/apple/u6307.png
index ad9a077871..cc81d7398a 100644
Binary files a/public/images/emoji/apple/u6307.png and b/public/images/emoji/apple/u6307.png differ
diff --git a/public/images/emoji/apple/u6708.png b/public/images/emoji/apple/u6708.png
index 9e79230f6d..3448a62f19 100644
Binary files a/public/images/emoji/apple/u6708.png and b/public/images/emoji/apple/u6708.png differ
diff --git a/public/images/emoji/apple/u6709.png b/public/images/emoji/apple/u6709.png
index b9b24f4a5a..c9bdbbc1fd 100644
Binary files a/public/images/emoji/apple/u6709.png and b/public/images/emoji/apple/u6709.png differ
diff --git a/public/images/emoji/apple/u6e80.png b/public/images/emoji/apple/u6e80.png
index 2fe46b57c0..1d2a183c83 100644
Binary files a/public/images/emoji/apple/u6e80.png and b/public/images/emoji/apple/u6e80.png differ
diff --git a/public/images/emoji/apple/u7121.png b/public/images/emoji/apple/u7121.png
index 9a1e32f38f..b07e11fee9 100644
Binary files a/public/images/emoji/apple/u7121.png and b/public/images/emoji/apple/u7121.png differ
diff --git a/public/images/emoji/apple/u7533.png b/public/images/emoji/apple/u7533.png
index 68854c4e7f..01283bafd8 100644
Binary files a/public/images/emoji/apple/u7533.png and b/public/images/emoji/apple/u7533.png differ
diff --git a/public/images/emoji/apple/u7981.png b/public/images/emoji/apple/u7981.png
index f8d1473ce7..9261039531 100644
Binary files a/public/images/emoji/apple/u7981.png and b/public/images/emoji/apple/u7981.png differ
diff --git a/public/images/emoji/apple/u7a7a.png b/public/images/emoji/apple/u7a7a.png
index 9b92765755..6c0603c3b2 100644
Binary files a/public/images/emoji/apple/u7a7a.png and b/public/images/emoji/apple/u7a7a.png differ
diff --git a/public/images/emoji/apple/uganda.png b/public/images/emoji/apple/uganda.png
index 02590e94cf..ae58476ee3 100644
Binary files a/public/images/emoji/apple/uganda.png and b/public/images/emoji/apple/uganda.png differ
diff --git a/public/images/emoji/apple/uk.png b/public/images/emoji/apple/uk.png
index 1d15d6cb96..4ca275e08f 100644
Binary files a/public/images/emoji/apple/uk.png and b/public/images/emoji/apple/uk.png differ
diff --git a/public/images/emoji/apple/ukraine.png b/public/images/emoji/apple/ukraine.png
index ac778caae3..eb05408e03 100644
Binary files a/public/images/emoji/apple/ukraine.png and b/public/images/emoji/apple/ukraine.png differ
diff --git a/public/images/emoji/apple/umbrella.png b/public/images/emoji/apple/umbrella.png
index ba24ed35bd..da4ab40ce2 100644
Binary files a/public/images/emoji/apple/umbrella.png and b/public/images/emoji/apple/umbrella.png differ
diff --git a/public/images/emoji/apple/umbrella2.png b/public/images/emoji/apple/umbrella2.png
index 1d7d1c6a5f..df4299aa97 100644
Binary files a/public/images/emoji/apple/umbrella2.png and b/public/images/emoji/apple/umbrella2.png differ
diff --git a/public/images/emoji/apple/umbrella_on_ground.png b/public/images/emoji/apple/umbrella_on_ground.png
index 95b1ae9fdd..e42ee9ac52 100644
Binary files a/public/images/emoji/apple/umbrella_on_ground.png and b/public/images/emoji/apple/umbrella_on_ground.png differ
diff --git a/public/images/emoji/apple/unamused.png b/public/images/emoji/apple/unamused.png
index e29e6fac8c..3a5058d07f 100644
Binary files a/public/images/emoji/apple/unamused.png and b/public/images/emoji/apple/unamused.png differ
diff --git a/public/images/emoji/apple/underage.png b/public/images/emoji/apple/underage.png
index 2e425f1d29..57b98624e3 100644
Binary files a/public/images/emoji/apple/underage.png and b/public/images/emoji/apple/underage.png differ
diff --git a/public/images/emoji/apple/unicorn.png b/public/images/emoji/apple/unicorn.png
index ca52d64d99..7fcc2594c1 100644
Binary files a/public/images/emoji/apple/unicorn.png and b/public/images/emoji/apple/unicorn.png differ
diff --git a/public/images/emoji/apple/unicorn_face.png b/public/images/emoji/apple/unicorn_face.png
index ca52d64d99..7fcc2594c1 100644
Binary files a/public/images/emoji/apple/unicorn_face.png and b/public/images/emoji/apple/unicorn_face.png differ
diff --git a/public/images/emoji/apple/united_arab_emirates.png b/public/images/emoji/apple/united_arab_emirates.png
index 0f079b5cc5..58234f3ca9 100644
Binary files a/public/images/emoji/apple/united_arab_emirates.png and b/public/images/emoji/apple/united_arab_emirates.png differ
diff --git a/public/images/emoji/apple/unlock.png b/public/images/emoji/apple/unlock.png
index 620245dc60..32b269c8c0 100644
Binary files a/public/images/emoji/apple/unlock.png and b/public/images/emoji/apple/unlock.png differ
diff --git a/public/images/emoji/apple/up.png b/public/images/emoji/apple/up.png
index e7d02e98e5..06f17c1dd3 100644
Binary files a/public/images/emoji/apple/up.png and b/public/images/emoji/apple/up.png differ
diff --git a/public/images/emoji/apple/upside_down.png b/public/images/emoji/apple/upside_down.png
index f60d9b623b..d5dc73622b 100644
Binary files a/public/images/emoji/apple/upside_down.png and b/public/images/emoji/apple/upside_down.png differ
diff --git a/public/images/emoji/apple/upside_down_face.png b/public/images/emoji/apple/upside_down_face.png
index f60d9b623b..d5dc73622b 100644
Binary files a/public/images/emoji/apple/upside_down_face.png and b/public/images/emoji/apple/upside_down_face.png differ
diff --git a/public/images/emoji/apple/urn.png b/public/images/emoji/apple/urn.png
index d1af59ed33..26b206c156 100644
Binary files a/public/images/emoji/apple/urn.png and b/public/images/emoji/apple/urn.png differ
diff --git a/public/images/emoji/apple/uruguay.png b/public/images/emoji/apple/uruguay.png
index a03f80a7eb..094a7b3440 100644
Binary files a/public/images/emoji/apple/uruguay.png and b/public/images/emoji/apple/uruguay.png differ
diff --git a/public/images/emoji/apple/us.png b/public/images/emoji/apple/us.png
index 64a5e528d9..cc5a722bc7 100644
Binary files a/public/images/emoji/apple/us.png and b/public/images/emoji/apple/us.png differ
diff --git a/public/images/emoji/apple/us_outlying_islands.png b/public/images/emoji/apple/us_outlying_islands.png
index 64a5e528d9..cc5a722bc7 100644
Binary files a/public/images/emoji/apple/us_outlying_islands.png and b/public/images/emoji/apple/us_outlying_islands.png differ
diff --git a/public/images/emoji/apple/us_virgin_islands.png b/public/images/emoji/apple/us_virgin_islands.png
index 4c5cb5786c..7f6330027b 100644
Binary files a/public/images/emoji/apple/us_virgin_islands.png and b/public/images/emoji/apple/us_virgin_islands.png differ
diff --git a/public/images/emoji/apple/uzbekistan.png b/public/images/emoji/apple/uzbekistan.png
index 9ad43eba98..fed930e09b 100644
Binary files a/public/images/emoji/apple/uzbekistan.png and b/public/images/emoji/apple/uzbekistan.png differ
diff --git a/public/images/emoji/apple/v.png b/public/images/emoji/apple/v.png
index d3fc2ab19b..80f56c2087 100644
Binary files a/public/images/emoji/apple/v.png and b/public/images/emoji/apple/v.png differ
diff --git a/public/images/emoji/apple/v/2.png b/public/images/emoji/apple/v/2.png
index 8e9dadbca3..96039d1bee 100644
Binary files a/public/images/emoji/apple/v/2.png and b/public/images/emoji/apple/v/2.png differ
diff --git a/public/images/emoji/apple/v/3.png b/public/images/emoji/apple/v/3.png
index eab98d2804..b899c136dc 100644
Binary files a/public/images/emoji/apple/v/3.png and b/public/images/emoji/apple/v/3.png differ
diff --git a/public/images/emoji/apple/v/4.png b/public/images/emoji/apple/v/4.png
index 6e6d282f7e..82f3516aae 100644
Binary files a/public/images/emoji/apple/v/4.png and b/public/images/emoji/apple/v/4.png differ
diff --git a/public/images/emoji/apple/v/5.png b/public/images/emoji/apple/v/5.png
index 3b8c0e6db9..e818ebe597 100644
Binary files a/public/images/emoji/apple/v/5.png and b/public/images/emoji/apple/v/5.png differ
diff --git a/public/images/emoji/apple/v/6.png b/public/images/emoji/apple/v/6.png
index e6c87e1b3d..3acd806646 100644
Binary files a/public/images/emoji/apple/v/6.png and b/public/images/emoji/apple/v/6.png differ
diff --git a/public/images/emoji/apple/vampire.png b/public/images/emoji/apple/vampire.png
index 962288bd17..2b39dd6b08 100644
Binary files a/public/images/emoji/apple/vampire.png and b/public/images/emoji/apple/vampire.png differ
diff --git a/public/images/emoji/apple/vampire/2.png b/public/images/emoji/apple/vampire/2.png
index 154f2b6e35..66b31086cc 100644
Binary files a/public/images/emoji/apple/vampire/2.png and b/public/images/emoji/apple/vampire/2.png differ
diff --git a/public/images/emoji/apple/vampire/3.png b/public/images/emoji/apple/vampire/3.png
index 540b48d887..ac24896fb5 100644
Binary files a/public/images/emoji/apple/vampire/3.png and b/public/images/emoji/apple/vampire/3.png differ
diff --git a/public/images/emoji/apple/vampire/4.png b/public/images/emoji/apple/vampire/4.png
index b05d3bad9a..b2c928d1b2 100644
Binary files a/public/images/emoji/apple/vampire/4.png and b/public/images/emoji/apple/vampire/4.png differ
diff --git a/public/images/emoji/apple/vampire/5.png b/public/images/emoji/apple/vampire/5.png
index 2bd9a7b71b..c0993a947c 100644
Binary files a/public/images/emoji/apple/vampire/5.png and b/public/images/emoji/apple/vampire/5.png differ
diff --git a/public/images/emoji/apple/vampire/6.png b/public/images/emoji/apple/vampire/6.png
index c88f4ad73b..33a85380c6 100644
Binary files a/public/images/emoji/apple/vampire/6.png and b/public/images/emoji/apple/vampire/6.png differ
diff --git a/public/images/emoji/apple/vanuatu.png b/public/images/emoji/apple/vanuatu.png
index 557f83f14a..6880316881 100644
Binary files a/public/images/emoji/apple/vanuatu.png and b/public/images/emoji/apple/vanuatu.png differ
diff --git a/public/images/emoji/apple/vatican_city.png b/public/images/emoji/apple/vatican_city.png
index 317b79b153..25540ab801 100644
Binary files a/public/images/emoji/apple/vatican_city.png and b/public/images/emoji/apple/vatican_city.png differ
diff --git a/public/images/emoji/apple/venezuela.png b/public/images/emoji/apple/venezuela.png
index 38cd6eb8e3..08d94cf7c2 100644
Binary files a/public/images/emoji/apple/venezuela.png and b/public/images/emoji/apple/venezuela.png differ
diff --git a/public/images/emoji/apple/vertical_traffic_light.png b/public/images/emoji/apple/vertical_traffic_light.png
index 99179206f9..d84f8a201d 100644
Binary files a/public/images/emoji/apple/vertical_traffic_light.png and b/public/images/emoji/apple/vertical_traffic_light.png differ
diff --git a/public/images/emoji/apple/vhs.png b/public/images/emoji/apple/vhs.png
index 975285a28a..68ef7f4929 100644
Binary files a/public/images/emoji/apple/vhs.png and b/public/images/emoji/apple/vhs.png differ
diff --git a/public/images/emoji/apple/vibration_mode.png b/public/images/emoji/apple/vibration_mode.png
index 5c88e13f41..5d01968c3d 100644
Binary files a/public/images/emoji/apple/vibration_mode.png and b/public/images/emoji/apple/vibration_mode.png differ
diff --git a/public/images/emoji/apple/video_camera.png b/public/images/emoji/apple/video_camera.png
index c2acf77fbc..9103e77fa8 100644
Binary files a/public/images/emoji/apple/video_camera.png and b/public/images/emoji/apple/video_camera.png differ
diff --git a/public/images/emoji/apple/video_game.png b/public/images/emoji/apple/video_game.png
index 7c08a2623c..171e6f3852 100644
Binary files a/public/images/emoji/apple/video_game.png and b/public/images/emoji/apple/video_game.png differ
diff --git a/public/images/emoji/apple/vietnam.png b/public/images/emoji/apple/vietnam.png
index b67f1a1047..29dbd6e09b 100644
Binary files a/public/images/emoji/apple/vietnam.png and b/public/images/emoji/apple/vietnam.png differ
diff --git a/public/images/emoji/apple/violin.png b/public/images/emoji/apple/violin.png
index e78c6ec7da..aed241c0b0 100644
Binary files a/public/images/emoji/apple/violin.png and b/public/images/emoji/apple/violin.png differ
diff --git a/public/images/emoji/apple/virgo.png b/public/images/emoji/apple/virgo.png
index d32108ffe0..ce538315f1 100644
Binary files a/public/images/emoji/apple/virgo.png and b/public/images/emoji/apple/virgo.png differ
diff --git a/public/images/emoji/apple/volcano.png b/public/images/emoji/apple/volcano.png
index 5f5184bcd1..b4b9e0cd82 100644
Binary files a/public/images/emoji/apple/volcano.png and b/public/images/emoji/apple/volcano.png differ
diff --git a/public/images/emoji/apple/volleyball.png b/public/images/emoji/apple/volleyball.png
index 1424df5f48..714f7a5718 100644
Binary files a/public/images/emoji/apple/volleyball.png and b/public/images/emoji/apple/volleyball.png differ
diff --git a/public/images/emoji/apple/vs.png b/public/images/emoji/apple/vs.png
index ce01369010..05e5df6ea8 100644
Binary files a/public/images/emoji/apple/vs.png and b/public/images/emoji/apple/vs.png differ
diff --git a/public/images/emoji/apple/vulcan.png b/public/images/emoji/apple/vulcan.png
index 89fd1859fe..de1b78b311 100644
Binary files a/public/images/emoji/apple/vulcan.png and b/public/images/emoji/apple/vulcan.png differ
diff --git a/public/images/emoji/apple/vulcan/2.png b/public/images/emoji/apple/vulcan/2.png
index 9c277890ad..b20e107c81 100644
Binary files a/public/images/emoji/apple/vulcan/2.png and b/public/images/emoji/apple/vulcan/2.png differ
diff --git a/public/images/emoji/apple/vulcan/3.png b/public/images/emoji/apple/vulcan/3.png
index 8d6940ee24..a54bee3211 100644
Binary files a/public/images/emoji/apple/vulcan/3.png and b/public/images/emoji/apple/vulcan/3.png differ
diff --git a/public/images/emoji/apple/vulcan/4.png b/public/images/emoji/apple/vulcan/4.png
index fe549c3e2c..a851bc95ab 100644
Binary files a/public/images/emoji/apple/vulcan/4.png and b/public/images/emoji/apple/vulcan/4.png differ
diff --git a/public/images/emoji/apple/vulcan/5.png b/public/images/emoji/apple/vulcan/5.png
index 4ad8b9df45..d3053b5e1a 100644
Binary files a/public/images/emoji/apple/vulcan/5.png and b/public/images/emoji/apple/vulcan/5.png differ
diff --git a/public/images/emoji/apple/vulcan/6.png b/public/images/emoji/apple/vulcan/6.png
index af23814474..4aababec2d 100644
Binary files a/public/images/emoji/apple/vulcan/6.png and b/public/images/emoji/apple/vulcan/6.png differ
diff --git a/public/images/emoji/apple/vulcan_salute.png b/public/images/emoji/apple/vulcan_salute.png
index 89fd1859fe..de1b78b311 100644
Binary files a/public/images/emoji/apple/vulcan_salute.png and b/public/images/emoji/apple/vulcan_salute.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/2.png b/public/images/emoji/apple/vulcan_salute/2.png
index 9c277890ad..b20e107c81 100644
Binary files a/public/images/emoji/apple/vulcan_salute/2.png and b/public/images/emoji/apple/vulcan_salute/2.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/3.png b/public/images/emoji/apple/vulcan_salute/3.png
index 8d6940ee24..a54bee3211 100644
Binary files a/public/images/emoji/apple/vulcan_salute/3.png and b/public/images/emoji/apple/vulcan_salute/3.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/4.png b/public/images/emoji/apple/vulcan_salute/4.png
index fe549c3e2c..a851bc95ab 100644
Binary files a/public/images/emoji/apple/vulcan_salute/4.png and b/public/images/emoji/apple/vulcan_salute/4.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/5.png b/public/images/emoji/apple/vulcan_salute/5.png
index 4ad8b9df45..d3053b5e1a 100644
Binary files a/public/images/emoji/apple/vulcan_salute/5.png and b/public/images/emoji/apple/vulcan_salute/5.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/6.png b/public/images/emoji/apple/vulcan_salute/6.png
index af23814474..4aababec2d 100644
Binary files a/public/images/emoji/apple/vulcan_salute/6.png and b/public/images/emoji/apple/vulcan_salute/6.png differ
diff --git a/public/images/emoji/apple/walking.png b/public/images/emoji/apple/walking.png
index e647b9672b..5c51af3969 100644
Binary files a/public/images/emoji/apple/walking.png and b/public/images/emoji/apple/walking.png differ
diff --git a/public/images/emoji/apple/walking/2.png b/public/images/emoji/apple/walking/2.png
index 8ca3ec2b82..498e702972 100644
Binary files a/public/images/emoji/apple/walking/2.png and b/public/images/emoji/apple/walking/2.png differ
diff --git a/public/images/emoji/apple/walking/3.png b/public/images/emoji/apple/walking/3.png
index 91fd7ddc36..d27a38a0b0 100644
Binary files a/public/images/emoji/apple/walking/3.png and b/public/images/emoji/apple/walking/3.png differ
diff --git a/public/images/emoji/apple/walking/4.png b/public/images/emoji/apple/walking/4.png
index a591da4533..6bcae9b0c0 100644
Binary files a/public/images/emoji/apple/walking/4.png and b/public/images/emoji/apple/walking/4.png differ
diff --git a/public/images/emoji/apple/walking/5.png b/public/images/emoji/apple/walking/5.png
index ca9a5d71e1..97b068df88 100644
Binary files a/public/images/emoji/apple/walking/5.png and b/public/images/emoji/apple/walking/5.png differ
diff --git a/public/images/emoji/apple/walking/6.png b/public/images/emoji/apple/walking/6.png
index 9a52e38995..729d5cee2e 100644
Binary files a/public/images/emoji/apple/walking/6.png and b/public/images/emoji/apple/walking/6.png differ
diff --git a/public/images/emoji/apple/walking_man.png b/public/images/emoji/apple/walking_man.png
index e647b9672b..5c51af3969 100644
Binary files a/public/images/emoji/apple/walking_man.png and b/public/images/emoji/apple/walking_man.png differ
diff --git a/public/images/emoji/apple/walking_man/2.png b/public/images/emoji/apple/walking_man/2.png
index 8ca3ec2b82..498e702972 100644
Binary files a/public/images/emoji/apple/walking_man/2.png and b/public/images/emoji/apple/walking_man/2.png differ
diff --git a/public/images/emoji/apple/walking_man/3.png b/public/images/emoji/apple/walking_man/3.png
index 91fd7ddc36..d27a38a0b0 100644
Binary files a/public/images/emoji/apple/walking_man/3.png and b/public/images/emoji/apple/walking_man/3.png differ
diff --git a/public/images/emoji/apple/walking_man/4.png b/public/images/emoji/apple/walking_man/4.png
index a591da4533..6bcae9b0c0 100644
Binary files a/public/images/emoji/apple/walking_man/4.png and b/public/images/emoji/apple/walking_man/4.png differ
diff --git a/public/images/emoji/apple/walking_man/5.png b/public/images/emoji/apple/walking_man/5.png
index ca9a5d71e1..97b068df88 100644
Binary files a/public/images/emoji/apple/walking_man/5.png and b/public/images/emoji/apple/walking_man/5.png differ
diff --git a/public/images/emoji/apple/walking_man/6.png b/public/images/emoji/apple/walking_man/6.png
index 9a52e38995..729d5cee2e 100644
Binary files a/public/images/emoji/apple/walking_man/6.png and b/public/images/emoji/apple/walking_man/6.png differ
diff --git a/public/images/emoji/apple/walking_woman.png b/public/images/emoji/apple/walking_woman.png
index 15b622aee3..5a5160686b 100644
Binary files a/public/images/emoji/apple/walking_woman.png and b/public/images/emoji/apple/walking_woman.png differ
diff --git a/public/images/emoji/apple/walking_woman/2.png b/public/images/emoji/apple/walking_woman/2.png
index a548a92f62..6125294eca 100644
Binary files a/public/images/emoji/apple/walking_woman/2.png and b/public/images/emoji/apple/walking_woman/2.png differ
diff --git a/public/images/emoji/apple/walking_woman/3.png b/public/images/emoji/apple/walking_woman/3.png
index b6a8d817b9..4313782022 100644
Binary files a/public/images/emoji/apple/walking_woman/3.png and b/public/images/emoji/apple/walking_woman/3.png differ
diff --git a/public/images/emoji/apple/walking_woman/4.png b/public/images/emoji/apple/walking_woman/4.png
index 997873d8c3..0bf1c12d7e 100644
Binary files a/public/images/emoji/apple/walking_woman/4.png and b/public/images/emoji/apple/walking_woman/4.png differ
diff --git a/public/images/emoji/apple/walking_woman/5.png b/public/images/emoji/apple/walking_woman/5.png
index aa4faf95b6..b96962fb23 100644
Binary files a/public/images/emoji/apple/walking_woman/5.png and b/public/images/emoji/apple/walking_woman/5.png differ
diff --git a/public/images/emoji/apple/walking_woman/6.png b/public/images/emoji/apple/walking_woman/6.png
index f6946051c4..722942c3af 100644
Binary files a/public/images/emoji/apple/walking_woman/6.png and b/public/images/emoji/apple/walking_woman/6.png differ
diff --git a/public/images/emoji/apple/wallis_futuna.png b/public/images/emoji/apple/wallis_futuna.png
index eae880a42f..f46f96063f 100644
Binary files a/public/images/emoji/apple/wallis_futuna.png and b/public/images/emoji/apple/wallis_futuna.png differ
diff --git a/public/images/emoji/apple/waning_crescent_moon.png b/public/images/emoji/apple/waning_crescent_moon.png
index 8e81988d4d..a3ba222ff4 100644
Binary files a/public/images/emoji/apple/waning_crescent_moon.png and b/public/images/emoji/apple/waning_crescent_moon.png differ
diff --git a/public/images/emoji/apple/waning_gibbous_moon.png b/public/images/emoji/apple/waning_gibbous_moon.png
index 777f2aafaa..d1a14f3de3 100644
Binary files a/public/images/emoji/apple/waning_gibbous_moon.png and b/public/images/emoji/apple/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/apple/warning.png b/public/images/emoji/apple/warning.png
index e60055ef8a..9648715075 100644
Binary files a/public/images/emoji/apple/warning.png and b/public/images/emoji/apple/warning.png differ
diff --git a/public/images/emoji/apple/wastebasket.png b/public/images/emoji/apple/wastebasket.png
index 4ab69a6c84..9609eb77dc 100644
Binary files a/public/images/emoji/apple/wastebasket.png and b/public/images/emoji/apple/wastebasket.png differ
diff --git a/public/images/emoji/apple/watch.png b/public/images/emoji/apple/watch.png
index ed3dc504fe..3361694401 100644
Binary files a/public/images/emoji/apple/watch.png and b/public/images/emoji/apple/watch.png differ
diff --git a/public/images/emoji/apple/water_buffalo.png b/public/images/emoji/apple/water_buffalo.png
index 6d7f5bd5b7..900712e983 100644
Binary files a/public/images/emoji/apple/water_buffalo.png and b/public/images/emoji/apple/water_buffalo.png differ
diff --git a/public/images/emoji/apple/watermelon.png b/public/images/emoji/apple/watermelon.png
index 10b71a6a16..4fe269eb7f 100644
Binary files a/public/images/emoji/apple/watermelon.png and b/public/images/emoji/apple/watermelon.png differ
diff --git a/public/images/emoji/apple/wave.png b/public/images/emoji/apple/wave.png
index 2c6ae426f4..9716eebcb9 100644
Binary files a/public/images/emoji/apple/wave.png and b/public/images/emoji/apple/wave.png differ
diff --git a/public/images/emoji/apple/wave/2.png b/public/images/emoji/apple/wave/2.png
index b1f7a46467..583682aab5 100644
Binary files a/public/images/emoji/apple/wave/2.png and b/public/images/emoji/apple/wave/2.png differ
diff --git a/public/images/emoji/apple/wave/3.png b/public/images/emoji/apple/wave/3.png
index 23a515d10d..2422556bb1 100644
Binary files a/public/images/emoji/apple/wave/3.png and b/public/images/emoji/apple/wave/3.png differ
diff --git a/public/images/emoji/apple/wave/4.png b/public/images/emoji/apple/wave/4.png
index fe2f453ef5..dab52182a4 100644
Binary files a/public/images/emoji/apple/wave/4.png and b/public/images/emoji/apple/wave/4.png differ
diff --git a/public/images/emoji/apple/wave/5.png b/public/images/emoji/apple/wave/5.png
index f40dbb9df7..3db08fdf7a 100644
Binary files a/public/images/emoji/apple/wave/5.png and b/public/images/emoji/apple/wave/5.png differ
diff --git a/public/images/emoji/apple/wave/6.png b/public/images/emoji/apple/wave/6.png
index 854b4fc22b..bf87854e67 100644
Binary files a/public/images/emoji/apple/wave/6.png and b/public/images/emoji/apple/wave/6.png differ
diff --git a/public/images/emoji/apple/waving_black_flag.png b/public/images/emoji/apple/waving_black_flag.png
index 36a0a6987d..b8815fb9c2 100644
Binary files a/public/images/emoji/apple/waving_black_flag.png and b/public/images/emoji/apple/waving_black_flag.png differ
diff --git a/public/images/emoji/apple/waving_white_flag.png b/public/images/emoji/apple/waving_white_flag.png
index 16ed8e6169..6f9b833d7e 100644
Binary files a/public/images/emoji/apple/waving_white_flag.png and b/public/images/emoji/apple/waving_white_flag.png differ
diff --git a/public/images/emoji/apple/wavy_dash.png b/public/images/emoji/apple/wavy_dash.png
index 507f6f6de9..1090ad0e88 100644
Binary files a/public/images/emoji/apple/wavy_dash.png and b/public/images/emoji/apple/wavy_dash.png differ
diff --git a/public/images/emoji/apple/waxing_crescent_moon.png b/public/images/emoji/apple/waxing_crescent_moon.png
index 742a443509..51d2b3c6f6 100644
Binary files a/public/images/emoji/apple/waxing_crescent_moon.png and b/public/images/emoji/apple/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/apple/waxing_gibbous_moon.png b/public/images/emoji/apple/waxing_gibbous_moon.png
index 704c4b4e2d..a0468a513c 100644
Binary files a/public/images/emoji/apple/waxing_gibbous_moon.png and b/public/images/emoji/apple/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/apple/wc.png b/public/images/emoji/apple/wc.png
index 8e9d43c32f..d4ab1f38e7 100644
Binary files a/public/images/emoji/apple/wc.png and b/public/images/emoji/apple/wc.png differ
diff --git a/public/images/emoji/apple/weary.png b/public/images/emoji/apple/weary.png
index 2d4e531a36..9d4abe96be 100644
Binary files a/public/images/emoji/apple/weary.png and b/public/images/emoji/apple/weary.png differ
diff --git a/public/images/emoji/apple/wedding.png b/public/images/emoji/apple/wedding.png
index 223299695d..dd988d685d 100644
Binary files a/public/images/emoji/apple/wedding.png and b/public/images/emoji/apple/wedding.png differ
diff --git a/public/images/emoji/apple/weight_lifter.png b/public/images/emoji/apple/weight_lifter.png
index 9cebc0e16d..c5407cdcbb 100644
Binary files a/public/images/emoji/apple/weight_lifter.png and b/public/images/emoji/apple/weight_lifter.png differ
diff --git a/public/images/emoji/apple/weight_lifter/2.png b/public/images/emoji/apple/weight_lifter/2.png
index df54bd55f9..1f80bc4259 100644
Binary files a/public/images/emoji/apple/weight_lifter/2.png and b/public/images/emoji/apple/weight_lifter/2.png differ
diff --git a/public/images/emoji/apple/weight_lifter/3.png b/public/images/emoji/apple/weight_lifter/3.png
index dafe388c95..f6615f540e 100644
Binary files a/public/images/emoji/apple/weight_lifter/3.png and b/public/images/emoji/apple/weight_lifter/3.png differ
diff --git a/public/images/emoji/apple/weight_lifter/4.png b/public/images/emoji/apple/weight_lifter/4.png
index ecf9101aa9..5c3a2d7ffb 100644
Binary files a/public/images/emoji/apple/weight_lifter/4.png and b/public/images/emoji/apple/weight_lifter/4.png differ
diff --git a/public/images/emoji/apple/weight_lifter/5.png b/public/images/emoji/apple/weight_lifter/5.png
index cd1c9aad39..d2d765acaa 100644
Binary files a/public/images/emoji/apple/weight_lifter/5.png and b/public/images/emoji/apple/weight_lifter/5.png differ
diff --git a/public/images/emoji/apple/weight_lifter/6.png b/public/images/emoji/apple/weight_lifter/6.png
index 1afa3bea2c..9a9f4f1656 100644
Binary files a/public/images/emoji/apple/weight_lifter/6.png and b/public/images/emoji/apple/weight_lifter/6.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man.png b/public/images/emoji/apple/weight_lifting_man.png
index 9cebc0e16d..c5407cdcbb 100644
Binary files a/public/images/emoji/apple/weight_lifting_man.png and b/public/images/emoji/apple/weight_lifting_man.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/2.png b/public/images/emoji/apple/weight_lifting_man/2.png
index df54bd55f9..1f80bc4259 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/2.png and b/public/images/emoji/apple/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/3.png b/public/images/emoji/apple/weight_lifting_man/3.png
index dafe388c95..f6615f540e 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/3.png and b/public/images/emoji/apple/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/4.png b/public/images/emoji/apple/weight_lifting_man/4.png
index ecf9101aa9..5c3a2d7ffb 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/4.png and b/public/images/emoji/apple/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/5.png b/public/images/emoji/apple/weight_lifting_man/5.png
index cd1c9aad39..d2d765acaa 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/5.png and b/public/images/emoji/apple/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/6.png b/public/images/emoji/apple/weight_lifting_man/6.png
index 1afa3bea2c..9a9f4f1656 100644
Binary files a/public/images/emoji/apple/weight_lifting_man/6.png and b/public/images/emoji/apple/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/apple/weight_lifting_woman.png b/public/images/emoji/apple/weight_lifting_woman.png
index 94ad7f2eff..78f0e7f17e 100644
Binary files a/public/images/emoji/apple/weight_lifting_woman.png and b/public/images/emoji/apple/weight_lifting_woman.png differ
diff --git a/public/images/emoji/apple/western_sahara.png b/public/images/emoji/apple/western_sahara.png
index 8321631184..800b3ae96f 100644
Binary files a/public/images/emoji/apple/western_sahara.png and b/public/images/emoji/apple/western_sahara.png differ
diff --git a/public/images/emoji/apple/whale.png b/public/images/emoji/apple/whale.png
index 9efadf3d48..3d72965500 100644
Binary files a/public/images/emoji/apple/whale.png and b/public/images/emoji/apple/whale.png differ
diff --git a/public/images/emoji/apple/whale2.png b/public/images/emoji/apple/whale2.png
index fb23e965fc..b4e124e784 100644
Binary files a/public/images/emoji/apple/whale2.png and b/public/images/emoji/apple/whale2.png differ
diff --git a/public/images/emoji/apple/wheel_of_dharma.png b/public/images/emoji/apple/wheel_of_dharma.png
index 272a4c3c5b..1853862668 100644
Binary files a/public/images/emoji/apple/wheel_of_dharma.png and b/public/images/emoji/apple/wheel_of_dharma.png differ
diff --git a/public/images/emoji/apple/wheelchair.png b/public/images/emoji/apple/wheelchair.png
index 51646c9b8e..322806ba7e 100644
Binary files a/public/images/emoji/apple/wheelchair.png and b/public/images/emoji/apple/wheelchair.png differ
diff --git a/public/images/emoji/apple/white_check_mark.png b/public/images/emoji/apple/white_check_mark.png
index dd694996d3..4a2f2c0007 100644
Binary files a/public/images/emoji/apple/white_check_mark.png and b/public/images/emoji/apple/white_check_mark.png differ
diff --git a/public/images/emoji/apple/white_circle.png b/public/images/emoji/apple/white_circle.png
index 4f65906e0a..b165aa5b02 100644
Binary files a/public/images/emoji/apple/white_circle.png and b/public/images/emoji/apple/white_circle.png differ
diff --git a/public/images/emoji/apple/white_flag.png b/public/images/emoji/apple/white_flag.png
index 16ed8e6169..6f9b833d7e 100644
Binary files a/public/images/emoji/apple/white_flag.png and b/public/images/emoji/apple/white_flag.png differ
diff --git a/public/images/emoji/apple/white_flower.png b/public/images/emoji/apple/white_flower.png
index 81dadb26a4..d7f9f300f6 100644
Binary files a/public/images/emoji/apple/white_flower.png and b/public/images/emoji/apple/white_flower.png differ
diff --git a/public/images/emoji/apple/white_frowning_face.png b/public/images/emoji/apple/white_frowning_face.png
index ad1715f8a4..cbac2e6098 100644
Binary files a/public/images/emoji/apple/white_frowning_face.png and b/public/images/emoji/apple/white_frowning_face.png differ
diff --git a/public/images/emoji/apple/white_large_square.png b/public/images/emoji/apple/white_large_square.png
index d9fdef8357..1c086cfe69 100644
Binary files a/public/images/emoji/apple/white_large_square.png and b/public/images/emoji/apple/white_large_square.png differ
diff --git a/public/images/emoji/apple/white_medium_small_square.png b/public/images/emoji/apple/white_medium_small_square.png
index 0b61de8dc1..466036c8ee 100644
Binary files a/public/images/emoji/apple/white_medium_small_square.png and b/public/images/emoji/apple/white_medium_small_square.png differ
diff --git a/public/images/emoji/apple/white_medium_square.png b/public/images/emoji/apple/white_medium_square.png
index ff357d5cd5..508d8853ac 100644
Binary files a/public/images/emoji/apple/white_medium_square.png and b/public/images/emoji/apple/white_medium_square.png differ
diff --git a/public/images/emoji/apple/white_small_square.png b/public/images/emoji/apple/white_small_square.png
index f662c10353..580c7b7834 100644
Binary files a/public/images/emoji/apple/white_small_square.png and b/public/images/emoji/apple/white_small_square.png differ
diff --git a/public/images/emoji/apple/white_square_button.png b/public/images/emoji/apple/white_square_button.png
index 1acb1dd3f0..04c028e070 100644
Binary files a/public/images/emoji/apple/white_square_button.png and b/public/images/emoji/apple/white_square_button.png differ
diff --git a/public/images/emoji/apple/white_sun_behind_cloud.png b/public/images/emoji/apple/white_sun_behind_cloud.png
index 8632921373..04814464d2 100644
Binary files a/public/images/emoji/apple/white_sun_behind_cloud.png and b/public/images/emoji/apple/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png b/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png
index 16324c90c4..056c26538b 100644
Binary files a/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/apple/white_sun_cloud.png b/public/images/emoji/apple/white_sun_cloud.png
index 8632921373..04814464d2 100644
Binary files a/public/images/emoji/apple/white_sun_cloud.png and b/public/images/emoji/apple/white_sun_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_rain_cloud.png b/public/images/emoji/apple/white_sun_rain_cloud.png
index 16324c90c4..056c26538b 100644
Binary files a/public/images/emoji/apple/white_sun_rain_cloud.png and b/public/images/emoji/apple/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_small_cloud.png b/public/images/emoji/apple/white_sun_small_cloud.png
index b31de05a28..b87741933b 100644
Binary files a/public/images/emoji/apple/white_sun_small_cloud.png and b/public/images/emoji/apple/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_with_small_cloud.png b/public/images/emoji/apple/white_sun_with_small_cloud.png
index b31de05a28..b87741933b 100644
Binary files a/public/images/emoji/apple/white_sun_with_small_cloud.png and b/public/images/emoji/apple/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/apple/wilted_flower.png b/public/images/emoji/apple/wilted_flower.png
index bbcd946b44..65226819cb 100644
Binary files a/public/images/emoji/apple/wilted_flower.png and b/public/images/emoji/apple/wilted_flower.png differ
diff --git a/public/images/emoji/apple/wind_blowing_face.png b/public/images/emoji/apple/wind_blowing_face.png
index f43d48e0da..0f5dd8a145 100644
Binary files a/public/images/emoji/apple/wind_blowing_face.png and b/public/images/emoji/apple/wind_blowing_face.png differ
diff --git a/public/images/emoji/apple/wind_chime.png b/public/images/emoji/apple/wind_chime.png
index a00ff20a21..df8a023fcf 100644
Binary files a/public/images/emoji/apple/wind_chime.png and b/public/images/emoji/apple/wind_chime.png differ
diff --git a/public/images/emoji/apple/wind_face.png b/public/images/emoji/apple/wind_face.png
index f43d48e0da..0f5dd8a145 100644
Binary files a/public/images/emoji/apple/wind_face.png and b/public/images/emoji/apple/wind_face.png differ
diff --git a/public/images/emoji/apple/wine_glass.png b/public/images/emoji/apple/wine_glass.png
index eca18cf112..5dce39a7b9 100644
Binary files a/public/images/emoji/apple/wine_glass.png and b/public/images/emoji/apple/wine_glass.png differ
diff --git a/public/images/emoji/apple/wink.png b/public/images/emoji/apple/wink.png
index 1cd1426ddb..e95727a733 100644
Binary files a/public/images/emoji/apple/wink.png and b/public/images/emoji/apple/wink.png differ
diff --git a/public/images/emoji/apple/wolf.png b/public/images/emoji/apple/wolf.png
index ab4c58d1ca..fa098ae586 100644
Binary files a/public/images/emoji/apple/wolf.png and b/public/images/emoji/apple/wolf.png differ
diff --git a/public/images/emoji/apple/woman.png b/public/images/emoji/apple/woman.png
index 64a0c28d0b..5a636a4a13 100644
Binary files a/public/images/emoji/apple/woman.png and b/public/images/emoji/apple/woman.png differ
diff --git a/public/images/emoji/apple/woman/2.png b/public/images/emoji/apple/woman/2.png
index b848946811..4f3ae4f4b2 100644
Binary files a/public/images/emoji/apple/woman/2.png and b/public/images/emoji/apple/woman/2.png differ
diff --git a/public/images/emoji/apple/woman/3.png b/public/images/emoji/apple/woman/3.png
index ea952c2182..504edcd4b0 100644
Binary files a/public/images/emoji/apple/woman/3.png and b/public/images/emoji/apple/woman/3.png differ
diff --git a/public/images/emoji/apple/woman/4.png b/public/images/emoji/apple/woman/4.png
index 9fae54cd11..d90a7993ba 100644
Binary files a/public/images/emoji/apple/woman/4.png and b/public/images/emoji/apple/woman/4.png differ
diff --git a/public/images/emoji/apple/woman/5.png b/public/images/emoji/apple/woman/5.png
index 8313fda6b3..7c8b0e7aaa 100644
Binary files a/public/images/emoji/apple/woman/5.png and b/public/images/emoji/apple/woman/5.png differ
diff --git a/public/images/emoji/apple/woman/6.png b/public/images/emoji/apple/woman/6.png
index 89348fab65..ca8648123c 100644
Binary files a/public/images/emoji/apple/woman/6.png and b/public/images/emoji/apple/woman/6.png differ
diff --git a/public/images/emoji/apple/woman_artist.png b/public/images/emoji/apple/woman_artist.png
index 9642bb8072..b284f0321e 100644
Binary files a/public/images/emoji/apple/woman_artist.png and b/public/images/emoji/apple/woman_artist.png differ
diff --git a/public/images/emoji/apple/woman_artist/2.png b/public/images/emoji/apple/woman_artist/2.png
index ee4dab5d3c..19468f169f 100644
Binary files a/public/images/emoji/apple/woman_artist/2.png and b/public/images/emoji/apple/woman_artist/2.png differ
diff --git a/public/images/emoji/apple/woman_artist/3.png b/public/images/emoji/apple/woman_artist/3.png
index ac267a252a..d19726fd06 100644
Binary files a/public/images/emoji/apple/woman_artist/3.png and b/public/images/emoji/apple/woman_artist/3.png differ
diff --git a/public/images/emoji/apple/woman_artist/4.png b/public/images/emoji/apple/woman_artist/4.png
index 738a7d4a1e..5de515c300 100644
Binary files a/public/images/emoji/apple/woman_artist/4.png and b/public/images/emoji/apple/woman_artist/4.png differ
diff --git a/public/images/emoji/apple/woman_artist/5.png b/public/images/emoji/apple/woman_artist/5.png
index 6a2dcb50e8..fc13f76013 100644
Binary files a/public/images/emoji/apple/woman_artist/5.png and b/public/images/emoji/apple/woman_artist/5.png differ
diff --git a/public/images/emoji/apple/woman_artist/6.png b/public/images/emoji/apple/woman_artist/6.png
index 38e815ac58..639a6b6e17 100644
Binary files a/public/images/emoji/apple/woman_artist/6.png and b/public/images/emoji/apple/woman_artist/6.png differ
diff --git a/public/images/emoji/apple/woman_astronaut.png b/public/images/emoji/apple/woman_astronaut.png
index 8a8c1bdfb8..53d5fbff64 100644
Binary files a/public/images/emoji/apple/woman_astronaut.png and b/public/images/emoji/apple/woman_astronaut.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/2.png b/public/images/emoji/apple/woman_astronaut/2.png
index 7bc13d2ea4..50156f24f1 100644
Binary files a/public/images/emoji/apple/woman_astronaut/2.png and b/public/images/emoji/apple/woman_astronaut/2.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/3.png b/public/images/emoji/apple/woman_astronaut/3.png
index 5bcf17df1c..81a2beacc8 100644
Binary files a/public/images/emoji/apple/woman_astronaut/3.png and b/public/images/emoji/apple/woman_astronaut/3.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/4.png b/public/images/emoji/apple/woman_astronaut/4.png
index f513f6d8c2..5ea7de3510 100644
Binary files a/public/images/emoji/apple/woman_astronaut/4.png and b/public/images/emoji/apple/woman_astronaut/4.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/5.png b/public/images/emoji/apple/woman_astronaut/5.png
index d88a04a16d..b3d7c67fb2 100644
Binary files a/public/images/emoji/apple/woman_astronaut/5.png and b/public/images/emoji/apple/woman_astronaut/5.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/6.png b/public/images/emoji/apple/woman_astronaut/6.png
index b1e0a11e44..f7c473bd97 100644
Binary files a/public/images/emoji/apple/woman_astronaut/6.png and b/public/images/emoji/apple/woman_astronaut/6.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling.png b/public/images/emoji/apple/woman_cartwheeling.png
index ffd3de76f0..b12f382a1b 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling.png and b/public/images/emoji/apple/woman_cartwheeling.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/2.png b/public/images/emoji/apple/woman_cartwheeling/2.png
index 1d43aa981c..8ffd854986 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/2.png and b/public/images/emoji/apple/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/3.png b/public/images/emoji/apple/woman_cartwheeling/3.png
index 1f8e3b0b11..0f82a20683 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/3.png and b/public/images/emoji/apple/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/4.png b/public/images/emoji/apple/woman_cartwheeling/4.png
index 522105a842..e94b853433 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/4.png and b/public/images/emoji/apple/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/5.png b/public/images/emoji/apple/woman_cartwheeling/5.png
index 41d40d2970..a0df36e6f5 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/5.png and b/public/images/emoji/apple/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/6.png b/public/images/emoji/apple/woman_cartwheeling/6.png
index d1f21426b9..4eac050d25 100644
Binary files a/public/images/emoji/apple/woman_cartwheeling/6.png and b/public/images/emoji/apple/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/apple/woman_cook.png b/public/images/emoji/apple/woman_cook.png
index e9a2694266..6411f44b49 100644
Binary files a/public/images/emoji/apple/woman_cook.png and b/public/images/emoji/apple/woman_cook.png differ
diff --git a/public/images/emoji/apple/woman_cook/2.png b/public/images/emoji/apple/woman_cook/2.png
index c8e70d26cb..e7f2c4ae13 100644
Binary files a/public/images/emoji/apple/woman_cook/2.png and b/public/images/emoji/apple/woman_cook/2.png differ
diff --git a/public/images/emoji/apple/woman_cook/3.png b/public/images/emoji/apple/woman_cook/3.png
index 670fd0afe4..2704a1115a 100644
Binary files a/public/images/emoji/apple/woman_cook/3.png and b/public/images/emoji/apple/woman_cook/3.png differ
diff --git a/public/images/emoji/apple/woman_cook/4.png b/public/images/emoji/apple/woman_cook/4.png
index 734d2ff0ee..6ab3c14c91 100644
Binary files a/public/images/emoji/apple/woman_cook/4.png and b/public/images/emoji/apple/woman_cook/4.png differ
diff --git a/public/images/emoji/apple/woman_cook/5.png b/public/images/emoji/apple/woman_cook/5.png
index 1569e9a25f..4ddd3fbc1c 100644
Binary files a/public/images/emoji/apple/woman_cook/5.png and b/public/images/emoji/apple/woman_cook/5.png differ
diff --git a/public/images/emoji/apple/woman_cook/6.png b/public/images/emoji/apple/woman_cook/6.png
index b2c927026a..5e50f80731 100644
Binary files a/public/images/emoji/apple/woman_cook/6.png and b/public/images/emoji/apple/woman_cook/6.png differ
diff --git a/public/images/emoji/apple/woman_facepalming.png b/public/images/emoji/apple/woman_facepalming.png
index 71b21b8132..d5dca333da 100644
Binary files a/public/images/emoji/apple/woman_facepalming.png and b/public/images/emoji/apple/woman_facepalming.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/2.png b/public/images/emoji/apple/woman_facepalming/2.png
index c9be4b7d97..1f39a3d151 100644
Binary files a/public/images/emoji/apple/woman_facepalming/2.png and b/public/images/emoji/apple/woman_facepalming/2.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/3.png b/public/images/emoji/apple/woman_facepalming/3.png
index c6c8ea4b30..de0b296382 100644
Binary files a/public/images/emoji/apple/woman_facepalming/3.png and b/public/images/emoji/apple/woman_facepalming/3.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/4.png b/public/images/emoji/apple/woman_facepalming/4.png
index a8fe42901e..859a0c0f8c 100644
Binary files a/public/images/emoji/apple/woman_facepalming/4.png and b/public/images/emoji/apple/woman_facepalming/4.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/5.png b/public/images/emoji/apple/woman_facepalming/5.png
index 478fd88d9a..e995aeb1af 100644
Binary files a/public/images/emoji/apple/woman_facepalming/5.png and b/public/images/emoji/apple/woman_facepalming/5.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/6.png b/public/images/emoji/apple/woman_facepalming/6.png
index 80167ff226..895b26cc05 100644
Binary files a/public/images/emoji/apple/woman_facepalming/6.png and b/public/images/emoji/apple/woman_facepalming/6.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker.png b/public/images/emoji/apple/woman_factory_worker.png
index 80a66cfcb4..708ed62568 100644
Binary files a/public/images/emoji/apple/woman_factory_worker.png and b/public/images/emoji/apple/woman_factory_worker.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/2.png b/public/images/emoji/apple/woman_factory_worker/2.png
index c8eb4d41f1..da23e3bc3f 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/2.png and b/public/images/emoji/apple/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/3.png b/public/images/emoji/apple/woman_factory_worker/3.png
index b2a064fe65..4805d788bb 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/3.png and b/public/images/emoji/apple/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/4.png b/public/images/emoji/apple/woman_factory_worker/4.png
index 577493d152..116a84a40a 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/4.png and b/public/images/emoji/apple/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/5.png b/public/images/emoji/apple/woman_factory_worker/5.png
index f5ea3f592a..c2487eec84 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/5.png and b/public/images/emoji/apple/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/6.png b/public/images/emoji/apple/woman_factory_worker/6.png
index 2d3b220796..4f24d1a92f 100644
Binary files a/public/images/emoji/apple/woman_factory_worker/6.png and b/public/images/emoji/apple/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/apple/woman_farmer.png b/public/images/emoji/apple/woman_farmer.png
index cb73fb9b42..0afc91470f 100644
Binary files a/public/images/emoji/apple/woman_farmer.png and b/public/images/emoji/apple/woman_farmer.png differ
diff --git a/public/images/emoji/apple/woman_farmer/2.png b/public/images/emoji/apple/woman_farmer/2.png
index 3e846f6229..435d9beb0a 100644
Binary files a/public/images/emoji/apple/woman_farmer/2.png and b/public/images/emoji/apple/woman_farmer/2.png differ
diff --git a/public/images/emoji/apple/woman_farmer/3.png b/public/images/emoji/apple/woman_farmer/3.png
index 0f85dd55e3..ad801e3e8b 100644
Binary files a/public/images/emoji/apple/woman_farmer/3.png and b/public/images/emoji/apple/woman_farmer/3.png differ
diff --git a/public/images/emoji/apple/woman_farmer/4.png b/public/images/emoji/apple/woman_farmer/4.png
index 060fe1343f..3698cf1bdd 100644
Binary files a/public/images/emoji/apple/woman_farmer/4.png and b/public/images/emoji/apple/woman_farmer/4.png differ
diff --git a/public/images/emoji/apple/woman_farmer/5.png b/public/images/emoji/apple/woman_farmer/5.png
index 6917503665..73b7af0259 100644
Binary files a/public/images/emoji/apple/woman_farmer/5.png and b/public/images/emoji/apple/woman_farmer/5.png differ
diff --git a/public/images/emoji/apple/woman_farmer/6.png b/public/images/emoji/apple/woman_farmer/6.png
index 2537d80d57..5259aff1c6 100644
Binary files a/public/images/emoji/apple/woman_farmer/6.png and b/public/images/emoji/apple/woman_farmer/6.png differ
diff --git a/public/images/emoji/apple/woman_firefighter.png b/public/images/emoji/apple/woman_firefighter.png
index f5714b011c..5f59cf0244 100644
Binary files a/public/images/emoji/apple/woman_firefighter.png and b/public/images/emoji/apple/woman_firefighter.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/2.png b/public/images/emoji/apple/woman_firefighter/2.png
index 92722663c9..ff79202b74 100644
Binary files a/public/images/emoji/apple/woman_firefighter/2.png and b/public/images/emoji/apple/woman_firefighter/2.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/3.png b/public/images/emoji/apple/woman_firefighter/3.png
index a5e90cb633..943fef7085 100644
Binary files a/public/images/emoji/apple/woman_firefighter/3.png and b/public/images/emoji/apple/woman_firefighter/3.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/4.png b/public/images/emoji/apple/woman_firefighter/4.png
index 4b56a83064..57f507d640 100644
Binary files a/public/images/emoji/apple/woman_firefighter/4.png and b/public/images/emoji/apple/woman_firefighter/4.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/5.png b/public/images/emoji/apple/woman_firefighter/5.png
index 9b53eed204..1ac0104b33 100644
Binary files a/public/images/emoji/apple/woman_firefighter/5.png and b/public/images/emoji/apple/woman_firefighter/5.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/6.png b/public/images/emoji/apple/woman_firefighter/6.png
index e788760f72..1a4679d7e7 100644
Binary files a/public/images/emoji/apple/woman_firefighter/6.png and b/public/images/emoji/apple/woman_firefighter/6.png differ
diff --git a/public/images/emoji/apple/woman_health_worker.png b/public/images/emoji/apple/woman_health_worker.png
index 76e63a86e9..2776d43de8 100644
Binary files a/public/images/emoji/apple/woman_health_worker.png and b/public/images/emoji/apple/woman_health_worker.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/2.png b/public/images/emoji/apple/woman_health_worker/2.png
index fd3aaebd20..f92f2a3335 100644
Binary files a/public/images/emoji/apple/woman_health_worker/2.png and b/public/images/emoji/apple/woman_health_worker/2.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/3.png b/public/images/emoji/apple/woman_health_worker/3.png
index 606e2e81d6..4bfc03d5ce 100644
Binary files a/public/images/emoji/apple/woman_health_worker/3.png and b/public/images/emoji/apple/woman_health_worker/3.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/4.png b/public/images/emoji/apple/woman_health_worker/4.png
index eec739e9fc..b2cb3bd831 100644
Binary files a/public/images/emoji/apple/woman_health_worker/4.png and b/public/images/emoji/apple/woman_health_worker/4.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/5.png b/public/images/emoji/apple/woman_health_worker/5.png
index 6d2500304b..51c0aea51c 100644
Binary files a/public/images/emoji/apple/woman_health_worker/5.png and b/public/images/emoji/apple/woman_health_worker/5.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/6.png b/public/images/emoji/apple/woman_health_worker/6.png
index 2819c0f5a4..abfb3c21fc 100644
Binary files a/public/images/emoji/apple/woman_health_worker/6.png and b/public/images/emoji/apple/woman_health_worker/6.png differ
diff --git a/public/images/emoji/apple/woman_judge.png b/public/images/emoji/apple/woman_judge.png
index c67f17e130..c840252361 100644
Binary files a/public/images/emoji/apple/woman_judge.png and b/public/images/emoji/apple/woman_judge.png differ
diff --git a/public/images/emoji/apple/woman_judge/2.png b/public/images/emoji/apple/woman_judge/2.png
index 5a0ad48c26..ed4bbe56c5 100644
Binary files a/public/images/emoji/apple/woman_judge/2.png and b/public/images/emoji/apple/woman_judge/2.png differ
diff --git a/public/images/emoji/apple/woman_judge/3.png b/public/images/emoji/apple/woman_judge/3.png
index 45124f3c70..3592193656 100644
Binary files a/public/images/emoji/apple/woman_judge/3.png and b/public/images/emoji/apple/woman_judge/3.png differ
diff --git a/public/images/emoji/apple/woman_judge/4.png b/public/images/emoji/apple/woman_judge/4.png
index 00a22677ee..cfa68bab4c 100644
Binary files a/public/images/emoji/apple/woman_judge/4.png and b/public/images/emoji/apple/woman_judge/4.png differ
diff --git a/public/images/emoji/apple/woman_judge/5.png b/public/images/emoji/apple/woman_judge/5.png
index b346b61558..3d81730d02 100644
Binary files a/public/images/emoji/apple/woman_judge/5.png and b/public/images/emoji/apple/woman_judge/5.png differ
diff --git a/public/images/emoji/apple/woman_judge/6.png b/public/images/emoji/apple/woman_judge/6.png
index 9fa2d24786..e0eaf0c137 100644
Binary files a/public/images/emoji/apple/woman_judge/6.png and b/public/images/emoji/apple/woman_judge/6.png differ
diff --git a/public/images/emoji/apple/woman_juggling.png b/public/images/emoji/apple/woman_juggling.png
index ffd612a193..573f9dd1a6 100644
Binary files a/public/images/emoji/apple/woman_juggling.png and b/public/images/emoji/apple/woman_juggling.png differ
diff --git a/public/images/emoji/apple/woman_juggling/2.png b/public/images/emoji/apple/woman_juggling/2.png
index 4387658e44..1ca3138d4c 100644
Binary files a/public/images/emoji/apple/woman_juggling/2.png and b/public/images/emoji/apple/woman_juggling/2.png differ
diff --git a/public/images/emoji/apple/woman_juggling/3.png b/public/images/emoji/apple/woman_juggling/3.png
index 10749861f2..c9e2d8d868 100644
Binary files a/public/images/emoji/apple/woman_juggling/3.png and b/public/images/emoji/apple/woman_juggling/3.png differ
diff --git a/public/images/emoji/apple/woman_juggling/4.png b/public/images/emoji/apple/woman_juggling/4.png
index 86e73768b7..2d0634faad 100644
Binary files a/public/images/emoji/apple/woman_juggling/4.png and b/public/images/emoji/apple/woman_juggling/4.png differ
diff --git a/public/images/emoji/apple/woman_juggling/5.png b/public/images/emoji/apple/woman_juggling/5.png
index 9ab0c98d84..5aefb599de 100644
Binary files a/public/images/emoji/apple/woman_juggling/5.png and b/public/images/emoji/apple/woman_juggling/5.png differ
diff --git a/public/images/emoji/apple/woman_juggling/6.png b/public/images/emoji/apple/woman_juggling/6.png
index d5fdb9a3a7..dcee7ccd25 100644
Binary files a/public/images/emoji/apple/woman_juggling/6.png and b/public/images/emoji/apple/woman_juggling/6.png differ
diff --git a/public/images/emoji/apple/woman_mechanic.png b/public/images/emoji/apple/woman_mechanic.png
index 4f44652939..68c7e50b82 100644
Binary files a/public/images/emoji/apple/woman_mechanic.png and b/public/images/emoji/apple/woman_mechanic.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/2.png b/public/images/emoji/apple/woman_mechanic/2.png
index 17da6e1c33..0b6348801b 100644
Binary files a/public/images/emoji/apple/woman_mechanic/2.png and b/public/images/emoji/apple/woman_mechanic/2.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/3.png b/public/images/emoji/apple/woman_mechanic/3.png
index 14b322a0d9..1dd2cd9521 100644
Binary files a/public/images/emoji/apple/woman_mechanic/3.png and b/public/images/emoji/apple/woman_mechanic/3.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/4.png b/public/images/emoji/apple/woman_mechanic/4.png
index f9b7cb8bef..d7268f54d9 100644
Binary files a/public/images/emoji/apple/woman_mechanic/4.png and b/public/images/emoji/apple/woman_mechanic/4.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/5.png b/public/images/emoji/apple/woman_mechanic/5.png
index a307279650..44f8c0dfef 100644
Binary files a/public/images/emoji/apple/woman_mechanic/5.png and b/public/images/emoji/apple/woman_mechanic/5.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/6.png b/public/images/emoji/apple/woman_mechanic/6.png
index 4bf700c628..94781ce791 100644
Binary files a/public/images/emoji/apple/woman_mechanic/6.png and b/public/images/emoji/apple/woman_mechanic/6.png differ
diff --git a/public/images/emoji/apple/woman_office_worker.png b/public/images/emoji/apple/woman_office_worker.png
index ad0661cbf0..74c5afd1b0 100644
Binary files a/public/images/emoji/apple/woman_office_worker.png and b/public/images/emoji/apple/woman_office_worker.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/2.png b/public/images/emoji/apple/woman_office_worker/2.png
index cb9105925a..0e0269c6ac 100644
Binary files a/public/images/emoji/apple/woman_office_worker/2.png and b/public/images/emoji/apple/woman_office_worker/2.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/3.png b/public/images/emoji/apple/woman_office_worker/3.png
index 967eecf0bf..445ea71e79 100644
Binary files a/public/images/emoji/apple/woman_office_worker/3.png and b/public/images/emoji/apple/woman_office_worker/3.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/4.png b/public/images/emoji/apple/woman_office_worker/4.png
index 58c9a78593..027f29a71c 100644
Binary files a/public/images/emoji/apple/woman_office_worker/4.png and b/public/images/emoji/apple/woman_office_worker/4.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/5.png b/public/images/emoji/apple/woman_office_worker/5.png
index 14e8166360..78b587d3f5 100644
Binary files a/public/images/emoji/apple/woman_office_worker/5.png and b/public/images/emoji/apple/woman_office_worker/5.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/6.png b/public/images/emoji/apple/woman_office_worker/6.png
index b400c31a3e..4b93420877 100644
Binary files a/public/images/emoji/apple/woman_office_worker/6.png and b/public/images/emoji/apple/woman_office_worker/6.png differ
diff --git a/public/images/emoji/apple/woman_pilot.png b/public/images/emoji/apple/woman_pilot.png
index 671d7235bd..b4b4f5e3bd 100644
Binary files a/public/images/emoji/apple/woman_pilot.png and b/public/images/emoji/apple/woman_pilot.png differ
diff --git a/public/images/emoji/apple/woman_pilot/2.png b/public/images/emoji/apple/woman_pilot/2.png
index 8c6a425663..a770803704 100644
Binary files a/public/images/emoji/apple/woman_pilot/2.png and b/public/images/emoji/apple/woman_pilot/2.png differ
diff --git a/public/images/emoji/apple/woman_pilot/3.png b/public/images/emoji/apple/woman_pilot/3.png
index a8b2af7235..8392b27eb0 100644
Binary files a/public/images/emoji/apple/woman_pilot/3.png and b/public/images/emoji/apple/woman_pilot/3.png differ
diff --git a/public/images/emoji/apple/woman_pilot/4.png b/public/images/emoji/apple/woman_pilot/4.png
index ba132cad0f..230729d935 100644
Binary files a/public/images/emoji/apple/woman_pilot/4.png and b/public/images/emoji/apple/woman_pilot/4.png differ
diff --git a/public/images/emoji/apple/woman_pilot/5.png b/public/images/emoji/apple/woman_pilot/5.png
index 080cf51136..18034bef82 100644
Binary files a/public/images/emoji/apple/woman_pilot/5.png and b/public/images/emoji/apple/woman_pilot/5.png differ
diff --git a/public/images/emoji/apple/woman_pilot/6.png b/public/images/emoji/apple/woman_pilot/6.png
index 75029fcc0d..0efc7bd242 100644
Binary files a/public/images/emoji/apple/woman_pilot/6.png and b/public/images/emoji/apple/woman_pilot/6.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball.png b/public/images/emoji/apple/woman_playing_handball.png
index 9a03e9c23b..f369f5a2a6 100644
Binary files a/public/images/emoji/apple/woman_playing_handball.png and b/public/images/emoji/apple/woman_playing_handball.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/2.png b/public/images/emoji/apple/woman_playing_handball/2.png
index 346119656c..9fdce37f2c 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/2.png and b/public/images/emoji/apple/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/3.png b/public/images/emoji/apple/woman_playing_handball/3.png
index 3d61de41b4..82e2c900c8 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/3.png and b/public/images/emoji/apple/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/4.png b/public/images/emoji/apple/woman_playing_handball/4.png
index 1048ef5966..456eb64ab6 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/4.png and b/public/images/emoji/apple/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/5.png b/public/images/emoji/apple/woman_playing_handball/5.png
index b3364ccfe6..0c52aed175 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/5.png and b/public/images/emoji/apple/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/6.png b/public/images/emoji/apple/woman_playing_handball/6.png
index ca6f7369d9..20095dcef2 100644
Binary files a/public/images/emoji/apple/woman_playing_handball/6.png and b/public/images/emoji/apple/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo.png b/public/images/emoji/apple/woman_playing_water_polo.png
index adf9f3114e..9d3b174cf5 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo.png and b/public/images/emoji/apple/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/2.png b/public/images/emoji/apple/woman_playing_water_polo/2.png
index 73f8e3b6ac..1c0822b291 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/2.png and b/public/images/emoji/apple/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/3.png b/public/images/emoji/apple/woman_playing_water_polo/3.png
index 47daa87211..dbbb875435 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/3.png and b/public/images/emoji/apple/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/4.png b/public/images/emoji/apple/woman_playing_water_polo/4.png
index 58c5f97a44..7729b89c57 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/4.png and b/public/images/emoji/apple/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/5.png b/public/images/emoji/apple/woman_playing_water_polo/5.png
index d06753b0e2..22344ac583 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/5.png and b/public/images/emoji/apple/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/6.png b/public/images/emoji/apple/woman_playing_water_polo/6.png
index 6072d77097..2bc8195151 100644
Binary files a/public/images/emoji/apple/woman_playing_water_polo/6.png and b/public/images/emoji/apple/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/apple/woman_scientist.png b/public/images/emoji/apple/woman_scientist.png
index 0b250021df..5dc4f52b70 100644
Binary files a/public/images/emoji/apple/woman_scientist.png and b/public/images/emoji/apple/woman_scientist.png differ
diff --git a/public/images/emoji/apple/woman_scientist/2.png b/public/images/emoji/apple/woman_scientist/2.png
index 491be8a684..c44a1713c6 100644
Binary files a/public/images/emoji/apple/woman_scientist/2.png and b/public/images/emoji/apple/woman_scientist/2.png differ
diff --git a/public/images/emoji/apple/woman_scientist/3.png b/public/images/emoji/apple/woman_scientist/3.png
index ff4749d395..5a87da5779 100644
Binary files a/public/images/emoji/apple/woman_scientist/3.png and b/public/images/emoji/apple/woman_scientist/3.png differ
diff --git a/public/images/emoji/apple/woman_scientist/4.png b/public/images/emoji/apple/woman_scientist/4.png
index 5cabb438c9..2741e35080 100644
Binary files a/public/images/emoji/apple/woman_scientist/4.png and b/public/images/emoji/apple/woman_scientist/4.png differ
diff --git a/public/images/emoji/apple/woman_scientist/5.png b/public/images/emoji/apple/woman_scientist/5.png
index 28758853ed..fd77f91fc7 100644
Binary files a/public/images/emoji/apple/woman_scientist/5.png and b/public/images/emoji/apple/woman_scientist/5.png differ
diff --git a/public/images/emoji/apple/woman_scientist/6.png b/public/images/emoji/apple/woman_scientist/6.png
index 298a13fbe6..c83e188b7e 100644
Binary files a/public/images/emoji/apple/woman_scientist/6.png and b/public/images/emoji/apple/woman_scientist/6.png differ
diff --git a/public/images/emoji/apple/woman_shrugging.png b/public/images/emoji/apple/woman_shrugging.png
index 412e490d8c..e384872916 100644
Binary files a/public/images/emoji/apple/woman_shrugging.png and b/public/images/emoji/apple/woman_shrugging.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/2.png b/public/images/emoji/apple/woman_shrugging/2.png
index bdfc9f7ad2..6258d3a567 100644
Binary files a/public/images/emoji/apple/woman_shrugging/2.png and b/public/images/emoji/apple/woman_shrugging/2.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/3.png b/public/images/emoji/apple/woman_shrugging/3.png
index f68633a993..ab424e3b13 100644
Binary files a/public/images/emoji/apple/woman_shrugging/3.png and b/public/images/emoji/apple/woman_shrugging/3.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/4.png b/public/images/emoji/apple/woman_shrugging/4.png
index 7038c11ae2..2a391970cb 100644
Binary files a/public/images/emoji/apple/woman_shrugging/4.png and b/public/images/emoji/apple/woman_shrugging/4.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/5.png b/public/images/emoji/apple/woman_shrugging/5.png
index e8245f18e4..41d34c46ac 100644
Binary files a/public/images/emoji/apple/woman_shrugging/5.png and b/public/images/emoji/apple/woman_shrugging/5.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/6.png b/public/images/emoji/apple/woman_shrugging/6.png
index 96cf350ee3..50e6718dd8 100644
Binary files a/public/images/emoji/apple/woman_shrugging/6.png and b/public/images/emoji/apple/woman_shrugging/6.png differ
diff --git a/public/images/emoji/apple/woman_singer.png b/public/images/emoji/apple/woman_singer.png
index 9f248dab13..9900723438 100644
Binary files a/public/images/emoji/apple/woman_singer.png and b/public/images/emoji/apple/woman_singer.png differ
diff --git a/public/images/emoji/apple/woman_singer/2.png b/public/images/emoji/apple/woman_singer/2.png
index 2008017cde..c1dc8777a4 100644
Binary files a/public/images/emoji/apple/woman_singer/2.png and b/public/images/emoji/apple/woman_singer/2.png differ
diff --git a/public/images/emoji/apple/woman_singer/3.png b/public/images/emoji/apple/woman_singer/3.png
index 2875ffda44..bd51a11f1c 100644
Binary files a/public/images/emoji/apple/woman_singer/3.png and b/public/images/emoji/apple/woman_singer/3.png differ
diff --git a/public/images/emoji/apple/woman_singer/4.png b/public/images/emoji/apple/woman_singer/4.png
index 25f64dc20e..05fd5029b2 100644
Binary files a/public/images/emoji/apple/woman_singer/4.png and b/public/images/emoji/apple/woman_singer/4.png differ
diff --git a/public/images/emoji/apple/woman_singer/5.png b/public/images/emoji/apple/woman_singer/5.png
index e4dbaf142c..de64947c4d 100644
Binary files a/public/images/emoji/apple/woman_singer/5.png and b/public/images/emoji/apple/woman_singer/5.png differ
diff --git a/public/images/emoji/apple/woman_singer/6.png b/public/images/emoji/apple/woman_singer/6.png
index 18e544431f..08af03e921 100644
Binary files a/public/images/emoji/apple/woman_singer/6.png and b/public/images/emoji/apple/woman_singer/6.png differ
diff --git a/public/images/emoji/apple/woman_student.png b/public/images/emoji/apple/woman_student.png
index 6fcfe2aba0..c9eebc0777 100644
Binary files a/public/images/emoji/apple/woman_student.png and b/public/images/emoji/apple/woman_student.png differ
diff --git a/public/images/emoji/apple/woman_student/2.png b/public/images/emoji/apple/woman_student/2.png
index 38aa863d95..8597f38b17 100644
Binary files a/public/images/emoji/apple/woman_student/2.png and b/public/images/emoji/apple/woman_student/2.png differ
diff --git a/public/images/emoji/apple/woman_student/3.png b/public/images/emoji/apple/woman_student/3.png
index 312ab89a73..cef40dc8d9 100644
Binary files a/public/images/emoji/apple/woman_student/3.png and b/public/images/emoji/apple/woman_student/3.png differ
diff --git a/public/images/emoji/apple/woman_student/4.png b/public/images/emoji/apple/woman_student/4.png
index da8216b827..137aa1ea74 100644
Binary files a/public/images/emoji/apple/woman_student/4.png and b/public/images/emoji/apple/woman_student/4.png differ
diff --git a/public/images/emoji/apple/woman_student/5.png b/public/images/emoji/apple/woman_student/5.png
index 7bc31e0318..a58d349595 100644
Binary files a/public/images/emoji/apple/woman_student/5.png and b/public/images/emoji/apple/woman_student/5.png differ
diff --git a/public/images/emoji/apple/woman_student/6.png b/public/images/emoji/apple/woman_student/6.png
index 25e6123843..c4ce52f2f6 100644
Binary files a/public/images/emoji/apple/woman_student/6.png and b/public/images/emoji/apple/woman_student/6.png differ
diff --git a/public/images/emoji/apple/woman_teacher.png b/public/images/emoji/apple/woman_teacher.png
index 7f3b5516b2..1d973608c1 100644
Binary files a/public/images/emoji/apple/woman_teacher.png and b/public/images/emoji/apple/woman_teacher.png differ
diff --git a/public/images/emoji/apple/woman_teacher/2.png b/public/images/emoji/apple/woman_teacher/2.png
index c0f4abf643..fbcaa9827d 100644
Binary files a/public/images/emoji/apple/woman_teacher/2.png and b/public/images/emoji/apple/woman_teacher/2.png differ
diff --git a/public/images/emoji/apple/woman_teacher/3.png b/public/images/emoji/apple/woman_teacher/3.png
index 6c14f58aa5..3fd817058b 100644
Binary files a/public/images/emoji/apple/woman_teacher/3.png and b/public/images/emoji/apple/woman_teacher/3.png differ
diff --git a/public/images/emoji/apple/woman_teacher/4.png b/public/images/emoji/apple/woman_teacher/4.png
index faf928beaa..e2cac1cbcb 100644
Binary files a/public/images/emoji/apple/woman_teacher/4.png and b/public/images/emoji/apple/woman_teacher/4.png differ
diff --git a/public/images/emoji/apple/woman_teacher/5.png b/public/images/emoji/apple/woman_teacher/5.png
index 1ccaf76ca6..e50642b5a1 100644
Binary files a/public/images/emoji/apple/woman_teacher/5.png and b/public/images/emoji/apple/woman_teacher/5.png differ
diff --git a/public/images/emoji/apple/woman_teacher/6.png b/public/images/emoji/apple/woman_teacher/6.png
index 607e69c1c4..4b706564a6 100644
Binary files a/public/images/emoji/apple/woman_teacher/6.png and b/public/images/emoji/apple/woman_teacher/6.png differ
diff --git a/public/images/emoji/apple/woman_technologist.png b/public/images/emoji/apple/woman_technologist.png
index 2398b1c24e..286fa9e298 100644
Binary files a/public/images/emoji/apple/woman_technologist.png and b/public/images/emoji/apple/woman_technologist.png differ
diff --git a/public/images/emoji/apple/woman_technologist/2.png b/public/images/emoji/apple/woman_technologist/2.png
index 3992fec1bd..7984a6571c 100644
Binary files a/public/images/emoji/apple/woman_technologist/2.png and b/public/images/emoji/apple/woman_technologist/2.png differ
diff --git a/public/images/emoji/apple/woman_technologist/3.png b/public/images/emoji/apple/woman_technologist/3.png
index f7a1a66347..9b2f56a172 100644
Binary files a/public/images/emoji/apple/woman_technologist/3.png and b/public/images/emoji/apple/woman_technologist/3.png differ
diff --git a/public/images/emoji/apple/woman_technologist/4.png b/public/images/emoji/apple/woman_technologist/4.png
index f44b39dfed..a1edac0347 100644
Binary files a/public/images/emoji/apple/woman_technologist/4.png and b/public/images/emoji/apple/woman_technologist/4.png differ
diff --git a/public/images/emoji/apple/woman_technologist/5.png b/public/images/emoji/apple/woman_technologist/5.png
index 32e393d56d..fdad5a208e 100644
Binary files a/public/images/emoji/apple/woman_technologist/5.png and b/public/images/emoji/apple/woman_technologist/5.png differ
diff --git a/public/images/emoji/apple/woman_technologist/6.png b/public/images/emoji/apple/woman_technologist/6.png
index 50958f787b..7ceac85f98 100644
Binary files a/public/images/emoji/apple/woman_technologist/6.png and b/public/images/emoji/apple/woman_technologist/6.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf.png b/public/images/emoji/apple/woman_with_headscarf.png
index 6b3731cac8..21ef4d1a5c 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf.png and b/public/images/emoji/apple/woman_with_headscarf.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/2.png b/public/images/emoji/apple/woman_with_headscarf/2.png
index 511414ad6c..b4654b5943 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/2.png and b/public/images/emoji/apple/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/3.png b/public/images/emoji/apple/woman_with_headscarf/3.png
index af95435379..d47ad71cd3 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/3.png and b/public/images/emoji/apple/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/4.png b/public/images/emoji/apple/woman_with_headscarf/4.png
index 355bdeb636..1f71a81eb5 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/4.png and b/public/images/emoji/apple/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/5.png b/public/images/emoji/apple/woman_with_headscarf/5.png
index 8d0ad7202e..0c0579281d 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/5.png and b/public/images/emoji/apple/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/6.png b/public/images/emoji/apple/woman_with_headscarf/6.png
index 3c49195f87..87064763b1 100644
Binary files a/public/images/emoji/apple/woman_with_headscarf/6.png and b/public/images/emoji/apple/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/apple/woman_with_turban.png b/public/images/emoji/apple/woman_with_turban.png
index b9b6f95c5c..fbf9bbf706 100644
Binary files a/public/images/emoji/apple/woman_with_turban.png and b/public/images/emoji/apple/woman_with_turban.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/2.png b/public/images/emoji/apple/woman_with_turban/2.png
index 3be821a5f7..8981a93239 100644
Binary files a/public/images/emoji/apple/woman_with_turban/2.png and b/public/images/emoji/apple/woman_with_turban/2.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/3.png b/public/images/emoji/apple/woman_with_turban/3.png
index cb19d35ab3..9d60d55cf5 100644
Binary files a/public/images/emoji/apple/woman_with_turban/3.png and b/public/images/emoji/apple/woman_with_turban/3.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/4.png b/public/images/emoji/apple/woman_with_turban/4.png
index 45392c4130..b33d36f6d5 100644
Binary files a/public/images/emoji/apple/woman_with_turban/4.png and b/public/images/emoji/apple/woman_with_turban/4.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/5.png b/public/images/emoji/apple/woman_with_turban/5.png
index e5b510d196..cb371c1db7 100644
Binary files a/public/images/emoji/apple/woman_with_turban/5.png and b/public/images/emoji/apple/woman_with_turban/5.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/6.png b/public/images/emoji/apple/woman_with_turban/6.png
index d89b94bd4b..453bb3e6f6 100644
Binary files a/public/images/emoji/apple/woman_with_turban/6.png and b/public/images/emoji/apple/woman_with_turban/6.png differ
diff --git a/public/images/emoji/apple/womans_clothes.png b/public/images/emoji/apple/womans_clothes.png
index 3552fb6483..609694fff4 100644
Binary files a/public/images/emoji/apple/womans_clothes.png and b/public/images/emoji/apple/womans_clothes.png differ
diff --git a/public/images/emoji/apple/womans_hat.png b/public/images/emoji/apple/womans_hat.png
index 6244f5c30e..ef0d0fefec 100644
Binary files a/public/images/emoji/apple/womans_hat.png and b/public/images/emoji/apple/womans_hat.png differ
diff --git a/public/images/emoji/apple/women_wrestling.png b/public/images/emoji/apple/women_wrestling.png
index d344fc9cc3..8d8c1098a6 100644
Binary files a/public/images/emoji/apple/women_wrestling.png and b/public/images/emoji/apple/women_wrestling.png differ
diff --git a/public/images/emoji/apple/womens.png b/public/images/emoji/apple/womens.png
index 0518592460..da948fdc1a 100644
Binary files a/public/images/emoji/apple/womens.png and b/public/images/emoji/apple/womens.png differ
diff --git a/public/images/emoji/apple/world_map.png b/public/images/emoji/apple/world_map.png
index 9cd3f7decf..0f62ad91dd 100644
Binary files a/public/images/emoji/apple/world_map.png and b/public/images/emoji/apple/world_map.png differ
diff --git a/public/images/emoji/apple/worried.png b/public/images/emoji/apple/worried.png
index 41d4c7c12a..074c4ff4d0 100644
Binary files a/public/images/emoji/apple/worried.png and b/public/images/emoji/apple/worried.png differ
diff --git a/public/images/emoji/apple/worship_symbol.png b/public/images/emoji/apple/worship_symbol.png
index c8e1cecd39..43a2461763 100644
Binary files a/public/images/emoji/apple/worship_symbol.png and b/public/images/emoji/apple/worship_symbol.png differ
diff --git a/public/images/emoji/apple/wrench.png b/public/images/emoji/apple/wrench.png
index d958ea664a..737489c4d2 100644
Binary files a/public/images/emoji/apple/wrench.png and b/public/images/emoji/apple/wrench.png differ
diff --git a/public/images/emoji/apple/writing_hand.png b/public/images/emoji/apple/writing_hand.png
index 6812287950..bb00a4e396 100644
Binary files a/public/images/emoji/apple/writing_hand.png and b/public/images/emoji/apple/writing_hand.png differ
diff --git a/public/images/emoji/apple/writing_hand/2.png b/public/images/emoji/apple/writing_hand/2.png
index c017804a1a..4c3dd95161 100644
Binary files a/public/images/emoji/apple/writing_hand/2.png and b/public/images/emoji/apple/writing_hand/2.png differ
diff --git a/public/images/emoji/apple/writing_hand/3.png b/public/images/emoji/apple/writing_hand/3.png
index 59764dd649..0889563a3f 100644
Binary files a/public/images/emoji/apple/writing_hand/3.png and b/public/images/emoji/apple/writing_hand/3.png differ
diff --git a/public/images/emoji/apple/writing_hand/4.png b/public/images/emoji/apple/writing_hand/4.png
index 158aa52f05..d03f9397e3 100644
Binary files a/public/images/emoji/apple/writing_hand/4.png and b/public/images/emoji/apple/writing_hand/4.png differ
diff --git a/public/images/emoji/apple/writing_hand/5.png b/public/images/emoji/apple/writing_hand/5.png
index 85d3b01ade..2dbcc65239 100644
Binary files a/public/images/emoji/apple/writing_hand/5.png and b/public/images/emoji/apple/writing_hand/5.png differ
diff --git a/public/images/emoji/apple/writing_hand/6.png b/public/images/emoji/apple/writing_hand/6.png
index ca23a54b76..6faa12fde6 100644
Binary files a/public/images/emoji/apple/writing_hand/6.png and b/public/images/emoji/apple/writing_hand/6.png differ
diff --git a/public/images/emoji/apple/x.png b/public/images/emoji/apple/x.png
index 1ecd7f42a2..73efa2579f 100644
Binary files a/public/images/emoji/apple/x.png and b/public/images/emoji/apple/x.png differ
diff --git a/public/images/emoji/apple/yellow_heart.png b/public/images/emoji/apple/yellow_heart.png
index f554224f08..2582a23537 100644
Binary files a/public/images/emoji/apple/yellow_heart.png and b/public/images/emoji/apple/yellow_heart.png differ
diff --git a/public/images/emoji/apple/yemen.png b/public/images/emoji/apple/yemen.png
index d3ac4e1ed6..0d57e24f36 100644
Binary files a/public/images/emoji/apple/yemen.png and b/public/images/emoji/apple/yemen.png differ
diff --git a/public/images/emoji/apple/yen.png b/public/images/emoji/apple/yen.png
index 4ec18abab3..21023e510a 100644
Binary files a/public/images/emoji/apple/yen.png and b/public/images/emoji/apple/yen.png differ
diff --git a/public/images/emoji/apple/yin_yang.png b/public/images/emoji/apple/yin_yang.png
index 9e466a8693..c44ef4e819 100644
Binary files a/public/images/emoji/apple/yin_yang.png and b/public/images/emoji/apple/yin_yang.png differ
diff --git a/public/images/emoji/apple/yum.png b/public/images/emoji/apple/yum.png
index 1d849d566f..a188500e5a 100644
Binary files a/public/images/emoji/apple/yum.png and b/public/images/emoji/apple/yum.png differ
diff --git a/public/images/emoji/apple/zambia.png b/public/images/emoji/apple/zambia.png
index 04dfc3bdb2..be4ea17952 100644
Binary files a/public/images/emoji/apple/zambia.png and b/public/images/emoji/apple/zambia.png differ
diff --git a/public/images/emoji/apple/zap.png b/public/images/emoji/apple/zap.png
index c517566427..7ea5f85e88 100644
Binary files a/public/images/emoji/apple/zap.png and b/public/images/emoji/apple/zap.png differ
diff --git a/public/images/emoji/apple/zebra.png b/public/images/emoji/apple/zebra.png
index 6faa14f55d..db57ea29e7 100644
Binary files a/public/images/emoji/apple/zebra.png and b/public/images/emoji/apple/zebra.png differ
diff --git a/public/images/emoji/apple/zero.png b/public/images/emoji/apple/zero.png
index 4b2b38dce0..6a0d6d2e46 100644
Binary files a/public/images/emoji/apple/zero.png and b/public/images/emoji/apple/zero.png differ
diff --git a/public/images/emoji/apple/zimbabwe.png b/public/images/emoji/apple/zimbabwe.png
index 0470d4dd94..4e32c51b0a 100644
Binary files a/public/images/emoji/apple/zimbabwe.png and b/public/images/emoji/apple/zimbabwe.png differ
diff --git a/public/images/emoji/apple/zipper_mouth.png b/public/images/emoji/apple/zipper_mouth.png
index 8aaf44f5fd..9fb3055b85 100644
Binary files a/public/images/emoji/apple/zipper_mouth.png and b/public/images/emoji/apple/zipper_mouth.png differ
diff --git a/public/images/emoji/apple/zipper_mouth_face.png b/public/images/emoji/apple/zipper_mouth_face.png
index 8aaf44f5fd..9fb3055b85 100644
Binary files a/public/images/emoji/apple/zipper_mouth_face.png and b/public/images/emoji/apple/zipper_mouth_face.png differ
diff --git a/public/images/emoji/apple/zombie.png b/public/images/emoji/apple/zombie.png
index 1bf288fcd4..5022d41f80 100644
Binary files a/public/images/emoji/apple/zombie.png and b/public/images/emoji/apple/zombie.png differ
diff --git a/public/images/emoji/apple/zzz.png b/public/images/emoji/apple/zzz.png
index c8b4142b9f..baae35f775 100644
Binary files a/public/images/emoji/apple/zzz.png and b/public/images/emoji/apple/zzz.png differ
diff --git a/public/images/emoji/emoji_one/sushing_face.png b/public/images/emoji/emoji_one/shushing_face.png
similarity index 100%
rename from public/images/emoji/emoji_one/sushing_face.png
rename to public/images/emoji/emoji_one/shushing_face.png
diff --git a/public/images/emoji/facebook_messenger/+1.png b/public/images/emoji/facebook_messenger/+1.png
index 6621dc4a7b..53f1b3d075 100644
Binary files a/public/images/emoji/facebook_messenger/+1.png and b/public/images/emoji/facebook_messenger/+1.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/2.png b/public/images/emoji/facebook_messenger/+1/2.png
index 37b29f3252..eb5da604ed 100644
Binary files a/public/images/emoji/facebook_messenger/+1/2.png and b/public/images/emoji/facebook_messenger/+1/2.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/3.png b/public/images/emoji/facebook_messenger/+1/3.png
index c7aa537558..192910cdc2 100644
Binary files a/public/images/emoji/facebook_messenger/+1/3.png and b/public/images/emoji/facebook_messenger/+1/3.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/4.png b/public/images/emoji/facebook_messenger/+1/4.png
index 1e24d40e56..ec447b3076 100644
Binary files a/public/images/emoji/facebook_messenger/+1/4.png and b/public/images/emoji/facebook_messenger/+1/4.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/5.png b/public/images/emoji/facebook_messenger/+1/5.png
index 5b1740d87b..e09b86a9f1 100644
Binary files a/public/images/emoji/facebook_messenger/+1/5.png and b/public/images/emoji/facebook_messenger/+1/5.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/6.png b/public/images/emoji/facebook_messenger/+1/6.png
index e67bd06a2a..b43fad6805 100644
Binary files a/public/images/emoji/facebook_messenger/+1/6.png and b/public/images/emoji/facebook_messenger/+1/6.png differ
diff --git a/public/images/emoji/facebook_messenger/-1.png b/public/images/emoji/facebook_messenger/-1.png
index 1f6f64836b..6a7dce2614 100644
Binary files a/public/images/emoji/facebook_messenger/-1.png and b/public/images/emoji/facebook_messenger/-1.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/2.png b/public/images/emoji/facebook_messenger/-1/2.png
index e706d7c7a5..ceaa32b82f 100644
Binary files a/public/images/emoji/facebook_messenger/-1/2.png and b/public/images/emoji/facebook_messenger/-1/2.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/3.png b/public/images/emoji/facebook_messenger/-1/3.png
index 9bf7711367..c6d370ce27 100644
Binary files a/public/images/emoji/facebook_messenger/-1/3.png and b/public/images/emoji/facebook_messenger/-1/3.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/4.png b/public/images/emoji/facebook_messenger/-1/4.png
index 35fc141cba..212f843ce9 100644
Binary files a/public/images/emoji/facebook_messenger/-1/4.png and b/public/images/emoji/facebook_messenger/-1/4.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/5.png b/public/images/emoji/facebook_messenger/-1/5.png
index bd43bad304..2b2cf80548 100644
Binary files a/public/images/emoji/facebook_messenger/-1/5.png and b/public/images/emoji/facebook_messenger/-1/5.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/6.png b/public/images/emoji/facebook_messenger/-1/6.png
index 5b68287702..deb44ca2b3 100644
Binary files a/public/images/emoji/facebook_messenger/-1/6.png and b/public/images/emoji/facebook_messenger/-1/6.png differ
diff --git a/public/images/emoji/facebook_messenger/100.png b/public/images/emoji/facebook_messenger/100.png
index d6b5336e12..78dfa21ffb 100644
Binary files a/public/images/emoji/facebook_messenger/100.png and b/public/images/emoji/facebook_messenger/100.png differ
diff --git a/public/images/emoji/facebook_messenger/1234.png b/public/images/emoji/facebook_messenger/1234.png
index 44d2a4fc66..7419d45eaf 100644
Binary files a/public/images/emoji/facebook_messenger/1234.png and b/public/images/emoji/facebook_messenger/1234.png differ
diff --git a/public/images/emoji/facebook_messenger/1st_place_medal.png b/public/images/emoji/facebook_messenger/1st_place_medal.png
index 92235c693c..2e7efd77c8 100644
Binary files a/public/images/emoji/facebook_messenger/1st_place_medal.png and b/public/images/emoji/facebook_messenger/1st_place_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/2nd_place_medal.png b/public/images/emoji/facebook_messenger/2nd_place_medal.png
index 6eb5db8e21..531865180a 100644
Binary files a/public/images/emoji/facebook_messenger/2nd_place_medal.png and b/public/images/emoji/facebook_messenger/2nd_place_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/3rd_place_medal.png b/public/images/emoji/facebook_messenger/3rd_place_medal.png
index 4676f24e21..f4f0c3562e 100644
Binary files a/public/images/emoji/facebook_messenger/3rd_place_medal.png and b/public/images/emoji/facebook_messenger/3rd_place_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/8ball.png b/public/images/emoji/facebook_messenger/8ball.png
index 771ad02569..11cc716c11 100644
Binary files a/public/images/emoji/facebook_messenger/8ball.png and b/public/images/emoji/facebook_messenger/8ball.png differ
diff --git a/public/images/emoji/facebook_messenger/a.png b/public/images/emoji/facebook_messenger/a.png
index 501883feb4..55b11f4ec0 100644
Binary files a/public/images/emoji/facebook_messenger/a.png and b/public/images/emoji/facebook_messenger/a.png differ
diff --git a/public/images/emoji/facebook_messenger/ab.png b/public/images/emoji/facebook_messenger/ab.png
index e00355202a..963d76b053 100644
Binary files a/public/images/emoji/facebook_messenger/ab.png and b/public/images/emoji/facebook_messenger/ab.png differ
diff --git a/public/images/emoji/facebook_messenger/abc.png b/public/images/emoji/facebook_messenger/abc.png
index 1428e8a0ea..baaa45c9b2 100644
Binary files a/public/images/emoji/facebook_messenger/abc.png and b/public/images/emoji/facebook_messenger/abc.png differ
diff --git a/public/images/emoji/facebook_messenger/abcd.png b/public/images/emoji/facebook_messenger/abcd.png
index d1ce86be98..09f754c8b6 100644
Binary files a/public/images/emoji/facebook_messenger/abcd.png and b/public/images/emoji/facebook_messenger/abcd.png differ
diff --git a/public/images/emoji/facebook_messenger/accept.png b/public/images/emoji/facebook_messenger/accept.png
index 178a26fea0..958f0f7788 100644
Binary files a/public/images/emoji/facebook_messenger/accept.png and b/public/images/emoji/facebook_messenger/accept.png differ
diff --git a/public/images/emoji/facebook_messenger/admission_tickets.png b/public/images/emoji/facebook_messenger/admission_tickets.png
index 295e9bbdc6..e863f088be 100644
Binary files a/public/images/emoji/facebook_messenger/admission_tickets.png and b/public/images/emoji/facebook_messenger/admission_tickets.png differ
diff --git a/public/images/emoji/facebook_messenger/adult.png b/public/images/emoji/facebook_messenger/adult.png
index 53a5eb2ccb..d70004b157 100644
Binary files a/public/images/emoji/facebook_messenger/adult.png and b/public/images/emoji/facebook_messenger/adult.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/2.png b/public/images/emoji/facebook_messenger/adult/2.png
index 8f30fc9e38..c63a8b3197 100644
Binary files a/public/images/emoji/facebook_messenger/adult/2.png and b/public/images/emoji/facebook_messenger/adult/2.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/3.png b/public/images/emoji/facebook_messenger/adult/3.png
index 36a4e57d1f..dd38f3bd9f 100644
Binary files a/public/images/emoji/facebook_messenger/adult/3.png and b/public/images/emoji/facebook_messenger/adult/3.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/4.png b/public/images/emoji/facebook_messenger/adult/4.png
index 77c57605e9..94747d11cf 100644
Binary files a/public/images/emoji/facebook_messenger/adult/4.png and b/public/images/emoji/facebook_messenger/adult/4.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/5.png b/public/images/emoji/facebook_messenger/adult/5.png
index 58bcd6a2fc..73a7293ce5 100644
Binary files a/public/images/emoji/facebook_messenger/adult/5.png and b/public/images/emoji/facebook_messenger/adult/5.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/6.png b/public/images/emoji/facebook_messenger/adult/6.png
index 3bc6b5a57a..15932aaea8 100644
Binary files a/public/images/emoji/facebook_messenger/adult/6.png and b/public/images/emoji/facebook_messenger/adult/6.png differ
diff --git a/public/images/emoji/facebook_messenger/aerial_tramway.png b/public/images/emoji/facebook_messenger/aerial_tramway.png
index 417aad5844..278811eaf6 100644
Binary files a/public/images/emoji/facebook_messenger/aerial_tramway.png and b/public/images/emoji/facebook_messenger/aerial_tramway.png differ
diff --git a/public/images/emoji/facebook_messenger/afghanistan.png b/public/images/emoji/facebook_messenger/afghanistan.png
index 50c4c6b272..e4bd70e0cc 100644
Binary files a/public/images/emoji/facebook_messenger/afghanistan.png and b/public/images/emoji/facebook_messenger/afghanistan.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane.png b/public/images/emoji/facebook_messenger/airplane.png
index 4cd01455cd..1591f52a46 100644
Binary files a/public/images/emoji/facebook_messenger/airplane.png and b/public/images/emoji/facebook_messenger/airplane.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane_arriving.png b/public/images/emoji/facebook_messenger/airplane_arriving.png
index 0585a1c36c..4e22866646 100644
Binary files a/public/images/emoji/facebook_messenger/airplane_arriving.png and b/public/images/emoji/facebook_messenger/airplane_arriving.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane_departure.png b/public/images/emoji/facebook_messenger/airplane_departure.png
index dc86670a86..bfa84966f7 100644
Binary files a/public/images/emoji/facebook_messenger/airplane_departure.png and b/public/images/emoji/facebook_messenger/airplane_departure.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane_small.png b/public/images/emoji/facebook_messenger/airplane_small.png
index 47399184f7..110df28455 100644
Binary files a/public/images/emoji/facebook_messenger/airplane_small.png and b/public/images/emoji/facebook_messenger/airplane_small.png differ
diff --git a/public/images/emoji/facebook_messenger/aland_islands.png b/public/images/emoji/facebook_messenger/aland_islands.png
index 2ce958b920..27ccf56b7b 100644
Binary files a/public/images/emoji/facebook_messenger/aland_islands.png and b/public/images/emoji/facebook_messenger/aland_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/alarm_clock.png b/public/images/emoji/facebook_messenger/alarm_clock.png
index 8b2669f0ce..bf68033cbc 100644
Binary files a/public/images/emoji/facebook_messenger/alarm_clock.png and b/public/images/emoji/facebook_messenger/alarm_clock.png differ
diff --git a/public/images/emoji/facebook_messenger/albania.png b/public/images/emoji/facebook_messenger/albania.png
index 8d428869d4..86e6ef78a7 100644
Binary files a/public/images/emoji/facebook_messenger/albania.png and b/public/images/emoji/facebook_messenger/albania.png differ
diff --git a/public/images/emoji/facebook_messenger/alembic.png b/public/images/emoji/facebook_messenger/alembic.png
index cc2853f6d9..06f6bcfea7 100644
Binary files a/public/images/emoji/facebook_messenger/alembic.png and b/public/images/emoji/facebook_messenger/alembic.png differ
diff --git a/public/images/emoji/facebook_messenger/algeria.png b/public/images/emoji/facebook_messenger/algeria.png
index cd3dc01ab2..e00db341e1 100644
Binary files a/public/images/emoji/facebook_messenger/algeria.png and b/public/images/emoji/facebook_messenger/algeria.png differ
diff --git a/public/images/emoji/facebook_messenger/alien.png b/public/images/emoji/facebook_messenger/alien.png
index 00c53ca2bd..4f74102854 100644
Binary files a/public/images/emoji/facebook_messenger/alien.png and b/public/images/emoji/facebook_messenger/alien.png differ
diff --git a/public/images/emoji/facebook_messenger/ambulance.png b/public/images/emoji/facebook_messenger/ambulance.png
index 2700dcd39c..38215b61f8 100644
Binary files a/public/images/emoji/facebook_messenger/ambulance.png and b/public/images/emoji/facebook_messenger/ambulance.png differ
diff --git a/public/images/emoji/facebook_messenger/american_samoa.png b/public/images/emoji/facebook_messenger/american_samoa.png
index f4f58e2e25..61d8eab2fe 100644
Binary files a/public/images/emoji/facebook_messenger/american_samoa.png and b/public/images/emoji/facebook_messenger/american_samoa.png differ
diff --git a/public/images/emoji/facebook_messenger/amphora.png b/public/images/emoji/facebook_messenger/amphora.png
index 550f047067..d6548cfcc4 100644
Binary files a/public/images/emoji/facebook_messenger/amphora.png and b/public/images/emoji/facebook_messenger/amphora.png differ
diff --git a/public/images/emoji/facebook_messenger/anchor.png b/public/images/emoji/facebook_messenger/anchor.png
index ff5a1a69fb..b3114bceef 100644
Binary files a/public/images/emoji/facebook_messenger/anchor.png and b/public/images/emoji/facebook_messenger/anchor.png differ
diff --git a/public/images/emoji/facebook_messenger/andorra.png b/public/images/emoji/facebook_messenger/andorra.png
index 0fd73782c2..fdf8c39b42 100644
Binary files a/public/images/emoji/facebook_messenger/andorra.png and b/public/images/emoji/facebook_messenger/andorra.png differ
diff --git a/public/images/emoji/facebook_messenger/angel.png b/public/images/emoji/facebook_messenger/angel.png
index 8e51518eef..d7b42390ae 100644
Binary files a/public/images/emoji/facebook_messenger/angel.png and b/public/images/emoji/facebook_messenger/angel.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/2.png b/public/images/emoji/facebook_messenger/angel/2.png
index e0ca086f4c..9f6366e1f1 100644
Binary files a/public/images/emoji/facebook_messenger/angel/2.png and b/public/images/emoji/facebook_messenger/angel/2.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/3.png b/public/images/emoji/facebook_messenger/angel/3.png
index 6157d5e417..152b7ed700 100644
Binary files a/public/images/emoji/facebook_messenger/angel/3.png and b/public/images/emoji/facebook_messenger/angel/3.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/4.png b/public/images/emoji/facebook_messenger/angel/4.png
index 2e46b4983e..721ed57f21 100644
Binary files a/public/images/emoji/facebook_messenger/angel/4.png and b/public/images/emoji/facebook_messenger/angel/4.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/5.png b/public/images/emoji/facebook_messenger/angel/5.png
index 0869151648..88f9a9804e 100644
Binary files a/public/images/emoji/facebook_messenger/angel/5.png and b/public/images/emoji/facebook_messenger/angel/5.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/6.png b/public/images/emoji/facebook_messenger/angel/6.png
index 82c7fcb3cf..5edcf9d8f6 100644
Binary files a/public/images/emoji/facebook_messenger/angel/6.png and b/public/images/emoji/facebook_messenger/angel/6.png differ
diff --git a/public/images/emoji/facebook_messenger/anger.png b/public/images/emoji/facebook_messenger/anger.png
index 689a10c00f..4eb6dccaa2 100644
Binary files a/public/images/emoji/facebook_messenger/anger.png and b/public/images/emoji/facebook_messenger/anger.png differ
diff --git a/public/images/emoji/facebook_messenger/anger_right.png b/public/images/emoji/facebook_messenger/anger_right.png
index 3d3ee7dcfa..c9f3e48c81 100644
Binary files a/public/images/emoji/facebook_messenger/anger_right.png and b/public/images/emoji/facebook_messenger/anger_right.png differ
diff --git a/public/images/emoji/facebook_messenger/angola.png b/public/images/emoji/facebook_messenger/angola.png
index 5aca11a07e..a1a98b7e2a 100644
Binary files a/public/images/emoji/facebook_messenger/angola.png and b/public/images/emoji/facebook_messenger/angola.png differ
diff --git a/public/images/emoji/facebook_messenger/angry.png b/public/images/emoji/facebook_messenger/angry.png
index cedaec8a4d..e6b2466095 100644
Binary files a/public/images/emoji/facebook_messenger/angry.png and b/public/images/emoji/facebook_messenger/angry.png differ
diff --git a/public/images/emoji/facebook_messenger/anguilla.png b/public/images/emoji/facebook_messenger/anguilla.png
index d1006c6c19..66f543a1ec 100644
Binary files a/public/images/emoji/facebook_messenger/anguilla.png and b/public/images/emoji/facebook_messenger/anguilla.png differ
diff --git a/public/images/emoji/facebook_messenger/anguished.png b/public/images/emoji/facebook_messenger/anguished.png
index 52899f30da..41ea3c16c8 100644
Binary files a/public/images/emoji/facebook_messenger/anguished.png and b/public/images/emoji/facebook_messenger/anguished.png differ
diff --git a/public/images/emoji/facebook_messenger/ant.png b/public/images/emoji/facebook_messenger/ant.png
index 2bab6a6f12..c4388256a3 100644
Binary files a/public/images/emoji/facebook_messenger/ant.png and b/public/images/emoji/facebook_messenger/ant.png differ
diff --git a/public/images/emoji/facebook_messenger/antarctica.png b/public/images/emoji/facebook_messenger/antarctica.png
index 5a6759de63..387d47f5bb 100644
Binary files a/public/images/emoji/facebook_messenger/antarctica.png and b/public/images/emoji/facebook_messenger/antarctica.png differ
diff --git a/public/images/emoji/facebook_messenger/antigua_barbuda.png b/public/images/emoji/facebook_messenger/antigua_barbuda.png
index e3ff113cba..0655dfa9d8 100644
Binary files a/public/images/emoji/facebook_messenger/antigua_barbuda.png and b/public/images/emoji/facebook_messenger/antigua_barbuda.png differ
diff --git a/public/images/emoji/facebook_messenger/apple.png b/public/images/emoji/facebook_messenger/apple.png
index 97c4bbdd6d..46ec06ea24 100644
Binary files a/public/images/emoji/facebook_messenger/apple.png and b/public/images/emoji/facebook_messenger/apple.png differ
diff --git a/public/images/emoji/facebook_messenger/aquarius.png b/public/images/emoji/facebook_messenger/aquarius.png
index bee7380c6c..f81db33ca6 100644
Binary files a/public/images/emoji/facebook_messenger/aquarius.png and b/public/images/emoji/facebook_messenger/aquarius.png differ
diff --git a/public/images/emoji/facebook_messenger/archery.png b/public/images/emoji/facebook_messenger/archery.png
index f50a1389fe..eba0a0deeb 100644
Binary files a/public/images/emoji/facebook_messenger/archery.png and b/public/images/emoji/facebook_messenger/archery.png differ
diff --git a/public/images/emoji/facebook_messenger/argentina.png b/public/images/emoji/facebook_messenger/argentina.png
index 1e5e815098..b8581e08d7 100644
Binary files a/public/images/emoji/facebook_messenger/argentina.png and b/public/images/emoji/facebook_messenger/argentina.png differ
diff --git a/public/images/emoji/facebook_messenger/aries.png b/public/images/emoji/facebook_messenger/aries.png
index 270321de17..0223295e50 100644
Binary files a/public/images/emoji/facebook_messenger/aries.png and b/public/images/emoji/facebook_messenger/aries.png differ
diff --git a/public/images/emoji/facebook_messenger/armenia.png b/public/images/emoji/facebook_messenger/armenia.png
index 846307fcf3..546e4c9fae 100644
Binary files a/public/images/emoji/facebook_messenger/armenia.png and b/public/images/emoji/facebook_messenger/armenia.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_backward.png b/public/images/emoji/facebook_messenger/arrow_backward.png
index 31bc57f66e..130d818226 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_backward.png and b/public/images/emoji/facebook_messenger/arrow_backward.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_double_down.png b/public/images/emoji/facebook_messenger/arrow_double_down.png
index 0d55a3b8a5..3ba9966d5c 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_double_down.png and b/public/images/emoji/facebook_messenger/arrow_double_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_double_up.png b/public/images/emoji/facebook_messenger/arrow_double_up.png
index 3e26428da1..fd19d0666a 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_double_up.png and b/public/images/emoji/facebook_messenger/arrow_double_up.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_down.png b/public/images/emoji/facebook_messenger/arrow_down.png
index cea37e3f45..12849775a2 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_down.png and b/public/images/emoji/facebook_messenger/arrow_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_down_small.png b/public/images/emoji/facebook_messenger/arrow_down_small.png
index 26f28620d3..1902d03537 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_down_small.png and b/public/images/emoji/facebook_messenger/arrow_down_small.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_forward.png b/public/images/emoji/facebook_messenger/arrow_forward.png
index b7f0770bfa..e6061821e4 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_forward.png and b/public/images/emoji/facebook_messenger/arrow_forward.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_heading_down.png b/public/images/emoji/facebook_messenger/arrow_heading_down.png
index d0031653e0..6a6228d3f0 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_heading_down.png and b/public/images/emoji/facebook_messenger/arrow_heading_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_heading_up.png b/public/images/emoji/facebook_messenger/arrow_heading_up.png
index d95ee952c3..3123994b1d 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_heading_up.png and b/public/images/emoji/facebook_messenger/arrow_heading_up.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_left.png b/public/images/emoji/facebook_messenger/arrow_left.png
index 0bd799e866..ae620c31d6 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_left.png and b/public/images/emoji/facebook_messenger/arrow_left.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_lower_left.png b/public/images/emoji/facebook_messenger/arrow_lower_left.png
index 230b491ccb..4288a049ef 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_lower_left.png and b/public/images/emoji/facebook_messenger/arrow_lower_left.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_lower_right.png b/public/images/emoji/facebook_messenger/arrow_lower_right.png
index 2cb9ab11bb..385137287d 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_lower_right.png and b/public/images/emoji/facebook_messenger/arrow_lower_right.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_right.png b/public/images/emoji/facebook_messenger/arrow_right.png
index 08a9c6e85b..eecdb6a67a 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_right.png and b/public/images/emoji/facebook_messenger/arrow_right.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_right_hook.png b/public/images/emoji/facebook_messenger/arrow_right_hook.png
index 10e84d8f5d..400f8be14c 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_right_hook.png and b/public/images/emoji/facebook_messenger/arrow_right_hook.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_up.png b/public/images/emoji/facebook_messenger/arrow_up.png
index d87df932aa..c45961fece 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_up.png and b/public/images/emoji/facebook_messenger/arrow_up.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_up_down.png b/public/images/emoji/facebook_messenger/arrow_up_down.png
index 0262977544..d41e69dd89 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_up_down.png and b/public/images/emoji/facebook_messenger/arrow_up_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_up_small.png b/public/images/emoji/facebook_messenger/arrow_up_small.png
index f2eff4c904..7022016ea7 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_up_small.png and b/public/images/emoji/facebook_messenger/arrow_up_small.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_upper_left.png b/public/images/emoji/facebook_messenger/arrow_upper_left.png
index 8ac358c63f..73041d2f30 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_upper_left.png and b/public/images/emoji/facebook_messenger/arrow_upper_left.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_upper_right.png b/public/images/emoji/facebook_messenger/arrow_upper_right.png
index 29700d0bf7..96382a22c7 100644
Binary files a/public/images/emoji/facebook_messenger/arrow_upper_right.png and b/public/images/emoji/facebook_messenger/arrow_upper_right.png differ
diff --git a/public/images/emoji/facebook_messenger/arrows_clockwise.png b/public/images/emoji/facebook_messenger/arrows_clockwise.png
index 04755b3923..45ae5473a5 100644
Binary files a/public/images/emoji/facebook_messenger/arrows_clockwise.png and b/public/images/emoji/facebook_messenger/arrows_clockwise.png differ
diff --git a/public/images/emoji/facebook_messenger/arrows_counterclockwise.png b/public/images/emoji/facebook_messenger/arrows_counterclockwise.png
index 8d16454516..dc32223232 100644
Binary files a/public/images/emoji/facebook_messenger/arrows_counterclockwise.png and b/public/images/emoji/facebook_messenger/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/facebook_messenger/art.png b/public/images/emoji/facebook_messenger/art.png
index 416c995030..7f2a869348 100644
Binary files a/public/images/emoji/facebook_messenger/art.png and b/public/images/emoji/facebook_messenger/art.png differ
diff --git a/public/images/emoji/facebook_messenger/articulated_lorry.png b/public/images/emoji/facebook_messenger/articulated_lorry.png
index d965f6a490..6a01eb5f96 100644
Binary files a/public/images/emoji/facebook_messenger/articulated_lorry.png and b/public/images/emoji/facebook_messenger/articulated_lorry.png differ
diff --git a/public/images/emoji/facebook_messenger/artificial_satellite.png b/public/images/emoji/facebook_messenger/artificial_satellite.png
index 81715516af..d50cf91954 100644
Binary files a/public/images/emoji/facebook_messenger/artificial_satellite.png and b/public/images/emoji/facebook_messenger/artificial_satellite.png differ
diff --git a/public/images/emoji/facebook_messenger/aruba.png b/public/images/emoji/facebook_messenger/aruba.png
index 459facc13b..bbd1acac5d 100644
Binary files a/public/images/emoji/facebook_messenger/aruba.png and b/public/images/emoji/facebook_messenger/aruba.png differ
diff --git a/public/images/emoji/facebook_messenger/ascension_island.png b/public/images/emoji/facebook_messenger/ascension_island.png
index 2e3a1fdd73..1f04f48a0c 100644
Binary files a/public/images/emoji/facebook_messenger/ascension_island.png and b/public/images/emoji/facebook_messenger/ascension_island.png differ
diff --git a/public/images/emoji/facebook_messenger/asterisk.png b/public/images/emoji/facebook_messenger/asterisk.png
index 2bfefce2be..a009bc2cda 100644
Binary files a/public/images/emoji/facebook_messenger/asterisk.png and b/public/images/emoji/facebook_messenger/asterisk.png differ
diff --git a/public/images/emoji/facebook_messenger/astonished.png b/public/images/emoji/facebook_messenger/astonished.png
index 915e481889..0cb60d865e 100644
Binary files a/public/images/emoji/facebook_messenger/astonished.png and b/public/images/emoji/facebook_messenger/astonished.png differ
diff --git a/public/images/emoji/facebook_messenger/athletic_shoe.png b/public/images/emoji/facebook_messenger/athletic_shoe.png
index 5c5909a17d..dab191424b 100644
Binary files a/public/images/emoji/facebook_messenger/athletic_shoe.png and b/public/images/emoji/facebook_messenger/athletic_shoe.png differ
diff --git a/public/images/emoji/facebook_messenger/atm.png b/public/images/emoji/facebook_messenger/atm.png
index 4cfeb25e64..fb14b328e7 100644
Binary files a/public/images/emoji/facebook_messenger/atm.png and b/public/images/emoji/facebook_messenger/atm.png differ
diff --git a/public/images/emoji/facebook_messenger/atom.png b/public/images/emoji/facebook_messenger/atom.png
index 3d27cd8953..de8f524127 100644
Binary files a/public/images/emoji/facebook_messenger/atom.png and b/public/images/emoji/facebook_messenger/atom.png differ
diff --git a/public/images/emoji/facebook_messenger/atom_symbol.png b/public/images/emoji/facebook_messenger/atom_symbol.png
index 3d27cd8953..de8f524127 100644
Binary files a/public/images/emoji/facebook_messenger/atom_symbol.png and b/public/images/emoji/facebook_messenger/atom_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/australia.png b/public/images/emoji/facebook_messenger/australia.png
index edd74bfd73..fa2f3852cb 100644
Binary files a/public/images/emoji/facebook_messenger/australia.png and b/public/images/emoji/facebook_messenger/australia.png differ
diff --git a/public/images/emoji/facebook_messenger/austria.png b/public/images/emoji/facebook_messenger/austria.png
index c0e176217b..54a96ff5f9 100644
Binary files a/public/images/emoji/facebook_messenger/austria.png and b/public/images/emoji/facebook_messenger/austria.png differ
diff --git a/public/images/emoji/facebook_messenger/automobile.png b/public/images/emoji/facebook_messenger/automobile.png
index 024cdb23b5..ba661ecefd 100644
Binary files a/public/images/emoji/facebook_messenger/automobile.png and b/public/images/emoji/facebook_messenger/automobile.png differ
diff --git a/public/images/emoji/facebook_messenger/avocado.png b/public/images/emoji/facebook_messenger/avocado.png
index faa8c8fbe7..1c54fda2c7 100644
Binary files a/public/images/emoji/facebook_messenger/avocado.png and b/public/images/emoji/facebook_messenger/avocado.png differ
diff --git a/public/images/emoji/facebook_messenger/azerbaijan.png b/public/images/emoji/facebook_messenger/azerbaijan.png
index 59b4ecf2a0..a5689d93da 100644
Binary files a/public/images/emoji/facebook_messenger/azerbaijan.png and b/public/images/emoji/facebook_messenger/azerbaijan.png differ
diff --git a/public/images/emoji/facebook_messenger/b.png b/public/images/emoji/facebook_messenger/b.png
index 4e3c3241ee..9679d4109b 100644
Binary files a/public/images/emoji/facebook_messenger/b.png and b/public/images/emoji/facebook_messenger/b.png differ
diff --git a/public/images/emoji/facebook_messenger/baby.png b/public/images/emoji/facebook_messenger/baby.png
index 3250db1a61..192b1e3aa4 100644
Binary files a/public/images/emoji/facebook_messenger/baby.png and b/public/images/emoji/facebook_messenger/baby.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/2.png b/public/images/emoji/facebook_messenger/baby/2.png
index ba7d05faa1..27e7de7446 100644
Binary files a/public/images/emoji/facebook_messenger/baby/2.png and b/public/images/emoji/facebook_messenger/baby/2.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/3.png b/public/images/emoji/facebook_messenger/baby/3.png
index 02393b8bf1..617a54702d 100644
Binary files a/public/images/emoji/facebook_messenger/baby/3.png and b/public/images/emoji/facebook_messenger/baby/3.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/4.png b/public/images/emoji/facebook_messenger/baby/4.png
index 43b9d1234c..c81aacca05 100644
Binary files a/public/images/emoji/facebook_messenger/baby/4.png and b/public/images/emoji/facebook_messenger/baby/4.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/5.png b/public/images/emoji/facebook_messenger/baby/5.png
index 8d394e75d9..940b70c960 100644
Binary files a/public/images/emoji/facebook_messenger/baby/5.png and b/public/images/emoji/facebook_messenger/baby/5.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/6.png b/public/images/emoji/facebook_messenger/baby/6.png
index db838c4790..95153c3a12 100644
Binary files a/public/images/emoji/facebook_messenger/baby/6.png and b/public/images/emoji/facebook_messenger/baby/6.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_bottle.png b/public/images/emoji/facebook_messenger/baby_bottle.png
index 8a7f5d0409..7ffbf050da 100644
Binary files a/public/images/emoji/facebook_messenger/baby_bottle.png and b/public/images/emoji/facebook_messenger/baby_bottle.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_chick.png b/public/images/emoji/facebook_messenger/baby_chick.png
index c01948acd5..35031b2b1d 100644
Binary files a/public/images/emoji/facebook_messenger/baby_chick.png and b/public/images/emoji/facebook_messenger/baby_chick.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_symbol.png b/public/images/emoji/facebook_messenger/baby_symbol.png
index d90dc597c1..29d467e1c3 100644
Binary files a/public/images/emoji/facebook_messenger/baby_symbol.png and b/public/images/emoji/facebook_messenger/baby_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/back.png b/public/images/emoji/facebook_messenger/back.png
index b38f526062..74adb96ec8 100644
Binary files a/public/images/emoji/facebook_messenger/back.png and b/public/images/emoji/facebook_messenger/back.png differ
diff --git a/public/images/emoji/facebook_messenger/bacon.png b/public/images/emoji/facebook_messenger/bacon.png
index b1cfa9dc3b..a1641e680e 100644
Binary files a/public/images/emoji/facebook_messenger/bacon.png and b/public/images/emoji/facebook_messenger/bacon.png differ
diff --git a/public/images/emoji/facebook_messenger/badminton.png b/public/images/emoji/facebook_messenger/badminton.png
index 3b5d0df295..6c76fb84fb 100644
Binary files a/public/images/emoji/facebook_messenger/badminton.png and b/public/images/emoji/facebook_messenger/badminton.png differ
diff --git a/public/images/emoji/facebook_messenger/baggage_claim.png b/public/images/emoji/facebook_messenger/baggage_claim.png
index 62234d5dba..1e2b83d35f 100644
Binary files a/public/images/emoji/facebook_messenger/baggage_claim.png and b/public/images/emoji/facebook_messenger/baggage_claim.png differ
diff --git a/public/images/emoji/facebook_messenger/baguette_bread.png b/public/images/emoji/facebook_messenger/baguette_bread.png
index 3be5a53903..91558c2a20 100644
Binary files a/public/images/emoji/facebook_messenger/baguette_bread.png and b/public/images/emoji/facebook_messenger/baguette_bread.png differ
diff --git a/public/images/emoji/facebook_messenger/bahamas.png b/public/images/emoji/facebook_messenger/bahamas.png
index ed95128e19..ad1fccb6f0 100644
Binary files a/public/images/emoji/facebook_messenger/bahamas.png and b/public/images/emoji/facebook_messenger/bahamas.png differ
diff --git a/public/images/emoji/facebook_messenger/bahrain.png b/public/images/emoji/facebook_messenger/bahrain.png
index 815a93ef0b..3493584047 100644
Binary files a/public/images/emoji/facebook_messenger/bahrain.png and b/public/images/emoji/facebook_messenger/bahrain.png differ
diff --git a/public/images/emoji/facebook_messenger/balance_scale.png b/public/images/emoji/facebook_messenger/balance_scale.png
index 75713abc23..a9e4f53e97 100644
Binary files a/public/images/emoji/facebook_messenger/balance_scale.png and b/public/images/emoji/facebook_messenger/balance_scale.png differ
diff --git a/public/images/emoji/facebook_messenger/balloon.png b/public/images/emoji/facebook_messenger/balloon.png
index 4c1986ac6f..a2257da1cd 100644
Binary files a/public/images/emoji/facebook_messenger/balloon.png and b/public/images/emoji/facebook_messenger/balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/ballot_box.png b/public/images/emoji/facebook_messenger/ballot_box.png
index 59bfa2ae2f..5536b98437 100644
Binary files a/public/images/emoji/facebook_messenger/ballot_box.png and b/public/images/emoji/facebook_messenger/ballot_box.png differ
diff --git a/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png b/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png
index 59bfa2ae2f..5536b98437 100644
Binary files a/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png and b/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/facebook_messenger/ballot_box_with_check.png b/public/images/emoji/facebook_messenger/ballot_box_with_check.png
index 80b2e3fda4..ff72c53602 100644
Binary files a/public/images/emoji/facebook_messenger/ballot_box_with_check.png and b/public/images/emoji/facebook_messenger/ballot_box_with_check.png differ
diff --git a/public/images/emoji/facebook_messenger/bamboo.png b/public/images/emoji/facebook_messenger/bamboo.png
index f364eba710..2cbf57618c 100644
Binary files a/public/images/emoji/facebook_messenger/bamboo.png and b/public/images/emoji/facebook_messenger/bamboo.png differ
diff --git a/public/images/emoji/facebook_messenger/banana.png b/public/images/emoji/facebook_messenger/banana.png
index cf8781b5ef..302581faf9 100644
Binary files a/public/images/emoji/facebook_messenger/banana.png and b/public/images/emoji/facebook_messenger/banana.png differ
diff --git a/public/images/emoji/facebook_messenger/bangbang.png b/public/images/emoji/facebook_messenger/bangbang.png
index f14ac06077..8e9678240d 100644
Binary files a/public/images/emoji/facebook_messenger/bangbang.png and b/public/images/emoji/facebook_messenger/bangbang.png differ
diff --git a/public/images/emoji/facebook_messenger/bangladesh.png b/public/images/emoji/facebook_messenger/bangladesh.png
index caab400018..30cef30b4e 100644
Binary files a/public/images/emoji/facebook_messenger/bangladesh.png and b/public/images/emoji/facebook_messenger/bangladesh.png differ
diff --git a/public/images/emoji/facebook_messenger/bank.png b/public/images/emoji/facebook_messenger/bank.png
index bb8a282801..b38b5bb1e5 100644
Binary files a/public/images/emoji/facebook_messenger/bank.png and b/public/images/emoji/facebook_messenger/bank.png differ
diff --git a/public/images/emoji/facebook_messenger/bar_chart.png b/public/images/emoji/facebook_messenger/bar_chart.png
index 2cd9961c95..d9b4b6e106 100644
Binary files a/public/images/emoji/facebook_messenger/bar_chart.png and b/public/images/emoji/facebook_messenger/bar_chart.png differ
diff --git a/public/images/emoji/facebook_messenger/barbados.png b/public/images/emoji/facebook_messenger/barbados.png
index 830578344d..4a2d7d3050 100644
Binary files a/public/images/emoji/facebook_messenger/barbados.png and b/public/images/emoji/facebook_messenger/barbados.png differ
diff --git a/public/images/emoji/facebook_messenger/barber.png b/public/images/emoji/facebook_messenger/barber.png
index 2cdda450a8..2b4c6ab305 100644
Binary files a/public/images/emoji/facebook_messenger/barber.png and b/public/images/emoji/facebook_messenger/barber.png differ
diff --git a/public/images/emoji/facebook_messenger/baseball.png b/public/images/emoji/facebook_messenger/baseball.png
index 20a21d567e..f39fbbf099 100644
Binary files a/public/images/emoji/facebook_messenger/baseball.png and b/public/images/emoji/facebook_messenger/baseball.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball.png b/public/images/emoji/facebook_messenger/basketball.png
index fbff78ffbb..702a48a1a5 100644
Binary files a/public/images/emoji/facebook_messenger/basketball.png and b/public/images/emoji/facebook_messenger/basketball.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man.png b/public/images/emoji/facebook_messenger/basketball_man.png
index ac6a6c2c9f..fc307b60c9 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man.png and b/public/images/emoji/facebook_messenger/basketball_man.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/2.png b/public/images/emoji/facebook_messenger/basketball_man/2.png
index 4dad1da7db..cdd5c25469 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/2.png and b/public/images/emoji/facebook_messenger/basketball_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/3.png b/public/images/emoji/facebook_messenger/basketball_man/3.png
index 739f1de58c..e4630e522c 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/3.png and b/public/images/emoji/facebook_messenger/basketball_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/4.png b/public/images/emoji/facebook_messenger/basketball_man/4.png
index 62a23de466..8fbdb822fc 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/4.png and b/public/images/emoji/facebook_messenger/basketball_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/5.png b/public/images/emoji/facebook_messenger/basketball_man/5.png
index 2cd9628b76..047897cbf5 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/5.png and b/public/images/emoji/facebook_messenger/basketball_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/6.png b/public/images/emoji/facebook_messenger/basketball_man/6.png
index 85bfaeb578..4592818525 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_man/6.png and b/public/images/emoji/facebook_messenger/basketball_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player.png b/public/images/emoji/facebook_messenger/basketball_player.png
index ac6a6c2c9f..fc307b60c9 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player.png and b/public/images/emoji/facebook_messenger/basketball_player.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/2.png b/public/images/emoji/facebook_messenger/basketball_player/2.png
index 4dad1da7db..cdd5c25469 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/2.png and b/public/images/emoji/facebook_messenger/basketball_player/2.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/3.png b/public/images/emoji/facebook_messenger/basketball_player/3.png
index 739f1de58c..e4630e522c 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/3.png and b/public/images/emoji/facebook_messenger/basketball_player/3.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/4.png b/public/images/emoji/facebook_messenger/basketball_player/4.png
index 62a23de466..8fbdb822fc 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/4.png and b/public/images/emoji/facebook_messenger/basketball_player/4.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/5.png b/public/images/emoji/facebook_messenger/basketball_player/5.png
index 2cd9628b76..047897cbf5 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/5.png and b/public/images/emoji/facebook_messenger/basketball_player/5.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/6.png b/public/images/emoji/facebook_messenger/basketball_player/6.png
index 85bfaeb578..4592818525 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_player/6.png and b/public/images/emoji/facebook_messenger/basketball_player/6.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_woman.png b/public/images/emoji/facebook_messenger/basketball_woman.png
index 7df66bcfb7..febb3c03b6 100644
Binary files a/public/images/emoji/facebook_messenger/basketball_woman.png and b/public/images/emoji/facebook_messenger/basketball_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/bat.png b/public/images/emoji/facebook_messenger/bat.png
index d997111fc5..8e046d8509 100644
Binary files a/public/images/emoji/facebook_messenger/bat.png and b/public/images/emoji/facebook_messenger/bat.png differ
diff --git a/public/images/emoji/facebook_messenger/bath.png b/public/images/emoji/facebook_messenger/bath.png
index 2173defed8..ed123b48c6 100644
Binary files a/public/images/emoji/facebook_messenger/bath.png and b/public/images/emoji/facebook_messenger/bath.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/2.png b/public/images/emoji/facebook_messenger/bath/2.png
index 9ca3e7b1cb..8c46841369 100644
Binary files a/public/images/emoji/facebook_messenger/bath/2.png and b/public/images/emoji/facebook_messenger/bath/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/3.png b/public/images/emoji/facebook_messenger/bath/3.png
index 2ffaa93680..2e138cde56 100644
Binary files a/public/images/emoji/facebook_messenger/bath/3.png and b/public/images/emoji/facebook_messenger/bath/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/4.png b/public/images/emoji/facebook_messenger/bath/4.png
index 008ff97772..dae85ebae1 100644
Binary files a/public/images/emoji/facebook_messenger/bath/4.png and b/public/images/emoji/facebook_messenger/bath/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/5.png b/public/images/emoji/facebook_messenger/bath/5.png
index 09c0ac3fe9..5dad5eb07f 100644
Binary files a/public/images/emoji/facebook_messenger/bath/5.png and b/public/images/emoji/facebook_messenger/bath/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/6.png b/public/images/emoji/facebook_messenger/bath/6.png
index 857b92f231..9f10640cf6 100644
Binary files a/public/images/emoji/facebook_messenger/bath/6.png and b/public/images/emoji/facebook_messenger/bath/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bathtub.png b/public/images/emoji/facebook_messenger/bathtub.png
index 6ac723e1c8..924ff3acd4 100644
Binary files a/public/images/emoji/facebook_messenger/bathtub.png and b/public/images/emoji/facebook_messenger/bathtub.png differ
diff --git a/public/images/emoji/facebook_messenger/battery.png b/public/images/emoji/facebook_messenger/battery.png
index a63f16624f..2b390fa736 100644
Binary files a/public/images/emoji/facebook_messenger/battery.png and b/public/images/emoji/facebook_messenger/battery.png differ
diff --git a/public/images/emoji/facebook_messenger/beach.png b/public/images/emoji/facebook_messenger/beach.png
index 894e33bee1..953bbe38d6 100644
Binary files a/public/images/emoji/facebook_messenger/beach.png and b/public/images/emoji/facebook_messenger/beach.png differ
diff --git a/public/images/emoji/facebook_messenger/beach_umbrella.png b/public/images/emoji/facebook_messenger/beach_umbrella.png
index 894e33bee1..953bbe38d6 100644
Binary files a/public/images/emoji/facebook_messenger/beach_umbrella.png and b/public/images/emoji/facebook_messenger/beach_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/beach_with_umbrella.png b/public/images/emoji/facebook_messenger/beach_with_umbrella.png
index 894e33bee1..953bbe38d6 100644
Binary files a/public/images/emoji/facebook_messenger/beach_with_umbrella.png and b/public/images/emoji/facebook_messenger/beach_with_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/bear.png b/public/images/emoji/facebook_messenger/bear.png
index 8e052d9adb..5622d9c5ca 100644
Binary files a/public/images/emoji/facebook_messenger/bear.png and b/public/images/emoji/facebook_messenger/bear.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person.png b/public/images/emoji/facebook_messenger/bearded_person.png
index ed22a6cb38..d43b7a1124 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person.png and b/public/images/emoji/facebook_messenger/bearded_person.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/2.png b/public/images/emoji/facebook_messenger/bearded_person/2.png
index 4a2fdeb304..65a4e8b6ca 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/2.png and b/public/images/emoji/facebook_messenger/bearded_person/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/3.png b/public/images/emoji/facebook_messenger/bearded_person/3.png
index b1f6e168d7..71be9e86c6 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/3.png and b/public/images/emoji/facebook_messenger/bearded_person/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/4.png b/public/images/emoji/facebook_messenger/bearded_person/4.png
index f75b75a74e..76d3f66b6f 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/4.png and b/public/images/emoji/facebook_messenger/bearded_person/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/5.png b/public/images/emoji/facebook_messenger/bearded_person/5.png
index a9665b318a..f927d59a80 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/5.png and b/public/images/emoji/facebook_messenger/bearded_person/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/6.png b/public/images/emoji/facebook_messenger/bearded_person/6.png
index a42b3caf88..225c35f2b0 100644
Binary files a/public/images/emoji/facebook_messenger/bearded_person/6.png and b/public/images/emoji/facebook_messenger/bearded_person/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bed.png b/public/images/emoji/facebook_messenger/bed.png
index 98d795e847..fb92a4795b 100644
Binary files a/public/images/emoji/facebook_messenger/bed.png and b/public/images/emoji/facebook_messenger/bed.png differ
diff --git a/public/images/emoji/facebook_messenger/bee.png b/public/images/emoji/facebook_messenger/bee.png
index b4b2bff015..649181cf28 100644
Binary files a/public/images/emoji/facebook_messenger/bee.png and b/public/images/emoji/facebook_messenger/bee.png differ
diff --git a/public/images/emoji/facebook_messenger/beer.png b/public/images/emoji/facebook_messenger/beer.png
index 035842b005..7a4c1270f2 100644
Binary files a/public/images/emoji/facebook_messenger/beer.png and b/public/images/emoji/facebook_messenger/beer.png differ
diff --git a/public/images/emoji/facebook_messenger/beers.png b/public/images/emoji/facebook_messenger/beers.png
index f69c94220e..b2a335ec47 100644
Binary files a/public/images/emoji/facebook_messenger/beers.png and b/public/images/emoji/facebook_messenger/beers.png differ
diff --git a/public/images/emoji/facebook_messenger/beetle.png b/public/images/emoji/facebook_messenger/beetle.png
index 01bc9362c1..03698c3175 100644
Binary files a/public/images/emoji/facebook_messenger/beetle.png and b/public/images/emoji/facebook_messenger/beetle.png differ
diff --git a/public/images/emoji/facebook_messenger/beginner.png b/public/images/emoji/facebook_messenger/beginner.png
index 80429e29ec..61fd22318d 100644
Binary files a/public/images/emoji/facebook_messenger/beginner.png and b/public/images/emoji/facebook_messenger/beginner.png differ
diff --git a/public/images/emoji/facebook_messenger/belarus.png b/public/images/emoji/facebook_messenger/belarus.png
index e75dc9ec50..18bec8aa65 100644
Binary files a/public/images/emoji/facebook_messenger/belarus.png and b/public/images/emoji/facebook_messenger/belarus.png differ
diff --git a/public/images/emoji/facebook_messenger/belgium.png b/public/images/emoji/facebook_messenger/belgium.png
index faa710e211..e73dfdf9b4 100644
Binary files a/public/images/emoji/facebook_messenger/belgium.png and b/public/images/emoji/facebook_messenger/belgium.png differ
diff --git a/public/images/emoji/facebook_messenger/belize.png b/public/images/emoji/facebook_messenger/belize.png
index 5f6dded80b..b2b1118cbf 100644
Binary files a/public/images/emoji/facebook_messenger/belize.png and b/public/images/emoji/facebook_messenger/belize.png differ
diff --git a/public/images/emoji/facebook_messenger/bell.png b/public/images/emoji/facebook_messenger/bell.png
index 50bd10b5db..6bce010523 100644
Binary files a/public/images/emoji/facebook_messenger/bell.png and b/public/images/emoji/facebook_messenger/bell.png differ
diff --git a/public/images/emoji/facebook_messenger/bellhop.png b/public/images/emoji/facebook_messenger/bellhop.png
index 21a073029d..6d356446ff 100644
Binary files a/public/images/emoji/facebook_messenger/bellhop.png and b/public/images/emoji/facebook_messenger/bellhop.png differ
diff --git a/public/images/emoji/facebook_messenger/bellhop_bell.png b/public/images/emoji/facebook_messenger/bellhop_bell.png
index 21a073029d..6d356446ff 100644
Binary files a/public/images/emoji/facebook_messenger/bellhop_bell.png and b/public/images/emoji/facebook_messenger/bellhop_bell.png differ
diff --git a/public/images/emoji/facebook_messenger/benin.png b/public/images/emoji/facebook_messenger/benin.png
index bb74e98818..8886562e35 100644
Binary files a/public/images/emoji/facebook_messenger/benin.png and b/public/images/emoji/facebook_messenger/benin.png differ
diff --git a/public/images/emoji/facebook_messenger/bento.png b/public/images/emoji/facebook_messenger/bento.png
index 6f1ce980f3..b67d8ba257 100644
Binary files a/public/images/emoji/facebook_messenger/bento.png and b/public/images/emoji/facebook_messenger/bento.png differ
diff --git a/public/images/emoji/facebook_messenger/bermuda.png b/public/images/emoji/facebook_messenger/bermuda.png
index 75f2fac760..2dd999ea25 100644
Binary files a/public/images/emoji/facebook_messenger/bermuda.png and b/public/images/emoji/facebook_messenger/bermuda.png differ
diff --git a/public/images/emoji/facebook_messenger/bhutan.png b/public/images/emoji/facebook_messenger/bhutan.png
index d9a2d20fc1..0d670c8383 100644
Binary files a/public/images/emoji/facebook_messenger/bhutan.png and b/public/images/emoji/facebook_messenger/bhutan.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist.png b/public/images/emoji/facebook_messenger/bicyclist.png
index e2079b8040..9866c2131c 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist.png and b/public/images/emoji/facebook_messenger/bicyclist.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/2.png b/public/images/emoji/facebook_messenger/bicyclist/2.png
index 120dba4f56..37071ba134 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/2.png and b/public/images/emoji/facebook_messenger/bicyclist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/3.png b/public/images/emoji/facebook_messenger/bicyclist/3.png
index 108f8765b6..89fb037c3d 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/3.png and b/public/images/emoji/facebook_messenger/bicyclist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/4.png b/public/images/emoji/facebook_messenger/bicyclist/4.png
index 96e0fc4e07..9f7da1d5f0 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/4.png and b/public/images/emoji/facebook_messenger/bicyclist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/5.png b/public/images/emoji/facebook_messenger/bicyclist/5.png
index 37d2867b23..19552d15aa 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/5.png and b/public/images/emoji/facebook_messenger/bicyclist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/6.png b/public/images/emoji/facebook_messenger/bicyclist/6.png
index 454968531e..b73dbf92b3 100644
Binary files a/public/images/emoji/facebook_messenger/bicyclist/6.png and b/public/images/emoji/facebook_messenger/bicyclist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bike.png b/public/images/emoji/facebook_messenger/bike.png
index 56d1d538d5..5e72b9eb62 100644
Binary files a/public/images/emoji/facebook_messenger/bike.png and b/public/images/emoji/facebook_messenger/bike.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man.png b/public/images/emoji/facebook_messenger/biking_man.png
index e2079b8040..9866c2131c 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man.png and b/public/images/emoji/facebook_messenger/biking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/2.png b/public/images/emoji/facebook_messenger/biking_man/2.png
index 120dba4f56..37071ba134 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/2.png and b/public/images/emoji/facebook_messenger/biking_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/3.png b/public/images/emoji/facebook_messenger/biking_man/3.png
index 108f8765b6..89fb037c3d 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/3.png and b/public/images/emoji/facebook_messenger/biking_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/4.png b/public/images/emoji/facebook_messenger/biking_man/4.png
index 96e0fc4e07..9f7da1d5f0 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/4.png and b/public/images/emoji/facebook_messenger/biking_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/5.png b/public/images/emoji/facebook_messenger/biking_man/5.png
index 37d2867b23..19552d15aa 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/5.png and b/public/images/emoji/facebook_messenger/biking_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/6.png b/public/images/emoji/facebook_messenger/biking_man/6.png
index 454968531e..b73dbf92b3 100644
Binary files a/public/images/emoji/facebook_messenger/biking_man/6.png and b/public/images/emoji/facebook_messenger/biking_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman.png b/public/images/emoji/facebook_messenger/biking_woman.png
index eab8bcf9f6..3980ebe622 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman.png and b/public/images/emoji/facebook_messenger/biking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/2.png b/public/images/emoji/facebook_messenger/biking_woman/2.png
index 39b2f70d9a..975a1c38f7 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/2.png and b/public/images/emoji/facebook_messenger/biking_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/3.png b/public/images/emoji/facebook_messenger/biking_woman/3.png
index 1cdb55d7bd..430ba5933f 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/3.png and b/public/images/emoji/facebook_messenger/biking_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/4.png b/public/images/emoji/facebook_messenger/biking_woman/4.png
index 1479fbc064..1cfd775332 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/4.png and b/public/images/emoji/facebook_messenger/biking_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/5.png b/public/images/emoji/facebook_messenger/biking_woman/5.png
index 521d5bf885..217cad51c2 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/5.png and b/public/images/emoji/facebook_messenger/biking_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/6.png b/public/images/emoji/facebook_messenger/biking_woman/6.png
index bb3897810e..dd18e1a401 100644
Binary files a/public/images/emoji/facebook_messenger/biking_woman/6.png and b/public/images/emoji/facebook_messenger/biking_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bikini.png b/public/images/emoji/facebook_messenger/bikini.png
index 9ddf6bbc4a..0efa62c324 100644
Binary files a/public/images/emoji/facebook_messenger/bikini.png and b/public/images/emoji/facebook_messenger/bikini.png differ
diff --git a/public/images/emoji/facebook_messenger/billed_cap.png b/public/images/emoji/facebook_messenger/billed_cap.png
index 5cc92e307e..dae491812e 100644
Binary files a/public/images/emoji/facebook_messenger/billed_cap.png and b/public/images/emoji/facebook_messenger/billed_cap.png differ
diff --git a/public/images/emoji/facebook_messenger/biohazard.png b/public/images/emoji/facebook_messenger/biohazard.png
index 95f312482c..d9ebf1c044 100644
Binary files a/public/images/emoji/facebook_messenger/biohazard.png and b/public/images/emoji/facebook_messenger/biohazard.png differ
diff --git a/public/images/emoji/facebook_messenger/biohazard_sign.png b/public/images/emoji/facebook_messenger/biohazard_sign.png
index 95f312482c..d9ebf1c044 100644
Binary files a/public/images/emoji/facebook_messenger/biohazard_sign.png and b/public/images/emoji/facebook_messenger/biohazard_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/bird.png b/public/images/emoji/facebook_messenger/bird.png
index 23e7612417..549fc66244 100644
Binary files a/public/images/emoji/facebook_messenger/bird.png and b/public/images/emoji/facebook_messenger/bird.png differ
diff --git a/public/images/emoji/facebook_messenger/birthday.png b/public/images/emoji/facebook_messenger/birthday.png
index 1d1dd50585..ee788fa455 100644
Binary files a/public/images/emoji/facebook_messenger/birthday.png and b/public/images/emoji/facebook_messenger/birthday.png differ
diff --git a/public/images/emoji/facebook_messenger/black_circle.png b/public/images/emoji/facebook_messenger/black_circle.png
index b6dd0cc78b..426b5c11ef 100644
Binary files a/public/images/emoji/facebook_messenger/black_circle.png and b/public/images/emoji/facebook_messenger/black_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/black_flag.png b/public/images/emoji/facebook_messenger/black_flag.png
index 5c1237bdad..bc52913998 100644
Binary files a/public/images/emoji/facebook_messenger/black_flag.png and b/public/images/emoji/facebook_messenger/black_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/black_heart.png b/public/images/emoji/facebook_messenger/black_heart.png
index b237819755..7a582c18a8 100644
Binary files a/public/images/emoji/facebook_messenger/black_heart.png and b/public/images/emoji/facebook_messenger/black_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/black_joker.png b/public/images/emoji/facebook_messenger/black_joker.png
index 5666f561d1..7a45907304 100644
Binary files a/public/images/emoji/facebook_messenger/black_joker.png and b/public/images/emoji/facebook_messenger/black_joker.png differ
diff --git a/public/images/emoji/facebook_messenger/black_large_square.png b/public/images/emoji/facebook_messenger/black_large_square.png
index b9af66d432..302a41b45e 100644
Binary files a/public/images/emoji/facebook_messenger/black_large_square.png and b/public/images/emoji/facebook_messenger/black_large_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_medium_small_square.png b/public/images/emoji/facebook_messenger/black_medium_small_square.png
index 7fe4d1187d..cb53eac3bc 100644
Binary files a/public/images/emoji/facebook_messenger/black_medium_small_square.png and b/public/images/emoji/facebook_messenger/black_medium_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_medium_square.png b/public/images/emoji/facebook_messenger/black_medium_square.png
index 5e67a2f95d..21e0c608e7 100644
Binary files a/public/images/emoji/facebook_messenger/black_medium_square.png and b/public/images/emoji/facebook_messenger/black_medium_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_nib.png b/public/images/emoji/facebook_messenger/black_nib.png
index 6bc6df45cb..531ca55087 100644
Binary files a/public/images/emoji/facebook_messenger/black_nib.png and b/public/images/emoji/facebook_messenger/black_nib.png differ
diff --git a/public/images/emoji/facebook_messenger/black_small_square.png b/public/images/emoji/facebook_messenger/black_small_square.png
index 7a9dac388b..9354131059 100644
Binary files a/public/images/emoji/facebook_messenger/black_small_square.png and b/public/images/emoji/facebook_messenger/black_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_square_button.png b/public/images/emoji/facebook_messenger/black_square_button.png
index acdb7812c3..29c9e13885 100644
Binary files a/public/images/emoji/facebook_messenger/black_square_button.png and b/public/images/emoji/facebook_messenger/black_square_button.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man.png b/public/images/emoji/facebook_messenger/blonde_man.png
index cfe7273eb3..f19dc6ff1d 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man.png and b/public/images/emoji/facebook_messenger/blonde_man.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/2.png b/public/images/emoji/facebook_messenger/blonde_man/2.png
index aee96b85a7..88d69b3062 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/2.png and b/public/images/emoji/facebook_messenger/blonde_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/3.png b/public/images/emoji/facebook_messenger/blonde_man/3.png
index b4fffd5a30..ee68c1bb33 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/3.png and b/public/images/emoji/facebook_messenger/blonde_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/4.png b/public/images/emoji/facebook_messenger/blonde_man/4.png
index d8d6a0de15..36062b098e 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/4.png and b/public/images/emoji/facebook_messenger/blonde_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/5.png b/public/images/emoji/facebook_messenger/blonde_man/5.png
index 6a573ffb48..6e6f29b214 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/5.png and b/public/images/emoji/facebook_messenger/blonde_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/6.png b/public/images/emoji/facebook_messenger/blonde_man/6.png
index 1cefe68636..e773f42481 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_man/6.png and b/public/images/emoji/facebook_messenger/blonde_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman.png b/public/images/emoji/facebook_messenger/blonde_woman.png
index 11e258fa61..cb1c51ac23 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman.png and b/public/images/emoji/facebook_messenger/blonde_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/2.png b/public/images/emoji/facebook_messenger/blonde_woman/2.png
index 70e3888d3e..e274131ced 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/2.png and b/public/images/emoji/facebook_messenger/blonde_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/3.png b/public/images/emoji/facebook_messenger/blonde_woman/3.png
index 52e92bb7d6..34f72e75f7 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/3.png and b/public/images/emoji/facebook_messenger/blonde_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/4.png b/public/images/emoji/facebook_messenger/blonde_woman/4.png
index 37108efb1f..f1bc0dbe52 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/4.png and b/public/images/emoji/facebook_messenger/blonde_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/5.png b/public/images/emoji/facebook_messenger/blonde_woman/5.png
index a7c2fcdfd9..be390b7bb9 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/5.png and b/public/images/emoji/facebook_messenger/blonde_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/6.png b/public/images/emoji/facebook_messenger/blonde_woman/6.png
index 0a8ee484ce..8a4eda74fa 100644
Binary files a/public/images/emoji/facebook_messenger/blonde_woman/6.png and b/public/images/emoji/facebook_messenger/blonde_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/blossom.png b/public/images/emoji/facebook_messenger/blossom.png
index cc6fb6e617..a2a7b6db3c 100644
Binary files a/public/images/emoji/facebook_messenger/blossom.png and b/public/images/emoji/facebook_messenger/blossom.png differ
diff --git a/public/images/emoji/facebook_messenger/blowfish.png b/public/images/emoji/facebook_messenger/blowfish.png
index 5d39475b06..828264cc85 100644
Binary files a/public/images/emoji/facebook_messenger/blowfish.png and b/public/images/emoji/facebook_messenger/blowfish.png differ
diff --git a/public/images/emoji/facebook_messenger/blue_book.png b/public/images/emoji/facebook_messenger/blue_book.png
index ce96b52fc3..4423cca14d 100644
Binary files a/public/images/emoji/facebook_messenger/blue_book.png and b/public/images/emoji/facebook_messenger/blue_book.png differ
diff --git a/public/images/emoji/facebook_messenger/blue_car.png b/public/images/emoji/facebook_messenger/blue_car.png
index b4976f1124..b48a962405 100644
Binary files a/public/images/emoji/facebook_messenger/blue_car.png and b/public/images/emoji/facebook_messenger/blue_car.png differ
diff --git a/public/images/emoji/facebook_messenger/blue_heart.png b/public/images/emoji/facebook_messenger/blue_heart.png
index b81cebfba1..6f707d91a8 100644
Binary files a/public/images/emoji/facebook_messenger/blue_heart.png and b/public/images/emoji/facebook_messenger/blue_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/blush.png b/public/images/emoji/facebook_messenger/blush.png
index 5db3f3a78c..1d15bde80b 100644
Binary files a/public/images/emoji/facebook_messenger/blush.png and b/public/images/emoji/facebook_messenger/blush.png differ
diff --git a/public/images/emoji/facebook_messenger/boar.png b/public/images/emoji/facebook_messenger/boar.png
index 09614c3722..22967fe532 100644
Binary files a/public/images/emoji/facebook_messenger/boar.png and b/public/images/emoji/facebook_messenger/boar.png differ
diff --git a/public/images/emoji/facebook_messenger/boat.png b/public/images/emoji/facebook_messenger/boat.png
index 3eba365766..d17e9287e5 100644
Binary files a/public/images/emoji/facebook_messenger/boat.png and b/public/images/emoji/facebook_messenger/boat.png differ
diff --git a/public/images/emoji/facebook_messenger/bolivia.png b/public/images/emoji/facebook_messenger/bolivia.png
index af9bd4d5e7..bb8c24688b 100644
Binary files a/public/images/emoji/facebook_messenger/bolivia.png and b/public/images/emoji/facebook_messenger/bolivia.png differ
diff --git a/public/images/emoji/facebook_messenger/bomb.png b/public/images/emoji/facebook_messenger/bomb.png
index 5afa9092b4..b08b877e95 100644
Binary files a/public/images/emoji/facebook_messenger/bomb.png and b/public/images/emoji/facebook_messenger/bomb.png differ
diff --git a/public/images/emoji/facebook_messenger/book.png b/public/images/emoji/facebook_messenger/book.png
index 466a96d4dc..724a71aeb9 100644
Binary files a/public/images/emoji/facebook_messenger/book.png and b/public/images/emoji/facebook_messenger/book.png differ
diff --git a/public/images/emoji/facebook_messenger/bookmark.png b/public/images/emoji/facebook_messenger/bookmark.png
index 896268d22b..2667d0cf46 100644
Binary files a/public/images/emoji/facebook_messenger/bookmark.png and b/public/images/emoji/facebook_messenger/bookmark.png differ
diff --git a/public/images/emoji/facebook_messenger/bookmark_tabs.png b/public/images/emoji/facebook_messenger/bookmark_tabs.png
index b26787ae8a..d631d3c536 100644
Binary files a/public/images/emoji/facebook_messenger/bookmark_tabs.png and b/public/images/emoji/facebook_messenger/bookmark_tabs.png differ
diff --git a/public/images/emoji/facebook_messenger/books.png b/public/images/emoji/facebook_messenger/books.png
index 77002adc85..f8411f5717 100644
Binary files a/public/images/emoji/facebook_messenger/books.png and b/public/images/emoji/facebook_messenger/books.png differ
diff --git a/public/images/emoji/facebook_messenger/boom.png b/public/images/emoji/facebook_messenger/boom.png
index 786e74def7..04269ded8c 100644
Binary files a/public/images/emoji/facebook_messenger/boom.png and b/public/images/emoji/facebook_messenger/boom.png differ
diff --git a/public/images/emoji/facebook_messenger/boot.png b/public/images/emoji/facebook_messenger/boot.png
index 8675b47940..9b6e9c76c0 100644
Binary files a/public/images/emoji/facebook_messenger/boot.png and b/public/images/emoji/facebook_messenger/boot.png differ
diff --git a/public/images/emoji/facebook_messenger/bosnia_herzegovina.png b/public/images/emoji/facebook_messenger/bosnia_herzegovina.png
index 91493ade75..bd99de522c 100644
Binary files a/public/images/emoji/facebook_messenger/bosnia_herzegovina.png and b/public/images/emoji/facebook_messenger/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/facebook_messenger/botswana.png b/public/images/emoji/facebook_messenger/botswana.png
index 3697a723dd..80636409e1 100644
Binary files a/public/images/emoji/facebook_messenger/botswana.png and b/public/images/emoji/facebook_messenger/botswana.png differ
diff --git a/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png b/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png
index 49ea37f389..428019d382 100644
Binary files a/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png and b/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/facebook_messenger/bouquet.png b/public/images/emoji/facebook_messenger/bouquet.png
index 7bf622d736..35bf8501a6 100644
Binary files a/public/images/emoji/facebook_messenger/bouquet.png and b/public/images/emoji/facebook_messenger/bouquet.png differ
diff --git a/public/images/emoji/facebook_messenger/bouvet_island.png b/public/images/emoji/facebook_messenger/bouvet_island.png
index 801a577654..d2cd8f67f2 100644
Binary files a/public/images/emoji/facebook_messenger/bouvet_island.png and b/public/images/emoji/facebook_messenger/bouvet_island.png differ
diff --git a/public/images/emoji/facebook_messenger/bow.png b/public/images/emoji/facebook_messenger/bow.png
index 8bcfb35910..d2ca3b5c9c 100644
Binary files a/public/images/emoji/facebook_messenger/bow.png and b/public/images/emoji/facebook_messenger/bow.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/2.png b/public/images/emoji/facebook_messenger/bow/2.png
index dbcc662a1d..126ecfeffc 100644
Binary files a/public/images/emoji/facebook_messenger/bow/2.png and b/public/images/emoji/facebook_messenger/bow/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/3.png b/public/images/emoji/facebook_messenger/bow/3.png
index e764892f5b..90000670ef 100644
Binary files a/public/images/emoji/facebook_messenger/bow/3.png and b/public/images/emoji/facebook_messenger/bow/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/4.png b/public/images/emoji/facebook_messenger/bow/4.png
index 0a33d718d2..f7d1ba7745 100644
Binary files a/public/images/emoji/facebook_messenger/bow/4.png and b/public/images/emoji/facebook_messenger/bow/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/5.png b/public/images/emoji/facebook_messenger/bow/5.png
index f6f4b24775..9f10f1da00 100644
Binary files a/public/images/emoji/facebook_messenger/bow/5.png and b/public/images/emoji/facebook_messenger/bow/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/6.png b/public/images/emoji/facebook_messenger/bow/6.png
index ef61032004..ba8f4eb367 100644
Binary files a/public/images/emoji/facebook_messenger/bow/6.png and b/public/images/emoji/facebook_messenger/bow/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bow_and_arrow.png b/public/images/emoji/facebook_messenger/bow_and_arrow.png
index f50a1389fe..eba0a0deeb 100644
Binary files a/public/images/emoji/facebook_messenger/bow_and_arrow.png and b/public/images/emoji/facebook_messenger/bow_and_arrow.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man.png b/public/images/emoji/facebook_messenger/bowing_man.png
index 8bcfb35910..d2ca3b5c9c 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man.png and b/public/images/emoji/facebook_messenger/bowing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/2.png b/public/images/emoji/facebook_messenger/bowing_man/2.png
index dbcc662a1d..126ecfeffc 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/2.png and b/public/images/emoji/facebook_messenger/bowing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/3.png b/public/images/emoji/facebook_messenger/bowing_man/3.png
index e764892f5b..90000670ef 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/3.png and b/public/images/emoji/facebook_messenger/bowing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/4.png b/public/images/emoji/facebook_messenger/bowing_man/4.png
index 0a33d718d2..f7d1ba7745 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/4.png and b/public/images/emoji/facebook_messenger/bowing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/5.png b/public/images/emoji/facebook_messenger/bowing_man/5.png
index f6f4b24775..9f10f1da00 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/5.png and b/public/images/emoji/facebook_messenger/bowing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/6.png b/public/images/emoji/facebook_messenger/bowing_man/6.png
index ef61032004..ba8f4eb367 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_man/6.png and b/public/images/emoji/facebook_messenger/bowing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman.png b/public/images/emoji/facebook_messenger/bowing_woman.png
index bbe859ce67..7b2cefa342 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman.png and b/public/images/emoji/facebook_messenger/bowing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/2.png b/public/images/emoji/facebook_messenger/bowing_woman/2.png
index e6fa7ca7f5..b8a6f0fc8f 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/2.png and b/public/images/emoji/facebook_messenger/bowing_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/3.png b/public/images/emoji/facebook_messenger/bowing_woman/3.png
index 206a368708..75cadf3376 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/3.png and b/public/images/emoji/facebook_messenger/bowing_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/4.png b/public/images/emoji/facebook_messenger/bowing_woman/4.png
index 047411f966..76660ba20d 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/4.png and b/public/images/emoji/facebook_messenger/bowing_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/5.png b/public/images/emoji/facebook_messenger/bowing_woman/5.png
index 9d43cffab0..5417adf356 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/5.png and b/public/images/emoji/facebook_messenger/bowing_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/6.png b/public/images/emoji/facebook_messenger/bowing_woman/6.png
index 85a701f354..abe63e985d 100644
Binary files a/public/images/emoji/facebook_messenger/bowing_woman/6.png and b/public/images/emoji/facebook_messenger/bowing_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bowl_with_spoon.png b/public/images/emoji/facebook_messenger/bowl_with_spoon.png
index b0d88a73b9..d8c2f02a72 100644
Binary files a/public/images/emoji/facebook_messenger/bowl_with_spoon.png and b/public/images/emoji/facebook_messenger/bowl_with_spoon.png differ
diff --git a/public/images/emoji/facebook_messenger/bowling.png b/public/images/emoji/facebook_messenger/bowling.png
index 4b480dd9bf..4848c6d193 100644
Binary files a/public/images/emoji/facebook_messenger/bowling.png and b/public/images/emoji/facebook_messenger/bowling.png differ
diff --git a/public/images/emoji/facebook_messenger/boxing_glove.png b/public/images/emoji/facebook_messenger/boxing_glove.png
index abb4d24834..a95603e47c 100644
Binary files a/public/images/emoji/facebook_messenger/boxing_glove.png and b/public/images/emoji/facebook_messenger/boxing_glove.png differ
diff --git a/public/images/emoji/facebook_messenger/boy.png b/public/images/emoji/facebook_messenger/boy.png
index 28d4189bc1..5c511ccc33 100644
Binary files a/public/images/emoji/facebook_messenger/boy.png and b/public/images/emoji/facebook_messenger/boy.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/2.png b/public/images/emoji/facebook_messenger/boy/2.png
index 0a447532d8..fb50209c59 100644
Binary files a/public/images/emoji/facebook_messenger/boy/2.png and b/public/images/emoji/facebook_messenger/boy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/3.png b/public/images/emoji/facebook_messenger/boy/3.png
index 777a3f9cfb..309cb98165 100644
Binary files a/public/images/emoji/facebook_messenger/boy/3.png and b/public/images/emoji/facebook_messenger/boy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/4.png b/public/images/emoji/facebook_messenger/boy/4.png
index d0d67a57f5..8607ad6a48 100644
Binary files a/public/images/emoji/facebook_messenger/boy/4.png and b/public/images/emoji/facebook_messenger/boy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/5.png b/public/images/emoji/facebook_messenger/boy/5.png
index 0d04819d22..4cad8e27a6 100644
Binary files a/public/images/emoji/facebook_messenger/boy/5.png and b/public/images/emoji/facebook_messenger/boy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/6.png b/public/images/emoji/facebook_messenger/boy/6.png
index c817adeeeb..cfdf901ef3 100644
Binary files a/public/images/emoji/facebook_messenger/boy/6.png and b/public/images/emoji/facebook_messenger/boy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/brain.png b/public/images/emoji/facebook_messenger/brain.png
index c8e889faec..76b43744dc 100644
Binary files a/public/images/emoji/facebook_messenger/brain.png and b/public/images/emoji/facebook_messenger/brain.png differ
diff --git a/public/images/emoji/facebook_messenger/brazil.png b/public/images/emoji/facebook_messenger/brazil.png
index f510542abc..e620c5eb37 100644
Binary files a/public/images/emoji/facebook_messenger/brazil.png and b/public/images/emoji/facebook_messenger/brazil.png differ
diff --git a/public/images/emoji/facebook_messenger/bread.png b/public/images/emoji/facebook_messenger/bread.png
index 4d4011d449..e11f314c2d 100644
Binary files a/public/images/emoji/facebook_messenger/bread.png and b/public/images/emoji/facebook_messenger/bread.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding.png b/public/images/emoji/facebook_messenger/breast_feeding.png
index 815538138b..c3a78fdfc5 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding.png and b/public/images/emoji/facebook_messenger/breast_feeding.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/2.png b/public/images/emoji/facebook_messenger/breast_feeding/2.png
index fb591aa4fb..0b4325d6ae 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/2.png and b/public/images/emoji/facebook_messenger/breast_feeding/2.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/3.png b/public/images/emoji/facebook_messenger/breast_feeding/3.png
index 5adcffa4b9..05390c718e 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/3.png and b/public/images/emoji/facebook_messenger/breast_feeding/3.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/4.png b/public/images/emoji/facebook_messenger/breast_feeding/4.png
index d166f981b2..c71cea1cb7 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/4.png and b/public/images/emoji/facebook_messenger/breast_feeding/4.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/5.png b/public/images/emoji/facebook_messenger/breast_feeding/5.png
index 7c8cb50a78..efc8aa64bb 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/5.png and b/public/images/emoji/facebook_messenger/breast_feeding/5.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/6.png b/public/images/emoji/facebook_messenger/breast_feeding/6.png
index e113d8cb42..be68ef2dde 100644
Binary files a/public/images/emoji/facebook_messenger/breast_feeding/6.png and b/public/images/emoji/facebook_messenger/breast_feeding/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil.png b/public/images/emoji/facebook_messenger/bride_with_veil.png
index ffb6004902..7a8894f5bf 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil.png and b/public/images/emoji/facebook_messenger/bride_with_veil.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/2.png b/public/images/emoji/facebook_messenger/bride_with_veil/2.png
index f279c55580..1e3f3aea36 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/2.png and b/public/images/emoji/facebook_messenger/bride_with_veil/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/3.png b/public/images/emoji/facebook_messenger/bride_with_veil/3.png
index 016fae0a30..6889e54f50 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/3.png and b/public/images/emoji/facebook_messenger/bride_with_veil/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/4.png b/public/images/emoji/facebook_messenger/bride_with_veil/4.png
index d257eb58b7..c54095f40e 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/4.png and b/public/images/emoji/facebook_messenger/bride_with_veil/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/5.png b/public/images/emoji/facebook_messenger/bride_with_veil/5.png
index 76478e5f9c..cc31e23355 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/5.png and b/public/images/emoji/facebook_messenger/bride_with_veil/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/6.png b/public/images/emoji/facebook_messenger/bride_with_veil/6.png
index 3b592cdefb..7a9a872bad 100644
Binary files a/public/images/emoji/facebook_messenger/bride_with_veil/6.png and b/public/images/emoji/facebook_messenger/bride_with_veil/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bridge_at_night.png b/public/images/emoji/facebook_messenger/bridge_at_night.png
index 742e0629fd..cd7ad472eb 100644
Binary files a/public/images/emoji/facebook_messenger/bridge_at_night.png and b/public/images/emoji/facebook_messenger/bridge_at_night.png differ
diff --git a/public/images/emoji/facebook_messenger/briefcase.png b/public/images/emoji/facebook_messenger/briefcase.png
index 0dbe9606a3..8c63d39e4c 100644
Binary files a/public/images/emoji/facebook_messenger/briefcase.png and b/public/images/emoji/facebook_messenger/briefcase.png differ
diff --git a/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png b/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png
index e3d2479344..2c48fa114c 100644
Binary files a/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png and b/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/facebook_messenger/british_virgin_islands.png b/public/images/emoji/facebook_messenger/british_virgin_islands.png
index 9f758979a1..039c5f6617 100644
Binary files a/public/images/emoji/facebook_messenger/british_virgin_islands.png and b/public/images/emoji/facebook_messenger/british_virgin_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/broccoli.png b/public/images/emoji/facebook_messenger/broccoli.png
index 5e03a6d23b..350b31d138 100644
Binary files a/public/images/emoji/facebook_messenger/broccoli.png and b/public/images/emoji/facebook_messenger/broccoli.png differ
diff --git a/public/images/emoji/facebook_messenger/broken_heart.png b/public/images/emoji/facebook_messenger/broken_heart.png
index 3f16d80d9e..08d023a94a 100644
Binary files a/public/images/emoji/facebook_messenger/broken_heart.png and b/public/images/emoji/facebook_messenger/broken_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/brunei.png b/public/images/emoji/facebook_messenger/brunei.png
index 647e1c4d79..9cc73ebf71 100644
Binary files a/public/images/emoji/facebook_messenger/brunei.png and b/public/images/emoji/facebook_messenger/brunei.png differ
diff --git a/public/images/emoji/facebook_messenger/bug.png b/public/images/emoji/facebook_messenger/bug.png
index bea8c8c0b6..c0990ce9b0 100644
Binary files a/public/images/emoji/facebook_messenger/bug.png and b/public/images/emoji/facebook_messenger/bug.png differ
diff --git a/public/images/emoji/facebook_messenger/building_construction.png b/public/images/emoji/facebook_messenger/building_construction.png
index 24cdec2e5f..74cd30792b 100644
Binary files a/public/images/emoji/facebook_messenger/building_construction.png and b/public/images/emoji/facebook_messenger/building_construction.png differ
diff --git a/public/images/emoji/facebook_messenger/bulb.png b/public/images/emoji/facebook_messenger/bulb.png
index 485bf7f6a4..f018dd1e1b 100644
Binary files a/public/images/emoji/facebook_messenger/bulb.png and b/public/images/emoji/facebook_messenger/bulb.png differ
diff --git a/public/images/emoji/facebook_messenger/bulgaria.png b/public/images/emoji/facebook_messenger/bulgaria.png
index 5185700c63..e82767d588 100644
Binary files a/public/images/emoji/facebook_messenger/bulgaria.png and b/public/images/emoji/facebook_messenger/bulgaria.png differ
diff --git a/public/images/emoji/facebook_messenger/bullettrain_front.png b/public/images/emoji/facebook_messenger/bullettrain_front.png
index 70218a9ea2..415d45cf36 100644
Binary files a/public/images/emoji/facebook_messenger/bullettrain_front.png and b/public/images/emoji/facebook_messenger/bullettrain_front.png differ
diff --git a/public/images/emoji/facebook_messenger/bullettrain_side.png b/public/images/emoji/facebook_messenger/bullettrain_side.png
index 8e23c7097c..100c02226f 100644
Binary files a/public/images/emoji/facebook_messenger/bullettrain_side.png and b/public/images/emoji/facebook_messenger/bullettrain_side.png differ
diff --git a/public/images/emoji/facebook_messenger/burkina_faso.png b/public/images/emoji/facebook_messenger/burkina_faso.png
index c519f8a954..5f56200865 100644
Binary files a/public/images/emoji/facebook_messenger/burkina_faso.png and b/public/images/emoji/facebook_messenger/burkina_faso.png differ
diff --git a/public/images/emoji/facebook_messenger/burrito.png b/public/images/emoji/facebook_messenger/burrito.png
index 74894241cc..f9bf2b0fae 100644
Binary files a/public/images/emoji/facebook_messenger/burrito.png and b/public/images/emoji/facebook_messenger/burrito.png differ
diff --git a/public/images/emoji/facebook_messenger/burundi.png b/public/images/emoji/facebook_messenger/burundi.png
index 83e731cc34..55eedeabd4 100644
Binary files a/public/images/emoji/facebook_messenger/burundi.png and b/public/images/emoji/facebook_messenger/burundi.png differ
diff --git a/public/images/emoji/facebook_messenger/bus.png b/public/images/emoji/facebook_messenger/bus.png
index a8a91afa97..6a253e989d 100644
Binary files a/public/images/emoji/facebook_messenger/bus.png and b/public/images/emoji/facebook_messenger/bus.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating.png b/public/images/emoji/facebook_messenger/business_suit_levitating.png
index 5231c708a0..12436f9888 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating.png and b/public/images/emoji/facebook_messenger/business_suit_levitating.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/2.png b/public/images/emoji/facebook_messenger/business_suit_levitating/2.png
index 753693b093..7d66f0d7b6 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/2.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/3.png b/public/images/emoji/facebook_messenger/business_suit_levitating/3.png
index f56875edac..775f49d644 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/3.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/4.png b/public/images/emoji/facebook_messenger/business_suit_levitating/4.png
index 37d74f5c97..6906ed1845 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/4.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/5.png b/public/images/emoji/facebook_messenger/business_suit_levitating/5.png
index 5a48f96192..28849bdcc7 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/5.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/6.png b/public/images/emoji/facebook_messenger/business_suit_levitating/6.png
index 6150740817..cb80f23fc2 100644
Binary files a/public/images/emoji/facebook_messenger/business_suit_levitating/6.png and b/public/images/emoji/facebook_messenger/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/facebook_messenger/busstop.png b/public/images/emoji/facebook_messenger/busstop.png
index ac57b9d39f..5f0c87e31c 100644
Binary files a/public/images/emoji/facebook_messenger/busstop.png and b/public/images/emoji/facebook_messenger/busstop.png differ
diff --git a/public/images/emoji/facebook_messenger/bust_in_silhouette.png b/public/images/emoji/facebook_messenger/bust_in_silhouette.png
index 7459422611..67ea131957 100644
Binary files a/public/images/emoji/facebook_messenger/bust_in_silhouette.png and b/public/images/emoji/facebook_messenger/bust_in_silhouette.png differ
diff --git a/public/images/emoji/facebook_messenger/busts_in_silhouette.png b/public/images/emoji/facebook_messenger/busts_in_silhouette.png
index ecb85a4566..72ec2d844a 100644
Binary files a/public/images/emoji/facebook_messenger/busts_in_silhouette.png and b/public/images/emoji/facebook_messenger/busts_in_silhouette.png differ
diff --git a/public/images/emoji/facebook_messenger/butterfly.png b/public/images/emoji/facebook_messenger/butterfly.png
index 995ea58f80..b2c9a28a08 100644
Binary files a/public/images/emoji/facebook_messenger/butterfly.png and b/public/images/emoji/facebook_messenger/butterfly.png differ
diff --git a/public/images/emoji/facebook_messenger/cactus.png b/public/images/emoji/facebook_messenger/cactus.png
index 8b7a55a0fa..ba88add8c0 100644
Binary files a/public/images/emoji/facebook_messenger/cactus.png and b/public/images/emoji/facebook_messenger/cactus.png differ
diff --git a/public/images/emoji/facebook_messenger/cake.png b/public/images/emoji/facebook_messenger/cake.png
index e89e914f1a..379bd5b920 100644
Binary files a/public/images/emoji/facebook_messenger/cake.png and b/public/images/emoji/facebook_messenger/cake.png differ
diff --git a/public/images/emoji/facebook_messenger/calendar.png b/public/images/emoji/facebook_messenger/calendar.png
index b8b14b579a..3eb35553ee 100644
Binary files a/public/images/emoji/facebook_messenger/calendar.png and b/public/images/emoji/facebook_messenger/calendar.png differ
diff --git a/public/images/emoji/facebook_messenger/calendar_spiral.png b/public/images/emoji/facebook_messenger/calendar_spiral.png
index 8cd3bd7e57..ee07d24cb1 100644
Binary files a/public/images/emoji/facebook_messenger/calendar_spiral.png and b/public/images/emoji/facebook_messenger/calendar_spiral.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand.png b/public/images/emoji/facebook_messenger/call_me_hand.png
index 6e50aea9ee..b6167359c4 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand.png and b/public/images/emoji/facebook_messenger/call_me_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/2.png b/public/images/emoji/facebook_messenger/call_me_hand/2.png
index 31a89ad633..d3f73861bd 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/2.png and b/public/images/emoji/facebook_messenger/call_me_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/3.png b/public/images/emoji/facebook_messenger/call_me_hand/3.png
index d619e0b8d7..e27340161a 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/3.png and b/public/images/emoji/facebook_messenger/call_me_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/4.png b/public/images/emoji/facebook_messenger/call_me_hand/4.png
index f99492eb6c..11464e73d0 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/4.png and b/public/images/emoji/facebook_messenger/call_me_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/5.png b/public/images/emoji/facebook_messenger/call_me_hand/5.png
index 02be2857ff..5d0fa6a712 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/5.png and b/public/images/emoji/facebook_messenger/call_me_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/6.png b/public/images/emoji/facebook_messenger/call_me_hand/6.png
index f0c258b55b..b1d253a42f 100644
Binary files a/public/images/emoji/facebook_messenger/call_me_hand/6.png and b/public/images/emoji/facebook_messenger/call_me_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/calling.png b/public/images/emoji/facebook_messenger/calling.png
index a6891ba5bd..bebcdc4bc6 100644
Binary files a/public/images/emoji/facebook_messenger/calling.png and b/public/images/emoji/facebook_messenger/calling.png differ
diff --git a/public/images/emoji/facebook_messenger/cambodia.png b/public/images/emoji/facebook_messenger/cambodia.png
index 0a7ca06fb4..9ae1378cdd 100644
Binary files a/public/images/emoji/facebook_messenger/cambodia.png and b/public/images/emoji/facebook_messenger/cambodia.png differ
diff --git a/public/images/emoji/facebook_messenger/camel.png b/public/images/emoji/facebook_messenger/camel.png
index 5f3c565b69..929b1d55a0 100644
Binary files a/public/images/emoji/facebook_messenger/camel.png and b/public/images/emoji/facebook_messenger/camel.png differ
diff --git a/public/images/emoji/facebook_messenger/camera.png b/public/images/emoji/facebook_messenger/camera.png
index fd24f1b440..3e815fdce7 100644
Binary files a/public/images/emoji/facebook_messenger/camera.png and b/public/images/emoji/facebook_messenger/camera.png differ
diff --git a/public/images/emoji/facebook_messenger/camera_flash.png b/public/images/emoji/facebook_messenger/camera_flash.png
index fd49394ac1..868eae6a70 100644
Binary files a/public/images/emoji/facebook_messenger/camera_flash.png and b/public/images/emoji/facebook_messenger/camera_flash.png differ
diff --git a/public/images/emoji/facebook_messenger/camera_with_flash.png b/public/images/emoji/facebook_messenger/camera_with_flash.png
index fd49394ac1..868eae6a70 100644
Binary files a/public/images/emoji/facebook_messenger/camera_with_flash.png and b/public/images/emoji/facebook_messenger/camera_with_flash.png differ
diff --git a/public/images/emoji/facebook_messenger/cameroon.png b/public/images/emoji/facebook_messenger/cameroon.png
index b9aaf46348..38777f3dd2 100644
Binary files a/public/images/emoji/facebook_messenger/cameroon.png and b/public/images/emoji/facebook_messenger/cameroon.png differ
diff --git a/public/images/emoji/facebook_messenger/camping.png b/public/images/emoji/facebook_messenger/camping.png
index 414dc9caf6..c77eb36e6e 100644
Binary files a/public/images/emoji/facebook_messenger/camping.png and b/public/images/emoji/facebook_messenger/camping.png differ
diff --git a/public/images/emoji/facebook_messenger/canada.png b/public/images/emoji/facebook_messenger/canada.png
index 4ee3f2c1fd..846e0f2cda 100644
Binary files a/public/images/emoji/facebook_messenger/canada.png and b/public/images/emoji/facebook_messenger/canada.png differ
diff --git a/public/images/emoji/facebook_messenger/canary_islands.png b/public/images/emoji/facebook_messenger/canary_islands.png
index 68ccf48d0d..6bd488163d 100644
Binary files a/public/images/emoji/facebook_messenger/canary_islands.png and b/public/images/emoji/facebook_messenger/canary_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/cancer.png b/public/images/emoji/facebook_messenger/cancer.png
index f413b1e61f..afd6e4cd9f 100644
Binary files a/public/images/emoji/facebook_messenger/cancer.png and b/public/images/emoji/facebook_messenger/cancer.png differ
diff --git a/public/images/emoji/facebook_messenger/candle.png b/public/images/emoji/facebook_messenger/candle.png
index 0a27def4ef..ed5e789952 100644
Binary files a/public/images/emoji/facebook_messenger/candle.png and b/public/images/emoji/facebook_messenger/candle.png differ
diff --git a/public/images/emoji/facebook_messenger/candy.png b/public/images/emoji/facebook_messenger/candy.png
index 2eb0b1616f..5c66cf87f0 100644
Binary files a/public/images/emoji/facebook_messenger/candy.png and b/public/images/emoji/facebook_messenger/candy.png differ
diff --git a/public/images/emoji/facebook_messenger/canned_food.png b/public/images/emoji/facebook_messenger/canned_food.png
index 2e5976e9d2..74b5ad355e 100644
Binary files a/public/images/emoji/facebook_messenger/canned_food.png and b/public/images/emoji/facebook_messenger/canned_food.png differ
diff --git a/public/images/emoji/facebook_messenger/canoe.png b/public/images/emoji/facebook_messenger/canoe.png
index 4ee3c9caa7..e7dfc9fcc8 100644
Binary files a/public/images/emoji/facebook_messenger/canoe.png and b/public/images/emoji/facebook_messenger/canoe.png differ
diff --git a/public/images/emoji/facebook_messenger/cape_verde.png b/public/images/emoji/facebook_messenger/cape_verde.png
index 1252c37a6d..64efb89b75 100644
Binary files a/public/images/emoji/facebook_messenger/cape_verde.png and b/public/images/emoji/facebook_messenger/cape_verde.png differ
diff --git a/public/images/emoji/facebook_messenger/capital_abcd.png b/public/images/emoji/facebook_messenger/capital_abcd.png
index 0d4c9eba17..7a5024cc86 100644
Binary files a/public/images/emoji/facebook_messenger/capital_abcd.png and b/public/images/emoji/facebook_messenger/capital_abcd.png differ
diff --git a/public/images/emoji/facebook_messenger/capricorn.png b/public/images/emoji/facebook_messenger/capricorn.png
index f7e1446d11..cc28532c9b 100644
Binary files a/public/images/emoji/facebook_messenger/capricorn.png and b/public/images/emoji/facebook_messenger/capricorn.png differ
diff --git a/public/images/emoji/facebook_messenger/car.png b/public/images/emoji/facebook_messenger/car.png
index 024cdb23b5..ba661ecefd 100644
Binary files a/public/images/emoji/facebook_messenger/car.png and b/public/images/emoji/facebook_messenger/car.png differ
diff --git a/public/images/emoji/facebook_messenger/card_box.png b/public/images/emoji/facebook_messenger/card_box.png
index 5f2766de91..9090e436a3 100644
Binary files a/public/images/emoji/facebook_messenger/card_box.png and b/public/images/emoji/facebook_messenger/card_box.png differ
diff --git a/public/images/emoji/facebook_messenger/card_file_box.png b/public/images/emoji/facebook_messenger/card_file_box.png
index 5f2766de91..9090e436a3 100644
Binary files a/public/images/emoji/facebook_messenger/card_file_box.png and b/public/images/emoji/facebook_messenger/card_file_box.png differ
diff --git a/public/images/emoji/facebook_messenger/card_index.png b/public/images/emoji/facebook_messenger/card_index.png
index b608bb66a1..5083f6735c 100644
Binary files a/public/images/emoji/facebook_messenger/card_index.png and b/public/images/emoji/facebook_messenger/card_index.png differ
diff --git a/public/images/emoji/facebook_messenger/card_index_dividers.png b/public/images/emoji/facebook_messenger/card_index_dividers.png
index b1e27091c9..8df2040c73 100644
Binary files a/public/images/emoji/facebook_messenger/card_index_dividers.png and b/public/images/emoji/facebook_messenger/card_index_dividers.png differ
diff --git a/public/images/emoji/facebook_messenger/caribbean_netherlands.png b/public/images/emoji/facebook_messenger/caribbean_netherlands.png
index 7780a4a036..7b0a02ff57 100644
Binary files a/public/images/emoji/facebook_messenger/caribbean_netherlands.png and b/public/images/emoji/facebook_messenger/caribbean_netherlands.png differ
diff --git a/public/images/emoji/facebook_messenger/carousel_horse.png b/public/images/emoji/facebook_messenger/carousel_horse.png
index 66a3f29830..94d5d288c4 100644
Binary files a/public/images/emoji/facebook_messenger/carousel_horse.png and b/public/images/emoji/facebook_messenger/carousel_horse.png differ
diff --git a/public/images/emoji/facebook_messenger/carrot.png b/public/images/emoji/facebook_messenger/carrot.png
index 939b6874ea..02b18cec6d 100644
Binary files a/public/images/emoji/facebook_messenger/carrot.png and b/public/images/emoji/facebook_messenger/carrot.png differ
diff --git a/public/images/emoji/facebook_messenger/cat.png b/public/images/emoji/facebook_messenger/cat.png
index bcbd9a26d2..f27d90591c 100644
Binary files a/public/images/emoji/facebook_messenger/cat.png and b/public/images/emoji/facebook_messenger/cat.png differ
diff --git a/public/images/emoji/facebook_messenger/cat2.png b/public/images/emoji/facebook_messenger/cat2.png
index 9c7f4536bf..7002c9d87c 100644
Binary files a/public/images/emoji/facebook_messenger/cat2.png and b/public/images/emoji/facebook_messenger/cat2.png differ
diff --git a/public/images/emoji/facebook_messenger/cayman_islands.png b/public/images/emoji/facebook_messenger/cayman_islands.png
index 70d8309d8c..086ac829fe 100644
Binary files a/public/images/emoji/facebook_messenger/cayman_islands.png and b/public/images/emoji/facebook_messenger/cayman_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/cd.png b/public/images/emoji/facebook_messenger/cd.png
index 411ec9a7a1..f01b522c8c 100644
Binary files a/public/images/emoji/facebook_messenger/cd.png and b/public/images/emoji/facebook_messenger/cd.png differ
diff --git a/public/images/emoji/facebook_messenger/central_african_republic.png b/public/images/emoji/facebook_messenger/central_african_republic.png
index a344cb3ae8..7cc5e769c7 100644
Binary files a/public/images/emoji/facebook_messenger/central_african_republic.png and b/public/images/emoji/facebook_messenger/central_african_republic.png differ
diff --git a/public/images/emoji/facebook_messenger/ceuta_and_melilla.png b/public/images/emoji/facebook_messenger/ceuta_and_melilla.png
index e0da30d5a6..5d2f27537f 100644
Binary files a/public/images/emoji/facebook_messenger/ceuta_and_melilla.png and b/public/images/emoji/facebook_messenger/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/facebook_messenger/chad.png b/public/images/emoji/facebook_messenger/chad.png
index 26b77c821c..e8452a8acf 100644
Binary files a/public/images/emoji/facebook_messenger/chad.png and b/public/images/emoji/facebook_messenger/chad.png differ
diff --git a/public/images/emoji/facebook_messenger/chains.png b/public/images/emoji/facebook_messenger/chains.png
index 610d0e4734..1d9343f2c9 100644
Binary files a/public/images/emoji/facebook_messenger/chains.png and b/public/images/emoji/facebook_messenger/chains.png differ
diff --git a/public/images/emoji/facebook_messenger/champagne.png b/public/images/emoji/facebook_messenger/champagne.png
index 49ea37f389..428019d382 100644
Binary files a/public/images/emoji/facebook_messenger/champagne.png and b/public/images/emoji/facebook_messenger/champagne.png differ
diff --git a/public/images/emoji/facebook_messenger/chart.png b/public/images/emoji/facebook_messenger/chart.png
index 5d933361d5..a14b1cb1ca 100644
Binary files a/public/images/emoji/facebook_messenger/chart.png and b/public/images/emoji/facebook_messenger/chart.png differ
diff --git a/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png b/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png
index be24239508..ad71c30399 100644
Binary files a/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png and b/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png b/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png
index 6e8de585ec..93230e3ca2 100644
Binary files a/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png and b/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/facebook_messenger/checkered_flag.png b/public/images/emoji/facebook_messenger/checkered_flag.png
index 1c819a0386..518e7feebe 100644
Binary files a/public/images/emoji/facebook_messenger/checkered_flag.png and b/public/images/emoji/facebook_messenger/checkered_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/cheese.png b/public/images/emoji/facebook_messenger/cheese.png
index c3a4b402b1..d4aaac5dc6 100644
Binary files a/public/images/emoji/facebook_messenger/cheese.png and b/public/images/emoji/facebook_messenger/cheese.png differ
diff --git a/public/images/emoji/facebook_messenger/cheese_wedge.png b/public/images/emoji/facebook_messenger/cheese_wedge.png
index c3a4b402b1..d4aaac5dc6 100644
Binary files a/public/images/emoji/facebook_messenger/cheese_wedge.png and b/public/images/emoji/facebook_messenger/cheese_wedge.png differ
diff --git a/public/images/emoji/facebook_messenger/cherries.png b/public/images/emoji/facebook_messenger/cherries.png
index 5a700ed9d8..3cbc7a6f35 100644
Binary files a/public/images/emoji/facebook_messenger/cherries.png and b/public/images/emoji/facebook_messenger/cherries.png differ
diff --git a/public/images/emoji/facebook_messenger/cherry_blossom.png b/public/images/emoji/facebook_messenger/cherry_blossom.png
index 16bf728cdd..7ed25a03ba 100644
Binary files a/public/images/emoji/facebook_messenger/cherry_blossom.png and b/public/images/emoji/facebook_messenger/cherry_blossom.png differ
diff --git a/public/images/emoji/facebook_messenger/chestnut.png b/public/images/emoji/facebook_messenger/chestnut.png
index 1f50ca9713..a93a2af0f8 100644
Binary files a/public/images/emoji/facebook_messenger/chestnut.png and b/public/images/emoji/facebook_messenger/chestnut.png differ
diff --git a/public/images/emoji/facebook_messenger/chicken.png b/public/images/emoji/facebook_messenger/chicken.png
index a87033991a..ec3d58893d 100644
Binary files a/public/images/emoji/facebook_messenger/chicken.png and b/public/images/emoji/facebook_messenger/chicken.png differ
diff --git a/public/images/emoji/facebook_messenger/child.png b/public/images/emoji/facebook_messenger/child.png
index 33e50494a3..5f8b2383dd 100644
Binary files a/public/images/emoji/facebook_messenger/child.png and b/public/images/emoji/facebook_messenger/child.png differ
diff --git a/public/images/emoji/facebook_messenger/child/2.png b/public/images/emoji/facebook_messenger/child/2.png
index 7a0e4f1cb7..47736506ff 100644
Binary files a/public/images/emoji/facebook_messenger/child/2.png and b/public/images/emoji/facebook_messenger/child/2.png differ
diff --git a/public/images/emoji/facebook_messenger/child/3.png b/public/images/emoji/facebook_messenger/child/3.png
index 81a69110e9..e349306585 100644
Binary files a/public/images/emoji/facebook_messenger/child/3.png and b/public/images/emoji/facebook_messenger/child/3.png differ
diff --git a/public/images/emoji/facebook_messenger/child/4.png b/public/images/emoji/facebook_messenger/child/4.png
index b5c64c9cc8..78636a33ec 100644
Binary files a/public/images/emoji/facebook_messenger/child/4.png and b/public/images/emoji/facebook_messenger/child/4.png differ
diff --git a/public/images/emoji/facebook_messenger/child/5.png b/public/images/emoji/facebook_messenger/child/5.png
index 0763a8bd94..eeaf9608f1 100644
Binary files a/public/images/emoji/facebook_messenger/child/5.png and b/public/images/emoji/facebook_messenger/child/5.png differ
diff --git a/public/images/emoji/facebook_messenger/child/6.png b/public/images/emoji/facebook_messenger/child/6.png
index 3ed705b902..6389e29f73 100644
Binary files a/public/images/emoji/facebook_messenger/child/6.png and b/public/images/emoji/facebook_messenger/child/6.png differ
diff --git a/public/images/emoji/facebook_messenger/children_crossing.png b/public/images/emoji/facebook_messenger/children_crossing.png
index 10479dbe19..e08351b44c 100644
Binary files a/public/images/emoji/facebook_messenger/children_crossing.png and b/public/images/emoji/facebook_messenger/children_crossing.png differ
diff --git a/public/images/emoji/facebook_messenger/chile.png b/public/images/emoji/facebook_messenger/chile.png
index e150c07478..f52a03a2ea 100644
Binary files a/public/images/emoji/facebook_messenger/chile.png and b/public/images/emoji/facebook_messenger/chile.png differ
diff --git a/public/images/emoji/facebook_messenger/chipmunk.png b/public/images/emoji/facebook_messenger/chipmunk.png
index e46b2790d6..92d32c95cb 100644
Binary files a/public/images/emoji/facebook_messenger/chipmunk.png and b/public/images/emoji/facebook_messenger/chipmunk.png differ
diff --git a/public/images/emoji/facebook_messenger/chocolate_bar.png b/public/images/emoji/facebook_messenger/chocolate_bar.png
index 8efd86eddf..137a7efd31 100644
Binary files a/public/images/emoji/facebook_messenger/chocolate_bar.png and b/public/images/emoji/facebook_messenger/chocolate_bar.png differ
diff --git a/public/images/emoji/facebook_messenger/chopsticks.png b/public/images/emoji/facebook_messenger/chopsticks.png
index 5706420297..cbc90cf980 100644
Binary files a/public/images/emoji/facebook_messenger/chopsticks.png and b/public/images/emoji/facebook_messenger/chopsticks.png differ
diff --git a/public/images/emoji/facebook_messenger/christmas_island.png b/public/images/emoji/facebook_messenger/christmas_island.png
index 6958b7d8d8..bd3bd24ac9 100644
Binary files a/public/images/emoji/facebook_messenger/christmas_island.png and b/public/images/emoji/facebook_messenger/christmas_island.png differ
diff --git a/public/images/emoji/facebook_messenger/christmas_tree.png b/public/images/emoji/facebook_messenger/christmas_tree.png
index ce421a823f..8708c9f8c6 100644
Binary files a/public/images/emoji/facebook_messenger/christmas_tree.png and b/public/images/emoji/facebook_messenger/christmas_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/church.png b/public/images/emoji/facebook_messenger/church.png
index e365f1b5d7..19930de136 100644
Binary files a/public/images/emoji/facebook_messenger/church.png and b/public/images/emoji/facebook_messenger/church.png differ
diff --git a/public/images/emoji/facebook_messenger/cinema.png b/public/images/emoji/facebook_messenger/cinema.png
index 64864074f2..294d990439 100644
Binary files a/public/images/emoji/facebook_messenger/cinema.png and b/public/images/emoji/facebook_messenger/cinema.png differ
diff --git a/public/images/emoji/facebook_messenger/circus_tent.png b/public/images/emoji/facebook_messenger/circus_tent.png
index 6fafd2ced0..255c1f6c97 100644
Binary files a/public/images/emoji/facebook_messenger/circus_tent.png and b/public/images/emoji/facebook_messenger/circus_tent.png differ
diff --git a/public/images/emoji/facebook_messenger/city_dusk.png b/public/images/emoji/facebook_messenger/city_dusk.png
index 75c2bb97d6..82ef3e31cb 100644
Binary files a/public/images/emoji/facebook_messenger/city_dusk.png and b/public/images/emoji/facebook_messenger/city_dusk.png differ
diff --git a/public/images/emoji/facebook_messenger/city_sunrise.png b/public/images/emoji/facebook_messenger/city_sunrise.png
index 41b4c09ddc..7733873a9d 100644
Binary files a/public/images/emoji/facebook_messenger/city_sunrise.png and b/public/images/emoji/facebook_messenger/city_sunrise.png differ
diff --git a/public/images/emoji/facebook_messenger/city_sunset.png b/public/images/emoji/facebook_messenger/city_sunset.png
index 75c2bb97d6..82ef3e31cb 100644
Binary files a/public/images/emoji/facebook_messenger/city_sunset.png and b/public/images/emoji/facebook_messenger/city_sunset.png differ
diff --git a/public/images/emoji/facebook_messenger/cityscape.png b/public/images/emoji/facebook_messenger/cityscape.png
index 24bcea239b..8fe7412997 100644
Binary files a/public/images/emoji/facebook_messenger/cityscape.png and b/public/images/emoji/facebook_messenger/cityscape.png differ
diff --git a/public/images/emoji/facebook_messenger/cl.png b/public/images/emoji/facebook_messenger/cl.png
index c3ea87fdbe..9fb3fddb97 100644
Binary files a/public/images/emoji/facebook_messenger/cl.png and b/public/images/emoji/facebook_messenger/cl.png differ
diff --git a/public/images/emoji/facebook_messenger/clamp.png b/public/images/emoji/facebook_messenger/clamp.png
index e17edcfc70..c10411d5bd 100644
Binary files a/public/images/emoji/facebook_messenger/clamp.png and b/public/images/emoji/facebook_messenger/clamp.png differ
diff --git a/public/images/emoji/facebook_messenger/clap.png b/public/images/emoji/facebook_messenger/clap.png
index 4052901763..4c10caf428 100644
Binary files a/public/images/emoji/facebook_messenger/clap.png and b/public/images/emoji/facebook_messenger/clap.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/2.png b/public/images/emoji/facebook_messenger/clap/2.png
index a60881e107..f196253769 100644
Binary files a/public/images/emoji/facebook_messenger/clap/2.png and b/public/images/emoji/facebook_messenger/clap/2.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/3.png b/public/images/emoji/facebook_messenger/clap/3.png
index 44e6d82998..f196253769 100644
Binary files a/public/images/emoji/facebook_messenger/clap/3.png and b/public/images/emoji/facebook_messenger/clap/3.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/4.png b/public/images/emoji/facebook_messenger/clap/4.png
index d01e802f64..44b1d65fc5 100644
Binary files a/public/images/emoji/facebook_messenger/clap/4.png and b/public/images/emoji/facebook_messenger/clap/4.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/5.png b/public/images/emoji/facebook_messenger/clap/5.png
index a08c620dd7..98c8e53295 100644
Binary files a/public/images/emoji/facebook_messenger/clap/5.png and b/public/images/emoji/facebook_messenger/clap/5.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/6.png b/public/images/emoji/facebook_messenger/clap/6.png
index 55a4e45e2b..907060335d 100644
Binary files a/public/images/emoji/facebook_messenger/clap/6.png and b/public/images/emoji/facebook_messenger/clap/6.png differ
diff --git a/public/images/emoji/facebook_messenger/clapper.png b/public/images/emoji/facebook_messenger/clapper.png
index 5024b9412d..fa560c7bc4 100644
Binary files a/public/images/emoji/facebook_messenger/clapper.png and b/public/images/emoji/facebook_messenger/clapper.png differ
diff --git a/public/images/emoji/facebook_messenger/classical_building.png b/public/images/emoji/facebook_messenger/classical_building.png
index 00dfbe29d3..23ed0b0287 100644
Binary files a/public/images/emoji/facebook_messenger/classical_building.png and b/public/images/emoji/facebook_messenger/classical_building.png differ
diff --git a/public/images/emoji/facebook_messenger/clinking_glasses.png b/public/images/emoji/facebook_messenger/clinking_glasses.png
index 1b24d16ae0..95a68131c8 100644
Binary files a/public/images/emoji/facebook_messenger/clinking_glasses.png and b/public/images/emoji/facebook_messenger/clinking_glasses.png differ
diff --git a/public/images/emoji/facebook_messenger/clipboard.png b/public/images/emoji/facebook_messenger/clipboard.png
index 8159f1d4d5..75f931105e 100644
Binary files a/public/images/emoji/facebook_messenger/clipboard.png and b/public/images/emoji/facebook_messenger/clipboard.png differ
diff --git a/public/images/emoji/facebook_messenger/clipperton_island.png b/public/images/emoji/facebook_messenger/clipperton_island.png
index 7943b73f67..2ef71d792a 100644
Binary files a/public/images/emoji/facebook_messenger/clipperton_island.png and b/public/images/emoji/facebook_messenger/clipperton_island.png differ
diff --git a/public/images/emoji/facebook_messenger/clock.png b/public/images/emoji/facebook_messenger/clock.png
index 62a0e89459..78008e45b6 100644
Binary files a/public/images/emoji/facebook_messenger/clock.png and b/public/images/emoji/facebook_messenger/clock.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1.png b/public/images/emoji/facebook_messenger/clock1.png
index 54ab69b0e9..d2fe7a734f 100644
Binary files a/public/images/emoji/facebook_messenger/clock1.png and b/public/images/emoji/facebook_messenger/clock1.png differ
diff --git a/public/images/emoji/facebook_messenger/clock10.png b/public/images/emoji/facebook_messenger/clock10.png
index b584c2d381..c29bb23b17 100644
Binary files a/public/images/emoji/facebook_messenger/clock10.png and b/public/images/emoji/facebook_messenger/clock10.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1030.png b/public/images/emoji/facebook_messenger/clock1030.png
index bff9bd0f0a..3820f6c771 100644
Binary files a/public/images/emoji/facebook_messenger/clock1030.png and b/public/images/emoji/facebook_messenger/clock1030.png differ
diff --git a/public/images/emoji/facebook_messenger/clock11.png b/public/images/emoji/facebook_messenger/clock11.png
index d2bf76b159..28e8a3fa9d 100644
Binary files a/public/images/emoji/facebook_messenger/clock11.png and b/public/images/emoji/facebook_messenger/clock11.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1130.png b/public/images/emoji/facebook_messenger/clock1130.png
index 252f51565e..d09766e18c 100644
Binary files a/public/images/emoji/facebook_messenger/clock1130.png and b/public/images/emoji/facebook_messenger/clock1130.png differ
diff --git a/public/images/emoji/facebook_messenger/clock12.png b/public/images/emoji/facebook_messenger/clock12.png
index 067c79fbe3..1e2ebb6b7e 100644
Binary files a/public/images/emoji/facebook_messenger/clock12.png and b/public/images/emoji/facebook_messenger/clock12.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1230.png b/public/images/emoji/facebook_messenger/clock1230.png
index b50c585430..af50bf9da1 100644
Binary files a/public/images/emoji/facebook_messenger/clock1230.png and b/public/images/emoji/facebook_messenger/clock1230.png differ
diff --git a/public/images/emoji/facebook_messenger/clock130.png b/public/images/emoji/facebook_messenger/clock130.png
index 44a6ef348a..4a40410585 100644
Binary files a/public/images/emoji/facebook_messenger/clock130.png and b/public/images/emoji/facebook_messenger/clock130.png differ
diff --git a/public/images/emoji/facebook_messenger/clock2.png b/public/images/emoji/facebook_messenger/clock2.png
index 1abb0b3dcf..2200574405 100644
Binary files a/public/images/emoji/facebook_messenger/clock2.png and b/public/images/emoji/facebook_messenger/clock2.png differ
diff --git a/public/images/emoji/facebook_messenger/clock230.png b/public/images/emoji/facebook_messenger/clock230.png
index e36cfd6faf..0b75450318 100644
Binary files a/public/images/emoji/facebook_messenger/clock230.png and b/public/images/emoji/facebook_messenger/clock230.png differ
diff --git a/public/images/emoji/facebook_messenger/clock3.png b/public/images/emoji/facebook_messenger/clock3.png
index 3818ab1cbb..c06ab4efdf 100644
Binary files a/public/images/emoji/facebook_messenger/clock3.png and b/public/images/emoji/facebook_messenger/clock3.png differ
diff --git a/public/images/emoji/facebook_messenger/clock330.png b/public/images/emoji/facebook_messenger/clock330.png
index c6631cdc26..f2227efb44 100644
Binary files a/public/images/emoji/facebook_messenger/clock330.png and b/public/images/emoji/facebook_messenger/clock330.png differ
diff --git a/public/images/emoji/facebook_messenger/clock4.png b/public/images/emoji/facebook_messenger/clock4.png
index ebc3cfd4de..ab02a47af1 100644
Binary files a/public/images/emoji/facebook_messenger/clock4.png and b/public/images/emoji/facebook_messenger/clock4.png differ
diff --git a/public/images/emoji/facebook_messenger/clock430.png b/public/images/emoji/facebook_messenger/clock430.png
index bf51349130..983319af15 100644
Binary files a/public/images/emoji/facebook_messenger/clock430.png and b/public/images/emoji/facebook_messenger/clock430.png differ
diff --git a/public/images/emoji/facebook_messenger/clock5.png b/public/images/emoji/facebook_messenger/clock5.png
index ea2c4adcbc..85df9f23b2 100644
Binary files a/public/images/emoji/facebook_messenger/clock5.png and b/public/images/emoji/facebook_messenger/clock5.png differ
diff --git a/public/images/emoji/facebook_messenger/clock530.png b/public/images/emoji/facebook_messenger/clock530.png
index 77fba2691e..445e19120b 100644
Binary files a/public/images/emoji/facebook_messenger/clock530.png and b/public/images/emoji/facebook_messenger/clock530.png differ
diff --git a/public/images/emoji/facebook_messenger/clock6.png b/public/images/emoji/facebook_messenger/clock6.png
index af72ddd43a..f0d0abde11 100644
Binary files a/public/images/emoji/facebook_messenger/clock6.png and b/public/images/emoji/facebook_messenger/clock6.png differ
diff --git a/public/images/emoji/facebook_messenger/clock630.png b/public/images/emoji/facebook_messenger/clock630.png
index 4dff8b7757..ff6e85b7fa 100644
Binary files a/public/images/emoji/facebook_messenger/clock630.png and b/public/images/emoji/facebook_messenger/clock630.png differ
diff --git a/public/images/emoji/facebook_messenger/clock7.png b/public/images/emoji/facebook_messenger/clock7.png
index b3a1194391..eabd472dcb 100644
Binary files a/public/images/emoji/facebook_messenger/clock7.png and b/public/images/emoji/facebook_messenger/clock7.png differ
diff --git a/public/images/emoji/facebook_messenger/clock730.png b/public/images/emoji/facebook_messenger/clock730.png
index f52c360898..bf655fee5e 100644
Binary files a/public/images/emoji/facebook_messenger/clock730.png and b/public/images/emoji/facebook_messenger/clock730.png differ
diff --git a/public/images/emoji/facebook_messenger/clock8.png b/public/images/emoji/facebook_messenger/clock8.png
index 505234ede5..fc1f205987 100644
Binary files a/public/images/emoji/facebook_messenger/clock8.png and b/public/images/emoji/facebook_messenger/clock8.png differ
diff --git a/public/images/emoji/facebook_messenger/clock830.png b/public/images/emoji/facebook_messenger/clock830.png
index c3ff77cd7f..e6c8c9ece9 100644
Binary files a/public/images/emoji/facebook_messenger/clock830.png and b/public/images/emoji/facebook_messenger/clock830.png differ
diff --git a/public/images/emoji/facebook_messenger/clock9.png b/public/images/emoji/facebook_messenger/clock9.png
index 972becb6d4..b650d63c03 100644
Binary files a/public/images/emoji/facebook_messenger/clock9.png and b/public/images/emoji/facebook_messenger/clock9.png differ
diff --git a/public/images/emoji/facebook_messenger/clock930.png b/public/images/emoji/facebook_messenger/clock930.png
index 8ec20ac7dc..bdcf428fe0 100644
Binary files a/public/images/emoji/facebook_messenger/clock930.png and b/public/images/emoji/facebook_messenger/clock930.png differ
diff --git a/public/images/emoji/facebook_messenger/closed_book.png b/public/images/emoji/facebook_messenger/closed_book.png
index ddf42b7ab7..ea4dfba918 100644
Binary files a/public/images/emoji/facebook_messenger/closed_book.png and b/public/images/emoji/facebook_messenger/closed_book.png differ
diff --git a/public/images/emoji/facebook_messenger/closed_lock_with_key.png b/public/images/emoji/facebook_messenger/closed_lock_with_key.png
index 7ef1a8ab5e..696082fe3e 100644
Binary files a/public/images/emoji/facebook_messenger/closed_lock_with_key.png and b/public/images/emoji/facebook_messenger/closed_lock_with_key.png differ
diff --git a/public/images/emoji/facebook_messenger/closed_umbrella.png b/public/images/emoji/facebook_messenger/closed_umbrella.png
index 680ef4cd1e..2c419306b3 100644
Binary files a/public/images/emoji/facebook_messenger/closed_umbrella.png and b/public/images/emoji/facebook_messenger/closed_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud.png b/public/images/emoji/facebook_messenger/cloud.png
index 8f1746d075..0cdcd5e3f6 100644
Binary files a/public/images/emoji/facebook_messenger/cloud.png and b/public/images/emoji/facebook_messenger/cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_lightning.png b/public/images/emoji/facebook_messenger/cloud_lightning.png
index f45cd42199..0bce1c2615 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_lightning.png and b/public/images/emoji/facebook_messenger/cloud_lightning.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_rain.png b/public/images/emoji/facebook_messenger/cloud_rain.png
index ffd91a25b4..22c872b509 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_rain.png and b/public/images/emoji/facebook_messenger/cloud_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_snow.png b/public/images/emoji/facebook_messenger/cloud_snow.png
index 24834e2de3..c3b2df9657 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_snow.png and b/public/images/emoji/facebook_messenger/cloud_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_tornado.png b/public/images/emoji/facebook_messenger/cloud_tornado.png
index fd843824ed..2de8ec4a69 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_tornado.png and b/public/images/emoji/facebook_messenger/cloud_tornado.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_lightning.png b/public/images/emoji/facebook_messenger/cloud_with_lightning.png
index f45cd42199..0bce1c2615 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_lightning.png and b/public/images/emoji/facebook_messenger/cloud_with_lightning.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png b/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png
index be44d531a7..943482554f 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png and b/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_rain.png b/public/images/emoji/facebook_messenger/cloud_with_rain.png
index ffd91a25b4..22c872b509 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_rain.png and b/public/images/emoji/facebook_messenger/cloud_with_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_snow.png b/public/images/emoji/facebook_messenger/cloud_with_snow.png
index 24834e2de3..c3b2df9657 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_snow.png and b/public/images/emoji/facebook_messenger/cloud_with_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_tornado.png b/public/images/emoji/facebook_messenger/cloud_with_tornado.png
index fd843824ed..2de8ec4a69 100644
Binary files a/public/images/emoji/facebook_messenger/cloud_with_tornado.png and b/public/images/emoji/facebook_messenger/cloud_with_tornado.png differ
diff --git a/public/images/emoji/facebook_messenger/clown_face.png b/public/images/emoji/facebook_messenger/clown_face.png
index c78134fdee..dafd3b5c0d 100644
Binary files a/public/images/emoji/facebook_messenger/clown_face.png and b/public/images/emoji/facebook_messenger/clown_face.png differ
diff --git a/public/images/emoji/facebook_messenger/clubs.png b/public/images/emoji/facebook_messenger/clubs.png
index e0889a39fd..993580971f 100644
Binary files a/public/images/emoji/facebook_messenger/clubs.png and b/public/images/emoji/facebook_messenger/clubs.png differ
diff --git a/public/images/emoji/facebook_messenger/cn.png b/public/images/emoji/facebook_messenger/cn.png
index a9325fc771..ddad4d8315 100644
Binary files a/public/images/emoji/facebook_messenger/cn.png and b/public/images/emoji/facebook_messenger/cn.png differ
diff --git a/public/images/emoji/facebook_messenger/coat.png b/public/images/emoji/facebook_messenger/coat.png
index c409f9f4c4..d7a1a07d05 100644
Binary files a/public/images/emoji/facebook_messenger/coat.png and b/public/images/emoji/facebook_messenger/coat.png differ
diff --git a/public/images/emoji/facebook_messenger/cocktail.png b/public/images/emoji/facebook_messenger/cocktail.png
index 7226b15e04..9231d1c010 100644
Binary files a/public/images/emoji/facebook_messenger/cocktail.png and b/public/images/emoji/facebook_messenger/cocktail.png differ
diff --git a/public/images/emoji/facebook_messenger/coconut.png b/public/images/emoji/facebook_messenger/coconut.png
index e76b533149..5c0ddcf15b 100644
Binary files a/public/images/emoji/facebook_messenger/coconut.png and b/public/images/emoji/facebook_messenger/coconut.png differ
diff --git a/public/images/emoji/facebook_messenger/cocos_islands.png b/public/images/emoji/facebook_messenger/cocos_islands.png
index c9025e34e4..8aaf9f3d82 100644
Binary files a/public/images/emoji/facebook_messenger/cocos_islands.png and b/public/images/emoji/facebook_messenger/cocos_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/coffee.png b/public/images/emoji/facebook_messenger/coffee.png
index 00f0517ca5..7b032b193c 100644
Binary files a/public/images/emoji/facebook_messenger/coffee.png and b/public/images/emoji/facebook_messenger/coffee.png differ
diff --git a/public/images/emoji/facebook_messenger/coffin.png b/public/images/emoji/facebook_messenger/coffin.png
index cbf6ba5696..311c61cbfe 100644
Binary files a/public/images/emoji/facebook_messenger/coffin.png and b/public/images/emoji/facebook_messenger/coffin.png differ
diff --git a/public/images/emoji/facebook_messenger/cold_sweat.png b/public/images/emoji/facebook_messenger/cold_sweat.png
index aef91ca852..35b8bb6861 100644
Binary files a/public/images/emoji/facebook_messenger/cold_sweat.png and b/public/images/emoji/facebook_messenger/cold_sweat.png differ
diff --git a/public/images/emoji/facebook_messenger/colombia.png b/public/images/emoji/facebook_messenger/colombia.png
index f8ac0baf8b..ff797a7631 100644
Binary files a/public/images/emoji/facebook_messenger/colombia.png and b/public/images/emoji/facebook_messenger/colombia.png differ
diff --git a/public/images/emoji/facebook_messenger/comet.png b/public/images/emoji/facebook_messenger/comet.png
index fceafe31e0..13f4a3e1f7 100644
Binary files a/public/images/emoji/facebook_messenger/comet.png and b/public/images/emoji/facebook_messenger/comet.png differ
diff --git a/public/images/emoji/facebook_messenger/comoros.png b/public/images/emoji/facebook_messenger/comoros.png
index e765f50715..443a8fb64f 100644
Binary files a/public/images/emoji/facebook_messenger/comoros.png and b/public/images/emoji/facebook_messenger/comoros.png differ
diff --git a/public/images/emoji/facebook_messenger/compression.png b/public/images/emoji/facebook_messenger/compression.png
index e17edcfc70..c10411d5bd 100644
Binary files a/public/images/emoji/facebook_messenger/compression.png and b/public/images/emoji/facebook_messenger/compression.png differ
diff --git a/public/images/emoji/facebook_messenger/computer.png b/public/images/emoji/facebook_messenger/computer.png
index 16df1b4590..0444ab77d1 100644
Binary files a/public/images/emoji/facebook_messenger/computer.png and b/public/images/emoji/facebook_messenger/computer.png differ
diff --git a/public/images/emoji/facebook_messenger/computer_mouse.png b/public/images/emoji/facebook_messenger/computer_mouse.png
index 3a71c800c6..53fdef1f76 100644
Binary files a/public/images/emoji/facebook_messenger/computer_mouse.png and b/public/images/emoji/facebook_messenger/computer_mouse.png differ
diff --git a/public/images/emoji/facebook_messenger/confetti_ball.png b/public/images/emoji/facebook_messenger/confetti_ball.png
index d198bb4654..a814a64b1f 100644
Binary files a/public/images/emoji/facebook_messenger/confetti_ball.png and b/public/images/emoji/facebook_messenger/confetti_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/confounded.png b/public/images/emoji/facebook_messenger/confounded.png
index 556801a6c1..9113d51adf 100644
Binary files a/public/images/emoji/facebook_messenger/confounded.png and b/public/images/emoji/facebook_messenger/confounded.png differ
diff --git a/public/images/emoji/facebook_messenger/confused.png b/public/images/emoji/facebook_messenger/confused.png
index 8a37c428cb..fda747e0ac 100644
Binary files a/public/images/emoji/facebook_messenger/confused.png and b/public/images/emoji/facebook_messenger/confused.png differ
diff --git a/public/images/emoji/facebook_messenger/congo_brazzaville.png b/public/images/emoji/facebook_messenger/congo_brazzaville.png
index 2eef1d6c17..d2bfc4f6b8 100644
Binary files a/public/images/emoji/facebook_messenger/congo_brazzaville.png and b/public/images/emoji/facebook_messenger/congo_brazzaville.png differ
diff --git a/public/images/emoji/facebook_messenger/congo_kinshasa.png b/public/images/emoji/facebook_messenger/congo_kinshasa.png
index a34af9d64a..c3a26864c1 100644
Binary files a/public/images/emoji/facebook_messenger/congo_kinshasa.png and b/public/images/emoji/facebook_messenger/congo_kinshasa.png differ
diff --git a/public/images/emoji/facebook_messenger/congratulations.png b/public/images/emoji/facebook_messenger/congratulations.png
index eb88827ad0..9234bd13ae 100644
Binary files a/public/images/emoji/facebook_messenger/congratulations.png and b/public/images/emoji/facebook_messenger/congratulations.png differ
diff --git a/public/images/emoji/facebook_messenger/construction.png b/public/images/emoji/facebook_messenger/construction.png
index 5d09fb084f..b4bbfc7151 100644
Binary files a/public/images/emoji/facebook_messenger/construction.png and b/public/images/emoji/facebook_messenger/construction.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_site.png b/public/images/emoji/facebook_messenger/construction_site.png
index 24cdec2e5f..74cd30792b 100644
Binary files a/public/images/emoji/facebook_messenger/construction_site.png and b/public/images/emoji/facebook_messenger/construction_site.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker.png b/public/images/emoji/facebook_messenger/construction_worker.png
index 5feb48f134..df0e868cf3 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker.png and b/public/images/emoji/facebook_messenger/construction_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/2.png b/public/images/emoji/facebook_messenger/construction_worker/2.png
index bd490932a3..9cfbbb8550 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/2.png and b/public/images/emoji/facebook_messenger/construction_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/3.png b/public/images/emoji/facebook_messenger/construction_worker/3.png
index ff712fcd47..0b2de1f802 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/3.png and b/public/images/emoji/facebook_messenger/construction_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/4.png b/public/images/emoji/facebook_messenger/construction_worker/4.png
index e59a2e7038..6a9fd06961 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/4.png and b/public/images/emoji/facebook_messenger/construction_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/5.png b/public/images/emoji/facebook_messenger/construction_worker/5.png
index 95e6d6a842..eaff63ea75 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/5.png and b/public/images/emoji/facebook_messenger/construction_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/6.png b/public/images/emoji/facebook_messenger/construction_worker/6.png
index 721415e844..0d997a9be5 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker/6.png and b/public/images/emoji/facebook_messenger/construction_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man.png b/public/images/emoji/facebook_messenger/construction_worker_man.png
index 5feb48f134..df0e868cf3 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man.png and b/public/images/emoji/facebook_messenger/construction_worker_man.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/2.png b/public/images/emoji/facebook_messenger/construction_worker_man/2.png
index bd490932a3..9cfbbb8550 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/2.png and b/public/images/emoji/facebook_messenger/construction_worker_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/3.png b/public/images/emoji/facebook_messenger/construction_worker_man/3.png
index ff712fcd47..0b2de1f802 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/3.png and b/public/images/emoji/facebook_messenger/construction_worker_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/4.png b/public/images/emoji/facebook_messenger/construction_worker_man/4.png
index e59a2e7038..6a9fd06961 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/4.png and b/public/images/emoji/facebook_messenger/construction_worker_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/5.png b/public/images/emoji/facebook_messenger/construction_worker_man/5.png
index 95e6d6a842..eaff63ea75 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/5.png and b/public/images/emoji/facebook_messenger/construction_worker_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/6.png b/public/images/emoji/facebook_messenger/construction_worker_man/6.png
index 721415e844..0d997a9be5 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_man/6.png and b/public/images/emoji/facebook_messenger/construction_worker_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman.png b/public/images/emoji/facebook_messenger/construction_worker_woman.png
index 7963262606..c5299dd7b9 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman.png and b/public/images/emoji/facebook_messenger/construction_worker_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/2.png b/public/images/emoji/facebook_messenger/construction_worker_woman/2.png
index 63998c76ae..547ad22764 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/2.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/3.png b/public/images/emoji/facebook_messenger/construction_worker_woman/3.png
index 83eb2d8749..6ebc97eeab 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/3.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/4.png b/public/images/emoji/facebook_messenger/construction_worker_woman/4.png
index b518850876..3494276874 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/4.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/5.png b/public/images/emoji/facebook_messenger/construction_worker_woman/5.png
index 80eacbdd52..4bbc0d60d6 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/5.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/6.png b/public/images/emoji/facebook_messenger/construction_worker_woman/6.png
index 34a1e9e2c0..92b38dece7 100644
Binary files a/public/images/emoji/facebook_messenger/construction_worker_woman/6.png and b/public/images/emoji/facebook_messenger/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/control_knobs.png b/public/images/emoji/facebook_messenger/control_knobs.png
index 471e812ed3..102fea6aea 100644
Binary files a/public/images/emoji/facebook_messenger/control_knobs.png and b/public/images/emoji/facebook_messenger/control_knobs.png differ
diff --git a/public/images/emoji/facebook_messenger/convenience_store.png b/public/images/emoji/facebook_messenger/convenience_store.png
index 7cf81e3889..6cf8b990a9 100644
Binary files a/public/images/emoji/facebook_messenger/convenience_store.png and b/public/images/emoji/facebook_messenger/convenience_store.png differ
diff --git a/public/images/emoji/facebook_messenger/cook_islands.png b/public/images/emoji/facebook_messenger/cook_islands.png
index d1e4afbaca..f42617d6fd 100644
Binary files a/public/images/emoji/facebook_messenger/cook_islands.png and b/public/images/emoji/facebook_messenger/cook_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/cookie.png b/public/images/emoji/facebook_messenger/cookie.png
index 5037c4bc64..69739eb017 100644
Binary files a/public/images/emoji/facebook_messenger/cookie.png and b/public/images/emoji/facebook_messenger/cookie.png differ
diff --git a/public/images/emoji/facebook_messenger/cool.png b/public/images/emoji/facebook_messenger/cool.png
index 8e1dccf987..d68afbc36a 100644
Binary files a/public/images/emoji/facebook_messenger/cool.png and b/public/images/emoji/facebook_messenger/cool.png differ
diff --git a/public/images/emoji/facebook_messenger/cop.png b/public/images/emoji/facebook_messenger/cop.png
index 4efbb5500d..089df5b596 100644
Binary files a/public/images/emoji/facebook_messenger/cop.png and b/public/images/emoji/facebook_messenger/cop.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/2.png b/public/images/emoji/facebook_messenger/cop/2.png
index 02f646d46f..2bf0af607a 100644
Binary files a/public/images/emoji/facebook_messenger/cop/2.png and b/public/images/emoji/facebook_messenger/cop/2.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/3.png b/public/images/emoji/facebook_messenger/cop/3.png
index fc0d621ff8..0f03ba24e4 100644
Binary files a/public/images/emoji/facebook_messenger/cop/3.png and b/public/images/emoji/facebook_messenger/cop/3.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/4.png b/public/images/emoji/facebook_messenger/cop/4.png
index 607565d83d..f0fb4bd4d1 100644
Binary files a/public/images/emoji/facebook_messenger/cop/4.png and b/public/images/emoji/facebook_messenger/cop/4.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/5.png b/public/images/emoji/facebook_messenger/cop/5.png
index d54b5e01ab..bba1ef04c9 100644
Binary files a/public/images/emoji/facebook_messenger/cop/5.png and b/public/images/emoji/facebook_messenger/cop/5.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/6.png b/public/images/emoji/facebook_messenger/cop/6.png
index cc17ff14df..7b2ccb4109 100644
Binary files a/public/images/emoji/facebook_messenger/cop/6.png and b/public/images/emoji/facebook_messenger/cop/6.png differ
diff --git a/public/images/emoji/facebook_messenger/copyright.png b/public/images/emoji/facebook_messenger/copyright.png
index e7ed95e52a..61cb4f64b6 100644
Binary files a/public/images/emoji/facebook_messenger/copyright.png and b/public/images/emoji/facebook_messenger/copyright.png differ
diff --git a/public/images/emoji/facebook_messenger/corn.png b/public/images/emoji/facebook_messenger/corn.png
index 7d6bd73005..e025602738 100644
Binary files a/public/images/emoji/facebook_messenger/corn.png and b/public/images/emoji/facebook_messenger/corn.png differ
diff --git a/public/images/emoji/facebook_messenger/costa_rica.png b/public/images/emoji/facebook_messenger/costa_rica.png
index e6c16e4ea0..3c8348c05c 100644
Binary files a/public/images/emoji/facebook_messenger/costa_rica.png and b/public/images/emoji/facebook_messenger/costa_rica.png differ
diff --git a/public/images/emoji/facebook_messenger/cote_divoire.png b/public/images/emoji/facebook_messenger/cote_divoire.png
index c8e9c1eace..29dd8bdb36 100644
Binary files a/public/images/emoji/facebook_messenger/cote_divoire.png and b/public/images/emoji/facebook_messenger/cote_divoire.png differ
diff --git a/public/images/emoji/facebook_messenger/couch.png b/public/images/emoji/facebook_messenger/couch.png
index e46d4de859..678c13d733 100644
Binary files a/public/images/emoji/facebook_messenger/couch.png and b/public/images/emoji/facebook_messenger/couch.png differ
diff --git a/public/images/emoji/facebook_messenger/couch_and_lamp.png b/public/images/emoji/facebook_messenger/couch_and_lamp.png
index e46d4de859..678c13d733 100644
Binary files a/public/images/emoji/facebook_messenger/couch_and_lamp.png and b/public/images/emoji/facebook_messenger/couch_and_lamp.png differ
diff --git a/public/images/emoji/facebook_messenger/couple.png b/public/images/emoji/facebook_messenger/couple.png
index 955b98c386..d30ab40ac9 100644
Binary files a/public/images/emoji/facebook_messenger/couple.png and b/public/images/emoji/facebook_messenger/couple.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart.png b/public/images/emoji/facebook_messenger/couple_with_heart.png
index 30aa3b8329..00012f6fdc 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart.png and b/public/images/emoji/facebook_messenger/couple_with_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png b/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png
index 8fcabbd430..50c3f8f81f 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png and b/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png b/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png
index 30aa3b8329..00012f6fdc 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png and b/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png b/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png
index b82bbf04b4..ab3c64daed 100644
Binary files a/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png and b/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss.png b/public/images/emoji/facebook_messenger/couplekiss.png
index 07ab022382..27f53aa0cd 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss.png and b/public/images/emoji/facebook_messenger/couplekiss.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss_man_man.png b/public/images/emoji/facebook_messenger/couplekiss_man_man.png
index 842c5a4e22..e626b7eb92 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss_man_man.png and b/public/images/emoji/facebook_messenger/couplekiss_man_man.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss_man_woman.png b/public/images/emoji/facebook_messenger/couplekiss_man_woman.png
index 07ab022382..27f53aa0cd 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss_man_woman.png and b/public/images/emoji/facebook_messenger/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png b/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png
index 4f1324e09f..cb33b1daf9 100644
Binary files a/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png and b/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/cow.png b/public/images/emoji/facebook_messenger/cow.png
index 21b6b7be8f..03134a5300 100644
Binary files a/public/images/emoji/facebook_messenger/cow.png and b/public/images/emoji/facebook_messenger/cow.png differ
diff --git a/public/images/emoji/facebook_messenger/cow2.png b/public/images/emoji/facebook_messenger/cow2.png
index 0aee85e183..acb8e68aec 100644
Binary files a/public/images/emoji/facebook_messenger/cow2.png and b/public/images/emoji/facebook_messenger/cow2.png differ
diff --git a/public/images/emoji/facebook_messenger/cowboy_hat_face.png b/public/images/emoji/facebook_messenger/cowboy_hat_face.png
index efe2c6fcd1..fb0178aef0 100644
Binary files a/public/images/emoji/facebook_messenger/cowboy_hat_face.png and b/public/images/emoji/facebook_messenger/cowboy_hat_face.png differ
diff --git a/public/images/emoji/facebook_messenger/crab.png b/public/images/emoji/facebook_messenger/crab.png
index 549988455d..29d38bb172 100644
Binary files a/public/images/emoji/facebook_messenger/crab.png and b/public/images/emoji/facebook_messenger/crab.png differ
diff --git a/public/images/emoji/facebook_messenger/crayon.png b/public/images/emoji/facebook_messenger/crayon.png
index 0ad5b02c2d..5f920abb85 100644
Binary files a/public/images/emoji/facebook_messenger/crayon.png and b/public/images/emoji/facebook_messenger/crayon.png differ
diff --git a/public/images/emoji/facebook_messenger/crazy_face.png b/public/images/emoji/facebook_messenger/crazy_face.png
index 0aaa1cf765..c98503796f 100644
Binary files a/public/images/emoji/facebook_messenger/crazy_face.png and b/public/images/emoji/facebook_messenger/crazy_face.png differ
diff --git a/public/images/emoji/facebook_messenger/credit_card.png b/public/images/emoji/facebook_messenger/credit_card.png
index 818c05713d..8274ccb05d 100644
Binary files a/public/images/emoji/facebook_messenger/credit_card.png and b/public/images/emoji/facebook_messenger/credit_card.png differ
diff --git a/public/images/emoji/facebook_messenger/crescent_moon.png b/public/images/emoji/facebook_messenger/crescent_moon.png
index 8094a7c205..423e9adf48 100644
Binary files a/public/images/emoji/facebook_messenger/crescent_moon.png and b/public/images/emoji/facebook_messenger/crescent_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket.png b/public/images/emoji/facebook_messenger/cricket.png
index 1e3c9dfa38..21f51073b7 100644
Binary files a/public/images/emoji/facebook_messenger/cricket.png and b/public/images/emoji/facebook_messenger/cricket.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png b/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png
index 8a0bf65a6c..3247402fc5 100644
Binary files a/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png and b/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket_bat_ball.png b/public/images/emoji/facebook_messenger/cricket_bat_ball.png
index 8a0bf65a6c..3247402fc5 100644
Binary files a/public/images/emoji/facebook_messenger/cricket_bat_ball.png and b/public/images/emoji/facebook_messenger/cricket_bat_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/croatia.png b/public/images/emoji/facebook_messenger/croatia.png
index 6cc9a0e748..4b0c90ed4a 100644
Binary files a/public/images/emoji/facebook_messenger/croatia.png and b/public/images/emoji/facebook_messenger/croatia.png differ
diff --git a/public/images/emoji/facebook_messenger/crocodile.png b/public/images/emoji/facebook_messenger/crocodile.png
index 64740f53d5..0794c39b52 100644
Binary files a/public/images/emoji/facebook_messenger/crocodile.png and b/public/images/emoji/facebook_messenger/crocodile.png differ
diff --git a/public/images/emoji/facebook_messenger/croissant.png b/public/images/emoji/facebook_messenger/croissant.png
index c2cea2221f..3675ac294e 100644
Binary files a/public/images/emoji/facebook_messenger/croissant.png and b/public/images/emoji/facebook_messenger/croissant.png differ
diff --git a/public/images/emoji/facebook_messenger/cross.png b/public/images/emoji/facebook_messenger/cross.png
index f11e296dd9..705cfc1e6f 100644
Binary files a/public/images/emoji/facebook_messenger/cross.png and b/public/images/emoji/facebook_messenger/cross.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers.png b/public/images/emoji/facebook_messenger/crossed_fingers.png
index 9ba3b1ff09..63e4b4c155 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers.png and b/public/images/emoji/facebook_messenger/crossed_fingers.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/2.png b/public/images/emoji/facebook_messenger/crossed_fingers/2.png
index 7ce5cd5811..f785dff7c8 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/2.png and b/public/images/emoji/facebook_messenger/crossed_fingers/2.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/3.png b/public/images/emoji/facebook_messenger/crossed_fingers/3.png
index c6297b1c63..54dac6d117 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/3.png and b/public/images/emoji/facebook_messenger/crossed_fingers/3.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/4.png b/public/images/emoji/facebook_messenger/crossed_fingers/4.png
index 8ae4d9b0f9..35c320e4b3 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/4.png and b/public/images/emoji/facebook_messenger/crossed_fingers/4.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/5.png b/public/images/emoji/facebook_messenger/crossed_fingers/5.png
index f3529e2537..863900fd71 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/5.png and b/public/images/emoji/facebook_messenger/crossed_fingers/5.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/6.png b/public/images/emoji/facebook_messenger/crossed_fingers/6.png
index 0265996d38..0180a4bd6c 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_fingers/6.png and b/public/images/emoji/facebook_messenger/crossed_fingers/6.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_flags.png b/public/images/emoji/facebook_messenger/crossed_flags.png
index c168bb1ba5..2c2802055e 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_flags.png and b/public/images/emoji/facebook_messenger/crossed_flags.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_swords.png b/public/images/emoji/facebook_messenger/crossed_swords.png
index ec1da04367..1c2e4956cb 100644
Binary files a/public/images/emoji/facebook_messenger/crossed_swords.png and b/public/images/emoji/facebook_messenger/crossed_swords.png differ
diff --git a/public/images/emoji/facebook_messenger/crown.png b/public/images/emoji/facebook_messenger/crown.png
index 8a0b6d323d..8b4003b813 100644
Binary files a/public/images/emoji/facebook_messenger/crown.png and b/public/images/emoji/facebook_messenger/crown.png differ
diff --git a/public/images/emoji/facebook_messenger/cruise_ship.png b/public/images/emoji/facebook_messenger/cruise_ship.png
index b1ee561346..a79fe563a4 100644
Binary files a/public/images/emoji/facebook_messenger/cruise_ship.png and b/public/images/emoji/facebook_messenger/cruise_ship.png differ
diff --git a/public/images/emoji/facebook_messenger/cry.png b/public/images/emoji/facebook_messenger/cry.png
index f77cfe7b5a..35274e4359 100644
Binary files a/public/images/emoji/facebook_messenger/cry.png and b/public/images/emoji/facebook_messenger/cry.png differ
diff --git a/public/images/emoji/facebook_messenger/crying_cat_face.png b/public/images/emoji/facebook_messenger/crying_cat_face.png
index ea06ae025c..37e7c91b31 100644
Binary files a/public/images/emoji/facebook_messenger/crying_cat_face.png and b/public/images/emoji/facebook_messenger/crying_cat_face.png differ
diff --git a/public/images/emoji/facebook_messenger/crystal_ball.png b/public/images/emoji/facebook_messenger/crystal_ball.png
index 0a119e84f4..4274254a14 100644
Binary files a/public/images/emoji/facebook_messenger/crystal_ball.png and b/public/images/emoji/facebook_messenger/crystal_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/cuba.png b/public/images/emoji/facebook_messenger/cuba.png
index 4436dee31e..154462eb04 100644
Binary files a/public/images/emoji/facebook_messenger/cuba.png and b/public/images/emoji/facebook_messenger/cuba.png differ
diff --git a/public/images/emoji/facebook_messenger/cucumber.png b/public/images/emoji/facebook_messenger/cucumber.png
index 392fdddcc1..1331599e45 100644
Binary files a/public/images/emoji/facebook_messenger/cucumber.png and b/public/images/emoji/facebook_messenger/cucumber.png differ
diff --git a/public/images/emoji/facebook_messenger/cup_with_straw.png b/public/images/emoji/facebook_messenger/cup_with_straw.png
index 4b2f313f9b..18d6fea1f5 100644
Binary files a/public/images/emoji/facebook_messenger/cup_with_straw.png and b/public/images/emoji/facebook_messenger/cup_with_straw.png differ
diff --git a/public/images/emoji/facebook_messenger/cupid.png b/public/images/emoji/facebook_messenger/cupid.png
index d6c771a319..8d936d1e24 100644
Binary files a/public/images/emoji/facebook_messenger/cupid.png and b/public/images/emoji/facebook_messenger/cupid.png differ
diff --git a/public/images/emoji/facebook_messenger/curacao.png b/public/images/emoji/facebook_messenger/curacao.png
index e29bde1f8b..7425765f9a 100644
Binary files a/public/images/emoji/facebook_messenger/curacao.png and b/public/images/emoji/facebook_messenger/curacao.png differ
diff --git a/public/images/emoji/facebook_messenger/curling_stone.png b/public/images/emoji/facebook_messenger/curling_stone.png
index 09027a2fb2..b19fa35617 100644
Binary files a/public/images/emoji/facebook_messenger/curling_stone.png and b/public/images/emoji/facebook_messenger/curling_stone.png differ
diff --git a/public/images/emoji/facebook_messenger/curly_loop.png b/public/images/emoji/facebook_messenger/curly_loop.png
index dc1db4da40..6128a31690 100644
Binary files a/public/images/emoji/facebook_messenger/curly_loop.png and b/public/images/emoji/facebook_messenger/curly_loop.png differ
diff --git a/public/images/emoji/facebook_messenger/currency_exchange.png b/public/images/emoji/facebook_messenger/currency_exchange.png
index e3bdddf392..3747db6ca6 100644
Binary files a/public/images/emoji/facebook_messenger/currency_exchange.png and b/public/images/emoji/facebook_messenger/currency_exchange.png differ
diff --git a/public/images/emoji/facebook_messenger/curry.png b/public/images/emoji/facebook_messenger/curry.png
index 383f800e95..11bda1ff92 100644
Binary files a/public/images/emoji/facebook_messenger/curry.png and b/public/images/emoji/facebook_messenger/curry.png differ
diff --git a/public/images/emoji/facebook_messenger/custard.png b/public/images/emoji/facebook_messenger/custard.png
index dc16af3ad2..f829264bd3 100644
Binary files a/public/images/emoji/facebook_messenger/custard.png and b/public/images/emoji/facebook_messenger/custard.png differ
diff --git a/public/images/emoji/facebook_messenger/customs.png b/public/images/emoji/facebook_messenger/customs.png
index 9c0dc646a1..301caea47c 100644
Binary files a/public/images/emoji/facebook_messenger/customs.png and b/public/images/emoji/facebook_messenger/customs.png differ
diff --git a/public/images/emoji/facebook_messenger/cut_of_meat.png b/public/images/emoji/facebook_messenger/cut_of_meat.png
index b66d427e09..b6f4714c46 100644
Binary files a/public/images/emoji/facebook_messenger/cut_of_meat.png and b/public/images/emoji/facebook_messenger/cut_of_meat.png differ
diff --git a/public/images/emoji/facebook_messenger/cyclone.png b/public/images/emoji/facebook_messenger/cyclone.png
index cf2b568c06..dfbeb83774 100644
Binary files a/public/images/emoji/facebook_messenger/cyclone.png and b/public/images/emoji/facebook_messenger/cyclone.png differ
diff --git a/public/images/emoji/facebook_messenger/cyprus.png b/public/images/emoji/facebook_messenger/cyprus.png
index 7f80f4ed57..71ef3428ca 100644
Binary files a/public/images/emoji/facebook_messenger/cyprus.png and b/public/images/emoji/facebook_messenger/cyprus.png differ
diff --git a/public/images/emoji/facebook_messenger/czech_republic.png b/public/images/emoji/facebook_messenger/czech_republic.png
index 88558e4ab2..c7b22d1dbc 100644
Binary files a/public/images/emoji/facebook_messenger/czech_republic.png and b/public/images/emoji/facebook_messenger/czech_republic.png differ
diff --git a/public/images/emoji/facebook_messenger/dagger.png b/public/images/emoji/facebook_messenger/dagger.png
index 8e56922aa6..18965532b4 100644
Binary files a/public/images/emoji/facebook_messenger/dagger.png and b/public/images/emoji/facebook_messenger/dagger.png differ
diff --git a/public/images/emoji/facebook_messenger/dagger_knife.png b/public/images/emoji/facebook_messenger/dagger_knife.png
index 8e56922aa6..18965532b4 100644
Binary files a/public/images/emoji/facebook_messenger/dagger_knife.png and b/public/images/emoji/facebook_messenger/dagger_knife.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer.png b/public/images/emoji/facebook_messenger/dancer.png
index e05d637236..1626b805d8 100644
Binary files a/public/images/emoji/facebook_messenger/dancer.png and b/public/images/emoji/facebook_messenger/dancer.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/2.png b/public/images/emoji/facebook_messenger/dancer/2.png
index cec2b05df7..afea33901d 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/2.png and b/public/images/emoji/facebook_messenger/dancer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/3.png b/public/images/emoji/facebook_messenger/dancer/3.png
index 208851079d..80d6678c2d 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/3.png and b/public/images/emoji/facebook_messenger/dancer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/4.png b/public/images/emoji/facebook_messenger/dancer/4.png
index c68c9968ab..144deb45f0 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/4.png and b/public/images/emoji/facebook_messenger/dancer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/5.png b/public/images/emoji/facebook_messenger/dancer/5.png
index 7927c18674..bab54cc034 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/5.png and b/public/images/emoji/facebook_messenger/dancer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/6.png b/public/images/emoji/facebook_messenger/dancer/6.png
index 13b2052130..cbbd1ede9a 100644
Binary files a/public/images/emoji/facebook_messenger/dancer/6.png and b/public/images/emoji/facebook_messenger/dancer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/dancers.png b/public/images/emoji/facebook_messenger/dancers.png
index 8a83bc31d2..8514dea420 100644
Binary files a/public/images/emoji/facebook_messenger/dancers.png and b/public/images/emoji/facebook_messenger/dancers.png differ
diff --git a/public/images/emoji/facebook_messenger/dancing_men.png b/public/images/emoji/facebook_messenger/dancing_men.png
index dec9fb054b..873562db0a 100644
Binary files a/public/images/emoji/facebook_messenger/dancing_men.png and b/public/images/emoji/facebook_messenger/dancing_men.png differ
diff --git a/public/images/emoji/facebook_messenger/dancing_women.png b/public/images/emoji/facebook_messenger/dancing_women.png
index 8a83bc31d2..8514dea420 100644
Binary files a/public/images/emoji/facebook_messenger/dancing_women.png and b/public/images/emoji/facebook_messenger/dancing_women.png differ
diff --git a/public/images/emoji/facebook_messenger/dango.png b/public/images/emoji/facebook_messenger/dango.png
index f90ec298ad..549edddc9c 100644
Binary files a/public/images/emoji/facebook_messenger/dango.png and b/public/images/emoji/facebook_messenger/dango.png differ
diff --git a/public/images/emoji/facebook_messenger/dark_sunglasses.png b/public/images/emoji/facebook_messenger/dark_sunglasses.png
index a4a0514f9c..666c6f13d5 100644
Binary files a/public/images/emoji/facebook_messenger/dark_sunglasses.png and b/public/images/emoji/facebook_messenger/dark_sunglasses.png differ
diff --git a/public/images/emoji/facebook_messenger/dart.png b/public/images/emoji/facebook_messenger/dart.png
index ff79ba245d..d1054c6516 100644
Binary files a/public/images/emoji/facebook_messenger/dart.png and b/public/images/emoji/facebook_messenger/dart.png differ
diff --git a/public/images/emoji/facebook_messenger/dash.png b/public/images/emoji/facebook_messenger/dash.png
index 72b36c8e4f..99da43cb75 100644
Binary files a/public/images/emoji/facebook_messenger/dash.png and b/public/images/emoji/facebook_messenger/dash.png differ
diff --git a/public/images/emoji/facebook_messenger/date.png b/public/images/emoji/facebook_messenger/date.png
index adfdfd4256..5816566750 100644
Binary files a/public/images/emoji/facebook_messenger/date.png and b/public/images/emoji/facebook_messenger/date.png differ
diff --git a/public/images/emoji/facebook_messenger/de.png b/public/images/emoji/facebook_messenger/de.png
index 964116acbb..8a375afccd 100644
Binary files a/public/images/emoji/facebook_messenger/de.png and b/public/images/emoji/facebook_messenger/de.png differ
diff --git a/public/images/emoji/facebook_messenger/deciduous_tree.png b/public/images/emoji/facebook_messenger/deciduous_tree.png
index a6df67b2a9..99ec0af655 100644
Binary files a/public/images/emoji/facebook_messenger/deciduous_tree.png and b/public/images/emoji/facebook_messenger/deciduous_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/deer.png b/public/images/emoji/facebook_messenger/deer.png
index 92aa546e94..c9b03cc45f 100644
Binary files a/public/images/emoji/facebook_messenger/deer.png and b/public/images/emoji/facebook_messenger/deer.png differ
diff --git a/public/images/emoji/facebook_messenger/denmark.png b/public/images/emoji/facebook_messenger/denmark.png
index bb8ef11ea5..182974982d 100644
Binary files a/public/images/emoji/facebook_messenger/denmark.png and b/public/images/emoji/facebook_messenger/denmark.png differ
diff --git a/public/images/emoji/facebook_messenger/department_store.png b/public/images/emoji/facebook_messenger/department_store.png
index b6b6f440ed..96222f81e8 100644
Binary files a/public/images/emoji/facebook_messenger/department_store.png and b/public/images/emoji/facebook_messenger/department_store.png differ
diff --git a/public/images/emoji/facebook_messenger/derelict_house.png b/public/images/emoji/facebook_messenger/derelict_house.png
index a48da60494..a03480bd67 100644
Binary files a/public/images/emoji/facebook_messenger/derelict_house.png and b/public/images/emoji/facebook_messenger/derelict_house.png differ
diff --git a/public/images/emoji/facebook_messenger/derelict_house_building.png b/public/images/emoji/facebook_messenger/derelict_house_building.png
index a48da60494..a03480bd67 100644
Binary files a/public/images/emoji/facebook_messenger/derelict_house_building.png and b/public/images/emoji/facebook_messenger/derelict_house_building.png differ
diff --git a/public/images/emoji/facebook_messenger/desert.png b/public/images/emoji/facebook_messenger/desert.png
index 3ec8a867b4..2b62e0a111 100644
Binary files a/public/images/emoji/facebook_messenger/desert.png and b/public/images/emoji/facebook_messenger/desert.png differ
diff --git a/public/images/emoji/facebook_messenger/desert_island.png b/public/images/emoji/facebook_messenger/desert_island.png
index 2d2e8919ff..7a1f87faf9 100644
Binary files a/public/images/emoji/facebook_messenger/desert_island.png and b/public/images/emoji/facebook_messenger/desert_island.png differ
diff --git a/public/images/emoji/facebook_messenger/desktop.png b/public/images/emoji/facebook_messenger/desktop.png
index 120faa7536..afd2e0ab2b 100644
Binary files a/public/images/emoji/facebook_messenger/desktop.png and b/public/images/emoji/facebook_messenger/desktop.png differ
diff --git a/public/images/emoji/facebook_messenger/desktop_computer.png b/public/images/emoji/facebook_messenger/desktop_computer.png
index 120faa7536..afd2e0ab2b 100644
Binary files a/public/images/emoji/facebook_messenger/desktop_computer.png and b/public/images/emoji/facebook_messenger/desktop_computer.png differ
diff --git a/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png b/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png
index 5b51721f2e..bc8c27c99b 100644
Binary files a/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/facebook_messenger/diamonds.png b/public/images/emoji/facebook_messenger/diamonds.png
index e416a8ce5d..51ceb38b9e 100644
Binary files a/public/images/emoji/facebook_messenger/diamonds.png and b/public/images/emoji/facebook_messenger/diamonds.png differ
diff --git a/public/images/emoji/facebook_messenger/diego_garcia.png b/public/images/emoji/facebook_messenger/diego_garcia.png
index 881e01a927..2c48fa114c 100644
Binary files a/public/images/emoji/facebook_messenger/diego_garcia.png and b/public/images/emoji/facebook_messenger/diego_garcia.png differ
diff --git a/public/images/emoji/facebook_messenger/disappointed.png b/public/images/emoji/facebook_messenger/disappointed.png
index 26ca83eeb5..60fff2810e 100644
Binary files a/public/images/emoji/facebook_messenger/disappointed.png and b/public/images/emoji/facebook_messenger/disappointed.png differ
diff --git a/public/images/emoji/facebook_messenger/disappointed_relieved.png b/public/images/emoji/facebook_messenger/disappointed_relieved.png
index 0537746c4c..ff9396b641 100644
Binary files a/public/images/emoji/facebook_messenger/disappointed_relieved.png and b/public/images/emoji/facebook_messenger/disappointed_relieved.png differ
diff --git a/public/images/emoji/facebook_messenger/dividers.png b/public/images/emoji/facebook_messenger/dividers.png
index b1e27091c9..8df2040c73 100644
Binary files a/public/images/emoji/facebook_messenger/dividers.png and b/public/images/emoji/facebook_messenger/dividers.png differ
diff --git a/public/images/emoji/facebook_messenger/dizzy.png b/public/images/emoji/facebook_messenger/dizzy.png
index 0894ceafb5..28e7fc09be 100644
Binary files a/public/images/emoji/facebook_messenger/dizzy.png and b/public/images/emoji/facebook_messenger/dizzy.png differ
diff --git a/public/images/emoji/facebook_messenger/dizzy_face.png b/public/images/emoji/facebook_messenger/dizzy_face.png
index 24f1af2db3..762b12e5d9 100644
Binary files a/public/images/emoji/facebook_messenger/dizzy_face.png and b/public/images/emoji/facebook_messenger/dizzy_face.png differ
diff --git a/public/images/emoji/facebook_messenger/djibouti.png b/public/images/emoji/facebook_messenger/djibouti.png
index 606fe6a1ee..cfd80d614f 100644
Binary files a/public/images/emoji/facebook_messenger/djibouti.png and b/public/images/emoji/facebook_messenger/djibouti.png differ
diff --git a/public/images/emoji/facebook_messenger/do_not_litter.png b/public/images/emoji/facebook_messenger/do_not_litter.png
index f53f8fa83d..255f8d94ab 100644
Binary files a/public/images/emoji/facebook_messenger/do_not_litter.png and b/public/images/emoji/facebook_messenger/do_not_litter.png differ
diff --git a/public/images/emoji/facebook_messenger/dog.png b/public/images/emoji/facebook_messenger/dog.png
index 8f39851230..b478ca4e39 100644
Binary files a/public/images/emoji/facebook_messenger/dog.png and b/public/images/emoji/facebook_messenger/dog.png differ
diff --git a/public/images/emoji/facebook_messenger/dog2.png b/public/images/emoji/facebook_messenger/dog2.png
index afb48d19e8..476d447a77 100644
Binary files a/public/images/emoji/facebook_messenger/dog2.png and b/public/images/emoji/facebook_messenger/dog2.png differ
diff --git a/public/images/emoji/facebook_messenger/dollar.png b/public/images/emoji/facebook_messenger/dollar.png
index cc6d41c785..d523c3ad2e 100644
Binary files a/public/images/emoji/facebook_messenger/dollar.png and b/public/images/emoji/facebook_messenger/dollar.png differ
diff --git a/public/images/emoji/facebook_messenger/dolls.png b/public/images/emoji/facebook_messenger/dolls.png
index effc75342e..f92c9d90fd 100644
Binary files a/public/images/emoji/facebook_messenger/dolls.png and b/public/images/emoji/facebook_messenger/dolls.png differ
diff --git a/public/images/emoji/facebook_messenger/dolphin.png b/public/images/emoji/facebook_messenger/dolphin.png
index bae7802d5e..0229c106b7 100644
Binary files a/public/images/emoji/facebook_messenger/dolphin.png and b/public/images/emoji/facebook_messenger/dolphin.png differ
diff --git a/public/images/emoji/facebook_messenger/dominica.png b/public/images/emoji/facebook_messenger/dominica.png
index 588ece3f43..f25264e8a2 100644
Binary files a/public/images/emoji/facebook_messenger/dominica.png and b/public/images/emoji/facebook_messenger/dominica.png differ
diff --git a/public/images/emoji/facebook_messenger/dominican_republic.png b/public/images/emoji/facebook_messenger/dominican_republic.png
index de48ff449c..124c0ea10f 100644
Binary files a/public/images/emoji/facebook_messenger/dominican_republic.png and b/public/images/emoji/facebook_messenger/dominican_republic.png differ
diff --git a/public/images/emoji/facebook_messenger/door.png b/public/images/emoji/facebook_messenger/door.png
index bcb88cd2b5..c3ded83934 100644
Binary files a/public/images/emoji/facebook_messenger/door.png and b/public/images/emoji/facebook_messenger/door.png differ
diff --git a/public/images/emoji/facebook_messenger/double_vertical_bar.png b/public/images/emoji/facebook_messenger/double_vertical_bar.png
index 624e2df711..de512cc09f 100644
Binary files a/public/images/emoji/facebook_messenger/double_vertical_bar.png and b/public/images/emoji/facebook_messenger/double_vertical_bar.png differ
diff --git a/public/images/emoji/facebook_messenger/doughnut.png b/public/images/emoji/facebook_messenger/doughnut.png
index edfa5ccac9..7882858ed4 100644
Binary files a/public/images/emoji/facebook_messenger/doughnut.png and b/public/images/emoji/facebook_messenger/doughnut.png differ
diff --git a/public/images/emoji/facebook_messenger/dove.png b/public/images/emoji/facebook_messenger/dove.png
index 9fdcff829a..fbd53b289d 100644
Binary files a/public/images/emoji/facebook_messenger/dove.png and b/public/images/emoji/facebook_messenger/dove.png differ
diff --git a/public/images/emoji/facebook_messenger/dove_of_peace.png b/public/images/emoji/facebook_messenger/dove_of_peace.png
index 9fdcff829a..fbd53b289d 100644
Binary files a/public/images/emoji/facebook_messenger/dove_of_peace.png and b/public/images/emoji/facebook_messenger/dove_of_peace.png differ
diff --git a/public/images/emoji/facebook_messenger/dragon.png b/public/images/emoji/facebook_messenger/dragon.png
index c67e4d4b5e..7493c8bcbe 100644
Binary files a/public/images/emoji/facebook_messenger/dragon.png and b/public/images/emoji/facebook_messenger/dragon.png differ
diff --git a/public/images/emoji/facebook_messenger/dragon_face.png b/public/images/emoji/facebook_messenger/dragon_face.png
index cea46ab094..c664b08192 100644
Binary files a/public/images/emoji/facebook_messenger/dragon_face.png and b/public/images/emoji/facebook_messenger/dragon_face.png differ
diff --git a/public/images/emoji/facebook_messenger/dress.png b/public/images/emoji/facebook_messenger/dress.png
index ef0e02eb6a..ff6572470d 100644
Binary files a/public/images/emoji/facebook_messenger/dress.png and b/public/images/emoji/facebook_messenger/dress.png differ
diff --git a/public/images/emoji/facebook_messenger/dromedary_camel.png b/public/images/emoji/facebook_messenger/dromedary_camel.png
index 30fba91ffe..b9632cf2fc 100644
Binary files a/public/images/emoji/facebook_messenger/dromedary_camel.png and b/public/images/emoji/facebook_messenger/dromedary_camel.png differ
diff --git a/public/images/emoji/facebook_messenger/drooling_face.png b/public/images/emoji/facebook_messenger/drooling_face.png
index 2ad3f8a41b..677d0d3bfd 100644
Binary files a/public/images/emoji/facebook_messenger/drooling_face.png and b/public/images/emoji/facebook_messenger/drooling_face.png differ
diff --git a/public/images/emoji/facebook_messenger/droplet.png b/public/images/emoji/facebook_messenger/droplet.png
index 186137dfb4..1bd974bb04 100644
Binary files a/public/images/emoji/facebook_messenger/droplet.png and b/public/images/emoji/facebook_messenger/droplet.png differ
diff --git a/public/images/emoji/facebook_messenger/drum.png b/public/images/emoji/facebook_messenger/drum.png
index d0c94c34e4..94383bf380 100644
Binary files a/public/images/emoji/facebook_messenger/drum.png and b/public/images/emoji/facebook_messenger/drum.png differ
diff --git a/public/images/emoji/facebook_messenger/duck.png b/public/images/emoji/facebook_messenger/duck.png
index 6adaf8cddb..f6c09dd677 100644
Binary files a/public/images/emoji/facebook_messenger/duck.png and b/public/images/emoji/facebook_messenger/duck.png differ
diff --git a/public/images/emoji/facebook_messenger/dumpling.png b/public/images/emoji/facebook_messenger/dumpling.png
index 489a779bf6..43d8c92275 100644
Binary files a/public/images/emoji/facebook_messenger/dumpling.png and b/public/images/emoji/facebook_messenger/dumpling.png differ
diff --git a/public/images/emoji/facebook_messenger/dvd.png b/public/images/emoji/facebook_messenger/dvd.png
index d2cfd45f3c..c81bf2e1e8 100644
Binary files a/public/images/emoji/facebook_messenger/dvd.png and b/public/images/emoji/facebook_messenger/dvd.png differ
diff --git a/public/images/emoji/facebook_messenger/e-mail.png b/public/images/emoji/facebook_messenger/e-mail.png
index e160129faf..e50d4fc637 100644
Binary files a/public/images/emoji/facebook_messenger/e-mail.png and b/public/images/emoji/facebook_messenger/e-mail.png differ
diff --git a/public/images/emoji/facebook_messenger/eagle.png b/public/images/emoji/facebook_messenger/eagle.png
index c9cce258ae..c152a6f022 100644
Binary files a/public/images/emoji/facebook_messenger/eagle.png and b/public/images/emoji/facebook_messenger/eagle.png differ
diff --git a/public/images/emoji/facebook_messenger/ear.png b/public/images/emoji/facebook_messenger/ear.png
index 654ee58983..c2cc0b5392 100644
Binary files a/public/images/emoji/facebook_messenger/ear.png and b/public/images/emoji/facebook_messenger/ear.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/2.png b/public/images/emoji/facebook_messenger/ear/2.png
index 16c75ee0c1..bac35be734 100644
Binary files a/public/images/emoji/facebook_messenger/ear/2.png and b/public/images/emoji/facebook_messenger/ear/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/3.png b/public/images/emoji/facebook_messenger/ear/3.png
index f62ef93bf8..80e98fa965 100644
Binary files a/public/images/emoji/facebook_messenger/ear/3.png and b/public/images/emoji/facebook_messenger/ear/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/4.png b/public/images/emoji/facebook_messenger/ear/4.png
index 4b1179a35b..eb0577cbf2 100644
Binary files a/public/images/emoji/facebook_messenger/ear/4.png and b/public/images/emoji/facebook_messenger/ear/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/5.png b/public/images/emoji/facebook_messenger/ear/5.png
index 2388c5ce03..f0f8a21187 100644
Binary files a/public/images/emoji/facebook_messenger/ear/5.png and b/public/images/emoji/facebook_messenger/ear/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/6.png b/public/images/emoji/facebook_messenger/ear/6.png
index 6b2e51b85e..32498024b7 100644
Binary files a/public/images/emoji/facebook_messenger/ear/6.png and b/public/images/emoji/facebook_messenger/ear/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ear_of_rice.png b/public/images/emoji/facebook_messenger/ear_of_rice.png
index 5273991fab..5c443c28e3 100644
Binary files a/public/images/emoji/facebook_messenger/ear_of_rice.png and b/public/images/emoji/facebook_messenger/ear_of_rice.png differ
diff --git a/public/images/emoji/facebook_messenger/earth_africa.png b/public/images/emoji/facebook_messenger/earth_africa.png
index f659e02dbe..760ac58218 100644
Binary files a/public/images/emoji/facebook_messenger/earth_africa.png and b/public/images/emoji/facebook_messenger/earth_africa.png differ
diff --git a/public/images/emoji/facebook_messenger/earth_americas.png b/public/images/emoji/facebook_messenger/earth_americas.png
index 26fbfc9714..4ea93a7589 100644
Binary files a/public/images/emoji/facebook_messenger/earth_americas.png and b/public/images/emoji/facebook_messenger/earth_americas.png differ
diff --git a/public/images/emoji/facebook_messenger/earth_asia.png b/public/images/emoji/facebook_messenger/earth_asia.png
index 030250142f..63dd04b647 100644
Binary files a/public/images/emoji/facebook_messenger/earth_asia.png and b/public/images/emoji/facebook_messenger/earth_asia.png differ
diff --git a/public/images/emoji/facebook_messenger/ecuador.png b/public/images/emoji/facebook_messenger/ecuador.png
index cf86fbaad6..38527eed7f 100644
Binary files a/public/images/emoji/facebook_messenger/ecuador.png and b/public/images/emoji/facebook_messenger/ecuador.png differ
diff --git a/public/images/emoji/facebook_messenger/egg.png b/public/images/emoji/facebook_messenger/egg.png
index cec55b549a..49d700ec26 100644
Binary files a/public/images/emoji/facebook_messenger/egg.png and b/public/images/emoji/facebook_messenger/egg.png differ
diff --git a/public/images/emoji/facebook_messenger/eggplant.png b/public/images/emoji/facebook_messenger/eggplant.png
index 4f60ef799d..aba93476d8 100644
Binary files a/public/images/emoji/facebook_messenger/eggplant.png and b/public/images/emoji/facebook_messenger/eggplant.png differ
diff --git a/public/images/emoji/facebook_messenger/egypt.png b/public/images/emoji/facebook_messenger/egypt.png
index bbbdefa653..82c3bedbdb 100644
Binary files a/public/images/emoji/facebook_messenger/egypt.png and b/public/images/emoji/facebook_messenger/egypt.png differ
diff --git a/public/images/emoji/facebook_messenger/eight.png b/public/images/emoji/facebook_messenger/eight.png
index 12c277e585..fa9597b5cd 100644
Binary files a/public/images/emoji/facebook_messenger/eight.png and b/public/images/emoji/facebook_messenger/eight.png differ
diff --git a/public/images/emoji/facebook_messenger/eight_pointed_black_star.png b/public/images/emoji/facebook_messenger/eight_pointed_black_star.png
index af0cf9daba..89a35ee8a6 100644
Binary files a/public/images/emoji/facebook_messenger/eight_pointed_black_star.png and b/public/images/emoji/facebook_messenger/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png b/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png
index 09351f437d..62d86d5833 100644
Binary files a/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png and b/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/facebook_messenger/el_salvador.png b/public/images/emoji/facebook_messenger/el_salvador.png
index 0f24a98369..b761864c8a 100644
Binary files a/public/images/emoji/facebook_messenger/el_salvador.png and b/public/images/emoji/facebook_messenger/el_salvador.png differ
diff --git a/public/images/emoji/facebook_messenger/electric_plug.png b/public/images/emoji/facebook_messenger/electric_plug.png
index b6c91f603b..9dba32a38a 100644
Binary files a/public/images/emoji/facebook_messenger/electric_plug.png and b/public/images/emoji/facebook_messenger/electric_plug.png differ
diff --git a/public/images/emoji/facebook_messenger/elephant.png b/public/images/emoji/facebook_messenger/elephant.png
index d7dc652e62..964f62c9f4 100644
Binary files a/public/images/emoji/facebook_messenger/elephant.png and b/public/images/emoji/facebook_messenger/elephant.png differ
diff --git a/public/images/emoji/facebook_messenger/elf.png b/public/images/emoji/facebook_messenger/elf.png
index f8b6dd873e..28df7d4551 100644
Binary files a/public/images/emoji/facebook_messenger/elf.png and b/public/images/emoji/facebook_messenger/elf.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/2.png b/public/images/emoji/facebook_messenger/elf/2.png
index 15984024f2..471706456a 100644
Binary files a/public/images/emoji/facebook_messenger/elf/2.png and b/public/images/emoji/facebook_messenger/elf/2.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/3.png b/public/images/emoji/facebook_messenger/elf/3.png
index 4689243a17..9d127ad866 100644
Binary files a/public/images/emoji/facebook_messenger/elf/3.png and b/public/images/emoji/facebook_messenger/elf/3.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/4.png b/public/images/emoji/facebook_messenger/elf/4.png
index 861cbf808c..a095c2f494 100644
Binary files a/public/images/emoji/facebook_messenger/elf/4.png and b/public/images/emoji/facebook_messenger/elf/4.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/5.png b/public/images/emoji/facebook_messenger/elf/5.png
index 5074876010..ee9752e7dd 100644
Binary files a/public/images/emoji/facebook_messenger/elf/5.png and b/public/images/emoji/facebook_messenger/elf/5.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/6.png b/public/images/emoji/facebook_messenger/elf/6.png
index 505c908b18..9319cac89c 100644
Binary files a/public/images/emoji/facebook_messenger/elf/6.png and b/public/images/emoji/facebook_messenger/elf/6.png differ
diff --git a/public/images/emoji/facebook_messenger/email.png b/public/images/emoji/facebook_messenger/email.png
index e160129faf..e50d4fc637 100644
Binary files a/public/images/emoji/facebook_messenger/email.png and b/public/images/emoji/facebook_messenger/email.png differ
diff --git a/public/images/emoji/facebook_messenger/end.png b/public/images/emoji/facebook_messenger/end.png
index fb13367f7f..4fb09e928b 100644
Binary files a/public/images/emoji/facebook_messenger/end.png and b/public/images/emoji/facebook_messenger/end.png differ
diff --git a/public/images/emoji/facebook_messenger/envelope.png b/public/images/emoji/facebook_messenger/envelope.png
index e160129faf..e50d4fc637 100644
Binary files a/public/images/emoji/facebook_messenger/envelope.png and b/public/images/emoji/facebook_messenger/envelope.png differ
diff --git a/public/images/emoji/facebook_messenger/envelope_with_arrow.png b/public/images/emoji/facebook_messenger/envelope_with_arrow.png
index ea1f5e5b37..815f2e8c92 100644
Binary files a/public/images/emoji/facebook_messenger/envelope_with_arrow.png and b/public/images/emoji/facebook_messenger/envelope_with_arrow.png differ
diff --git a/public/images/emoji/facebook_messenger/equatorial_guinea.png b/public/images/emoji/facebook_messenger/equatorial_guinea.png
index 38e992318c..8d75e77f6c 100644
Binary files a/public/images/emoji/facebook_messenger/equatorial_guinea.png and b/public/images/emoji/facebook_messenger/equatorial_guinea.png differ
diff --git a/public/images/emoji/facebook_messenger/eritrea.png b/public/images/emoji/facebook_messenger/eritrea.png
index 630fd66415..66814696cf 100644
Binary files a/public/images/emoji/facebook_messenger/eritrea.png and b/public/images/emoji/facebook_messenger/eritrea.png differ
diff --git a/public/images/emoji/facebook_messenger/es.png b/public/images/emoji/facebook_messenger/es.png
index 82d50c036e..5d2f27537f 100644
Binary files a/public/images/emoji/facebook_messenger/es.png and b/public/images/emoji/facebook_messenger/es.png differ
diff --git a/public/images/emoji/facebook_messenger/estonia.png b/public/images/emoji/facebook_messenger/estonia.png
index 2553a5dbf7..54e6980bbf 100644
Binary files a/public/images/emoji/facebook_messenger/estonia.png and b/public/images/emoji/facebook_messenger/estonia.png differ
diff --git a/public/images/emoji/facebook_messenger/ethiopia.png b/public/images/emoji/facebook_messenger/ethiopia.png
index d0d78350cd..53d71bf466 100644
Binary files a/public/images/emoji/facebook_messenger/ethiopia.png and b/public/images/emoji/facebook_messenger/ethiopia.png differ
diff --git a/public/images/emoji/facebook_messenger/eu.png b/public/images/emoji/facebook_messenger/eu.png
index 938b488ddb..206c2b3f62 100644
Binary files a/public/images/emoji/facebook_messenger/eu.png and b/public/images/emoji/facebook_messenger/eu.png differ
diff --git a/public/images/emoji/facebook_messenger/euro.png b/public/images/emoji/facebook_messenger/euro.png
index bdfc11b7f6..fccf055f99 100644
Binary files a/public/images/emoji/facebook_messenger/euro.png and b/public/images/emoji/facebook_messenger/euro.png differ
diff --git a/public/images/emoji/facebook_messenger/european_castle.png b/public/images/emoji/facebook_messenger/european_castle.png
index 5eeee24e64..67966275e0 100644
Binary files a/public/images/emoji/facebook_messenger/european_castle.png and b/public/images/emoji/facebook_messenger/european_castle.png differ
diff --git a/public/images/emoji/facebook_messenger/european_post_office.png b/public/images/emoji/facebook_messenger/european_post_office.png
index fb3da8bf70..8dfaea0d1a 100644
Binary files a/public/images/emoji/facebook_messenger/european_post_office.png and b/public/images/emoji/facebook_messenger/european_post_office.png differ
diff --git a/public/images/emoji/facebook_messenger/evergreen_tree.png b/public/images/emoji/facebook_messenger/evergreen_tree.png
index ce75d328c3..a37979eb96 100644
Binary files a/public/images/emoji/facebook_messenger/evergreen_tree.png and b/public/images/emoji/facebook_messenger/evergreen_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/exclamation.png b/public/images/emoji/facebook_messenger/exclamation.png
index e7230e1697..1903c396ed 100644
Binary files a/public/images/emoji/facebook_messenger/exclamation.png and b/public/images/emoji/facebook_messenger/exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/exploding_head.png b/public/images/emoji/facebook_messenger/exploding_head.png
index 85532dadc7..a9f5841a2e 100644
Binary files a/public/images/emoji/facebook_messenger/exploding_head.png and b/public/images/emoji/facebook_messenger/exploding_head.png differ
diff --git a/public/images/emoji/facebook_messenger/expressionless.png b/public/images/emoji/facebook_messenger/expressionless.png
index ace98269b5..37263d3cf0 100644
Binary files a/public/images/emoji/facebook_messenger/expressionless.png and b/public/images/emoji/facebook_messenger/expressionless.png differ
diff --git a/public/images/emoji/facebook_messenger/eye.png b/public/images/emoji/facebook_messenger/eye.png
index 5c77590cb2..ddc8746378 100644
Binary files a/public/images/emoji/facebook_messenger/eye.png and b/public/images/emoji/facebook_messenger/eye.png differ
diff --git a/public/images/emoji/facebook_messenger/eyeglasses.png b/public/images/emoji/facebook_messenger/eyeglasses.png
index 04830b29ab..21197b6c81 100644
Binary files a/public/images/emoji/facebook_messenger/eyeglasses.png and b/public/images/emoji/facebook_messenger/eyeglasses.png differ
diff --git a/public/images/emoji/facebook_messenger/eyes.png b/public/images/emoji/facebook_messenger/eyes.png
index 711c98965b..6a8386702e 100644
Binary files a/public/images/emoji/facebook_messenger/eyes.png and b/public/images/emoji/facebook_messenger/eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/face_vomiting.png b/public/images/emoji/facebook_messenger/face_vomiting.png
index cd7c3d1f2b..5d01c9ce3d 100644
Binary files a/public/images/emoji/facebook_messenger/face_vomiting.png and b/public/images/emoji/facebook_messenger/face_vomiting.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png b/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png
index aed8f62e0b..823c498bf2 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png and b/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_head_bandage.png b/public/images/emoji/facebook_messenger/face_with_head_bandage.png
index 97bec4d11f..602886ae28 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_head_bandage.png and b/public/images/emoji/facebook_messenger/face_with_head_bandage.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_monocle.png b/public/images/emoji/facebook_messenger/face_with_monocle.png
index c6fbb4481d..3fcf2d871d 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_monocle.png and b/public/images/emoji/facebook_messenger/face_with_monocle.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png b/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png
index 887f70e365..f79d400eae 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png and b/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png b/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png
index 8a864a00bd..06b96d4c45 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png and b/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png b/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png
index 84bb9ec9c5..1d7963a934 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png and b/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_thermometer.png b/public/images/emoji/facebook_messenger/face_with_thermometer.png
index c9440239c0..9c4da3e1fc 100644
Binary files a/public/images/emoji/facebook_messenger/face_with_thermometer.png and b/public/images/emoji/facebook_messenger/face_with_thermometer.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch.png b/public/images/emoji/facebook_messenger/facepunch.png
index ed3c41bc0d..9db84ed1fd 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch.png and b/public/images/emoji/facebook_messenger/facepunch.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/2.png b/public/images/emoji/facebook_messenger/facepunch/2.png
index e499d8d0fa..b14e4d7984 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/2.png and b/public/images/emoji/facebook_messenger/facepunch/2.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/3.png b/public/images/emoji/facebook_messenger/facepunch/3.png
index f56ee4a1ff..4972f25e1e 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/3.png and b/public/images/emoji/facebook_messenger/facepunch/3.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/4.png b/public/images/emoji/facebook_messenger/facepunch/4.png
index bc6cebcbf6..4233ef0d5a 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/4.png and b/public/images/emoji/facebook_messenger/facepunch/4.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/5.png b/public/images/emoji/facebook_messenger/facepunch/5.png
index c8313f984f..a82a578585 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/5.png and b/public/images/emoji/facebook_messenger/facepunch/5.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/6.png b/public/images/emoji/facebook_messenger/facepunch/6.png
index cf2064a1ad..73efba003b 100644
Binary files a/public/images/emoji/facebook_messenger/facepunch/6.png and b/public/images/emoji/facebook_messenger/facepunch/6.png differ
diff --git a/public/images/emoji/facebook_messenger/factory.png b/public/images/emoji/facebook_messenger/factory.png
index 188462d1b7..48500df348 100644
Binary files a/public/images/emoji/facebook_messenger/factory.png and b/public/images/emoji/facebook_messenger/factory.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy.png b/public/images/emoji/facebook_messenger/fairy.png
index 429938294b..578c0af459 100644
Binary files a/public/images/emoji/facebook_messenger/fairy.png and b/public/images/emoji/facebook_messenger/fairy.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/2.png b/public/images/emoji/facebook_messenger/fairy/2.png
index 91e1de4e5d..578c0af459 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/2.png and b/public/images/emoji/facebook_messenger/fairy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/3.png b/public/images/emoji/facebook_messenger/fairy/3.png
index 42821806e9..578c0af459 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/3.png and b/public/images/emoji/facebook_messenger/fairy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/4.png b/public/images/emoji/facebook_messenger/fairy/4.png
index 9e8d3adb89..578c0af459 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/4.png and b/public/images/emoji/facebook_messenger/fairy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/5.png b/public/images/emoji/facebook_messenger/fairy/5.png
index 88d190e392..578c0af459 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/5.png and b/public/images/emoji/facebook_messenger/fairy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/6.png b/public/images/emoji/facebook_messenger/fairy/6.png
index e6ab8ade74..578c0af459 100644
Binary files a/public/images/emoji/facebook_messenger/fairy/6.png and b/public/images/emoji/facebook_messenger/fairy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/falkland_islands.png b/public/images/emoji/facebook_messenger/falkland_islands.png
index d97a84cea1..d92d34fb2f 100644
Binary files a/public/images/emoji/facebook_messenger/falkland_islands.png and b/public/images/emoji/facebook_messenger/falkland_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/fallen_leaf.png b/public/images/emoji/facebook_messenger/fallen_leaf.png
index f349fd56d1..c36b650a35 100644
Binary files a/public/images/emoji/facebook_messenger/fallen_leaf.png and b/public/images/emoji/facebook_messenger/fallen_leaf.png differ
diff --git a/public/images/emoji/facebook_messenger/family.png b/public/images/emoji/facebook_messenger/family.png
index 08b4d427ba..f062b56d63 100644
Binary files a/public/images/emoji/facebook_messenger/family.png and b/public/images/emoji/facebook_messenger/family.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_boy.png b/public/images/emoji/facebook_messenger/family_man_boy.png
index d31b0f6209..d5f9acd844 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_boy.png and b/public/images/emoji/facebook_messenger/family_man_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_boy_boy.png b/public/images/emoji/facebook_messenger/family_man_boy_boy.png
index 67d15f282c..7071038f69 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_boy_boy.png and b/public/images/emoji/facebook_messenger/family_man_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_girl.png b/public/images/emoji/facebook_messenger/family_man_girl.png
index 4bb3d823f8..19a459b2ec 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_girl.png and b/public/images/emoji/facebook_messenger/family_man_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_girl_boy.png b/public/images/emoji/facebook_messenger/family_man_girl_boy.png
index a8b6469dcb..23143257d5 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_girl_boy.png and b/public/images/emoji/facebook_messenger/family_man_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_girl_girl.png b/public/images/emoji/facebook_messenger/family_man_girl_girl.png
index e1aa1a80db..b3954a2ca3 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_girl_girl.png and b/public/images/emoji/facebook_messenger/family_man_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_boy.png b/public/images/emoji/facebook_messenger/family_man_man_boy.png
index 02c84cb237..1f70963cb5 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_boy.png and b/public/images/emoji/facebook_messenger/family_man_man_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png b/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png
index b26bb9ae07..f0042698f3 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png and b/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_girl.png b/public/images/emoji/facebook_messenger/family_man_man_girl.png
index b8aa492934..ad0d796e1a 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_girl.png and b/public/images/emoji/facebook_messenger/family_man_man_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png b/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png
index e5f46611b5..38c179099d 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png and b/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png b/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png
index 569ee332e2..137ef25dee 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png and b/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_boy.png b/public/images/emoji/facebook_messenger/family_man_woman_boy.png
index d6749b798d..632185dca7 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_boy.png and b/public/images/emoji/facebook_messenger/family_man_woman_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png b/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png
index 34b21628a1..e5355a098a 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png and b/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_boys.png b/public/images/emoji/facebook_messenger/family_man_woman_boys.png
index 34b21628a1..e5355a098a 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_boys.png and b/public/images/emoji/facebook_messenger/family_man_woman_boys.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girl.png b/public/images/emoji/facebook_messenger/family_man_woman_girl.png
index ff4539599f..bdecab4e74 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girl.png and b/public/images/emoji/facebook_messenger/family_man_woman_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png b/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png
index 08b4d427ba..f062b56d63 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png and b/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png b/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png
index 2e16043166..c5871f65e1 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png and b/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girls.png b/public/images/emoji/facebook_messenger/family_man_woman_girls.png
index 2e16043166..c5871f65e1 100644
Binary files a/public/images/emoji/facebook_messenger/family_man_woman_girls.png and b/public/images/emoji/facebook_messenger/family_man_woman_girls.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_boy.png b/public/images/emoji/facebook_messenger/family_men_boy.png
index 02c84cb237..1f70963cb5 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_boy.png and b/public/images/emoji/facebook_messenger/family_men_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_boys.png b/public/images/emoji/facebook_messenger/family_men_boys.png
index b26bb9ae07..f0042698f3 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_boys.png and b/public/images/emoji/facebook_messenger/family_men_boys.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_girl.png b/public/images/emoji/facebook_messenger/family_men_girl.png
index b8aa492934..ad0d796e1a 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_girl.png and b/public/images/emoji/facebook_messenger/family_men_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_girl_boy.png b/public/images/emoji/facebook_messenger/family_men_girl_boy.png
index e5f46611b5..38c179099d 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_girl_boy.png and b/public/images/emoji/facebook_messenger/family_men_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_girls.png b/public/images/emoji/facebook_messenger/family_men_girls.png
index 569ee332e2..137ef25dee 100644
Binary files a/public/images/emoji/facebook_messenger/family_men_girls.png and b/public/images/emoji/facebook_messenger/family_men_girls.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_boy.png b/public/images/emoji/facebook_messenger/family_woman_boy.png
index 3b0f755fd8..85b90bce15 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_boy.png and b/public/images/emoji/facebook_messenger/family_woman_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_boy_boy.png b/public/images/emoji/facebook_messenger/family_woman_boy_boy.png
index f9a1813738..8ad5c0ef74 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_boy_boy.png and b/public/images/emoji/facebook_messenger/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_girl.png b/public/images/emoji/facebook_messenger/family_woman_girl.png
index 966c36a0b9..88006bf99a 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_girl.png and b/public/images/emoji/facebook_messenger/family_woman_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_girl_boy.png b/public/images/emoji/facebook_messenger/family_woman_girl_boy.png
index 68b9671817..6a75a1fdf8 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_girl_boy.png and b/public/images/emoji/facebook_messenger/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_girl_girl.png b/public/images/emoji/facebook_messenger/family_woman_girl_girl.png
index 1e1995f8bf..b4507cee6d 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_girl_girl.png and b/public/images/emoji/facebook_messenger/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_boy.png b/public/images/emoji/facebook_messenger/family_woman_woman_boy.png
index 7246ed2b02..114275fe53 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_boy.png and b/public/images/emoji/facebook_messenger/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png b/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png
index 734955bf4a..9b3324a616 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png and b/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_girl.png b/public/images/emoji/facebook_messenger/family_woman_woman_girl.png
index a702d02e5b..776eb9c96d 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_girl.png and b/public/images/emoji/facebook_messenger/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png b/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png
index d21b40444d..21669217fc 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png and b/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png b/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png
index 5f3f8b821e..61d3425d94 100644
Binary files a/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png and b/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_boy.png b/public/images/emoji/facebook_messenger/family_women_boy.png
index 7246ed2b02..114275fe53 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_boy.png and b/public/images/emoji/facebook_messenger/family_women_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_boys.png b/public/images/emoji/facebook_messenger/family_women_boys.png
index 734955bf4a..9b3324a616 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_boys.png and b/public/images/emoji/facebook_messenger/family_women_boys.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_girl.png b/public/images/emoji/facebook_messenger/family_women_girl.png
index a702d02e5b..776eb9c96d 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_girl.png and b/public/images/emoji/facebook_messenger/family_women_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_girl_boy.png b/public/images/emoji/facebook_messenger/family_women_girl_boy.png
index d21b40444d..21669217fc 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_girl_boy.png and b/public/images/emoji/facebook_messenger/family_women_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_girls.png b/public/images/emoji/facebook_messenger/family_women_girls.png
index 5f3f8b821e..61d3425d94 100644
Binary files a/public/images/emoji/facebook_messenger/family_women_girls.png and b/public/images/emoji/facebook_messenger/family_women_girls.png differ
diff --git a/public/images/emoji/facebook_messenger/faroe_islands.png b/public/images/emoji/facebook_messenger/faroe_islands.png
index 5da7953f8d..6968ee7c57 100644
Binary files a/public/images/emoji/facebook_messenger/faroe_islands.png and b/public/images/emoji/facebook_messenger/faroe_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/fast_forward.png b/public/images/emoji/facebook_messenger/fast_forward.png
index 3e26428da1..2a0a36fdfa 100644
Binary files a/public/images/emoji/facebook_messenger/fast_forward.png and b/public/images/emoji/facebook_messenger/fast_forward.png differ
diff --git a/public/images/emoji/facebook_messenger/fax.png b/public/images/emoji/facebook_messenger/fax.png
index c28739d459..5fe54424db 100644
Binary files a/public/images/emoji/facebook_messenger/fax.png and b/public/images/emoji/facebook_messenger/fax.png differ
diff --git a/public/images/emoji/facebook_messenger/fearful.png b/public/images/emoji/facebook_messenger/fearful.png
index c42b60ae3b..cac14ad2d0 100644
Binary files a/public/images/emoji/facebook_messenger/fearful.png and b/public/images/emoji/facebook_messenger/fearful.png differ
diff --git a/public/images/emoji/facebook_messenger/feet.png b/public/images/emoji/facebook_messenger/feet.png
index 47eb29d7b8..19555800a9 100644
Binary files a/public/images/emoji/facebook_messenger/feet.png and b/public/images/emoji/facebook_messenger/feet.png differ
diff --git a/public/images/emoji/facebook_messenger/female_couple_with_heart.png b/public/images/emoji/facebook_messenger/female_couple_with_heart.png
index b82bbf04b4..ab3c64daed 100644
Binary files a/public/images/emoji/facebook_messenger/female_couple_with_heart.png and b/public/images/emoji/facebook_messenger/female_couple_with_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/female_couplekiss.png b/public/images/emoji/facebook_messenger/female_couplekiss.png
index 4f1324e09f..cb33b1daf9 100644
Binary files a/public/images/emoji/facebook_messenger/female_couplekiss.png and b/public/images/emoji/facebook_messenger/female_couplekiss.png differ
diff --git a/public/images/emoji/facebook_messenger/female_detective.png b/public/images/emoji/facebook_messenger/female_detective.png
index c1703a7c86..0c05fc2b6c 100644
Binary files a/public/images/emoji/facebook_messenger/female_detective.png and b/public/images/emoji/facebook_messenger/female_detective.png differ
diff --git a/public/images/emoji/facebook_messenger/ferris_wheel.png b/public/images/emoji/facebook_messenger/ferris_wheel.png
index d88a5881ce..ed9b3bad6c 100644
Binary files a/public/images/emoji/facebook_messenger/ferris_wheel.png and b/public/images/emoji/facebook_messenger/ferris_wheel.png differ
diff --git a/public/images/emoji/facebook_messenger/ferry.png b/public/images/emoji/facebook_messenger/ferry.png
index b56a1cb3ff..094d57bc69 100644
Binary files a/public/images/emoji/facebook_messenger/ferry.png and b/public/images/emoji/facebook_messenger/ferry.png differ
diff --git a/public/images/emoji/facebook_messenger/field_hockey.png b/public/images/emoji/facebook_messenger/field_hockey.png
index fb4f1e573a..170a99ef0d 100644
Binary files a/public/images/emoji/facebook_messenger/field_hockey.png and b/public/images/emoji/facebook_messenger/field_hockey.png differ
diff --git a/public/images/emoji/facebook_messenger/fiji.png b/public/images/emoji/facebook_messenger/fiji.png
index df504caef6..664e772e59 100644
Binary files a/public/images/emoji/facebook_messenger/fiji.png and b/public/images/emoji/facebook_messenger/fiji.png differ
diff --git a/public/images/emoji/facebook_messenger/file_cabinet.png b/public/images/emoji/facebook_messenger/file_cabinet.png
index f94b0fd46a..65fd2c5c29 100644
Binary files a/public/images/emoji/facebook_messenger/file_cabinet.png and b/public/images/emoji/facebook_messenger/file_cabinet.png differ
diff --git a/public/images/emoji/facebook_messenger/file_folder.png b/public/images/emoji/facebook_messenger/file_folder.png
index 131226b2b4..f0767e0c85 100644
Binary files a/public/images/emoji/facebook_messenger/file_folder.png and b/public/images/emoji/facebook_messenger/file_folder.png differ
diff --git a/public/images/emoji/facebook_messenger/film_frames.png b/public/images/emoji/facebook_messenger/film_frames.png
index f0fcd6fc1d..a52d79d20f 100644
Binary files a/public/images/emoji/facebook_messenger/film_frames.png and b/public/images/emoji/facebook_messenger/film_frames.png differ
diff --git a/public/images/emoji/facebook_messenger/film_projector.png b/public/images/emoji/facebook_messenger/film_projector.png
index 3acb6ea9c3..61cf7f7bac 100644
Binary files a/public/images/emoji/facebook_messenger/film_projector.png and b/public/images/emoji/facebook_messenger/film_projector.png differ
diff --git a/public/images/emoji/facebook_messenger/film_strip.png b/public/images/emoji/facebook_messenger/film_strip.png
index f0fcd6fc1d..a52d79d20f 100644
Binary files a/public/images/emoji/facebook_messenger/film_strip.png and b/public/images/emoji/facebook_messenger/film_strip.png differ
diff --git a/public/images/emoji/facebook_messenger/finland.png b/public/images/emoji/facebook_messenger/finland.png
index 3e6178f10a..b912331641 100644
Binary files a/public/images/emoji/facebook_messenger/finland.png and b/public/images/emoji/facebook_messenger/finland.png differ
diff --git a/public/images/emoji/facebook_messenger/fire.png b/public/images/emoji/facebook_messenger/fire.png
index d871ffb8a4..6915f6350e 100644
Binary files a/public/images/emoji/facebook_messenger/fire.png and b/public/images/emoji/facebook_messenger/fire.png differ
diff --git a/public/images/emoji/facebook_messenger/fire_engine.png b/public/images/emoji/facebook_messenger/fire_engine.png
index 66b69e4f30..2638586eee 100644
Binary files a/public/images/emoji/facebook_messenger/fire_engine.png and b/public/images/emoji/facebook_messenger/fire_engine.png differ
diff --git a/public/images/emoji/facebook_messenger/fireworks.png b/public/images/emoji/facebook_messenger/fireworks.png
index e4367bbe5d..2668be1397 100644
Binary files a/public/images/emoji/facebook_messenger/fireworks.png and b/public/images/emoji/facebook_messenger/fireworks.png differ
diff --git a/public/images/emoji/facebook_messenger/first_quarter_moon.png b/public/images/emoji/facebook_messenger/first_quarter_moon.png
index 1ac1c39d87..d0e1d4e755 100644
Binary files a/public/images/emoji/facebook_messenger/first_quarter_moon.png and b/public/images/emoji/facebook_messenger/first_quarter_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png b/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png
index 144e9976c5..08066c164a 100644
Binary files a/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png and b/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/fish.png b/public/images/emoji/facebook_messenger/fish.png
index 73ab8a0067..1d94061c4b 100644
Binary files a/public/images/emoji/facebook_messenger/fish.png and b/public/images/emoji/facebook_messenger/fish.png differ
diff --git a/public/images/emoji/facebook_messenger/fish_cake.png b/public/images/emoji/facebook_messenger/fish_cake.png
index 89982e42bf..7337b4a973 100644
Binary files a/public/images/emoji/facebook_messenger/fish_cake.png and b/public/images/emoji/facebook_messenger/fish_cake.png differ
diff --git a/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png b/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png
index 827a249f5f..1d90b0b3c4 100644
Binary files a/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png and b/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/facebook_messenger/fist.png b/public/images/emoji/facebook_messenger/fist.png
index 735826472a..51a0bdaec0 100644
Binary files a/public/images/emoji/facebook_messenger/fist.png and b/public/images/emoji/facebook_messenger/fist.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/2.png b/public/images/emoji/facebook_messenger/fist/2.png
index 5731ed8c0a..e756904eae 100644
Binary files a/public/images/emoji/facebook_messenger/fist/2.png and b/public/images/emoji/facebook_messenger/fist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/3.png b/public/images/emoji/facebook_messenger/fist/3.png
index db84dee200..cd164def81 100644
Binary files a/public/images/emoji/facebook_messenger/fist/3.png and b/public/images/emoji/facebook_messenger/fist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/4.png b/public/images/emoji/facebook_messenger/fist/4.png
index 6390df800d..b27b1cee5b 100644
Binary files a/public/images/emoji/facebook_messenger/fist/4.png and b/public/images/emoji/facebook_messenger/fist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/5.png b/public/images/emoji/facebook_messenger/fist/5.png
index 32890d75b7..3d78025350 100644
Binary files a/public/images/emoji/facebook_messenger/fist/5.png and b/public/images/emoji/facebook_messenger/fist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/6.png b/public/images/emoji/facebook_messenger/fist/6.png
index 36ed9f43f1..10e9008aae 100644
Binary files a/public/images/emoji/facebook_messenger/fist/6.png and b/public/images/emoji/facebook_messenger/fist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left.png b/public/images/emoji/facebook_messenger/fist_left.png
index f1ebb97514..77c33b2da8 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left.png and b/public/images/emoji/facebook_messenger/fist_left.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/2.png b/public/images/emoji/facebook_messenger/fist_left/2.png
index 1360d252ce..c3ed95ea3f 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/2.png and b/public/images/emoji/facebook_messenger/fist_left/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/3.png b/public/images/emoji/facebook_messenger/fist_left/3.png
index 270de69cd2..620e721097 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/3.png and b/public/images/emoji/facebook_messenger/fist_left/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/4.png b/public/images/emoji/facebook_messenger/fist_left/4.png
index 99e8ae08f3..227ca9af95 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/4.png and b/public/images/emoji/facebook_messenger/fist_left/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/5.png b/public/images/emoji/facebook_messenger/fist_left/5.png
index 5600a525fb..cca670bc26 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/5.png and b/public/images/emoji/facebook_messenger/fist_left/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/6.png b/public/images/emoji/facebook_messenger/fist_left/6.png
index 4db9f46f34..db7f571ea1 100644
Binary files a/public/images/emoji/facebook_messenger/fist_left/6.png and b/public/images/emoji/facebook_messenger/fist_left/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right.png b/public/images/emoji/facebook_messenger/fist_right.png
index 010432f201..9b7ef4d8a4 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right.png and b/public/images/emoji/facebook_messenger/fist_right.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/2.png b/public/images/emoji/facebook_messenger/fist_right/2.png
index a71348e322..e23940f973 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/2.png and b/public/images/emoji/facebook_messenger/fist_right/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/3.png b/public/images/emoji/facebook_messenger/fist_right/3.png
index b62317eca5..58e6dbbb43 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/3.png and b/public/images/emoji/facebook_messenger/fist_right/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/4.png b/public/images/emoji/facebook_messenger/fist_right/4.png
index abceea0434..8879b93b4a 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/4.png and b/public/images/emoji/facebook_messenger/fist_right/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/5.png b/public/images/emoji/facebook_messenger/fist_right/5.png
index e64682dfe5..dde48c74db 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/5.png and b/public/images/emoji/facebook_messenger/fist_right/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/6.png b/public/images/emoji/facebook_messenger/fist_right/6.png
index daa257c5c2..e097677184 100644
Binary files a/public/images/emoji/facebook_messenger/fist_right/6.png and b/public/images/emoji/facebook_messenger/fist_right/6.png differ
diff --git a/public/images/emoji/facebook_messenger/five.png b/public/images/emoji/facebook_messenger/five.png
index cea258d2f0..e7b38107eb 100644
Binary files a/public/images/emoji/facebook_messenger/five.png and b/public/images/emoji/facebook_messenger/five.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_black.png b/public/images/emoji/facebook_messenger/flag_black.png
index 5c1237bdad..bc52913998 100644
Binary files a/public/images/emoji/facebook_messenger/flag_black.png and b/public/images/emoji/facebook_messenger/flag_black.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_cn.png b/public/images/emoji/facebook_messenger/flag_cn.png
index a9325fc771..ddad4d8315 100644
Binary files a/public/images/emoji/facebook_messenger/flag_cn.png and b/public/images/emoji/facebook_messenger/flag_cn.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_de.png b/public/images/emoji/facebook_messenger/flag_de.png
index 964116acbb..8a375afccd 100644
Binary files a/public/images/emoji/facebook_messenger/flag_de.png and b/public/images/emoji/facebook_messenger/flag_de.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_es.png b/public/images/emoji/facebook_messenger/flag_es.png
index 82d50c036e..5d2f27537f 100644
Binary files a/public/images/emoji/facebook_messenger/flag_es.png and b/public/images/emoji/facebook_messenger/flag_es.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_fr.png b/public/images/emoji/facebook_messenger/flag_fr.png
index f8afe53651..2ef71d792a 100644
Binary files a/public/images/emoji/facebook_messenger/flag_fr.png and b/public/images/emoji/facebook_messenger/flag_fr.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_gb.png b/public/images/emoji/facebook_messenger/flag_gb.png
index bc850e7890..8ba8cda3ac 100644
Binary files a/public/images/emoji/facebook_messenger/flag_gb.png and b/public/images/emoji/facebook_messenger/flag_gb.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_it.png b/public/images/emoji/facebook_messenger/flag_it.png
index e5e0646c21..1b5c5906b3 100644
Binary files a/public/images/emoji/facebook_messenger/flag_it.png and b/public/images/emoji/facebook_messenger/flag_it.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_jp.png b/public/images/emoji/facebook_messenger/flag_jp.png
index ab749c77f7..ef2bc7b48f 100644
Binary files a/public/images/emoji/facebook_messenger/flag_jp.png and b/public/images/emoji/facebook_messenger/flag_jp.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_kr.png b/public/images/emoji/facebook_messenger/flag_kr.png
index 73c4454e7f..4bd85faa98 100644
Binary files a/public/images/emoji/facebook_messenger/flag_kr.png and b/public/images/emoji/facebook_messenger/flag_kr.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_ru.png b/public/images/emoji/facebook_messenger/flag_ru.png
index f3932d9f3c..89692b70ef 100644
Binary files a/public/images/emoji/facebook_messenger/flag_ru.png and b/public/images/emoji/facebook_messenger/flag_ru.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_us.png b/public/images/emoji/facebook_messenger/flag_us.png
index b0c3a76dd6..103498e009 100644
Binary files a/public/images/emoji/facebook_messenger/flag_us.png and b/public/images/emoji/facebook_messenger/flag_us.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_white.png b/public/images/emoji/facebook_messenger/flag_white.png
index 5f052fff2a..34dfcb802a 100644
Binary files a/public/images/emoji/facebook_messenger/flag_white.png and b/public/images/emoji/facebook_messenger/flag_white.png differ
diff --git a/public/images/emoji/facebook_messenger/flags.png b/public/images/emoji/facebook_messenger/flags.png
index 52e8a4a95f..3ff68d9b47 100644
Binary files a/public/images/emoji/facebook_messenger/flags.png and b/public/images/emoji/facebook_messenger/flags.png differ
diff --git a/public/images/emoji/facebook_messenger/flame.png b/public/images/emoji/facebook_messenger/flame.png
index d871ffb8a4..6915f6350e 100644
Binary files a/public/images/emoji/facebook_messenger/flame.png and b/public/images/emoji/facebook_messenger/flame.png differ
diff --git a/public/images/emoji/facebook_messenger/flashlight.png b/public/images/emoji/facebook_messenger/flashlight.png
index 3bb5512763..7ea2a2ff84 100644
Binary files a/public/images/emoji/facebook_messenger/flashlight.png and b/public/images/emoji/facebook_messenger/flashlight.png differ
diff --git a/public/images/emoji/facebook_messenger/fleur-de-lis.png b/public/images/emoji/facebook_messenger/fleur-de-lis.png
index 27cd209049..4066f0646a 100644
Binary files a/public/images/emoji/facebook_messenger/fleur-de-lis.png and b/public/images/emoji/facebook_messenger/fleur-de-lis.png differ
diff --git a/public/images/emoji/facebook_messenger/fleur_de_lis.png b/public/images/emoji/facebook_messenger/fleur_de_lis.png
index 27cd209049..4066f0646a 100644
Binary files a/public/images/emoji/facebook_messenger/fleur_de_lis.png and b/public/images/emoji/facebook_messenger/fleur_de_lis.png differ
diff --git a/public/images/emoji/facebook_messenger/flight_arrival.png b/public/images/emoji/facebook_messenger/flight_arrival.png
index 0585a1c36c..4e22866646 100644
Binary files a/public/images/emoji/facebook_messenger/flight_arrival.png and b/public/images/emoji/facebook_messenger/flight_arrival.png differ
diff --git a/public/images/emoji/facebook_messenger/flight_departure.png b/public/images/emoji/facebook_messenger/flight_departure.png
index dc86670a86..bfa84966f7 100644
Binary files a/public/images/emoji/facebook_messenger/flight_departure.png and b/public/images/emoji/facebook_messenger/flight_departure.png differ
diff --git a/public/images/emoji/facebook_messenger/floppy_disk.png b/public/images/emoji/facebook_messenger/floppy_disk.png
index 25bd410b02..2efaf0997a 100644
Binary files a/public/images/emoji/facebook_messenger/floppy_disk.png and b/public/images/emoji/facebook_messenger/floppy_disk.png differ
diff --git a/public/images/emoji/facebook_messenger/flower_playing_cards.png b/public/images/emoji/facebook_messenger/flower_playing_cards.png
index baf5f9ddde..2bb67f87db 100644
Binary files a/public/images/emoji/facebook_messenger/flower_playing_cards.png and b/public/images/emoji/facebook_messenger/flower_playing_cards.png differ
diff --git a/public/images/emoji/facebook_messenger/flushed.png b/public/images/emoji/facebook_messenger/flushed.png
index 7b4667ad26..b1de1c333a 100644
Binary files a/public/images/emoji/facebook_messenger/flushed.png and b/public/images/emoji/facebook_messenger/flushed.png differ
diff --git a/public/images/emoji/facebook_messenger/flying_saucer.png b/public/images/emoji/facebook_messenger/flying_saucer.png
index 7d5c862855..012c32faf9 100644
Binary files a/public/images/emoji/facebook_messenger/flying_saucer.png and b/public/images/emoji/facebook_messenger/flying_saucer.png differ
diff --git a/public/images/emoji/facebook_messenger/fog.png b/public/images/emoji/facebook_messenger/fog.png
index f8aee2c7b5..5684bd2467 100644
Binary files a/public/images/emoji/facebook_messenger/fog.png and b/public/images/emoji/facebook_messenger/fog.png differ
diff --git a/public/images/emoji/facebook_messenger/foggy.png b/public/images/emoji/facebook_messenger/foggy.png
index e5dcb6812a..711fe0d85d 100644
Binary files a/public/images/emoji/facebook_messenger/foggy.png and b/public/images/emoji/facebook_messenger/foggy.png differ
diff --git a/public/images/emoji/facebook_messenger/football.png b/public/images/emoji/facebook_messenger/football.png
index 65f4c1147a..4db67dcfe8 100644
Binary files a/public/images/emoji/facebook_messenger/football.png and b/public/images/emoji/facebook_messenger/football.png differ
diff --git a/public/images/emoji/facebook_messenger/footprints.png b/public/images/emoji/facebook_messenger/footprints.png
index 47eb29d7b8..19555800a9 100644
Binary files a/public/images/emoji/facebook_messenger/footprints.png and b/public/images/emoji/facebook_messenger/footprints.png differ
diff --git a/public/images/emoji/facebook_messenger/fork_and_knife.png b/public/images/emoji/facebook_messenger/fork_and_knife.png
index e233399e52..4dd1ed6f5c 100644
Binary files a/public/images/emoji/facebook_messenger/fork_and_knife.png and b/public/images/emoji/facebook_messenger/fork_and_knife.png differ
diff --git a/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png b/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png
index df63dcc4f4..84fd7bba6a 100644
Binary files a/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png and b/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/facebook_messenger/fork_knife_plate.png b/public/images/emoji/facebook_messenger/fork_knife_plate.png
index df63dcc4f4..84fd7bba6a 100644
Binary files a/public/images/emoji/facebook_messenger/fork_knife_plate.png and b/public/images/emoji/facebook_messenger/fork_knife_plate.png differ
diff --git a/public/images/emoji/facebook_messenger/fortune_cookie.png b/public/images/emoji/facebook_messenger/fortune_cookie.png
index 94a8cdca40..d023dc45dd 100644
Binary files a/public/images/emoji/facebook_messenger/fortune_cookie.png and b/public/images/emoji/facebook_messenger/fortune_cookie.png differ
diff --git a/public/images/emoji/facebook_messenger/fountain.png b/public/images/emoji/facebook_messenger/fountain.png
index c128b6075e..13cc69f0d7 100644
Binary files a/public/images/emoji/facebook_messenger/fountain.png and b/public/images/emoji/facebook_messenger/fountain.png differ
diff --git a/public/images/emoji/facebook_messenger/fountain_pen.png b/public/images/emoji/facebook_messenger/fountain_pen.png
index 96584c9f57..2e7296057b 100644
Binary files a/public/images/emoji/facebook_messenger/fountain_pen.png and b/public/images/emoji/facebook_messenger/fountain_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/four.png b/public/images/emoji/facebook_messenger/four.png
index f728effd4a..bf7e0c444d 100644
Binary files a/public/images/emoji/facebook_messenger/four.png and b/public/images/emoji/facebook_messenger/four.png differ
diff --git a/public/images/emoji/facebook_messenger/four_leaf_clover.png b/public/images/emoji/facebook_messenger/four_leaf_clover.png
index 99d39c965c..6bb5773121 100644
Binary files a/public/images/emoji/facebook_messenger/four_leaf_clover.png and b/public/images/emoji/facebook_messenger/four_leaf_clover.png differ
diff --git a/public/images/emoji/facebook_messenger/fox_face.png b/public/images/emoji/facebook_messenger/fox_face.png
index 74bcddb7e7..ddc3a4e751 100644
Binary files a/public/images/emoji/facebook_messenger/fox_face.png and b/public/images/emoji/facebook_messenger/fox_face.png differ
diff --git a/public/images/emoji/facebook_messenger/fr.png b/public/images/emoji/facebook_messenger/fr.png
index f8afe53651..2ef71d792a 100644
Binary files a/public/images/emoji/facebook_messenger/fr.png and b/public/images/emoji/facebook_messenger/fr.png differ
diff --git a/public/images/emoji/facebook_messenger/frame_photo.png b/public/images/emoji/facebook_messenger/frame_photo.png
index ad38ccf08d..9a61cd3cd7 100644
Binary files a/public/images/emoji/facebook_messenger/frame_photo.png and b/public/images/emoji/facebook_messenger/frame_photo.png differ
diff --git a/public/images/emoji/facebook_messenger/frame_with_picture.png b/public/images/emoji/facebook_messenger/frame_with_picture.png
index ad38ccf08d..9a61cd3cd7 100644
Binary files a/public/images/emoji/facebook_messenger/frame_with_picture.png and b/public/images/emoji/facebook_messenger/frame_with_picture.png differ
diff --git a/public/images/emoji/facebook_messenger/framed_picture.png b/public/images/emoji/facebook_messenger/framed_picture.png
index ad38ccf08d..9a61cd3cd7 100644
Binary files a/public/images/emoji/facebook_messenger/framed_picture.png and b/public/images/emoji/facebook_messenger/framed_picture.png differ
diff --git a/public/images/emoji/facebook_messenger/free.png b/public/images/emoji/facebook_messenger/free.png
index 1b4d5a6973..8079e73326 100644
Binary files a/public/images/emoji/facebook_messenger/free.png and b/public/images/emoji/facebook_messenger/free.png differ
diff --git a/public/images/emoji/facebook_messenger/french_guiana.png b/public/images/emoji/facebook_messenger/french_guiana.png
index b67d58af24..9a989f2cb1 100644
Binary files a/public/images/emoji/facebook_messenger/french_guiana.png and b/public/images/emoji/facebook_messenger/french_guiana.png differ
diff --git a/public/images/emoji/facebook_messenger/french_polynesia.png b/public/images/emoji/facebook_messenger/french_polynesia.png
index 8e67281736..18c22d5625 100644
Binary files a/public/images/emoji/facebook_messenger/french_polynesia.png and b/public/images/emoji/facebook_messenger/french_polynesia.png differ
diff --git a/public/images/emoji/facebook_messenger/french_southern_territories.png b/public/images/emoji/facebook_messenger/french_southern_territories.png
index ecc9bec0fa..3e6643ad03 100644
Binary files a/public/images/emoji/facebook_messenger/french_southern_territories.png and b/public/images/emoji/facebook_messenger/french_southern_territories.png differ
diff --git a/public/images/emoji/facebook_messenger/fried_egg.png b/public/images/emoji/facebook_messenger/fried_egg.png
index 20578913f1..9020c53b0c 100644
Binary files a/public/images/emoji/facebook_messenger/fried_egg.png and b/public/images/emoji/facebook_messenger/fried_egg.png differ
diff --git a/public/images/emoji/facebook_messenger/fried_shrimp.png b/public/images/emoji/facebook_messenger/fried_shrimp.png
index e3ffbd8888..16fca0768d 100644
Binary files a/public/images/emoji/facebook_messenger/fried_shrimp.png and b/public/images/emoji/facebook_messenger/fried_shrimp.png differ
diff --git a/public/images/emoji/facebook_messenger/fries.png b/public/images/emoji/facebook_messenger/fries.png
index 49655d5827..e5b1893c87 100644
Binary files a/public/images/emoji/facebook_messenger/fries.png and b/public/images/emoji/facebook_messenger/fries.png differ
diff --git a/public/images/emoji/facebook_messenger/frog.png b/public/images/emoji/facebook_messenger/frog.png
index 33274868db..3dfa411b72 100644
Binary files a/public/images/emoji/facebook_messenger/frog.png and b/public/images/emoji/facebook_messenger/frog.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning.png b/public/images/emoji/facebook_messenger/frowning.png
index 55d6c9d460..971c37f998 100644
Binary files a/public/images/emoji/facebook_messenger/frowning.png and b/public/images/emoji/facebook_messenger/frowning.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning2.png b/public/images/emoji/facebook_messenger/frowning2.png
index 1c5988a20b..e35c8cec02 100644
Binary files a/public/images/emoji/facebook_messenger/frowning2.png and b/public/images/emoji/facebook_messenger/frowning2.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_face.png b/public/images/emoji/facebook_messenger/frowning_face.png
index 1c5988a20b..e35c8cec02 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_face.png and b/public/images/emoji/facebook_messenger/frowning_face.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man.png b/public/images/emoji/facebook_messenger/frowning_man.png
index e10ce817f8..87a0828c37 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man.png and b/public/images/emoji/facebook_messenger/frowning_man.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/2.png b/public/images/emoji/facebook_messenger/frowning_man/2.png
index 5f04a5370d..47aa4d9bee 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/2.png and b/public/images/emoji/facebook_messenger/frowning_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/3.png b/public/images/emoji/facebook_messenger/frowning_man/3.png
index 8be682c19d..9c5aa56170 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/3.png and b/public/images/emoji/facebook_messenger/frowning_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/4.png b/public/images/emoji/facebook_messenger/frowning_man/4.png
index 28b7990842..9583a2c59a 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/4.png and b/public/images/emoji/facebook_messenger/frowning_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/5.png b/public/images/emoji/facebook_messenger/frowning_man/5.png
index 5f8463196b..2da1fb63d5 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/5.png and b/public/images/emoji/facebook_messenger/frowning_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/6.png b/public/images/emoji/facebook_messenger/frowning_man/6.png
index 8c92a9c484..8048286324 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_man/6.png and b/public/images/emoji/facebook_messenger/frowning_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman.png b/public/images/emoji/facebook_messenger/frowning_woman.png
index 1e5f89e7b5..1b7de19871 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman.png and b/public/images/emoji/facebook_messenger/frowning_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/2.png b/public/images/emoji/facebook_messenger/frowning_woman/2.png
index db018f2e81..d4e0b4aa13 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/2.png and b/public/images/emoji/facebook_messenger/frowning_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/3.png b/public/images/emoji/facebook_messenger/frowning_woman/3.png
index 2a32b70d58..dc65835b2b 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/3.png and b/public/images/emoji/facebook_messenger/frowning_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/4.png b/public/images/emoji/facebook_messenger/frowning_woman/4.png
index 824a0bea02..0b4c694606 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/4.png and b/public/images/emoji/facebook_messenger/frowning_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/5.png b/public/images/emoji/facebook_messenger/frowning_woman/5.png
index ca476ecf1f..402b54502f 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/5.png and b/public/images/emoji/facebook_messenger/frowning_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/6.png b/public/images/emoji/facebook_messenger/frowning_woman/6.png
index c36b369e0b..265d4fcffd 100644
Binary files a/public/images/emoji/facebook_messenger/frowning_woman/6.png and b/public/images/emoji/facebook_messenger/frowning_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fu.png b/public/images/emoji/facebook_messenger/fu.png
index 8e7fce2f49..7f227d2d23 100644
Binary files a/public/images/emoji/facebook_messenger/fu.png and b/public/images/emoji/facebook_messenger/fu.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/2.png b/public/images/emoji/facebook_messenger/fu/2.png
index 992338bb2b..14c75b484f 100644
Binary files a/public/images/emoji/facebook_messenger/fu/2.png and b/public/images/emoji/facebook_messenger/fu/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/3.png b/public/images/emoji/facebook_messenger/fu/3.png
index aadc06129f..e403a196a5 100644
Binary files a/public/images/emoji/facebook_messenger/fu/3.png and b/public/images/emoji/facebook_messenger/fu/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/4.png b/public/images/emoji/facebook_messenger/fu/4.png
index 8ad10be116..d8507a7f62 100644
Binary files a/public/images/emoji/facebook_messenger/fu/4.png and b/public/images/emoji/facebook_messenger/fu/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/5.png b/public/images/emoji/facebook_messenger/fu/5.png
index 695c4a6cb9..e67c93cb2a 100644
Binary files a/public/images/emoji/facebook_messenger/fu/5.png and b/public/images/emoji/facebook_messenger/fu/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/6.png b/public/images/emoji/facebook_messenger/fu/6.png
index 3457e01312..c3bd0d882f 100644
Binary files a/public/images/emoji/facebook_messenger/fu/6.png and b/public/images/emoji/facebook_messenger/fu/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fuelpump.png b/public/images/emoji/facebook_messenger/fuelpump.png
index 75df52ada8..c0e4d0debb 100644
Binary files a/public/images/emoji/facebook_messenger/fuelpump.png and b/public/images/emoji/facebook_messenger/fuelpump.png differ
diff --git a/public/images/emoji/facebook_messenger/full_moon.png b/public/images/emoji/facebook_messenger/full_moon.png
index 9d4cd0c36b..2a7748b936 100644
Binary files a/public/images/emoji/facebook_messenger/full_moon.png and b/public/images/emoji/facebook_messenger/full_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/full_moon_with_face.png b/public/images/emoji/facebook_messenger/full_moon_with_face.png
index ff164d2be1..8fa6950024 100644
Binary files a/public/images/emoji/facebook_messenger/full_moon_with_face.png and b/public/images/emoji/facebook_messenger/full_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/funeral_urn.png b/public/images/emoji/facebook_messenger/funeral_urn.png
index 56112c50ed..818fa27fb8 100644
Binary files a/public/images/emoji/facebook_messenger/funeral_urn.png and b/public/images/emoji/facebook_messenger/funeral_urn.png differ
diff --git a/public/images/emoji/facebook_messenger/gabon.png b/public/images/emoji/facebook_messenger/gabon.png
index 6563b2a69f..c1a2fb11fc 100644
Binary files a/public/images/emoji/facebook_messenger/gabon.png and b/public/images/emoji/facebook_messenger/gabon.png differ
diff --git a/public/images/emoji/facebook_messenger/gambia.png b/public/images/emoji/facebook_messenger/gambia.png
index 707ca2a121..33622c52ae 100644
Binary files a/public/images/emoji/facebook_messenger/gambia.png and b/public/images/emoji/facebook_messenger/gambia.png differ
diff --git a/public/images/emoji/facebook_messenger/game_die.png b/public/images/emoji/facebook_messenger/game_die.png
index 9ed66afdac..4c6642d798 100644
Binary files a/public/images/emoji/facebook_messenger/game_die.png and b/public/images/emoji/facebook_messenger/game_die.png differ
diff --git a/public/images/emoji/facebook_messenger/gb.png b/public/images/emoji/facebook_messenger/gb.png
index bc850e7890..8ba8cda3ac 100644
Binary files a/public/images/emoji/facebook_messenger/gb.png and b/public/images/emoji/facebook_messenger/gb.png differ
diff --git a/public/images/emoji/facebook_messenger/gear.png b/public/images/emoji/facebook_messenger/gear.png
index 6a9d3b8d1b..dae873e04f 100644
Binary files a/public/images/emoji/facebook_messenger/gear.png and b/public/images/emoji/facebook_messenger/gear.png differ
diff --git a/public/images/emoji/facebook_messenger/gem.png b/public/images/emoji/facebook_messenger/gem.png
index 7ffd84c773..e4544a4fe5 100644
Binary files a/public/images/emoji/facebook_messenger/gem.png and b/public/images/emoji/facebook_messenger/gem.png differ
diff --git a/public/images/emoji/facebook_messenger/gemini.png b/public/images/emoji/facebook_messenger/gemini.png
index a08a5b768b..7af737f442 100644
Binary files a/public/images/emoji/facebook_messenger/gemini.png and b/public/images/emoji/facebook_messenger/gemini.png differ
diff --git a/public/images/emoji/facebook_messenger/genie.png b/public/images/emoji/facebook_messenger/genie.png
index f0eddcc91a..e6eec0fe3c 100644
Binary files a/public/images/emoji/facebook_messenger/genie.png and b/public/images/emoji/facebook_messenger/genie.png differ
diff --git a/public/images/emoji/facebook_messenger/georgia.png b/public/images/emoji/facebook_messenger/georgia.png
index 673f81ef6f..34dc6a4189 100644
Binary files a/public/images/emoji/facebook_messenger/georgia.png and b/public/images/emoji/facebook_messenger/georgia.png differ
diff --git a/public/images/emoji/facebook_messenger/ghana.png b/public/images/emoji/facebook_messenger/ghana.png
index f1b8829dba..968d76a9f9 100644
Binary files a/public/images/emoji/facebook_messenger/ghana.png and b/public/images/emoji/facebook_messenger/ghana.png differ
diff --git a/public/images/emoji/facebook_messenger/ghost.png b/public/images/emoji/facebook_messenger/ghost.png
index 45ea4f57b9..a863a1583c 100644
Binary files a/public/images/emoji/facebook_messenger/ghost.png and b/public/images/emoji/facebook_messenger/ghost.png differ
diff --git a/public/images/emoji/facebook_messenger/gibraltar.png b/public/images/emoji/facebook_messenger/gibraltar.png
index cbe9f11a12..95f4bde22b 100644
Binary files a/public/images/emoji/facebook_messenger/gibraltar.png and b/public/images/emoji/facebook_messenger/gibraltar.png differ
diff --git a/public/images/emoji/facebook_messenger/gift.png b/public/images/emoji/facebook_messenger/gift.png
index d4abb27460..f472a530a3 100644
Binary files a/public/images/emoji/facebook_messenger/gift.png and b/public/images/emoji/facebook_messenger/gift.png differ
diff --git a/public/images/emoji/facebook_messenger/gift_heart.png b/public/images/emoji/facebook_messenger/gift_heart.png
index 7cb11440d2..dc0ebbf3af 100644
Binary files a/public/images/emoji/facebook_messenger/gift_heart.png and b/public/images/emoji/facebook_messenger/gift_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/giraffe.png b/public/images/emoji/facebook_messenger/giraffe.png
index be0e85d289..38971ced07 100644
Binary files a/public/images/emoji/facebook_messenger/giraffe.png and b/public/images/emoji/facebook_messenger/giraffe.png differ
diff --git a/public/images/emoji/facebook_messenger/girl.png b/public/images/emoji/facebook_messenger/girl.png
index cef329322b..6d02f25aef 100644
Binary files a/public/images/emoji/facebook_messenger/girl.png and b/public/images/emoji/facebook_messenger/girl.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/2.png b/public/images/emoji/facebook_messenger/girl/2.png
index 94ef7ffcde..071073c959 100644
Binary files a/public/images/emoji/facebook_messenger/girl/2.png and b/public/images/emoji/facebook_messenger/girl/2.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/3.png b/public/images/emoji/facebook_messenger/girl/3.png
index 84c7e27b99..ee03e8afbe 100644
Binary files a/public/images/emoji/facebook_messenger/girl/3.png and b/public/images/emoji/facebook_messenger/girl/3.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/4.png b/public/images/emoji/facebook_messenger/girl/4.png
index f542d343c0..5bb7a64adc 100644
Binary files a/public/images/emoji/facebook_messenger/girl/4.png and b/public/images/emoji/facebook_messenger/girl/4.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/5.png b/public/images/emoji/facebook_messenger/girl/5.png
index c4d0909ec8..6805e5eca4 100644
Binary files a/public/images/emoji/facebook_messenger/girl/5.png and b/public/images/emoji/facebook_messenger/girl/5.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/6.png b/public/images/emoji/facebook_messenger/girl/6.png
index 74133163aa..1347749d1f 100644
Binary files a/public/images/emoji/facebook_messenger/girl/6.png and b/public/images/emoji/facebook_messenger/girl/6.png differ
diff --git a/public/images/emoji/facebook_messenger/globe_with_meridians.png b/public/images/emoji/facebook_messenger/globe_with_meridians.png
index fec4f1ea63..01de602655 100644
Binary files a/public/images/emoji/facebook_messenger/globe_with_meridians.png and b/public/images/emoji/facebook_messenger/globe_with_meridians.png differ
diff --git a/public/images/emoji/facebook_messenger/gloves.png b/public/images/emoji/facebook_messenger/gloves.png
index 1a11dd2c56..f0c79270aa 100644
Binary files a/public/images/emoji/facebook_messenger/gloves.png and b/public/images/emoji/facebook_messenger/gloves.png differ
diff --git a/public/images/emoji/facebook_messenger/goal_net.png b/public/images/emoji/facebook_messenger/goal_net.png
index 4773a63cf9..1587bf485a 100644
Binary files a/public/images/emoji/facebook_messenger/goal_net.png and b/public/images/emoji/facebook_messenger/goal_net.png differ
diff --git a/public/images/emoji/facebook_messenger/goat.png b/public/images/emoji/facebook_messenger/goat.png
index 7c66018bd4..2b433344ab 100644
Binary files a/public/images/emoji/facebook_messenger/goat.png and b/public/images/emoji/facebook_messenger/goat.png differ
diff --git a/public/images/emoji/facebook_messenger/golf.png b/public/images/emoji/facebook_messenger/golf.png
index 750595fb3c..c4d3e9825a 100644
Binary files a/public/images/emoji/facebook_messenger/golf.png and b/public/images/emoji/facebook_messenger/golf.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer.png b/public/images/emoji/facebook_messenger/golfer.png
index 36609a5670..b9b3813b61 100644
Binary files a/public/images/emoji/facebook_messenger/golfer.png and b/public/images/emoji/facebook_messenger/golfer.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/2.png b/public/images/emoji/facebook_messenger/golfer/2.png
index 93df509c6e..e71a899640 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/2.png and b/public/images/emoji/facebook_messenger/golfer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/3.png b/public/images/emoji/facebook_messenger/golfer/3.png
index d986fe7501..de815eac1d 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/3.png and b/public/images/emoji/facebook_messenger/golfer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/4.png b/public/images/emoji/facebook_messenger/golfer/4.png
index 3fa61820b6..7d7b540a1c 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/4.png and b/public/images/emoji/facebook_messenger/golfer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/5.png b/public/images/emoji/facebook_messenger/golfer/5.png
index 22116c217a..173a8e6d72 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/5.png and b/public/images/emoji/facebook_messenger/golfer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/6.png b/public/images/emoji/facebook_messenger/golfer/6.png
index ebbc3263e2..0b390802af 100644
Binary files a/public/images/emoji/facebook_messenger/golfer/6.png and b/public/images/emoji/facebook_messenger/golfer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man.png b/public/images/emoji/facebook_messenger/golfing_man.png
index 36609a5670..b9b3813b61 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man.png and b/public/images/emoji/facebook_messenger/golfing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/2.png b/public/images/emoji/facebook_messenger/golfing_man/2.png
index 93df509c6e..e71a899640 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/2.png and b/public/images/emoji/facebook_messenger/golfing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/3.png b/public/images/emoji/facebook_messenger/golfing_man/3.png
index d986fe7501..de815eac1d 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/3.png and b/public/images/emoji/facebook_messenger/golfing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/4.png b/public/images/emoji/facebook_messenger/golfing_man/4.png
index 3fa61820b6..7d7b540a1c 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/4.png and b/public/images/emoji/facebook_messenger/golfing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/5.png b/public/images/emoji/facebook_messenger/golfing_man/5.png
index 22116c217a..173a8e6d72 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/5.png and b/public/images/emoji/facebook_messenger/golfing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/6.png b/public/images/emoji/facebook_messenger/golfing_man/6.png
index ebbc3263e2..0b390802af 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_man/6.png and b/public/images/emoji/facebook_messenger/golfing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_woman.png b/public/images/emoji/facebook_messenger/golfing_woman.png
index 115ceac8f0..6892a2c001 100644
Binary files a/public/images/emoji/facebook_messenger/golfing_woman.png and b/public/images/emoji/facebook_messenger/golfing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/gorilla.png b/public/images/emoji/facebook_messenger/gorilla.png
index bd7d3d17fb..2b6c812747 100644
Binary files a/public/images/emoji/facebook_messenger/gorilla.png and b/public/images/emoji/facebook_messenger/gorilla.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma.png b/public/images/emoji/facebook_messenger/grandma.png
index 02e8230771..e03cb5c779 100644
Binary files a/public/images/emoji/facebook_messenger/grandma.png and b/public/images/emoji/facebook_messenger/grandma.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/2.png b/public/images/emoji/facebook_messenger/grandma/2.png
index 8e4a01cfcc..86ef258ed8 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/2.png and b/public/images/emoji/facebook_messenger/grandma/2.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/3.png b/public/images/emoji/facebook_messenger/grandma/3.png
index 4f8be8c914..2982fa1d6f 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/3.png and b/public/images/emoji/facebook_messenger/grandma/3.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/4.png b/public/images/emoji/facebook_messenger/grandma/4.png
index 0d7aa5e0d9..7ab3d41b2a 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/4.png and b/public/images/emoji/facebook_messenger/grandma/4.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/5.png b/public/images/emoji/facebook_messenger/grandma/5.png
index 41f7e66438..3b8a10b0c7 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/5.png and b/public/images/emoji/facebook_messenger/grandma/5.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/6.png b/public/images/emoji/facebook_messenger/grandma/6.png
index 6de0611496..a77762c3ad 100644
Binary files a/public/images/emoji/facebook_messenger/grandma/6.png and b/public/images/emoji/facebook_messenger/grandma/6.png differ
diff --git a/public/images/emoji/facebook_messenger/grapes.png b/public/images/emoji/facebook_messenger/grapes.png
index 6503af87cc..23ae219f03 100644
Binary files a/public/images/emoji/facebook_messenger/grapes.png and b/public/images/emoji/facebook_messenger/grapes.png differ
diff --git a/public/images/emoji/facebook_messenger/greece.png b/public/images/emoji/facebook_messenger/greece.png
index c274ffb629..b14999baaf 100644
Binary files a/public/images/emoji/facebook_messenger/greece.png and b/public/images/emoji/facebook_messenger/greece.png differ
diff --git a/public/images/emoji/facebook_messenger/green_apple.png b/public/images/emoji/facebook_messenger/green_apple.png
index 4955c0c8ca..a86a4bae2e 100644
Binary files a/public/images/emoji/facebook_messenger/green_apple.png and b/public/images/emoji/facebook_messenger/green_apple.png differ
diff --git a/public/images/emoji/facebook_messenger/green_book.png b/public/images/emoji/facebook_messenger/green_book.png
index 535329d592..77b7cfc9ae 100644
Binary files a/public/images/emoji/facebook_messenger/green_book.png and b/public/images/emoji/facebook_messenger/green_book.png differ
diff --git a/public/images/emoji/facebook_messenger/green_heart.png b/public/images/emoji/facebook_messenger/green_heart.png
index 9c3f439624..56b2d8c32a 100644
Binary files a/public/images/emoji/facebook_messenger/green_heart.png and b/public/images/emoji/facebook_messenger/green_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/green_salad.png b/public/images/emoji/facebook_messenger/green_salad.png
index e3325b048e..e2c0f4eb12 100644
Binary files a/public/images/emoji/facebook_messenger/green_salad.png and b/public/images/emoji/facebook_messenger/green_salad.png differ
diff --git a/public/images/emoji/facebook_messenger/greenland.png b/public/images/emoji/facebook_messenger/greenland.png
index 31c8707a43..0ff15a9ce5 100644
Binary files a/public/images/emoji/facebook_messenger/greenland.png and b/public/images/emoji/facebook_messenger/greenland.png differ
diff --git a/public/images/emoji/facebook_messenger/grenada.png b/public/images/emoji/facebook_messenger/grenada.png
index 87f17a6ff2..daa85edf80 100644
Binary files a/public/images/emoji/facebook_messenger/grenada.png and b/public/images/emoji/facebook_messenger/grenada.png differ
diff --git a/public/images/emoji/facebook_messenger/grey_exclamation.png b/public/images/emoji/facebook_messenger/grey_exclamation.png
index 2e4d806cfd..a44d73e9dd 100644
Binary files a/public/images/emoji/facebook_messenger/grey_exclamation.png and b/public/images/emoji/facebook_messenger/grey_exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/grey_question.png b/public/images/emoji/facebook_messenger/grey_question.png
index 22c7edad28..959bc4b17f 100644
Binary files a/public/images/emoji/facebook_messenger/grey_question.png and b/public/images/emoji/facebook_messenger/grey_question.png differ
diff --git a/public/images/emoji/facebook_messenger/grimacing.png b/public/images/emoji/facebook_messenger/grimacing.png
index 768958e130..99ef127b0a 100644
Binary files a/public/images/emoji/facebook_messenger/grimacing.png and b/public/images/emoji/facebook_messenger/grimacing.png differ
diff --git a/public/images/emoji/facebook_messenger/grin.png b/public/images/emoji/facebook_messenger/grin.png
index 47c8a26276..897ca7c7f2 100644
Binary files a/public/images/emoji/facebook_messenger/grin.png and b/public/images/emoji/facebook_messenger/grin.png differ
diff --git a/public/images/emoji/facebook_messenger/grinning.png b/public/images/emoji/facebook_messenger/grinning.png
index 508ab37205..96c64315a7 100644
Binary files a/public/images/emoji/facebook_messenger/grinning.png and b/public/images/emoji/facebook_messenger/grinning.png differ
diff --git a/public/images/emoji/facebook_messenger/guadeloupe.png b/public/images/emoji/facebook_messenger/guadeloupe.png
index c9c437901d..a971544962 100644
Binary files a/public/images/emoji/facebook_messenger/guadeloupe.png and b/public/images/emoji/facebook_messenger/guadeloupe.png differ
diff --git a/public/images/emoji/facebook_messenger/guam.png b/public/images/emoji/facebook_messenger/guam.png
index d291c89c97..fe22a2d203 100644
Binary files a/public/images/emoji/facebook_messenger/guam.png and b/public/images/emoji/facebook_messenger/guam.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman.png b/public/images/emoji/facebook_messenger/guardsman.png
index 66df4e7a1b..31878125c2 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman.png and b/public/images/emoji/facebook_messenger/guardsman.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/2.png b/public/images/emoji/facebook_messenger/guardsman/2.png
index 819233d197..2917f252a0 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/2.png and b/public/images/emoji/facebook_messenger/guardsman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/3.png b/public/images/emoji/facebook_messenger/guardsman/3.png
index 17d12bc5b1..69491a0a93 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/3.png and b/public/images/emoji/facebook_messenger/guardsman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/4.png b/public/images/emoji/facebook_messenger/guardsman/4.png
index 57dbe51427..8508c714ce 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/4.png and b/public/images/emoji/facebook_messenger/guardsman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/5.png b/public/images/emoji/facebook_messenger/guardsman/5.png
index 3d2088de4a..bb42fd21e7 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/5.png and b/public/images/emoji/facebook_messenger/guardsman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/6.png b/public/images/emoji/facebook_messenger/guardsman/6.png
index 38b5ea5003..d621c7d22c 100644
Binary files a/public/images/emoji/facebook_messenger/guardsman/6.png and b/public/images/emoji/facebook_messenger/guardsman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman.png b/public/images/emoji/facebook_messenger/guardswoman.png
index fefb6c23e5..97b1b0cdf4 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman.png and b/public/images/emoji/facebook_messenger/guardswoman.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/2.png b/public/images/emoji/facebook_messenger/guardswoman/2.png
index 9b3ea56a62..07c14be7d4 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/2.png and b/public/images/emoji/facebook_messenger/guardswoman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/3.png b/public/images/emoji/facebook_messenger/guardswoman/3.png
index 0ab6714e8d..0967765b39 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/3.png and b/public/images/emoji/facebook_messenger/guardswoman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/4.png b/public/images/emoji/facebook_messenger/guardswoman/4.png
index 4fde6f1fd6..dad2e88196 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/4.png and b/public/images/emoji/facebook_messenger/guardswoman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/5.png b/public/images/emoji/facebook_messenger/guardswoman/5.png
index 42349efadd..85be424b6e 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/5.png and b/public/images/emoji/facebook_messenger/guardswoman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/6.png b/public/images/emoji/facebook_messenger/guardswoman/6.png
index 77ae53aaf1..2c4767adc4 100644
Binary files a/public/images/emoji/facebook_messenger/guardswoman/6.png and b/public/images/emoji/facebook_messenger/guardswoman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/guatemala.png b/public/images/emoji/facebook_messenger/guatemala.png
index b7e7259bc8..d2f304231b 100644
Binary files a/public/images/emoji/facebook_messenger/guatemala.png and b/public/images/emoji/facebook_messenger/guatemala.png differ
diff --git a/public/images/emoji/facebook_messenger/guernsey.png b/public/images/emoji/facebook_messenger/guernsey.png
index f92e78a324..f44090afdf 100644
Binary files a/public/images/emoji/facebook_messenger/guernsey.png and b/public/images/emoji/facebook_messenger/guernsey.png differ
diff --git a/public/images/emoji/facebook_messenger/guinea.png b/public/images/emoji/facebook_messenger/guinea.png
index dd1482188c..f5be8aae5a 100644
Binary files a/public/images/emoji/facebook_messenger/guinea.png and b/public/images/emoji/facebook_messenger/guinea.png differ
diff --git a/public/images/emoji/facebook_messenger/guinea_bissau.png b/public/images/emoji/facebook_messenger/guinea_bissau.png
index c2ab6fb507..28a2c2389f 100644
Binary files a/public/images/emoji/facebook_messenger/guinea_bissau.png and b/public/images/emoji/facebook_messenger/guinea_bissau.png differ
diff --git a/public/images/emoji/facebook_messenger/guitar.png b/public/images/emoji/facebook_messenger/guitar.png
index 7e8246bd69..e0ef8db988 100644
Binary files a/public/images/emoji/facebook_messenger/guitar.png and b/public/images/emoji/facebook_messenger/guitar.png differ
diff --git a/public/images/emoji/facebook_messenger/gun.png b/public/images/emoji/facebook_messenger/gun.png
index 0d269b9bbd..d2c1b3e737 100644
Binary files a/public/images/emoji/facebook_messenger/gun.png and b/public/images/emoji/facebook_messenger/gun.png differ
diff --git a/public/images/emoji/facebook_messenger/guyana.png b/public/images/emoji/facebook_messenger/guyana.png
index 2ceb411ad2..8e4eb44c47 100644
Binary files a/public/images/emoji/facebook_messenger/guyana.png and b/public/images/emoji/facebook_messenger/guyana.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut.png b/public/images/emoji/facebook_messenger/haircut.png
index b6c6486938..cbf2b9410f 100644
Binary files a/public/images/emoji/facebook_messenger/haircut.png and b/public/images/emoji/facebook_messenger/haircut.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/2.png b/public/images/emoji/facebook_messenger/haircut/2.png
index e211f4d8bb..3d0393ea91 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/2.png and b/public/images/emoji/facebook_messenger/haircut/2.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/3.png b/public/images/emoji/facebook_messenger/haircut/3.png
index 47626a4a9e..2278b679bf 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/3.png and b/public/images/emoji/facebook_messenger/haircut/3.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/4.png b/public/images/emoji/facebook_messenger/haircut/4.png
index 210b78048c..1e19c15c80 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/4.png and b/public/images/emoji/facebook_messenger/haircut/4.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/5.png b/public/images/emoji/facebook_messenger/haircut/5.png
index 543c86e14d..6ef92159ed 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/5.png and b/public/images/emoji/facebook_messenger/haircut/5.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/6.png b/public/images/emoji/facebook_messenger/haircut/6.png
index 3e21e1099b..9131582aa0 100644
Binary files a/public/images/emoji/facebook_messenger/haircut/6.png and b/public/images/emoji/facebook_messenger/haircut/6.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man.png b/public/images/emoji/facebook_messenger/haircut_man.png
index b5a80561e4..a497d7c559 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man.png and b/public/images/emoji/facebook_messenger/haircut_man.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/2.png b/public/images/emoji/facebook_messenger/haircut_man/2.png
index 2be41d13bc..00fcc30cfb 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/2.png and b/public/images/emoji/facebook_messenger/haircut_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/3.png b/public/images/emoji/facebook_messenger/haircut_man/3.png
index 2fab3a1ac2..ef7300663f 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/3.png and b/public/images/emoji/facebook_messenger/haircut_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/4.png b/public/images/emoji/facebook_messenger/haircut_man/4.png
index 7e6d5998c7..4387f105e3 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/4.png and b/public/images/emoji/facebook_messenger/haircut_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/5.png b/public/images/emoji/facebook_messenger/haircut_man/5.png
index 5787ce4a5b..7301a8e23a 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/5.png and b/public/images/emoji/facebook_messenger/haircut_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/6.png b/public/images/emoji/facebook_messenger/haircut_man/6.png
index f5d2a28312..abeacc627f 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_man/6.png and b/public/images/emoji/facebook_messenger/haircut_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman.png b/public/images/emoji/facebook_messenger/haircut_woman.png
index b6c6486938..cbf2b9410f 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman.png and b/public/images/emoji/facebook_messenger/haircut_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/2.png b/public/images/emoji/facebook_messenger/haircut_woman/2.png
index e211f4d8bb..3d0393ea91 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/2.png and b/public/images/emoji/facebook_messenger/haircut_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/3.png b/public/images/emoji/facebook_messenger/haircut_woman/3.png
index 47626a4a9e..2278b679bf 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/3.png and b/public/images/emoji/facebook_messenger/haircut_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/4.png b/public/images/emoji/facebook_messenger/haircut_woman/4.png
index 210b78048c..1e19c15c80 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/4.png and b/public/images/emoji/facebook_messenger/haircut_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/5.png b/public/images/emoji/facebook_messenger/haircut_woman/5.png
index 543c86e14d..6ef92159ed 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/5.png and b/public/images/emoji/facebook_messenger/haircut_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/6.png b/public/images/emoji/facebook_messenger/haircut_woman/6.png
index 3e21e1099b..9131582aa0 100644
Binary files a/public/images/emoji/facebook_messenger/haircut_woman/6.png and b/public/images/emoji/facebook_messenger/haircut_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/haiti.png b/public/images/emoji/facebook_messenger/haiti.png
index 53d2160f9a..19dfa54998 100644
Binary files a/public/images/emoji/facebook_messenger/haiti.png and b/public/images/emoji/facebook_messenger/haiti.png differ
diff --git a/public/images/emoji/facebook_messenger/hamburger.png b/public/images/emoji/facebook_messenger/hamburger.png
index c5843ee75b..f97e8ccbde 100644
Binary files a/public/images/emoji/facebook_messenger/hamburger.png and b/public/images/emoji/facebook_messenger/hamburger.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer.png b/public/images/emoji/facebook_messenger/hammer.png
index 7d18dc8fd3..69487b597d 100644
Binary files a/public/images/emoji/facebook_messenger/hammer.png and b/public/images/emoji/facebook_messenger/hammer.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer_and_pick.png b/public/images/emoji/facebook_messenger/hammer_and_pick.png
index 71bb73f2c5..585f3afe9d 100644
Binary files a/public/images/emoji/facebook_messenger/hammer_and_pick.png and b/public/images/emoji/facebook_messenger/hammer_and_pick.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer_and_wrench.png b/public/images/emoji/facebook_messenger/hammer_and_wrench.png
index 2b7c33b207..ed21302869 100644
Binary files a/public/images/emoji/facebook_messenger/hammer_and_wrench.png and b/public/images/emoji/facebook_messenger/hammer_and_wrench.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer_pick.png b/public/images/emoji/facebook_messenger/hammer_pick.png
index 71bb73f2c5..585f3afe9d 100644
Binary files a/public/images/emoji/facebook_messenger/hammer_pick.png and b/public/images/emoji/facebook_messenger/hammer_pick.png differ
diff --git a/public/images/emoji/facebook_messenger/hamster.png b/public/images/emoji/facebook_messenger/hamster.png
index efd899ad5a..04a6d2fd05 100644
Binary files a/public/images/emoji/facebook_messenger/hamster.png and b/public/images/emoji/facebook_messenger/hamster.png differ
diff --git a/public/images/emoji/facebook_messenger/hand.png b/public/images/emoji/facebook_messenger/hand.png
index a0097d9b71..17f858c2fa 100644
Binary files a/public/images/emoji/facebook_messenger/hand.png and b/public/images/emoji/facebook_messenger/hand.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/2.png b/public/images/emoji/facebook_messenger/hand/2.png
index d23202d6c3..8a4a4e6f84 100644
Binary files a/public/images/emoji/facebook_messenger/hand/2.png and b/public/images/emoji/facebook_messenger/hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/3.png b/public/images/emoji/facebook_messenger/hand/3.png
index 7ff91aea00..8dd6e6e709 100644
Binary files a/public/images/emoji/facebook_messenger/hand/3.png and b/public/images/emoji/facebook_messenger/hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/4.png b/public/images/emoji/facebook_messenger/hand/4.png
index 635801f647..93dcc99aee 100644
Binary files a/public/images/emoji/facebook_messenger/hand/4.png and b/public/images/emoji/facebook_messenger/hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/5.png b/public/images/emoji/facebook_messenger/hand/5.png
index 63bc01077e..dbf83f9523 100644
Binary files a/public/images/emoji/facebook_messenger/hand/5.png and b/public/images/emoji/facebook_messenger/hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/6.png b/public/images/emoji/facebook_messenger/hand/6.png
index 244c30c382..05c48ac0bb 100644
Binary files a/public/images/emoji/facebook_messenger/hand/6.png and b/public/images/emoji/facebook_messenger/hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed.png b/public/images/emoji/facebook_messenger/hand_splayed.png
index f41f01af47..600cb22c58 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed.png and b/public/images/emoji/facebook_messenger/hand_splayed.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/2.png b/public/images/emoji/facebook_messenger/hand_splayed/2.png
index 37a9048ad7..0550a92fe4 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/2.png and b/public/images/emoji/facebook_messenger/hand_splayed/2.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/3.png b/public/images/emoji/facebook_messenger/hand_splayed/3.png
index 6ddd74b586..ed89af340f 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/3.png and b/public/images/emoji/facebook_messenger/hand_splayed/3.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/4.png b/public/images/emoji/facebook_messenger/hand_splayed/4.png
index 1d901925fe..6318255a29 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/4.png and b/public/images/emoji/facebook_messenger/hand_splayed/4.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/5.png b/public/images/emoji/facebook_messenger/hand_splayed/5.png
index 5fcac72a70..6ce8d07a14 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/5.png and b/public/images/emoji/facebook_messenger/hand_splayed/5.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/6.png b/public/images/emoji/facebook_messenger/hand_splayed/6.png
index 74fa972cad..d382007e54 100644
Binary files a/public/images/emoji/facebook_messenger/hand_splayed/6.png and b/public/images/emoji/facebook_messenger/hand_splayed/6.png differ
diff --git a/public/images/emoji/facebook_messenger/handbag.png b/public/images/emoji/facebook_messenger/handbag.png
index 401416b286..f722ba09c1 100644
Binary files a/public/images/emoji/facebook_messenger/handbag.png and b/public/images/emoji/facebook_messenger/handbag.png differ
diff --git a/public/images/emoji/facebook_messenger/handshake.png b/public/images/emoji/facebook_messenger/handshake.png
index 6ac8b5fdf6..9f33302261 100644
Binary files a/public/images/emoji/facebook_messenger/handshake.png and b/public/images/emoji/facebook_messenger/handshake.png differ
diff --git a/public/images/emoji/facebook_messenger/hankey.png b/public/images/emoji/facebook_messenger/hankey.png
index e175a1dfff..7c3e519922 100644
Binary files a/public/images/emoji/facebook_messenger/hankey.png and b/public/images/emoji/facebook_messenger/hankey.png differ
diff --git a/public/images/emoji/facebook_messenger/hash.png b/public/images/emoji/facebook_messenger/hash.png
index 1ce5502869..72b73a8fc5 100644
Binary files a/public/images/emoji/facebook_messenger/hash.png and b/public/images/emoji/facebook_messenger/hash.png differ
diff --git a/public/images/emoji/facebook_messenger/hatched_chick.png b/public/images/emoji/facebook_messenger/hatched_chick.png
index 3034639583..3da991ab2c 100644
Binary files a/public/images/emoji/facebook_messenger/hatched_chick.png and b/public/images/emoji/facebook_messenger/hatched_chick.png differ
diff --git a/public/images/emoji/facebook_messenger/hatching_chick.png b/public/images/emoji/facebook_messenger/hatching_chick.png
index fb7d92ec9b..d4f74aa4d5 100644
Binary files a/public/images/emoji/facebook_messenger/hatching_chick.png and b/public/images/emoji/facebook_messenger/hatching_chick.png differ
diff --git a/public/images/emoji/facebook_messenger/head_bandage.png b/public/images/emoji/facebook_messenger/head_bandage.png
index 97bec4d11f..602886ae28 100644
Binary files a/public/images/emoji/facebook_messenger/head_bandage.png and b/public/images/emoji/facebook_messenger/head_bandage.png differ
diff --git a/public/images/emoji/facebook_messenger/headphones.png b/public/images/emoji/facebook_messenger/headphones.png
index 366b1c8cef..ace9eda596 100644
Binary files a/public/images/emoji/facebook_messenger/headphones.png and b/public/images/emoji/facebook_messenger/headphones.png differ
diff --git a/public/images/emoji/facebook_messenger/hear_no_evil.png b/public/images/emoji/facebook_messenger/hear_no_evil.png
index cf3508c82c..f03d4ad4a5 100644
Binary files a/public/images/emoji/facebook_messenger/hear_no_evil.png and b/public/images/emoji/facebook_messenger/hear_no_evil.png differ
diff --git a/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png b/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png
index 1b5bf7b178..fa2f3852cb 100644
Binary files a/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png and b/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/heart.png b/public/images/emoji/facebook_messenger/heart.png
index 87f15c3a77..2d97890163 100644
Binary files a/public/images/emoji/facebook_messenger/heart.png and b/public/images/emoji/facebook_messenger/heart.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_decoration.png b/public/images/emoji/facebook_messenger/heart_decoration.png
index ad8a16d330..61a8cf5b25 100644
Binary files a/public/images/emoji/facebook_messenger/heart_decoration.png and b/public/images/emoji/facebook_messenger/heart_decoration.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_exclamation.png b/public/images/emoji/facebook_messenger/heart_exclamation.png
index 1cb11ddf8b..026082fabb 100644
Binary files a/public/images/emoji/facebook_messenger/heart_exclamation.png and b/public/images/emoji/facebook_messenger/heart_exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_eyes.png b/public/images/emoji/facebook_messenger/heart_eyes.png
index 8e6d385190..50a43d9081 100644
Binary files a/public/images/emoji/facebook_messenger/heart_eyes.png and b/public/images/emoji/facebook_messenger/heart_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_eyes_cat.png b/public/images/emoji/facebook_messenger/heart_eyes_cat.png
index e0803aeb18..48f8910a5e 100644
Binary files a/public/images/emoji/facebook_messenger/heart_eyes_cat.png and b/public/images/emoji/facebook_messenger/heart_eyes_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/heartbeat.png b/public/images/emoji/facebook_messenger/heartbeat.png
index 8d6aaa7b93..1dff4e5be8 100644
Binary files a/public/images/emoji/facebook_messenger/heartbeat.png and b/public/images/emoji/facebook_messenger/heartbeat.png differ
diff --git a/public/images/emoji/facebook_messenger/heartpulse.png b/public/images/emoji/facebook_messenger/heartpulse.png
index 99e48c36ca..e789909dec 100644
Binary files a/public/images/emoji/facebook_messenger/heartpulse.png and b/public/images/emoji/facebook_messenger/heartpulse.png differ
diff --git a/public/images/emoji/facebook_messenger/hearts.png b/public/images/emoji/facebook_messenger/hearts.png
index 11d94403ae..d2cd3477ec 100644
Binary files a/public/images/emoji/facebook_messenger/hearts.png and b/public/images/emoji/facebook_messenger/hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_check_mark.png b/public/images/emoji/facebook_messenger/heavy_check_mark.png
index 54b5613486..00d59ba534 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_check_mark.png and b/public/images/emoji/facebook_messenger/heavy_check_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_division_sign.png b/public/images/emoji/facebook_messenger/heavy_division_sign.png
index d9e495f28e..2bb364dd8a 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_division_sign.png and b/public/images/emoji/facebook_messenger/heavy_division_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_dollar_sign.png b/public/images/emoji/facebook_messenger/heavy_dollar_sign.png
index 21f0df3b74..e356de42d5 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_dollar_sign.png and b/public/images/emoji/facebook_messenger/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png b/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png
index 1cb11ddf8b..026082fabb 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png and b/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png
index 1cb11ddf8b..026082fabb 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_minus_sign.png b/public/images/emoji/facebook_messenger/heavy_minus_sign.png
index 666b6d5038..9f9d9d165f 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_minus_sign.png and b/public/images/emoji/facebook_messenger/heavy_minus_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_multiplication_x.png b/public/images/emoji/facebook_messenger/heavy_multiplication_x.png
index f442fec0c9..846b870e88 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_multiplication_x.png and b/public/images/emoji/facebook_messenger/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_plus_sign.png b/public/images/emoji/facebook_messenger/heavy_plus_sign.png
index c40c5c83fb..3cb405cab2 100644
Binary files a/public/images/emoji/facebook_messenger/heavy_plus_sign.png and b/public/images/emoji/facebook_messenger/heavy_plus_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/hedgehog.png b/public/images/emoji/facebook_messenger/hedgehog.png
index 9b978b3540..d877234ff9 100644
Binary files a/public/images/emoji/facebook_messenger/hedgehog.png and b/public/images/emoji/facebook_messenger/hedgehog.png differ
diff --git a/public/images/emoji/facebook_messenger/helicopter.png b/public/images/emoji/facebook_messenger/helicopter.png
index e4ecb07aac..d66ada6082 100644
Binary files a/public/images/emoji/facebook_messenger/helicopter.png and b/public/images/emoji/facebook_messenger/helicopter.png differ
diff --git a/public/images/emoji/facebook_messenger/helmet_with_cross.png b/public/images/emoji/facebook_messenger/helmet_with_cross.png
index ad220c2eef..959efb0fb0 100644
Binary files a/public/images/emoji/facebook_messenger/helmet_with_cross.png and b/public/images/emoji/facebook_messenger/helmet_with_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/helmet_with_white_cross.png b/public/images/emoji/facebook_messenger/helmet_with_white_cross.png
index ad220c2eef..959efb0fb0 100644
Binary files a/public/images/emoji/facebook_messenger/helmet_with_white_cross.png and b/public/images/emoji/facebook_messenger/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/herb.png b/public/images/emoji/facebook_messenger/herb.png
index 610292c362..537c88ff2e 100644
Binary files a/public/images/emoji/facebook_messenger/herb.png and b/public/images/emoji/facebook_messenger/herb.png differ
diff --git a/public/images/emoji/facebook_messenger/hibiscus.png b/public/images/emoji/facebook_messenger/hibiscus.png
index 5655dc87de..0f40ef1f0e 100644
Binary files a/public/images/emoji/facebook_messenger/hibiscus.png and b/public/images/emoji/facebook_messenger/hibiscus.png differ
diff --git a/public/images/emoji/facebook_messenger/high_brightness.png b/public/images/emoji/facebook_messenger/high_brightness.png
index ff1e121280..bfe3eff100 100644
Binary files a/public/images/emoji/facebook_messenger/high_brightness.png and b/public/images/emoji/facebook_messenger/high_brightness.png differ
diff --git a/public/images/emoji/facebook_messenger/high_heel.png b/public/images/emoji/facebook_messenger/high_heel.png
index a93d0c41ef..1f252a71f2 100644
Binary files a/public/images/emoji/facebook_messenger/high_heel.png and b/public/images/emoji/facebook_messenger/high_heel.png differ
diff --git a/public/images/emoji/facebook_messenger/hocho.png b/public/images/emoji/facebook_messenger/hocho.png
index c606db130a..963153dd29 100644
Binary files a/public/images/emoji/facebook_messenger/hocho.png and b/public/images/emoji/facebook_messenger/hocho.png differ
diff --git a/public/images/emoji/facebook_messenger/hockey.png b/public/images/emoji/facebook_messenger/hockey.png
index 7b5a1105c3..a8776ad0b3 100644
Binary files a/public/images/emoji/facebook_messenger/hockey.png and b/public/images/emoji/facebook_messenger/hockey.png differ
diff --git a/public/images/emoji/facebook_messenger/hole.png b/public/images/emoji/facebook_messenger/hole.png
index 6df8ea8c4c..54686d0428 100644
Binary files a/public/images/emoji/facebook_messenger/hole.png and b/public/images/emoji/facebook_messenger/hole.png differ
diff --git a/public/images/emoji/facebook_messenger/homes.png b/public/images/emoji/facebook_messenger/homes.png
index 5f9a0a658b..8e3698a572 100644
Binary files a/public/images/emoji/facebook_messenger/homes.png and b/public/images/emoji/facebook_messenger/homes.png differ
diff --git a/public/images/emoji/facebook_messenger/honduras.png b/public/images/emoji/facebook_messenger/honduras.png
index d0aff11833..e1eb11f5a7 100644
Binary files a/public/images/emoji/facebook_messenger/honduras.png and b/public/images/emoji/facebook_messenger/honduras.png differ
diff --git a/public/images/emoji/facebook_messenger/honey_pot.png b/public/images/emoji/facebook_messenger/honey_pot.png
index a23e57415a..dde7e17e7c 100644
Binary files a/public/images/emoji/facebook_messenger/honey_pot.png and b/public/images/emoji/facebook_messenger/honey_pot.png differ
diff --git a/public/images/emoji/facebook_messenger/honeybee.png b/public/images/emoji/facebook_messenger/honeybee.png
index b4b2bff015..649181cf28 100644
Binary files a/public/images/emoji/facebook_messenger/honeybee.png and b/public/images/emoji/facebook_messenger/honeybee.png differ
diff --git a/public/images/emoji/facebook_messenger/hong_kong.png b/public/images/emoji/facebook_messenger/hong_kong.png
index 786a040156..01ac6e241c 100644
Binary files a/public/images/emoji/facebook_messenger/hong_kong.png and b/public/images/emoji/facebook_messenger/hong_kong.png differ
diff --git a/public/images/emoji/facebook_messenger/horse.png b/public/images/emoji/facebook_messenger/horse.png
index befd5ea865..54ad115988 100644
Binary files a/public/images/emoji/facebook_messenger/horse.png and b/public/images/emoji/facebook_messenger/horse.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing.png b/public/images/emoji/facebook_messenger/horse_racing.png
index 7aacc88528..436c3d0b23 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing.png and b/public/images/emoji/facebook_messenger/horse_racing.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/2.png b/public/images/emoji/facebook_messenger/horse_racing/2.png
index 07a007cec6..0fbfcf2312 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/2.png and b/public/images/emoji/facebook_messenger/horse_racing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/3.png b/public/images/emoji/facebook_messenger/horse_racing/3.png
index 999574cf48..3435a8688d 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/3.png and b/public/images/emoji/facebook_messenger/horse_racing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/4.png b/public/images/emoji/facebook_messenger/horse_racing/4.png
index f4cf9ba39d..1caf1598d7 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/4.png and b/public/images/emoji/facebook_messenger/horse_racing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/5.png b/public/images/emoji/facebook_messenger/horse_racing/5.png
index b697e37867..8b97dc9b83 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/5.png and b/public/images/emoji/facebook_messenger/horse_racing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/6.png b/public/images/emoji/facebook_messenger/horse_racing/6.png
index ab5119fd2d..dc66a429b2 100644
Binary files a/public/images/emoji/facebook_messenger/horse_racing/6.png and b/public/images/emoji/facebook_messenger/horse_racing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/hospital.png b/public/images/emoji/facebook_messenger/hospital.png
index 87adf35427..aadcadf4aa 100644
Binary files a/public/images/emoji/facebook_messenger/hospital.png and b/public/images/emoji/facebook_messenger/hospital.png differ
diff --git a/public/images/emoji/facebook_messenger/hot_dog.png b/public/images/emoji/facebook_messenger/hot_dog.png
index 0fe32af15f..e45ce386c4 100644
Binary files a/public/images/emoji/facebook_messenger/hot_dog.png and b/public/images/emoji/facebook_messenger/hot_dog.png differ
diff --git a/public/images/emoji/facebook_messenger/hot_pepper.png b/public/images/emoji/facebook_messenger/hot_pepper.png
index d72eba3a1a..abb2655218 100644
Binary files a/public/images/emoji/facebook_messenger/hot_pepper.png and b/public/images/emoji/facebook_messenger/hot_pepper.png differ
diff --git a/public/images/emoji/facebook_messenger/hotdog.png b/public/images/emoji/facebook_messenger/hotdog.png
index 0fe32af15f..e45ce386c4 100644
Binary files a/public/images/emoji/facebook_messenger/hotdog.png and b/public/images/emoji/facebook_messenger/hotdog.png differ
diff --git a/public/images/emoji/facebook_messenger/hotel.png b/public/images/emoji/facebook_messenger/hotel.png
index b689dbc376..47b7b53926 100644
Binary files a/public/images/emoji/facebook_messenger/hotel.png and b/public/images/emoji/facebook_messenger/hotel.png differ
diff --git a/public/images/emoji/facebook_messenger/hotsprings.png b/public/images/emoji/facebook_messenger/hotsprings.png
index 9a31e886bd..a5ceefcb10 100644
Binary files a/public/images/emoji/facebook_messenger/hotsprings.png and b/public/images/emoji/facebook_messenger/hotsprings.png differ
diff --git a/public/images/emoji/facebook_messenger/hourglass.png b/public/images/emoji/facebook_messenger/hourglass.png
index e139fe1077..5d65df7558 100644
Binary files a/public/images/emoji/facebook_messenger/hourglass.png and b/public/images/emoji/facebook_messenger/hourglass.png differ
diff --git a/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png b/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png
index cff6f63bee..b3cf6c1c4e 100644
Binary files a/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png and b/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/facebook_messenger/house.png b/public/images/emoji/facebook_messenger/house.png
index 6775ff4882..e8b95ddeee 100644
Binary files a/public/images/emoji/facebook_messenger/house.png and b/public/images/emoji/facebook_messenger/house.png differ
diff --git a/public/images/emoji/facebook_messenger/house_abandoned.png b/public/images/emoji/facebook_messenger/house_abandoned.png
index a48da60494..a03480bd67 100644
Binary files a/public/images/emoji/facebook_messenger/house_abandoned.png and b/public/images/emoji/facebook_messenger/house_abandoned.png differ
diff --git a/public/images/emoji/facebook_messenger/house_buildings.png b/public/images/emoji/facebook_messenger/house_buildings.png
index 5f9a0a658b..8e3698a572 100644
Binary files a/public/images/emoji/facebook_messenger/house_buildings.png and b/public/images/emoji/facebook_messenger/house_buildings.png differ
diff --git a/public/images/emoji/facebook_messenger/house_with_garden.png b/public/images/emoji/facebook_messenger/house_with_garden.png
index 763eaa1b8f..a0f69a0e53 100644
Binary files a/public/images/emoji/facebook_messenger/house_with_garden.png and b/public/images/emoji/facebook_messenger/house_with_garden.png differ
diff --git a/public/images/emoji/facebook_messenger/houses.png b/public/images/emoji/facebook_messenger/houses.png
index 5f9a0a658b..8e3698a572 100644
Binary files a/public/images/emoji/facebook_messenger/houses.png and b/public/images/emoji/facebook_messenger/houses.png differ
diff --git a/public/images/emoji/facebook_messenger/hugging.png b/public/images/emoji/facebook_messenger/hugging.png
index f0eb7db322..b9d48c43a1 100644
Binary files a/public/images/emoji/facebook_messenger/hugging.png and b/public/images/emoji/facebook_messenger/hugging.png differ
diff --git a/public/images/emoji/facebook_messenger/hugging_face.png b/public/images/emoji/facebook_messenger/hugging_face.png
index f0eb7db322..b9d48c43a1 100644
Binary files a/public/images/emoji/facebook_messenger/hugging_face.png and b/public/images/emoji/facebook_messenger/hugging_face.png differ
diff --git a/public/images/emoji/facebook_messenger/hugs.png b/public/images/emoji/facebook_messenger/hugs.png
index f0eb7db322..b9d48c43a1 100644
Binary files a/public/images/emoji/facebook_messenger/hugs.png and b/public/images/emoji/facebook_messenger/hugs.png differ
diff --git a/public/images/emoji/facebook_messenger/hungary.png b/public/images/emoji/facebook_messenger/hungary.png
index 98963a97c9..ce5faad3cf 100644
Binary files a/public/images/emoji/facebook_messenger/hungary.png and b/public/images/emoji/facebook_messenger/hungary.png differ
diff --git a/public/images/emoji/facebook_messenger/hushed.png b/public/images/emoji/facebook_messenger/hushed.png
index e8b83c13b7..fe5922c1b1 100644
Binary files a/public/images/emoji/facebook_messenger/hushed.png and b/public/images/emoji/facebook_messenger/hushed.png differ
diff --git a/public/images/emoji/facebook_messenger/ice_cream.png b/public/images/emoji/facebook_messenger/ice_cream.png
index 7db482a697..6eb4419cf6 100644
Binary files a/public/images/emoji/facebook_messenger/ice_cream.png and b/public/images/emoji/facebook_messenger/ice_cream.png differ
diff --git a/public/images/emoji/facebook_messenger/ice_hockey.png b/public/images/emoji/facebook_messenger/ice_hockey.png
index 7b5a1105c3..a8776ad0b3 100644
Binary files a/public/images/emoji/facebook_messenger/ice_hockey.png and b/public/images/emoji/facebook_messenger/ice_hockey.png differ
diff --git a/public/images/emoji/facebook_messenger/ice_skate.png b/public/images/emoji/facebook_messenger/ice_skate.png
index a9e9fcbbe5..0d6fc56224 100644
Binary files a/public/images/emoji/facebook_messenger/ice_skate.png and b/public/images/emoji/facebook_messenger/ice_skate.png differ
diff --git a/public/images/emoji/facebook_messenger/icecream.png b/public/images/emoji/facebook_messenger/icecream.png
index fe53d60a2e..e4b11920b4 100644
Binary files a/public/images/emoji/facebook_messenger/icecream.png and b/public/images/emoji/facebook_messenger/icecream.png differ
diff --git a/public/images/emoji/facebook_messenger/iceland.png b/public/images/emoji/facebook_messenger/iceland.png
index 399f5a4e85..61ae322bfa 100644
Binary files a/public/images/emoji/facebook_messenger/iceland.png and b/public/images/emoji/facebook_messenger/iceland.png differ
diff --git a/public/images/emoji/facebook_messenger/id.png b/public/images/emoji/facebook_messenger/id.png
index 73c4ab4da3..46bab338b3 100644
Binary files a/public/images/emoji/facebook_messenger/id.png and b/public/images/emoji/facebook_messenger/id.png differ
diff --git a/public/images/emoji/facebook_messenger/ideograph_advantage.png b/public/images/emoji/facebook_messenger/ideograph_advantage.png
index 17f27bb535..4d5ba3582a 100644
Binary files a/public/images/emoji/facebook_messenger/ideograph_advantage.png and b/public/images/emoji/facebook_messenger/ideograph_advantage.png differ
diff --git a/public/images/emoji/facebook_messenger/imp.png b/public/images/emoji/facebook_messenger/imp.png
index 86b6277008..ee24b8fabd 100644
Binary files a/public/images/emoji/facebook_messenger/imp.png and b/public/images/emoji/facebook_messenger/imp.png differ
diff --git a/public/images/emoji/facebook_messenger/inbox_tray.png b/public/images/emoji/facebook_messenger/inbox_tray.png
index ebf4a42d5b..260a984f1e 100644
Binary files a/public/images/emoji/facebook_messenger/inbox_tray.png and b/public/images/emoji/facebook_messenger/inbox_tray.png differ
diff --git a/public/images/emoji/facebook_messenger/incoming_envelope.png b/public/images/emoji/facebook_messenger/incoming_envelope.png
index da989200eb..6379db7cf1 100644
Binary files a/public/images/emoji/facebook_messenger/incoming_envelope.png and b/public/images/emoji/facebook_messenger/incoming_envelope.png differ
diff --git a/public/images/emoji/facebook_messenger/india.png b/public/images/emoji/facebook_messenger/india.png
index 3ae5f9b82b..b903a37759 100644
Binary files a/public/images/emoji/facebook_messenger/india.png and b/public/images/emoji/facebook_messenger/india.png differ
diff --git a/public/images/emoji/facebook_messenger/indonesia.png b/public/images/emoji/facebook_messenger/indonesia.png
index c3906b3705..d3945cc22a 100644
Binary files a/public/images/emoji/facebook_messenger/indonesia.png and b/public/images/emoji/facebook_messenger/indonesia.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person.png b/public/images/emoji/facebook_messenger/information_desk_person.png
index 17d66f473b..45ca8d273d 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person.png and b/public/images/emoji/facebook_messenger/information_desk_person.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/2.png b/public/images/emoji/facebook_messenger/information_desk_person/2.png
index 92055ff0cd..ee2883ad57 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/2.png and b/public/images/emoji/facebook_messenger/information_desk_person/2.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/3.png b/public/images/emoji/facebook_messenger/information_desk_person/3.png
index 2c8a485a1f..e98fdbc0e2 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/3.png and b/public/images/emoji/facebook_messenger/information_desk_person/3.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/4.png b/public/images/emoji/facebook_messenger/information_desk_person/4.png
index 890ae929d2..a74a217798 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/4.png and b/public/images/emoji/facebook_messenger/information_desk_person/4.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/5.png b/public/images/emoji/facebook_messenger/information_desk_person/5.png
index c7228bf6a8..03f6a7303e 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/5.png and b/public/images/emoji/facebook_messenger/information_desk_person/5.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/6.png b/public/images/emoji/facebook_messenger/information_desk_person/6.png
index f02f68988a..994308cee8 100644
Binary files a/public/images/emoji/facebook_messenger/information_desk_person/6.png and b/public/images/emoji/facebook_messenger/information_desk_person/6.png differ
diff --git a/public/images/emoji/facebook_messenger/information_source.png b/public/images/emoji/facebook_messenger/information_source.png
index a8fd945655..0494b22384 100644
Binary files a/public/images/emoji/facebook_messenger/information_source.png and b/public/images/emoji/facebook_messenger/information_source.png differ
diff --git a/public/images/emoji/facebook_messenger/innocent.png b/public/images/emoji/facebook_messenger/innocent.png
index 11d735eb66..ae87d6ced4 100644
Binary files a/public/images/emoji/facebook_messenger/innocent.png and b/public/images/emoji/facebook_messenger/innocent.png differ
diff --git a/public/images/emoji/facebook_messenger/interrobang.png b/public/images/emoji/facebook_messenger/interrobang.png
index 3128a2b638..bcf63f7d25 100644
Binary files a/public/images/emoji/facebook_messenger/interrobang.png and b/public/images/emoji/facebook_messenger/interrobang.png differ
diff --git a/public/images/emoji/facebook_messenger/iphone.png b/public/images/emoji/facebook_messenger/iphone.png
index dafb42d72e..d5ac577d7f 100644
Binary files a/public/images/emoji/facebook_messenger/iphone.png and b/public/images/emoji/facebook_messenger/iphone.png differ
diff --git a/public/images/emoji/facebook_messenger/iran.png b/public/images/emoji/facebook_messenger/iran.png
index e30df4c1f5..d40dd83547 100644
Binary files a/public/images/emoji/facebook_messenger/iran.png and b/public/images/emoji/facebook_messenger/iran.png differ
diff --git a/public/images/emoji/facebook_messenger/iraq.png b/public/images/emoji/facebook_messenger/iraq.png
index cccd140ba3..b9f8e328f0 100644
Binary files a/public/images/emoji/facebook_messenger/iraq.png and b/public/images/emoji/facebook_messenger/iraq.png differ
diff --git a/public/images/emoji/facebook_messenger/ireland.png b/public/images/emoji/facebook_messenger/ireland.png
index e71a1f1e63..a9a69ad3b8 100644
Binary files a/public/images/emoji/facebook_messenger/ireland.png and b/public/images/emoji/facebook_messenger/ireland.png differ
diff --git a/public/images/emoji/facebook_messenger/island.png b/public/images/emoji/facebook_messenger/island.png
index 2d2e8919ff..7a1f87faf9 100644
Binary files a/public/images/emoji/facebook_messenger/island.png and b/public/images/emoji/facebook_messenger/island.png differ
diff --git a/public/images/emoji/facebook_messenger/isle_of_man.png b/public/images/emoji/facebook_messenger/isle_of_man.png
index 7829f538f8..d5a7846ed8 100644
Binary files a/public/images/emoji/facebook_messenger/isle_of_man.png and b/public/images/emoji/facebook_messenger/isle_of_man.png differ
diff --git a/public/images/emoji/facebook_messenger/israel.png b/public/images/emoji/facebook_messenger/israel.png
index 548d97611f..58146f46cb 100644
Binary files a/public/images/emoji/facebook_messenger/israel.png and b/public/images/emoji/facebook_messenger/israel.png differ
diff --git a/public/images/emoji/facebook_messenger/it.png b/public/images/emoji/facebook_messenger/it.png
index e5e0646c21..1b5c5906b3 100644
Binary files a/public/images/emoji/facebook_messenger/it.png and b/public/images/emoji/facebook_messenger/it.png differ
diff --git a/public/images/emoji/facebook_messenger/izakaya_lantern.png b/public/images/emoji/facebook_messenger/izakaya_lantern.png
index 8dde73ba95..91f1eb3b69 100644
Binary files a/public/images/emoji/facebook_messenger/izakaya_lantern.png and b/public/images/emoji/facebook_messenger/izakaya_lantern.png differ
diff --git a/public/images/emoji/facebook_messenger/jack_o_lantern.png b/public/images/emoji/facebook_messenger/jack_o_lantern.png
index b6e2ad00df..815cf3eb4e 100644
Binary files a/public/images/emoji/facebook_messenger/jack_o_lantern.png and b/public/images/emoji/facebook_messenger/jack_o_lantern.png differ
diff --git a/public/images/emoji/facebook_messenger/jamaica.png b/public/images/emoji/facebook_messenger/jamaica.png
index dc2c807511..e569aa9ee9 100644
Binary files a/public/images/emoji/facebook_messenger/jamaica.png and b/public/images/emoji/facebook_messenger/jamaica.png differ
diff --git a/public/images/emoji/facebook_messenger/japan.png b/public/images/emoji/facebook_messenger/japan.png
index 1720c3d9b1..718d526368 100644
Binary files a/public/images/emoji/facebook_messenger/japan.png and b/public/images/emoji/facebook_messenger/japan.png differ
diff --git a/public/images/emoji/facebook_messenger/japanese_castle.png b/public/images/emoji/facebook_messenger/japanese_castle.png
index 0ba2b78fa4..9b7faba907 100644
Binary files a/public/images/emoji/facebook_messenger/japanese_castle.png and b/public/images/emoji/facebook_messenger/japanese_castle.png differ
diff --git a/public/images/emoji/facebook_messenger/japanese_goblin.png b/public/images/emoji/facebook_messenger/japanese_goblin.png
index 77c502d606..3df2f0ed51 100644
Binary files a/public/images/emoji/facebook_messenger/japanese_goblin.png and b/public/images/emoji/facebook_messenger/japanese_goblin.png differ
diff --git a/public/images/emoji/facebook_messenger/japanese_ogre.png b/public/images/emoji/facebook_messenger/japanese_ogre.png
index dd7075f444..761225433f 100644
Binary files a/public/images/emoji/facebook_messenger/japanese_ogre.png and b/public/images/emoji/facebook_messenger/japanese_ogre.png differ
diff --git a/public/images/emoji/facebook_messenger/jeans.png b/public/images/emoji/facebook_messenger/jeans.png
index 3287ca8815..f692b7ce50 100644
Binary files a/public/images/emoji/facebook_messenger/jeans.png and b/public/images/emoji/facebook_messenger/jeans.png differ
diff --git a/public/images/emoji/facebook_messenger/jersey.png b/public/images/emoji/facebook_messenger/jersey.png
index adfdbc3c1a..1c294698e3 100644
Binary files a/public/images/emoji/facebook_messenger/jersey.png and b/public/images/emoji/facebook_messenger/jersey.png differ
diff --git a/public/images/emoji/facebook_messenger/jordan.png b/public/images/emoji/facebook_messenger/jordan.png
index 43a2f9139f..2211150a8e 100644
Binary files a/public/images/emoji/facebook_messenger/jordan.png and b/public/images/emoji/facebook_messenger/jordan.png differ
diff --git a/public/images/emoji/facebook_messenger/joy.png b/public/images/emoji/facebook_messenger/joy.png
index 9c6e7ee147..b61ad326be 100644
Binary files a/public/images/emoji/facebook_messenger/joy.png and b/public/images/emoji/facebook_messenger/joy.png differ
diff --git a/public/images/emoji/facebook_messenger/joy_cat.png b/public/images/emoji/facebook_messenger/joy_cat.png
index db84adf5ef..be20cd66c4 100644
Binary files a/public/images/emoji/facebook_messenger/joy_cat.png and b/public/images/emoji/facebook_messenger/joy_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/joystick.png b/public/images/emoji/facebook_messenger/joystick.png
index 8e5c09d59b..7ae3e89d17 100644
Binary files a/public/images/emoji/facebook_messenger/joystick.png and b/public/images/emoji/facebook_messenger/joystick.png differ
diff --git a/public/images/emoji/facebook_messenger/jp.png b/public/images/emoji/facebook_messenger/jp.png
index ab749c77f7..ef2bc7b48f 100644
Binary files a/public/images/emoji/facebook_messenger/jp.png and b/public/images/emoji/facebook_messenger/jp.png differ
diff --git a/public/images/emoji/facebook_messenger/kaaba.png b/public/images/emoji/facebook_messenger/kaaba.png
index 73219d28c1..292dd5e2e1 100644
Binary files a/public/images/emoji/facebook_messenger/kaaba.png and b/public/images/emoji/facebook_messenger/kaaba.png differ
diff --git a/public/images/emoji/facebook_messenger/kazakhstan.png b/public/images/emoji/facebook_messenger/kazakhstan.png
index 731858e2cf..799739df89 100644
Binary files a/public/images/emoji/facebook_messenger/kazakhstan.png and b/public/images/emoji/facebook_messenger/kazakhstan.png differ
diff --git a/public/images/emoji/facebook_messenger/kenya.png b/public/images/emoji/facebook_messenger/kenya.png
index cc55fd6981..5bd6cbce8e 100644
Binary files a/public/images/emoji/facebook_messenger/kenya.png and b/public/images/emoji/facebook_messenger/kenya.png differ
diff --git a/public/images/emoji/facebook_messenger/key.png b/public/images/emoji/facebook_messenger/key.png
index 84889b66f5..4007045365 100644
Binary files a/public/images/emoji/facebook_messenger/key.png and b/public/images/emoji/facebook_messenger/key.png differ
diff --git a/public/images/emoji/facebook_messenger/key2.png b/public/images/emoji/facebook_messenger/key2.png
index 18b9399432..4452b17fb5 100644
Binary files a/public/images/emoji/facebook_messenger/key2.png and b/public/images/emoji/facebook_messenger/key2.png differ
diff --git a/public/images/emoji/facebook_messenger/keyboard.png b/public/images/emoji/facebook_messenger/keyboard.png
index a16457d533..6a3d63d1e0 100644
Binary files a/public/images/emoji/facebook_messenger/keyboard.png and b/public/images/emoji/facebook_messenger/keyboard.png differ
diff --git a/public/images/emoji/facebook_messenger/keycap_star.png b/public/images/emoji/facebook_messenger/keycap_star.png
index 2bfefce2be..a009bc2cda 100644
Binary files a/public/images/emoji/facebook_messenger/keycap_star.png and b/public/images/emoji/facebook_messenger/keycap_star.png differ
diff --git a/public/images/emoji/facebook_messenger/keycap_ten.png b/public/images/emoji/facebook_messenger/keycap_ten.png
index 12264637b0..c0beb67e22 100644
Binary files a/public/images/emoji/facebook_messenger/keycap_ten.png and b/public/images/emoji/facebook_messenger/keycap_ten.png differ
diff --git a/public/images/emoji/facebook_messenger/kick_scooter.png b/public/images/emoji/facebook_messenger/kick_scooter.png
index f04615710f..262f386ccf 100644
Binary files a/public/images/emoji/facebook_messenger/kick_scooter.png and b/public/images/emoji/facebook_messenger/kick_scooter.png differ
diff --git a/public/images/emoji/facebook_messenger/kimono.png b/public/images/emoji/facebook_messenger/kimono.png
index 8459c5ef5f..0647cd4e98 100644
Binary files a/public/images/emoji/facebook_messenger/kimono.png and b/public/images/emoji/facebook_messenger/kimono.png differ
diff --git a/public/images/emoji/facebook_messenger/kiribati.png b/public/images/emoji/facebook_messenger/kiribati.png
index 138fd3f2b5..ca481a9860 100644
Binary files a/public/images/emoji/facebook_messenger/kiribati.png and b/public/images/emoji/facebook_messenger/kiribati.png differ
diff --git a/public/images/emoji/facebook_messenger/kiss.png b/public/images/emoji/facebook_messenger/kiss.png
index 2419578972..a9748f359a 100644
Binary files a/public/images/emoji/facebook_messenger/kiss.png and b/public/images/emoji/facebook_messenger/kiss.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing.png b/public/images/emoji/facebook_messenger/kissing.png
index e1fe9088c1..00ac735175 100644
Binary files a/public/images/emoji/facebook_messenger/kissing.png and b/public/images/emoji/facebook_messenger/kissing.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_cat.png b/public/images/emoji/facebook_messenger/kissing_cat.png
index 42882123c5..8f406299d2 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_cat.png and b/public/images/emoji/facebook_messenger/kissing_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_closed_eyes.png b/public/images/emoji/facebook_messenger/kissing_closed_eyes.png
index 68c5f1c4fd..b128cee450 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_closed_eyes.png and b/public/images/emoji/facebook_messenger/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_heart.png b/public/images/emoji/facebook_messenger/kissing_heart.png
index 70ac23c2fc..9678efe0c9 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_heart.png and b/public/images/emoji/facebook_messenger/kissing_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png b/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png
index 7e32d050e6..1a3dcb4d2a 100644
Binary files a/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png and b/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/kiwi_fruit.png b/public/images/emoji/facebook_messenger/kiwi_fruit.png
index 1abebdab60..07613f83aa 100644
Binary files a/public/images/emoji/facebook_messenger/kiwi_fruit.png and b/public/images/emoji/facebook_messenger/kiwi_fruit.png differ
diff --git a/public/images/emoji/facebook_messenger/knife.png b/public/images/emoji/facebook_messenger/knife.png
index c606db130a..963153dd29 100644
Binary files a/public/images/emoji/facebook_messenger/knife.png and b/public/images/emoji/facebook_messenger/knife.png differ
diff --git a/public/images/emoji/facebook_messenger/koala.png b/public/images/emoji/facebook_messenger/koala.png
index b181cd8aee..dbf611f299 100644
Binary files a/public/images/emoji/facebook_messenger/koala.png and b/public/images/emoji/facebook_messenger/koala.png differ
diff --git a/public/images/emoji/facebook_messenger/koko.png b/public/images/emoji/facebook_messenger/koko.png
index 277172ed84..3d1a4f4b56 100644
Binary files a/public/images/emoji/facebook_messenger/koko.png and b/public/images/emoji/facebook_messenger/koko.png differ
diff --git a/public/images/emoji/facebook_messenger/kosovo.png b/public/images/emoji/facebook_messenger/kosovo.png
index efea0b70bd..9b8d095d51 100644
Binary files a/public/images/emoji/facebook_messenger/kosovo.png and b/public/images/emoji/facebook_messenger/kosovo.png differ
diff --git a/public/images/emoji/facebook_messenger/kr.png b/public/images/emoji/facebook_messenger/kr.png
index 73c4454e7f..4bd85faa98 100644
Binary files a/public/images/emoji/facebook_messenger/kr.png and b/public/images/emoji/facebook_messenger/kr.png differ
diff --git a/public/images/emoji/facebook_messenger/kuwait.png b/public/images/emoji/facebook_messenger/kuwait.png
index 32b00e4806..447fbdd84a 100644
Binary files a/public/images/emoji/facebook_messenger/kuwait.png and b/public/images/emoji/facebook_messenger/kuwait.png differ
diff --git a/public/images/emoji/facebook_messenger/kyrgyzstan.png b/public/images/emoji/facebook_messenger/kyrgyzstan.png
index 6ecfc717c9..60ab151c04 100644
Binary files a/public/images/emoji/facebook_messenger/kyrgyzstan.png and b/public/images/emoji/facebook_messenger/kyrgyzstan.png differ
diff --git a/public/images/emoji/facebook_messenger/label.png b/public/images/emoji/facebook_messenger/label.png
index 36f91eb31c..1a8034cbe6 100644
Binary files a/public/images/emoji/facebook_messenger/label.png and b/public/images/emoji/facebook_messenger/label.png differ
diff --git a/public/images/emoji/facebook_messenger/laos.png b/public/images/emoji/facebook_messenger/laos.png
index 5dca502f80..becdf43c9b 100644
Binary files a/public/images/emoji/facebook_messenger/laos.png and b/public/images/emoji/facebook_messenger/laos.png differ
diff --git a/public/images/emoji/facebook_messenger/large_blue_circle.png b/public/images/emoji/facebook_messenger/large_blue_circle.png
index e79a949ccb..13a06c1bab 100644
Binary files a/public/images/emoji/facebook_messenger/large_blue_circle.png and b/public/images/emoji/facebook_messenger/large_blue_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/large_blue_diamond.png b/public/images/emoji/facebook_messenger/large_blue_diamond.png
index fc1a854716..b37360628a 100644
Binary files a/public/images/emoji/facebook_messenger/large_blue_diamond.png and b/public/images/emoji/facebook_messenger/large_blue_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/large_orange_diamond.png b/public/images/emoji/facebook_messenger/large_orange_diamond.png
index ecc594465b..f3e122848e 100644
Binary files a/public/images/emoji/facebook_messenger/large_orange_diamond.png and b/public/images/emoji/facebook_messenger/large_orange_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/last_quarter_moon.png b/public/images/emoji/facebook_messenger/last_quarter_moon.png
index aa083f2b81..c6ffbfa280 100644
Binary files a/public/images/emoji/facebook_messenger/last_quarter_moon.png and b/public/images/emoji/facebook_messenger/last_quarter_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png b/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png
index 33bf88b07b..b7404f7719 100644
Binary files a/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png and b/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/latin_cross.png b/public/images/emoji/facebook_messenger/latin_cross.png
index f11e296dd9..705cfc1e6f 100644
Binary files a/public/images/emoji/facebook_messenger/latin_cross.png and b/public/images/emoji/facebook_messenger/latin_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/latvia.png b/public/images/emoji/facebook_messenger/latvia.png
index a23d4c4e2e..5028433200 100644
Binary files a/public/images/emoji/facebook_messenger/latvia.png and b/public/images/emoji/facebook_messenger/latvia.png differ
diff --git a/public/images/emoji/facebook_messenger/laughing.png b/public/images/emoji/facebook_messenger/laughing.png
index 68cbb0f148..039f7f9d6d 100644
Binary files a/public/images/emoji/facebook_messenger/laughing.png and b/public/images/emoji/facebook_messenger/laughing.png differ
diff --git a/public/images/emoji/facebook_messenger/leaves.png b/public/images/emoji/facebook_messenger/leaves.png
index a4cbbe176c..20f7a4c8aa 100644
Binary files a/public/images/emoji/facebook_messenger/leaves.png and b/public/images/emoji/facebook_messenger/leaves.png differ
diff --git a/public/images/emoji/facebook_messenger/lebanon.png b/public/images/emoji/facebook_messenger/lebanon.png
index 5b8710dfd7..462daf5b45 100644
Binary files a/public/images/emoji/facebook_messenger/lebanon.png and b/public/images/emoji/facebook_messenger/lebanon.png differ
diff --git a/public/images/emoji/facebook_messenger/ledger.png b/public/images/emoji/facebook_messenger/ledger.png
index 0801a71d89..2b4ea73fe3 100644
Binary files a/public/images/emoji/facebook_messenger/ledger.png and b/public/images/emoji/facebook_messenger/ledger.png differ
diff --git a/public/images/emoji/facebook_messenger/left_luggage.png b/public/images/emoji/facebook_messenger/left_luggage.png
index 8a3acbaf3a..a384686dd9 100644
Binary files a/public/images/emoji/facebook_messenger/left_luggage.png and b/public/images/emoji/facebook_messenger/left_luggage.png differ
diff --git a/public/images/emoji/facebook_messenger/left_right_arrow.png b/public/images/emoji/facebook_messenger/left_right_arrow.png
index 86df388cca..db907768e0 100644
Binary files a/public/images/emoji/facebook_messenger/left_right_arrow.png and b/public/images/emoji/facebook_messenger/left_right_arrow.png differ
diff --git a/public/images/emoji/facebook_messenger/left_speech_bubble.png b/public/images/emoji/facebook_messenger/left_speech_bubble.png
index 8cb3b728e0..80195d4727 100644
Binary files a/public/images/emoji/facebook_messenger/left_speech_bubble.png and b/public/images/emoji/facebook_messenger/left_speech_bubble.png differ
diff --git a/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png b/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png
index 0a60642fa6..b7c7dd6baa 100644
Binary files a/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png and b/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/facebook_messenger/lemon.png b/public/images/emoji/facebook_messenger/lemon.png
index 14773e7d99..a5d4c812ad 100644
Binary files a/public/images/emoji/facebook_messenger/lemon.png and b/public/images/emoji/facebook_messenger/lemon.png differ
diff --git a/public/images/emoji/facebook_messenger/leo.png b/public/images/emoji/facebook_messenger/leo.png
index 0050c7afb3..3b92fc4b10 100644
Binary files a/public/images/emoji/facebook_messenger/leo.png and b/public/images/emoji/facebook_messenger/leo.png differ
diff --git a/public/images/emoji/facebook_messenger/leopard.png b/public/images/emoji/facebook_messenger/leopard.png
index 4a602a95bb..e04426afa8 100644
Binary files a/public/images/emoji/facebook_messenger/leopard.png and b/public/images/emoji/facebook_messenger/leopard.png differ
diff --git a/public/images/emoji/facebook_messenger/lesotho.png b/public/images/emoji/facebook_messenger/lesotho.png
index 136ea59d3d..dcb3b92128 100644
Binary files a/public/images/emoji/facebook_messenger/lesotho.png and b/public/images/emoji/facebook_messenger/lesotho.png differ
diff --git a/public/images/emoji/facebook_messenger/level_slider.png b/public/images/emoji/facebook_messenger/level_slider.png
index d7c8408ead..bad2d4c7e5 100644
Binary files a/public/images/emoji/facebook_messenger/level_slider.png and b/public/images/emoji/facebook_messenger/level_slider.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate.png b/public/images/emoji/facebook_messenger/levitate.png
index 5231c708a0..12436f9888 100644
Binary files a/public/images/emoji/facebook_messenger/levitate.png and b/public/images/emoji/facebook_messenger/levitate.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/2.png b/public/images/emoji/facebook_messenger/levitate/2.png
index 753693b093..7d66f0d7b6 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/2.png and b/public/images/emoji/facebook_messenger/levitate/2.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/3.png b/public/images/emoji/facebook_messenger/levitate/3.png
index f56875edac..775f49d644 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/3.png and b/public/images/emoji/facebook_messenger/levitate/3.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/4.png b/public/images/emoji/facebook_messenger/levitate/4.png
index 37d74f5c97..6906ed1845 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/4.png and b/public/images/emoji/facebook_messenger/levitate/4.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/5.png b/public/images/emoji/facebook_messenger/levitate/5.png
index 5a48f96192..28849bdcc7 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/5.png and b/public/images/emoji/facebook_messenger/levitate/5.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/6.png b/public/images/emoji/facebook_messenger/levitate/6.png
index 6150740817..cb80f23fc2 100644
Binary files a/public/images/emoji/facebook_messenger/levitate/6.png and b/public/images/emoji/facebook_messenger/levitate/6.png differ
diff --git a/public/images/emoji/facebook_messenger/liberia.png b/public/images/emoji/facebook_messenger/liberia.png
index 2828cee4c8..0a04c6709f 100644
Binary files a/public/images/emoji/facebook_messenger/liberia.png and b/public/images/emoji/facebook_messenger/liberia.png differ
diff --git a/public/images/emoji/facebook_messenger/libra.png b/public/images/emoji/facebook_messenger/libra.png
index 54f93f04d9..96ce496875 100644
Binary files a/public/images/emoji/facebook_messenger/libra.png and b/public/images/emoji/facebook_messenger/libra.png differ
diff --git a/public/images/emoji/facebook_messenger/libya.png b/public/images/emoji/facebook_messenger/libya.png
index a6c90e15d4..263d4f56cc 100644
Binary files a/public/images/emoji/facebook_messenger/libya.png and b/public/images/emoji/facebook_messenger/libya.png differ
diff --git a/public/images/emoji/facebook_messenger/liechtenstein.png b/public/images/emoji/facebook_messenger/liechtenstein.png
index 93605ebfd5..888fa7a2d8 100644
Binary files a/public/images/emoji/facebook_messenger/liechtenstein.png and b/public/images/emoji/facebook_messenger/liechtenstein.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter.png b/public/images/emoji/facebook_messenger/lifter.png
index be0473304d..1ce6966153 100644
Binary files a/public/images/emoji/facebook_messenger/lifter.png and b/public/images/emoji/facebook_messenger/lifter.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/2.png b/public/images/emoji/facebook_messenger/lifter/2.png
index 8d680f5b12..e29ccc9b4b 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/2.png and b/public/images/emoji/facebook_messenger/lifter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/3.png b/public/images/emoji/facebook_messenger/lifter/3.png
index e4e961d5d5..e21fa2a374 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/3.png and b/public/images/emoji/facebook_messenger/lifter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/4.png b/public/images/emoji/facebook_messenger/lifter/4.png
index bcdf20d175..e7ac09f9c7 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/4.png and b/public/images/emoji/facebook_messenger/lifter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/5.png b/public/images/emoji/facebook_messenger/lifter/5.png
index 9b91906952..1fbe8f888f 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/5.png and b/public/images/emoji/facebook_messenger/lifter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/6.png b/public/images/emoji/facebook_messenger/lifter/6.png
index c3ce145e9e..731280ee0c 100644
Binary files a/public/images/emoji/facebook_messenger/lifter/6.png and b/public/images/emoji/facebook_messenger/lifter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/light_rail.png b/public/images/emoji/facebook_messenger/light_rail.png
index e1aecd7aef..510c368879 100644
Binary files a/public/images/emoji/facebook_messenger/light_rail.png and b/public/images/emoji/facebook_messenger/light_rail.png differ
diff --git a/public/images/emoji/facebook_messenger/link.png b/public/images/emoji/facebook_messenger/link.png
index a428a15a9b..c3fd6f5f23 100644
Binary files a/public/images/emoji/facebook_messenger/link.png and b/public/images/emoji/facebook_messenger/link.png differ
diff --git a/public/images/emoji/facebook_messenger/linked_paperclips.png b/public/images/emoji/facebook_messenger/linked_paperclips.png
index b4080878f6..998be6d8ba 100644
Binary files a/public/images/emoji/facebook_messenger/linked_paperclips.png and b/public/images/emoji/facebook_messenger/linked_paperclips.png differ
diff --git a/public/images/emoji/facebook_messenger/lion.png b/public/images/emoji/facebook_messenger/lion.png
index aace4fa00b..d77e842321 100644
Binary files a/public/images/emoji/facebook_messenger/lion.png and b/public/images/emoji/facebook_messenger/lion.png differ
diff --git a/public/images/emoji/facebook_messenger/lion_face.png b/public/images/emoji/facebook_messenger/lion_face.png
index aace4fa00b..d77e842321 100644
Binary files a/public/images/emoji/facebook_messenger/lion_face.png and b/public/images/emoji/facebook_messenger/lion_face.png differ
diff --git a/public/images/emoji/facebook_messenger/lips.png b/public/images/emoji/facebook_messenger/lips.png
index 6e6f416421..9d54a3869b 100644
Binary files a/public/images/emoji/facebook_messenger/lips.png and b/public/images/emoji/facebook_messenger/lips.png differ
diff --git a/public/images/emoji/facebook_messenger/lipstick.png b/public/images/emoji/facebook_messenger/lipstick.png
index f42fefcebc..dc1a810cca 100644
Binary files a/public/images/emoji/facebook_messenger/lipstick.png and b/public/images/emoji/facebook_messenger/lipstick.png differ
diff --git a/public/images/emoji/facebook_messenger/lithuania.png b/public/images/emoji/facebook_messenger/lithuania.png
index d4e7e6766a..6682b7d125 100644
Binary files a/public/images/emoji/facebook_messenger/lithuania.png and b/public/images/emoji/facebook_messenger/lithuania.png differ
diff --git a/public/images/emoji/facebook_messenger/lizard.png b/public/images/emoji/facebook_messenger/lizard.png
index 302081914b..55488c67b0 100644
Binary files a/public/images/emoji/facebook_messenger/lizard.png and b/public/images/emoji/facebook_messenger/lizard.png differ
diff --git a/public/images/emoji/facebook_messenger/lock.png b/public/images/emoji/facebook_messenger/lock.png
index c584b6db28..a64f3f01e9 100644
Binary files a/public/images/emoji/facebook_messenger/lock.png and b/public/images/emoji/facebook_messenger/lock.png differ
diff --git a/public/images/emoji/facebook_messenger/lock_with_ink_pen.png b/public/images/emoji/facebook_messenger/lock_with_ink_pen.png
index a8c6259a9b..e3878e7c73 100644
Binary files a/public/images/emoji/facebook_messenger/lock_with_ink_pen.png and b/public/images/emoji/facebook_messenger/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/lollipop.png b/public/images/emoji/facebook_messenger/lollipop.png
index ec7f17ed11..6519cba46c 100644
Binary files a/public/images/emoji/facebook_messenger/lollipop.png and b/public/images/emoji/facebook_messenger/lollipop.png differ
diff --git a/public/images/emoji/facebook_messenger/loop.png b/public/images/emoji/facebook_messenger/loop.png
index 103b356312..45ecb253f0 100644
Binary files a/public/images/emoji/facebook_messenger/loop.png and b/public/images/emoji/facebook_messenger/loop.png differ
diff --git a/public/images/emoji/facebook_messenger/loud_sound.png b/public/images/emoji/facebook_messenger/loud_sound.png
index e5201112af..c44ba01abe 100644
Binary files a/public/images/emoji/facebook_messenger/loud_sound.png and b/public/images/emoji/facebook_messenger/loud_sound.png differ
diff --git a/public/images/emoji/facebook_messenger/loudspeaker.png b/public/images/emoji/facebook_messenger/loudspeaker.png
index c1c1fcbf23..a1cd49a51e 100644
Binary files a/public/images/emoji/facebook_messenger/loudspeaker.png and b/public/images/emoji/facebook_messenger/loudspeaker.png differ
diff --git a/public/images/emoji/facebook_messenger/love_hotel.png b/public/images/emoji/facebook_messenger/love_hotel.png
index 88ff0d0c97..488c2b9bda 100644
Binary files a/public/images/emoji/facebook_messenger/love_hotel.png and b/public/images/emoji/facebook_messenger/love_hotel.png differ
diff --git a/public/images/emoji/facebook_messenger/love_letter.png b/public/images/emoji/facebook_messenger/love_letter.png
index 6042cea736..a45da6bdcc 100644
Binary files a/public/images/emoji/facebook_messenger/love_letter.png and b/public/images/emoji/facebook_messenger/love_letter.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture.png b/public/images/emoji/facebook_messenger/love_you_gesture.png
index 14ef7c72b2..2421a6f2aa 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture.png and b/public/images/emoji/facebook_messenger/love_you_gesture.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/2.png b/public/images/emoji/facebook_messenger/love_you_gesture/2.png
index b70217e894..a55a2d6d24 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/2.png and b/public/images/emoji/facebook_messenger/love_you_gesture/2.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/3.png b/public/images/emoji/facebook_messenger/love_you_gesture/3.png
index aa984ea926..65c0733426 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/3.png and b/public/images/emoji/facebook_messenger/love_you_gesture/3.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/4.png b/public/images/emoji/facebook_messenger/love_you_gesture/4.png
index 5decb0e800..5f3e11565c 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/4.png and b/public/images/emoji/facebook_messenger/love_you_gesture/4.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/5.png b/public/images/emoji/facebook_messenger/love_you_gesture/5.png
index e0bb218cc0..a120ea1d5c 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/5.png and b/public/images/emoji/facebook_messenger/love_you_gesture/5.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/6.png b/public/images/emoji/facebook_messenger/love_you_gesture/6.png
index bb51bde8bb..5cff9667a8 100644
Binary files a/public/images/emoji/facebook_messenger/love_you_gesture/6.png and b/public/images/emoji/facebook_messenger/love_you_gesture/6.png differ
diff --git a/public/images/emoji/facebook_messenger/low_brightness.png b/public/images/emoji/facebook_messenger/low_brightness.png
index f7dfde34ed..5663f2c871 100644
Binary files a/public/images/emoji/facebook_messenger/low_brightness.png and b/public/images/emoji/facebook_messenger/low_brightness.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png b/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png
index 6219ae26cc..399b2fbf22 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png and b/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_crayon.png b/public/images/emoji/facebook_messenger/lower_left_crayon.png
index 0ad5b02c2d..5f920abb85 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_crayon.png and b/public/images/emoji/facebook_messenger/lower_left_crayon.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png b/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png
index 96584c9f57..2e7296057b 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png and b/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_paintbrush.png b/public/images/emoji/facebook_messenger/lower_left_paintbrush.png
index c7d649a378..6044b9caff 100644
Binary files a/public/images/emoji/facebook_messenger/lower_left_paintbrush.png and b/public/images/emoji/facebook_messenger/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/facebook_messenger/luxembourg.png b/public/images/emoji/facebook_messenger/luxembourg.png
index a8c6737d1b..68575f7817 100644
Binary files a/public/images/emoji/facebook_messenger/luxembourg.png and b/public/images/emoji/facebook_messenger/luxembourg.png differ
diff --git a/public/images/emoji/facebook_messenger/lying_face.png b/public/images/emoji/facebook_messenger/lying_face.png
index e31e547296..811777b16d 100644
Binary files a/public/images/emoji/facebook_messenger/lying_face.png and b/public/images/emoji/facebook_messenger/lying_face.png differ
diff --git a/public/images/emoji/facebook_messenger/m.png b/public/images/emoji/facebook_messenger/m.png
index 84fef974e0..05105497d2 100644
Binary files a/public/images/emoji/facebook_messenger/m.png and b/public/images/emoji/facebook_messenger/m.png differ
diff --git a/public/images/emoji/facebook_messenger/macau.png b/public/images/emoji/facebook_messenger/macau.png
index 6690c383f8..9e4a5f7f2b 100644
Binary files a/public/images/emoji/facebook_messenger/macau.png and b/public/images/emoji/facebook_messenger/macau.png differ
diff --git a/public/images/emoji/facebook_messenger/macedonia.png b/public/images/emoji/facebook_messenger/macedonia.png
index a4c8ef41d2..ed77739065 100644
Binary files a/public/images/emoji/facebook_messenger/macedonia.png and b/public/images/emoji/facebook_messenger/macedonia.png differ
diff --git a/public/images/emoji/facebook_messenger/madagascar.png b/public/images/emoji/facebook_messenger/madagascar.png
index 708ec7416c..cb90e63b62 100644
Binary files a/public/images/emoji/facebook_messenger/madagascar.png and b/public/images/emoji/facebook_messenger/madagascar.png differ
diff --git a/public/images/emoji/facebook_messenger/mag.png b/public/images/emoji/facebook_messenger/mag.png
index a0881161e4..f17f5bc03d 100644
Binary files a/public/images/emoji/facebook_messenger/mag.png and b/public/images/emoji/facebook_messenger/mag.png differ
diff --git a/public/images/emoji/facebook_messenger/mag_right.png b/public/images/emoji/facebook_messenger/mag_right.png
index 0ba4cfeff0..953a397b6e 100644
Binary files a/public/images/emoji/facebook_messenger/mag_right.png and b/public/images/emoji/facebook_messenger/mag_right.png differ
diff --git a/public/images/emoji/facebook_messenger/mage.png b/public/images/emoji/facebook_messenger/mage.png
index 71c1b13f92..339eb4c0c7 100644
Binary files a/public/images/emoji/facebook_messenger/mage.png and b/public/images/emoji/facebook_messenger/mage.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/2.png b/public/images/emoji/facebook_messenger/mage/2.png
index 823f6843fa..b46050143b 100644
Binary files a/public/images/emoji/facebook_messenger/mage/2.png and b/public/images/emoji/facebook_messenger/mage/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/3.png b/public/images/emoji/facebook_messenger/mage/3.png
index c2ff6622a0..d547fd6878 100644
Binary files a/public/images/emoji/facebook_messenger/mage/3.png and b/public/images/emoji/facebook_messenger/mage/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/4.png b/public/images/emoji/facebook_messenger/mage/4.png
index 76d0a52e37..be66447aee 100644
Binary files a/public/images/emoji/facebook_messenger/mage/4.png and b/public/images/emoji/facebook_messenger/mage/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/5.png b/public/images/emoji/facebook_messenger/mage/5.png
index ddb5de5580..70e39d3617 100644
Binary files a/public/images/emoji/facebook_messenger/mage/5.png and b/public/images/emoji/facebook_messenger/mage/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/6.png b/public/images/emoji/facebook_messenger/mage/6.png
index 302dd62dfb..4e0837d690 100644
Binary files a/public/images/emoji/facebook_messenger/mage/6.png and b/public/images/emoji/facebook_messenger/mage/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mahjong.png b/public/images/emoji/facebook_messenger/mahjong.png
index 5766d97ecf..636fe30a68 100644
Binary files a/public/images/emoji/facebook_messenger/mahjong.png and b/public/images/emoji/facebook_messenger/mahjong.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox.png b/public/images/emoji/facebook_messenger/mailbox.png
index 1ee01907c3..73ddcb39eb 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox.png and b/public/images/emoji/facebook_messenger/mailbox.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox_closed.png b/public/images/emoji/facebook_messenger/mailbox_closed.png
index 4d7c0ac620..b631ad8414 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox_closed.png and b/public/images/emoji/facebook_messenger/mailbox_closed.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox_with_mail.png b/public/images/emoji/facebook_messenger/mailbox_with_mail.png
index 724bab14ab..d75eca10f8 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox_with_mail.png and b/public/images/emoji/facebook_messenger/mailbox_with_mail.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png b/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png
index a3ae327980..524dac7777 100644
Binary files a/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png and b/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/facebook_messenger/malawi.png b/public/images/emoji/facebook_messenger/malawi.png
index 854fd4ce85..6f25fc26b4 100644
Binary files a/public/images/emoji/facebook_messenger/malawi.png and b/public/images/emoji/facebook_messenger/malawi.png differ
diff --git a/public/images/emoji/facebook_messenger/malaysia.png b/public/images/emoji/facebook_messenger/malaysia.png
index dbf3a91298..dc5ec8d4e9 100644
Binary files a/public/images/emoji/facebook_messenger/malaysia.png and b/public/images/emoji/facebook_messenger/malaysia.png differ
diff --git a/public/images/emoji/facebook_messenger/maldives.png b/public/images/emoji/facebook_messenger/maldives.png
index e0fec7e04b..c8fa5b60b9 100644
Binary files a/public/images/emoji/facebook_messenger/maldives.png and b/public/images/emoji/facebook_messenger/maldives.png differ
diff --git a/public/images/emoji/facebook_messenger/male_couple_with_heart.png b/public/images/emoji/facebook_messenger/male_couple_with_heart.png
index 8fcabbd430..50c3f8f81f 100644
Binary files a/public/images/emoji/facebook_messenger/male_couple_with_heart.png and b/public/images/emoji/facebook_messenger/male_couple_with_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/male_couplekiss.png b/public/images/emoji/facebook_messenger/male_couplekiss.png
index 842c5a4e22..e626b7eb92 100644
Binary files a/public/images/emoji/facebook_messenger/male_couplekiss.png and b/public/images/emoji/facebook_messenger/male_couplekiss.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective.png b/public/images/emoji/facebook_messenger/male_detective.png
index 587e506d98..6734c6bde0 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective.png and b/public/images/emoji/facebook_messenger/male_detective.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/2.png b/public/images/emoji/facebook_messenger/male_detective/2.png
index a25d5ea4d4..04383914af 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/2.png and b/public/images/emoji/facebook_messenger/male_detective/2.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/3.png b/public/images/emoji/facebook_messenger/male_detective/3.png
index f100fd13a4..1a6c3ca89c 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/3.png and b/public/images/emoji/facebook_messenger/male_detective/3.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/4.png b/public/images/emoji/facebook_messenger/male_detective/4.png
index 775a8b2f2b..0778fa99eb 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/4.png and b/public/images/emoji/facebook_messenger/male_detective/4.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/5.png b/public/images/emoji/facebook_messenger/male_detective/5.png
index c9703ba994..4479cc79cc 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/5.png and b/public/images/emoji/facebook_messenger/male_detective/5.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/6.png b/public/images/emoji/facebook_messenger/male_detective/6.png
index 55cc03db8d..2602f4c409 100644
Binary files a/public/images/emoji/facebook_messenger/male_detective/6.png and b/public/images/emoji/facebook_messenger/male_detective/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mali.png b/public/images/emoji/facebook_messenger/mali.png
index ef19c197c7..4798e46bec 100644
Binary files a/public/images/emoji/facebook_messenger/mali.png and b/public/images/emoji/facebook_messenger/mali.png differ
diff --git a/public/images/emoji/facebook_messenger/malta.png b/public/images/emoji/facebook_messenger/malta.png
index f6850d6276..fb79203a5e 100644
Binary files a/public/images/emoji/facebook_messenger/malta.png and b/public/images/emoji/facebook_messenger/malta.png differ
diff --git a/public/images/emoji/facebook_messenger/man.png b/public/images/emoji/facebook_messenger/man.png
index 51dd587074..8559060c61 100644
Binary files a/public/images/emoji/facebook_messenger/man.png and b/public/images/emoji/facebook_messenger/man.png differ
diff --git a/public/images/emoji/facebook_messenger/man/2.png b/public/images/emoji/facebook_messenger/man/2.png
index 619a4af214..b73ee5274e 100644
Binary files a/public/images/emoji/facebook_messenger/man/2.png and b/public/images/emoji/facebook_messenger/man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man/3.png b/public/images/emoji/facebook_messenger/man/3.png
index c75a2f06c7..cdae4a5510 100644
Binary files a/public/images/emoji/facebook_messenger/man/3.png and b/public/images/emoji/facebook_messenger/man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man/4.png b/public/images/emoji/facebook_messenger/man/4.png
index 3289978982..639fb3c4cf 100644
Binary files a/public/images/emoji/facebook_messenger/man/4.png and b/public/images/emoji/facebook_messenger/man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man/5.png b/public/images/emoji/facebook_messenger/man/5.png
index c77e49351f..18731b3f42 100644
Binary files a/public/images/emoji/facebook_messenger/man/5.png and b/public/images/emoji/facebook_messenger/man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man/6.png b/public/images/emoji/facebook_messenger/man/6.png
index fe6e80f216..1d706af22a 100644
Binary files a/public/images/emoji/facebook_messenger/man/6.png and b/public/images/emoji/facebook_messenger/man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist.png b/public/images/emoji/facebook_messenger/man_artist.png
index 1cc6650697..4a540590d3 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist.png and b/public/images/emoji/facebook_messenger/man_artist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/2.png b/public/images/emoji/facebook_messenger/man_artist/2.png
index 4bacb1ea06..5cebe53d07 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/2.png and b/public/images/emoji/facebook_messenger/man_artist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/3.png b/public/images/emoji/facebook_messenger/man_artist/3.png
index 05d4d810aa..1a0411b4f9 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/3.png and b/public/images/emoji/facebook_messenger/man_artist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/4.png b/public/images/emoji/facebook_messenger/man_artist/4.png
index 4f62b71923..9030c4d11f 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/4.png and b/public/images/emoji/facebook_messenger/man_artist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/5.png b/public/images/emoji/facebook_messenger/man_artist/5.png
index 87b201e106..8f60033116 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/5.png and b/public/images/emoji/facebook_messenger/man_artist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/6.png b/public/images/emoji/facebook_messenger/man_artist/6.png
index d3c5344420..ffc904a06f 100644
Binary files a/public/images/emoji/facebook_messenger/man_artist/6.png and b/public/images/emoji/facebook_messenger/man_artist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut.png b/public/images/emoji/facebook_messenger/man_astronaut.png
index 3248c7ea4b..0cd5eaeecf 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut.png and b/public/images/emoji/facebook_messenger/man_astronaut.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/2.png b/public/images/emoji/facebook_messenger/man_astronaut/2.png
index 3f4608453c..0cd5eaeecf 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/2.png and b/public/images/emoji/facebook_messenger/man_astronaut/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/3.png b/public/images/emoji/facebook_messenger/man_astronaut/3.png
index dfb79a0fa1..0cd5eaeecf 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/3.png and b/public/images/emoji/facebook_messenger/man_astronaut/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/4.png b/public/images/emoji/facebook_messenger/man_astronaut/4.png
index ecffb4b3dc..0cd5eaeecf 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/4.png and b/public/images/emoji/facebook_messenger/man_astronaut/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/5.png b/public/images/emoji/facebook_messenger/man_astronaut/5.png
index 30a01501b6..0cd5eaeecf 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/5.png and b/public/images/emoji/facebook_messenger/man_astronaut/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/6.png b/public/images/emoji/facebook_messenger/man_astronaut/6.png
index 1b5c86eeb3..0cd5eaeecf 100644
Binary files a/public/images/emoji/facebook_messenger/man_astronaut/6.png and b/public/images/emoji/facebook_messenger/man_astronaut/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling.png b/public/images/emoji/facebook_messenger/man_cartwheeling.png
index aaf7c70f74..49633f6851 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling.png and b/public/images/emoji/facebook_messenger/man_cartwheeling.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/2.png b/public/images/emoji/facebook_messenger/man_cartwheeling/2.png
index 431a4461e3..2da4606eb7 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/2.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/3.png b/public/images/emoji/facebook_messenger/man_cartwheeling/3.png
index fb4421abb0..926cdd7280 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/3.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/4.png b/public/images/emoji/facebook_messenger/man_cartwheeling/4.png
index 277e11f0c5..8e8125e73f 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/4.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/5.png b/public/images/emoji/facebook_messenger/man_cartwheeling/5.png
index dfd446bd8d..1ae0a7eaab 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/5.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/6.png b/public/images/emoji/facebook_messenger/man_cartwheeling/6.png
index 8877efb271..d817b4a020 100644
Binary files a/public/images/emoji/facebook_messenger/man_cartwheeling/6.png and b/public/images/emoji/facebook_messenger/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook.png b/public/images/emoji/facebook_messenger/man_cook.png
index 8fb843406f..61961e6d46 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook.png and b/public/images/emoji/facebook_messenger/man_cook.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/2.png b/public/images/emoji/facebook_messenger/man_cook/2.png
index 4dfed22855..8becc5f528 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/2.png and b/public/images/emoji/facebook_messenger/man_cook/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/3.png b/public/images/emoji/facebook_messenger/man_cook/3.png
index 072ab0c475..a873ab1927 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/3.png and b/public/images/emoji/facebook_messenger/man_cook/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/4.png b/public/images/emoji/facebook_messenger/man_cook/4.png
index 0d3c6b8535..387fd7d972 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/4.png and b/public/images/emoji/facebook_messenger/man_cook/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/5.png b/public/images/emoji/facebook_messenger/man_cook/5.png
index 805aa4fcf6..5deb2fd9ae 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/5.png and b/public/images/emoji/facebook_messenger/man_cook/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/6.png b/public/images/emoji/facebook_messenger/man_cook/6.png
index 60d2b62aa2..5ab58fc8ef 100644
Binary files a/public/images/emoji/facebook_messenger/man_cook/6.png and b/public/images/emoji/facebook_messenger/man_cook/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing.png b/public/images/emoji/facebook_messenger/man_dancing.png
index f3f2a5b04c..a0792b7355 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing.png and b/public/images/emoji/facebook_messenger/man_dancing.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/2.png b/public/images/emoji/facebook_messenger/man_dancing/2.png
index 040218520e..e6e7acb78b 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/2.png and b/public/images/emoji/facebook_messenger/man_dancing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/3.png b/public/images/emoji/facebook_messenger/man_dancing/3.png
index 8aec654d0e..9acbfb02f4 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/3.png and b/public/images/emoji/facebook_messenger/man_dancing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/4.png b/public/images/emoji/facebook_messenger/man_dancing/4.png
index 3d74099cbb..411c3c3260 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/4.png and b/public/images/emoji/facebook_messenger/man_dancing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/5.png b/public/images/emoji/facebook_messenger/man_dancing/5.png
index d41bc27788..d895910679 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/5.png and b/public/images/emoji/facebook_messenger/man_dancing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/6.png b/public/images/emoji/facebook_messenger/man_dancing/6.png
index 01ee2f8efe..38040f16c0 100644
Binary files a/public/images/emoji/facebook_messenger/man_dancing/6.png and b/public/images/emoji/facebook_messenger/man_dancing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming.png b/public/images/emoji/facebook_messenger/man_facepalming.png
index c819f4029a..acce29638a 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming.png and b/public/images/emoji/facebook_messenger/man_facepalming.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/2.png b/public/images/emoji/facebook_messenger/man_facepalming/2.png
index 890aa9695f..0f3c375494 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/2.png and b/public/images/emoji/facebook_messenger/man_facepalming/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/3.png b/public/images/emoji/facebook_messenger/man_facepalming/3.png
index 58aee73c58..e858efc635 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/3.png and b/public/images/emoji/facebook_messenger/man_facepalming/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/4.png b/public/images/emoji/facebook_messenger/man_facepalming/4.png
index 94355c5aca..75102dff1b 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/4.png and b/public/images/emoji/facebook_messenger/man_facepalming/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/5.png b/public/images/emoji/facebook_messenger/man_facepalming/5.png
index ddd6d4a05a..885189f2a6 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/5.png and b/public/images/emoji/facebook_messenger/man_facepalming/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/6.png b/public/images/emoji/facebook_messenger/man_facepalming/6.png
index 9263f22556..f1bfe54169 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/6.png and b/public/images/emoji/facebook_messenger/man_facepalming/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker.png b/public/images/emoji/facebook_messenger/man_factory_worker.png
index 4f8d7b6339..225a58bae3 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker.png and b/public/images/emoji/facebook_messenger/man_factory_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/2.png b/public/images/emoji/facebook_messenger/man_factory_worker/2.png
index ac0c07e8d5..e46e58e9d0 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/2.png and b/public/images/emoji/facebook_messenger/man_factory_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/3.png b/public/images/emoji/facebook_messenger/man_factory_worker/3.png
index f5b09e3c74..6fec8f9e6e 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/3.png and b/public/images/emoji/facebook_messenger/man_factory_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/4.png b/public/images/emoji/facebook_messenger/man_factory_worker/4.png
index d9e2f4f8f9..8cad972161 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/4.png and b/public/images/emoji/facebook_messenger/man_factory_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/5.png b/public/images/emoji/facebook_messenger/man_factory_worker/5.png
index c6fb8f9c46..4143a15d4c 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/5.png and b/public/images/emoji/facebook_messenger/man_factory_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/6.png b/public/images/emoji/facebook_messenger/man_factory_worker/6.png
index 196de5ae66..3d8951f6fd 100644
Binary files a/public/images/emoji/facebook_messenger/man_factory_worker/6.png and b/public/images/emoji/facebook_messenger/man_factory_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer.png b/public/images/emoji/facebook_messenger/man_farmer.png
index a275fe56a7..0db3f28676 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer.png and b/public/images/emoji/facebook_messenger/man_farmer.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/2.png b/public/images/emoji/facebook_messenger/man_farmer/2.png
index cf79c4c311..996bc0e255 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/2.png and b/public/images/emoji/facebook_messenger/man_farmer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/3.png b/public/images/emoji/facebook_messenger/man_farmer/3.png
index b0c9648562..a5812d9993 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/3.png and b/public/images/emoji/facebook_messenger/man_farmer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/4.png b/public/images/emoji/facebook_messenger/man_farmer/4.png
index 8924978790..fc0109d906 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/4.png and b/public/images/emoji/facebook_messenger/man_farmer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/5.png b/public/images/emoji/facebook_messenger/man_farmer/5.png
index dc6e22dbc1..379326ef2d 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/5.png and b/public/images/emoji/facebook_messenger/man_farmer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/6.png b/public/images/emoji/facebook_messenger/man_farmer/6.png
index e7df59313d..56439a8ec0 100644
Binary files a/public/images/emoji/facebook_messenger/man_farmer/6.png and b/public/images/emoji/facebook_messenger/man_farmer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter.png b/public/images/emoji/facebook_messenger/man_firefighter.png
index a43787bc20..af2a62e44e 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter.png and b/public/images/emoji/facebook_messenger/man_firefighter.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/2.png b/public/images/emoji/facebook_messenger/man_firefighter/2.png
index 9788ff223e..cdf9f0a58a 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/2.png and b/public/images/emoji/facebook_messenger/man_firefighter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/3.png b/public/images/emoji/facebook_messenger/man_firefighter/3.png
index b92f649135..a14bd78210 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/3.png and b/public/images/emoji/facebook_messenger/man_firefighter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/4.png b/public/images/emoji/facebook_messenger/man_firefighter/4.png
index 2494826b0d..b7f9f92a5b 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/4.png and b/public/images/emoji/facebook_messenger/man_firefighter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/5.png b/public/images/emoji/facebook_messenger/man_firefighter/5.png
index 74caaf3d67..cdd6cad443 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/5.png and b/public/images/emoji/facebook_messenger/man_firefighter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/6.png b/public/images/emoji/facebook_messenger/man_firefighter/6.png
index 87b1460b99..2b2be60962 100644
Binary files a/public/images/emoji/facebook_messenger/man_firefighter/6.png and b/public/images/emoji/facebook_messenger/man_firefighter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker.png b/public/images/emoji/facebook_messenger/man_health_worker.png
index 266219eec1..d25197ffc4 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker.png and b/public/images/emoji/facebook_messenger/man_health_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/2.png b/public/images/emoji/facebook_messenger/man_health_worker/2.png
index 07434ed578..a9fd818b4b 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/2.png and b/public/images/emoji/facebook_messenger/man_health_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/3.png b/public/images/emoji/facebook_messenger/man_health_worker/3.png
index a233efb0c7..f3e52bde19 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/3.png and b/public/images/emoji/facebook_messenger/man_health_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/4.png b/public/images/emoji/facebook_messenger/man_health_worker/4.png
index 9dbd254708..248e243166 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/4.png and b/public/images/emoji/facebook_messenger/man_health_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/5.png b/public/images/emoji/facebook_messenger/man_health_worker/5.png
index 3e13cf5b0d..32d88c43cb 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/5.png and b/public/images/emoji/facebook_messenger/man_health_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/6.png b/public/images/emoji/facebook_messenger/man_health_worker/6.png
index 6fe28eed3c..f9ba0ef2dc 100644
Binary files a/public/images/emoji/facebook_messenger/man_health_worker/6.png and b/public/images/emoji/facebook_messenger/man_health_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png
index 5231c708a0..12436f9888 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png
index 753693b093..7d66f0d7b6 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png
index f56875edac..775f49d644 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png
index 37d74f5c97..6906ed1845 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png
index 5a48f96192..28849bdcc7 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png
index 6150740817..cb80f23fc2 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo.png b/public/images/emoji/facebook_messenger/man_in_tuxedo.png
index 68a5498555..c1e78a356a 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png
index 9115065434..1c7de60964 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png
index 7d21e35505..28ea67dcda 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png
index 5560c73e7c..9791f6a44a 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png
index 0507a8bc08..e3f97a3cb7 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png
index 7e5b911860..511c229868 100644
Binary files a/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png and b/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge.png b/public/images/emoji/facebook_messenger/man_judge.png
index b20c0cd734..672fb5f7df 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge.png and b/public/images/emoji/facebook_messenger/man_judge.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/2.png b/public/images/emoji/facebook_messenger/man_judge/2.png
index bdfee1817b..efe1b2e3b6 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/2.png and b/public/images/emoji/facebook_messenger/man_judge/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/3.png b/public/images/emoji/facebook_messenger/man_judge/3.png
index 052c0b0fa2..c0c4dc18a1 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/3.png and b/public/images/emoji/facebook_messenger/man_judge/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/4.png b/public/images/emoji/facebook_messenger/man_judge/4.png
index ddd7e0530d..6ac1280767 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/4.png and b/public/images/emoji/facebook_messenger/man_judge/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/5.png b/public/images/emoji/facebook_messenger/man_judge/5.png
index 1a374e1485..8d7983da9c 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/5.png and b/public/images/emoji/facebook_messenger/man_judge/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/6.png b/public/images/emoji/facebook_messenger/man_judge/6.png
index 4d5fac75df..8e3454517d 100644
Binary files a/public/images/emoji/facebook_messenger/man_judge/6.png and b/public/images/emoji/facebook_messenger/man_judge/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling.png b/public/images/emoji/facebook_messenger/man_juggling.png
index d6cc6a380d..afa07527b3 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling.png and b/public/images/emoji/facebook_messenger/man_juggling.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/2.png b/public/images/emoji/facebook_messenger/man_juggling/2.png
index 631afe697f..0401075bb3 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/2.png and b/public/images/emoji/facebook_messenger/man_juggling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/3.png b/public/images/emoji/facebook_messenger/man_juggling/3.png
index c28f2a5db9..f8a42dc9c7 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/3.png and b/public/images/emoji/facebook_messenger/man_juggling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/4.png b/public/images/emoji/facebook_messenger/man_juggling/4.png
index 12d32ecb86..fdbd69344b 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/4.png and b/public/images/emoji/facebook_messenger/man_juggling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/5.png b/public/images/emoji/facebook_messenger/man_juggling/5.png
index f04ba21ece..9a0b00d4bf 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/5.png and b/public/images/emoji/facebook_messenger/man_juggling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/6.png b/public/images/emoji/facebook_messenger/man_juggling/6.png
index 4b5b1a7d5c..4e546c6ca1 100644
Binary files a/public/images/emoji/facebook_messenger/man_juggling/6.png and b/public/images/emoji/facebook_messenger/man_juggling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic.png b/public/images/emoji/facebook_messenger/man_mechanic.png
index df912ad255..c79d7989e9 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic.png and b/public/images/emoji/facebook_messenger/man_mechanic.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/2.png b/public/images/emoji/facebook_messenger/man_mechanic/2.png
index 2d9a40a7b6..9845ab06e4 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/2.png and b/public/images/emoji/facebook_messenger/man_mechanic/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/3.png b/public/images/emoji/facebook_messenger/man_mechanic/3.png
index 0b6093c561..5f974ea240 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/3.png and b/public/images/emoji/facebook_messenger/man_mechanic/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/4.png b/public/images/emoji/facebook_messenger/man_mechanic/4.png
index 4b776c98ef..d31883ff77 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/4.png and b/public/images/emoji/facebook_messenger/man_mechanic/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/5.png b/public/images/emoji/facebook_messenger/man_mechanic/5.png
index 994526ddb9..f5bd0ff933 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/5.png and b/public/images/emoji/facebook_messenger/man_mechanic/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/6.png b/public/images/emoji/facebook_messenger/man_mechanic/6.png
index e95117df24..8e07938caf 100644
Binary files a/public/images/emoji/facebook_messenger/man_mechanic/6.png and b/public/images/emoji/facebook_messenger/man_mechanic/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker.png b/public/images/emoji/facebook_messenger/man_office_worker.png
index 641784af02..fe5637f8cf 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker.png and b/public/images/emoji/facebook_messenger/man_office_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/2.png b/public/images/emoji/facebook_messenger/man_office_worker/2.png
index db95aa1431..8a32d340a8 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/2.png and b/public/images/emoji/facebook_messenger/man_office_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/3.png b/public/images/emoji/facebook_messenger/man_office_worker/3.png
index 0da3a36f50..031d6b54f2 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/3.png and b/public/images/emoji/facebook_messenger/man_office_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/4.png b/public/images/emoji/facebook_messenger/man_office_worker/4.png
index 0e7d62291b..1b95e48b1a 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/4.png and b/public/images/emoji/facebook_messenger/man_office_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/5.png b/public/images/emoji/facebook_messenger/man_office_worker/5.png
index b2ef2f0420..6420095e1d 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/5.png and b/public/images/emoji/facebook_messenger/man_office_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/6.png b/public/images/emoji/facebook_messenger/man_office_worker/6.png
index f237971ab0..d6a5b556e5 100644
Binary files a/public/images/emoji/facebook_messenger/man_office_worker/6.png and b/public/images/emoji/facebook_messenger/man_office_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot.png b/public/images/emoji/facebook_messenger/man_pilot.png
index 196949a366..9dc4123649 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot.png and b/public/images/emoji/facebook_messenger/man_pilot.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/2.png b/public/images/emoji/facebook_messenger/man_pilot/2.png
index 0b3fe7f349..f54faef6f5 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/2.png and b/public/images/emoji/facebook_messenger/man_pilot/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/3.png b/public/images/emoji/facebook_messenger/man_pilot/3.png
index 2af0c956d9..f5bd685c18 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/3.png and b/public/images/emoji/facebook_messenger/man_pilot/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/4.png b/public/images/emoji/facebook_messenger/man_pilot/4.png
index 7098a598ca..ffcc8a415b 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/4.png and b/public/images/emoji/facebook_messenger/man_pilot/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/5.png b/public/images/emoji/facebook_messenger/man_pilot/5.png
index 790ecc7051..5663bd1e02 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/5.png and b/public/images/emoji/facebook_messenger/man_pilot/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/6.png b/public/images/emoji/facebook_messenger/man_pilot/6.png
index 7082b178d7..8f8912718f 100644
Binary files a/public/images/emoji/facebook_messenger/man_pilot/6.png and b/public/images/emoji/facebook_messenger/man_pilot/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball.png b/public/images/emoji/facebook_messenger/man_playing_handball.png
index 8d9964cf03..8a8ae125d6 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball.png and b/public/images/emoji/facebook_messenger/man_playing_handball.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/2.png b/public/images/emoji/facebook_messenger/man_playing_handball/2.png
index 33b1d7c764..671bbd6562 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/2.png and b/public/images/emoji/facebook_messenger/man_playing_handball/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/3.png b/public/images/emoji/facebook_messenger/man_playing_handball/3.png
index 1f3f9215d0..a850d9c3b4 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/3.png and b/public/images/emoji/facebook_messenger/man_playing_handball/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/4.png b/public/images/emoji/facebook_messenger/man_playing_handball/4.png
index 20d6288ed7..4f73532a1c 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/4.png and b/public/images/emoji/facebook_messenger/man_playing_handball/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/5.png b/public/images/emoji/facebook_messenger/man_playing_handball/5.png
index b653112d27..7c5a9fadd5 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/5.png and b/public/images/emoji/facebook_messenger/man_playing_handball/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/6.png b/public/images/emoji/facebook_messenger/man_playing_handball/6.png
index c7dce8c231..f67334e6ec 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_handball/6.png and b/public/images/emoji/facebook_messenger/man_playing_handball/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo.png b/public/images/emoji/facebook_messenger/man_playing_water_polo.png
index 14bc7c68d1..520bca4a68 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png
index 4f343861d3..7721dfcf57 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png
index 3548a2ef8d..38150a1247 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png
index 7b45751b64..885cdce85e 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png
index 3247752e19..aa77b65de3 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png
index bd6e616eb2..465e02d723 100644
Binary files a/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png and b/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist.png b/public/images/emoji/facebook_messenger/man_scientist.png
index af1f36d1cd..d2d1336eb2 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist.png and b/public/images/emoji/facebook_messenger/man_scientist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/2.png b/public/images/emoji/facebook_messenger/man_scientist/2.png
index 5a1e488e80..cfce7faf30 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/2.png and b/public/images/emoji/facebook_messenger/man_scientist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/3.png b/public/images/emoji/facebook_messenger/man_scientist/3.png
index 7c7d6b849e..e23b413b4e 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/3.png and b/public/images/emoji/facebook_messenger/man_scientist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/4.png b/public/images/emoji/facebook_messenger/man_scientist/4.png
index ff16a5535f..c85ac7c4b4 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/4.png and b/public/images/emoji/facebook_messenger/man_scientist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/5.png b/public/images/emoji/facebook_messenger/man_scientist/5.png
index 179479a696..1618248f9d 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/5.png and b/public/images/emoji/facebook_messenger/man_scientist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/6.png b/public/images/emoji/facebook_messenger/man_scientist/6.png
index b02e169aaf..e2445f7596 100644
Binary files a/public/images/emoji/facebook_messenger/man_scientist/6.png and b/public/images/emoji/facebook_messenger/man_scientist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging.png b/public/images/emoji/facebook_messenger/man_shrugging.png
index 61e00fd0b0..378c415170 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging.png and b/public/images/emoji/facebook_messenger/man_shrugging.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/2.png b/public/images/emoji/facebook_messenger/man_shrugging/2.png
index 6db5885ddb..8fc5ac7a9b 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/2.png and b/public/images/emoji/facebook_messenger/man_shrugging/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/3.png b/public/images/emoji/facebook_messenger/man_shrugging/3.png
index f1fc833e9c..d377aeb2db 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/3.png and b/public/images/emoji/facebook_messenger/man_shrugging/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/4.png b/public/images/emoji/facebook_messenger/man_shrugging/4.png
index 9ca39fce99..8069a9d9db 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/4.png and b/public/images/emoji/facebook_messenger/man_shrugging/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/5.png b/public/images/emoji/facebook_messenger/man_shrugging/5.png
index ab9cd50150..4df62e3042 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/5.png and b/public/images/emoji/facebook_messenger/man_shrugging/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/6.png b/public/images/emoji/facebook_messenger/man_shrugging/6.png
index a805a9fe34..f4f961b6d4 100644
Binary files a/public/images/emoji/facebook_messenger/man_shrugging/6.png and b/public/images/emoji/facebook_messenger/man_shrugging/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer.png b/public/images/emoji/facebook_messenger/man_singer.png
index f3df881028..f7a8eb225d 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer.png and b/public/images/emoji/facebook_messenger/man_singer.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/2.png b/public/images/emoji/facebook_messenger/man_singer/2.png
index 4e65783bfd..1bf8b0b4f7 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/2.png and b/public/images/emoji/facebook_messenger/man_singer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/3.png b/public/images/emoji/facebook_messenger/man_singer/3.png
index 516eb98afb..3c88ddc907 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/3.png and b/public/images/emoji/facebook_messenger/man_singer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/4.png b/public/images/emoji/facebook_messenger/man_singer/4.png
index 89326187fb..7af903db09 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/4.png and b/public/images/emoji/facebook_messenger/man_singer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/5.png b/public/images/emoji/facebook_messenger/man_singer/5.png
index b899d241e7..7de133ed79 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/5.png and b/public/images/emoji/facebook_messenger/man_singer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/6.png b/public/images/emoji/facebook_messenger/man_singer/6.png
index a13d0b8c92..e3624cba7e 100644
Binary files a/public/images/emoji/facebook_messenger/man_singer/6.png and b/public/images/emoji/facebook_messenger/man_singer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student.png b/public/images/emoji/facebook_messenger/man_student.png
index 897c8af412..6f424bf572 100644
Binary files a/public/images/emoji/facebook_messenger/man_student.png and b/public/images/emoji/facebook_messenger/man_student.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/2.png b/public/images/emoji/facebook_messenger/man_student/2.png
index 7acaf3e280..6110707218 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/2.png and b/public/images/emoji/facebook_messenger/man_student/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/3.png b/public/images/emoji/facebook_messenger/man_student/3.png
index c24cb60730..e64638d38e 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/3.png and b/public/images/emoji/facebook_messenger/man_student/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/4.png b/public/images/emoji/facebook_messenger/man_student/4.png
index f0789f0b59..7092eb890d 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/4.png and b/public/images/emoji/facebook_messenger/man_student/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/5.png b/public/images/emoji/facebook_messenger/man_student/5.png
index 8471ef972a..31356b4916 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/5.png and b/public/images/emoji/facebook_messenger/man_student/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/6.png b/public/images/emoji/facebook_messenger/man_student/6.png
index 985678e804..509da6e840 100644
Binary files a/public/images/emoji/facebook_messenger/man_student/6.png and b/public/images/emoji/facebook_messenger/man_student/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher.png b/public/images/emoji/facebook_messenger/man_teacher.png
index b85d905466..86ce6c107d 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher.png and b/public/images/emoji/facebook_messenger/man_teacher.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/2.png b/public/images/emoji/facebook_messenger/man_teacher/2.png
index e7cdd5b69a..c8da3fcb8b 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/2.png and b/public/images/emoji/facebook_messenger/man_teacher/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/3.png b/public/images/emoji/facebook_messenger/man_teacher/3.png
index 00f91851cb..5a2ccc4e13 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/3.png and b/public/images/emoji/facebook_messenger/man_teacher/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/4.png b/public/images/emoji/facebook_messenger/man_teacher/4.png
index a82ddfb140..61f131f683 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/4.png and b/public/images/emoji/facebook_messenger/man_teacher/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/5.png b/public/images/emoji/facebook_messenger/man_teacher/5.png
index d4140998d3..64f1f87d55 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/5.png and b/public/images/emoji/facebook_messenger/man_teacher/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/6.png b/public/images/emoji/facebook_messenger/man_teacher/6.png
index ed08c11d2b..1ef09aab80 100644
Binary files a/public/images/emoji/facebook_messenger/man_teacher/6.png and b/public/images/emoji/facebook_messenger/man_teacher/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist.png b/public/images/emoji/facebook_messenger/man_technologist.png
index 4d8208bbe1..f20d3a50f6 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist.png and b/public/images/emoji/facebook_messenger/man_technologist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/2.png b/public/images/emoji/facebook_messenger/man_technologist/2.png
index aed10e4c38..ecc01084d6 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/2.png and b/public/images/emoji/facebook_messenger/man_technologist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/3.png b/public/images/emoji/facebook_messenger/man_technologist/3.png
index 21b1243f7d..76f0e40961 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/3.png and b/public/images/emoji/facebook_messenger/man_technologist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/4.png b/public/images/emoji/facebook_messenger/man_technologist/4.png
index f8d2f531dc..def0175bbd 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/4.png and b/public/images/emoji/facebook_messenger/man_technologist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/5.png b/public/images/emoji/facebook_messenger/man_technologist/5.png
index 27ea100413..a19e3af21e 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/5.png and b/public/images/emoji/facebook_messenger/man_technologist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/6.png b/public/images/emoji/facebook_messenger/man_technologist/6.png
index e6c6bccfff..604b73f669 100644
Binary files a/public/images/emoji/facebook_messenger/man_technologist/6.png and b/public/images/emoji/facebook_messenger/man_technologist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png
index 12733f7310..76cd44df79 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png
index 5be2053690..f56c9005fb 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png
index d6fe373e5d..c72344831c 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png
index ed8e0fa95f..309865e7cf 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png
index 37ebcedaf7..b45996b4a0 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png
index 0fd02d1709..a9b2226c27 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban.png b/public/images/emoji/facebook_messenger/man_with_turban.png
index 658845d182..39194b7c4f 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban.png and b/public/images/emoji/facebook_messenger/man_with_turban.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/2.png b/public/images/emoji/facebook_messenger/man_with_turban/2.png
index fd2a2c17e3..67d214dd15 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/2.png and b/public/images/emoji/facebook_messenger/man_with_turban/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/3.png b/public/images/emoji/facebook_messenger/man_with_turban/3.png
index 0fd074ec85..02de1f9adc 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/3.png and b/public/images/emoji/facebook_messenger/man_with_turban/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/4.png b/public/images/emoji/facebook_messenger/man_with_turban/4.png
index 88ef725c32..26a8f043aa 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/4.png and b/public/images/emoji/facebook_messenger/man_with_turban/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/5.png b/public/images/emoji/facebook_messenger/man_with_turban/5.png
index 924ab084d2..ae0b480675 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/5.png and b/public/images/emoji/facebook_messenger/man_with_turban/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/6.png b/public/images/emoji/facebook_messenger/man_with_turban/6.png
index fa49843cb6..c5dce37c2e 100644
Binary files a/public/images/emoji/facebook_messenger/man_with_turban/6.png and b/public/images/emoji/facebook_messenger/man_with_turban/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mans_shoe.png b/public/images/emoji/facebook_messenger/mans_shoe.png
index e9157aa9a5..82f9de4e31 100644
Binary files a/public/images/emoji/facebook_messenger/mans_shoe.png and b/public/images/emoji/facebook_messenger/mans_shoe.png differ
diff --git a/public/images/emoji/facebook_messenger/mantelpiece_clock.png b/public/images/emoji/facebook_messenger/mantelpiece_clock.png
index 62a0e89459..78008e45b6 100644
Binary files a/public/images/emoji/facebook_messenger/mantelpiece_clock.png and b/public/images/emoji/facebook_messenger/mantelpiece_clock.png differ
diff --git a/public/images/emoji/facebook_messenger/map.png b/public/images/emoji/facebook_messenger/map.png
index 8c102ea49d..f387ba2fd7 100644
Binary files a/public/images/emoji/facebook_messenger/map.png and b/public/images/emoji/facebook_messenger/map.png differ
diff --git a/public/images/emoji/facebook_messenger/maple_leaf.png b/public/images/emoji/facebook_messenger/maple_leaf.png
index d9ec405655..eeced53f25 100644
Binary files a/public/images/emoji/facebook_messenger/maple_leaf.png and b/public/images/emoji/facebook_messenger/maple_leaf.png differ
diff --git a/public/images/emoji/facebook_messenger/marshall_islands.png b/public/images/emoji/facebook_messenger/marshall_islands.png
index 35a77d3ec6..acd27f3eba 100644
Binary files a/public/images/emoji/facebook_messenger/marshall_islands.png and b/public/images/emoji/facebook_messenger/marshall_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/martial_arts_uniform.png b/public/images/emoji/facebook_messenger/martial_arts_uniform.png
index 50e9d87cd5..04258b2bb5 100644
Binary files a/public/images/emoji/facebook_messenger/martial_arts_uniform.png and b/public/images/emoji/facebook_messenger/martial_arts_uniform.png differ
diff --git a/public/images/emoji/facebook_messenger/martinique.png b/public/images/emoji/facebook_messenger/martinique.png
index 20265c357a..05e5005493 100644
Binary files a/public/images/emoji/facebook_messenger/martinique.png and b/public/images/emoji/facebook_messenger/martinique.png differ
diff --git a/public/images/emoji/facebook_messenger/mask.png b/public/images/emoji/facebook_messenger/mask.png
index 3fb3c370ed..56eefc6684 100644
Binary files a/public/images/emoji/facebook_messenger/mask.png and b/public/images/emoji/facebook_messenger/mask.png differ
diff --git a/public/images/emoji/facebook_messenger/massage.png b/public/images/emoji/facebook_messenger/massage.png
index 963acc0b3b..7bd3bc2694 100644
Binary files a/public/images/emoji/facebook_messenger/massage.png and b/public/images/emoji/facebook_messenger/massage.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/2.png b/public/images/emoji/facebook_messenger/massage/2.png
index 908482b905..78c034b61e 100644
Binary files a/public/images/emoji/facebook_messenger/massage/2.png and b/public/images/emoji/facebook_messenger/massage/2.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/3.png b/public/images/emoji/facebook_messenger/massage/3.png
index c6349e9146..58f96b7d53 100644
Binary files a/public/images/emoji/facebook_messenger/massage/3.png and b/public/images/emoji/facebook_messenger/massage/3.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/4.png b/public/images/emoji/facebook_messenger/massage/4.png
index 83899fc193..6db57cc07e 100644
Binary files a/public/images/emoji/facebook_messenger/massage/4.png and b/public/images/emoji/facebook_messenger/massage/4.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/5.png b/public/images/emoji/facebook_messenger/massage/5.png
index 8645741a67..196fe018f4 100644
Binary files a/public/images/emoji/facebook_messenger/massage/5.png and b/public/images/emoji/facebook_messenger/massage/5.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/6.png b/public/images/emoji/facebook_messenger/massage/6.png
index 6ebddf72f9..c2872a961b 100644
Binary files a/public/images/emoji/facebook_messenger/massage/6.png and b/public/images/emoji/facebook_messenger/massage/6.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man.png b/public/images/emoji/facebook_messenger/massage_man.png
index b2d809725e..1c94d6a3fe 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man.png and b/public/images/emoji/facebook_messenger/massage_man.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/2.png b/public/images/emoji/facebook_messenger/massage_man/2.png
index 892e43bd6a..78fa85eef1 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/2.png and b/public/images/emoji/facebook_messenger/massage_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/3.png b/public/images/emoji/facebook_messenger/massage_man/3.png
index e9668ae1d8..eb58f3dbae 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/3.png and b/public/images/emoji/facebook_messenger/massage_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/4.png b/public/images/emoji/facebook_messenger/massage_man/4.png
index f891cc952f..786b19d92e 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/4.png and b/public/images/emoji/facebook_messenger/massage_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/5.png b/public/images/emoji/facebook_messenger/massage_man/5.png
index 8295da5a87..bad5a489ae 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/5.png and b/public/images/emoji/facebook_messenger/massage_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/6.png b/public/images/emoji/facebook_messenger/massage_man/6.png
index 549596cc7c..1f10070bd6 100644
Binary files a/public/images/emoji/facebook_messenger/massage_man/6.png and b/public/images/emoji/facebook_messenger/massage_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman.png b/public/images/emoji/facebook_messenger/massage_woman.png
index 963acc0b3b..7bd3bc2694 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman.png and b/public/images/emoji/facebook_messenger/massage_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/2.png b/public/images/emoji/facebook_messenger/massage_woman/2.png
index 908482b905..78c034b61e 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/2.png and b/public/images/emoji/facebook_messenger/massage_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/3.png b/public/images/emoji/facebook_messenger/massage_woman/3.png
index c6349e9146..58f96b7d53 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/3.png and b/public/images/emoji/facebook_messenger/massage_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/4.png b/public/images/emoji/facebook_messenger/massage_woman/4.png
index 83899fc193..6db57cc07e 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/4.png and b/public/images/emoji/facebook_messenger/massage_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/5.png b/public/images/emoji/facebook_messenger/massage_woman/5.png
index 8645741a67..196fe018f4 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/5.png and b/public/images/emoji/facebook_messenger/massage_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/6.png b/public/images/emoji/facebook_messenger/massage_woman/6.png
index 6ebddf72f9..c2872a961b 100644
Binary files a/public/images/emoji/facebook_messenger/massage_woman/6.png and b/public/images/emoji/facebook_messenger/massage_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mauritania.png b/public/images/emoji/facebook_messenger/mauritania.png
index 23fa26e4ce..3c10439149 100644
Binary files a/public/images/emoji/facebook_messenger/mauritania.png and b/public/images/emoji/facebook_messenger/mauritania.png differ
diff --git a/public/images/emoji/facebook_messenger/mauritius.png b/public/images/emoji/facebook_messenger/mauritius.png
index 846272e367..048d235748 100644
Binary files a/public/images/emoji/facebook_messenger/mauritius.png and b/public/images/emoji/facebook_messenger/mauritius.png differ
diff --git a/public/images/emoji/facebook_messenger/mayotte.png b/public/images/emoji/facebook_messenger/mayotte.png
index 43a7879d24..d719a9d2d3 100644
Binary files a/public/images/emoji/facebook_messenger/mayotte.png and b/public/images/emoji/facebook_messenger/mayotte.png differ
diff --git a/public/images/emoji/facebook_messenger/meat_on_bone.png b/public/images/emoji/facebook_messenger/meat_on_bone.png
index 545091e6d7..4d06e486e9 100644
Binary files a/public/images/emoji/facebook_messenger/meat_on_bone.png and b/public/images/emoji/facebook_messenger/meat_on_bone.png differ
diff --git a/public/images/emoji/facebook_messenger/medal.png b/public/images/emoji/facebook_messenger/medal.png
index 57fbc8512f..2f481eb281 100644
Binary files a/public/images/emoji/facebook_messenger/medal.png and b/public/images/emoji/facebook_messenger/medal.png differ
diff --git a/public/images/emoji/facebook_messenger/medal_military.png b/public/images/emoji/facebook_messenger/medal_military.png
index 857488da67..8d80e8b4c6 100644
Binary files a/public/images/emoji/facebook_messenger/medal_military.png and b/public/images/emoji/facebook_messenger/medal_military.png differ
diff --git a/public/images/emoji/facebook_messenger/medal_sports.png b/public/images/emoji/facebook_messenger/medal_sports.png
index 57fbc8512f..2f481eb281 100644
Binary files a/public/images/emoji/facebook_messenger/medal_sports.png and b/public/images/emoji/facebook_messenger/medal_sports.png differ
diff --git a/public/images/emoji/facebook_messenger/mega.png b/public/images/emoji/facebook_messenger/mega.png
index 0b8649ee37..7e2d03af65 100644
Binary files a/public/images/emoji/facebook_messenger/mega.png and b/public/images/emoji/facebook_messenger/mega.png differ
diff --git a/public/images/emoji/facebook_messenger/melon.png b/public/images/emoji/facebook_messenger/melon.png
index 474cf5ae56..bcc3734221 100644
Binary files a/public/images/emoji/facebook_messenger/melon.png and b/public/images/emoji/facebook_messenger/melon.png differ
diff --git a/public/images/emoji/facebook_messenger/memo.png b/public/images/emoji/facebook_messenger/memo.png
index 8a9a0a4d8c..57d00e040e 100644
Binary files a/public/images/emoji/facebook_messenger/memo.png and b/public/images/emoji/facebook_messenger/memo.png differ
diff --git a/public/images/emoji/facebook_messenger/men_wrestling.png b/public/images/emoji/facebook_messenger/men_wrestling.png
index ab63e2f4f0..1e179aa03a 100644
Binary files a/public/images/emoji/facebook_messenger/men_wrestling.png and b/public/images/emoji/facebook_messenger/men_wrestling.png differ
diff --git a/public/images/emoji/facebook_messenger/menorah.png b/public/images/emoji/facebook_messenger/menorah.png
index fe2a128793..292658d622 100644
Binary files a/public/images/emoji/facebook_messenger/menorah.png and b/public/images/emoji/facebook_messenger/menorah.png differ
diff --git a/public/images/emoji/facebook_messenger/mens.png b/public/images/emoji/facebook_messenger/mens.png
index 4cddf230fb..306dc4c6e1 100644
Binary files a/public/images/emoji/facebook_messenger/mens.png and b/public/images/emoji/facebook_messenger/mens.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson.png b/public/images/emoji/facebook_messenger/merperson.png
index ee1b999e0d..a2b11f2232 100644
Binary files a/public/images/emoji/facebook_messenger/merperson.png and b/public/images/emoji/facebook_messenger/merperson.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/2.png b/public/images/emoji/facebook_messenger/merperson/2.png
index b97fbf42e3..a28740baf0 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/2.png and b/public/images/emoji/facebook_messenger/merperson/2.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/3.png b/public/images/emoji/facebook_messenger/merperson/3.png
index 9079f60b81..a5cdf4705f 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/3.png and b/public/images/emoji/facebook_messenger/merperson/3.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/4.png b/public/images/emoji/facebook_messenger/merperson/4.png
index decc0b5892..74973225cd 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/4.png and b/public/images/emoji/facebook_messenger/merperson/4.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/5.png b/public/images/emoji/facebook_messenger/merperson/5.png
index e3e3e89cb1..3ae662eefa 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/5.png and b/public/images/emoji/facebook_messenger/merperson/5.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/6.png b/public/images/emoji/facebook_messenger/merperson/6.png
index 5a5f36684e..16256cdfe8 100644
Binary files a/public/images/emoji/facebook_messenger/merperson/6.png and b/public/images/emoji/facebook_messenger/merperson/6.png differ
diff --git a/public/images/emoji/facebook_messenger/metal.png b/public/images/emoji/facebook_messenger/metal.png
index 72d987aadc..42ebf7a6e4 100644
Binary files a/public/images/emoji/facebook_messenger/metal.png and b/public/images/emoji/facebook_messenger/metal.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/2.png b/public/images/emoji/facebook_messenger/metal/2.png
index 8d87aab277..f5b6ff33ee 100644
Binary files a/public/images/emoji/facebook_messenger/metal/2.png and b/public/images/emoji/facebook_messenger/metal/2.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/3.png b/public/images/emoji/facebook_messenger/metal/3.png
index 39a19cd401..a4df883cbd 100644
Binary files a/public/images/emoji/facebook_messenger/metal/3.png and b/public/images/emoji/facebook_messenger/metal/3.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/4.png b/public/images/emoji/facebook_messenger/metal/4.png
index 73bedb2c02..0b59f79fdd 100644
Binary files a/public/images/emoji/facebook_messenger/metal/4.png and b/public/images/emoji/facebook_messenger/metal/4.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/5.png b/public/images/emoji/facebook_messenger/metal/5.png
index 36413ab8cf..5a6b7f1757 100644
Binary files a/public/images/emoji/facebook_messenger/metal/5.png and b/public/images/emoji/facebook_messenger/metal/5.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/6.png b/public/images/emoji/facebook_messenger/metal/6.png
index 1cb1b661b9..e700d4afb2 100644
Binary files a/public/images/emoji/facebook_messenger/metal/6.png and b/public/images/emoji/facebook_messenger/metal/6.png differ
diff --git a/public/images/emoji/facebook_messenger/metro.png b/public/images/emoji/facebook_messenger/metro.png
index b4b77dd6ba..b8b8874e58 100644
Binary files a/public/images/emoji/facebook_messenger/metro.png and b/public/images/emoji/facebook_messenger/metro.png differ
diff --git a/public/images/emoji/facebook_messenger/mexico.png b/public/images/emoji/facebook_messenger/mexico.png
index 0bed6bc464..79c41a695c 100644
Binary files a/public/images/emoji/facebook_messenger/mexico.png and b/public/images/emoji/facebook_messenger/mexico.png differ
diff --git a/public/images/emoji/facebook_messenger/micronesia.png b/public/images/emoji/facebook_messenger/micronesia.png
index 549d03fdc7..21c6152900 100644
Binary files a/public/images/emoji/facebook_messenger/micronesia.png and b/public/images/emoji/facebook_messenger/micronesia.png differ
diff --git a/public/images/emoji/facebook_messenger/microphone.png b/public/images/emoji/facebook_messenger/microphone.png
index 2b72052cc9..7ebc72a14c 100644
Binary files a/public/images/emoji/facebook_messenger/microphone.png and b/public/images/emoji/facebook_messenger/microphone.png differ
diff --git a/public/images/emoji/facebook_messenger/microphone2.png b/public/images/emoji/facebook_messenger/microphone2.png
index d10b32281f..ed24a78f7f 100644
Binary files a/public/images/emoji/facebook_messenger/microphone2.png and b/public/images/emoji/facebook_messenger/microphone2.png differ
diff --git a/public/images/emoji/facebook_messenger/microscope.png b/public/images/emoji/facebook_messenger/microscope.png
index 9881d1fa04..6a4530f623 100644
Binary files a/public/images/emoji/facebook_messenger/microscope.png and b/public/images/emoji/facebook_messenger/microscope.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger.png b/public/images/emoji/facebook_messenger/middle_finger.png
index 8e7fce2f49..7f227d2d23 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger.png and b/public/images/emoji/facebook_messenger/middle_finger.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/2.png b/public/images/emoji/facebook_messenger/middle_finger/2.png
index 992338bb2b..14c75b484f 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/2.png and b/public/images/emoji/facebook_messenger/middle_finger/2.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/3.png b/public/images/emoji/facebook_messenger/middle_finger/3.png
index aadc06129f..e403a196a5 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/3.png and b/public/images/emoji/facebook_messenger/middle_finger/3.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/4.png b/public/images/emoji/facebook_messenger/middle_finger/4.png
index 8ad10be116..d8507a7f62 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/4.png and b/public/images/emoji/facebook_messenger/middle_finger/4.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/5.png b/public/images/emoji/facebook_messenger/middle_finger/5.png
index 695c4a6cb9..e67c93cb2a 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/5.png and b/public/images/emoji/facebook_messenger/middle_finger/5.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/6.png b/public/images/emoji/facebook_messenger/middle_finger/6.png
index 3457e01312..c3bd0d882f 100644
Binary files a/public/images/emoji/facebook_messenger/middle_finger/6.png and b/public/images/emoji/facebook_messenger/middle_finger/6.png differ
diff --git a/public/images/emoji/facebook_messenger/military_medal.png b/public/images/emoji/facebook_messenger/military_medal.png
index 857488da67..8d80e8b4c6 100644
Binary files a/public/images/emoji/facebook_messenger/military_medal.png and b/public/images/emoji/facebook_messenger/military_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/milk_glass.png b/public/images/emoji/facebook_messenger/milk_glass.png
index d2de8252bb..45c736ee87 100644
Binary files a/public/images/emoji/facebook_messenger/milk_glass.png and b/public/images/emoji/facebook_messenger/milk_glass.png differ
diff --git a/public/images/emoji/facebook_messenger/milky_way.png b/public/images/emoji/facebook_messenger/milky_way.png
index e3073f128a..3183e2b6b7 100644
Binary files a/public/images/emoji/facebook_messenger/milky_way.png and b/public/images/emoji/facebook_messenger/milky_way.png differ
diff --git a/public/images/emoji/facebook_messenger/minibus.png b/public/images/emoji/facebook_messenger/minibus.png
index aee0cb3011..bed2cfab32 100644
Binary files a/public/images/emoji/facebook_messenger/minibus.png and b/public/images/emoji/facebook_messenger/minibus.png differ
diff --git a/public/images/emoji/facebook_messenger/minidisc.png b/public/images/emoji/facebook_messenger/minidisc.png
index 0c8fa7297a..6ef24a0c5d 100644
Binary files a/public/images/emoji/facebook_messenger/minidisc.png and b/public/images/emoji/facebook_messenger/minidisc.png differ
diff --git a/public/images/emoji/facebook_messenger/mobile_phone_off.png b/public/images/emoji/facebook_messenger/mobile_phone_off.png
index 21e170f6fd..0cba945b11 100644
Binary files a/public/images/emoji/facebook_messenger/mobile_phone_off.png and b/public/images/emoji/facebook_messenger/mobile_phone_off.png differ
diff --git a/public/images/emoji/facebook_messenger/moldova.png b/public/images/emoji/facebook_messenger/moldova.png
index d4463a0147..13d3d63680 100644
Binary files a/public/images/emoji/facebook_messenger/moldova.png and b/public/images/emoji/facebook_messenger/moldova.png differ
diff --git a/public/images/emoji/facebook_messenger/monaco.png b/public/images/emoji/facebook_messenger/monaco.png
index 17833f535a..3d30b55f81 100644
Binary files a/public/images/emoji/facebook_messenger/monaco.png and b/public/images/emoji/facebook_messenger/monaco.png differ
diff --git a/public/images/emoji/facebook_messenger/money_mouth.png b/public/images/emoji/facebook_messenger/money_mouth.png
index cd2459518e..4ef96ba5f7 100644
Binary files a/public/images/emoji/facebook_messenger/money_mouth.png and b/public/images/emoji/facebook_messenger/money_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/money_mouth_face.png b/public/images/emoji/facebook_messenger/money_mouth_face.png
index cd2459518e..4ef96ba5f7 100644
Binary files a/public/images/emoji/facebook_messenger/money_mouth_face.png and b/public/images/emoji/facebook_messenger/money_mouth_face.png differ
diff --git a/public/images/emoji/facebook_messenger/money_with_wings.png b/public/images/emoji/facebook_messenger/money_with_wings.png
index 6b3ed315ad..4f500ee513 100644
Binary files a/public/images/emoji/facebook_messenger/money_with_wings.png and b/public/images/emoji/facebook_messenger/money_with_wings.png differ
diff --git a/public/images/emoji/facebook_messenger/moneybag.png b/public/images/emoji/facebook_messenger/moneybag.png
index abd97b8904..0b80bcf56a 100644
Binary files a/public/images/emoji/facebook_messenger/moneybag.png and b/public/images/emoji/facebook_messenger/moneybag.png differ
diff --git a/public/images/emoji/facebook_messenger/mongolia.png b/public/images/emoji/facebook_messenger/mongolia.png
index cf97894508..19672874f3 100644
Binary files a/public/images/emoji/facebook_messenger/mongolia.png and b/public/images/emoji/facebook_messenger/mongolia.png differ
diff --git a/public/images/emoji/facebook_messenger/monkey.png b/public/images/emoji/facebook_messenger/monkey.png
index c47f55ca63..e6e32df3c2 100644
Binary files a/public/images/emoji/facebook_messenger/monkey.png and b/public/images/emoji/facebook_messenger/monkey.png differ
diff --git a/public/images/emoji/facebook_messenger/monkey_face.png b/public/images/emoji/facebook_messenger/monkey_face.png
index 590a3057c9..a1cc715ede 100644
Binary files a/public/images/emoji/facebook_messenger/monkey_face.png and b/public/images/emoji/facebook_messenger/monkey_face.png differ
diff --git a/public/images/emoji/facebook_messenger/monorail.png b/public/images/emoji/facebook_messenger/monorail.png
index 2dcf74036c..c746ad48f7 100644
Binary files a/public/images/emoji/facebook_messenger/monorail.png and b/public/images/emoji/facebook_messenger/monorail.png differ
diff --git a/public/images/emoji/facebook_messenger/montenegro.png b/public/images/emoji/facebook_messenger/montenegro.png
index 7cbd07cef3..d341052481 100644
Binary files a/public/images/emoji/facebook_messenger/montenegro.png and b/public/images/emoji/facebook_messenger/montenegro.png differ
diff --git a/public/images/emoji/facebook_messenger/montserrat.png b/public/images/emoji/facebook_messenger/montserrat.png
index 28712de519..e93e3f1ad5 100644
Binary files a/public/images/emoji/facebook_messenger/montserrat.png and b/public/images/emoji/facebook_messenger/montserrat.png differ
diff --git a/public/images/emoji/facebook_messenger/moon.png b/public/images/emoji/facebook_messenger/moon.png
index c20fb89b18..6c643e99fb 100644
Binary files a/public/images/emoji/facebook_messenger/moon.png and b/public/images/emoji/facebook_messenger/moon.png differ
diff --git a/public/images/emoji/facebook_messenger/morocco.png b/public/images/emoji/facebook_messenger/morocco.png
index 7f16d0a66d..deb941c352 100644
Binary files a/public/images/emoji/facebook_messenger/morocco.png and b/public/images/emoji/facebook_messenger/morocco.png differ
diff --git a/public/images/emoji/facebook_messenger/mortar_board.png b/public/images/emoji/facebook_messenger/mortar_board.png
index d06f52a438..682dea333c 100644
Binary files a/public/images/emoji/facebook_messenger/mortar_board.png and b/public/images/emoji/facebook_messenger/mortar_board.png differ
diff --git a/public/images/emoji/facebook_messenger/mosque.png b/public/images/emoji/facebook_messenger/mosque.png
index b0a68fffb5..eb379aabfc 100644
Binary files a/public/images/emoji/facebook_messenger/mosque.png and b/public/images/emoji/facebook_messenger/mosque.png differ
diff --git a/public/images/emoji/facebook_messenger/motor_boat.png b/public/images/emoji/facebook_messenger/motor_boat.png
index 3eba365766..d17e9287e5 100644
Binary files a/public/images/emoji/facebook_messenger/motor_boat.png and b/public/images/emoji/facebook_messenger/motor_boat.png differ
diff --git a/public/images/emoji/facebook_messenger/motor_scooter.png b/public/images/emoji/facebook_messenger/motor_scooter.png
index b9659e99a3..bcf8f5edf4 100644
Binary files a/public/images/emoji/facebook_messenger/motor_scooter.png and b/public/images/emoji/facebook_messenger/motor_scooter.png differ
diff --git a/public/images/emoji/facebook_messenger/motorboat.png b/public/images/emoji/facebook_messenger/motorboat.png
index 3eba365766..d17e9287e5 100644
Binary files a/public/images/emoji/facebook_messenger/motorboat.png and b/public/images/emoji/facebook_messenger/motorboat.png differ
diff --git a/public/images/emoji/facebook_messenger/motorcycle.png b/public/images/emoji/facebook_messenger/motorcycle.png
index ba7fb373ba..a23e481708 100644
Binary files a/public/images/emoji/facebook_messenger/motorcycle.png and b/public/images/emoji/facebook_messenger/motorcycle.png differ
diff --git a/public/images/emoji/facebook_messenger/motorway.png b/public/images/emoji/facebook_messenger/motorway.png
index 2d5622664b..9519c6cc3b 100644
Binary files a/public/images/emoji/facebook_messenger/motorway.png and b/public/images/emoji/facebook_messenger/motorway.png differ
diff --git a/public/images/emoji/facebook_messenger/mount_fuji.png b/public/images/emoji/facebook_messenger/mount_fuji.png
index e987911d26..2c07a998e7 100644
Binary files a/public/images/emoji/facebook_messenger/mount_fuji.png and b/public/images/emoji/facebook_messenger/mount_fuji.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain.png b/public/images/emoji/facebook_messenger/mountain.png
index 6b545f0058..d5fd7c1c0f 100644
Binary files a/public/images/emoji/facebook_messenger/mountain.png and b/public/images/emoji/facebook_messenger/mountain.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist.png b/public/images/emoji/facebook_messenger/mountain_bicyclist.png
index 31e00446a8..9f8962cf5a 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png
index 19ecb982e3..23530f1262 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png
index 0c96a1744f..8751f40de5 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png
index a407ca499f..b976c8c7f2 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png
index 1d87023abe..962102cd96 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png
index 74eafbd22e..e20d86857e 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png and b/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man.png b/public/images/emoji/facebook_messenger/mountain_biking_man.png
index 31e00446a8..9f8962cf5a 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man.png and b/public/images/emoji/facebook_messenger/mountain_biking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/2.png b/public/images/emoji/facebook_messenger/mountain_biking_man/2.png
index 19ecb982e3..23530f1262 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/2.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/3.png b/public/images/emoji/facebook_messenger/mountain_biking_man/3.png
index 0c96a1744f..8751f40de5 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/3.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/4.png b/public/images/emoji/facebook_messenger/mountain_biking_man/4.png
index a407ca499f..b976c8c7f2 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/4.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/5.png b/public/images/emoji/facebook_messenger/mountain_biking_man/5.png
index 1d87023abe..962102cd96 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/5.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/6.png b/public/images/emoji/facebook_messenger/mountain_biking_man/6.png
index 74eafbd22e..e20d86857e 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_man/6.png and b/public/images/emoji/facebook_messenger/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman.png b/public/images/emoji/facebook_messenger/mountain_biking_woman.png
index f752e9cdf3..848ae248ab 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png
index 78e8c2577b..7ff787cb16 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png
index 2e4e5a891d..705db4d7f4 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png
index ee9fd92c8d..c4144da9fa 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png
index 6f663ca4c0..50d5ffc292 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png
index f49e7054c9..040d249711 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png and b/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_cableway.png b/public/images/emoji/facebook_messenger/mountain_cableway.png
index e242393030..05e5c2cd34 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_cableway.png and b/public/images/emoji/facebook_messenger/mountain_cableway.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_railway.png b/public/images/emoji/facebook_messenger/mountain_railway.png
index eee5c10a52..55752f0549 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_railway.png and b/public/images/emoji/facebook_messenger/mountain_railway.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_snow.png b/public/images/emoji/facebook_messenger/mountain_snow.png
index b3e246f09b..5529c620de 100644
Binary files a/public/images/emoji/facebook_messenger/mountain_snow.png and b/public/images/emoji/facebook_messenger/mountain_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/mouse.png b/public/images/emoji/facebook_messenger/mouse.png
index 8e52012ef3..b451d03334 100644
Binary files a/public/images/emoji/facebook_messenger/mouse.png and b/public/images/emoji/facebook_messenger/mouse.png differ
diff --git a/public/images/emoji/facebook_messenger/mouse2.png b/public/images/emoji/facebook_messenger/mouse2.png
index 08163d834a..92e3d7efd6 100644
Binary files a/public/images/emoji/facebook_messenger/mouse2.png and b/public/images/emoji/facebook_messenger/mouse2.png differ
diff --git a/public/images/emoji/facebook_messenger/mouse_three_button.png b/public/images/emoji/facebook_messenger/mouse_three_button.png
index 3a71c800c6..53fdef1f76 100644
Binary files a/public/images/emoji/facebook_messenger/mouse_three_button.png and b/public/images/emoji/facebook_messenger/mouse_three_button.png differ
diff --git a/public/images/emoji/facebook_messenger/movie_camera.png b/public/images/emoji/facebook_messenger/movie_camera.png
index e074b30c83..0e7c8535d2 100644
Binary files a/public/images/emoji/facebook_messenger/movie_camera.png and b/public/images/emoji/facebook_messenger/movie_camera.png differ
diff --git a/public/images/emoji/facebook_messenger/moyai.png b/public/images/emoji/facebook_messenger/moyai.png
index 454250431e..9358b9ee33 100644
Binary files a/public/images/emoji/facebook_messenger/moyai.png and b/public/images/emoji/facebook_messenger/moyai.png differ
diff --git a/public/images/emoji/facebook_messenger/mozambique.png b/public/images/emoji/facebook_messenger/mozambique.png
index 07d5cd56f0..e2fb9eb03e 100644
Binary files a/public/images/emoji/facebook_messenger/mozambique.png and b/public/images/emoji/facebook_messenger/mozambique.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus.png b/public/images/emoji/facebook_messenger/mrs_claus.png
index 1923fbd8e9..8530a11d5d 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus.png and b/public/images/emoji/facebook_messenger/mrs_claus.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/2.png b/public/images/emoji/facebook_messenger/mrs_claus/2.png
index a6e57fc30b..8d7a74743a 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/2.png and b/public/images/emoji/facebook_messenger/mrs_claus/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/3.png b/public/images/emoji/facebook_messenger/mrs_claus/3.png
index 48e8121256..0f0aac82e8 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/3.png and b/public/images/emoji/facebook_messenger/mrs_claus/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/4.png b/public/images/emoji/facebook_messenger/mrs_claus/4.png
index cdefbc9340..1c2a4a8509 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/4.png and b/public/images/emoji/facebook_messenger/mrs_claus/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/5.png b/public/images/emoji/facebook_messenger/mrs_claus/5.png
index de7de0327a..76b059691f 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/5.png and b/public/images/emoji/facebook_messenger/mrs_claus/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/6.png b/public/images/emoji/facebook_messenger/mrs_claus/6.png
index 25324ab420..a391685f6e 100644
Binary files a/public/images/emoji/facebook_messenger/mrs_claus/6.png and b/public/images/emoji/facebook_messenger/mrs_claus/6.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle.png b/public/images/emoji/facebook_messenger/muscle.png
index 756a72d513..9bbaec8da5 100644
Binary files a/public/images/emoji/facebook_messenger/muscle.png and b/public/images/emoji/facebook_messenger/muscle.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/2.png b/public/images/emoji/facebook_messenger/muscle/2.png
index 305d54c21b..ec266b8303 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/2.png and b/public/images/emoji/facebook_messenger/muscle/2.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/3.png b/public/images/emoji/facebook_messenger/muscle/3.png
index e8ebb0250a..5465ebb837 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/3.png and b/public/images/emoji/facebook_messenger/muscle/3.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/4.png b/public/images/emoji/facebook_messenger/muscle/4.png
index 83ba3d4bfd..895e4247cc 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/4.png and b/public/images/emoji/facebook_messenger/muscle/4.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/5.png b/public/images/emoji/facebook_messenger/muscle/5.png
index eb0d6edff4..2340650569 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/5.png and b/public/images/emoji/facebook_messenger/muscle/5.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/6.png b/public/images/emoji/facebook_messenger/muscle/6.png
index ddd35e7478..a11fd2afee 100644
Binary files a/public/images/emoji/facebook_messenger/muscle/6.png and b/public/images/emoji/facebook_messenger/muscle/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mushroom.png b/public/images/emoji/facebook_messenger/mushroom.png
index 03d8b063f3..bf49f207ee 100644
Binary files a/public/images/emoji/facebook_messenger/mushroom.png and b/public/images/emoji/facebook_messenger/mushroom.png differ
diff --git a/public/images/emoji/facebook_messenger/musical_keyboard.png b/public/images/emoji/facebook_messenger/musical_keyboard.png
index 8248f6d20c..68d5e55021 100644
Binary files a/public/images/emoji/facebook_messenger/musical_keyboard.png and b/public/images/emoji/facebook_messenger/musical_keyboard.png differ
diff --git a/public/images/emoji/facebook_messenger/musical_note.png b/public/images/emoji/facebook_messenger/musical_note.png
index 401fc30568..5d00c5d49a 100644
Binary files a/public/images/emoji/facebook_messenger/musical_note.png and b/public/images/emoji/facebook_messenger/musical_note.png differ
diff --git a/public/images/emoji/facebook_messenger/musical_score.png b/public/images/emoji/facebook_messenger/musical_score.png
index 1ccebe791d..a666aeee4c 100644
Binary files a/public/images/emoji/facebook_messenger/musical_score.png and b/public/images/emoji/facebook_messenger/musical_score.png differ
diff --git a/public/images/emoji/facebook_messenger/mute.png b/public/images/emoji/facebook_messenger/mute.png
index 6f1b18791a..b63a966af3 100644
Binary files a/public/images/emoji/facebook_messenger/mute.png and b/public/images/emoji/facebook_messenger/mute.png differ
diff --git a/public/images/emoji/facebook_messenger/myanmar.png b/public/images/emoji/facebook_messenger/myanmar.png
index 345829e2a3..b181354b0c 100644
Binary files a/public/images/emoji/facebook_messenger/myanmar.png and b/public/images/emoji/facebook_messenger/myanmar.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care.png b/public/images/emoji/facebook_messenger/nail_care.png
index be33983b20..3e11be1510 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care.png and b/public/images/emoji/facebook_messenger/nail_care.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/2.png b/public/images/emoji/facebook_messenger/nail_care/2.png
index 78df4c6564..a6140dad02 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/2.png and b/public/images/emoji/facebook_messenger/nail_care/2.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/3.png b/public/images/emoji/facebook_messenger/nail_care/3.png
index 146f82f51d..0a28750dd3 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/3.png and b/public/images/emoji/facebook_messenger/nail_care/3.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/4.png b/public/images/emoji/facebook_messenger/nail_care/4.png
index bcfc28f1be..e3b154e453 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/4.png and b/public/images/emoji/facebook_messenger/nail_care/4.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/5.png b/public/images/emoji/facebook_messenger/nail_care/5.png
index b4a35b6540..86ddbb635f 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/5.png and b/public/images/emoji/facebook_messenger/nail_care/5.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/6.png b/public/images/emoji/facebook_messenger/nail_care/6.png
index 923baa7cd8..32b982f60f 100644
Binary files a/public/images/emoji/facebook_messenger/nail_care/6.png and b/public/images/emoji/facebook_messenger/nail_care/6.png differ
diff --git a/public/images/emoji/facebook_messenger/name_badge.png b/public/images/emoji/facebook_messenger/name_badge.png
index 3aec1b2f8e..b6004838b0 100644
Binary files a/public/images/emoji/facebook_messenger/name_badge.png and b/public/images/emoji/facebook_messenger/name_badge.png differ
diff --git a/public/images/emoji/facebook_messenger/namibia.png b/public/images/emoji/facebook_messenger/namibia.png
index f505b371fd..f5ca04c822 100644
Binary files a/public/images/emoji/facebook_messenger/namibia.png and b/public/images/emoji/facebook_messenger/namibia.png differ
diff --git a/public/images/emoji/facebook_messenger/national_park.png b/public/images/emoji/facebook_messenger/national_park.png
index db29d2dff9..38452f9b92 100644
Binary files a/public/images/emoji/facebook_messenger/national_park.png and b/public/images/emoji/facebook_messenger/national_park.png differ
diff --git a/public/images/emoji/facebook_messenger/nauru.png b/public/images/emoji/facebook_messenger/nauru.png
index 443c1a5e93..eab0c09add 100644
Binary files a/public/images/emoji/facebook_messenger/nauru.png and b/public/images/emoji/facebook_messenger/nauru.png differ
diff --git a/public/images/emoji/facebook_messenger/nauseated_face.png b/public/images/emoji/facebook_messenger/nauseated_face.png
index 0ec48392c2..c50528789c 100644
Binary files a/public/images/emoji/facebook_messenger/nauseated_face.png and b/public/images/emoji/facebook_messenger/nauseated_face.png differ
diff --git a/public/images/emoji/facebook_messenger/necktie.png b/public/images/emoji/facebook_messenger/necktie.png
index c872774b80..3b0b644091 100644
Binary files a/public/images/emoji/facebook_messenger/necktie.png and b/public/images/emoji/facebook_messenger/necktie.png differ
diff --git a/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png b/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png
index 24a2cfa27d..7a5b77824a 100644
Binary files a/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png and b/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/nepal.png b/public/images/emoji/facebook_messenger/nepal.png
index cd57822d80..52db040673 100644
Binary files a/public/images/emoji/facebook_messenger/nepal.png and b/public/images/emoji/facebook_messenger/nepal.png differ
diff --git a/public/images/emoji/facebook_messenger/nerd.png b/public/images/emoji/facebook_messenger/nerd.png
index b844baf25b..2c83c27732 100644
Binary files a/public/images/emoji/facebook_messenger/nerd.png and b/public/images/emoji/facebook_messenger/nerd.png differ
diff --git a/public/images/emoji/facebook_messenger/nerd_face.png b/public/images/emoji/facebook_messenger/nerd_face.png
index b844baf25b..2c83c27732 100644
Binary files a/public/images/emoji/facebook_messenger/nerd_face.png and b/public/images/emoji/facebook_messenger/nerd_face.png differ
diff --git a/public/images/emoji/facebook_messenger/netherlands.png b/public/images/emoji/facebook_messenger/netherlands.png
index b01d79e5ee..d939e8d0ab 100644
Binary files a/public/images/emoji/facebook_messenger/netherlands.png and b/public/images/emoji/facebook_messenger/netherlands.png differ
diff --git a/public/images/emoji/facebook_messenger/neutral_face.png b/public/images/emoji/facebook_messenger/neutral_face.png
index e617f1227a..0272013bb9 100644
Binary files a/public/images/emoji/facebook_messenger/neutral_face.png and b/public/images/emoji/facebook_messenger/neutral_face.png differ
diff --git a/public/images/emoji/facebook_messenger/new.png b/public/images/emoji/facebook_messenger/new.png
index 3def1bf771..399ac34b5b 100644
Binary files a/public/images/emoji/facebook_messenger/new.png and b/public/images/emoji/facebook_messenger/new.png differ
diff --git a/public/images/emoji/facebook_messenger/new_caledonia.png b/public/images/emoji/facebook_messenger/new_caledonia.png
index 45914c48c7..95db4553b7 100644
Binary files a/public/images/emoji/facebook_messenger/new_caledonia.png and b/public/images/emoji/facebook_messenger/new_caledonia.png differ
diff --git a/public/images/emoji/facebook_messenger/new_moon.png b/public/images/emoji/facebook_messenger/new_moon.png
index c20fb89b18..6c643e99fb 100644
Binary files a/public/images/emoji/facebook_messenger/new_moon.png and b/public/images/emoji/facebook_messenger/new_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/new_moon_with_face.png b/public/images/emoji/facebook_messenger/new_moon_with_face.png
index 70599fc0db..a73dd1035d 100644
Binary files a/public/images/emoji/facebook_messenger/new_moon_with_face.png and b/public/images/emoji/facebook_messenger/new_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/new_zealand.png b/public/images/emoji/facebook_messenger/new_zealand.png
index 9d86ff873c..6e5d8b040e 100644
Binary files a/public/images/emoji/facebook_messenger/new_zealand.png and b/public/images/emoji/facebook_messenger/new_zealand.png differ
diff --git a/public/images/emoji/facebook_messenger/newspaper.png b/public/images/emoji/facebook_messenger/newspaper.png
index f0dd5da17e..0f17e09c37 100644
Binary files a/public/images/emoji/facebook_messenger/newspaper.png and b/public/images/emoji/facebook_messenger/newspaper.png differ
diff --git a/public/images/emoji/facebook_messenger/newspaper2.png b/public/images/emoji/facebook_messenger/newspaper2.png
index 052dcce75f..785c9d1767 100644
Binary files a/public/images/emoji/facebook_messenger/newspaper2.png and b/public/images/emoji/facebook_messenger/newspaper2.png differ
diff --git a/public/images/emoji/facebook_messenger/newspaper_roll.png b/public/images/emoji/facebook_messenger/newspaper_roll.png
index 052dcce75f..785c9d1767 100644
Binary files a/public/images/emoji/facebook_messenger/newspaper_roll.png and b/public/images/emoji/facebook_messenger/newspaper_roll.png differ
diff --git a/public/images/emoji/facebook_messenger/next_track.png b/public/images/emoji/facebook_messenger/next_track.png
index 13953da5d7..73c5fae8b8 100644
Binary files a/public/images/emoji/facebook_messenger/next_track.png and b/public/images/emoji/facebook_messenger/next_track.png differ
diff --git a/public/images/emoji/facebook_messenger/next_track_button.png b/public/images/emoji/facebook_messenger/next_track_button.png
index 13953da5d7..73c5fae8b8 100644
Binary files a/public/images/emoji/facebook_messenger/next_track_button.png and b/public/images/emoji/facebook_messenger/next_track_button.png differ
diff --git a/public/images/emoji/facebook_messenger/ng.png b/public/images/emoji/facebook_messenger/ng.png
index fbf8bf7d8e..77d4f0bc5d 100644
Binary files a/public/images/emoji/facebook_messenger/ng.png and b/public/images/emoji/facebook_messenger/ng.png differ
diff --git a/public/images/emoji/facebook_messenger/nicaragua.png b/public/images/emoji/facebook_messenger/nicaragua.png
index e405151e2d..f173f6e56f 100644
Binary files a/public/images/emoji/facebook_messenger/nicaragua.png and b/public/images/emoji/facebook_messenger/nicaragua.png differ
diff --git a/public/images/emoji/facebook_messenger/niger.png b/public/images/emoji/facebook_messenger/niger.png
index fb6c4a4d37..7a63027982 100644
Binary files a/public/images/emoji/facebook_messenger/niger.png and b/public/images/emoji/facebook_messenger/niger.png differ
diff --git a/public/images/emoji/facebook_messenger/nigeria.png b/public/images/emoji/facebook_messenger/nigeria.png
index 23c9d9a762..fef6a35192 100644
Binary files a/public/images/emoji/facebook_messenger/nigeria.png and b/public/images/emoji/facebook_messenger/nigeria.png differ
diff --git a/public/images/emoji/facebook_messenger/night_with_stars.png b/public/images/emoji/facebook_messenger/night_with_stars.png
index 8e42c84cad..e4dbd0f925 100644
Binary files a/public/images/emoji/facebook_messenger/night_with_stars.png and b/public/images/emoji/facebook_messenger/night_with_stars.png differ
diff --git a/public/images/emoji/facebook_messenger/nine.png b/public/images/emoji/facebook_messenger/nine.png
index 15cd82061e..78c2b33ae4 100644
Binary files a/public/images/emoji/facebook_messenger/nine.png and b/public/images/emoji/facebook_messenger/nine.png differ
diff --git a/public/images/emoji/facebook_messenger/niue.png b/public/images/emoji/facebook_messenger/niue.png
index daaa26cc16..f60cff48dd 100644
Binary files a/public/images/emoji/facebook_messenger/niue.png and b/public/images/emoji/facebook_messenger/niue.png differ
diff --git a/public/images/emoji/facebook_messenger/no_bell.png b/public/images/emoji/facebook_messenger/no_bell.png
index 30cc5f68ba..0d7043bfe7 100644
Binary files a/public/images/emoji/facebook_messenger/no_bell.png and b/public/images/emoji/facebook_messenger/no_bell.png differ
diff --git a/public/images/emoji/facebook_messenger/no_bicycles.png b/public/images/emoji/facebook_messenger/no_bicycles.png
index 81d14e9d8b..5d365336c4 100644
Binary files a/public/images/emoji/facebook_messenger/no_bicycles.png and b/public/images/emoji/facebook_messenger/no_bicycles.png differ
diff --git a/public/images/emoji/facebook_messenger/no_entry.png b/public/images/emoji/facebook_messenger/no_entry.png
index f3db9deb40..b251f243c3 100644
Binary files a/public/images/emoji/facebook_messenger/no_entry.png and b/public/images/emoji/facebook_messenger/no_entry.png differ
diff --git a/public/images/emoji/facebook_messenger/no_entry_sign.png b/public/images/emoji/facebook_messenger/no_entry_sign.png
index 930838c69b..3fb90983da 100644
Binary files a/public/images/emoji/facebook_messenger/no_entry_sign.png and b/public/images/emoji/facebook_messenger/no_entry_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good.png b/public/images/emoji/facebook_messenger/no_good.png
index 1b39244154..35ea5e5a2e 100644
Binary files a/public/images/emoji/facebook_messenger/no_good.png and b/public/images/emoji/facebook_messenger/no_good.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/2.png b/public/images/emoji/facebook_messenger/no_good/2.png
index ae600f93d1..4f4639fb71 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/2.png and b/public/images/emoji/facebook_messenger/no_good/2.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/3.png b/public/images/emoji/facebook_messenger/no_good/3.png
index aaa680f7ab..150dac45e3 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/3.png and b/public/images/emoji/facebook_messenger/no_good/3.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/4.png b/public/images/emoji/facebook_messenger/no_good/4.png
index f96e628a3a..5ba774f306 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/4.png and b/public/images/emoji/facebook_messenger/no_good/4.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/5.png b/public/images/emoji/facebook_messenger/no_good/5.png
index 10cf1a4bec..96e240b573 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/5.png and b/public/images/emoji/facebook_messenger/no_good/5.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/6.png b/public/images/emoji/facebook_messenger/no_good/6.png
index 2bf5e24008..3f75a33ea6 100644
Binary files a/public/images/emoji/facebook_messenger/no_good/6.png and b/public/images/emoji/facebook_messenger/no_good/6.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man.png b/public/images/emoji/facebook_messenger/no_good_man.png
index 482a4698d1..04525ff5a9 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man.png and b/public/images/emoji/facebook_messenger/no_good_man.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/2.png b/public/images/emoji/facebook_messenger/no_good_man/2.png
index faf146004d..cf86d2818e 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/2.png and b/public/images/emoji/facebook_messenger/no_good_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/3.png b/public/images/emoji/facebook_messenger/no_good_man/3.png
index 27ba65f98b..81d84e412b 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/3.png and b/public/images/emoji/facebook_messenger/no_good_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/4.png b/public/images/emoji/facebook_messenger/no_good_man/4.png
index cb7608b4e9..adf18cd858 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/4.png and b/public/images/emoji/facebook_messenger/no_good_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/5.png b/public/images/emoji/facebook_messenger/no_good_man/5.png
index 6498b6f082..f9365edc5c 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/5.png and b/public/images/emoji/facebook_messenger/no_good_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/6.png b/public/images/emoji/facebook_messenger/no_good_man/6.png
index 0bac0f4cd4..86ff6953e2 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_man/6.png and b/public/images/emoji/facebook_messenger/no_good_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman.png b/public/images/emoji/facebook_messenger/no_good_woman.png
index 1b39244154..35ea5e5a2e 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman.png and b/public/images/emoji/facebook_messenger/no_good_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/2.png b/public/images/emoji/facebook_messenger/no_good_woman/2.png
index ae600f93d1..4f4639fb71 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/2.png and b/public/images/emoji/facebook_messenger/no_good_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/3.png b/public/images/emoji/facebook_messenger/no_good_woman/3.png
index aaa680f7ab..150dac45e3 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/3.png and b/public/images/emoji/facebook_messenger/no_good_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/4.png b/public/images/emoji/facebook_messenger/no_good_woman/4.png
index f96e628a3a..5ba774f306 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/4.png and b/public/images/emoji/facebook_messenger/no_good_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/5.png b/public/images/emoji/facebook_messenger/no_good_woman/5.png
index 10cf1a4bec..96e240b573 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/5.png and b/public/images/emoji/facebook_messenger/no_good_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/6.png b/public/images/emoji/facebook_messenger/no_good_woman/6.png
index 2bf5e24008..3f75a33ea6 100644
Binary files a/public/images/emoji/facebook_messenger/no_good_woman/6.png and b/public/images/emoji/facebook_messenger/no_good_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/no_mobile_phones.png b/public/images/emoji/facebook_messenger/no_mobile_phones.png
index 26a54246de..64444baa03 100644
Binary files a/public/images/emoji/facebook_messenger/no_mobile_phones.png and b/public/images/emoji/facebook_messenger/no_mobile_phones.png differ
diff --git a/public/images/emoji/facebook_messenger/no_mouth.png b/public/images/emoji/facebook_messenger/no_mouth.png
index 609faa8c37..e3626f448b 100644
Binary files a/public/images/emoji/facebook_messenger/no_mouth.png and b/public/images/emoji/facebook_messenger/no_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/no_pedestrians.png b/public/images/emoji/facebook_messenger/no_pedestrians.png
index afccb3291f..cf2e6202f0 100644
Binary files a/public/images/emoji/facebook_messenger/no_pedestrians.png and b/public/images/emoji/facebook_messenger/no_pedestrians.png differ
diff --git a/public/images/emoji/facebook_messenger/no_smoking.png b/public/images/emoji/facebook_messenger/no_smoking.png
index 06ff47b0a9..6d5f7caf45 100644
Binary files a/public/images/emoji/facebook_messenger/no_smoking.png and b/public/images/emoji/facebook_messenger/no_smoking.png differ
diff --git a/public/images/emoji/facebook_messenger/non-potable_water.png b/public/images/emoji/facebook_messenger/non-potable_water.png
index 7efa68146e..6c3d2c5d99 100644
Binary files a/public/images/emoji/facebook_messenger/non-potable_water.png and b/public/images/emoji/facebook_messenger/non-potable_water.png differ
diff --git a/public/images/emoji/facebook_messenger/norfolk_island.png b/public/images/emoji/facebook_messenger/norfolk_island.png
index 574acba100..1a56f41ccb 100644
Binary files a/public/images/emoji/facebook_messenger/norfolk_island.png and b/public/images/emoji/facebook_messenger/norfolk_island.png differ
diff --git a/public/images/emoji/facebook_messenger/north_korea.png b/public/images/emoji/facebook_messenger/north_korea.png
index d15d10aece..0a0621583c 100644
Binary files a/public/images/emoji/facebook_messenger/north_korea.png and b/public/images/emoji/facebook_messenger/north_korea.png differ
diff --git a/public/images/emoji/facebook_messenger/northern_mariana_islands.png b/public/images/emoji/facebook_messenger/northern_mariana_islands.png
index 962a6171b9..0adddf1ed5 100644
Binary files a/public/images/emoji/facebook_messenger/northern_mariana_islands.png and b/public/images/emoji/facebook_messenger/northern_mariana_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/norway.png b/public/images/emoji/facebook_messenger/norway.png
index 3a2439e150..d2cd8f67f2 100644
Binary files a/public/images/emoji/facebook_messenger/norway.png and b/public/images/emoji/facebook_messenger/norway.png differ
diff --git a/public/images/emoji/facebook_messenger/nose.png b/public/images/emoji/facebook_messenger/nose.png
index 8f583249c5..9ab35d4ee4 100644
Binary files a/public/images/emoji/facebook_messenger/nose.png and b/public/images/emoji/facebook_messenger/nose.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/2.png b/public/images/emoji/facebook_messenger/nose/2.png
index c61a3cd9b2..1d2e0547ff 100644
Binary files a/public/images/emoji/facebook_messenger/nose/2.png and b/public/images/emoji/facebook_messenger/nose/2.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/3.png b/public/images/emoji/facebook_messenger/nose/3.png
index 5024bbcac6..3c137a6258 100644
Binary files a/public/images/emoji/facebook_messenger/nose/3.png and b/public/images/emoji/facebook_messenger/nose/3.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/4.png b/public/images/emoji/facebook_messenger/nose/4.png
index acc16c879d..d8bb8a826b 100644
Binary files a/public/images/emoji/facebook_messenger/nose/4.png and b/public/images/emoji/facebook_messenger/nose/4.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/5.png b/public/images/emoji/facebook_messenger/nose/5.png
index 79221668f3..64c5795c93 100644
Binary files a/public/images/emoji/facebook_messenger/nose/5.png and b/public/images/emoji/facebook_messenger/nose/5.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/6.png b/public/images/emoji/facebook_messenger/nose/6.png
index 2b29d4ef60..66f3c65fcc 100644
Binary files a/public/images/emoji/facebook_messenger/nose/6.png and b/public/images/emoji/facebook_messenger/nose/6.png differ
diff --git a/public/images/emoji/facebook_messenger/notebook.png b/public/images/emoji/facebook_messenger/notebook.png
index 30c97ad185..f22f2f9318 100644
Binary files a/public/images/emoji/facebook_messenger/notebook.png and b/public/images/emoji/facebook_messenger/notebook.png differ
diff --git a/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png b/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png
index bfdf9849b5..b6c301f963 100644
Binary files a/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png and b/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/facebook_messenger/notepad_spiral.png b/public/images/emoji/facebook_messenger/notepad_spiral.png
index b8ebfe080a..e441801b07 100644
Binary files a/public/images/emoji/facebook_messenger/notepad_spiral.png and b/public/images/emoji/facebook_messenger/notepad_spiral.png differ
diff --git a/public/images/emoji/facebook_messenger/notes.png b/public/images/emoji/facebook_messenger/notes.png
index ff9430ffdc..d2d297c574 100644
Binary files a/public/images/emoji/facebook_messenger/notes.png and b/public/images/emoji/facebook_messenger/notes.png differ
diff --git a/public/images/emoji/facebook_messenger/nut_and_bolt.png b/public/images/emoji/facebook_messenger/nut_and_bolt.png
index ff4e024188..f33cc46acd 100644
Binary files a/public/images/emoji/facebook_messenger/nut_and_bolt.png and b/public/images/emoji/facebook_messenger/nut_and_bolt.png differ
diff --git a/public/images/emoji/facebook_messenger/o.png b/public/images/emoji/facebook_messenger/o.png
index 65518db51f..bd9e2bce25 100644
Binary files a/public/images/emoji/facebook_messenger/o.png and b/public/images/emoji/facebook_messenger/o.png differ
diff --git a/public/images/emoji/facebook_messenger/o2.png b/public/images/emoji/facebook_messenger/o2.png
index 7293a012e8..d56cd0c2aa 100644
Binary files a/public/images/emoji/facebook_messenger/o2.png and b/public/images/emoji/facebook_messenger/o2.png differ
diff --git a/public/images/emoji/facebook_messenger/ocean.png b/public/images/emoji/facebook_messenger/ocean.png
index f4ce329fce..1d0e349a94 100644
Binary files a/public/images/emoji/facebook_messenger/ocean.png and b/public/images/emoji/facebook_messenger/ocean.png differ
diff --git a/public/images/emoji/facebook_messenger/octopus.png b/public/images/emoji/facebook_messenger/octopus.png
index b6a1b5acbf..7b84177501 100644
Binary files a/public/images/emoji/facebook_messenger/octopus.png and b/public/images/emoji/facebook_messenger/octopus.png differ
diff --git a/public/images/emoji/facebook_messenger/oden.png b/public/images/emoji/facebook_messenger/oden.png
index c497a79d04..621476b0b9 100644
Binary files a/public/images/emoji/facebook_messenger/oden.png and b/public/images/emoji/facebook_messenger/oden.png differ
diff --git a/public/images/emoji/facebook_messenger/office.png b/public/images/emoji/facebook_messenger/office.png
index e231c280ac..d5ed4d845a 100644
Binary files a/public/images/emoji/facebook_messenger/office.png and b/public/images/emoji/facebook_messenger/office.png differ
diff --git a/public/images/emoji/facebook_messenger/oil.png b/public/images/emoji/facebook_messenger/oil.png
index 7c6d9e728f..9e49ad7667 100644
Binary files a/public/images/emoji/facebook_messenger/oil.png and b/public/images/emoji/facebook_messenger/oil.png differ
diff --git a/public/images/emoji/facebook_messenger/oil_drum.png b/public/images/emoji/facebook_messenger/oil_drum.png
index 7c6d9e728f..9e49ad7667 100644
Binary files a/public/images/emoji/facebook_messenger/oil_drum.png and b/public/images/emoji/facebook_messenger/oil_drum.png differ
diff --git a/public/images/emoji/facebook_messenger/ok.png b/public/images/emoji/facebook_messenger/ok.png
index 200b86672b..32ee0173f0 100644
Binary files a/public/images/emoji/facebook_messenger/ok.png and b/public/images/emoji/facebook_messenger/ok.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand.png b/public/images/emoji/facebook_messenger/ok_hand.png
index e1d5e568ae..b5ff9c0f8d 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand.png and b/public/images/emoji/facebook_messenger/ok_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/2.png b/public/images/emoji/facebook_messenger/ok_hand/2.png
index e7fc3a26ca..0acf0527b5 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/2.png and b/public/images/emoji/facebook_messenger/ok_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/3.png b/public/images/emoji/facebook_messenger/ok_hand/3.png
index 963f15614e..51ee9e1f03 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/3.png and b/public/images/emoji/facebook_messenger/ok_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/4.png b/public/images/emoji/facebook_messenger/ok_hand/4.png
index 93c785d3e1..72cc89f62e 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/4.png and b/public/images/emoji/facebook_messenger/ok_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/5.png b/public/images/emoji/facebook_messenger/ok_hand/5.png
index 57dfe1cdc4..0cac5bbd11 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/5.png and b/public/images/emoji/facebook_messenger/ok_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/6.png b/public/images/emoji/facebook_messenger/ok_hand/6.png
index 428fa0ef4f..3c6b913db2 100644
Binary files a/public/images/emoji/facebook_messenger/ok_hand/6.png and b/public/images/emoji/facebook_messenger/ok_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man.png b/public/images/emoji/facebook_messenger/ok_man.png
index a409be9d6e..526277ebe0 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man.png and b/public/images/emoji/facebook_messenger/ok_man.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/2.png b/public/images/emoji/facebook_messenger/ok_man/2.png
index a053dbd980..8057cf8bc3 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/2.png and b/public/images/emoji/facebook_messenger/ok_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/3.png b/public/images/emoji/facebook_messenger/ok_man/3.png
index e16633321f..14b9444bda 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/3.png and b/public/images/emoji/facebook_messenger/ok_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/4.png b/public/images/emoji/facebook_messenger/ok_man/4.png
index 4634976b5e..74c24deabb 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/4.png and b/public/images/emoji/facebook_messenger/ok_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/5.png b/public/images/emoji/facebook_messenger/ok_man/5.png
index f0003c09eb..715a67da30 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/5.png and b/public/images/emoji/facebook_messenger/ok_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/6.png b/public/images/emoji/facebook_messenger/ok_man/6.png
index 39c7357546..4f3bce3c13 100644
Binary files a/public/images/emoji/facebook_messenger/ok_man/6.png and b/public/images/emoji/facebook_messenger/ok_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman.png b/public/images/emoji/facebook_messenger/ok_woman.png
index e5ed37b439..00a58e844c 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman.png and b/public/images/emoji/facebook_messenger/ok_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/2.png b/public/images/emoji/facebook_messenger/ok_woman/2.png
index 11e28436c0..bed8dab5a9 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/2.png and b/public/images/emoji/facebook_messenger/ok_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/3.png b/public/images/emoji/facebook_messenger/ok_woman/3.png
index 4d341255ee..b699b753cc 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/3.png and b/public/images/emoji/facebook_messenger/ok_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/4.png b/public/images/emoji/facebook_messenger/ok_woman/4.png
index b6dc29569a..5102e7eba7 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/4.png and b/public/images/emoji/facebook_messenger/ok_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/5.png b/public/images/emoji/facebook_messenger/ok_woman/5.png
index df01731869..d869755fab 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/5.png and b/public/images/emoji/facebook_messenger/ok_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/6.png b/public/images/emoji/facebook_messenger/ok_woman/6.png
index 825602b97d..b9aabced9b 100644
Binary files a/public/images/emoji/facebook_messenger/ok_woman/6.png and b/public/images/emoji/facebook_messenger/ok_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/old_key.png b/public/images/emoji/facebook_messenger/old_key.png
index 18b9399432..4452b17fb5 100644
Binary files a/public/images/emoji/facebook_messenger/old_key.png and b/public/images/emoji/facebook_messenger/old_key.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult.png b/public/images/emoji/facebook_messenger/older_adult.png
index 8796829b87..6bad639262 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult.png and b/public/images/emoji/facebook_messenger/older_adult.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/2.png b/public/images/emoji/facebook_messenger/older_adult/2.png
index b36f41960e..40a8bceac0 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/2.png and b/public/images/emoji/facebook_messenger/older_adult/2.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/3.png b/public/images/emoji/facebook_messenger/older_adult/3.png
index dc1441fea5..7f643c9064 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/3.png and b/public/images/emoji/facebook_messenger/older_adult/3.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/4.png b/public/images/emoji/facebook_messenger/older_adult/4.png
index abc19e06c7..0bf64871aa 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/4.png and b/public/images/emoji/facebook_messenger/older_adult/4.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/5.png b/public/images/emoji/facebook_messenger/older_adult/5.png
index c90549f681..e94e38b255 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/5.png and b/public/images/emoji/facebook_messenger/older_adult/5.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/6.png b/public/images/emoji/facebook_messenger/older_adult/6.png
index 5152c9c1a3..168819ec89 100644
Binary files a/public/images/emoji/facebook_messenger/older_adult/6.png and b/public/images/emoji/facebook_messenger/older_adult/6.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man.png b/public/images/emoji/facebook_messenger/older_man.png
index 47e7cef999..db5c5681d1 100644
Binary files a/public/images/emoji/facebook_messenger/older_man.png and b/public/images/emoji/facebook_messenger/older_man.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/2.png b/public/images/emoji/facebook_messenger/older_man/2.png
index 2fb0c5a7e5..8d005a368c 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/2.png and b/public/images/emoji/facebook_messenger/older_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/3.png b/public/images/emoji/facebook_messenger/older_man/3.png
index 7e4e62a615..cff7b90a73 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/3.png and b/public/images/emoji/facebook_messenger/older_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/4.png b/public/images/emoji/facebook_messenger/older_man/4.png
index 2414ae1dfe..b98f815607 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/4.png and b/public/images/emoji/facebook_messenger/older_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/5.png b/public/images/emoji/facebook_messenger/older_man/5.png
index 7f3d54e689..25e842a808 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/5.png and b/public/images/emoji/facebook_messenger/older_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/6.png b/public/images/emoji/facebook_messenger/older_man/6.png
index 07eb64ff15..00f50b3f67 100644
Binary files a/public/images/emoji/facebook_messenger/older_man/6.png and b/public/images/emoji/facebook_messenger/older_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman.png b/public/images/emoji/facebook_messenger/older_woman.png
index 02e8230771..e03cb5c779 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman.png and b/public/images/emoji/facebook_messenger/older_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/2.png b/public/images/emoji/facebook_messenger/older_woman/2.png
index 8e4a01cfcc..86ef258ed8 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/2.png and b/public/images/emoji/facebook_messenger/older_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/3.png b/public/images/emoji/facebook_messenger/older_woman/3.png
index 4f8be8c914..2982fa1d6f 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/3.png and b/public/images/emoji/facebook_messenger/older_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/4.png b/public/images/emoji/facebook_messenger/older_woman/4.png
index 0d7aa5e0d9..7ab3d41b2a 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/4.png and b/public/images/emoji/facebook_messenger/older_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/5.png b/public/images/emoji/facebook_messenger/older_woman/5.png
index 41f7e66438..3b8a10b0c7 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/5.png and b/public/images/emoji/facebook_messenger/older_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/6.png b/public/images/emoji/facebook_messenger/older_woman/6.png
index 6de0611496..a77762c3ad 100644
Binary files a/public/images/emoji/facebook_messenger/older_woman/6.png and b/public/images/emoji/facebook_messenger/older_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/om.png b/public/images/emoji/facebook_messenger/om.png
index bcd7113141..8b75e5ff06 100644
Binary files a/public/images/emoji/facebook_messenger/om.png and b/public/images/emoji/facebook_messenger/om.png differ
diff --git a/public/images/emoji/facebook_messenger/om_symbol.png b/public/images/emoji/facebook_messenger/om_symbol.png
index bcd7113141..8b75e5ff06 100644
Binary files a/public/images/emoji/facebook_messenger/om_symbol.png and b/public/images/emoji/facebook_messenger/om_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/oman.png b/public/images/emoji/facebook_messenger/oman.png
index 59e0df087e..29ecf6f579 100644
Binary files a/public/images/emoji/facebook_messenger/oman.png and b/public/images/emoji/facebook_messenger/oman.png differ
diff --git a/public/images/emoji/facebook_messenger/on.png b/public/images/emoji/facebook_messenger/on.png
index bd14ab9d48..1cb4c2240c 100644
Binary files a/public/images/emoji/facebook_messenger/on.png and b/public/images/emoji/facebook_messenger/on.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_automobile.png b/public/images/emoji/facebook_messenger/oncoming_automobile.png
index 024cdb23b5..ba661ecefd 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_automobile.png and b/public/images/emoji/facebook_messenger/oncoming_automobile.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_bus.png b/public/images/emoji/facebook_messenger/oncoming_bus.png
index 19dfdd08c5..9f3ab610b3 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_bus.png and b/public/images/emoji/facebook_messenger/oncoming_bus.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_police_car.png b/public/images/emoji/facebook_messenger/oncoming_police_car.png
index cacce06c49..c902b64726 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_police_car.png and b/public/images/emoji/facebook_messenger/oncoming_police_car.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_taxi.png b/public/images/emoji/facebook_messenger/oncoming_taxi.png
index c3d11c9bb8..bfd23e66a6 100644
Binary files a/public/images/emoji/facebook_messenger/oncoming_taxi.png and b/public/images/emoji/facebook_messenger/oncoming_taxi.png differ
diff --git a/public/images/emoji/facebook_messenger/one.png b/public/images/emoji/facebook_messenger/one.png
index 8cf9c77656..76300042c2 100644
Binary files a/public/images/emoji/facebook_messenger/one.png and b/public/images/emoji/facebook_messenger/one.png differ
diff --git a/public/images/emoji/facebook_messenger/open_book.png b/public/images/emoji/facebook_messenger/open_book.png
index 466a96d4dc..724a71aeb9 100644
Binary files a/public/images/emoji/facebook_messenger/open_book.png and b/public/images/emoji/facebook_messenger/open_book.png differ
diff --git a/public/images/emoji/facebook_messenger/open_file_folder.png b/public/images/emoji/facebook_messenger/open_file_folder.png
index 1c7e6b1be0..a8a486e9bb 100644
Binary files a/public/images/emoji/facebook_messenger/open_file_folder.png and b/public/images/emoji/facebook_messenger/open_file_folder.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands.png b/public/images/emoji/facebook_messenger/open_hands.png
index a85e8a6c4b..8c8ecb9b6b 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands.png and b/public/images/emoji/facebook_messenger/open_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/2.png b/public/images/emoji/facebook_messenger/open_hands/2.png
index c45027d8ad..8018ad442f 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/2.png and b/public/images/emoji/facebook_messenger/open_hands/2.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/3.png b/public/images/emoji/facebook_messenger/open_hands/3.png
index 0422b88434..a58735a00c 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/3.png and b/public/images/emoji/facebook_messenger/open_hands/3.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/4.png b/public/images/emoji/facebook_messenger/open_hands/4.png
index d36a522438..09557382f4 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/4.png and b/public/images/emoji/facebook_messenger/open_hands/4.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/5.png b/public/images/emoji/facebook_messenger/open_hands/5.png
index 0e41b410c5..a90afbffcc 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/5.png and b/public/images/emoji/facebook_messenger/open_hands/5.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/6.png b/public/images/emoji/facebook_messenger/open_hands/6.png
index 473c50cb3d..f9517d43e7 100644
Binary files a/public/images/emoji/facebook_messenger/open_hands/6.png and b/public/images/emoji/facebook_messenger/open_hands/6.png differ
diff --git a/public/images/emoji/facebook_messenger/open_mouth.png b/public/images/emoji/facebook_messenger/open_mouth.png
index 5857e8dcca..faf523c087 100644
Binary files a/public/images/emoji/facebook_messenger/open_mouth.png and b/public/images/emoji/facebook_messenger/open_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/open_umbrella.png b/public/images/emoji/facebook_messenger/open_umbrella.png
index ec99aeb164..d84b97cb0c 100644
Binary files a/public/images/emoji/facebook_messenger/open_umbrella.png and b/public/images/emoji/facebook_messenger/open_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/ophiuchus.png b/public/images/emoji/facebook_messenger/ophiuchus.png
index 785022965e..d6b543d1e2 100644
Binary files a/public/images/emoji/facebook_messenger/ophiuchus.png and b/public/images/emoji/facebook_messenger/ophiuchus.png differ
diff --git a/public/images/emoji/facebook_messenger/orange_book.png b/public/images/emoji/facebook_messenger/orange_book.png
index f740242a40..7d665061df 100644
Binary files a/public/images/emoji/facebook_messenger/orange_book.png and b/public/images/emoji/facebook_messenger/orange_book.png differ
diff --git a/public/images/emoji/facebook_messenger/orange_heart.png b/public/images/emoji/facebook_messenger/orange_heart.png
index f217c930a7..3d53e3eeae 100644
Binary files a/public/images/emoji/facebook_messenger/orange_heart.png and b/public/images/emoji/facebook_messenger/orange_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/orthodox_cross.png b/public/images/emoji/facebook_messenger/orthodox_cross.png
index 5b398f5cf2..f8f3aa79dc 100644
Binary files a/public/images/emoji/facebook_messenger/orthodox_cross.png and b/public/images/emoji/facebook_messenger/orthodox_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/outbox_tray.png b/public/images/emoji/facebook_messenger/outbox_tray.png
index 3749f9e0c5..50b5392576 100644
Binary files a/public/images/emoji/facebook_messenger/outbox_tray.png and b/public/images/emoji/facebook_messenger/outbox_tray.png differ
diff --git a/public/images/emoji/facebook_messenger/owl.png b/public/images/emoji/facebook_messenger/owl.png
index 905115e712..8d0fc40856 100644
Binary files a/public/images/emoji/facebook_messenger/owl.png and b/public/images/emoji/facebook_messenger/owl.png differ
diff --git a/public/images/emoji/facebook_messenger/ox.png b/public/images/emoji/facebook_messenger/ox.png
index f1389ed765..76087acb70 100644
Binary files a/public/images/emoji/facebook_messenger/ox.png and b/public/images/emoji/facebook_messenger/ox.png differ
diff --git a/public/images/emoji/facebook_messenger/package.png b/public/images/emoji/facebook_messenger/package.png
index 5252e91f82..ab5e2dc92c 100644
Binary files a/public/images/emoji/facebook_messenger/package.png and b/public/images/emoji/facebook_messenger/package.png differ
diff --git a/public/images/emoji/facebook_messenger/page_facing_up.png b/public/images/emoji/facebook_messenger/page_facing_up.png
index a3e3e6dac9..77bd0e595f 100644
Binary files a/public/images/emoji/facebook_messenger/page_facing_up.png and b/public/images/emoji/facebook_messenger/page_facing_up.png differ
diff --git a/public/images/emoji/facebook_messenger/page_with_curl.png b/public/images/emoji/facebook_messenger/page_with_curl.png
index 1b6042549f..24af18b404 100644
Binary files a/public/images/emoji/facebook_messenger/page_with_curl.png and b/public/images/emoji/facebook_messenger/page_with_curl.png differ
diff --git a/public/images/emoji/facebook_messenger/pager.png b/public/images/emoji/facebook_messenger/pager.png
index 9e3cb95303..b7b4372d70 100644
Binary files a/public/images/emoji/facebook_messenger/pager.png and b/public/images/emoji/facebook_messenger/pager.png differ
diff --git a/public/images/emoji/facebook_messenger/paintbrush.png b/public/images/emoji/facebook_messenger/paintbrush.png
index c7d649a378..6044b9caff 100644
Binary files a/public/images/emoji/facebook_messenger/paintbrush.png and b/public/images/emoji/facebook_messenger/paintbrush.png differ
diff --git a/public/images/emoji/facebook_messenger/pakistan.png b/public/images/emoji/facebook_messenger/pakistan.png
index f4c74d1d49..4f31345513 100644
Binary files a/public/images/emoji/facebook_messenger/pakistan.png and b/public/images/emoji/facebook_messenger/pakistan.png differ
diff --git a/public/images/emoji/facebook_messenger/palau.png b/public/images/emoji/facebook_messenger/palau.png
index 69aace7555..c92ad17134 100644
Binary files a/public/images/emoji/facebook_messenger/palau.png and b/public/images/emoji/facebook_messenger/palau.png differ
diff --git a/public/images/emoji/facebook_messenger/palestinian_territories.png b/public/images/emoji/facebook_messenger/palestinian_territories.png
index 2e4399d762..b1f0426ac4 100644
Binary files a/public/images/emoji/facebook_messenger/palestinian_territories.png and b/public/images/emoji/facebook_messenger/palestinian_territories.png differ
diff --git a/public/images/emoji/facebook_messenger/palm_tree.png b/public/images/emoji/facebook_messenger/palm_tree.png
index 8644ca6a57..d4df51746c 100644
Binary files a/public/images/emoji/facebook_messenger/palm_tree.png and b/public/images/emoji/facebook_messenger/palm_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together.png b/public/images/emoji/facebook_messenger/palms_up_together.png
index fb66ba11c4..376dbb58ad 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together.png and b/public/images/emoji/facebook_messenger/palms_up_together.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/2.png b/public/images/emoji/facebook_messenger/palms_up_together/2.png
index 6d9b2fc8cc..751923bee4 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/2.png and b/public/images/emoji/facebook_messenger/palms_up_together/2.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/3.png b/public/images/emoji/facebook_messenger/palms_up_together/3.png
index c5d52f5c7a..2c1a54b8e3 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/3.png and b/public/images/emoji/facebook_messenger/palms_up_together/3.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/4.png b/public/images/emoji/facebook_messenger/palms_up_together/4.png
index 3d4288d10d..076a52dde4 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/4.png and b/public/images/emoji/facebook_messenger/palms_up_together/4.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/5.png b/public/images/emoji/facebook_messenger/palms_up_together/5.png
index 6ff36c07cb..2249e208e8 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/5.png and b/public/images/emoji/facebook_messenger/palms_up_together/5.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/6.png b/public/images/emoji/facebook_messenger/palms_up_together/6.png
index c25d42927d..e5065ba3de 100644
Binary files a/public/images/emoji/facebook_messenger/palms_up_together/6.png and b/public/images/emoji/facebook_messenger/palms_up_together/6.png differ
diff --git a/public/images/emoji/facebook_messenger/panama.png b/public/images/emoji/facebook_messenger/panama.png
index 2a564db426..63384f4460 100644
Binary files a/public/images/emoji/facebook_messenger/panama.png and b/public/images/emoji/facebook_messenger/panama.png differ
diff --git a/public/images/emoji/facebook_messenger/pancakes.png b/public/images/emoji/facebook_messenger/pancakes.png
index ebd14eecd0..cc145982be 100644
Binary files a/public/images/emoji/facebook_messenger/pancakes.png and b/public/images/emoji/facebook_messenger/pancakes.png differ
diff --git a/public/images/emoji/facebook_messenger/panda_face.png b/public/images/emoji/facebook_messenger/panda_face.png
index 328e921619..682db9fd23 100644
Binary files a/public/images/emoji/facebook_messenger/panda_face.png and b/public/images/emoji/facebook_messenger/panda_face.png differ
diff --git a/public/images/emoji/facebook_messenger/paperclip.png b/public/images/emoji/facebook_messenger/paperclip.png
index 42329aa2d2..43ddbeabd8 100644
Binary files a/public/images/emoji/facebook_messenger/paperclip.png and b/public/images/emoji/facebook_messenger/paperclip.png differ
diff --git a/public/images/emoji/facebook_messenger/paperclips.png b/public/images/emoji/facebook_messenger/paperclips.png
index b4080878f6..998be6d8ba 100644
Binary files a/public/images/emoji/facebook_messenger/paperclips.png and b/public/images/emoji/facebook_messenger/paperclips.png differ
diff --git a/public/images/emoji/facebook_messenger/papua_new_guinea.png b/public/images/emoji/facebook_messenger/papua_new_guinea.png
index b449d67794..eb43e17411 100644
Binary files a/public/images/emoji/facebook_messenger/papua_new_guinea.png and b/public/images/emoji/facebook_messenger/papua_new_guinea.png differ
diff --git a/public/images/emoji/facebook_messenger/paraguay.png b/public/images/emoji/facebook_messenger/paraguay.png
index d9eab9434c..649c4a12e0 100644
Binary files a/public/images/emoji/facebook_messenger/paraguay.png and b/public/images/emoji/facebook_messenger/paraguay.png differ
diff --git a/public/images/emoji/facebook_messenger/parasol_on_ground.png b/public/images/emoji/facebook_messenger/parasol_on_ground.png
index 2bb23697b7..946097af1c 100644
Binary files a/public/images/emoji/facebook_messenger/parasol_on_ground.png and b/public/images/emoji/facebook_messenger/parasol_on_ground.png differ
diff --git a/public/images/emoji/facebook_messenger/park.png b/public/images/emoji/facebook_messenger/park.png
index db29d2dff9..38452f9b92 100644
Binary files a/public/images/emoji/facebook_messenger/park.png and b/public/images/emoji/facebook_messenger/park.png differ
diff --git a/public/images/emoji/facebook_messenger/parking.png b/public/images/emoji/facebook_messenger/parking.png
index 49ea56e322..cc8b01b40b 100644
Binary files a/public/images/emoji/facebook_messenger/parking.png and b/public/images/emoji/facebook_messenger/parking.png differ
diff --git a/public/images/emoji/facebook_messenger/part_alternation_mark.png b/public/images/emoji/facebook_messenger/part_alternation_mark.png
index e1bf14a947..5da9ee8653 100644
Binary files a/public/images/emoji/facebook_messenger/part_alternation_mark.png and b/public/images/emoji/facebook_messenger/part_alternation_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/partly_sunny.png b/public/images/emoji/facebook_messenger/partly_sunny.png
index 51953bf695..8258b2f793 100644
Binary files a/public/images/emoji/facebook_messenger/partly_sunny.png and b/public/images/emoji/facebook_messenger/partly_sunny.png differ
diff --git a/public/images/emoji/facebook_messenger/passenger_ship.png b/public/images/emoji/facebook_messenger/passenger_ship.png
index b1ee561346..a79fe563a4 100644
Binary files a/public/images/emoji/facebook_messenger/passenger_ship.png and b/public/images/emoji/facebook_messenger/passenger_ship.png differ
diff --git a/public/images/emoji/facebook_messenger/passport_control.png b/public/images/emoji/facebook_messenger/passport_control.png
index 87ab1cb24e..c1df6e0f18 100644
Binary files a/public/images/emoji/facebook_messenger/passport_control.png and b/public/images/emoji/facebook_messenger/passport_control.png differ
diff --git a/public/images/emoji/facebook_messenger/pause_button.png b/public/images/emoji/facebook_messenger/pause_button.png
index 624e2df711..de512cc09f 100644
Binary files a/public/images/emoji/facebook_messenger/pause_button.png and b/public/images/emoji/facebook_messenger/pause_button.png differ
diff --git a/public/images/emoji/facebook_messenger/paw_prints.png b/public/images/emoji/facebook_messenger/paw_prints.png
index ccd6e7503e..f102be9210 100644
Binary files a/public/images/emoji/facebook_messenger/paw_prints.png and b/public/images/emoji/facebook_messenger/paw_prints.png differ
diff --git a/public/images/emoji/facebook_messenger/peace.png b/public/images/emoji/facebook_messenger/peace.png
index 4eeaef2b55..f900713ae3 100644
Binary files a/public/images/emoji/facebook_messenger/peace.png and b/public/images/emoji/facebook_messenger/peace.png differ
diff --git a/public/images/emoji/facebook_messenger/peace_symbol.png b/public/images/emoji/facebook_messenger/peace_symbol.png
index 4eeaef2b55..f900713ae3 100644
Binary files a/public/images/emoji/facebook_messenger/peace_symbol.png and b/public/images/emoji/facebook_messenger/peace_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/peach.png b/public/images/emoji/facebook_messenger/peach.png
index 30e37f1588..f3af1b0a0e 100644
Binary files a/public/images/emoji/facebook_messenger/peach.png and b/public/images/emoji/facebook_messenger/peach.png differ
diff --git a/public/images/emoji/facebook_messenger/peanuts.png b/public/images/emoji/facebook_messenger/peanuts.png
index 34f4eed2d5..55adb32d2b 100644
Binary files a/public/images/emoji/facebook_messenger/peanuts.png and b/public/images/emoji/facebook_messenger/peanuts.png differ
diff --git a/public/images/emoji/facebook_messenger/pear.png b/public/images/emoji/facebook_messenger/pear.png
index b1ec7e04ec..6ac15abff2 100644
Binary files a/public/images/emoji/facebook_messenger/pear.png and b/public/images/emoji/facebook_messenger/pear.png differ
diff --git a/public/images/emoji/facebook_messenger/pen.png b/public/images/emoji/facebook_messenger/pen.png
index 6219ae26cc..399b2fbf22 100644
Binary files a/public/images/emoji/facebook_messenger/pen.png and b/public/images/emoji/facebook_messenger/pen.png differ
diff --git a/public/images/emoji/facebook_messenger/pen_ballpoint.png b/public/images/emoji/facebook_messenger/pen_ballpoint.png
index 6219ae26cc..399b2fbf22 100644
Binary files a/public/images/emoji/facebook_messenger/pen_ballpoint.png and b/public/images/emoji/facebook_messenger/pen_ballpoint.png differ
diff --git a/public/images/emoji/facebook_messenger/pen_fountain.png b/public/images/emoji/facebook_messenger/pen_fountain.png
index 96584c9f57..2e7296057b 100644
Binary files a/public/images/emoji/facebook_messenger/pen_fountain.png and b/public/images/emoji/facebook_messenger/pen_fountain.png differ
diff --git a/public/images/emoji/facebook_messenger/pencil.png b/public/images/emoji/facebook_messenger/pencil.png
index 8a9a0a4d8c..57d00e040e 100644
Binary files a/public/images/emoji/facebook_messenger/pencil.png and b/public/images/emoji/facebook_messenger/pencil.png differ
diff --git a/public/images/emoji/facebook_messenger/pencil2.png b/public/images/emoji/facebook_messenger/pencil2.png
index 2f90e4ed7d..5b48c58c80 100644
Binary files a/public/images/emoji/facebook_messenger/pencil2.png and b/public/images/emoji/facebook_messenger/pencil2.png differ
diff --git a/public/images/emoji/facebook_messenger/penguin.png b/public/images/emoji/facebook_messenger/penguin.png
index 6936f1c999..2633a1f130 100644
Binary files a/public/images/emoji/facebook_messenger/penguin.png and b/public/images/emoji/facebook_messenger/penguin.png differ
diff --git a/public/images/emoji/facebook_messenger/pensive.png b/public/images/emoji/facebook_messenger/pensive.png
index f72ca15c11..df42076659 100644
Binary files a/public/images/emoji/facebook_messenger/pensive.png and b/public/images/emoji/facebook_messenger/pensive.png differ
diff --git a/public/images/emoji/facebook_messenger/performing_arts.png b/public/images/emoji/facebook_messenger/performing_arts.png
index 08d06a7377..80cca58608 100644
Binary files a/public/images/emoji/facebook_messenger/performing_arts.png and b/public/images/emoji/facebook_messenger/performing_arts.png differ
diff --git a/public/images/emoji/facebook_messenger/persevere.png b/public/images/emoji/facebook_messenger/persevere.png
index 741dec170c..619272dafa 100644
Binary files a/public/images/emoji/facebook_messenger/persevere.png and b/public/images/emoji/facebook_messenger/persevere.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing.png b/public/images/emoji/facebook_messenger/person_climbing.png
index d8a6229d6b..a0001a92f5 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing.png and b/public/images/emoji/facebook_messenger/person_climbing.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/2.png b/public/images/emoji/facebook_messenger/person_climbing/2.png
index 71330d66a8..59145fcd6f 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/2.png and b/public/images/emoji/facebook_messenger/person_climbing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/3.png b/public/images/emoji/facebook_messenger/person_climbing/3.png
index a1345ecbd2..c2527e50b6 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/3.png and b/public/images/emoji/facebook_messenger/person_climbing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/4.png b/public/images/emoji/facebook_messenger/person_climbing/4.png
index 016b920bcd..edcef648fb 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/4.png and b/public/images/emoji/facebook_messenger/person_climbing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/5.png b/public/images/emoji/facebook_messenger/person_climbing/5.png
index 4591eb5290..c2fd3da64f 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/5.png and b/public/images/emoji/facebook_messenger/person_climbing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/6.png b/public/images/emoji/facebook_messenger/person_climbing/6.png
index 19be3236ae..12be569e54 100644
Binary files a/public/images/emoji/facebook_messenger/person_climbing/6.png and b/public/images/emoji/facebook_messenger/person_climbing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_fencing.png b/public/images/emoji/facebook_messenger/person_fencing.png
index 064b747aae..5a2d7381a3 100644
Binary files a/public/images/emoji/facebook_messenger/person_fencing.png and b/public/images/emoji/facebook_messenger/person_fencing.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning.png b/public/images/emoji/facebook_messenger/person_frowning.png
index 1e5f89e7b5..1b7de19871 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning.png and b/public/images/emoji/facebook_messenger/person_frowning.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/2.png b/public/images/emoji/facebook_messenger/person_frowning/2.png
index db018f2e81..d4e0b4aa13 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/2.png and b/public/images/emoji/facebook_messenger/person_frowning/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/3.png b/public/images/emoji/facebook_messenger/person_frowning/3.png
index 2a32b70d58..dc65835b2b 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/3.png and b/public/images/emoji/facebook_messenger/person_frowning/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/4.png b/public/images/emoji/facebook_messenger/person_frowning/4.png
index 824a0bea02..0b4c694606 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/4.png and b/public/images/emoji/facebook_messenger/person_frowning/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/5.png b/public/images/emoji/facebook_messenger/person_frowning/5.png
index ca476ecf1f..402b54502f 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/5.png and b/public/images/emoji/facebook_messenger/person_frowning/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/6.png b/public/images/emoji/facebook_messenger/person_frowning/6.png
index c36b369e0b..265d4fcffd 100644
Binary files a/public/images/emoji/facebook_messenger/person_frowning/6.png and b/public/images/emoji/facebook_messenger/person_frowning/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position.png b/public/images/emoji/facebook_messenger/person_in_lotus_position.png
index e9404fd525..3e265ed93e 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png
index 8817578cf0..2c08ad4b59 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png
index 0e9bf46e0b..66c5a5cf2a 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png
index 918e3d435a..d95ea80331 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png
index 0c01143530..defd5dce1d 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png
index fed226dac2..35bf171538 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png and b/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room.png b/public/images/emoji/facebook_messenger/person_in_steamy_room.png
index 65a0790d92..00fecc6ce1 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png
index 7260df1d15..17665c8cbf 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png
index d14580a3db..36a1a8f394 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png
index 9313ab2116..5cb9f8c69b 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png
index f432b554b3..17a44630be 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png
index dc7087e028..6a5710ea45 100644
Binary files a/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png and b/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball.png b/public/images/emoji/facebook_messenger/person_with_ball.png
index ac6a6c2c9f..fc307b60c9 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball.png and b/public/images/emoji/facebook_messenger/person_with_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/2.png b/public/images/emoji/facebook_messenger/person_with_ball/2.png
index 4dad1da7db..cdd5c25469 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/2.png and b/public/images/emoji/facebook_messenger/person_with_ball/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/3.png b/public/images/emoji/facebook_messenger/person_with_ball/3.png
index 739f1de58c..e4630e522c 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/3.png and b/public/images/emoji/facebook_messenger/person_with_ball/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/4.png b/public/images/emoji/facebook_messenger/person_with_ball/4.png
index 62a23de466..8fbdb822fc 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/4.png and b/public/images/emoji/facebook_messenger/person_with_ball/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/5.png b/public/images/emoji/facebook_messenger/person_with_ball/5.png
index 2cd9628b76..047897cbf5 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/5.png and b/public/images/emoji/facebook_messenger/person_with_ball/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/6.png b/public/images/emoji/facebook_messenger/person_with_ball/6.png
index 85bfaeb578..4592818525 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_ball/6.png and b/public/images/emoji/facebook_messenger/person_with_ball/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair.png b/public/images/emoji/facebook_messenger/person_with_blond_hair.png
index cfe7273eb3..f19dc6ff1d 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png
index aee96b85a7..88d69b3062 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png
index b4fffd5a30..ee68c1bb33 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png
index d8d6a0de15..36062b098e 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png
index 6a573ffb48..6e6f29b214 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png
index 1cefe68636..e773f42481 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png and b/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face.png b/public/images/emoji/facebook_messenger/person_with_pouting_face.png
index 038973f940..0a66b08a91 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png
index 65473cdbce..edd22d5222 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png
index 82e31162c0..17d2ba1ee3 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png
index 838df0d656..260cfdba5c 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png
index cedf79afd2..12ad6a1f5c 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png
index 7bb2a217db..3829aed5ab 100644
Binary files a/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png and b/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/facebook_messenger/peru.png b/public/images/emoji/facebook_messenger/peru.png
index bbb5523f93..bc70d26c8b 100644
Binary files a/public/images/emoji/facebook_messenger/peru.png and b/public/images/emoji/facebook_messenger/peru.png differ
diff --git a/public/images/emoji/facebook_messenger/philippines.png b/public/images/emoji/facebook_messenger/philippines.png
index 33fcf38a3c..b353a66a20 100644
Binary files a/public/images/emoji/facebook_messenger/philippines.png and b/public/images/emoji/facebook_messenger/philippines.png differ
diff --git a/public/images/emoji/facebook_messenger/phone.png b/public/images/emoji/facebook_messenger/phone.png
index b8bbec494d..13b38ac3c6 100644
Binary files a/public/images/emoji/facebook_messenger/phone.png and b/public/images/emoji/facebook_messenger/phone.png differ
diff --git a/public/images/emoji/facebook_messenger/pick.png b/public/images/emoji/facebook_messenger/pick.png
index cc216bfcae..9609878285 100644
Binary files a/public/images/emoji/facebook_messenger/pick.png and b/public/images/emoji/facebook_messenger/pick.png differ
diff --git a/public/images/emoji/facebook_messenger/pie.png b/public/images/emoji/facebook_messenger/pie.png
index 4f5f474d82..0e3e08b596 100644
Binary files a/public/images/emoji/facebook_messenger/pie.png and b/public/images/emoji/facebook_messenger/pie.png differ
diff --git a/public/images/emoji/facebook_messenger/pig.png b/public/images/emoji/facebook_messenger/pig.png
index f1785f8302..8c5e07caf4 100644
Binary files a/public/images/emoji/facebook_messenger/pig.png and b/public/images/emoji/facebook_messenger/pig.png differ
diff --git a/public/images/emoji/facebook_messenger/pig2.png b/public/images/emoji/facebook_messenger/pig2.png
index fe2fe97e23..5dbdfafb56 100644
Binary files a/public/images/emoji/facebook_messenger/pig2.png and b/public/images/emoji/facebook_messenger/pig2.png differ
diff --git a/public/images/emoji/facebook_messenger/pig_nose.png b/public/images/emoji/facebook_messenger/pig_nose.png
index d17e33d638..63162feb5a 100644
Binary files a/public/images/emoji/facebook_messenger/pig_nose.png and b/public/images/emoji/facebook_messenger/pig_nose.png differ
diff --git a/public/images/emoji/facebook_messenger/pill.png b/public/images/emoji/facebook_messenger/pill.png
index 70b65c6a31..c1014ba812 100644
Binary files a/public/images/emoji/facebook_messenger/pill.png and b/public/images/emoji/facebook_messenger/pill.png differ
diff --git a/public/images/emoji/facebook_messenger/pineapple.png b/public/images/emoji/facebook_messenger/pineapple.png
index 3dbd743222..68c125bb0e 100644
Binary files a/public/images/emoji/facebook_messenger/pineapple.png and b/public/images/emoji/facebook_messenger/pineapple.png differ
diff --git a/public/images/emoji/facebook_messenger/ping_pong.png b/public/images/emoji/facebook_messenger/ping_pong.png
index 935993c860..4b18adbad4 100644
Binary files a/public/images/emoji/facebook_messenger/ping_pong.png and b/public/images/emoji/facebook_messenger/ping_pong.png differ
diff --git a/public/images/emoji/facebook_messenger/pisces.png b/public/images/emoji/facebook_messenger/pisces.png
index 628b9b0706..1ff18a40d1 100644
Binary files a/public/images/emoji/facebook_messenger/pisces.png and b/public/images/emoji/facebook_messenger/pisces.png differ
diff --git a/public/images/emoji/facebook_messenger/pitcairn_islands.png b/public/images/emoji/facebook_messenger/pitcairn_islands.png
index 3e3d79bca5..65730670ad 100644
Binary files a/public/images/emoji/facebook_messenger/pitcairn_islands.png and b/public/images/emoji/facebook_messenger/pitcairn_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/pizza.png b/public/images/emoji/facebook_messenger/pizza.png
index 5f34afb51d..2fb11e2299 100644
Binary files a/public/images/emoji/facebook_messenger/pizza.png and b/public/images/emoji/facebook_messenger/pizza.png differ
diff --git a/public/images/emoji/facebook_messenger/place_of_worship.png b/public/images/emoji/facebook_messenger/place_of_worship.png
index 19e1150b30..0f9025c3c4 100644
Binary files a/public/images/emoji/facebook_messenger/place_of_worship.png and b/public/images/emoji/facebook_messenger/place_of_worship.png differ
diff --git a/public/images/emoji/facebook_messenger/plate_with_cutlery.png b/public/images/emoji/facebook_messenger/plate_with_cutlery.png
index df63dcc4f4..84fd7bba6a 100644
Binary files a/public/images/emoji/facebook_messenger/plate_with_cutlery.png and b/public/images/emoji/facebook_messenger/plate_with_cutlery.png differ
diff --git a/public/images/emoji/facebook_messenger/play_or_pause_button.png b/public/images/emoji/facebook_messenger/play_or_pause_button.png
index 64b9998541..3bd3854902 100644
Binary files a/public/images/emoji/facebook_messenger/play_or_pause_button.png and b/public/images/emoji/facebook_messenger/play_or_pause_button.png differ
diff --git a/public/images/emoji/facebook_messenger/play_pause.png b/public/images/emoji/facebook_messenger/play_pause.png
index 64b9998541..3bd3854902 100644
Binary files a/public/images/emoji/facebook_messenger/play_pause.png and b/public/images/emoji/facebook_messenger/play_pause.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down.png b/public/images/emoji/facebook_messenger/point_down.png
index 0532b9ae9c..7fcb9445f8 100644
Binary files a/public/images/emoji/facebook_messenger/point_down.png and b/public/images/emoji/facebook_messenger/point_down.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/2.png b/public/images/emoji/facebook_messenger/point_down/2.png
index d0b150916e..36b4e8f495 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/2.png and b/public/images/emoji/facebook_messenger/point_down/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/3.png b/public/images/emoji/facebook_messenger/point_down/3.png
index 6230cc4801..d9ef0c3fac 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/3.png and b/public/images/emoji/facebook_messenger/point_down/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/4.png b/public/images/emoji/facebook_messenger/point_down/4.png
index 114adc6a21..edb5fc7fd8 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/4.png and b/public/images/emoji/facebook_messenger/point_down/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/5.png b/public/images/emoji/facebook_messenger/point_down/5.png
index 0717726383..ba633e5099 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/5.png and b/public/images/emoji/facebook_messenger/point_down/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/6.png b/public/images/emoji/facebook_messenger/point_down/6.png
index 38d0116c82..ff56444732 100644
Binary files a/public/images/emoji/facebook_messenger/point_down/6.png and b/public/images/emoji/facebook_messenger/point_down/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left.png b/public/images/emoji/facebook_messenger/point_left.png
index d4a84e5d31..96875e5194 100644
Binary files a/public/images/emoji/facebook_messenger/point_left.png and b/public/images/emoji/facebook_messenger/point_left.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/2.png b/public/images/emoji/facebook_messenger/point_left/2.png
index d43212ff56..6c8e8c967d 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/2.png and b/public/images/emoji/facebook_messenger/point_left/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/3.png b/public/images/emoji/facebook_messenger/point_left/3.png
index 48753a68ef..89cc0cf461 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/3.png and b/public/images/emoji/facebook_messenger/point_left/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/4.png b/public/images/emoji/facebook_messenger/point_left/4.png
index e5bda27630..5b0ec8095b 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/4.png and b/public/images/emoji/facebook_messenger/point_left/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/5.png b/public/images/emoji/facebook_messenger/point_left/5.png
index 51200df95a..4a46e5b5c5 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/5.png and b/public/images/emoji/facebook_messenger/point_left/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/6.png b/public/images/emoji/facebook_messenger/point_left/6.png
index fd6c930fc8..535f6db883 100644
Binary files a/public/images/emoji/facebook_messenger/point_left/6.png and b/public/images/emoji/facebook_messenger/point_left/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right.png b/public/images/emoji/facebook_messenger/point_right.png
index 56f542c20a..1a15c51878 100644
Binary files a/public/images/emoji/facebook_messenger/point_right.png and b/public/images/emoji/facebook_messenger/point_right.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/2.png b/public/images/emoji/facebook_messenger/point_right/2.png
index 8e85edee2b..8526515e70 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/2.png and b/public/images/emoji/facebook_messenger/point_right/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/3.png b/public/images/emoji/facebook_messenger/point_right/3.png
index 5f8007ca82..78dac1621c 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/3.png and b/public/images/emoji/facebook_messenger/point_right/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/4.png b/public/images/emoji/facebook_messenger/point_right/4.png
index 4076a56aa1..ce284c3113 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/4.png and b/public/images/emoji/facebook_messenger/point_right/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/5.png b/public/images/emoji/facebook_messenger/point_right/5.png
index 7a2f0f8033..d4aa856c6d 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/5.png and b/public/images/emoji/facebook_messenger/point_right/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/6.png b/public/images/emoji/facebook_messenger/point_right/6.png
index df280e5a7e..1dbdbecb9a 100644
Binary files a/public/images/emoji/facebook_messenger/point_right/6.png and b/public/images/emoji/facebook_messenger/point_right/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up.png b/public/images/emoji/facebook_messenger/point_up.png
index fd27f92492..1a96d5a262 100644
Binary files a/public/images/emoji/facebook_messenger/point_up.png and b/public/images/emoji/facebook_messenger/point_up.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/2.png b/public/images/emoji/facebook_messenger/point_up/2.png
index 375079cacf..7bc263020b 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/2.png and b/public/images/emoji/facebook_messenger/point_up/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/3.png b/public/images/emoji/facebook_messenger/point_up/3.png
index 7087cdd806..1fe851a11a 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/3.png and b/public/images/emoji/facebook_messenger/point_up/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/4.png b/public/images/emoji/facebook_messenger/point_up/4.png
index 22ceb6d0bd..50451f71a4 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/4.png and b/public/images/emoji/facebook_messenger/point_up/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/5.png b/public/images/emoji/facebook_messenger/point_up/5.png
index 4a7973ef63..aafee59f67 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/5.png and b/public/images/emoji/facebook_messenger/point_up/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/6.png b/public/images/emoji/facebook_messenger/point_up/6.png
index 85cb47d273..e0db9d8979 100644
Binary files a/public/images/emoji/facebook_messenger/point_up/6.png and b/public/images/emoji/facebook_messenger/point_up/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2.png b/public/images/emoji/facebook_messenger/point_up_2.png
index ebf21760c6..4461114a60 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2.png and b/public/images/emoji/facebook_messenger/point_up_2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/2.png b/public/images/emoji/facebook_messenger/point_up_2/2.png
index b6d3fddfe6..70f4b7b275 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/2.png and b/public/images/emoji/facebook_messenger/point_up_2/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/3.png b/public/images/emoji/facebook_messenger/point_up_2/3.png
index ba3389e362..97c2272512 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/3.png and b/public/images/emoji/facebook_messenger/point_up_2/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/4.png b/public/images/emoji/facebook_messenger/point_up_2/4.png
index bce3cbdfa8..cf1b6b5d25 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/4.png and b/public/images/emoji/facebook_messenger/point_up_2/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/5.png b/public/images/emoji/facebook_messenger/point_up_2/5.png
index 71f95adf24..854958f027 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/5.png and b/public/images/emoji/facebook_messenger/point_up_2/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/6.png b/public/images/emoji/facebook_messenger/point_up_2/6.png
index 7fc4a4877b..edad89b631 100644
Binary files a/public/images/emoji/facebook_messenger/point_up_2/6.png and b/public/images/emoji/facebook_messenger/point_up_2/6.png differ
diff --git a/public/images/emoji/facebook_messenger/poland.png b/public/images/emoji/facebook_messenger/poland.png
index 78057f600c..1f2087f592 100644
Binary files a/public/images/emoji/facebook_messenger/poland.png and b/public/images/emoji/facebook_messenger/poland.png differ
diff --git a/public/images/emoji/facebook_messenger/police_car.png b/public/images/emoji/facebook_messenger/police_car.png
index c77c1c05a8..123fb4dd83 100644
Binary files a/public/images/emoji/facebook_messenger/police_car.png and b/public/images/emoji/facebook_messenger/police_car.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman.png b/public/images/emoji/facebook_messenger/policeman.png
index 4efbb5500d..089df5b596 100644
Binary files a/public/images/emoji/facebook_messenger/policeman.png and b/public/images/emoji/facebook_messenger/policeman.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/2.png b/public/images/emoji/facebook_messenger/policeman/2.png
index 02f646d46f..2bf0af607a 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/2.png and b/public/images/emoji/facebook_messenger/policeman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/3.png b/public/images/emoji/facebook_messenger/policeman/3.png
index fc0d621ff8..0f03ba24e4 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/3.png and b/public/images/emoji/facebook_messenger/policeman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/4.png b/public/images/emoji/facebook_messenger/policeman/4.png
index 607565d83d..f0fb4bd4d1 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/4.png and b/public/images/emoji/facebook_messenger/policeman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/5.png b/public/images/emoji/facebook_messenger/policeman/5.png
index d54b5e01ab..bba1ef04c9 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/5.png and b/public/images/emoji/facebook_messenger/policeman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/6.png b/public/images/emoji/facebook_messenger/policeman/6.png
index cc17ff14df..7b2ccb4109 100644
Binary files a/public/images/emoji/facebook_messenger/policeman/6.png and b/public/images/emoji/facebook_messenger/policeman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman.png b/public/images/emoji/facebook_messenger/policewoman.png
index 566f93771b..baa67bd5ca 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman.png and b/public/images/emoji/facebook_messenger/policewoman.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/2.png b/public/images/emoji/facebook_messenger/policewoman/2.png
index f319e4af5d..438998317d 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/2.png and b/public/images/emoji/facebook_messenger/policewoman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/3.png b/public/images/emoji/facebook_messenger/policewoman/3.png
index c1652f098c..bf0c4a33d1 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/3.png and b/public/images/emoji/facebook_messenger/policewoman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/4.png b/public/images/emoji/facebook_messenger/policewoman/4.png
index 92fe65ff97..2117a5f9df 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/4.png and b/public/images/emoji/facebook_messenger/policewoman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/5.png b/public/images/emoji/facebook_messenger/policewoman/5.png
index 0bf22ab60d..4c4751a063 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/5.png and b/public/images/emoji/facebook_messenger/policewoman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/6.png b/public/images/emoji/facebook_messenger/policewoman/6.png
index 13ab6c5e90..f0aa3b71cd 100644
Binary files a/public/images/emoji/facebook_messenger/policewoman/6.png and b/public/images/emoji/facebook_messenger/policewoman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/poo.png b/public/images/emoji/facebook_messenger/poo.png
index e175a1dfff..7c3e519922 100644
Binary files a/public/images/emoji/facebook_messenger/poo.png and b/public/images/emoji/facebook_messenger/poo.png differ
diff --git a/public/images/emoji/facebook_messenger/poodle.png b/public/images/emoji/facebook_messenger/poodle.png
index b9cad43ce1..795f840073 100644
Binary files a/public/images/emoji/facebook_messenger/poodle.png and b/public/images/emoji/facebook_messenger/poodle.png differ
diff --git a/public/images/emoji/facebook_messenger/poop.png b/public/images/emoji/facebook_messenger/poop.png
index e175a1dfff..7c3e519922 100644
Binary files a/public/images/emoji/facebook_messenger/poop.png and b/public/images/emoji/facebook_messenger/poop.png differ
diff --git a/public/images/emoji/facebook_messenger/popcorn.png b/public/images/emoji/facebook_messenger/popcorn.png
index ccdc42f6c6..1ff9913d74 100644
Binary files a/public/images/emoji/facebook_messenger/popcorn.png and b/public/images/emoji/facebook_messenger/popcorn.png differ
diff --git a/public/images/emoji/facebook_messenger/portugal.png b/public/images/emoji/facebook_messenger/portugal.png
index 77ff099394..a21775bee9 100644
Binary files a/public/images/emoji/facebook_messenger/portugal.png and b/public/images/emoji/facebook_messenger/portugal.png differ
diff --git a/public/images/emoji/facebook_messenger/post_office.png b/public/images/emoji/facebook_messenger/post_office.png
index 18aa7cdb7a..3e78559866 100644
Binary files a/public/images/emoji/facebook_messenger/post_office.png and b/public/images/emoji/facebook_messenger/post_office.png differ
diff --git a/public/images/emoji/facebook_messenger/postal_horn.png b/public/images/emoji/facebook_messenger/postal_horn.png
index 9a03ae187c..e5fe95fcd9 100644
Binary files a/public/images/emoji/facebook_messenger/postal_horn.png and b/public/images/emoji/facebook_messenger/postal_horn.png differ
diff --git a/public/images/emoji/facebook_messenger/postbox.png b/public/images/emoji/facebook_messenger/postbox.png
index 2f59011218..e9fa114529 100644
Binary files a/public/images/emoji/facebook_messenger/postbox.png and b/public/images/emoji/facebook_messenger/postbox.png differ
diff --git a/public/images/emoji/facebook_messenger/potable_water.png b/public/images/emoji/facebook_messenger/potable_water.png
index 220cacc7cb..de49c67324 100644
Binary files a/public/images/emoji/facebook_messenger/potable_water.png and b/public/images/emoji/facebook_messenger/potable_water.png differ
diff --git a/public/images/emoji/facebook_messenger/potato.png b/public/images/emoji/facebook_messenger/potato.png
index 3f097365d9..fa933340d3 100644
Binary files a/public/images/emoji/facebook_messenger/potato.png and b/public/images/emoji/facebook_messenger/potato.png differ
diff --git a/public/images/emoji/facebook_messenger/pouch.png b/public/images/emoji/facebook_messenger/pouch.png
index dd0ff20054..9f7276a17d 100644
Binary files a/public/images/emoji/facebook_messenger/pouch.png and b/public/images/emoji/facebook_messenger/pouch.png differ
diff --git a/public/images/emoji/facebook_messenger/poultry_leg.png b/public/images/emoji/facebook_messenger/poultry_leg.png
index 9c2d26a096..a04a253a01 100644
Binary files a/public/images/emoji/facebook_messenger/poultry_leg.png and b/public/images/emoji/facebook_messenger/poultry_leg.png differ
diff --git a/public/images/emoji/facebook_messenger/pound.png b/public/images/emoji/facebook_messenger/pound.png
index 8b25b67c8e..8e210f98c6 100644
Binary files a/public/images/emoji/facebook_messenger/pound.png and b/public/images/emoji/facebook_messenger/pound.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_cat.png b/public/images/emoji/facebook_messenger/pouting_cat.png
index bebe99a8aa..51e21f5413 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_cat.png and b/public/images/emoji/facebook_messenger/pouting_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man.png b/public/images/emoji/facebook_messenger/pouting_man.png
index c6392b40a6..94f4177368 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man.png and b/public/images/emoji/facebook_messenger/pouting_man.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/2.png b/public/images/emoji/facebook_messenger/pouting_man/2.png
index b5f4f2999a..5b0bc09a1d 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/2.png and b/public/images/emoji/facebook_messenger/pouting_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/3.png b/public/images/emoji/facebook_messenger/pouting_man/3.png
index 7ca74c419e..faed5e8dbe 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/3.png and b/public/images/emoji/facebook_messenger/pouting_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/4.png b/public/images/emoji/facebook_messenger/pouting_man/4.png
index 0e99fe45b1..f974f060ef 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/4.png and b/public/images/emoji/facebook_messenger/pouting_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/5.png b/public/images/emoji/facebook_messenger/pouting_man/5.png
index 91faf90cf5..db6d87d8a1 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/5.png and b/public/images/emoji/facebook_messenger/pouting_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/6.png b/public/images/emoji/facebook_messenger/pouting_man/6.png
index 0715623063..aa08b03bb1 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_man/6.png and b/public/images/emoji/facebook_messenger/pouting_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman.png b/public/images/emoji/facebook_messenger/pouting_woman.png
index 038973f940..0a66b08a91 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman.png and b/public/images/emoji/facebook_messenger/pouting_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/2.png b/public/images/emoji/facebook_messenger/pouting_woman/2.png
index 65473cdbce..edd22d5222 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/2.png and b/public/images/emoji/facebook_messenger/pouting_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/3.png b/public/images/emoji/facebook_messenger/pouting_woman/3.png
index 82e31162c0..17d2ba1ee3 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/3.png and b/public/images/emoji/facebook_messenger/pouting_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/4.png b/public/images/emoji/facebook_messenger/pouting_woman/4.png
index 838df0d656..260cfdba5c 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/4.png and b/public/images/emoji/facebook_messenger/pouting_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/5.png b/public/images/emoji/facebook_messenger/pouting_woman/5.png
index cedf79afd2..12ad6a1f5c 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/5.png and b/public/images/emoji/facebook_messenger/pouting_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/6.png b/public/images/emoji/facebook_messenger/pouting_woman/6.png
index 7bb2a217db..3829aed5ab 100644
Binary files a/public/images/emoji/facebook_messenger/pouting_woman/6.png and b/public/images/emoji/facebook_messenger/pouting_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/pray.png b/public/images/emoji/facebook_messenger/pray.png
index ef38e89858..1a069bcab0 100644
Binary files a/public/images/emoji/facebook_messenger/pray.png and b/public/images/emoji/facebook_messenger/pray.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/2.png b/public/images/emoji/facebook_messenger/pray/2.png
index 0d60a4c0e9..54525f1055 100644
Binary files a/public/images/emoji/facebook_messenger/pray/2.png and b/public/images/emoji/facebook_messenger/pray/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/3.png b/public/images/emoji/facebook_messenger/pray/3.png
index 11b9f06462..4343b2c3e0 100644
Binary files a/public/images/emoji/facebook_messenger/pray/3.png and b/public/images/emoji/facebook_messenger/pray/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/4.png b/public/images/emoji/facebook_messenger/pray/4.png
index ab26567ae2..5747f4d709 100644
Binary files a/public/images/emoji/facebook_messenger/pray/4.png and b/public/images/emoji/facebook_messenger/pray/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/5.png b/public/images/emoji/facebook_messenger/pray/5.png
index 97ddc0f08b..892e083833 100644
Binary files a/public/images/emoji/facebook_messenger/pray/5.png and b/public/images/emoji/facebook_messenger/pray/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/6.png b/public/images/emoji/facebook_messenger/pray/6.png
index bf6a32e347..3383ad6233 100644
Binary files a/public/images/emoji/facebook_messenger/pray/6.png and b/public/images/emoji/facebook_messenger/pray/6.png differ
diff --git a/public/images/emoji/facebook_messenger/prayer_beads.png b/public/images/emoji/facebook_messenger/prayer_beads.png
index 71d6e55ae0..9fe4026f77 100644
Binary files a/public/images/emoji/facebook_messenger/prayer_beads.png and b/public/images/emoji/facebook_messenger/prayer_beads.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman.png b/public/images/emoji/facebook_messenger/pregnant_woman.png
index d965748c88..b63c159fd2 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman.png and b/public/images/emoji/facebook_messenger/pregnant_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/2.png b/public/images/emoji/facebook_messenger/pregnant_woman/2.png
index 5b63304634..e3227b2ece 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/2.png and b/public/images/emoji/facebook_messenger/pregnant_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/3.png b/public/images/emoji/facebook_messenger/pregnant_woman/3.png
index 5ff2e3c432..a5b40edbb4 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/3.png and b/public/images/emoji/facebook_messenger/pregnant_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/4.png b/public/images/emoji/facebook_messenger/pregnant_woman/4.png
index 6b6241fefc..d3727ba9df 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/4.png and b/public/images/emoji/facebook_messenger/pregnant_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/5.png b/public/images/emoji/facebook_messenger/pregnant_woman/5.png
index ddc0648e8e..135d60bad3 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/5.png and b/public/images/emoji/facebook_messenger/pregnant_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/6.png b/public/images/emoji/facebook_messenger/pregnant_woman/6.png
index 04918ba738..cbdf43e299 100644
Binary files a/public/images/emoji/facebook_messenger/pregnant_woman/6.png and b/public/images/emoji/facebook_messenger/pregnant_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/pretzel.png b/public/images/emoji/facebook_messenger/pretzel.png
index 9116d6ee9a..d2704035f8 100644
Binary files a/public/images/emoji/facebook_messenger/pretzel.png and b/public/images/emoji/facebook_messenger/pretzel.png differ
diff --git a/public/images/emoji/facebook_messenger/previous_track.png b/public/images/emoji/facebook_messenger/previous_track.png
index ada39abc33..5794a548e0 100644
Binary files a/public/images/emoji/facebook_messenger/previous_track.png and b/public/images/emoji/facebook_messenger/previous_track.png differ
diff --git a/public/images/emoji/facebook_messenger/previous_track_button.png b/public/images/emoji/facebook_messenger/previous_track_button.png
index ada39abc33..5794a548e0 100644
Binary files a/public/images/emoji/facebook_messenger/previous_track_button.png and b/public/images/emoji/facebook_messenger/previous_track_button.png differ
diff --git a/public/images/emoji/facebook_messenger/prince.png b/public/images/emoji/facebook_messenger/prince.png
index 5ec0ddf76b..6757b6dfec 100644
Binary files a/public/images/emoji/facebook_messenger/prince.png and b/public/images/emoji/facebook_messenger/prince.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/2.png b/public/images/emoji/facebook_messenger/prince/2.png
index dd91dd02fa..e19a6da4ac 100644
Binary files a/public/images/emoji/facebook_messenger/prince/2.png and b/public/images/emoji/facebook_messenger/prince/2.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/3.png b/public/images/emoji/facebook_messenger/prince/3.png
index d3e3618184..26ca89e073 100644
Binary files a/public/images/emoji/facebook_messenger/prince/3.png and b/public/images/emoji/facebook_messenger/prince/3.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/4.png b/public/images/emoji/facebook_messenger/prince/4.png
index a00e9eb039..4a2ab0fbc3 100644
Binary files a/public/images/emoji/facebook_messenger/prince/4.png and b/public/images/emoji/facebook_messenger/prince/4.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/5.png b/public/images/emoji/facebook_messenger/prince/5.png
index 2d2fabb6ec..38ce9dcac5 100644
Binary files a/public/images/emoji/facebook_messenger/prince/5.png and b/public/images/emoji/facebook_messenger/prince/5.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/6.png b/public/images/emoji/facebook_messenger/prince/6.png
index 5f7f4ec891..958ed52684 100644
Binary files a/public/images/emoji/facebook_messenger/prince/6.png and b/public/images/emoji/facebook_messenger/prince/6.png differ
diff --git a/public/images/emoji/facebook_messenger/princess.png b/public/images/emoji/facebook_messenger/princess.png
index 83b1de6c49..6f6aad8f43 100644
Binary files a/public/images/emoji/facebook_messenger/princess.png and b/public/images/emoji/facebook_messenger/princess.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/2.png b/public/images/emoji/facebook_messenger/princess/2.png
index f44ba4578b..971ffc3e61 100644
Binary files a/public/images/emoji/facebook_messenger/princess/2.png and b/public/images/emoji/facebook_messenger/princess/2.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/3.png b/public/images/emoji/facebook_messenger/princess/3.png
index 49933ec338..ba1b72b84c 100644
Binary files a/public/images/emoji/facebook_messenger/princess/3.png and b/public/images/emoji/facebook_messenger/princess/3.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/4.png b/public/images/emoji/facebook_messenger/princess/4.png
index 2af30a213b..44536b62e1 100644
Binary files a/public/images/emoji/facebook_messenger/princess/4.png and b/public/images/emoji/facebook_messenger/princess/4.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/5.png b/public/images/emoji/facebook_messenger/princess/5.png
index 08e62a5795..66018a5819 100644
Binary files a/public/images/emoji/facebook_messenger/princess/5.png and b/public/images/emoji/facebook_messenger/princess/5.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/6.png b/public/images/emoji/facebook_messenger/princess/6.png
index 6ee3cd3da1..854e0bfd41 100644
Binary files a/public/images/emoji/facebook_messenger/princess/6.png and b/public/images/emoji/facebook_messenger/princess/6.png differ
diff --git a/public/images/emoji/facebook_messenger/printer.png b/public/images/emoji/facebook_messenger/printer.png
index 3fbfb20f27..51d12393ef 100644
Binary files a/public/images/emoji/facebook_messenger/printer.png and b/public/images/emoji/facebook_messenger/printer.png differ
diff --git a/public/images/emoji/facebook_messenger/projector.png b/public/images/emoji/facebook_messenger/projector.png
index 3acb6ea9c3..61cf7f7bac 100644
Binary files a/public/images/emoji/facebook_messenger/projector.png and b/public/images/emoji/facebook_messenger/projector.png differ
diff --git a/public/images/emoji/facebook_messenger/puerto_rico.png b/public/images/emoji/facebook_messenger/puerto_rico.png
index 5270bb9f87..62984354a8 100644
Binary files a/public/images/emoji/facebook_messenger/puerto_rico.png and b/public/images/emoji/facebook_messenger/puerto_rico.png differ
diff --git a/public/images/emoji/facebook_messenger/punch.png b/public/images/emoji/facebook_messenger/punch.png
index ed3c41bc0d..9db84ed1fd 100644
Binary files a/public/images/emoji/facebook_messenger/punch.png and b/public/images/emoji/facebook_messenger/punch.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/2.png b/public/images/emoji/facebook_messenger/punch/2.png
index e499d8d0fa..b14e4d7984 100644
Binary files a/public/images/emoji/facebook_messenger/punch/2.png and b/public/images/emoji/facebook_messenger/punch/2.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/3.png b/public/images/emoji/facebook_messenger/punch/3.png
index f56ee4a1ff..4972f25e1e 100644
Binary files a/public/images/emoji/facebook_messenger/punch/3.png and b/public/images/emoji/facebook_messenger/punch/3.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/4.png b/public/images/emoji/facebook_messenger/punch/4.png
index bc6cebcbf6..4233ef0d5a 100644
Binary files a/public/images/emoji/facebook_messenger/punch/4.png and b/public/images/emoji/facebook_messenger/punch/4.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/5.png b/public/images/emoji/facebook_messenger/punch/5.png
index c8313f984f..a82a578585 100644
Binary files a/public/images/emoji/facebook_messenger/punch/5.png and b/public/images/emoji/facebook_messenger/punch/5.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/6.png b/public/images/emoji/facebook_messenger/punch/6.png
index cf2064a1ad..73efba003b 100644
Binary files a/public/images/emoji/facebook_messenger/punch/6.png and b/public/images/emoji/facebook_messenger/punch/6.png differ
diff --git a/public/images/emoji/facebook_messenger/purple_heart.png b/public/images/emoji/facebook_messenger/purple_heart.png
index f055ac431c..fbc2b035fd 100644
Binary files a/public/images/emoji/facebook_messenger/purple_heart.png and b/public/images/emoji/facebook_messenger/purple_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/purse.png b/public/images/emoji/facebook_messenger/purse.png
index ec56d3b10a..75f4318ca0 100644
Binary files a/public/images/emoji/facebook_messenger/purse.png and b/public/images/emoji/facebook_messenger/purse.png differ
diff --git a/public/images/emoji/facebook_messenger/pushpin.png b/public/images/emoji/facebook_messenger/pushpin.png
index 79cf94cf55..783a05ec84 100644
Binary files a/public/images/emoji/facebook_messenger/pushpin.png and b/public/images/emoji/facebook_messenger/pushpin.png differ
diff --git a/public/images/emoji/facebook_messenger/put_litter_in_its_place.png b/public/images/emoji/facebook_messenger/put_litter_in_its_place.png
index fae27e6a25..fcf7e4d8fc 100644
Binary files a/public/images/emoji/facebook_messenger/put_litter_in_its_place.png and b/public/images/emoji/facebook_messenger/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/facebook_messenger/qatar.png b/public/images/emoji/facebook_messenger/qatar.png
index f51ae1d0ff..35e3a77782 100644
Binary files a/public/images/emoji/facebook_messenger/qatar.png and b/public/images/emoji/facebook_messenger/qatar.png differ
diff --git a/public/images/emoji/facebook_messenger/question.png b/public/images/emoji/facebook_messenger/question.png
index 7e87b10732..c1fb56fd01 100644
Binary files a/public/images/emoji/facebook_messenger/question.png and b/public/images/emoji/facebook_messenger/question.png differ
diff --git a/public/images/emoji/facebook_messenger/rabbit.png b/public/images/emoji/facebook_messenger/rabbit.png
index 637d9d57d7..83b69e3e77 100644
Binary files a/public/images/emoji/facebook_messenger/rabbit.png and b/public/images/emoji/facebook_messenger/rabbit.png differ
diff --git a/public/images/emoji/facebook_messenger/rabbit2.png b/public/images/emoji/facebook_messenger/rabbit2.png
index 63b2bb144b..1f448ab008 100644
Binary files a/public/images/emoji/facebook_messenger/rabbit2.png and b/public/images/emoji/facebook_messenger/rabbit2.png differ
diff --git a/public/images/emoji/facebook_messenger/race_car.png b/public/images/emoji/facebook_messenger/race_car.png
index 894f1b62c2..7f4a20f3e5 100644
Binary files a/public/images/emoji/facebook_messenger/race_car.png and b/public/images/emoji/facebook_messenger/race_car.png differ
diff --git a/public/images/emoji/facebook_messenger/racehorse.png b/public/images/emoji/facebook_messenger/racehorse.png
index 986b22d2b2..81bfe0d256 100644
Binary files a/public/images/emoji/facebook_messenger/racehorse.png and b/public/images/emoji/facebook_messenger/racehorse.png differ
diff --git a/public/images/emoji/facebook_messenger/racing_car.png b/public/images/emoji/facebook_messenger/racing_car.png
index 894f1b62c2..7f4a20f3e5 100644
Binary files a/public/images/emoji/facebook_messenger/racing_car.png and b/public/images/emoji/facebook_messenger/racing_car.png differ
diff --git a/public/images/emoji/facebook_messenger/racing_motorcycle.png b/public/images/emoji/facebook_messenger/racing_motorcycle.png
index ba7fb373ba..a23e481708 100644
Binary files a/public/images/emoji/facebook_messenger/racing_motorcycle.png and b/public/images/emoji/facebook_messenger/racing_motorcycle.png differ
diff --git a/public/images/emoji/facebook_messenger/radio.png b/public/images/emoji/facebook_messenger/radio.png
index ee26ea72d4..f9be30dc8a 100644
Binary files a/public/images/emoji/facebook_messenger/radio.png and b/public/images/emoji/facebook_messenger/radio.png differ
diff --git a/public/images/emoji/facebook_messenger/radio_button.png b/public/images/emoji/facebook_messenger/radio_button.png
index 2e744fd151..a0abadd2f3 100644
Binary files a/public/images/emoji/facebook_messenger/radio_button.png and b/public/images/emoji/facebook_messenger/radio_button.png differ
diff --git a/public/images/emoji/facebook_messenger/radioactive.png b/public/images/emoji/facebook_messenger/radioactive.png
index 8fdf276cd2..9d347aea25 100644
Binary files a/public/images/emoji/facebook_messenger/radioactive.png and b/public/images/emoji/facebook_messenger/radioactive.png differ
diff --git a/public/images/emoji/facebook_messenger/radioactive_sign.png b/public/images/emoji/facebook_messenger/radioactive_sign.png
index 8fdf276cd2..9d347aea25 100644
Binary files a/public/images/emoji/facebook_messenger/radioactive_sign.png and b/public/images/emoji/facebook_messenger/radioactive_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/rage.png b/public/images/emoji/facebook_messenger/rage.png
index 70ce2bd0c9..668631f0b3 100644
Binary files a/public/images/emoji/facebook_messenger/rage.png and b/public/images/emoji/facebook_messenger/rage.png differ
diff --git a/public/images/emoji/facebook_messenger/railroad_track.png b/public/images/emoji/facebook_messenger/railroad_track.png
index 7b456ff579..b15ae4cb9b 100644
Binary files a/public/images/emoji/facebook_messenger/railroad_track.png and b/public/images/emoji/facebook_messenger/railroad_track.png differ
diff --git a/public/images/emoji/facebook_messenger/railway_car.png b/public/images/emoji/facebook_messenger/railway_car.png
index dedb706da2..e6e20a0b25 100644
Binary files a/public/images/emoji/facebook_messenger/railway_car.png and b/public/images/emoji/facebook_messenger/railway_car.png differ
diff --git a/public/images/emoji/facebook_messenger/railway_track.png b/public/images/emoji/facebook_messenger/railway_track.png
index 7b456ff579..b15ae4cb9b 100644
Binary files a/public/images/emoji/facebook_messenger/railway_track.png and b/public/images/emoji/facebook_messenger/railway_track.png differ
diff --git a/public/images/emoji/facebook_messenger/rainbow.png b/public/images/emoji/facebook_messenger/rainbow.png
index 4d82fd066d..9f1a380b39 100644
Binary files a/public/images/emoji/facebook_messenger/rainbow.png and b/public/images/emoji/facebook_messenger/rainbow.png differ
diff --git a/public/images/emoji/facebook_messenger/rainbow_flag.png b/public/images/emoji/facebook_messenger/rainbow_flag.png
index af14c94a4f..e0e4ae944c 100644
Binary files a/public/images/emoji/facebook_messenger/rainbow_flag.png and b/public/images/emoji/facebook_messenger/rainbow_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand.png b/public/images/emoji/facebook_messenger/raised_back_of_hand.png
index 7e8bd4c6ad..abb7de33c5 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png
index a65c925100..c622368d5d 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png
index 527e2055be..c0475b7eb6 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png
index 35a4c34bc7..160b1392bb 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png
index 3a75748ef9..2bff5ba494 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png
index db1c8f050c..1ee0d693d8 100644
Binary files a/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png and b/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand.png b/public/images/emoji/facebook_messenger/raised_hand.png
index a0097d9b71..17f858c2fa 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand.png and b/public/images/emoji/facebook_messenger/raised_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/2.png b/public/images/emoji/facebook_messenger/raised_hand/2.png
index d23202d6c3..8a4a4e6f84 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/2.png and b/public/images/emoji/facebook_messenger/raised_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/3.png b/public/images/emoji/facebook_messenger/raised_hand/3.png
index 7ff91aea00..8dd6e6e709 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/3.png and b/public/images/emoji/facebook_messenger/raised_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/4.png b/public/images/emoji/facebook_messenger/raised_hand/4.png
index 635801f647..93dcc99aee 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/4.png and b/public/images/emoji/facebook_messenger/raised_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/5.png b/public/images/emoji/facebook_messenger/raised_hand/5.png
index 63bc01077e..dbf83f9523 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/5.png and b/public/images/emoji/facebook_messenger/raised_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/6.png b/public/images/emoji/facebook_messenger/raised_hand/6.png
index 244c30c382..05c48ac0bb 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand/6.png and b/public/images/emoji/facebook_messenger/raised_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png
index f41f01af47..600cb22c58 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png
index 37a9048ad7..0550a92fe4 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png
index 6ddd74b586..ed89af340f 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png
index 1d901925fe..6318255a29 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png
index 5fcac72a70..6ce8d07a14 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png
index 74fa972cad..d382007e54 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png
index 6245929457..af49237861 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png
index 5cdfab6d9a..125b8d015e 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png
index a469f9b420..193de9bced 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png
index a8803b8816..51453315d7 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png
index 2d9def823e..444ed219e9 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png
index bbcb6dc0d3..a4b6672c64 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands.png b/public/images/emoji/facebook_messenger/raised_hands.png
index c162e95558..4bdb955cc5 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands.png and b/public/images/emoji/facebook_messenger/raised_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/2.png b/public/images/emoji/facebook_messenger/raised_hands/2.png
index ba12906310..34cc85cede 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/2.png and b/public/images/emoji/facebook_messenger/raised_hands/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/3.png b/public/images/emoji/facebook_messenger/raised_hands/3.png
index e377f7180f..21bddf28cd 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/3.png and b/public/images/emoji/facebook_messenger/raised_hands/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/4.png b/public/images/emoji/facebook_messenger/raised_hands/4.png
index 79139782ea..2b124dcda9 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/4.png and b/public/images/emoji/facebook_messenger/raised_hands/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/5.png b/public/images/emoji/facebook_messenger/raised_hands/5.png
index b7ae99b4c5..c9112c05a6 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/5.png and b/public/images/emoji/facebook_messenger/raised_hands/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/6.png b/public/images/emoji/facebook_messenger/raised_hands/6.png
index 15dc25b2b2..a0642e5b15 100644
Binary files a/public/images/emoji/facebook_messenger/raised_hands/6.png and b/public/images/emoji/facebook_messenger/raised_hands/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand.png b/public/images/emoji/facebook_messenger/raising_hand.png
index 0a94688c88..1e03e1bde1 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand.png and b/public/images/emoji/facebook_messenger/raising_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/2.png b/public/images/emoji/facebook_messenger/raising_hand/2.png
index 342d6fafd0..400080c70e 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/2.png and b/public/images/emoji/facebook_messenger/raising_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/3.png b/public/images/emoji/facebook_messenger/raising_hand/3.png
index 6a27504e81..347e5f871e 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/3.png and b/public/images/emoji/facebook_messenger/raising_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/4.png b/public/images/emoji/facebook_messenger/raising_hand/4.png
index daa638dc6a..20a6a4c9b3 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/4.png and b/public/images/emoji/facebook_messenger/raising_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/5.png b/public/images/emoji/facebook_messenger/raising_hand/5.png
index 457f7ed4c5..059d302879 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/5.png and b/public/images/emoji/facebook_messenger/raising_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/6.png b/public/images/emoji/facebook_messenger/raising_hand/6.png
index 1d3bc70cc9..ae530be026 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand/6.png and b/public/images/emoji/facebook_messenger/raising_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man.png b/public/images/emoji/facebook_messenger/raising_hand_man.png
index 888c2e010f..cf96d698db 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man.png and b/public/images/emoji/facebook_messenger/raising_hand_man.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/2.png b/public/images/emoji/facebook_messenger/raising_hand_man/2.png
index 358c2c878b..f61b7a8f53 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/2.png and b/public/images/emoji/facebook_messenger/raising_hand_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/3.png b/public/images/emoji/facebook_messenger/raising_hand_man/3.png
index ebe5b4b0eb..d94d91daad 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/3.png and b/public/images/emoji/facebook_messenger/raising_hand_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/4.png b/public/images/emoji/facebook_messenger/raising_hand_man/4.png
index a2d3d552bb..546d314360 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/4.png and b/public/images/emoji/facebook_messenger/raising_hand_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/5.png b/public/images/emoji/facebook_messenger/raising_hand_man/5.png
index 385867923f..00499a04c6 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/5.png and b/public/images/emoji/facebook_messenger/raising_hand_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/6.png b/public/images/emoji/facebook_messenger/raising_hand_man/6.png
index 21a811c997..8adb5702f5 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_man/6.png and b/public/images/emoji/facebook_messenger/raising_hand_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman.png b/public/images/emoji/facebook_messenger/raising_hand_woman.png
index 0a94688c88..1e03e1bde1 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman.png and b/public/images/emoji/facebook_messenger/raising_hand_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/2.png b/public/images/emoji/facebook_messenger/raising_hand_woman/2.png
index 342d6fafd0..400080c70e 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/2.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/3.png b/public/images/emoji/facebook_messenger/raising_hand_woman/3.png
index 6a27504e81..347e5f871e 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/3.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/4.png b/public/images/emoji/facebook_messenger/raising_hand_woman/4.png
index daa638dc6a..20a6a4c9b3 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/4.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/5.png b/public/images/emoji/facebook_messenger/raising_hand_woman/5.png
index 457f7ed4c5..059d302879 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/5.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/6.png b/public/images/emoji/facebook_messenger/raising_hand_woman/6.png
index 1d3bc70cc9..ae530be026 100644
Binary files a/public/images/emoji/facebook_messenger/raising_hand_woman/6.png and b/public/images/emoji/facebook_messenger/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ram.png b/public/images/emoji/facebook_messenger/ram.png
index 4b0dd9f559..112d5fe61a 100644
Binary files a/public/images/emoji/facebook_messenger/ram.png and b/public/images/emoji/facebook_messenger/ram.png differ
diff --git a/public/images/emoji/facebook_messenger/ramen.png b/public/images/emoji/facebook_messenger/ramen.png
index 19d41b3efe..d9f74704a9 100644
Binary files a/public/images/emoji/facebook_messenger/ramen.png and b/public/images/emoji/facebook_messenger/ramen.png differ
diff --git a/public/images/emoji/facebook_messenger/rat.png b/public/images/emoji/facebook_messenger/rat.png
index 54c84f5778..6178f5c85b 100644
Binary files a/public/images/emoji/facebook_messenger/rat.png and b/public/images/emoji/facebook_messenger/rat.png differ
diff --git a/public/images/emoji/facebook_messenger/record_button.png b/public/images/emoji/facebook_messenger/record_button.png
index 9015b0fde1..b876f26aea 100644
Binary files a/public/images/emoji/facebook_messenger/record_button.png and b/public/images/emoji/facebook_messenger/record_button.png differ
diff --git a/public/images/emoji/facebook_messenger/recycle.png b/public/images/emoji/facebook_messenger/recycle.png
index aa374a2d34..79627cb74d 100644
Binary files a/public/images/emoji/facebook_messenger/recycle.png and b/public/images/emoji/facebook_messenger/recycle.png differ
diff --git a/public/images/emoji/facebook_messenger/red_car.png b/public/images/emoji/facebook_messenger/red_car.png
index 15024a56bd..8f5d52b249 100644
Binary files a/public/images/emoji/facebook_messenger/red_car.png and b/public/images/emoji/facebook_messenger/red_car.png differ
diff --git a/public/images/emoji/facebook_messenger/red_circle.png b/public/images/emoji/facebook_messenger/red_circle.png
index fef186ba91..381aa5eae2 100644
Binary files a/public/images/emoji/facebook_messenger/red_circle.png and b/public/images/emoji/facebook_messenger/red_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/registered.png b/public/images/emoji/facebook_messenger/registered.png
index b2242fe470..aaa5b08f6f 100644
Binary files a/public/images/emoji/facebook_messenger/registered.png and b/public/images/emoji/facebook_messenger/registered.png differ
diff --git a/public/images/emoji/facebook_messenger/relaxed.png b/public/images/emoji/facebook_messenger/relaxed.png
index 749a05960d..a22687bafc 100644
Binary files a/public/images/emoji/facebook_messenger/relaxed.png and b/public/images/emoji/facebook_messenger/relaxed.png differ
diff --git a/public/images/emoji/facebook_messenger/relieved.png b/public/images/emoji/facebook_messenger/relieved.png
index faceb08c80..8e7ec32047 100644
Binary files a/public/images/emoji/facebook_messenger/relieved.png and b/public/images/emoji/facebook_messenger/relieved.png differ
diff --git a/public/images/emoji/facebook_messenger/reminder_ribbon.png b/public/images/emoji/facebook_messenger/reminder_ribbon.png
index 09d8d0e308..0375adc7c0 100644
Binary files a/public/images/emoji/facebook_messenger/reminder_ribbon.png and b/public/images/emoji/facebook_messenger/reminder_ribbon.png differ
diff --git a/public/images/emoji/facebook_messenger/repeat.png b/public/images/emoji/facebook_messenger/repeat.png
index 73597ff253..449fbd9852 100644
Binary files a/public/images/emoji/facebook_messenger/repeat.png and b/public/images/emoji/facebook_messenger/repeat.png differ
diff --git a/public/images/emoji/facebook_messenger/repeat_one.png b/public/images/emoji/facebook_messenger/repeat_one.png
index 832543f62d..cd67c1061e 100644
Binary files a/public/images/emoji/facebook_messenger/repeat_one.png and b/public/images/emoji/facebook_messenger/repeat_one.png differ
diff --git a/public/images/emoji/facebook_messenger/rescue_worker_helmet.png b/public/images/emoji/facebook_messenger/rescue_worker_helmet.png
index ad220c2eef..959efb0fb0 100644
Binary files a/public/images/emoji/facebook_messenger/rescue_worker_helmet.png and b/public/images/emoji/facebook_messenger/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/facebook_messenger/restroom.png b/public/images/emoji/facebook_messenger/restroom.png
index 9322abb6bf..d6bbaeb20c 100644
Binary files a/public/images/emoji/facebook_messenger/restroom.png and b/public/images/emoji/facebook_messenger/restroom.png differ
diff --git a/public/images/emoji/facebook_messenger/reunion.png b/public/images/emoji/facebook_messenger/reunion.png
index 1679d4c5b9..6104c8cbe6 100644
Binary files a/public/images/emoji/facebook_messenger/reunion.png and b/public/images/emoji/facebook_messenger/reunion.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png
index 8e7fce2f49..7f227d2d23 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png
index 992338bb2b..14c75b484f 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png
index aadc06129f..e403a196a5 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png
index 8ad10be116..d8507a7f62 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png
index 695c4a6cb9..e67c93cb2a 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png
index 3457e01312..c3bd0d882f 100644
Binary files a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/facebook_messenger/revolving_hearts.png b/public/images/emoji/facebook_messenger/revolving_hearts.png
index 9a6f39ef71..f9ce212348 100644
Binary files a/public/images/emoji/facebook_messenger/revolving_hearts.png and b/public/images/emoji/facebook_messenger/revolving_hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/rewind.png b/public/images/emoji/facebook_messenger/rewind.png
index 685f57f86c..4dac953768 100644
Binary files a/public/images/emoji/facebook_messenger/rewind.png and b/public/images/emoji/facebook_messenger/rewind.png differ
diff --git a/public/images/emoji/facebook_messenger/rhinoceros.png b/public/images/emoji/facebook_messenger/rhinoceros.png
index e81681a603..9e5f1a55f4 100644
Binary files a/public/images/emoji/facebook_messenger/rhinoceros.png and b/public/images/emoji/facebook_messenger/rhinoceros.png differ
diff --git a/public/images/emoji/facebook_messenger/ribbon.png b/public/images/emoji/facebook_messenger/ribbon.png
index 2a236f2a13..1a031384e0 100644
Binary files a/public/images/emoji/facebook_messenger/ribbon.png and b/public/images/emoji/facebook_messenger/ribbon.png differ
diff --git a/public/images/emoji/facebook_messenger/rice.png b/public/images/emoji/facebook_messenger/rice.png
index 60de4a64f2..fcf702b567 100644
Binary files a/public/images/emoji/facebook_messenger/rice.png and b/public/images/emoji/facebook_messenger/rice.png differ
diff --git a/public/images/emoji/facebook_messenger/rice_ball.png b/public/images/emoji/facebook_messenger/rice_ball.png
index 13a97cc4ef..660f25d854 100644
Binary files a/public/images/emoji/facebook_messenger/rice_ball.png and b/public/images/emoji/facebook_messenger/rice_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/rice_cracker.png b/public/images/emoji/facebook_messenger/rice_cracker.png
index ad821b7575..d366fe9c83 100644
Binary files a/public/images/emoji/facebook_messenger/rice_cracker.png and b/public/images/emoji/facebook_messenger/rice_cracker.png differ
diff --git a/public/images/emoji/facebook_messenger/rice_scene.png b/public/images/emoji/facebook_messenger/rice_scene.png
index a9ff32238a..e54a58e204 100644
Binary files a/public/images/emoji/facebook_messenger/rice_scene.png and b/public/images/emoji/facebook_messenger/rice_scene.png differ
diff --git a/public/images/emoji/facebook_messenger/right_anger_bubble.png b/public/images/emoji/facebook_messenger/right_anger_bubble.png
index 3d3ee7dcfa..c9f3e48c81 100644
Binary files a/public/images/emoji/facebook_messenger/right_anger_bubble.png and b/public/images/emoji/facebook_messenger/right_anger_bubble.png differ
diff --git a/public/images/emoji/facebook_messenger/ring.png b/public/images/emoji/facebook_messenger/ring.png
index 88f8ad512b..226998089e 100644
Binary files a/public/images/emoji/facebook_messenger/ring.png and b/public/images/emoji/facebook_messenger/ring.png differ
diff --git a/public/images/emoji/facebook_messenger/robot.png b/public/images/emoji/facebook_messenger/robot.png
index c728ecf9c1..9d5170fb7f 100644
Binary files a/public/images/emoji/facebook_messenger/robot.png and b/public/images/emoji/facebook_messenger/robot.png differ
diff --git a/public/images/emoji/facebook_messenger/robot_face.png b/public/images/emoji/facebook_messenger/robot_face.png
index c728ecf9c1..9d5170fb7f 100644
Binary files a/public/images/emoji/facebook_messenger/robot_face.png and b/public/images/emoji/facebook_messenger/robot_face.png differ
diff --git a/public/images/emoji/facebook_messenger/rocket.png b/public/images/emoji/facebook_messenger/rocket.png
index 518c778f8b..00b96d3c7d 100644
Binary files a/public/images/emoji/facebook_messenger/rocket.png and b/public/images/emoji/facebook_messenger/rocket.png differ
diff --git a/public/images/emoji/facebook_messenger/rofl.png b/public/images/emoji/facebook_messenger/rofl.png
index ab648dd83d..7e75f50e65 100644
Binary files a/public/images/emoji/facebook_messenger/rofl.png and b/public/images/emoji/facebook_messenger/rofl.png differ
diff --git a/public/images/emoji/facebook_messenger/roll_eyes.png b/public/images/emoji/facebook_messenger/roll_eyes.png
index 8a864a00bd..06b96d4c45 100644
Binary files a/public/images/emoji/facebook_messenger/roll_eyes.png and b/public/images/emoji/facebook_messenger/roll_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/rolled_up_newspaper.png b/public/images/emoji/facebook_messenger/rolled_up_newspaper.png
index 052dcce75f..785c9d1767 100644
Binary files a/public/images/emoji/facebook_messenger/rolled_up_newspaper.png and b/public/images/emoji/facebook_messenger/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/facebook_messenger/roller_coaster.png b/public/images/emoji/facebook_messenger/roller_coaster.png
index 1d1919e0cd..8523147fc4 100644
Binary files a/public/images/emoji/facebook_messenger/roller_coaster.png and b/public/images/emoji/facebook_messenger/roller_coaster.png differ
diff --git a/public/images/emoji/facebook_messenger/rolling_eyes.png b/public/images/emoji/facebook_messenger/rolling_eyes.png
index 8a864a00bd..06b96d4c45 100644
Binary files a/public/images/emoji/facebook_messenger/rolling_eyes.png and b/public/images/emoji/facebook_messenger/rolling_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/romania.png b/public/images/emoji/facebook_messenger/romania.png
index 2b16324878..7b7ea9a3fe 100644
Binary files a/public/images/emoji/facebook_messenger/romania.png and b/public/images/emoji/facebook_messenger/romania.png differ
diff --git a/public/images/emoji/facebook_messenger/rooster.png b/public/images/emoji/facebook_messenger/rooster.png
index 3360815814..d07cd89243 100644
Binary files a/public/images/emoji/facebook_messenger/rooster.png and b/public/images/emoji/facebook_messenger/rooster.png differ
diff --git a/public/images/emoji/facebook_messenger/rose.png b/public/images/emoji/facebook_messenger/rose.png
index be7bcb7ae7..11e4246a1c 100644
Binary files a/public/images/emoji/facebook_messenger/rose.png and b/public/images/emoji/facebook_messenger/rose.png differ
diff --git a/public/images/emoji/facebook_messenger/rosette.png b/public/images/emoji/facebook_messenger/rosette.png
index b21ae33e63..732127dac6 100644
Binary files a/public/images/emoji/facebook_messenger/rosette.png and b/public/images/emoji/facebook_messenger/rosette.png differ
diff --git a/public/images/emoji/facebook_messenger/rotating_light.png b/public/images/emoji/facebook_messenger/rotating_light.png
index a6ac22f351..a11a19e8cc 100644
Binary files a/public/images/emoji/facebook_messenger/rotating_light.png and b/public/images/emoji/facebook_messenger/rotating_light.png differ
diff --git a/public/images/emoji/facebook_messenger/round_pushpin.png b/public/images/emoji/facebook_messenger/round_pushpin.png
index 35ccf8b943..28b4cb9e2a 100644
Binary files a/public/images/emoji/facebook_messenger/round_pushpin.png and b/public/images/emoji/facebook_messenger/round_pushpin.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat.png b/public/images/emoji/facebook_messenger/rowboat.png
index 7b73bd927a..1c1a5704b6 100644
Binary files a/public/images/emoji/facebook_messenger/rowboat.png and b/public/images/emoji/facebook_messenger/rowboat.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/2.png b/public/images/emoji/facebook_messenger/rowboat/2.png
new file mode 100644
index 0000000000..3131571286
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/2.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/3.png b/public/images/emoji/facebook_messenger/rowboat/3.png
new file mode 100644
index 0000000000..d3ac9aa6c7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/3.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/4.png b/public/images/emoji/facebook_messenger/rowboat/4.png
new file mode 100644
index 0000000000..0d7547330b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/4.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/5.png b/public/images/emoji/facebook_messenger/rowboat/5.png
new file mode 100644
index 0000000000..6031915acc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/5.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat/6.png b/public/images/emoji/facebook_messenger/rowboat/6.png
new file mode 100644
index 0000000000..30615bee85
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat/6.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man.png b/public/images/emoji/facebook_messenger/rowing_man.png
index 7b73bd927a..1c1a5704b6 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_man.png and b/public/images/emoji/facebook_messenger/rowing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/2.png b/public/images/emoji/facebook_messenger/rowing_man/2.png
new file mode 100644
index 0000000000..3131571286
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/3.png b/public/images/emoji/facebook_messenger/rowing_man/3.png
new file mode 100644
index 0000000000..d3ac9aa6c7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/4.png b/public/images/emoji/facebook_messenger/rowing_man/4.png
new file mode 100644
index 0000000000..0d7547330b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/5.png b/public/images/emoji/facebook_messenger/rowing_man/5.png
new file mode 100644
index 0000000000..6031915acc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man/6.png b/public/images/emoji/facebook_messenger/rowing_man/6.png
new file mode 100644
index 0000000000..30615bee85
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman.png b/public/images/emoji/facebook_messenger/rowing_woman.png
index 621b0acc04..d81db32514 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman.png and b/public/images/emoji/facebook_messenger/rowing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/2.png b/public/images/emoji/facebook_messenger/rowing_woman/2.png
index 0bee4147be..12f847664a 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/2.png and b/public/images/emoji/facebook_messenger/rowing_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/3.png b/public/images/emoji/facebook_messenger/rowing_woman/3.png
index f51db26321..6aa5e552ac 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/3.png and b/public/images/emoji/facebook_messenger/rowing_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/4.png b/public/images/emoji/facebook_messenger/rowing_woman/4.png
index e61c949d0d..5bc95b3cd1 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/4.png and b/public/images/emoji/facebook_messenger/rowing_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/5.png b/public/images/emoji/facebook_messenger/rowing_woman/5.png
index b21bb84ca6..f6f2e00204 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/5.png and b/public/images/emoji/facebook_messenger/rowing_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/6.png b/public/images/emoji/facebook_messenger/rowing_woman/6.png
index cc2a55e767..51574e6f1b 100644
Binary files a/public/images/emoji/facebook_messenger/rowing_woman/6.png and b/public/images/emoji/facebook_messenger/rowing_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ru.png b/public/images/emoji/facebook_messenger/ru.png
index f3932d9f3c..89692b70ef 100644
Binary files a/public/images/emoji/facebook_messenger/ru.png and b/public/images/emoji/facebook_messenger/ru.png differ
diff --git a/public/images/emoji/facebook_messenger/rugby_football.png b/public/images/emoji/facebook_messenger/rugby_football.png
index 6ce225a2ec..21cde2c867 100644
Binary files a/public/images/emoji/facebook_messenger/rugby_football.png and b/public/images/emoji/facebook_messenger/rugby_football.png differ
diff --git a/public/images/emoji/facebook_messenger/runner.png b/public/images/emoji/facebook_messenger/runner.png
index d1db4d1796..046d9b5ae6 100644
Binary files a/public/images/emoji/facebook_messenger/runner.png and b/public/images/emoji/facebook_messenger/runner.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/2.png b/public/images/emoji/facebook_messenger/runner/2.png
index d45b1ccb14..0492c8fffc 100644
Binary files a/public/images/emoji/facebook_messenger/runner/2.png and b/public/images/emoji/facebook_messenger/runner/2.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/3.png b/public/images/emoji/facebook_messenger/runner/3.png
index 67bb67e979..1b7bd5d069 100644
Binary files a/public/images/emoji/facebook_messenger/runner/3.png and b/public/images/emoji/facebook_messenger/runner/3.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/4.png b/public/images/emoji/facebook_messenger/runner/4.png
index da3404f135..0f25ac7d6a 100644
Binary files a/public/images/emoji/facebook_messenger/runner/4.png and b/public/images/emoji/facebook_messenger/runner/4.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/5.png b/public/images/emoji/facebook_messenger/runner/5.png
index 02b731334a..47623d1de7 100644
Binary files a/public/images/emoji/facebook_messenger/runner/5.png and b/public/images/emoji/facebook_messenger/runner/5.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/6.png b/public/images/emoji/facebook_messenger/runner/6.png
index 0a0dcc7d84..13b236ea66 100644
Binary files a/public/images/emoji/facebook_messenger/runner/6.png and b/public/images/emoji/facebook_messenger/runner/6.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man.png b/public/images/emoji/facebook_messenger/running_man.png
index d1db4d1796..046d9b5ae6 100644
Binary files a/public/images/emoji/facebook_messenger/running_man.png and b/public/images/emoji/facebook_messenger/running_man.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/2.png b/public/images/emoji/facebook_messenger/running_man/2.png
index d45b1ccb14..0492c8fffc 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/2.png and b/public/images/emoji/facebook_messenger/running_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/3.png b/public/images/emoji/facebook_messenger/running_man/3.png
index 67bb67e979..1b7bd5d069 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/3.png and b/public/images/emoji/facebook_messenger/running_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/4.png b/public/images/emoji/facebook_messenger/running_man/4.png
index da3404f135..0f25ac7d6a 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/4.png and b/public/images/emoji/facebook_messenger/running_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/5.png b/public/images/emoji/facebook_messenger/running_man/5.png
index 02b731334a..47623d1de7 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/5.png and b/public/images/emoji/facebook_messenger/running_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/6.png b/public/images/emoji/facebook_messenger/running_man/6.png
index 0a0dcc7d84..13b236ea66 100644
Binary files a/public/images/emoji/facebook_messenger/running_man/6.png and b/public/images/emoji/facebook_messenger/running_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/running_shirt_with_sash.png b/public/images/emoji/facebook_messenger/running_shirt_with_sash.png
index 960b63b65b..a513c91a73 100644
Binary files a/public/images/emoji/facebook_messenger/running_shirt_with_sash.png and b/public/images/emoji/facebook_messenger/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman.png b/public/images/emoji/facebook_messenger/running_woman.png
index 01418f1a8d..d2e300af47 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman.png and b/public/images/emoji/facebook_messenger/running_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/2.png b/public/images/emoji/facebook_messenger/running_woman/2.png
index cde0a28703..951aa8aa1f 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/2.png and b/public/images/emoji/facebook_messenger/running_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/3.png b/public/images/emoji/facebook_messenger/running_woman/3.png
index a9b8ba20ce..114b6ef06a 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/3.png and b/public/images/emoji/facebook_messenger/running_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/4.png b/public/images/emoji/facebook_messenger/running_woman/4.png
index e14cb3884a..d660a4234c 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/4.png and b/public/images/emoji/facebook_messenger/running_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/5.png b/public/images/emoji/facebook_messenger/running_woman/5.png
index 54b0cb838b..ce17b899ad 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/5.png and b/public/images/emoji/facebook_messenger/running_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/6.png b/public/images/emoji/facebook_messenger/running_woman/6.png
index 114138c0b6..fcd3eb3349 100644
Binary files a/public/images/emoji/facebook_messenger/running_woman/6.png and b/public/images/emoji/facebook_messenger/running_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/rwanda.png b/public/images/emoji/facebook_messenger/rwanda.png
index a45a988ff5..fa02c79c7c 100644
Binary files a/public/images/emoji/facebook_messenger/rwanda.png and b/public/images/emoji/facebook_messenger/rwanda.png differ
diff --git a/public/images/emoji/facebook_messenger/sa.png b/public/images/emoji/facebook_messenger/sa.png
index 67fffa68f8..4d0d6162a3 100644
Binary files a/public/images/emoji/facebook_messenger/sa.png and b/public/images/emoji/facebook_messenger/sa.png differ
diff --git a/public/images/emoji/facebook_messenger/sagittarius.png b/public/images/emoji/facebook_messenger/sagittarius.png
index d8580b190b..d834fda81f 100644
Binary files a/public/images/emoji/facebook_messenger/sagittarius.png and b/public/images/emoji/facebook_messenger/sagittarius.png differ
diff --git a/public/images/emoji/facebook_messenger/sailboat.png b/public/images/emoji/facebook_messenger/sailboat.png
index 73cb6717ef..7ec6f21e9b 100644
Binary files a/public/images/emoji/facebook_messenger/sailboat.png and b/public/images/emoji/facebook_messenger/sailboat.png differ
diff --git a/public/images/emoji/facebook_messenger/sake.png b/public/images/emoji/facebook_messenger/sake.png
index 7e9b170b68..1017b9015b 100644
Binary files a/public/images/emoji/facebook_messenger/sake.png and b/public/images/emoji/facebook_messenger/sake.png differ
diff --git a/public/images/emoji/facebook_messenger/samoa.png b/public/images/emoji/facebook_messenger/samoa.png
index de81c048d0..294802b0a1 100644
Binary files a/public/images/emoji/facebook_messenger/samoa.png and b/public/images/emoji/facebook_messenger/samoa.png differ
diff --git a/public/images/emoji/facebook_messenger/san_marino.png b/public/images/emoji/facebook_messenger/san_marino.png
index fa20a00808..b5d217c064 100644
Binary files a/public/images/emoji/facebook_messenger/san_marino.png and b/public/images/emoji/facebook_messenger/san_marino.png differ
diff --git a/public/images/emoji/facebook_messenger/sandal.png b/public/images/emoji/facebook_messenger/sandal.png
index f48e7f3a23..2d30646490 100644
Binary files a/public/images/emoji/facebook_messenger/sandal.png and b/public/images/emoji/facebook_messenger/sandal.png differ
diff --git a/public/images/emoji/facebook_messenger/sandwich.png b/public/images/emoji/facebook_messenger/sandwich.png
index ba3f9a1cdb..7052154c7d 100644
Binary files a/public/images/emoji/facebook_messenger/sandwich.png and b/public/images/emoji/facebook_messenger/sandwich.png differ
diff --git a/public/images/emoji/facebook_messenger/santa.png b/public/images/emoji/facebook_messenger/santa.png
index 4995fdca21..8948582258 100644
Binary files a/public/images/emoji/facebook_messenger/santa.png and b/public/images/emoji/facebook_messenger/santa.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/2.png b/public/images/emoji/facebook_messenger/santa/2.png
index 5a6ef2f00d..703b2b2f4b 100644
Binary files a/public/images/emoji/facebook_messenger/santa/2.png and b/public/images/emoji/facebook_messenger/santa/2.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/3.png b/public/images/emoji/facebook_messenger/santa/3.png
index 52b0fb2705..ee1433a8f6 100644
Binary files a/public/images/emoji/facebook_messenger/santa/3.png and b/public/images/emoji/facebook_messenger/santa/3.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/4.png b/public/images/emoji/facebook_messenger/santa/4.png
index 6181e6ccc3..f4ee3b04f3 100644
Binary files a/public/images/emoji/facebook_messenger/santa/4.png and b/public/images/emoji/facebook_messenger/santa/4.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/5.png b/public/images/emoji/facebook_messenger/santa/5.png
index 215b68451d..c977279e6d 100644
Binary files a/public/images/emoji/facebook_messenger/santa/5.png and b/public/images/emoji/facebook_messenger/santa/5.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/6.png b/public/images/emoji/facebook_messenger/santa/6.png
index 390a6a2550..ede3570127 100644
Binary files a/public/images/emoji/facebook_messenger/santa/6.png and b/public/images/emoji/facebook_messenger/santa/6.png differ
diff --git a/public/images/emoji/facebook_messenger/sao_tome_principe.png b/public/images/emoji/facebook_messenger/sao_tome_principe.png
index bbfcbd18df..3bb369a886 100644
Binary files a/public/images/emoji/facebook_messenger/sao_tome_principe.png and b/public/images/emoji/facebook_messenger/sao_tome_principe.png differ
diff --git a/public/images/emoji/facebook_messenger/satellite.png b/public/images/emoji/facebook_messenger/satellite.png
index 48510c86cf..f44c779fdb 100644
Binary files a/public/images/emoji/facebook_messenger/satellite.png and b/public/images/emoji/facebook_messenger/satellite.png differ
diff --git a/public/images/emoji/facebook_messenger/satellite_orbital.png b/public/images/emoji/facebook_messenger/satellite_orbital.png
index 81715516af..d50cf91954 100644
Binary files a/public/images/emoji/facebook_messenger/satellite_orbital.png and b/public/images/emoji/facebook_messenger/satellite_orbital.png differ
diff --git a/public/images/emoji/facebook_messenger/satisfied.png b/public/images/emoji/facebook_messenger/satisfied.png
index 68cbb0f148..039f7f9d6d 100644
Binary files a/public/images/emoji/facebook_messenger/satisfied.png and b/public/images/emoji/facebook_messenger/satisfied.png differ
diff --git a/public/images/emoji/facebook_messenger/saudi_arabia.png b/public/images/emoji/facebook_messenger/saudi_arabia.png
index dc3a6b29f6..338ee58ddf 100644
Binary files a/public/images/emoji/facebook_messenger/saudi_arabia.png and b/public/images/emoji/facebook_messenger/saudi_arabia.png differ
diff --git a/public/images/emoji/facebook_messenger/sauropod.png b/public/images/emoji/facebook_messenger/sauropod.png
index 2f4d619997..9643afaf9d 100644
Binary files a/public/images/emoji/facebook_messenger/sauropod.png and b/public/images/emoji/facebook_messenger/sauropod.png differ
diff --git a/public/images/emoji/facebook_messenger/saxophone.png b/public/images/emoji/facebook_messenger/saxophone.png
index 8740f0d688..3b93d50275 100644
Binary files a/public/images/emoji/facebook_messenger/saxophone.png and b/public/images/emoji/facebook_messenger/saxophone.png differ
diff --git a/public/images/emoji/facebook_messenger/scales.png b/public/images/emoji/facebook_messenger/scales.png
index 75713abc23..a9e4f53e97 100644
Binary files a/public/images/emoji/facebook_messenger/scales.png and b/public/images/emoji/facebook_messenger/scales.png differ
diff --git a/public/images/emoji/facebook_messenger/scarf.png b/public/images/emoji/facebook_messenger/scarf.png
index 73653eee2b..78c876e3c5 100644
Binary files a/public/images/emoji/facebook_messenger/scarf.png and b/public/images/emoji/facebook_messenger/scarf.png differ
diff --git a/public/images/emoji/facebook_messenger/school.png b/public/images/emoji/facebook_messenger/school.png
index a5d6791d93..0fd055c385 100644
Binary files a/public/images/emoji/facebook_messenger/school.png and b/public/images/emoji/facebook_messenger/school.png differ
diff --git a/public/images/emoji/facebook_messenger/school_satchel.png b/public/images/emoji/facebook_messenger/school_satchel.png
index cfc748f865..b9b685cf62 100644
Binary files a/public/images/emoji/facebook_messenger/school_satchel.png and b/public/images/emoji/facebook_messenger/school_satchel.png differ
diff --git a/public/images/emoji/facebook_messenger/scissors.png b/public/images/emoji/facebook_messenger/scissors.png
index 546ee1babb..2dbf8355e2 100644
Binary files a/public/images/emoji/facebook_messenger/scissors.png and b/public/images/emoji/facebook_messenger/scissors.png differ
diff --git a/public/images/emoji/facebook_messenger/scorpion.png b/public/images/emoji/facebook_messenger/scorpion.png
index 2215d4642f..1b3291654f 100644
Binary files a/public/images/emoji/facebook_messenger/scorpion.png and b/public/images/emoji/facebook_messenger/scorpion.png differ
diff --git a/public/images/emoji/facebook_messenger/scorpius.png b/public/images/emoji/facebook_messenger/scorpius.png
index 22f33ac23b..dbbb9d5fd9 100644
Binary files a/public/images/emoji/facebook_messenger/scorpius.png and b/public/images/emoji/facebook_messenger/scorpius.png differ
diff --git a/public/images/emoji/facebook_messenger/scream.png b/public/images/emoji/facebook_messenger/scream.png
index 76a4e2f5c7..37cb489464 100644
Binary files a/public/images/emoji/facebook_messenger/scream.png and b/public/images/emoji/facebook_messenger/scream.png differ
diff --git a/public/images/emoji/facebook_messenger/scream_cat.png b/public/images/emoji/facebook_messenger/scream_cat.png
index 1ff4b8e92a..5d23cfbc1e 100644
Binary files a/public/images/emoji/facebook_messenger/scream_cat.png and b/public/images/emoji/facebook_messenger/scream_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/scroll.png b/public/images/emoji/facebook_messenger/scroll.png
index 82c810dd5b..f3aee23f12 100644
Binary files a/public/images/emoji/facebook_messenger/scroll.png and b/public/images/emoji/facebook_messenger/scroll.png differ
diff --git a/public/images/emoji/facebook_messenger/seat.png b/public/images/emoji/facebook_messenger/seat.png
index 850e39dafe..05ab633a3f 100644
Binary files a/public/images/emoji/facebook_messenger/seat.png and b/public/images/emoji/facebook_messenger/seat.png differ
diff --git a/public/images/emoji/facebook_messenger/secret.png b/public/images/emoji/facebook_messenger/secret.png
index 652e4f7ca9..228ac6c33c 100644
Binary files a/public/images/emoji/facebook_messenger/secret.png and b/public/images/emoji/facebook_messenger/secret.png differ
diff --git a/public/images/emoji/facebook_messenger/see_no_evil.png b/public/images/emoji/facebook_messenger/see_no_evil.png
index 3b73a085a8..95dd3c76d7 100644
Binary files a/public/images/emoji/facebook_messenger/see_no_evil.png and b/public/images/emoji/facebook_messenger/see_no_evil.png differ
diff --git a/public/images/emoji/facebook_messenger/seedling.png b/public/images/emoji/facebook_messenger/seedling.png
index 990126746a..66f2bfabd7 100644
Binary files a/public/images/emoji/facebook_messenger/seedling.png and b/public/images/emoji/facebook_messenger/seedling.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie.png b/public/images/emoji/facebook_messenger/selfie.png
index f6411e5444..85482791df 100644
Binary files a/public/images/emoji/facebook_messenger/selfie.png and b/public/images/emoji/facebook_messenger/selfie.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/2.png b/public/images/emoji/facebook_messenger/selfie/2.png
index 24a81ca396..0e278a5545 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/2.png and b/public/images/emoji/facebook_messenger/selfie/2.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/3.png b/public/images/emoji/facebook_messenger/selfie/3.png
index 712bc73000..96522950a5 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/3.png and b/public/images/emoji/facebook_messenger/selfie/3.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/4.png b/public/images/emoji/facebook_messenger/selfie/4.png
index 77139915b7..71c3961ea7 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/4.png and b/public/images/emoji/facebook_messenger/selfie/4.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/5.png b/public/images/emoji/facebook_messenger/selfie/5.png
index f326d7825d..c246ac059c 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/5.png and b/public/images/emoji/facebook_messenger/selfie/5.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/6.png b/public/images/emoji/facebook_messenger/selfie/6.png
index de9106c369..f81cb0293c 100644
Binary files a/public/images/emoji/facebook_messenger/selfie/6.png and b/public/images/emoji/facebook_messenger/selfie/6.png differ
diff --git a/public/images/emoji/facebook_messenger/senegal.png b/public/images/emoji/facebook_messenger/senegal.png
index 2d32427625..6537571def 100644
Binary files a/public/images/emoji/facebook_messenger/senegal.png and b/public/images/emoji/facebook_messenger/senegal.png differ
diff --git a/public/images/emoji/facebook_messenger/serbia.png b/public/images/emoji/facebook_messenger/serbia.png
index a7af1346e5..ffefd9cbbc 100644
Binary files a/public/images/emoji/facebook_messenger/serbia.png and b/public/images/emoji/facebook_messenger/serbia.png differ
diff --git a/public/images/emoji/facebook_messenger/seven.png b/public/images/emoji/facebook_messenger/seven.png
index 967f909261..dabca5cf61 100644
Binary files a/public/images/emoji/facebook_messenger/seven.png and b/public/images/emoji/facebook_messenger/seven.png differ
diff --git a/public/images/emoji/facebook_messenger/seychelles.png b/public/images/emoji/facebook_messenger/seychelles.png
index e69ca6add1..41e622e1ac 100644
Binary files a/public/images/emoji/facebook_messenger/seychelles.png and b/public/images/emoji/facebook_messenger/seychelles.png differ
diff --git a/public/images/emoji/facebook_messenger/shallow_pan_of_food.png b/public/images/emoji/facebook_messenger/shallow_pan_of_food.png
index 300f700fcc..6957af4a31 100644
Binary files a/public/images/emoji/facebook_messenger/shallow_pan_of_food.png and b/public/images/emoji/facebook_messenger/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/facebook_messenger/shamrock.png b/public/images/emoji/facebook_messenger/shamrock.png
index dfad1cfc70..af8d5459bc 100644
Binary files a/public/images/emoji/facebook_messenger/shamrock.png and b/public/images/emoji/facebook_messenger/shamrock.png differ
diff --git a/public/images/emoji/facebook_messenger/shark.png b/public/images/emoji/facebook_messenger/shark.png
index 856894743d..1e85effc03 100644
Binary files a/public/images/emoji/facebook_messenger/shark.png and b/public/images/emoji/facebook_messenger/shark.png differ
diff --git a/public/images/emoji/facebook_messenger/shaved_ice.png b/public/images/emoji/facebook_messenger/shaved_ice.png
index d00270a662..8319007167 100644
Binary files a/public/images/emoji/facebook_messenger/shaved_ice.png and b/public/images/emoji/facebook_messenger/shaved_ice.png differ
diff --git a/public/images/emoji/facebook_messenger/sheep.png b/public/images/emoji/facebook_messenger/sheep.png
index c6deaa7063..af3e4fe23d 100644
Binary files a/public/images/emoji/facebook_messenger/sheep.png and b/public/images/emoji/facebook_messenger/sheep.png differ
diff --git a/public/images/emoji/facebook_messenger/shell.png b/public/images/emoji/facebook_messenger/shell.png
index dd46b772a4..6a3641d11d 100644
Binary files a/public/images/emoji/facebook_messenger/shell.png and b/public/images/emoji/facebook_messenger/shell.png differ
diff --git a/public/images/emoji/facebook_messenger/shield.png b/public/images/emoji/facebook_messenger/shield.png
index 4fbc6a5915..18219f103f 100644
Binary files a/public/images/emoji/facebook_messenger/shield.png and b/public/images/emoji/facebook_messenger/shield.png differ
diff --git a/public/images/emoji/facebook_messenger/shinto_shrine.png b/public/images/emoji/facebook_messenger/shinto_shrine.png
index 52c368a6a6..b08ebea155 100644
Binary files a/public/images/emoji/facebook_messenger/shinto_shrine.png and b/public/images/emoji/facebook_messenger/shinto_shrine.png differ
diff --git a/public/images/emoji/facebook_messenger/ship.png b/public/images/emoji/facebook_messenger/ship.png
index 80df6b3143..c51ac926ff 100644
Binary files a/public/images/emoji/facebook_messenger/ship.png and b/public/images/emoji/facebook_messenger/ship.png differ
diff --git a/public/images/emoji/facebook_messenger/shirt.png b/public/images/emoji/facebook_messenger/shirt.png
index f24f758f68..27ba96bfa0 100644
Binary files a/public/images/emoji/facebook_messenger/shirt.png and b/public/images/emoji/facebook_messenger/shirt.png differ
diff --git a/public/images/emoji/facebook_messenger/shit.png b/public/images/emoji/facebook_messenger/shit.png
index e175a1dfff..7c3e519922 100644
Binary files a/public/images/emoji/facebook_messenger/shit.png and b/public/images/emoji/facebook_messenger/shit.png differ
diff --git a/public/images/emoji/facebook_messenger/shopping.png b/public/images/emoji/facebook_messenger/shopping.png
index ee15abd993..872a4daba7 100644
Binary files a/public/images/emoji/facebook_messenger/shopping.png and b/public/images/emoji/facebook_messenger/shopping.png differ
diff --git a/public/images/emoji/facebook_messenger/shopping_bags.png b/public/images/emoji/facebook_messenger/shopping_bags.png
index ee15abd993..872a4daba7 100644
Binary files a/public/images/emoji/facebook_messenger/shopping_bags.png and b/public/images/emoji/facebook_messenger/shopping_bags.png differ
diff --git a/public/images/emoji/facebook_messenger/shopping_cart.png b/public/images/emoji/facebook_messenger/shopping_cart.png
index 419cc70376..6989a2a4cd 100644
Binary files a/public/images/emoji/facebook_messenger/shopping_cart.png and b/public/images/emoji/facebook_messenger/shopping_cart.png differ
diff --git a/public/images/emoji/facebook_messenger/shower.png b/public/images/emoji/facebook_messenger/shower.png
index 1070d46a50..2e0a7b2d9e 100644
Binary files a/public/images/emoji/facebook_messenger/shower.png and b/public/images/emoji/facebook_messenger/shower.png differ
diff --git a/public/images/emoji/facebook_messenger/shrimp.png b/public/images/emoji/facebook_messenger/shrimp.png
index e45d741b47..c04a810296 100644
Binary files a/public/images/emoji/facebook_messenger/shrimp.png and b/public/images/emoji/facebook_messenger/shrimp.png differ
diff --git a/public/images/emoji/facebook_messenger/shushing_face.png b/public/images/emoji/facebook_messenger/shushing_face.png
new file mode 100644
index 0000000000..cd0c5b5401
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shushing_face.png differ
diff --git a/public/images/emoji/facebook_messenger/sierra_leone.png b/public/images/emoji/facebook_messenger/sierra_leone.png
index 816f090002..f7235d0a41 100644
Binary files a/public/images/emoji/facebook_messenger/sierra_leone.png and b/public/images/emoji/facebook_messenger/sierra_leone.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns.png b/public/images/emoji/facebook_messenger/sign_of_the_horns.png
index 72d987aadc..42ebf7a6e4 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png
index 8d87aab277..f5b6ff33ee 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png
index 39a19cd401..a4df883cbd 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png
index 73bedb2c02..0b59f79fdd 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png
index 36413ab8cf..5a6b7f1757 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png
index 1cb1b661b9..e700d4afb2 100644
Binary files a/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png and b/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/facebook_messenger/signal_strength.png b/public/images/emoji/facebook_messenger/signal_strength.png
index 8ff27d1176..54045b69a3 100644
Binary files a/public/images/emoji/facebook_messenger/signal_strength.png and b/public/images/emoji/facebook_messenger/signal_strength.png differ
diff --git a/public/images/emoji/facebook_messenger/singapore.png b/public/images/emoji/facebook_messenger/singapore.png
index 42a338884d..f8efcc863f 100644
Binary files a/public/images/emoji/facebook_messenger/singapore.png and b/public/images/emoji/facebook_messenger/singapore.png differ
diff --git a/public/images/emoji/facebook_messenger/sint_maarten.png b/public/images/emoji/facebook_messenger/sint_maarten.png
index 5248152aba..87863f9b56 100644
Binary files a/public/images/emoji/facebook_messenger/sint_maarten.png and b/public/images/emoji/facebook_messenger/sint_maarten.png differ
diff --git a/public/images/emoji/facebook_messenger/six.png b/public/images/emoji/facebook_messenger/six.png
index 5208c51d59..304bf0eda8 100644
Binary files a/public/images/emoji/facebook_messenger/six.png and b/public/images/emoji/facebook_messenger/six.png differ
diff --git a/public/images/emoji/facebook_messenger/six_pointed_star.png b/public/images/emoji/facebook_messenger/six_pointed_star.png
index 3a640a6c91..70238181af 100644
Binary files a/public/images/emoji/facebook_messenger/six_pointed_star.png and b/public/images/emoji/facebook_messenger/six_pointed_star.png differ
diff --git a/public/images/emoji/facebook_messenger/skeleton.png b/public/images/emoji/facebook_messenger/skeleton.png
index 9ff2306a45..c60e9f8a9f 100644
Binary files a/public/images/emoji/facebook_messenger/skeleton.png and b/public/images/emoji/facebook_messenger/skeleton.png differ
diff --git a/public/images/emoji/facebook_messenger/ski.png b/public/images/emoji/facebook_messenger/ski.png
index 919452aacc..7faded1449 100644
Binary files a/public/images/emoji/facebook_messenger/ski.png and b/public/images/emoji/facebook_messenger/ski.png differ
diff --git a/public/images/emoji/facebook_messenger/skier.png b/public/images/emoji/facebook_messenger/skier.png
index a4cffe7aca..34e63f01c7 100644
Binary files a/public/images/emoji/facebook_messenger/skier.png and b/public/images/emoji/facebook_messenger/skier.png differ
diff --git a/public/images/emoji/facebook_messenger/skull.png b/public/images/emoji/facebook_messenger/skull.png
index 9ff2306a45..c60e9f8a9f 100644
Binary files a/public/images/emoji/facebook_messenger/skull.png and b/public/images/emoji/facebook_messenger/skull.png differ
diff --git a/public/images/emoji/facebook_messenger/skull_and_crossbones.png b/public/images/emoji/facebook_messenger/skull_and_crossbones.png
index df4531d2b0..686fd5afa9 100644
Binary files a/public/images/emoji/facebook_messenger/skull_and_crossbones.png and b/public/images/emoji/facebook_messenger/skull_and_crossbones.png differ
diff --git a/public/images/emoji/facebook_messenger/skull_crossbones.png b/public/images/emoji/facebook_messenger/skull_crossbones.png
index df4531d2b0..686fd5afa9 100644
Binary files a/public/images/emoji/facebook_messenger/skull_crossbones.png and b/public/images/emoji/facebook_messenger/skull_crossbones.png differ
diff --git a/public/images/emoji/facebook_messenger/sled.png b/public/images/emoji/facebook_messenger/sled.png
index 01805b1fe7..68b35f4919 100644
Binary files a/public/images/emoji/facebook_messenger/sled.png and b/public/images/emoji/facebook_messenger/sled.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping.png b/public/images/emoji/facebook_messenger/sleeping.png
index f0f03bd3a8..cad0d4518e 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping.png and b/public/images/emoji/facebook_messenger/sleeping.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation.png b/public/images/emoji/facebook_messenger/sleeping_accommodation.png
index 70398fd097..9fd8cfc18a 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png
index feb77c5dac..32f7f7153f 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png
index 6934d93973..fb634a33ad 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png
index e7705b515e..9fd8cfc18a 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png
index 76d7ae664b..32f7f7153f 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png
index 6ea7b53462..32f7f7153f 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png and b/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed.png b/public/images/emoji/facebook_messenger/sleeping_bed.png
index 70398fd097..9fd8cfc18a 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed.png and b/public/images/emoji/facebook_messenger/sleeping_bed.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/2.png b/public/images/emoji/facebook_messenger/sleeping_bed/2.png
index feb77c5dac..32f7f7153f 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/2.png and b/public/images/emoji/facebook_messenger/sleeping_bed/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/3.png b/public/images/emoji/facebook_messenger/sleeping_bed/3.png
index 6934d93973..fb634a33ad 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/3.png and b/public/images/emoji/facebook_messenger/sleeping_bed/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/4.png b/public/images/emoji/facebook_messenger/sleeping_bed/4.png
index e7705b515e..9fd8cfc18a 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/4.png and b/public/images/emoji/facebook_messenger/sleeping_bed/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/5.png b/public/images/emoji/facebook_messenger/sleeping_bed/5.png
index 76d7ae664b..32f7f7153f 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/5.png and b/public/images/emoji/facebook_messenger/sleeping_bed/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/6.png b/public/images/emoji/facebook_messenger/sleeping_bed/6.png
index 6ea7b53462..32f7f7153f 100644
Binary files a/public/images/emoji/facebook_messenger/sleeping_bed/6.png and b/public/images/emoji/facebook_messenger/sleeping_bed/6.png differ
diff --git a/public/images/emoji/facebook_messenger/sleepy.png b/public/images/emoji/facebook_messenger/sleepy.png
index d6d67475bc..8fc4a251bf 100644
Binary files a/public/images/emoji/facebook_messenger/sleepy.png and b/public/images/emoji/facebook_messenger/sleepy.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy.png b/public/images/emoji/facebook_messenger/sleuth_or_spy.png
index 587e506d98..6734c6bde0 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png
index a25d5ea4d4..04383914af 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png
index f100fd13a4..1a6c3ca89c 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png
index 775a8b2f2b..0778fa99eb 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png
index c9703ba994..4479cc79cc 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png
index 55cc03db8d..2602f4c409 100644
Binary files a/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png and b/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/slight_frown.png b/public/images/emoji/facebook_messenger/slight_frown.png
index d7dfe0e848..8f4af59ea1 100644
Binary files a/public/images/emoji/facebook_messenger/slight_frown.png and b/public/images/emoji/facebook_messenger/slight_frown.png differ
diff --git a/public/images/emoji/facebook_messenger/slight_smile.png b/public/images/emoji/facebook_messenger/slight_smile.png
index 2c240c1bb8..adb507495f 100644
Binary files a/public/images/emoji/facebook_messenger/slight_smile.png and b/public/images/emoji/facebook_messenger/slight_smile.png differ
diff --git a/public/images/emoji/facebook_messenger/slightly_frowning_face.png b/public/images/emoji/facebook_messenger/slightly_frowning_face.png
index d7dfe0e848..8f4af59ea1 100644
Binary files a/public/images/emoji/facebook_messenger/slightly_frowning_face.png and b/public/images/emoji/facebook_messenger/slightly_frowning_face.png differ
diff --git a/public/images/emoji/facebook_messenger/slightly_smiling.png b/public/images/emoji/facebook_messenger/slightly_smiling.png
index 2c240c1bb8..adb507495f 100644
Binary files a/public/images/emoji/facebook_messenger/slightly_smiling.png and b/public/images/emoji/facebook_messenger/slightly_smiling.png differ
diff --git a/public/images/emoji/facebook_messenger/slightly_smiling_face.png b/public/images/emoji/facebook_messenger/slightly_smiling_face.png
index 2c240c1bb8..adb507495f 100644
Binary files a/public/images/emoji/facebook_messenger/slightly_smiling_face.png and b/public/images/emoji/facebook_messenger/slightly_smiling_face.png differ
diff --git a/public/images/emoji/facebook_messenger/slot_machine.png b/public/images/emoji/facebook_messenger/slot_machine.png
index a67edf96be..13646f57df 100644
Binary files a/public/images/emoji/facebook_messenger/slot_machine.png and b/public/images/emoji/facebook_messenger/slot_machine.png differ
diff --git a/public/images/emoji/facebook_messenger/slovakia.png b/public/images/emoji/facebook_messenger/slovakia.png
index 9b716032fd..9b947a59fe 100644
Binary files a/public/images/emoji/facebook_messenger/slovakia.png and b/public/images/emoji/facebook_messenger/slovakia.png differ
diff --git a/public/images/emoji/facebook_messenger/slovenia.png b/public/images/emoji/facebook_messenger/slovenia.png
index 6dfbe6eae2..355664c785 100644
Binary files a/public/images/emoji/facebook_messenger/slovenia.png and b/public/images/emoji/facebook_messenger/slovenia.png differ
diff --git a/public/images/emoji/facebook_messenger/small_airplane.png b/public/images/emoji/facebook_messenger/small_airplane.png
index 47399184f7..110df28455 100644
Binary files a/public/images/emoji/facebook_messenger/small_airplane.png and b/public/images/emoji/facebook_messenger/small_airplane.png differ
diff --git a/public/images/emoji/facebook_messenger/small_blue_diamond.png b/public/images/emoji/facebook_messenger/small_blue_diamond.png
index e5b2ce33f2..e1808f68bc 100644
Binary files a/public/images/emoji/facebook_messenger/small_blue_diamond.png and b/public/images/emoji/facebook_messenger/small_blue_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/small_orange_diamond.png b/public/images/emoji/facebook_messenger/small_orange_diamond.png
index ce3ffc859b..5505c64f79 100644
Binary files a/public/images/emoji/facebook_messenger/small_orange_diamond.png and b/public/images/emoji/facebook_messenger/small_orange_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/small_red_triangle.png b/public/images/emoji/facebook_messenger/small_red_triangle.png
index ff5080276e..8062fa40d7 100644
Binary files a/public/images/emoji/facebook_messenger/small_red_triangle.png and b/public/images/emoji/facebook_messenger/small_red_triangle.png differ
diff --git a/public/images/emoji/facebook_messenger/small_red_triangle_down.png b/public/images/emoji/facebook_messenger/small_red_triangle_down.png
index ffc0b20b6d..b1a444e202 100644
Binary files a/public/images/emoji/facebook_messenger/small_red_triangle_down.png and b/public/images/emoji/facebook_messenger/small_red_triangle_down.png differ
diff --git a/public/images/emoji/facebook_messenger/smile.png b/public/images/emoji/facebook_messenger/smile.png
index b38ee2bad1..4597ec0c8a 100644
Binary files a/public/images/emoji/facebook_messenger/smile.png and b/public/images/emoji/facebook_messenger/smile.png differ
diff --git a/public/images/emoji/facebook_messenger/smile_cat.png b/public/images/emoji/facebook_messenger/smile_cat.png
index 07733f39a4..09b32fa39e 100644
Binary files a/public/images/emoji/facebook_messenger/smile_cat.png and b/public/images/emoji/facebook_messenger/smile_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smiley.png b/public/images/emoji/facebook_messenger/smiley.png
index 3df89f4799..479bfc2ffa 100644
Binary files a/public/images/emoji/facebook_messenger/smiley.png and b/public/images/emoji/facebook_messenger/smiley.png differ
diff --git a/public/images/emoji/facebook_messenger/smiley_cat.png b/public/images/emoji/facebook_messenger/smiley_cat.png
index c64dead528..81a35eb914 100644
Binary files a/public/images/emoji/facebook_messenger/smiley_cat.png and b/public/images/emoji/facebook_messenger/smiley_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smiling_imp.png b/public/images/emoji/facebook_messenger/smiling_imp.png
index ad5ca55849..e06a7ca2c9 100644
Binary files a/public/images/emoji/facebook_messenger/smiling_imp.png and b/public/images/emoji/facebook_messenger/smiling_imp.png differ
diff --git a/public/images/emoji/facebook_messenger/smirk.png b/public/images/emoji/facebook_messenger/smirk.png
index cf36fecf96..44728afa88 100644
Binary files a/public/images/emoji/facebook_messenger/smirk.png and b/public/images/emoji/facebook_messenger/smirk.png differ
diff --git a/public/images/emoji/facebook_messenger/smirk_cat.png b/public/images/emoji/facebook_messenger/smirk_cat.png
index 0981c4f092..b01633d8f1 100644
Binary files a/public/images/emoji/facebook_messenger/smirk_cat.png and b/public/images/emoji/facebook_messenger/smirk_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smoking.png b/public/images/emoji/facebook_messenger/smoking.png
index f3d1dd8b08..cc203be650 100644
Binary files a/public/images/emoji/facebook_messenger/smoking.png and b/public/images/emoji/facebook_messenger/smoking.png differ
diff --git a/public/images/emoji/facebook_messenger/snail.png b/public/images/emoji/facebook_messenger/snail.png
index 4ca88c40fe..845a66020a 100644
Binary files a/public/images/emoji/facebook_messenger/snail.png and b/public/images/emoji/facebook_messenger/snail.png differ
diff --git a/public/images/emoji/facebook_messenger/snake.png b/public/images/emoji/facebook_messenger/snake.png
index 45d642454c..81dfa138a0 100644
Binary files a/public/images/emoji/facebook_messenger/snake.png and b/public/images/emoji/facebook_messenger/snake.png differ
diff --git a/public/images/emoji/facebook_messenger/sneezing_face.png b/public/images/emoji/facebook_messenger/sneezing_face.png
index b1801ae41f..2b885dea7a 100644
Binary files a/public/images/emoji/facebook_messenger/sneezing_face.png and b/public/images/emoji/facebook_messenger/sneezing_face.png differ
diff --git a/public/images/emoji/facebook_messenger/snow_capped_mountain.png b/public/images/emoji/facebook_messenger/snow_capped_mountain.png
index b3e246f09b..5529c620de 100644
Binary files a/public/images/emoji/facebook_messenger/snow_capped_mountain.png and b/public/images/emoji/facebook_messenger/snow_capped_mountain.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder.png b/public/images/emoji/facebook_messenger/snowboarder.png
index 1c6f59397b..f9e77e2139 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder.png and b/public/images/emoji/facebook_messenger/snowboarder.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/2.png b/public/images/emoji/facebook_messenger/snowboarder/2.png
index 6d3da25d65..f9e77e2139 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/2.png and b/public/images/emoji/facebook_messenger/snowboarder/2.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/3.png b/public/images/emoji/facebook_messenger/snowboarder/3.png
index cf8c1f336d..f9e77e2139 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/3.png and b/public/images/emoji/facebook_messenger/snowboarder/3.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/4.png b/public/images/emoji/facebook_messenger/snowboarder/4.png
index 7c5a44116e..f9e77e2139 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/4.png and b/public/images/emoji/facebook_messenger/snowboarder/4.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/5.png b/public/images/emoji/facebook_messenger/snowboarder/5.png
index e7cea15490..f9e77e2139 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/5.png and b/public/images/emoji/facebook_messenger/snowboarder/5.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/6.png b/public/images/emoji/facebook_messenger/snowboarder/6.png
index abe744f0fe..f9e77e2139 100644
Binary files a/public/images/emoji/facebook_messenger/snowboarder/6.png and b/public/images/emoji/facebook_messenger/snowboarder/6.png differ
diff --git a/public/images/emoji/facebook_messenger/snowflake.png b/public/images/emoji/facebook_messenger/snowflake.png
index bc25658a74..23f9a19a0f 100644
Binary files a/public/images/emoji/facebook_messenger/snowflake.png and b/public/images/emoji/facebook_messenger/snowflake.png differ
diff --git a/public/images/emoji/facebook_messenger/snowman.png b/public/images/emoji/facebook_messenger/snowman.png
index edb003e362..e93ebca64f 100644
Binary files a/public/images/emoji/facebook_messenger/snowman.png and b/public/images/emoji/facebook_messenger/snowman.png differ
diff --git a/public/images/emoji/facebook_messenger/snowman2.png b/public/images/emoji/facebook_messenger/snowman2.png
index abefab7234..d616df2b4b 100644
Binary files a/public/images/emoji/facebook_messenger/snowman2.png and b/public/images/emoji/facebook_messenger/snowman2.png differ
diff --git a/public/images/emoji/facebook_messenger/snowman_with_snow.png b/public/images/emoji/facebook_messenger/snowman_with_snow.png
index abefab7234..d616df2b4b 100644
Binary files a/public/images/emoji/facebook_messenger/snowman_with_snow.png and b/public/images/emoji/facebook_messenger/snowman_with_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/sob.png b/public/images/emoji/facebook_messenger/sob.png
index 825639b566..fbc4a2e292 100644
Binary files a/public/images/emoji/facebook_messenger/sob.png and b/public/images/emoji/facebook_messenger/sob.png differ
diff --git a/public/images/emoji/facebook_messenger/soccer.png b/public/images/emoji/facebook_messenger/soccer.png
index 5b34f82474..628f907dfb 100644
Binary files a/public/images/emoji/facebook_messenger/soccer.png and b/public/images/emoji/facebook_messenger/soccer.png differ
diff --git a/public/images/emoji/facebook_messenger/socks.png b/public/images/emoji/facebook_messenger/socks.png
index 8f2b9bbe9e..98b6a36339 100644
Binary files a/public/images/emoji/facebook_messenger/socks.png and b/public/images/emoji/facebook_messenger/socks.png differ
diff --git a/public/images/emoji/facebook_messenger/solomon_islands.png b/public/images/emoji/facebook_messenger/solomon_islands.png
index e4476e1880..dfb732444b 100644
Binary files a/public/images/emoji/facebook_messenger/solomon_islands.png and b/public/images/emoji/facebook_messenger/solomon_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/somalia.png b/public/images/emoji/facebook_messenger/somalia.png
index 209fffeaed..c55dd20203 100644
Binary files a/public/images/emoji/facebook_messenger/somalia.png and b/public/images/emoji/facebook_messenger/somalia.png differ
diff --git a/public/images/emoji/facebook_messenger/soon.png b/public/images/emoji/facebook_messenger/soon.png
index 06de16d091..49397d0ddd 100644
Binary files a/public/images/emoji/facebook_messenger/soon.png and b/public/images/emoji/facebook_messenger/soon.png differ
diff --git a/public/images/emoji/facebook_messenger/sos.png b/public/images/emoji/facebook_messenger/sos.png
index d8ddeba4e0..9335e8bd34 100644
Binary files a/public/images/emoji/facebook_messenger/sos.png and b/public/images/emoji/facebook_messenger/sos.png differ
diff --git a/public/images/emoji/facebook_messenger/sound.png b/public/images/emoji/facebook_messenger/sound.png
index 2311f6534c..6cfe4a1333 100644
Binary files a/public/images/emoji/facebook_messenger/sound.png and b/public/images/emoji/facebook_messenger/sound.png differ
diff --git a/public/images/emoji/facebook_messenger/south_africa.png b/public/images/emoji/facebook_messenger/south_africa.png
index 967b98eb84..db47d38be5 100644
Binary files a/public/images/emoji/facebook_messenger/south_africa.png and b/public/images/emoji/facebook_messenger/south_africa.png differ
diff --git a/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png b/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png
index 58f47bcd9b..8e6393d3d1 100644
Binary files a/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png and b/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/south_sudan.png b/public/images/emoji/facebook_messenger/south_sudan.png
index c7cbc6967c..d2bf101734 100644
Binary files a/public/images/emoji/facebook_messenger/south_sudan.png and b/public/images/emoji/facebook_messenger/south_sudan.png differ
diff --git a/public/images/emoji/facebook_messenger/space_invader.png b/public/images/emoji/facebook_messenger/space_invader.png
index ef0cc6b645..862aa6326d 100644
Binary files a/public/images/emoji/facebook_messenger/space_invader.png and b/public/images/emoji/facebook_messenger/space_invader.png differ
diff --git a/public/images/emoji/facebook_messenger/spades.png b/public/images/emoji/facebook_messenger/spades.png
index d8caab8d91..c7ba3971e8 100644
Binary files a/public/images/emoji/facebook_messenger/spades.png and b/public/images/emoji/facebook_messenger/spades.png differ
diff --git a/public/images/emoji/facebook_messenger/spaghetti.png b/public/images/emoji/facebook_messenger/spaghetti.png
index 8276dcbec6..595cb7cdb9 100644
Binary files a/public/images/emoji/facebook_messenger/spaghetti.png and b/public/images/emoji/facebook_messenger/spaghetti.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkle.png b/public/images/emoji/facebook_messenger/sparkle.png
index b63a7dea20..357e7e5e00 100644
Binary files a/public/images/emoji/facebook_messenger/sparkle.png and b/public/images/emoji/facebook_messenger/sparkle.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkler.png b/public/images/emoji/facebook_messenger/sparkler.png
index 71550c5313..78696de313 100644
Binary files a/public/images/emoji/facebook_messenger/sparkler.png and b/public/images/emoji/facebook_messenger/sparkler.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkles.png b/public/images/emoji/facebook_messenger/sparkles.png
index 081aa8bea4..028864b8cc 100644
Binary files a/public/images/emoji/facebook_messenger/sparkles.png and b/public/images/emoji/facebook_messenger/sparkles.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkling_heart.png b/public/images/emoji/facebook_messenger/sparkling_heart.png
index db195de7cd..33f0d7d4ac 100644
Binary files a/public/images/emoji/facebook_messenger/sparkling_heart.png and b/public/images/emoji/facebook_messenger/sparkling_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/speak_no_evil.png b/public/images/emoji/facebook_messenger/speak_no_evil.png
index 4e7665f831..c65adb7ad2 100644
Binary files a/public/images/emoji/facebook_messenger/speak_no_evil.png and b/public/images/emoji/facebook_messenger/speak_no_evil.png differ
diff --git a/public/images/emoji/facebook_messenger/speaker.png b/public/images/emoji/facebook_messenger/speaker.png
index 5ce2110879..b84def26e7 100644
Binary files a/public/images/emoji/facebook_messenger/speaker.png and b/public/images/emoji/facebook_messenger/speaker.png differ
diff --git a/public/images/emoji/facebook_messenger/speaking_head.png b/public/images/emoji/facebook_messenger/speaking_head.png
index edf252b9bd..64d53b0d1c 100644
Binary files a/public/images/emoji/facebook_messenger/speaking_head.png and b/public/images/emoji/facebook_messenger/speaking_head.png differ
diff --git a/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png b/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png
index edf252b9bd..64d53b0d1c 100644
Binary files a/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png and b/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/facebook_messenger/speech_balloon.png b/public/images/emoji/facebook_messenger/speech_balloon.png
index ec17855d07..586a5bb263 100644
Binary files a/public/images/emoji/facebook_messenger/speech_balloon.png and b/public/images/emoji/facebook_messenger/speech_balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/speedboat.png b/public/images/emoji/facebook_messenger/speedboat.png
index cf31f7eac1..f126b63d94 100644
Binary files a/public/images/emoji/facebook_messenger/speedboat.png and b/public/images/emoji/facebook_messenger/speedboat.png differ
diff --git a/public/images/emoji/facebook_messenger/spider.png b/public/images/emoji/facebook_messenger/spider.png
index 12ef291fa0..6eeffa4d4b 100644
Binary files a/public/images/emoji/facebook_messenger/spider.png and b/public/images/emoji/facebook_messenger/spider.png differ
diff --git a/public/images/emoji/facebook_messenger/spider_web.png b/public/images/emoji/facebook_messenger/spider_web.png
index 568c1dec8a..fdcf6eb8cc 100644
Binary files a/public/images/emoji/facebook_messenger/spider_web.png and b/public/images/emoji/facebook_messenger/spider_web.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_calendar.png b/public/images/emoji/facebook_messenger/spiral_calendar.png
index 8cd3bd7e57..ee07d24cb1 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_calendar.png and b/public/images/emoji/facebook_messenger/spiral_calendar.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_calendar_pad.png b/public/images/emoji/facebook_messenger/spiral_calendar_pad.png
index 8cd3bd7e57..ee07d24cb1 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_calendar_pad.png and b/public/images/emoji/facebook_messenger/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_note_pad.png b/public/images/emoji/facebook_messenger/spiral_note_pad.png
index b8ebfe080a..e441801b07 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_note_pad.png and b/public/images/emoji/facebook_messenger/spiral_note_pad.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_notepad.png b/public/images/emoji/facebook_messenger/spiral_notepad.png
index b8ebfe080a..e441801b07 100644
Binary files a/public/images/emoji/facebook_messenger/spiral_notepad.png and b/public/images/emoji/facebook_messenger/spiral_notepad.png differ
diff --git a/public/images/emoji/facebook_messenger/spoon.png b/public/images/emoji/facebook_messenger/spoon.png
index 960cba2bf7..61ceb0552d 100644
Binary files a/public/images/emoji/facebook_messenger/spoon.png and b/public/images/emoji/facebook_messenger/spoon.png differ
diff --git a/public/images/emoji/facebook_messenger/sports_medal.png b/public/images/emoji/facebook_messenger/sports_medal.png
index 57fbc8512f..2f481eb281 100644
Binary files a/public/images/emoji/facebook_messenger/sports_medal.png and b/public/images/emoji/facebook_messenger/sports_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/spy.png b/public/images/emoji/facebook_messenger/spy.png
index 587e506d98..6734c6bde0 100644
Binary files a/public/images/emoji/facebook_messenger/spy.png and b/public/images/emoji/facebook_messenger/spy.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/2.png b/public/images/emoji/facebook_messenger/spy/2.png
index a25d5ea4d4..04383914af 100644
Binary files a/public/images/emoji/facebook_messenger/spy/2.png and b/public/images/emoji/facebook_messenger/spy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/3.png b/public/images/emoji/facebook_messenger/spy/3.png
index f100fd13a4..1a6c3ca89c 100644
Binary files a/public/images/emoji/facebook_messenger/spy/3.png and b/public/images/emoji/facebook_messenger/spy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/4.png b/public/images/emoji/facebook_messenger/spy/4.png
index 775a8b2f2b..0778fa99eb 100644
Binary files a/public/images/emoji/facebook_messenger/spy/4.png and b/public/images/emoji/facebook_messenger/spy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/5.png b/public/images/emoji/facebook_messenger/spy/5.png
index c9703ba994..4479cc79cc 100644
Binary files a/public/images/emoji/facebook_messenger/spy/5.png and b/public/images/emoji/facebook_messenger/spy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/6.png b/public/images/emoji/facebook_messenger/spy/6.png
index 55cc03db8d..2602f4c409 100644
Binary files a/public/images/emoji/facebook_messenger/spy/6.png and b/public/images/emoji/facebook_messenger/spy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/squid.png b/public/images/emoji/facebook_messenger/squid.png
index 8e1b95f60e..4b589aef41 100644
Binary files a/public/images/emoji/facebook_messenger/squid.png and b/public/images/emoji/facebook_messenger/squid.png differ
diff --git a/public/images/emoji/facebook_messenger/sri_lanka.png b/public/images/emoji/facebook_messenger/sri_lanka.png
index f15b9be56d..39e770f5fd 100644
Binary files a/public/images/emoji/facebook_messenger/sri_lanka.png and b/public/images/emoji/facebook_messenger/sri_lanka.png differ
diff --git a/public/images/emoji/facebook_messenger/st_barthelemy.png b/public/images/emoji/facebook_messenger/st_barthelemy.png
index e213bf7e40..b0acdb50ff 100644
Binary files a/public/images/emoji/facebook_messenger/st_barthelemy.png and b/public/images/emoji/facebook_messenger/st_barthelemy.png differ
diff --git a/public/images/emoji/facebook_messenger/st_helena.png b/public/images/emoji/facebook_messenger/st_helena.png
index 90fefd0cab..d1fb896890 100644
Binary files a/public/images/emoji/facebook_messenger/st_helena.png and b/public/images/emoji/facebook_messenger/st_helena.png differ
diff --git a/public/images/emoji/facebook_messenger/st_kitts_nevis.png b/public/images/emoji/facebook_messenger/st_kitts_nevis.png
index d7686f8b60..429af8b89e 100644
Binary files a/public/images/emoji/facebook_messenger/st_kitts_nevis.png and b/public/images/emoji/facebook_messenger/st_kitts_nevis.png differ
diff --git a/public/images/emoji/facebook_messenger/st_lucia.png b/public/images/emoji/facebook_messenger/st_lucia.png
index 92eafffe94..0642436de4 100644
Binary files a/public/images/emoji/facebook_messenger/st_lucia.png and b/public/images/emoji/facebook_messenger/st_lucia.png differ
diff --git a/public/images/emoji/facebook_messenger/st_martin.png b/public/images/emoji/facebook_messenger/st_martin.png
index 7943b73f67..2ef71d792a 100644
Binary files a/public/images/emoji/facebook_messenger/st_martin.png and b/public/images/emoji/facebook_messenger/st_martin.png differ
diff --git a/public/images/emoji/facebook_messenger/st_pierre_miquelon.png b/public/images/emoji/facebook_messenger/st_pierre_miquelon.png
index b05828b47c..697bcd6280 100644
Binary files a/public/images/emoji/facebook_messenger/st_pierre_miquelon.png and b/public/images/emoji/facebook_messenger/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/facebook_messenger/st_vincent_grenadines.png b/public/images/emoji/facebook_messenger/st_vincent_grenadines.png
index ddfd25fd22..30c54fb34a 100644
Binary files a/public/images/emoji/facebook_messenger/st_vincent_grenadines.png and b/public/images/emoji/facebook_messenger/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/facebook_messenger/stadium.png b/public/images/emoji/facebook_messenger/stadium.png
index 0ad57f80a4..c599f90bfb 100644
Binary files a/public/images/emoji/facebook_messenger/stadium.png and b/public/images/emoji/facebook_messenger/stadium.png differ
diff --git a/public/images/emoji/facebook_messenger/star.png b/public/images/emoji/facebook_messenger/star.png
index 7381725ef4..3817206170 100644
Binary files a/public/images/emoji/facebook_messenger/star.png and b/public/images/emoji/facebook_messenger/star.png differ
diff --git a/public/images/emoji/facebook_messenger/star2.png b/public/images/emoji/facebook_messenger/star2.png
index 43cfbee5cb..5a5acfa640 100644
Binary files a/public/images/emoji/facebook_messenger/star2.png and b/public/images/emoji/facebook_messenger/star2.png differ
diff --git a/public/images/emoji/facebook_messenger/star_and_crescent.png b/public/images/emoji/facebook_messenger/star_and_crescent.png
index a89f689ad5..977efca749 100644
Binary files a/public/images/emoji/facebook_messenger/star_and_crescent.png and b/public/images/emoji/facebook_messenger/star_and_crescent.png differ
diff --git a/public/images/emoji/facebook_messenger/star_of_david.png b/public/images/emoji/facebook_messenger/star_of_david.png
index 96462ffd58..a01e9c19e0 100644
Binary files a/public/images/emoji/facebook_messenger/star_of_david.png and b/public/images/emoji/facebook_messenger/star_of_david.png differ
diff --git a/public/images/emoji/facebook_messenger/star_struck.png b/public/images/emoji/facebook_messenger/star_struck.png
index 7da8183f39..88dde6c46b 100644
Binary files a/public/images/emoji/facebook_messenger/star_struck.png and b/public/images/emoji/facebook_messenger/star_struck.png differ
diff --git a/public/images/emoji/facebook_messenger/stars.png b/public/images/emoji/facebook_messenger/stars.png
index a7cfe72b88..72443a819a 100644
Binary files a/public/images/emoji/facebook_messenger/stars.png and b/public/images/emoji/facebook_messenger/stars.png differ
diff --git a/public/images/emoji/facebook_messenger/station.png b/public/images/emoji/facebook_messenger/station.png
index 66b496b9a2..68f40b18da 100644
Binary files a/public/images/emoji/facebook_messenger/station.png and b/public/images/emoji/facebook_messenger/station.png differ
diff --git a/public/images/emoji/facebook_messenger/statue_of_liberty.png b/public/images/emoji/facebook_messenger/statue_of_liberty.png
index 0bf418a00b..e1bdc292d9 100644
Binary files a/public/images/emoji/facebook_messenger/statue_of_liberty.png and b/public/images/emoji/facebook_messenger/statue_of_liberty.png differ
diff --git a/public/images/emoji/facebook_messenger/steam_locomotive.png b/public/images/emoji/facebook_messenger/steam_locomotive.png
index 1c5caa9a1c..551bc94b95 100644
Binary files a/public/images/emoji/facebook_messenger/steam_locomotive.png and b/public/images/emoji/facebook_messenger/steam_locomotive.png differ
diff --git a/public/images/emoji/facebook_messenger/stew.png b/public/images/emoji/facebook_messenger/stew.png
index e2c6063d23..9dd0cb7546 100644
Binary files a/public/images/emoji/facebook_messenger/stew.png and b/public/images/emoji/facebook_messenger/stew.png differ
diff --git a/public/images/emoji/facebook_messenger/stop_button.png b/public/images/emoji/facebook_messenger/stop_button.png
index bbdb0b7b75..564c188456 100644
Binary files a/public/images/emoji/facebook_messenger/stop_button.png and b/public/images/emoji/facebook_messenger/stop_button.png differ
diff --git a/public/images/emoji/facebook_messenger/stop_sign.png b/public/images/emoji/facebook_messenger/stop_sign.png
index cf08756ebf..2977d19141 100644
Binary files a/public/images/emoji/facebook_messenger/stop_sign.png and b/public/images/emoji/facebook_messenger/stop_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/stopwatch.png b/public/images/emoji/facebook_messenger/stopwatch.png
index 74bff44004..f8e1dffd08 100644
Binary files a/public/images/emoji/facebook_messenger/stopwatch.png and b/public/images/emoji/facebook_messenger/stopwatch.png differ
diff --git a/public/images/emoji/facebook_messenger/straight_ruler.png b/public/images/emoji/facebook_messenger/straight_ruler.png
index 9695738762..020871473d 100644
Binary files a/public/images/emoji/facebook_messenger/straight_ruler.png and b/public/images/emoji/facebook_messenger/straight_ruler.png differ
diff --git a/public/images/emoji/facebook_messenger/strawberry.png b/public/images/emoji/facebook_messenger/strawberry.png
index 0b2dd5ba43..a3528642ec 100644
Binary files a/public/images/emoji/facebook_messenger/strawberry.png and b/public/images/emoji/facebook_messenger/strawberry.png differ
diff --git a/public/images/emoji/facebook_messenger/stuck_out_tongue.png b/public/images/emoji/facebook_messenger/stuck_out_tongue.png
index 1bc6767861..e5beeb121a 100644
Binary files a/public/images/emoji/facebook_messenger/stuck_out_tongue.png and b/public/images/emoji/facebook_messenger/stuck_out_tongue.png differ
diff --git a/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png b/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png
index fc6eb0cb99..8b8d41b4e1 100644
Binary files a/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png b/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png
index 227eebc6ad..649eba9a43 100644
Binary files a/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png and b/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/facebook_messenger/studio_microphone.png b/public/images/emoji/facebook_messenger/studio_microphone.png
index d10b32281f..ed24a78f7f 100644
Binary files a/public/images/emoji/facebook_messenger/studio_microphone.png and b/public/images/emoji/facebook_messenger/studio_microphone.png differ
diff --git a/public/images/emoji/facebook_messenger/stuffed_flatbread.png b/public/images/emoji/facebook_messenger/stuffed_flatbread.png
index f5dca14bd2..b8e739742a 100644
Binary files a/public/images/emoji/facebook_messenger/stuffed_flatbread.png and b/public/images/emoji/facebook_messenger/stuffed_flatbread.png differ
diff --git a/public/images/emoji/facebook_messenger/sudan.png b/public/images/emoji/facebook_messenger/sudan.png
index 3974a07328..11efec7ed1 100644
Binary files a/public/images/emoji/facebook_messenger/sudan.png and b/public/images/emoji/facebook_messenger/sudan.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png b/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png
index 3ceb40a9ec..17a5f1ff82 100644
Binary files a/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png and b/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png b/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png
index ef892f1f88..ec92c38a2b 100644
Binary files a/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png and b/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png b/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png
index 90af3591e0..0a6ad08a98 100644
Binary files a/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png and b/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_with_face.png b/public/images/emoji/facebook_messenger/sun_with_face.png
index 5c3125e212..60cdafd79e 100644
Binary files a/public/images/emoji/facebook_messenger/sun_with_face.png and b/public/images/emoji/facebook_messenger/sun_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/sunflower.png b/public/images/emoji/facebook_messenger/sunflower.png
index f5ef9ec1df..939ff0818b 100644
Binary files a/public/images/emoji/facebook_messenger/sunflower.png and b/public/images/emoji/facebook_messenger/sunflower.png differ
diff --git a/public/images/emoji/facebook_messenger/sunglasses.png b/public/images/emoji/facebook_messenger/sunglasses.png
index e1ed311806..430be8ac23 100644
Binary files a/public/images/emoji/facebook_messenger/sunglasses.png and b/public/images/emoji/facebook_messenger/sunglasses.png differ
diff --git a/public/images/emoji/facebook_messenger/sunny.png b/public/images/emoji/facebook_messenger/sunny.png
index 02632bb3df..0bbab9a719 100644
Binary files a/public/images/emoji/facebook_messenger/sunny.png and b/public/images/emoji/facebook_messenger/sunny.png differ
diff --git a/public/images/emoji/facebook_messenger/sunrise.png b/public/images/emoji/facebook_messenger/sunrise.png
index b10c95a0e9..e5f45ef92c 100644
Binary files a/public/images/emoji/facebook_messenger/sunrise.png and b/public/images/emoji/facebook_messenger/sunrise.png differ
diff --git a/public/images/emoji/facebook_messenger/sunrise_over_mountains.png b/public/images/emoji/facebook_messenger/sunrise_over_mountains.png
index 5642e6c0ca..b5529673aa 100644
Binary files a/public/images/emoji/facebook_messenger/sunrise_over_mountains.png and b/public/images/emoji/facebook_messenger/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer.png b/public/images/emoji/facebook_messenger/surfer.png
index 0d12c43c8b..1cbae8ae1f 100644
Binary files a/public/images/emoji/facebook_messenger/surfer.png and b/public/images/emoji/facebook_messenger/surfer.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/2.png b/public/images/emoji/facebook_messenger/surfer/2.png
index 596085dc01..04d624820b 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/2.png and b/public/images/emoji/facebook_messenger/surfer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/3.png b/public/images/emoji/facebook_messenger/surfer/3.png
index 2ddb34c250..998fb376d9 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/3.png and b/public/images/emoji/facebook_messenger/surfer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/4.png b/public/images/emoji/facebook_messenger/surfer/4.png
index 46785c0494..643c9ef724 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/4.png and b/public/images/emoji/facebook_messenger/surfer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/5.png b/public/images/emoji/facebook_messenger/surfer/5.png
index d241b79d59..afd256b0eb 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/5.png and b/public/images/emoji/facebook_messenger/surfer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/6.png b/public/images/emoji/facebook_messenger/surfer/6.png
index d6b178659c..62e204af78 100644
Binary files a/public/images/emoji/facebook_messenger/surfer/6.png and b/public/images/emoji/facebook_messenger/surfer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man.png b/public/images/emoji/facebook_messenger/surfing_man.png
index 0d12c43c8b..1cbae8ae1f 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man.png and b/public/images/emoji/facebook_messenger/surfing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/2.png b/public/images/emoji/facebook_messenger/surfing_man/2.png
index 596085dc01..04d624820b 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/2.png and b/public/images/emoji/facebook_messenger/surfing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/3.png b/public/images/emoji/facebook_messenger/surfing_man/3.png
index 2ddb34c250..998fb376d9 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/3.png and b/public/images/emoji/facebook_messenger/surfing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/4.png b/public/images/emoji/facebook_messenger/surfing_man/4.png
index 46785c0494..643c9ef724 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/4.png and b/public/images/emoji/facebook_messenger/surfing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/5.png b/public/images/emoji/facebook_messenger/surfing_man/5.png
index d241b79d59..afd256b0eb 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/5.png and b/public/images/emoji/facebook_messenger/surfing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/6.png b/public/images/emoji/facebook_messenger/surfing_man/6.png
index d6b178659c..62e204af78 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_man/6.png and b/public/images/emoji/facebook_messenger/surfing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman.png b/public/images/emoji/facebook_messenger/surfing_woman.png
index 5a5e1cefda..c48f0ec9b3 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman.png and b/public/images/emoji/facebook_messenger/surfing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/2.png b/public/images/emoji/facebook_messenger/surfing_woman/2.png
index c66e258d1c..b660f1eb44 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/2.png and b/public/images/emoji/facebook_messenger/surfing_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/3.png b/public/images/emoji/facebook_messenger/surfing_woman/3.png
index 0e9b7989d6..7f75d6f39f 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/3.png and b/public/images/emoji/facebook_messenger/surfing_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/4.png b/public/images/emoji/facebook_messenger/surfing_woman/4.png
index 50f43ce070..1df15c3023 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/4.png and b/public/images/emoji/facebook_messenger/surfing_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/5.png b/public/images/emoji/facebook_messenger/surfing_woman/5.png
index 99d3d27535..449f23efc8 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/5.png and b/public/images/emoji/facebook_messenger/surfing_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/6.png b/public/images/emoji/facebook_messenger/surfing_woman/6.png
index f30dff2f5a..3f90f910e4 100644
Binary files a/public/images/emoji/facebook_messenger/surfing_woman/6.png and b/public/images/emoji/facebook_messenger/surfing_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/suriname.png b/public/images/emoji/facebook_messenger/suriname.png
index 48afc4adac..86caff504a 100644
Binary files a/public/images/emoji/facebook_messenger/suriname.png and b/public/images/emoji/facebook_messenger/suriname.png differ
diff --git a/public/images/emoji/facebook_messenger/sushi.png b/public/images/emoji/facebook_messenger/sushi.png
index a388ce9d65..f4bd6263b6 100644
Binary files a/public/images/emoji/facebook_messenger/sushi.png and b/public/images/emoji/facebook_messenger/sushi.png differ
diff --git a/public/images/emoji/facebook_messenger/suspension_railway.png b/public/images/emoji/facebook_messenger/suspension_railway.png
index 3dd6dc2e8a..bab0b96ae4 100644
Binary files a/public/images/emoji/facebook_messenger/suspension_railway.png and b/public/images/emoji/facebook_messenger/suspension_railway.png differ
diff --git a/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png b/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png
index 004a11d830..d2cd8f67f2 100644
Binary files a/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png and b/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/facebook_messenger/swaziland.png b/public/images/emoji/facebook_messenger/swaziland.png
index fb5ee97ba2..8e83a676ae 100644
Binary files a/public/images/emoji/facebook_messenger/swaziland.png and b/public/images/emoji/facebook_messenger/swaziland.png differ
diff --git a/public/images/emoji/facebook_messenger/sweat.png b/public/images/emoji/facebook_messenger/sweat.png
index 0f6075cbcc..4dfa75e54d 100644
Binary files a/public/images/emoji/facebook_messenger/sweat.png and b/public/images/emoji/facebook_messenger/sweat.png differ
diff --git a/public/images/emoji/facebook_messenger/sweat_drops.png b/public/images/emoji/facebook_messenger/sweat_drops.png
index 2555ca7db4..6f417fbfc1 100644
Binary files a/public/images/emoji/facebook_messenger/sweat_drops.png and b/public/images/emoji/facebook_messenger/sweat_drops.png differ
diff --git a/public/images/emoji/facebook_messenger/sweat_smile.png b/public/images/emoji/facebook_messenger/sweat_smile.png
index f910451ae6..dc7c2a0f1e 100644
Binary files a/public/images/emoji/facebook_messenger/sweat_smile.png and b/public/images/emoji/facebook_messenger/sweat_smile.png differ
diff --git a/public/images/emoji/facebook_messenger/sweden.png b/public/images/emoji/facebook_messenger/sweden.png
index 7274789f2e..2235439563 100644
Binary files a/public/images/emoji/facebook_messenger/sweden.png and b/public/images/emoji/facebook_messenger/sweden.png differ
diff --git a/public/images/emoji/facebook_messenger/sweet_potato.png b/public/images/emoji/facebook_messenger/sweet_potato.png
index cf66433144..a977184a2b 100644
Binary files a/public/images/emoji/facebook_messenger/sweet_potato.png and b/public/images/emoji/facebook_messenger/sweet_potato.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer.png b/public/images/emoji/facebook_messenger/swimmer.png
index 4ef1cc186f..f60b6a5a32 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer.png and b/public/images/emoji/facebook_messenger/swimmer.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/2.png b/public/images/emoji/facebook_messenger/swimmer/2.png
index c6140b93bb..4f00d13f3e 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/2.png and b/public/images/emoji/facebook_messenger/swimmer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/3.png b/public/images/emoji/facebook_messenger/swimmer/3.png
index cdb3af693a..1a09aba943 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/3.png and b/public/images/emoji/facebook_messenger/swimmer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/4.png b/public/images/emoji/facebook_messenger/swimmer/4.png
index 989a36b8c8..6bae69f370 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/4.png and b/public/images/emoji/facebook_messenger/swimmer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/5.png b/public/images/emoji/facebook_messenger/swimmer/5.png
index ab6537f51e..938f5a497f 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/5.png and b/public/images/emoji/facebook_messenger/swimmer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/6.png b/public/images/emoji/facebook_messenger/swimmer/6.png
index d49ea483d2..a45e2917c1 100644
Binary files a/public/images/emoji/facebook_messenger/swimmer/6.png and b/public/images/emoji/facebook_messenger/swimmer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man.png b/public/images/emoji/facebook_messenger/swimming_man.png
index 4ef1cc186f..f60b6a5a32 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man.png and b/public/images/emoji/facebook_messenger/swimming_man.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/2.png b/public/images/emoji/facebook_messenger/swimming_man/2.png
index c6140b93bb..4f00d13f3e 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/2.png and b/public/images/emoji/facebook_messenger/swimming_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/3.png b/public/images/emoji/facebook_messenger/swimming_man/3.png
index cdb3af693a..1a09aba943 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/3.png and b/public/images/emoji/facebook_messenger/swimming_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/4.png b/public/images/emoji/facebook_messenger/swimming_man/4.png
index 989a36b8c8..6bae69f370 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/4.png and b/public/images/emoji/facebook_messenger/swimming_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/5.png b/public/images/emoji/facebook_messenger/swimming_man/5.png
index ab6537f51e..938f5a497f 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/5.png and b/public/images/emoji/facebook_messenger/swimming_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/6.png b/public/images/emoji/facebook_messenger/swimming_man/6.png
index d49ea483d2..a45e2917c1 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_man/6.png and b/public/images/emoji/facebook_messenger/swimming_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman.png b/public/images/emoji/facebook_messenger/swimming_woman.png
index 9963221f61..3c6323c0c8 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman.png and b/public/images/emoji/facebook_messenger/swimming_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/2.png b/public/images/emoji/facebook_messenger/swimming_woman/2.png
index 59dad2c3e1..16a14ad260 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/2.png and b/public/images/emoji/facebook_messenger/swimming_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/3.png b/public/images/emoji/facebook_messenger/swimming_woman/3.png
index 66e962335c..789b80a56e 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/3.png and b/public/images/emoji/facebook_messenger/swimming_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/4.png b/public/images/emoji/facebook_messenger/swimming_woman/4.png
index 9414644c3e..acf859962a 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/4.png and b/public/images/emoji/facebook_messenger/swimming_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/5.png b/public/images/emoji/facebook_messenger/swimming_woman/5.png
index ebde0eb37c..44696ca0c4 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/5.png and b/public/images/emoji/facebook_messenger/swimming_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/6.png b/public/images/emoji/facebook_messenger/swimming_woman/6.png
index d294454be9..b7774e020f 100644
Binary files a/public/images/emoji/facebook_messenger/swimming_woman/6.png and b/public/images/emoji/facebook_messenger/swimming_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/switzerland.png b/public/images/emoji/facebook_messenger/switzerland.png
index 9e47fad1ae..dc6c36ac89 100644
Binary files a/public/images/emoji/facebook_messenger/switzerland.png and b/public/images/emoji/facebook_messenger/switzerland.png differ
diff --git a/public/images/emoji/facebook_messenger/symbols.png b/public/images/emoji/facebook_messenger/symbols.png
index def3faa02a..87e3f439b6 100644
Binary files a/public/images/emoji/facebook_messenger/symbols.png and b/public/images/emoji/facebook_messenger/symbols.png differ
diff --git a/public/images/emoji/facebook_messenger/synagogue.png b/public/images/emoji/facebook_messenger/synagogue.png
index c72b028f24..b449930821 100644
Binary files a/public/images/emoji/facebook_messenger/synagogue.png and b/public/images/emoji/facebook_messenger/synagogue.png differ
diff --git a/public/images/emoji/facebook_messenger/syria.png b/public/images/emoji/facebook_messenger/syria.png
index 53606f3e07..cc83b9c6a2 100644
Binary files a/public/images/emoji/facebook_messenger/syria.png and b/public/images/emoji/facebook_messenger/syria.png differ
diff --git a/public/images/emoji/facebook_messenger/syringe.png b/public/images/emoji/facebook_messenger/syringe.png
index 45cf34b2a1..188e7156c6 100644
Binary files a/public/images/emoji/facebook_messenger/syringe.png and b/public/images/emoji/facebook_messenger/syringe.png differ
diff --git a/public/images/emoji/facebook_messenger/t_rex.png b/public/images/emoji/facebook_messenger/t_rex.png
index d8811a5638..d0d1c7b5d7 100644
Binary files a/public/images/emoji/facebook_messenger/t_rex.png and b/public/images/emoji/facebook_messenger/t_rex.png differ
diff --git a/public/images/emoji/facebook_messenger/table_tennis.png b/public/images/emoji/facebook_messenger/table_tennis.png
index 935993c860..4b18adbad4 100644
Binary files a/public/images/emoji/facebook_messenger/table_tennis.png and b/public/images/emoji/facebook_messenger/table_tennis.png differ
diff --git a/public/images/emoji/facebook_messenger/taco.png b/public/images/emoji/facebook_messenger/taco.png
index 14247eb307..a9e6dda0e0 100644
Binary files a/public/images/emoji/facebook_messenger/taco.png and b/public/images/emoji/facebook_messenger/taco.png differ
diff --git a/public/images/emoji/facebook_messenger/tada.png b/public/images/emoji/facebook_messenger/tada.png
index ae95549f3b..ad69b893f8 100644
Binary files a/public/images/emoji/facebook_messenger/tada.png and b/public/images/emoji/facebook_messenger/tada.png differ
diff --git a/public/images/emoji/facebook_messenger/taiwan.png b/public/images/emoji/facebook_messenger/taiwan.png
index dde348b40d..d214347a7b 100644
Binary files a/public/images/emoji/facebook_messenger/taiwan.png and b/public/images/emoji/facebook_messenger/taiwan.png differ
diff --git a/public/images/emoji/facebook_messenger/tajikistan.png b/public/images/emoji/facebook_messenger/tajikistan.png
index 7b3697952d..f3a67c9a97 100644
Binary files a/public/images/emoji/facebook_messenger/tajikistan.png and b/public/images/emoji/facebook_messenger/tajikistan.png differ
diff --git a/public/images/emoji/facebook_messenger/takeout_box.png b/public/images/emoji/facebook_messenger/takeout_box.png
index 08aa6a4843..17c638d5c4 100644
Binary files a/public/images/emoji/facebook_messenger/takeout_box.png and b/public/images/emoji/facebook_messenger/takeout_box.png differ
diff --git a/public/images/emoji/facebook_messenger/tanabata_tree.png b/public/images/emoji/facebook_messenger/tanabata_tree.png
index ddf022c97f..6c160bc7b3 100644
Binary files a/public/images/emoji/facebook_messenger/tanabata_tree.png and b/public/images/emoji/facebook_messenger/tanabata_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/tangerine.png b/public/images/emoji/facebook_messenger/tangerine.png
index 369113f279..f6b8068396 100644
Binary files a/public/images/emoji/facebook_messenger/tangerine.png and b/public/images/emoji/facebook_messenger/tangerine.png differ
diff --git a/public/images/emoji/facebook_messenger/tanzania.png b/public/images/emoji/facebook_messenger/tanzania.png
index d4026fea32..d79422df00 100644
Binary files a/public/images/emoji/facebook_messenger/tanzania.png and b/public/images/emoji/facebook_messenger/tanzania.png differ
diff --git a/public/images/emoji/facebook_messenger/taurus.png b/public/images/emoji/facebook_messenger/taurus.png
index 0fc8505969..6064dce482 100644
Binary files a/public/images/emoji/facebook_messenger/taurus.png and b/public/images/emoji/facebook_messenger/taurus.png differ
diff --git a/public/images/emoji/facebook_messenger/taxi.png b/public/images/emoji/facebook_messenger/taxi.png
index 3097c343af..4e97b62afc 100644
Binary files a/public/images/emoji/facebook_messenger/taxi.png and b/public/images/emoji/facebook_messenger/taxi.png differ
diff --git a/public/images/emoji/facebook_messenger/tea.png b/public/images/emoji/facebook_messenger/tea.png
index e8ea943114..0b8d1891a9 100644
Binary files a/public/images/emoji/facebook_messenger/tea.png and b/public/images/emoji/facebook_messenger/tea.png differ
diff --git a/public/images/emoji/facebook_messenger/telephone.png b/public/images/emoji/facebook_messenger/telephone.png
index b8bbec494d..13b38ac3c6 100644
Binary files a/public/images/emoji/facebook_messenger/telephone.png and b/public/images/emoji/facebook_messenger/telephone.png differ
diff --git a/public/images/emoji/facebook_messenger/telephone_receiver.png b/public/images/emoji/facebook_messenger/telephone_receiver.png
index ec5f5e89cc..d903dbd15b 100644
Binary files a/public/images/emoji/facebook_messenger/telephone_receiver.png and b/public/images/emoji/facebook_messenger/telephone_receiver.png differ
diff --git a/public/images/emoji/facebook_messenger/telescope.png b/public/images/emoji/facebook_messenger/telescope.png
index e01c0f8aac..cc1a4c5b00 100644
Binary files a/public/images/emoji/facebook_messenger/telescope.png and b/public/images/emoji/facebook_messenger/telescope.png differ
diff --git a/public/images/emoji/facebook_messenger/ten.png b/public/images/emoji/facebook_messenger/ten.png
index 12264637b0..c0beb67e22 100644
Binary files a/public/images/emoji/facebook_messenger/ten.png and b/public/images/emoji/facebook_messenger/ten.png differ
diff --git a/public/images/emoji/facebook_messenger/tennis.png b/public/images/emoji/facebook_messenger/tennis.png
index bddde41f5a..bc7770211a 100644
Binary files a/public/images/emoji/facebook_messenger/tennis.png and b/public/images/emoji/facebook_messenger/tennis.png differ
diff --git a/public/images/emoji/facebook_messenger/tent.png b/public/images/emoji/facebook_messenger/tent.png
index 22617eb275..c6d5353e41 100644
Binary files a/public/images/emoji/facebook_messenger/tent.png and b/public/images/emoji/facebook_messenger/tent.png differ
diff --git a/public/images/emoji/facebook_messenger/thailand.png b/public/images/emoji/facebook_messenger/thailand.png
index 81499f1616..62cc8d3d17 100644
Binary files a/public/images/emoji/facebook_messenger/thailand.png and b/public/images/emoji/facebook_messenger/thailand.png differ
diff --git a/public/images/emoji/facebook_messenger/thermometer.png b/public/images/emoji/facebook_messenger/thermometer.png
index eef50895b0..77638009bd 100644
Binary files a/public/images/emoji/facebook_messenger/thermometer.png and b/public/images/emoji/facebook_messenger/thermometer.png differ
diff --git a/public/images/emoji/facebook_messenger/thermometer_face.png b/public/images/emoji/facebook_messenger/thermometer_face.png
index c9440239c0..9c4da3e1fc 100644
Binary files a/public/images/emoji/facebook_messenger/thermometer_face.png and b/public/images/emoji/facebook_messenger/thermometer_face.png differ
diff --git a/public/images/emoji/facebook_messenger/thinking.png b/public/images/emoji/facebook_messenger/thinking.png
index f1bc0726a2..2d0aeb611b 100644
Binary files a/public/images/emoji/facebook_messenger/thinking.png and b/public/images/emoji/facebook_messenger/thinking.png differ
diff --git a/public/images/emoji/facebook_messenger/thinking_face.png b/public/images/emoji/facebook_messenger/thinking_face.png
index f1bc0726a2..2d0aeb611b 100644
Binary files a/public/images/emoji/facebook_messenger/thinking_face.png and b/public/images/emoji/facebook_messenger/thinking_face.png differ
diff --git a/public/images/emoji/facebook_messenger/thought_balloon.png b/public/images/emoji/facebook_messenger/thought_balloon.png
index a8cae3276a..0c698c1a86 100644
Binary files a/public/images/emoji/facebook_messenger/thought_balloon.png and b/public/images/emoji/facebook_messenger/thought_balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/three.png b/public/images/emoji/facebook_messenger/three.png
index e57e2a8272..3fb7f86e6c 100644
Binary files a/public/images/emoji/facebook_messenger/three.png and b/public/images/emoji/facebook_messenger/three.png differ
diff --git a/public/images/emoji/facebook_messenger/three_button_mouse.png b/public/images/emoji/facebook_messenger/three_button_mouse.png
index 3a71c800c6..53fdef1f76 100644
Binary files a/public/images/emoji/facebook_messenger/three_button_mouse.png and b/public/images/emoji/facebook_messenger/three_button_mouse.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown.png b/public/images/emoji/facebook_messenger/thumbsdown.png
index 1f6f64836b..6a7dce2614 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown.png and b/public/images/emoji/facebook_messenger/thumbsdown.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/2.png b/public/images/emoji/facebook_messenger/thumbsdown/2.png
index e706d7c7a5..ceaa32b82f 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/2.png and b/public/images/emoji/facebook_messenger/thumbsdown/2.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/3.png b/public/images/emoji/facebook_messenger/thumbsdown/3.png
index 9bf7711367..c6d370ce27 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/3.png and b/public/images/emoji/facebook_messenger/thumbsdown/3.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/4.png b/public/images/emoji/facebook_messenger/thumbsdown/4.png
index 35fc141cba..212f843ce9 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/4.png and b/public/images/emoji/facebook_messenger/thumbsdown/4.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/5.png b/public/images/emoji/facebook_messenger/thumbsdown/5.png
index bd43bad304..2b2cf80548 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/5.png and b/public/images/emoji/facebook_messenger/thumbsdown/5.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/6.png b/public/images/emoji/facebook_messenger/thumbsdown/6.png
index 5b68287702..deb44ca2b3 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsdown/6.png and b/public/images/emoji/facebook_messenger/thumbsdown/6.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup.png b/public/images/emoji/facebook_messenger/thumbsup.png
index 6621dc4a7b..53f1b3d075 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup.png and b/public/images/emoji/facebook_messenger/thumbsup.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/2.png b/public/images/emoji/facebook_messenger/thumbsup/2.png
index 37b29f3252..eb5da604ed 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/2.png and b/public/images/emoji/facebook_messenger/thumbsup/2.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/3.png b/public/images/emoji/facebook_messenger/thumbsup/3.png
index c7aa537558..192910cdc2 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/3.png and b/public/images/emoji/facebook_messenger/thumbsup/3.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/4.png b/public/images/emoji/facebook_messenger/thumbsup/4.png
index 1e24d40e56..ec447b3076 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/4.png and b/public/images/emoji/facebook_messenger/thumbsup/4.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/5.png b/public/images/emoji/facebook_messenger/thumbsup/5.png
index 5b1740d87b..e09b86a9f1 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/5.png and b/public/images/emoji/facebook_messenger/thumbsup/5.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/6.png b/public/images/emoji/facebook_messenger/thumbsup/6.png
index e67bd06a2a..b43fad6805 100644
Binary files a/public/images/emoji/facebook_messenger/thumbsup/6.png and b/public/images/emoji/facebook_messenger/thumbsup/6.png differ
diff --git a/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png b/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png
index be44d531a7..943482554f 100644
Binary files a/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png and b/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/thunder_cloud_rain.png b/public/images/emoji/facebook_messenger/thunder_cloud_rain.png
index be44d531a7..943482554f 100644
Binary files a/public/images/emoji/facebook_messenger/thunder_cloud_rain.png and b/public/images/emoji/facebook_messenger/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/ticket.png b/public/images/emoji/facebook_messenger/ticket.png
index 2894d40300..60ce4aea21 100644
Binary files a/public/images/emoji/facebook_messenger/ticket.png and b/public/images/emoji/facebook_messenger/ticket.png differ
diff --git a/public/images/emoji/facebook_messenger/tickets.png b/public/images/emoji/facebook_messenger/tickets.png
index 295e9bbdc6..e863f088be 100644
Binary files a/public/images/emoji/facebook_messenger/tickets.png and b/public/images/emoji/facebook_messenger/tickets.png differ
diff --git a/public/images/emoji/facebook_messenger/tiger.png b/public/images/emoji/facebook_messenger/tiger.png
index c393c38d49..ddfd859a66 100644
Binary files a/public/images/emoji/facebook_messenger/tiger.png and b/public/images/emoji/facebook_messenger/tiger.png differ
diff --git a/public/images/emoji/facebook_messenger/tiger2.png b/public/images/emoji/facebook_messenger/tiger2.png
index 9934d6e85b..9f117a0958 100644
Binary files a/public/images/emoji/facebook_messenger/tiger2.png and b/public/images/emoji/facebook_messenger/tiger2.png differ
diff --git a/public/images/emoji/facebook_messenger/timer.png b/public/images/emoji/facebook_messenger/timer.png
index 31f31d8937..e3142522f7 100644
Binary files a/public/images/emoji/facebook_messenger/timer.png and b/public/images/emoji/facebook_messenger/timer.png differ
diff --git a/public/images/emoji/facebook_messenger/timer_clock.png b/public/images/emoji/facebook_messenger/timer_clock.png
index 31f31d8937..e3142522f7 100644
Binary files a/public/images/emoji/facebook_messenger/timer_clock.png and b/public/images/emoji/facebook_messenger/timer_clock.png differ
diff --git a/public/images/emoji/facebook_messenger/timor_leste.png b/public/images/emoji/facebook_messenger/timor_leste.png
index 6706def991..68b2faeb7a 100644
Binary files a/public/images/emoji/facebook_messenger/timor_leste.png and b/public/images/emoji/facebook_messenger/timor_leste.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man.png b/public/images/emoji/facebook_messenger/tipping_hand_man.png
index 63e5492220..775e5ad35d 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man.png and b/public/images/emoji/facebook_messenger/tipping_hand_man.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/2.png b/public/images/emoji/facebook_messenger/tipping_hand_man/2.png
index aec62f49f4..5ab668a8ca 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/2.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/3.png b/public/images/emoji/facebook_messenger/tipping_hand_man/3.png
index 92e1fe7d22..ddef3f13e9 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/3.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/4.png b/public/images/emoji/facebook_messenger/tipping_hand_man/4.png
index 813113bb9c..5e996a9924 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/4.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/5.png b/public/images/emoji/facebook_messenger/tipping_hand_man/5.png
index a2f29fdac9..7fd82d7274 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/5.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/6.png b/public/images/emoji/facebook_messenger/tipping_hand_man/6.png
index fa68bdb53a..8200d03e20 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_man/6.png and b/public/images/emoji/facebook_messenger/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman.png b/public/images/emoji/facebook_messenger/tipping_hand_woman.png
index 17d66f473b..45ca8d273d 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png
index 92055ff0cd..ee2883ad57 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png
index 2c8a485a1f..e98fdbc0e2 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png
index 890ae929d2..a74a217798 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png
index c7228bf6a8..03f6a7303e 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png
index f02f68988a..994308cee8 100644
Binary files a/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png and b/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/tired_face.png b/public/images/emoji/facebook_messenger/tired_face.png
index d1d6a8b748..311464115c 100644
Binary files a/public/images/emoji/facebook_messenger/tired_face.png and b/public/images/emoji/facebook_messenger/tired_face.png differ
diff --git a/public/images/emoji/facebook_messenger/tm.png b/public/images/emoji/facebook_messenger/tm.png
index d18a8b8004..9d86f2f706 100644
Binary files a/public/images/emoji/facebook_messenger/tm.png and b/public/images/emoji/facebook_messenger/tm.png differ
diff --git a/public/images/emoji/facebook_messenger/togo.png b/public/images/emoji/facebook_messenger/togo.png
index 7a542547e0..260a81c702 100644
Binary files a/public/images/emoji/facebook_messenger/togo.png and b/public/images/emoji/facebook_messenger/togo.png differ
diff --git a/public/images/emoji/facebook_messenger/toilet.png b/public/images/emoji/facebook_messenger/toilet.png
index 99d7a913ce..273f4f16a8 100644
Binary files a/public/images/emoji/facebook_messenger/toilet.png and b/public/images/emoji/facebook_messenger/toilet.png differ
diff --git a/public/images/emoji/facebook_messenger/tokelau.png b/public/images/emoji/facebook_messenger/tokelau.png
index f42f868631..86fd2423cb 100644
Binary files a/public/images/emoji/facebook_messenger/tokelau.png and b/public/images/emoji/facebook_messenger/tokelau.png differ
diff --git a/public/images/emoji/facebook_messenger/tokyo_tower.png b/public/images/emoji/facebook_messenger/tokyo_tower.png
index f2e7e714e0..d47cd01126 100644
Binary files a/public/images/emoji/facebook_messenger/tokyo_tower.png and b/public/images/emoji/facebook_messenger/tokyo_tower.png differ
diff --git a/public/images/emoji/facebook_messenger/tomato.png b/public/images/emoji/facebook_messenger/tomato.png
index 245cf16462..ed7ad8276b 100644
Binary files a/public/images/emoji/facebook_messenger/tomato.png and b/public/images/emoji/facebook_messenger/tomato.png differ
diff --git a/public/images/emoji/facebook_messenger/tonga.png b/public/images/emoji/facebook_messenger/tonga.png
index bfff80acf4..c30d9f9312 100644
Binary files a/public/images/emoji/facebook_messenger/tonga.png and b/public/images/emoji/facebook_messenger/tonga.png differ
diff --git a/public/images/emoji/facebook_messenger/tongue.png b/public/images/emoji/facebook_messenger/tongue.png
index 34fe6e6388..7b1a28827e 100644
Binary files a/public/images/emoji/facebook_messenger/tongue.png and b/public/images/emoji/facebook_messenger/tongue.png differ
diff --git a/public/images/emoji/facebook_messenger/tools.png b/public/images/emoji/facebook_messenger/tools.png
index 2b7c33b207..ed21302869 100644
Binary files a/public/images/emoji/facebook_messenger/tools.png and b/public/images/emoji/facebook_messenger/tools.png differ
diff --git a/public/images/emoji/facebook_messenger/top.png b/public/images/emoji/facebook_messenger/top.png
index 323068a708..da7fbdd93b 100644
Binary files a/public/images/emoji/facebook_messenger/top.png and b/public/images/emoji/facebook_messenger/top.png differ
diff --git a/public/images/emoji/facebook_messenger/tophat.png b/public/images/emoji/facebook_messenger/tophat.png
index 57b6312467..6bbf03199d 100644
Binary files a/public/images/emoji/facebook_messenger/tophat.png and b/public/images/emoji/facebook_messenger/tophat.png differ
diff --git a/public/images/emoji/facebook_messenger/tornado.png b/public/images/emoji/facebook_messenger/tornado.png
index fd843824ed..2de8ec4a69 100644
Binary files a/public/images/emoji/facebook_messenger/tornado.png and b/public/images/emoji/facebook_messenger/tornado.png differ
diff --git a/public/images/emoji/facebook_messenger/tr.png b/public/images/emoji/facebook_messenger/tr.png
index 0658b52963..8f3fa9a933 100644
Binary files a/public/images/emoji/facebook_messenger/tr.png and b/public/images/emoji/facebook_messenger/tr.png differ
diff --git a/public/images/emoji/facebook_messenger/track_next.png b/public/images/emoji/facebook_messenger/track_next.png
index 13953da5d7..73c5fae8b8 100644
Binary files a/public/images/emoji/facebook_messenger/track_next.png and b/public/images/emoji/facebook_messenger/track_next.png differ
diff --git a/public/images/emoji/facebook_messenger/track_previous.png b/public/images/emoji/facebook_messenger/track_previous.png
index ada39abc33..5794a548e0 100644
Binary files a/public/images/emoji/facebook_messenger/track_previous.png and b/public/images/emoji/facebook_messenger/track_previous.png differ
diff --git a/public/images/emoji/facebook_messenger/trackball.png b/public/images/emoji/facebook_messenger/trackball.png
index c2258edc12..3998927979 100644
Binary files a/public/images/emoji/facebook_messenger/trackball.png and b/public/images/emoji/facebook_messenger/trackball.png differ
diff --git a/public/images/emoji/facebook_messenger/tractor.png b/public/images/emoji/facebook_messenger/tractor.png
index a1c1b2765e..32e2263b83 100644
Binary files a/public/images/emoji/facebook_messenger/tractor.png and b/public/images/emoji/facebook_messenger/tractor.png differ
diff --git a/public/images/emoji/facebook_messenger/traffic_light.png b/public/images/emoji/facebook_messenger/traffic_light.png
index 2d1a5425a0..aa315f4d9c 100644
Binary files a/public/images/emoji/facebook_messenger/traffic_light.png and b/public/images/emoji/facebook_messenger/traffic_light.png differ
diff --git a/public/images/emoji/facebook_messenger/train.png b/public/images/emoji/facebook_messenger/train.png
index 4c70d251da..9374ae6ca7 100644
Binary files a/public/images/emoji/facebook_messenger/train.png and b/public/images/emoji/facebook_messenger/train.png differ
diff --git a/public/images/emoji/facebook_messenger/train2.png b/public/images/emoji/facebook_messenger/train2.png
index 76fff478a5..6ffca5b139 100644
Binary files a/public/images/emoji/facebook_messenger/train2.png and b/public/images/emoji/facebook_messenger/train2.png differ
diff --git a/public/images/emoji/facebook_messenger/tram.png b/public/images/emoji/facebook_messenger/tram.png
index 5b2069a40b..c0ad1d6769 100644
Binary files a/public/images/emoji/facebook_messenger/tram.png and b/public/images/emoji/facebook_messenger/tram.png differ
diff --git a/public/images/emoji/facebook_messenger/triangular_flag_on_post.png b/public/images/emoji/facebook_messenger/triangular_flag_on_post.png
index e6ff9b471c..03f9a63b3e 100644
Binary files a/public/images/emoji/facebook_messenger/triangular_flag_on_post.png and b/public/images/emoji/facebook_messenger/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/facebook_messenger/triangular_ruler.png b/public/images/emoji/facebook_messenger/triangular_ruler.png
index 1a7453442f..db0ffd4fb4 100644
Binary files a/public/images/emoji/facebook_messenger/triangular_ruler.png and b/public/images/emoji/facebook_messenger/triangular_ruler.png differ
diff --git a/public/images/emoji/facebook_messenger/trident.png b/public/images/emoji/facebook_messenger/trident.png
index fc10c3aa63..c1ad0e9c65 100644
Binary files a/public/images/emoji/facebook_messenger/trident.png and b/public/images/emoji/facebook_messenger/trident.png differ
diff --git a/public/images/emoji/facebook_messenger/trinidad_tobago.png b/public/images/emoji/facebook_messenger/trinidad_tobago.png
index 14355ce15f..bd3d9c1813 100644
Binary files a/public/images/emoji/facebook_messenger/trinidad_tobago.png and b/public/images/emoji/facebook_messenger/trinidad_tobago.png differ
diff --git a/public/images/emoji/facebook_messenger/tristan_da_cunha.png b/public/images/emoji/facebook_messenger/tristan_da_cunha.png
index dff4791d41..9939cb1c31 100644
Binary files a/public/images/emoji/facebook_messenger/tristan_da_cunha.png and b/public/images/emoji/facebook_messenger/tristan_da_cunha.png differ
diff --git a/public/images/emoji/facebook_messenger/triumph.png b/public/images/emoji/facebook_messenger/triumph.png
index 3ee0215c96..d04981c806 100644
Binary files a/public/images/emoji/facebook_messenger/triumph.png and b/public/images/emoji/facebook_messenger/triumph.png differ
diff --git a/public/images/emoji/facebook_messenger/trolleybus.png b/public/images/emoji/facebook_messenger/trolleybus.png
index 061adebdbf..05631ee3be 100644
Binary files a/public/images/emoji/facebook_messenger/trolleybus.png and b/public/images/emoji/facebook_messenger/trolleybus.png differ
diff --git a/public/images/emoji/facebook_messenger/trophy.png b/public/images/emoji/facebook_messenger/trophy.png
index 6724dbaa0d..3c2036979d 100644
Binary files a/public/images/emoji/facebook_messenger/trophy.png and b/public/images/emoji/facebook_messenger/trophy.png differ
diff --git a/public/images/emoji/facebook_messenger/tropical_drink.png b/public/images/emoji/facebook_messenger/tropical_drink.png
index 25045a45fa..f2ca1ee7f9 100644
Binary files a/public/images/emoji/facebook_messenger/tropical_drink.png and b/public/images/emoji/facebook_messenger/tropical_drink.png differ
diff --git a/public/images/emoji/facebook_messenger/tropical_fish.png b/public/images/emoji/facebook_messenger/tropical_fish.png
index 6bc8cc8855..653439ee0d 100644
Binary files a/public/images/emoji/facebook_messenger/tropical_fish.png and b/public/images/emoji/facebook_messenger/tropical_fish.png differ
diff --git a/public/images/emoji/facebook_messenger/truck.png b/public/images/emoji/facebook_messenger/truck.png
index 439548faef..4a6f2a03e8 100644
Binary files a/public/images/emoji/facebook_messenger/truck.png and b/public/images/emoji/facebook_messenger/truck.png differ
diff --git a/public/images/emoji/facebook_messenger/trumpet.png b/public/images/emoji/facebook_messenger/trumpet.png
index 7a17221d89..50410df53e 100644
Binary files a/public/images/emoji/facebook_messenger/trumpet.png and b/public/images/emoji/facebook_messenger/trumpet.png differ
diff --git a/public/images/emoji/facebook_messenger/tshirt.png b/public/images/emoji/facebook_messenger/tshirt.png
index f24f758f68..27ba96bfa0 100644
Binary files a/public/images/emoji/facebook_messenger/tshirt.png and b/public/images/emoji/facebook_messenger/tshirt.png differ
diff --git a/public/images/emoji/facebook_messenger/tulip.png b/public/images/emoji/facebook_messenger/tulip.png
index c4eb133b62..f7bb519dfd 100644
Binary files a/public/images/emoji/facebook_messenger/tulip.png and b/public/images/emoji/facebook_messenger/tulip.png differ
diff --git a/public/images/emoji/facebook_messenger/tumbler_glass.png b/public/images/emoji/facebook_messenger/tumbler_glass.png
index 78db9d6036..c00c2abcec 100644
Binary files a/public/images/emoji/facebook_messenger/tumbler_glass.png and b/public/images/emoji/facebook_messenger/tumbler_glass.png differ
diff --git a/public/images/emoji/facebook_messenger/tunisia.png b/public/images/emoji/facebook_messenger/tunisia.png
index 2691b42f09..d6f02aca4d 100644
Binary files a/public/images/emoji/facebook_messenger/tunisia.png and b/public/images/emoji/facebook_messenger/tunisia.png differ
diff --git a/public/images/emoji/facebook_messenger/turkey.png b/public/images/emoji/facebook_messenger/turkey.png
index 829f5ffdfc..dadd27b6c2 100644
Binary files a/public/images/emoji/facebook_messenger/turkey.png and b/public/images/emoji/facebook_messenger/turkey.png differ
diff --git a/public/images/emoji/facebook_messenger/turkmenistan.png b/public/images/emoji/facebook_messenger/turkmenistan.png
index a0729e2c29..de872e5ab3 100644
Binary files a/public/images/emoji/facebook_messenger/turkmenistan.png and b/public/images/emoji/facebook_messenger/turkmenistan.png differ
diff --git a/public/images/emoji/facebook_messenger/turks_caicos_islands.png b/public/images/emoji/facebook_messenger/turks_caicos_islands.png
index bb04d27666..57e7224b05 100644
Binary files a/public/images/emoji/facebook_messenger/turks_caicos_islands.png and b/public/images/emoji/facebook_messenger/turks_caicos_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/turtle.png b/public/images/emoji/facebook_messenger/turtle.png
index 5095da2853..a70d666d42 100644
Binary files a/public/images/emoji/facebook_messenger/turtle.png and b/public/images/emoji/facebook_messenger/turtle.png differ
diff --git a/public/images/emoji/facebook_messenger/tuvalu.png b/public/images/emoji/facebook_messenger/tuvalu.png
index 60fad11afc..4ab8afadb5 100644
Binary files a/public/images/emoji/facebook_messenger/tuvalu.png and b/public/images/emoji/facebook_messenger/tuvalu.png differ
diff --git a/public/images/emoji/facebook_messenger/tv.png b/public/images/emoji/facebook_messenger/tv.png
index fa8441fc9c..39b6acee99 100644
Binary files a/public/images/emoji/facebook_messenger/tv.png and b/public/images/emoji/facebook_messenger/tv.png differ
diff --git a/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png b/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png
index f393dfd6d0..a9505e05ec 100644
Binary files a/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png and b/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/facebook_messenger/two.png b/public/images/emoji/facebook_messenger/two.png
index 9bc86e3bec..735d778dae 100644
Binary files a/public/images/emoji/facebook_messenger/two.png and b/public/images/emoji/facebook_messenger/two.png differ
diff --git a/public/images/emoji/facebook_messenger/two_hearts.png b/public/images/emoji/facebook_messenger/two_hearts.png
index 33db2c6b33..11ea848799 100644
Binary files a/public/images/emoji/facebook_messenger/two_hearts.png and b/public/images/emoji/facebook_messenger/two_hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/two_men_holding_hands.png b/public/images/emoji/facebook_messenger/two_men_holding_hands.png
index ab6ad0d269..7187ed27cd 100644
Binary files a/public/images/emoji/facebook_messenger/two_men_holding_hands.png and b/public/images/emoji/facebook_messenger/two_men_holding_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/two_women_holding_hands.png b/public/images/emoji/facebook_messenger/two_women_holding_hands.png
index 3ec3b2d8ad..1de782a805 100644
Binary files a/public/images/emoji/facebook_messenger/two_women_holding_hands.png and b/public/images/emoji/facebook_messenger/two_women_holding_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/u5272.png b/public/images/emoji/facebook_messenger/u5272.png
index 3622c9a5a1..58417da4bb 100644
Binary files a/public/images/emoji/facebook_messenger/u5272.png and b/public/images/emoji/facebook_messenger/u5272.png differ
diff --git a/public/images/emoji/facebook_messenger/u5408.png b/public/images/emoji/facebook_messenger/u5408.png
index 43a08ae3ab..34730b3531 100644
Binary files a/public/images/emoji/facebook_messenger/u5408.png and b/public/images/emoji/facebook_messenger/u5408.png differ
diff --git a/public/images/emoji/facebook_messenger/u55b6.png b/public/images/emoji/facebook_messenger/u55b6.png
index 03daff7872..524eb808cb 100644
Binary files a/public/images/emoji/facebook_messenger/u55b6.png and b/public/images/emoji/facebook_messenger/u55b6.png differ
diff --git a/public/images/emoji/facebook_messenger/u6307.png b/public/images/emoji/facebook_messenger/u6307.png
index 976f45493a..f60c4c036b 100644
Binary files a/public/images/emoji/facebook_messenger/u6307.png and b/public/images/emoji/facebook_messenger/u6307.png differ
diff --git a/public/images/emoji/facebook_messenger/u6708.png b/public/images/emoji/facebook_messenger/u6708.png
index 510628a9ea..b01f8cf322 100644
Binary files a/public/images/emoji/facebook_messenger/u6708.png and b/public/images/emoji/facebook_messenger/u6708.png differ
diff --git a/public/images/emoji/facebook_messenger/u6709.png b/public/images/emoji/facebook_messenger/u6709.png
index 425c1597b0..30a499cd4f 100644
Binary files a/public/images/emoji/facebook_messenger/u6709.png and b/public/images/emoji/facebook_messenger/u6709.png differ
diff --git a/public/images/emoji/facebook_messenger/u6e80.png b/public/images/emoji/facebook_messenger/u6e80.png
index 47b86f38fd..781042283b 100644
Binary files a/public/images/emoji/facebook_messenger/u6e80.png and b/public/images/emoji/facebook_messenger/u6e80.png differ
diff --git a/public/images/emoji/facebook_messenger/u7121.png b/public/images/emoji/facebook_messenger/u7121.png
index 13d13a211a..430203639d 100644
Binary files a/public/images/emoji/facebook_messenger/u7121.png and b/public/images/emoji/facebook_messenger/u7121.png differ
diff --git a/public/images/emoji/facebook_messenger/u7533.png b/public/images/emoji/facebook_messenger/u7533.png
index e724d38ddf..2300499e3e 100644
Binary files a/public/images/emoji/facebook_messenger/u7533.png and b/public/images/emoji/facebook_messenger/u7533.png differ
diff --git a/public/images/emoji/facebook_messenger/u7981.png b/public/images/emoji/facebook_messenger/u7981.png
index ee222f8d86..489e87cad9 100644
Binary files a/public/images/emoji/facebook_messenger/u7981.png and b/public/images/emoji/facebook_messenger/u7981.png differ
diff --git a/public/images/emoji/facebook_messenger/u7a7a.png b/public/images/emoji/facebook_messenger/u7a7a.png
index a65626c072..4b01a34b75 100644
Binary files a/public/images/emoji/facebook_messenger/u7a7a.png and b/public/images/emoji/facebook_messenger/u7a7a.png differ
diff --git a/public/images/emoji/facebook_messenger/uganda.png b/public/images/emoji/facebook_messenger/uganda.png
index 9541a9fe43..8d6457b496 100644
Binary files a/public/images/emoji/facebook_messenger/uganda.png and b/public/images/emoji/facebook_messenger/uganda.png differ
diff --git a/public/images/emoji/facebook_messenger/uk.png b/public/images/emoji/facebook_messenger/uk.png
index bc850e7890..8ba8cda3ac 100644
Binary files a/public/images/emoji/facebook_messenger/uk.png and b/public/images/emoji/facebook_messenger/uk.png differ
diff --git a/public/images/emoji/facebook_messenger/ukraine.png b/public/images/emoji/facebook_messenger/ukraine.png
index d24b4e827b..ca0845ef17 100644
Binary files a/public/images/emoji/facebook_messenger/ukraine.png and b/public/images/emoji/facebook_messenger/ukraine.png differ
diff --git a/public/images/emoji/facebook_messenger/umbrella.png b/public/images/emoji/facebook_messenger/umbrella.png
index adc7a91474..f4b2475b4d 100644
Binary files a/public/images/emoji/facebook_messenger/umbrella.png and b/public/images/emoji/facebook_messenger/umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/umbrella2.png b/public/images/emoji/facebook_messenger/umbrella2.png
index ec99aeb164..d84b97cb0c 100644
Binary files a/public/images/emoji/facebook_messenger/umbrella2.png and b/public/images/emoji/facebook_messenger/umbrella2.png differ
diff --git a/public/images/emoji/facebook_messenger/umbrella_on_ground.png b/public/images/emoji/facebook_messenger/umbrella_on_ground.png
index 2bb23697b7..946097af1c 100644
Binary files a/public/images/emoji/facebook_messenger/umbrella_on_ground.png and b/public/images/emoji/facebook_messenger/umbrella_on_ground.png differ
diff --git a/public/images/emoji/facebook_messenger/unamused.png b/public/images/emoji/facebook_messenger/unamused.png
index 7a753e914a..cc89284c39 100644
Binary files a/public/images/emoji/facebook_messenger/unamused.png and b/public/images/emoji/facebook_messenger/unamused.png differ
diff --git a/public/images/emoji/facebook_messenger/underage.png b/public/images/emoji/facebook_messenger/underage.png
index a1f8047bce..7bbe01d86a 100644
Binary files a/public/images/emoji/facebook_messenger/underage.png and b/public/images/emoji/facebook_messenger/underage.png differ
diff --git a/public/images/emoji/facebook_messenger/unicorn.png b/public/images/emoji/facebook_messenger/unicorn.png
index 7b53a8b310..82f69e1c5c 100644
Binary files a/public/images/emoji/facebook_messenger/unicorn.png and b/public/images/emoji/facebook_messenger/unicorn.png differ
diff --git a/public/images/emoji/facebook_messenger/unicorn_face.png b/public/images/emoji/facebook_messenger/unicorn_face.png
index 7b53a8b310..82f69e1c5c 100644
Binary files a/public/images/emoji/facebook_messenger/unicorn_face.png and b/public/images/emoji/facebook_messenger/unicorn_face.png differ
diff --git a/public/images/emoji/facebook_messenger/united_arab_emirates.png b/public/images/emoji/facebook_messenger/united_arab_emirates.png
index aad7e05285..808d5c203d 100644
Binary files a/public/images/emoji/facebook_messenger/united_arab_emirates.png and b/public/images/emoji/facebook_messenger/united_arab_emirates.png differ
diff --git a/public/images/emoji/facebook_messenger/united_nations.png b/public/images/emoji/facebook_messenger/united_nations.png
index d695a5cac0..5b27fad62a 100644
Binary files a/public/images/emoji/facebook_messenger/united_nations.png and b/public/images/emoji/facebook_messenger/united_nations.png differ
diff --git a/public/images/emoji/facebook_messenger/unlock.png b/public/images/emoji/facebook_messenger/unlock.png
index c810256c58..1a4f4f8c79 100644
Binary files a/public/images/emoji/facebook_messenger/unlock.png and b/public/images/emoji/facebook_messenger/unlock.png differ
diff --git a/public/images/emoji/facebook_messenger/up.png b/public/images/emoji/facebook_messenger/up.png
index 19b5fb73b4..f6732b83b2 100644
Binary files a/public/images/emoji/facebook_messenger/up.png and b/public/images/emoji/facebook_messenger/up.png differ
diff --git a/public/images/emoji/facebook_messenger/upside_down.png b/public/images/emoji/facebook_messenger/upside_down.png
index 85c96142cf..8cb26e5968 100644
Binary files a/public/images/emoji/facebook_messenger/upside_down.png and b/public/images/emoji/facebook_messenger/upside_down.png differ
diff --git a/public/images/emoji/facebook_messenger/upside_down_face.png b/public/images/emoji/facebook_messenger/upside_down_face.png
index 85c96142cf..8cb26e5968 100644
Binary files a/public/images/emoji/facebook_messenger/upside_down_face.png and b/public/images/emoji/facebook_messenger/upside_down_face.png differ
diff --git a/public/images/emoji/facebook_messenger/urn.png b/public/images/emoji/facebook_messenger/urn.png
index 56112c50ed..818fa27fb8 100644
Binary files a/public/images/emoji/facebook_messenger/urn.png and b/public/images/emoji/facebook_messenger/urn.png differ
diff --git a/public/images/emoji/facebook_messenger/uruguay.png b/public/images/emoji/facebook_messenger/uruguay.png
index 8196541e26..7a8a93ca67 100644
Binary files a/public/images/emoji/facebook_messenger/uruguay.png and b/public/images/emoji/facebook_messenger/uruguay.png differ
diff --git a/public/images/emoji/facebook_messenger/us.png b/public/images/emoji/facebook_messenger/us.png
index b0c3a76dd6..103498e009 100644
Binary files a/public/images/emoji/facebook_messenger/us.png and b/public/images/emoji/facebook_messenger/us.png differ
diff --git a/public/images/emoji/facebook_messenger/us_outlying_islands.png b/public/images/emoji/facebook_messenger/us_outlying_islands.png
index 450853eca4..103498e009 100644
Binary files a/public/images/emoji/facebook_messenger/us_outlying_islands.png and b/public/images/emoji/facebook_messenger/us_outlying_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/us_virgin_islands.png b/public/images/emoji/facebook_messenger/us_virgin_islands.png
index 2352c2610b..b4f7cd6f27 100644
Binary files a/public/images/emoji/facebook_messenger/us_virgin_islands.png and b/public/images/emoji/facebook_messenger/us_virgin_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/uzbekistan.png b/public/images/emoji/facebook_messenger/uzbekistan.png
index c268b7f0b2..887f5016ab 100644
Binary files a/public/images/emoji/facebook_messenger/uzbekistan.png and b/public/images/emoji/facebook_messenger/uzbekistan.png differ
diff --git a/public/images/emoji/facebook_messenger/v.png b/public/images/emoji/facebook_messenger/v.png
index 03395c9e32..0518ccd01a 100644
Binary files a/public/images/emoji/facebook_messenger/v.png and b/public/images/emoji/facebook_messenger/v.png differ
diff --git a/public/images/emoji/facebook_messenger/v/2.png b/public/images/emoji/facebook_messenger/v/2.png
index 6acc777aaf..8455b96e5f 100644
Binary files a/public/images/emoji/facebook_messenger/v/2.png and b/public/images/emoji/facebook_messenger/v/2.png differ
diff --git a/public/images/emoji/facebook_messenger/v/3.png b/public/images/emoji/facebook_messenger/v/3.png
index 698acefd9b..90cf1e05dc 100644
Binary files a/public/images/emoji/facebook_messenger/v/3.png and b/public/images/emoji/facebook_messenger/v/3.png differ
diff --git a/public/images/emoji/facebook_messenger/v/4.png b/public/images/emoji/facebook_messenger/v/4.png
index 07596c8412..18d5ad7285 100644
Binary files a/public/images/emoji/facebook_messenger/v/4.png and b/public/images/emoji/facebook_messenger/v/4.png differ
diff --git a/public/images/emoji/facebook_messenger/v/5.png b/public/images/emoji/facebook_messenger/v/5.png
index 7afa597f1a..63865d9e28 100644
Binary files a/public/images/emoji/facebook_messenger/v/5.png and b/public/images/emoji/facebook_messenger/v/5.png differ
diff --git a/public/images/emoji/facebook_messenger/v/6.png b/public/images/emoji/facebook_messenger/v/6.png
index fc65442c4c..ab4985b2f4 100644
Binary files a/public/images/emoji/facebook_messenger/v/6.png and b/public/images/emoji/facebook_messenger/v/6.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire.png b/public/images/emoji/facebook_messenger/vampire.png
index 962288bd17..3f8b0cc23f 100644
Binary files a/public/images/emoji/facebook_messenger/vampire.png and b/public/images/emoji/facebook_messenger/vampire.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/2.png b/public/images/emoji/facebook_messenger/vampire/2.png
index 154f2b6e35..3f8b0cc23f 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/2.png and b/public/images/emoji/facebook_messenger/vampire/2.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/3.png b/public/images/emoji/facebook_messenger/vampire/3.png
index 540b48d887..3f8b0cc23f 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/3.png and b/public/images/emoji/facebook_messenger/vampire/3.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/4.png b/public/images/emoji/facebook_messenger/vampire/4.png
index b05d3bad9a..3f8b0cc23f 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/4.png and b/public/images/emoji/facebook_messenger/vampire/4.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/5.png b/public/images/emoji/facebook_messenger/vampire/5.png
index 2bd9a7b71b..3f8b0cc23f 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/5.png and b/public/images/emoji/facebook_messenger/vampire/5.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/6.png b/public/images/emoji/facebook_messenger/vampire/6.png
index c88f4ad73b..3f8b0cc23f 100644
Binary files a/public/images/emoji/facebook_messenger/vampire/6.png and b/public/images/emoji/facebook_messenger/vampire/6.png differ
diff --git a/public/images/emoji/facebook_messenger/vanuatu.png b/public/images/emoji/facebook_messenger/vanuatu.png
index ebf4b69315..068442e937 100644
Binary files a/public/images/emoji/facebook_messenger/vanuatu.png and b/public/images/emoji/facebook_messenger/vanuatu.png differ
diff --git a/public/images/emoji/facebook_messenger/vatican_city.png b/public/images/emoji/facebook_messenger/vatican_city.png
index a91fed8815..e38e58bb8b 100644
Binary files a/public/images/emoji/facebook_messenger/vatican_city.png and b/public/images/emoji/facebook_messenger/vatican_city.png differ
diff --git a/public/images/emoji/facebook_messenger/venezuela.png b/public/images/emoji/facebook_messenger/venezuela.png
index e2b7cff1d8..177c0326af 100644
Binary files a/public/images/emoji/facebook_messenger/venezuela.png and b/public/images/emoji/facebook_messenger/venezuela.png differ
diff --git a/public/images/emoji/facebook_messenger/vertical_traffic_light.png b/public/images/emoji/facebook_messenger/vertical_traffic_light.png
index 5d21d73d79..6721eb9b54 100644
Binary files a/public/images/emoji/facebook_messenger/vertical_traffic_light.png and b/public/images/emoji/facebook_messenger/vertical_traffic_light.png differ
diff --git a/public/images/emoji/facebook_messenger/vhs.png b/public/images/emoji/facebook_messenger/vhs.png
index 951ee0caa8..76058d7c5d 100644
Binary files a/public/images/emoji/facebook_messenger/vhs.png and b/public/images/emoji/facebook_messenger/vhs.png differ
diff --git a/public/images/emoji/facebook_messenger/vibration_mode.png b/public/images/emoji/facebook_messenger/vibration_mode.png
index a0c69eb824..02151e2ba6 100644
Binary files a/public/images/emoji/facebook_messenger/vibration_mode.png and b/public/images/emoji/facebook_messenger/vibration_mode.png differ
diff --git a/public/images/emoji/facebook_messenger/video_camera.png b/public/images/emoji/facebook_messenger/video_camera.png
index 799525309f..a116affff5 100644
Binary files a/public/images/emoji/facebook_messenger/video_camera.png and b/public/images/emoji/facebook_messenger/video_camera.png differ
diff --git a/public/images/emoji/facebook_messenger/video_game.png b/public/images/emoji/facebook_messenger/video_game.png
index d564ba844f..c1e5d534da 100644
Binary files a/public/images/emoji/facebook_messenger/video_game.png and b/public/images/emoji/facebook_messenger/video_game.png differ
diff --git a/public/images/emoji/facebook_messenger/vietnam.png b/public/images/emoji/facebook_messenger/vietnam.png
index 57e44ae175..e23af84a1e 100644
Binary files a/public/images/emoji/facebook_messenger/vietnam.png and b/public/images/emoji/facebook_messenger/vietnam.png differ
diff --git a/public/images/emoji/facebook_messenger/violin.png b/public/images/emoji/facebook_messenger/violin.png
index cdf1bf735b..a37cee2212 100644
Binary files a/public/images/emoji/facebook_messenger/violin.png and b/public/images/emoji/facebook_messenger/violin.png differ
diff --git a/public/images/emoji/facebook_messenger/virgo.png b/public/images/emoji/facebook_messenger/virgo.png
index d75d83bbd4..584296d404 100644
Binary files a/public/images/emoji/facebook_messenger/virgo.png and b/public/images/emoji/facebook_messenger/virgo.png differ
diff --git a/public/images/emoji/facebook_messenger/volcano.png b/public/images/emoji/facebook_messenger/volcano.png
index 5258533d2a..40ae1681f4 100644
Binary files a/public/images/emoji/facebook_messenger/volcano.png and b/public/images/emoji/facebook_messenger/volcano.png differ
diff --git a/public/images/emoji/facebook_messenger/volleyball.png b/public/images/emoji/facebook_messenger/volleyball.png
index 5d6921c81e..1ff3855a5e 100644
Binary files a/public/images/emoji/facebook_messenger/volleyball.png and b/public/images/emoji/facebook_messenger/volleyball.png differ
diff --git a/public/images/emoji/facebook_messenger/vs.png b/public/images/emoji/facebook_messenger/vs.png
index 761b7a9f02..5e9b02045e 100644
Binary files a/public/images/emoji/facebook_messenger/vs.png and b/public/images/emoji/facebook_messenger/vs.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan.png b/public/images/emoji/facebook_messenger/vulcan.png
index 6245929457..af49237861 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan.png and b/public/images/emoji/facebook_messenger/vulcan.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/2.png b/public/images/emoji/facebook_messenger/vulcan/2.png
index 5cdfab6d9a..125b8d015e 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/2.png and b/public/images/emoji/facebook_messenger/vulcan/2.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/3.png b/public/images/emoji/facebook_messenger/vulcan/3.png
index a469f9b420..193de9bced 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/3.png and b/public/images/emoji/facebook_messenger/vulcan/3.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/4.png b/public/images/emoji/facebook_messenger/vulcan/4.png
index a8803b8816..51453315d7 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/4.png and b/public/images/emoji/facebook_messenger/vulcan/4.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/5.png b/public/images/emoji/facebook_messenger/vulcan/5.png
index 2d9def823e..444ed219e9 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/5.png and b/public/images/emoji/facebook_messenger/vulcan/5.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/6.png b/public/images/emoji/facebook_messenger/vulcan/6.png
index bbcb6dc0d3..a4b6672c64 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan/6.png and b/public/images/emoji/facebook_messenger/vulcan/6.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute.png b/public/images/emoji/facebook_messenger/vulcan_salute.png
index 6245929457..af49237861 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute.png and b/public/images/emoji/facebook_messenger/vulcan_salute.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/2.png b/public/images/emoji/facebook_messenger/vulcan_salute/2.png
index 5cdfab6d9a..125b8d015e 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/2.png and b/public/images/emoji/facebook_messenger/vulcan_salute/2.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/3.png b/public/images/emoji/facebook_messenger/vulcan_salute/3.png
index a469f9b420..193de9bced 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/3.png and b/public/images/emoji/facebook_messenger/vulcan_salute/3.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/4.png b/public/images/emoji/facebook_messenger/vulcan_salute/4.png
index a8803b8816..51453315d7 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/4.png and b/public/images/emoji/facebook_messenger/vulcan_salute/4.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/5.png b/public/images/emoji/facebook_messenger/vulcan_salute/5.png
index 2d9def823e..444ed219e9 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/5.png and b/public/images/emoji/facebook_messenger/vulcan_salute/5.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/6.png b/public/images/emoji/facebook_messenger/vulcan_salute/6.png
index bbcb6dc0d3..a4b6672c64 100644
Binary files a/public/images/emoji/facebook_messenger/vulcan_salute/6.png and b/public/images/emoji/facebook_messenger/vulcan_salute/6.png differ
diff --git a/public/images/emoji/facebook_messenger/walking.png b/public/images/emoji/facebook_messenger/walking.png
index 23da7224aa..5805c83f64 100644
Binary files a/public/images/emoji/facebook_messenger/walking.png and b/public/images/emoji/facebook_messenger/walking.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/2.png b/public/images/emoji/facebook_messenger/walking/2.png
index c9dcb4569e..c5bccf4e8d 100644
Binary files a/public/images/emoji/facebook_messenger/walking/2.png and b/public/images/emoji/facebook_messenger/walking/2.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/3.png b/public/images/emoji/facebook_messenger/walking/3.png
index 61e714afb1..3b58908b22 100644
Binary files a/public/images/emoji/facebook_messenger/walking/3.png and b/public/images/emoji/facebook_messenger/walking/3.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/4.png b/public/images/emoji/facebook_messenger/walking/4.png
index 3cf55665cd..4f27d9ee19 100644
Binary files a/public/images/emoji/facebook_messenger/walking/4.png and b/public/images/emoji/facebook_messenger/walking/4.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/5.png b/public/images/emoji/facebook_messenger/walking/5.png
index 1a0a252797..f42fde8a23 100644
Binary files a/public/images/emoji/facebook_messenger/walking/5.png and b/public/images/emoji/facebook_messenger/walking/5.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/6.png b/public/images/emoji/facebook_messenger/walking/6.png
index 022aeb90ec..9435870ed5 100644
Binary files a/public/images/emoji/facebook_messenger/walking/6.png and b/public/images/emoji/facebook_messenger/walking/6.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man.png b/public/images/emoji/facebook_messenger/walking_man.png
index 23da7224aa..5805c83f64 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man.png and b/public/images/emoji/facebook_messenger/walking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/2.png b/public/images/emoji/facebook_messenger/walking_man/2.png
index c9dcb4569e..c5bccf4e8d 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/2.png and b/public/images/emoji/facebook_messenger/walking_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/3.png b/public/images/emoji/facebook_messenger/walking_man/3.png
index 61e714afb1..3b58908b22 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/3.png and b/public/images/emoji/facebook_messenger/walking_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/4.png b/public/images/emoji/facebook_messenger/walking_man/4.png
index 3cf55665cd..4f27d9ee19 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/4.png and b/public/images/emoji/facebook_messenger/walking_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/5.png b/public/images/emoji/facebook_messenger/walking_man/5.png
index 1a0a252797..f42fde8a23 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/5.png and b/public/images/emoji/facebook_messenger/walking_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/6.png b/public/images/emoji/facebook_messenger/walking_man/6.png
index 022aeb90ec..9435870ed5 100644
Binary files a/public/images/emoji/facebook_messenger/walking_man/6.png and b/public/images/emoji/facebook_messenger/walking_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman.png b/public/images/emoji/facebook_messenger/walking_woman.png
index 5541bff1ed..4815b287d7 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman.png and b/public/images/emoji/facebook_messenger/walking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/2.png b/public/images/emoji/facebook_messenger/walking_woman/2.png
index 3e8f7832c4..33d2f4d709 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/2.png and b/public/images/emoji/facebook_messenger/walking_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/3.png b/public/images/emoji/facebook_messenger/walking_woman/3.png
index 3876ee6e63..2d0691eee4 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/3.png and b/public/images/emoji/facebook_messenger/walking_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/4.png b/public/images/emoji/facebook_messenger/walking_woman/4.png
index 0aad2bc840..58bb25ccec 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/4.png and b/public/images/emoji/facebook_messenger/walking_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/5.png b/public/images/emoji/facebook_messenger/walking_woman/5.png
index c4d8fc9c35..be2acf7709 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/5.png and b/public/images/emoji/facebook_messenger/walking_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/6.png b/public/images/emoji/facebook_messenger/walking_woman/6.png
index 54cb211d6b..1149396242 100644
Binary files a/public/images/emoji/facebook_messenger/walking_woman/6.png and b/public/images/emoji/facebook_messenger/walking_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/wallis_futuna.png b/public/images/emoji/facebook_messenger/wallis_futuna.png
index 4672eabedb..3330920745 100644
Binary files a/public/images/emoji/facebook_messenger/wallis_futuna.png and b/public/images/emoji/facebook_messenger/wallis_futuna.png differ
diff --git a/public/images/emoji/facebook_messenger/waning_crescent_moon.png b/public/images/emoji/facebook_messenger/waning_crescent_moon.png
index f315a7566f..1320dfb8b2 100644
Binary files a/public/images/emoji/facebook_messenger/waning_crescent_moon.png and b/public/images/emoji/facebook_messenger/waning_crescent_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/waning_gibbous_moon.png b/public/images/emoji/facebook_messenger/waning_gibbous_moon.png
index 2f5450b752..3ec83220db 100644
Binary files a/public/images/emoji/facebook_messenger/waning_gibbous_moon.png and b/public/images/emoji/facebook_messenger/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/warning.png b/public/images/emoji/facebook_messenger/warning.png
index 4bf669d826..c4b09beb7c 100644
Binary files a/public/images/emoji/facebook_messenger/warning.png and b/public/images/emoji/facebook_messenger/warning.png differ
diff --git a/public/images/emoji/facebook_messenger/wastebasket.png b/public/images/emoji/facebook_messenger/wastebasket.png
index 65b0729097..94f3b10113 100644
Binary files a/public/images/emoji/facebook_messenger/wastebasket.png and b/public/images/emoji/facebook_messenger/wastebasket.png differ
diff --git a/public/images/emoji/facebook_messenger/watch.png b/public/images/emoji/facebook_messenger/watch.png
index b3b9b84eb8..b245572fa6 100644
Binary files a/public/images/emoji/facebook_messenger/watch.png and b/public/images/emoji/facebook_messenger/watch.png differ
diff --git a/public/images/emoji/facebook_messenger/water_buffalo.png b/public/images/emoji/facebook_messenger/water_buffalo.png
index 93c10bcd96..3c99cb0157 100644
Binary files a/public/images/emoji/facebook_messenger/water_buffalo.png and b/public/images/emoji/facebook_messenger/water_buffalo.png differ
diff --git a/public/images/emoji/facebook_messenger/watermelon.png b/public/images/emoji/facebook_messenger/watermelon.png
index bdb353b4b9..d901fc0a6c 100644
Binary files a/public/images/emoji/facebook_messenger/watermelon.png and b/public/images/emoji/facebook_messenger/watermelon.png differ
diff --git a/public/images/emoji/facebook_messenger/wave.png b/public/images/emoji/facebook_messenger/wave.png
index 99a9bc135a..3deca9f946 100644
Binary files a/public/images/emoji/facebook_messenger/wave.png and b/public/images/emoji/facebook_messenger/wave.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/2.png b/public/images/emoji/facebook_messenger/wave/2.png
index 57bd2ffb66..167dbfeadd 100644
Binary files a/public/images/emoji/facebook_messenger/wave/2.png and b/public/images/emoji/facebook_messenger/wave/2.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/3.png b/public/images/emoji/facebook_messenger/wave/3.png
index de52c86f75..be7fd355f7 100644
Binary files a/public/images/emoji/facebook_messenger/wave/3.png and b/public/images/emoji/facebook_messenger/wave/3.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/4.png b/public/images/emoji/facebook_messenger/wave/4.png
index aaa49bca4e..0085b2042c 100644
Binary files a/public/images/emoji/facebook_messenger/wave/4.png and b/public/images/emoji/facebook_messenger/wave/4.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/5.png b/public/images/emoji/facebook_messenger/wave/5.png
index 187177e478..11027e15b6 100644
Binary files a/public/images/emoji/facebook_messenger/wave/5.png and b/public/images/emoji/facebook_messenger/wave/5.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/6.png b/public/images/emoji/facebook_messenger/wave/6.png
index 52951b965a..36ffc629ca 100644
Binary files a/public/images/emoji/facebook_messenger/wave/6.png and b/public/images/emoji/facebook_messenger/wave/6.png differ
diff --git a/public/images/emoji/facebook_messenger/waving_black_flag.png b/public/images/emoji/facebook_messenger/waving_black_flag.png
index 5c1237bdad..bc52913998 100644
Binary files a/public/images/emoji/facebook_messenger/waving_black_flag.png and b/public/images/emoji/facebook_messenger/waving_black_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/waving_white_flag.png b/public/images/emoji/facebook_messenger/waving_white_flag.png
index 5f052fff2a..34dfcb802a 100644
Binary files a/public/images/emoji/facebook_messenger/waving_white_flag.png and b/public/images/emoji/facebook_messenger/waving_white_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/wavy_dash.png b/public/images/emoji/facebook_messenger/wavy_dash.png
index fab5f74c45..4d8d75af54 100644
Binary files a/public/images/emoji/facebook_messenger/wavy_dash.png and b/public/images/emoji/facebook_messenger/wavy_dash.png differ
diff --git a/public/images/emoji/facebook_messenger/waxing_crescent_moon.png b/public/images/emoji/facebook_messenger/waxing_crescent_moon.png
index 35560d1aae..29c239ac4a 100644
Binary files a/public/images/emoji/facebook_messenger/waxing_crescent_moon.png and b/public/images/emoji/facebook_messenger/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png b/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png
index afe59e7f4e..3fe69a7631 100644
Binary files a/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png and b/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/wc.png b/public/images/emoji/facebook_messenger/wc.png
index 55e92707a1..b22fc41385 100644
Binary files a/public/images/emoji/facebook_messenger/wc.png and b/public/images/emoji/facebook_messenger/wc.png differ
diff --git a/public/images/emoji/facebook_messenger/weary.png b/public/images/emoji/facebook_messenger/weary.png
index 097b31cf81..edf1b9b1a4 100644
Binary files a/public/images/emoji/facebook_messenger/weary.png and b/public/images/emoji/facebook_messenger/weary.png differ
diff --git a/public/images/emoji/facebook_messenger/wedding.png b/public/images/emoji/facebook_messenger/wedding.png
index 9e4cb77225..daa3309313 100644
Binary files a/public/images/emoji/facebook_messenger/wedding.png and b/public/images/emoji/facebook_messenger/wedding.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter.png b/public/images/emoji/facebook_messenger/weight_lifter.png
index be0473304d..1ce6966153 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter.png and b/public/images/emoji/facebook_messenger/weight_lifter.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/2.png b/public/images/emoji/facebook_messenger/weight_lifter/2.png
index 8d680f5b12..e29ccc9b4b 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/2.png and b/public/images/emoji/facebook_messenger/weight_lifter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/3.png b/public/images/emoji/facebook_messenger/weight_lifter/3.png
index e4e961d5d5..e21fa2a374 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/3.png and b/public/images/emoji/facebook_messenger/weight_lifter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/4.png b/public/images/emoji/facebook_messenger/weight_lifter/4.png
index bcdf20d175..e7ac09f9c7 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/4.png and b/public/images/emoji/facebook_messenger/weight_lifter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/5.png b/public/images/emoji/facebook_messenger/weight_lifter/5.png
index 9b91906952..1fbe8f888f 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/5.png and b/public/images/emoji/facebook_messenger/weight_lifter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/6.png b/public/images/emoji/facebook_messenger/weight_lifter/6.png
index c3ce145e9e..731280ee0c 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifter/6.png and b/public/images/emoji/facebook_messenger/weight_lifter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man.png b/public/images/emoji/facebook_messenger/weight_lifting_man.png
index be0473304d..1ce6966153 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man.png and b/public/images/emoji/facebook_messenger/weight_lifting_man.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/2.png b/public/images/emoji/facebook_messenger/weight_lifting_man/2.png
index 8d680f5b12..e29ccc9b4b 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/2.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/3.png b/public/images/emoji/facebook_messenger/weight_lifting_man/3.png
index e4e961d5d5..e21fa2a374 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/3.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/4.png b/public/images/emoji/facebook_messenger/weight_lifting_man/4.png
index bcdf20d175..e7ac09f9c7 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/4.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/5.png b/public/images/emoji/facebook_messenger/weight_lifting_man/5.png
index 9b91906952..1fbe8f888f 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/5.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/6.png b/public/images/emoji/facebook_messenger/weight_lifting_man/6.png
index c3ce145e9e..731280ee0c 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_man/6.png and b/public/images/emoji/facebook_messenger/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_woman.png b/public/images/emoji/facebook_messenger/weight_lifting_woman.png
index 2279709c85..2c58497d14 100644
Binary files a/public/images/emoji/facebook_messenger/weight_lifting_woman.png and b/public/images/emoji/facebook_messenger/weight_lifting_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/western_sahara.png b/public/images/emoji/facebook_messenger/western_sahara.png
index 44c0ea20dd..2492b90de6 100644
Binary files a/public/images/emoji/facebook_messenger/western_sahara.png and b/public/images/emoji/facebook_messenger/western_sahara.png differ
diff --git a/public/images/emoji/facebook_messenger/whale.png b/public/images/emoji/facebook_messenger/whale.png
index 7356dc7f43..94486fb19f 100644
Binary files a/public/images/emoji/facebook_messenger/whale.png and b/public/images/emoji/facebook_messenger/whale.png differ
diff --git a/public/images/emoji/facebook_messenger/whale2.png b/public/images/emoji/facebook_messenger/whale2.png
index 029e9adf6c..4463fc2a4e 100644
Binary files a/public/images/emoji/facebook_messenger/whale2.png and b/public/images/emoji/facebook_messenger/whale2.png differ
diff --git a/public/images/emoji/facebook_messenger/wheel_of_dharma.png b/public/images/emoji/facebook_messenger/wheel_of_dharma.png
index 8792718a1e..0ba685ffa9 100644
Binary files a/public/images/emoji/facebook_messenger/wheel_of_dharma.png and b/public/images/emoji/facebook_messenger/wheel_of_dharma.png differ
diff --git a/public/images/emoji/facebook_messenger/wheelchair.png b/public/images/emoji/facebook_messenger/wheelchair.png
index b90964dd4a..a0470f71ce 100644
Binary files a/public/images/emoji/facebook_messenger/wheelchair.png and b/public/images/emoji/facebook_messenger/wheelchair.png differ
diff --git a/public/images/emoji/facebook_messenger/white_check_mark.png b/public/images/emoji/facebook_messenger/white_check_mark.png
index 3b00d70f90..1f1fe8a9dd 100644
Binary files a/public/images/emoji/facebook_messenger/white_check_mark.png and b/public/images/emoji/facebook_messenger/white_check_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/white_circle.png b/public/images/emoji/facebook_messenger/white_circle.png
index 81e7ee8374..69710af3c2 100644
Binary files a/public/images/emoji/facebook_messenger/white_circle.png and b/public/images/emoji/facebook_messenger/white_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/white_flag.png b/public/images/emoji/facebook_messenger/white_flag.png
index 5f052fff2a..34dfcb802a 100644
Binary files a/public/images/emoji/facebook_messenger/white_flag.png and b/public/images/emoji/facebook_messenger/white_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/white_flower.png b/public/images/emoji/facebook_messenger/white_flower.png
index e7975caf5b..7762659e8b 100644
Binary files a/public/images/emoji/facebook_messenger/white_flower.png and b/public/images/emoji/facebook_messenger/white_flower.png differ
diff --git a/public/images/emoji/facebook_messenger/white_frowning_face.png b/public/images/emoji/facebook_messenger/white_frowning_face.png
index 1c5988a20b..e35c8cec02 100644
Binary files a/public/images/emoji/facebook_messenger/white_frowning_face.png and b/public/images/emoji/facebook_messenger/white_frowning_face.png differ
diff --git a/public/images/emoji/facebook_messenger/white_large_square.png b/public/images/emoji/facebook_messenger/white_large_square.png
index b0652e666b..de0cffdc2f 100644
Binary files a/public/images/emoji/facebook_messenger/white_large_square.png and b/public/images/emoji/facebook_messenger/white_large_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_medium_small_square.png b/public/images/emoji/facebook_messenger/white_medium_small_square.png
index d6ab186f38..c3674c5635 100644
Binary files a/public/images/emoji/facebook_messenger/white_medium_small_square.png and b/public/images/emoji/facebook_messenger/white_medium_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_medium_square.png b/public/images/emoji/facebook_messenger/white_medium_square.png
index 8f96f4ecd8..a77236a218 100644
Binary files a/public/images/emoji/facebook_messenger/white_medium_square.png and b/public/images/emoji/facebook_messenger/white_medium_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_small_square.png b/public/images/emoji/facebook_messenger/white_small_square.png
index 328248a3de..4ef6be8258 100644
Binary files a/public/images/emoji/facebook_messenger/white_small_square.png and b/public/images/emoji/facebook_messenger/white_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_square_button.png b/public/images/emoji/facebook_messenger/white_square_button.png
index 6162783a0d..ce68bbbef7 100644
Binary files a/public/images/emoji/facebook_messenger/white_square_button.png and b/public/images/emoji/facebook_messenger/white_square_button.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png b/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png
index 3ceb40a9ec..17a5f1ff82 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png b/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png
index ef892f1f88..ec92c38a2b 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_cloud.png b/public/images/emoji/facebook_messenger/white_sun_cloud.png
index 3ceb40a9ec..17a5f1ff82 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png b/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png
index ef892f1f88..ec92c38a2b 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_small_cloud.png b/public/images/emoji/facebook_messenger/white_sun_small_cloud.png
index 51953bf695..8258b2f793 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_small_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png b/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png
index 51953bf695..8258b2f793 100644
Binary files a/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png and b/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/wilted_flower.png b/public/images/emoji/facebook_messenger/wilted_flower.png
index a4e69ff073..f858df1886 100644
Binary files a/public/images/emoji/facebook_messenger/wilted_flower.png and b/public/images/emoji/facebook_messenger/wilted_flower.png differ
diff --git a/public/images/emoji/facebook_messenger/wind_blowing_face.png b/public/images/emoji/facebook_messenger/wind_blowing_face.png
index f89ef444f7..5b7f972f44 100644
Binary files a/public/images/emoji/facebook_messenger/wind_blowing_face.png and b/public/images/emoji/facebook_messenger/wind_blowing_face.png differ
diff --git a/public/images/emoji/facebook_messenger/wind_chime.png b/public/images/emoji/facebook_messenger/wind_chime.png
index 279f3ce2a2..b32d537e64 100644
Binary files a/public/images/emoji/facebook_messenger/wind_chime.png and b/public/images/emoji/facebook_messenger/wind_chime.png differ
diff --git a/public/images/emoji/facebook_messenger/wind_face.png b/public/images/emoji/facebook_messenger/wind_face.png
index f89ef444f7..5b7f972f44 100644
Binary files a/public/images/emoji/facebook_messenger/wind_face.png and b/public/images/emoji/facebook_messenger/wind_face.png differ
diff --git a/public/images/emoji/facebook_messenger/wine_glass.png b/public/images/emoji/facebook_messenger/wine_glass.png
index 765420b74f..e4d124c360 100644
Binary files a/public/images/emoji/facebook_messenger/wine_glass.png and b/public/images/emoji/facebook_messenger/wine_glass.png differ
diff --git a/public/images/emoji/facebook_messenger/wink.png b/public/images/emoji/facebook_messenger/wink.png
index b592f594ee..52da6c4d18 100644
Binary files a/public/images/emoji/facebook_messenger/wink.png and b/public/images/emoji/facebook_messenger/wink.png differ
diff --git a/public/images/emoji/facebook_messenger/wolf.png b/public/images/emoji/facebook_messenger/wolf.png
index ce3e33bbca..8cd9baec98 100644
Binary files a/public/images/emoji/facebook_messenger/wolf.png and b/public/images/emoji/facebook_messenger/wolf.png differ
diff --git a/public/images/emoji/facebook_messenger/woman.png b/public/images/emoji/facebook_messenger/woman.png
index 071afe7e94..c4a18fd7ff 100644
Binary files a/public/images/emoji/facebook_messenger/woman.png and b/public/images/emoji/facebook_messenger/woman.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/2.png b/public/images/emoji/facebook_messenger/woman/2.png
index f030836e28..20cc2e881a 100644
Binary files a/public/images/emoji/facebook_messenger/woman/2.png and b/public/images/emoji/facebook_messenger/woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/3.png b/public/images/emoji/facebook_messenger/woman/3.png
index 85fc02b9c6..6264e45eaa 100644
Binary files a/public/images/emoji/facebook_messenger/woman/3.png and b/public/images/emoji/facebook_messenger/woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/4.png b/public/images/emoji/facebook_messenger/woman/4.png
index 8320ed83f6..8319da4e1c 100644
Binary files a/public/images/emoji/facebook_messenger/woman/4.png and b/public/images/emoji/facebook_messenger/woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/5.png b/public/images/emoji/facebook_messenger/woman/5.png
index da30bd1d99..fd10c72122 100644
Binary files a/public/images/emoji/facebook_messenger/woman/5.png and b/public/images/emoji/facebook_messenger/woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/6.png b/public/images/emoji/facebook_messenger/woman/6.png
index 4818fd4739..2c7d12dedd 100644
Binary files a/public/images/emoji/facebook_messenger/woman/6.png and b/public/images/emoji/facebook_messenger/woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist.png b/public/images/emoji/facebook_messenger/woman_artist.png
index 59bef6499a..d2ad4d7589 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist.png and b/public/images/emoji/facebook_messenger/woman_artist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/2.png b/public/images/emoji/facebook_messenger/woman_artist/2.png
index 1f10ebc442..4c7c208567 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/2.png and b/public/images/emoji/facebook_messenger/woman_artist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/3.png b/public/images/emoji/facebook_messenger/woman_artist/3.png
index 4b6fe289bc..9a591f32f9 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/3.png and b/public/images/emoji/facebook_messenger/woman_artist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/4.png b/public/images/emoji/facebook_messenger/woman_artist/4.png
index 70d36d0287..32d92efb73 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/4.png and b/public/images/emoji/facebook_messenger/woman_artist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/5.png b/public/images/emoji/facebook_messenger/woman_artist/5.png
index ab8ce935d1..44286db27d 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/5.png and b/public/images/emoji/facebook_messenger/woman_artist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/6.png b/public/images/emoji/facebook_messenger/woman_artist/6.png
index 5513232d02..391f6e7847 100644
Binary files a/public/images/emoji/facebook_messenger/woman_artist/6.png and b/public/images/emoji/facebook_messenger/woman_artist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut.png b/public/images/emoji/facebook_messenger/woman_astronaut.png
index cdd72ce56d..40f8b2cf10 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut.png and b/public/images/emoji/facebook_messenger/woman_astronaut.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/2.png b/public/images/emoji/facebook_messenger/woman_astronaut/2.png
index 51af665668..40f8b2cf10 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/2.png and b/public/images/emoji/facebook_messenger/woman_astronaut/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/3.png b/public/images/emoji/facebook_messenger/woman_astronaut/3.png
index f1505464c9..40f8b2cf10 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/3.png and b/public/images/emoji/facebook_messenger/woman_astronaut/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/4.png b/public/images/emoji/facebook_messenger/woman_astronaut/4.png
index f5716b1882..40f8b2cf10 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/4.png and b/public/images/emoji/facebook_messenger/woman_astronaut/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/5.png b/public/images/emoji/facebook_messenger/woman_astronaut/5.png
index 5f8e97f970..40f8b2cf10 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/5.png and b/public/images/emoji/facebook_messenger/woman_astronaut/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/6.png b/public/images/emoji/facebook_messenger/woman_astronaut/6.png
index d07a48eaac..40f8b2cf10 100644
Binary files a/public/images/emoji/facebook_messenger/woman_astronaut/6.png and b/public/images/emoji/facebook_messenger/woman_astronaut/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling.png b/public/images/emoji/facebook_messenger/woman_cartwheeling.png
index 124763691f..7ae0cac2ff 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png
index cbda90bf9f..3760544352 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png
index 133d630aae..12b4a460a0 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png
index 399f4807f8..8ac7900f8d 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png
index bb0785b502..15d4bc6a11 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png
index 90454bc8b9..f725a3bbf8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png and b/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook.png b/public/images/emoji/facebook_messenger/woman_cook.png
index fb47369863..3afd6c3e3f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook.png and b/public/images/emoji/facebook_messenger/woman_cook.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/2.png b/public/images/emoji/facebook_messenger/woman_cook/2.png
index dcf2163a16..786bb7e497 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/2.png and b/public/images/emoji/facebook_messenger/woman_cook/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/3.png b/public/images/emoji/facebook_messenger/woman_cook/3.png
index 00a3210107..af7839cf2d 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/3.png and b/public/images/emoji/facebook_messenger/woman_cook/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/4.png b/public/images/emoji/facebook_messenger/woman_cook/4.png
index ea9400ce13..01167c1410 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/4.png and b/public/images/emoji/facebook_messenger/woman_cook/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/5.png b/public/images/emoji/facebook_messenger/woman_cook/5.png
index 9c90c090d7..1bb72c4283 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/5.png and b/public/images/emoji/facebook_messenger/woman_cook/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/6.png b/public/images/emoji/facebook_messenger/woman_cook/6.png
index 6745e5324e..feeeb1dd41 100644
Binary files a/public/images/emoji/facebook_messenger/woman_cook/6.png and b/public/images/emoji/facebook_messenger/woman_cook/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming.png b/public/images/emoji/facebook_messenger/woman_facepalming.png
index 0862f45755..b9e200299e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming.png and b/public/images/emoji/facebook_messenger/woman_facepalming.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/2.png b/public/images/emoji/facebook_messenger/woman_facepalming/2.png
index c2a0c5583d..a7cabf9e6f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/2.png and b/public/images/emoji/facebook_messenger/woman_facepalming/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/3.png b/public/images/emoji/facebook_messenger/woman_facepalming/3.png
index 2efbdb0954..d7f7e23469 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/3.png and b/public/images/emoji/facebook_messenger/woman_facepalming/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/4.png b/public/images/emoji/facebook_messenger/woman_facepalming/4.png
index 93d1697b83..641a5774fc 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/4.png and b/public/images/emoji/facebook_messenger/woman_facepalming/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/5.png b/public/images/emoji/facebook_messenger/woman_facepalming/5.png
index 5e7da37f05..1d78ad4ed8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/5.png and b/public/images/emoji/facebook_messenger/woman_facepalming/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/6.png b/public/images/emoji/facebook_messenger/woman_facepalming/6.png
index d7dcd8dfc0..59aca5cb9e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_facepalming/6.png and b/public/images/emoji/facebook_messenger/woman_facepalming/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker.png b/public/images/emoji/facebook_messenger/woman_factory_worker.png
index 22e9ab5b8d..3db83b0a45 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker.png and b/public/images/emoji/facebook_messenger/woman_factory_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/2.png b/public/images/emoji/facebook_messenger/woman_factory_worker/2.png
index 8124db7497..d7b620c506 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/2.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/3.png b/public/images/emoji/facebook_messenger/woman_factory_worker/3.png
index 2e3ad0ee37..403883f6d2 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/3.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/4.png b/public/images/emoji/facebook_messenger/woman_factory_worker/4.png
index 461a4dcb8f..11a26ff0aa 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/4.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/5.png b/public/images/emoji/facebook_messenger/woman_factory_worker/5.png
index a1e2b6fedf..a4d70e7b87 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/5.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/6.png b/public/images/emoji/facebook_messenger/woman_factory_worker/6.png
index 8bb53fe834..e5382394aa 100644
Binary files a/public/images/emoji/facebook_messenger/woman_factory_worker/6.png and b/public/images/emoji/facebook_messenger/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer.png b/public/images/emoji/facebook_messenger/woman_farmer.png
index edb763b8c0..f2c4eeee03 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer.png and b/public/images/emoji/facebook_messenger/woman_farmer.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/2.png b/public/images/emoji/facebook_messenger/woman_farmer/2.png
index b8b3875798..fc72b3b67f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/2.png and b/public/images/emoji/facebook_messenger/woman_farmer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/3.png b/public/images/emoji/facebook_messenger/woman_farmer/3.png
index 50bca0a619..7c18b10dd3 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/3.png and b/public/images/emoji/facebook_messenger/woman_farmer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/4.png b/public/images/emoji/facebook_messenger/woman_farmer/4.png
index f990a8c799..aacb27def5 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/4.png and b/public/images/emoji/facebook_messenger/woman_farmer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/5.png b/public/images/emoji/facebook_messenger/woman_farmer/5.png
index bbdeaac778..57e78a4347 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/5.png and b/public/images/emoji/facebook_messenger/woman_farmer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/6.png b/public/images/emoji/facebook_messenger/woman_farmer/6.png
index 680f352c0a..4e917fc2c7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_farmer/6.png and b/public/images/emoji/facebook_messenger/woman_farmer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter.png b/public/images/emoji/facebook_messenger/woman_firefighter.png
index ec9fc0dd0a..1476297bdc 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter.png and b/public/images/emoji/facebook_messenger/woman_firefighter.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/2.png b/public/images/emoji/facebook_messenger/woman_firefighter/2.png
index 4108b65e64..9e9b5dbc37 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/2.png and b/public/images/emoji/facebook_messenger/woman_firefighter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/3.png b/public/images/emoji/facebook_messenger/woman_firefighter/3.png
index 648fd207ef..afad8c2651 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/3.png and b/public/images/emoji/facebook_messenger/woman_firefighter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/4.png b/public/images/emoji/facebook_messenger/woman_firefighter/4.png
index 366f946a1c..57e79e7e80 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/4.png and b/public/images/emoji/facebook_messenger/woman_firefighter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/5.png b/public/images/emoji/facebook_messenger/woman_firefighter/5.png
index cfd3ac7270..3e6b551e71 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/5.png and b/public/images/emoji/facebook_messenger/woman_firefighter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/6.png b/public/images/emoji/facebook_messenger/woman_firefighter/6.png
index 6da20434d9..e875cceab9 100644
Binary files a/public/images/emoji/facebook_messenger/woman_firefighter/6.png and b/public/images/emoji/facebook_messenger/woman_firefighter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker.png b/public/images/emoji/facebook_messenger/woman_health_worker.png
index bdd57f781c..ed0c321bf8 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker.png and b/public/images/emoji/facebook_messenger/woman_health_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/2.png b/public/images/emoji/facebook_messenger/woman_health_worker/2.png
index 7e0d10c1f0..83f2b764d5 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/2.png and b/public/images/emoji/facebook_messenger/woman_health_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/3.png b/public/images/emoji/facebook_messenger/woman_health_worker/3.png
index 06e678a9db..895f1047da 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/3.png and b/public/images/emoji/facebook_messenger/woman_health_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/4.png b/public/images/emoji/facebook_messenger/woman_health_worker/4.png
index 86876a9e63..4bbfad9881 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/4.png and b/public/images/emoji/facebook_messenger/woman_health_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/5.png b/public/images/emoji/facebook_messenger/woman_health_worker/5.png
index 922e25ee9a..62594f79b6 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/5.png and b/public/images/emoji/facebook_messenger/woman_health_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/6.png b/public/images/emoji/facebook_messenger/woman_health_worker/6.png
index cae11d9338..0b01955c05 100644
Binary files a/public/images/emoji/facebook_messenger/woman_health_worker/6.png and b/public/images/emoji/facebook_messenger/woman_health_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge.png b/public/images/emoji/facebook_messenger/woman_judge.png
index 302f1fbdd7..c90b782a4e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge.png and b/public/images/emoji/facebook_messenger/woman_judge.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/2.png b/public/images/emoji/facebook_messenger/woman_judge/2.png
index ba942e11df..bf667a94fa 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/2.png and b/public/images/emoji/facebook_messenger/woman_judge/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/3.png b/public/images/emoji/facebook_messenger/woman_judge/3.png
index 943dc444e8..7521a08264 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/3.png and b/public/images/emoji/facebook_messenger/woman_judge/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/4.png b/public/images/emoji/facebook_messenger/woman_judge/4.png
index 901c7c2fb9..fe033d99c7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/4.png and b/public/images/emoji/facebook_messenger/woman_judge/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/5.png b/public/images/emoji/facebook_messenger/woman_judge/5.png
index be61917660..d1e0aed50c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/5.png and b/public/images/emoji/facebook_messenger/woman_judge/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/6.png b/public/images/emoji/facebook_messenger/woman_judge/6.png
index 3be5920c27..afe8c4f731 100644
Binary files a/public/images/emoji/facebook_messenger/woman_judge/6.png and b/public/images/emoji/facebook_messenger/woman_judge/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling.png b/public/images/emoji/facebook_messenger/woman_juggling.png
index 5c3deb2d49..afa07527b3 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling.png and b/public/images/emoji/facebook_messenger/woman_juggling.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/2.png b/public/images/emoji/facebook_messenger/woman_juggling/2.png
index 7e0822fd89..0401075bb3 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/2.png and b/public/images/emoji/facebook_messenger/woman_juggling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/3.png b/public/images/emoji/facebook_messenger/woman_juggling/3.png
index 9427c61849..f8a42dc9c7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/3.png and b/public/images/emoji/facebook_messenger/woman_juggling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/4.png b/public/images/emoji/facebook_messenger/woman_juggling/4.png
index 710119d96b..fdbd69344b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/4.png and b/public/images/emoji/facebook_messenger/woman_juggling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/5.png b/public/images/emoji/facebook_messenger/woman_juggling/5.png
index 2a8d51aaa9..9a0b00d4bf 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/5.png and b/public/images/emoji/facebook_messenger/woman_juggling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/6.png b/public/images/emoji/facebook_messenger/woman_juggling/6.png
index 37a7391cfe..4e546c6ca1 100644
Binary files a/public/images/emoji/facebook_messenger/woman_juggling/6.png and b/public/images/emoji/facebook_messenger/woman_juggling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic.png b/public/images/emoji/facebook_messenger/woman_mechanic.png
index 00c01f4dc7..5b3b9f8ff6 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic.png and b/public/images/emoji/facebook_messenger/woman_mechanic.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/2.png b/public/images/emoji/facebook_messenger/woman_mechanic/2.png
index 2dd109611e..106676a028 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/2.png and b/public/images/emoji/facebook_messenger/woman_mechanic/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/3.png b/public/images/emoji/facebook_messenger/woman_mechanic/3.png
index 3029459512..e30580df93 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/3.png and b/public/images/emoji/facebook_messenger/woman_mechanic/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/4.png b/public/images/emoji/facebook_messenger/woman_mechanic/4.png
index fd6be2cb76..d1ba1ecf12 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/4.png and b/public/images/emoji/facebook_messenger/woman_mechanic/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/5.png b/public/images/emoji/facebook_messenger/woman_mechanic/5.png
index baec0ca3c5..92491bf1e6 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/5.png and b/public/images/emoji/facebook_messenger/woman_mechanic/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/6.png b/public/images/emoji/facebook_messenger/woman_mechanic/6.png
index de62d29f06..6ad4e620e7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_mechanic/6.png and b/public/images/emoji/facebook_messenger/woman_mechanic/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker.png b/public/images/emoji/facebook_messenger/woman_office_worker.png
index 3ed967832b..8b4e28646a 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker.png and b/public/images/emoji/facebook_messenger/woman_office_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/2.png b/public/images/emoji/facebook_messenger/woman_office_worker/2.png
index 17b377b41c..d43be5251f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/2.png and b/public/images/emoji/facebook_messenger/woman_office_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/3.png b/public/images/emoji/facebook_messenger/woman_office_worker/3.png
index 70fea252b0..d2d3bba4a1 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/3.png and b/public/images/emoji/facebook_messenger/woman_office_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/4.png b/public/images/emoji/facebook_messenger/woman_office_worker/4.png
index 59cd972419..330109159b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/4.png and b/public/images/emoji/facebook_messenger/woman_office_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/5.png b/public/images/emoji/facebook_messenger/woman_office_worker/5.png
index 410d6e42cf..89ec56ce74 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/5.png and b/public/images/emoji/facebook_messenger/woman_office_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/6.png b/public/images/emoji/facebook_messenger/woman_office_worker/6.png
index 77c1ab6c3c..03be15a51f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_office_worker/6.png and b/public/images/emoji/facebook_messenger/woman_office_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot.png b/public/images/emoji/facebook_messenger/woman_pilot.png
index bdb1f781ee..1962bba010 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot.png and b/public/images/emoji/facebook_messenger/woman_pilot.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/2.png b/public/images/emoji/facebook_messenger/woman_pilot/2.png
index 18357b611a..6baec73b90 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/2.png and b/public/images/emoji/facebook_messenger/woman_pilot/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/3.png b/public/images/emoji/facebook_messenger/woman_pilot/3.png
index 6ef43682bc..244cda9521 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/3.png and b/public/images/emoji/facebook_messenger/woman_pilot/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/4.png b/public/images/emoji/facebook_messenger/woman_pilot/4.png
index 5b46123bc2..7b95b224d3 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/4.png and b/public/images/emoji/facebook_messenger/woman_pilot/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/5.png b/public/images/emoji/facebook_messenger/woman_pilot/5.png
index c13b55013e..aec2ed5e90 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/5.png and b/public/images/emoji/facebook_messenger/woman_pilot/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/6.png b/public/images/emoji/facebook_messenger/woman_pilot/6.png
index fb7ec93f0c..a49756308c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_pilot/6.png and b/public/images/emoji/facebook_messenger/woman_pilot/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball.png b/public/images/emoji/facebook_messenger/woman_playing_handball.png
index 731f747ab2..9eb1c81dbf 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball.png and b/public/images/emoji/facebook_messenger/woman_playing_handball.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/2.png b/public/images/emoji/facebook_messenger/woman_playing_handball/2.png
index 52f1ac332d..4afbc636a1 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/2.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/3.png b/public/images/emoji/facebook_messenger/woman_playing_handball/3.png
index 57ff251cbe..0fdd867dff 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/3.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/4.png b/public/images/emoji/facebook_messenger/woman_playing_handball/4.png
index 8b21c5f954..3d6ced251f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/4.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/5.png b/public/images/emoji/facebook_messenger/woman_playing_handball/5.png
index c09e12ad34..1a2d6bcaaf 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/5.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/6.png b/public/images/emoji/facebook_messenger/woman_playing_handball/6.png
index 25a5c4edd8..9d0e5b64ae 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_handball/6.png and b/public/images/emoji/facebook_messenger/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo.png
index 9f1a2e79e9..9f1c1c7d15 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png
index 74118cdc89..5ecc204eab 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png
index 02a40bc83d..46fca4221d 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png
index 28e04bc113..21ae635189 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png
index f112c330bc..0e80e1a7d7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png
index dd3f628ee9..e1bcd099a1 100644
Binary files a/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist.png b/public/images/emoji/facebook_messenger/woman_scientist.png
index debc8aa07e..398ed0c15b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist.png and b/public/images/emoji/facebook_messenger/woman_scientist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/2.png b/public/images/emoji/facebook_messenger/woman_scientist/2.png
index 84b54c10bb..2a6e8cbb90 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/2.png and b/public/images/emoji/facebook_messenger/woman_scientist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/3.png b/public/images/emoji/facebook_messenger/woman_scientist/3.png
index e7aa385a93..22568f8452 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/3.png and b/public/images/emoji/facebook_messenger/woman_scientist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/4.png b/public/images/emoji/facebook_messenger/woman_scientist/4.png
index 9d294761af..5c8d8f5465 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/4.png and b/public/images/emoji/facebook_messenger/woman_scientist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/5.png b/public/images/emoji/facebook_messenger/woman_scientist/5.png
index bfc9f7b48c..5c34317ffe 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/5.png and b/public/images/emoji/facebook_messenger/woman_scientist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/6.png b/public/images/emoji/facebook_messenger/woman_scientist/6.png
index 70ebc5bc4f..083c49ef3c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_scientist/6.png and b/public/images/emoji/facebook_messenger/woman_scientist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging.png b/public/images/emoji/facebook_messenger/woman_shrugging.png
index 3839c5eacd..128d155407 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging.png and b/public/images/emoji/facebook_messenger/woman_shrugging.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/2.png b/public/images/emoji/facebook_messenger/woman_shrugging/2.png
index 3ae10f1008..25b069d3c9 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/2.png and b/public/images/emoji/facebook_messenger/woman_shrugging/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/3.png b/public/images/emoji/facebook_messenger/woman_shrugging/3.png
index 1be387d41e..d304304d3c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/3.png and b/public/images/emoji/facebook_messenger/woman_shrugging/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/4.png b/public/images/emoji/facebook_messenger/woman_shrugging/4.png
index 9fbf38dfea..aaf368bafa 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/4.png and b/public/images/emoji/facebook_messenger/woman_shrugging/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/5.png b/public/images/emoji/facebook_messenger/woman_shrugging/5.png
index 349d86171e..9d705cdb44 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/5.png and b/public/images/emoji/facebook_messenger/woman_shrugging/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/6.png b/public/images/emoji/facebook_messenger/woman_shrugging/6.png
index 82a2b9f052..e94b7ba8fa 100644
Binary files a/public/images/emoji/facebook_messenger/woman_shrugging/6.png and b/public/images/emoji/facebook_messenger/woman_shrugging/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer.png b/public/images/emoji/facebook_messenger/woman_singer.png
index 07f59ab15f..911dbe2dff 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer.png and b/public/images/emoji/facebook_messenger/woman_singer.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/2.png b/public/images/emoji/facebook_messenger/woman_singer/2.png
index 96578ef833..29eef65012 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/2.png and b/public/images/emoji/facebook_messenger/woman_singer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/3.png b/public/images/emoji/facebook_messenger/woman_singer/3.png
index 3a613507ef..091973246e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/3.png and b/public/images/emoji/facebook_messenger/woman_singer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/4.png b/public/images/emoji/facebook_messenger/woman_singer/4.png
index 439f929fb0..8122d175ce 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/4.png and b/public/images/emoji/facebook_messenger/woman_singer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/5.png b/public/images/emoji/facebook_messenger/woman_singer/5.png
index f615d7ef3c..792b00db21 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/5.png and b/public/images/emoji/facebook_messenger/woman_singer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/6.png b/public/images/emoji/facebook_messenger/woman_singer/6.png
index 4d919b0453..c403f805df 100644
Binary files a/public/images/emoji/facebook_messenger/woman_singer/6.png and b/public/images/emoji/facebook_messenger/woman_singer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student.png b/public/images/emoji/facebook_messenger/woman_student.png
index 60e3c075eb..c321c0d38d 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student.png and b/public/images/emoji/facebook_messenger/woman_student.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/2.png b/public/images/emoji/facebook_messenger/woman_student/2.png
index b02489086f..76f04a80d3 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/2.png and b/public/images/emoji/facebook_messenger/woman_student/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/3.png b/public/images/emoji/facebook_messenger/woman_student/3.png
index f6488d3390..f4d5c491fb 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/3.png and b/public/images/emoji/facebook_messenger/woman_student/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/4.png b/public/images/emoji/facebook_messenger/woman_student/4.png
index 05f82e2162..09b7f07670 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/4.png and b/public/images/emoji/facebook_messenger/woman_student/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/5.png b/public/images/emoji/facebook_messenger/woman_student/5.png
index 26ceb12320..74fd1a64ff 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/5.png and b/public/images/emoji/facebook_messenger/woman_student/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/6.png b/public/images/emoji/facebook_messenger/woman_student/6.png
index 7fca961910..df0ba30713 100644
Binary files a/public/images/emoji/facebook_messenger/woman_student/6.png and b/public/images/emoji/facebook_messenger/woman_student/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher.png b/public/images/emoji/facebook_messenger/woman_teacher.png
index d98448f85b..84b8d807b5 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher.png and b/public/images/emoji/facebook_messenger/woman_teacher.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/2.png b/public/images/emoji/facebook_messenger/woman_teacher/2.png
index 6f980a3716..35019819a3 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/2.png and b/public/images/emoji/facebook_messenger/woman_teacher/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/3.png b/public/images/emoji/facebook_messenger/woman_teacher/3.png
index 0fb8f0904a..198fe3d32b 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/3.png and b/public/images/emoji/facebook_messenger/woman_teacher/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/4.png b/public/images/emoji/facebook_messenger/woman_teacher/4.png
index a802134793..8262557386 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/4.png and b/public/images/emoji/facebook_messenger/woman_teacher/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/5.png b/public/images/emoji/facebook_messenger/woman_teacher/5.png
index dcceb1add1..c8851eac03 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/5.png and b/public/images/emoji/facebook_messenger/woman_teacher/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/6.png b/public/images/emoji/facebook_messenger/woman_teacher/6.png
index 41dc97c078..f980712786 100644
Binary files a/public/images/emoji/facebook_messenger/woman_teacher/6.png and b/public/images/emoji/facebook_messenger/woman_teacher/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist.png b/public/images/emoji/facebook_messenger/woman_technologist.png
index d74e604a64..f81b5b4b6c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist.png and b/public/images/emoji/facebook_messenger/woman_technologist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/2.png b/public/images/emoji/facebook_messenger/woman_technologist/2.png
index 931f1fd2bd..4a82324b13 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/2.png and b/public/images/emoji/facebook_messenger/woman_technologist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/3.png b/public/images/emoji/facebook_messenger/woman_technologist/3.png
index 2cb918f752..9476baabda 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/3.png and b/public/images/emoji/facebook_messenger/woman_technologist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/4.png b/public/images/emoji/facebook_messenger/woman_technologist/4.png
index f1cb4062e8..b0cf3a7aaa 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/4.png and b/public/images/emoji/facebook_messenger/woman_technologist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/5.png b/public/images/emoji/facebook_messenger/woman_technologist/5.png
index 5154939f5b..4789d8321e 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/5.png and b/public/images/emoji/facebook_messenger/woman_technologist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/6.png b/public/images/emoji/facebook_messenger/woman_technologist/6.png
index a427628a98..001f9fb242 100644
Binary files a/public/images/emoji/facebook_messenger/woman_technologist/6.png and b/public/images/emoji/facebook_messenger/woman_technologist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf.png b/public/images/emoji/facebook_messenger/woman_with_headscarf.png
index 6b3731cac8..cf3f0f615c 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png
index 511414ad6c..2d5d61b5ef 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png
index af95435379..fc14029e00 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png
index 355bdeb636..c99b5c6cfb 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png
index 8d0ad7202e..299ab39194 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png
index 3c49195f87..615f12490d 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png and b/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban.png b/public/images/emoji/facebook_messenger/woman_with_turban.png
index 884af5800c..ae9465ead0 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban.png and b/public/images/emoji/facebook_messenger/woman_with_turban.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/2.png b/public/images/emoji/facebook_messenger/woman_with_turban/2.png
index f4904a0f1c..e8b659d6fe 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/2.png and b/public/images/emoji/facebook_messenger/woman_with_turban/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/3.png b/public/images/emoji/facebook_messenger/woman_with_turban/3.png
index 1629f28e0b..af222d5c7f 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/3.png and b/public/images/emoji/facebook_messenger/woman_with_turban/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/4.png b/public/images/emoji/facebook_messenger/woman_with_turban/4.png
index be7cbbeb4e..c4056633ae 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/4.png and b/public/images/emoji/facebook_messenger/woman_with_turban/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/5.png b/public/images/emoji/facebook_messenger/woman_with_turban/5.png
index 28845305df..20bac38ef7 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/5.png and b/public/images/emoji/facebook_messenger/woman_with_turban/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/6.png b/public/images/emoji/facebook_messenger/woman_with_turban/6.png
index 1831d062fe..be824964c4 100644
Binary files a/public/images/emoji/facebook_messenger/woman_with_turban/6.png and b/public/images/emoji/facebook_messenger/woman_with_turban/6.png differ
diff --git a/public/images/emoji/facebook_messenger/womans_clothes.png b/public/images/emoji/facebook_messenger/womans_clothes.png
index 69c438bcbc..1d3125eb56 100644
Binary files a/public/images/emoji/facebook_messenger/womans_clothes.png and b/public/images/emoji/facebook_messenger/womans_clothes.png differ
diff --git a/public/images/emoji/facebook_messenger/womans_hat.png b/public/images/emoji/facebook_messenger/womans_hat.png
index bcbde01af2..dc29f80127 100644
Binary files a/public/images/emoji/facebook_messenger/womans_hat.png and b/public/images/emoji/facebook_messenger/womans_hat.png differ
diff --git a/public/images/emoji/facebook_messenger/women_wrestling.png b/public/images/emoji/facebook_messenger/women_wrestling.png
index 11fa66fd95..fad1a7af59 100644
Binary files a/public/images/emoji/facebook_messenger/women_wrestling.png and b/public/images/emoji/facebook_messenger/women_wrestling.png differ
diff --git a/public/images/emoji/facebook_messenger/womens.png b/public/images/emoji/facebook_messenger/womens.png
index 4223ed07e6..1a8b1d2f75 100644
Binary files a/public/images/emoji/facebook_messenger/womens.png and b/public/images/emoji/facebook_messenger/womens.png differ
diff --git a/public/images/emoji/facebook_messenger/world_map.png b/public/images/emoji/facebook_messenger/world_map.png
index 8c102ea49d..f387ba2fd7 100644
Binary files a/public/images/emoji/facebook_messenger/world_map.png and b/public/images/emoji/facebook_messenger/world_map.png differ
diff --git a/public/images/emoji/facebook_messenger/worried.png b/public/images/emoji/facebook_messenger/worried.png
index c4614d9bef..ac743e0e24 100644
Binary files a/public/images/emoji/facebook_messenger/worried.png and b/public/images/emoji/facebook_messenger/worried.png differ
diff --git a/public/images/emoji/facebook_messenger/worship_symbol.png b/public/images/emoji/facebook_messenger/worship_symbol.png
index 19e1150b30..0f9025c3c4 100644
Binary files a/public/images/emoji/facebook_messenger/worship_symbol.png and b/public/images/emoji/facebook_messenger/worship_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/wrench.png b/public/images/emoji/facebook_messenger/wrench.png
index d91bd45269..1b1bf131af 100644
Binary files a/public/images/emoji/facebook_messenger/wrench.png and b/public/images/emoji/facebook_messenger/wrench.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand.png b/public/images/emoji/facebook_messenger/writing_hand.png
index 8ec2032bf4..524c4ec5c0 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand.png and b/public/images/emoji/facebook_messenger/writing_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/2.png b/public/images/emoji/facebook_messenger/writing_hand/2.png
index 37ac5fc089..cd1d39abd0 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/2.png and b/public/images/emoji/facebook_messenger/writing_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/3.png b/public/images/emoji/facebook_messenger/writing_hand/3.png
index 38606d2663..0942bf8fe9 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/3.png and b/public/images/emoji/facebook_messenger/writing_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/4.png b/public/images/emoji/facebook_messenger/writing_hand/4.png
index 84ae862921..d09b3b006d 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/4.png and b/public/images/emoji/facebook_messenger/writing_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/5.png b/public/images/emoji/facebook_messenger/writing_hand/5.png
index 89644b2736..a305c9bfdb 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/5.png and b/public/images/emoji/facebook_messenger/writing_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/6.png b/public/images/emoji/facebook_messenger/writing_hand/6.png
index c9e50cd352..472eab2ddd 100644
Binary files a/public/images/emoji/facebook_messenger/writing_hand/6.png and b/public/images/emoji/facebook_messenger/writing_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/x.png b/public/images/emoji/facebook_messenger/x.png
index fbb75f2626..e73307a738 100644
Binary files a/public/images/emoji/facebook_messenger/x.png and b/public/images/emoji/facebook_messenger/x.png differ
diff --git a/public/images/emoji/facebook_messenger/yellow_heart.png b/public/images/emoji/facebook_messenger/yellow_heart.png
index 5d2ed7dc20..8dbc5972f4 100644
Binary files a/public/images/emoji/facebook_messenger/yellow_heart.png and b/public/images/emoji/facebook_messenger/yellow_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/yemen.png b/public/images/emoji/facebook_messenger/yemen.png
index 3a37c85041..56f80a8d74 100644
Binary files a/public/images/emoji/facebook_messenger/yemen.png and b/public/images/emoji/facebook_messenger/yemen.png differ
diff --git a/public/images/emoji/facebook_messenger/yen.png b/public/images/emoji/facebook_messenger/yen.png
index 237355971e..556fad7ed5 100644
Binary files a/public/images/emoji/facebook_messenger/yen.png and b/public/images/emoji/facebook_messenger/yen.png differ
diff --git a/public/images/emoji/facebook_messenger/yin_yang.png b/public/images/emoji/facebook_messenger/yin_yang.png
index 9e6fbd048a..d37875455b 100644
Binary files a/public/images/emoji/facebook_messenger/yin_yang.png and b/public/images/emoji/facebook_messenger/yin_yang.png differ
diff --git a/public/images/emoji/facebook_messenger/yum.png b/public/images/emoji/facebook_messenger/yum.png
index 83d4dc62db..0912dc8749 100644
Binary files a/public/images/emoji/facebook_messenger/yum.png and b/public/images/emoji/facebook_messenger/yum.png differ
diff --git a/public/images/emoji/facebook_messenger/zambia.png b/public/images/emoji/facebook_messenger/zambia.png
index 3e7d4cbea5..333fa806ca 100644
Binary files a/public/images/emoji/facebook_messenger/zambia.png and b/public/images/emoji/facebook_messenger/zambia.png differ
diff --git a/public/images/emoji/facebook_messenger/zap.png b/public/images/emoji/facebook_messenger/zap.png
index e7a3c9cdfc..5fbf5ee4c1 100644
Binary files a/public/images/emoji/facebook_messenger/zap.png and b/public/images/emoji/facebook_messenger/zap.png differ
diff --git a/public/images/emoji/facebook_messenger/zebra.png b/public/images/emoji/facebook_messenger/zebra.png
index 6faa14f55d..66dcfd1729 100644
Binary files a/public/images/emoji/facebook_messenger/zebra.png and b/public/images/emoji/facebook_messenger/zebra.png differ
diff --git a/public/images/emoji/facebook_messenger/zero.png b/public/images/emoji/facebook_messenger/zero.png
index a8ff7b88d9..9802904050 100644
Binary files a/public/images/emoji/facebook_messenger/zero.png and b/public/images/emoji/facebook_messenger/zero.png differ
diff --git a/public/images/emoji/facebook_messenger/zimbabwe.png b/public/images/emoji/facebook_messenger/zimbabwe.png
index c3af3c54d7..5f6e8647a3 100644
Binary files a/public/images/emoji/facebook_messenger/zimbabwe.png and b/public/images/emoji/facebook_messenger/zimbabwe.png differ
diff --git a/public/images/emoji/facebook_messenger/zipper_mouth.png b/public/images/emoji/facebook_messenger/zipper_mouth.png
index d764a0fe1a..b7f5d24328 100644
Binary files a/public/images/emoji/facebook_messenger/zipper_mouth.png and b/public/images/emoji/facebook_messenger/zipper_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/zipper_mouth_face.png b/public/images/emoji/facebook_messenger/zipper_mouth_face.png
index d764a0fe1a..b7f5d24328 100644
Binary files a/public/images/emoji/facebook_messenger/zipper_mouth_face.png and b/public/images/emoji/facebook_messenger/zipper_mouth_face.png differ
diff --git a/public/images/emoji/facebook_messenger/zombie.png b/public/images/emoji/facebook_messenger/zombie.png
index 1bf288fcd4..6623ffe5d3 100644
Binary files a/public/images/emoji/facebook_messenger/zombie.png and b/public/images/emoji/facebook_messenger/zombie.png differ
diff --git a/public/images/emoji/facebook_messenger/zzz.png b/public/images/emoji/facebook_messenger/zzz.png
index 3ec9ff9003..b57261cb2d 100644
Binary files a/public/images/emoji/facebook_messenger/zzz.png and b/public/images/emoji/facebook_messenger/zzz.png differ
diff --git a/public/images/emoji/google/+1.png b/public/images/emoji/google/+1.png
index b03f09eb00..7e440eb6a8 100644
Binary files a/public/images/emoji/google/+1.png and b/public/images/emoji/google/+1.png differ
diff --git a/public/images/emoji/google/+1/2.png b/public/images/emoji/google/+1/2.png
index a3a855f569..d31652eaf5 100644
Binary files a/public/images/emoji/google/+1/2.png and b/public/images/emoji/google/+1/2.png differ
diff --git a/public/images/emoji/google/+1/3.png b/public/images/emoji/google/+1/3.png
index c8e515c99b..5b1760d7a3 100644
Binary files a/public/images/emoji/google/+1/3.png and b/public/images/emoji/google/+1/3.png differ
diff --git a/public/images/emoji/google/+1/4.png b/public/images/emoji/google/+1/4.png
index 4a388dd5fc..2ba4abddc4 100644
Binary files a/public/images/emoji/google/+1/4.png and b/public/images/emoji/google/+1/4.png differ
diff --git a/public/images/emoji/google/+1/5.png b/public/images/emoji/google/+1/5.png
index 5bf6c233fd..b9fdc0019d 100644
Binary files a/public/images/emoji/google/+1/5.png and b/public/images/emoji/google/+1/5.png differ
diff --git a/public/images/emoji/google/+1/6.png b/public/images/emoji/google/+1/6.png
index fed5d03000..d4944089c6 100644
Binary files a/public/images/emoji/google/+1/6.png and b/public/images/emoji/google/+1/6.png differ
diff --git a/public/images/emoji/google/-1.png b/public/images/emoji/google/-1.png
index f2e7da55f6..01e3d0ffa1 100644
Binary files a/public/images/emoji/google/-1.png and b/public/images/emoji/google/-1.png differ
diff --git a/public/images/emoji/google/-1/2.png b/public/images/emoji/google/-1/2.png
index 86d0319a4a..d2bcecf2c3 100644
Binary files a/public/images/emoji/google/-1/2.png and b/public/images/emoji/google/-1/2.png differ
diff --git a/public/images/emoji/google/-1/3.png b/public/images/emoji/google/-1/3.png
index c50a57e11e..e7665e4baf 100644
Binary files a/public/images/emoji/google/-1/3.png and b/public/images/emoji/google/-1/3.png differ
diff --git a/public/images/emoji/google/-1/4.png b/public/images/emoji/google/-1/4.png
index 979e09adf8..0ec1f2e3a0 100644
Binary files a/public/images/emoji/google/-1/4.png and b/public/images/emoji/google/-1/4.png differ
diff --git a/public/images/emoji/google/-1/5.png b/public/images/emoji/google/-1/5.png
index bf4f10d81a..3f3bd72ef4 100644
Binary files a/public/images/emoji/google/-1/5.png and b/public/images/emoji/google/-1/5.png differ
diff --git a/public/images/emoji/google/-1/6.png b/public/images/emoji/google/-1/6.png
index ecab34a982..6582568567 100644
Binary files a/public/images/emoji/google/-1/6.png and b/public/images/emoji/google/-1/6.png differ
diff --git a/public/images/emoji/google/100.png b/public/images/emoji/google/100.png
index f72792d350..947d38dc2f 100644
Binary files a/public/images/emoji/google/100.png and b/public/images/emoji/google/100.png differ
diff --git a/public/images/emoji/google/1234.png b/public/images/emoji/google/1234.png
index 53d00b4717..4c52b73db1 100644
Binary files a/public/images/emoji/google/1234.png and b/public/images/emoji/google/1234.png differ
diff --git a/public/images/emoji/google/1st_place_medal.png b/public/images/emoji/google/1st_place_medal.png
index 8b13dfec61..27865431cb 100644
Binary files a/public/images/emoji/google/1st_place_medal.png and b/public/images/emoji/google/1st_place_medal.png differ
diff --git a/public/images/emoji/google/2nd_place_medal.png b/public/images/emoji/google/2nd_place_medal.png
index dbd2ef9914..f49b7bc555 100644
Binary files a/public/images/emoji/google/2nd_place_medal.png and b/public/images/emoji/google/2nd_place_medal.png differ
diff --git a/public/images/emoji/google/3rd_place_medal.png b/public/images/emoji/google/3rd_place_medal.png
index a6e4ff3b4b..474e5890f6 100644
Binary files a/public/images/emoji/google/3rd_place_medal.png and b/public/images/emoji/google/3rd_place_medal.png differ
diff --git a/public/images/emoji/google/8ball.png b/public/images/emoji/google/8ball.png
index ab42869644..731079eb75 100644
Binary files a/public/images/emoji/google/8ball.png and b/public/images/emoji/google/8ball.png differ
diff --git a/public/images/emoji/google/a.png b/public/images/emoji/google/a.png
index 97451b6076..dcc2e925cd 100644
Binary files a/public/images/emoji/google/a.png and b/public/images/emoji/google/a.png differ
diff --git a/public/images/emoji/google/ab.png b/public/images/emoji/google/ab.png
index da29c55599..bc47162054 100644
Binary files a/public/images/emoji/google/ab.png and b/public/images/emoji/google/ab.png differ
diff --git a/public/images/emoji/google/abc.png b/public/images/emoji/google/abc.png
index 5c9880cf93..0aa4d7fa44 100644
Binary files a/public/images/emoji/google/abc.png and b/public/images/emoji/google/abc.png differ
diff --git a/public/images/emoji/google/abcd.png b/public/images/emoji/google/abcd.png
index 0aeeb0eb9d..7f5c5cd679 100644
Binary files a/public/images/emoji/google/abcd.png and b/public/images/emoji/google/abcd.png differ
diff --git a/public/images/emoji/google/accept.png b/public/images/emoji/google/accept.png
index 3a8259c2a6..85ac66b4ed 100644
Binary files a/public/images/emoji/google/accept.png and b/public/images/emoji/google/accept.png differ
diff --git a/public/images/emoji/google/admission_tickets.png b/public/images/emoji/google/admission_tickets.png
index d4a4f20a29..64ccba10db 100644
Binary files a/public/images/emoji/google/admission_tickets.png and b/public/images/emoji/google/admission_tickets.png differ
diff --git a/public/images/emoji/google/adult.png b/public/images/emoji/google/adult.png
index b1e573ea79..48535bf92d 100644
Binary files a/public/images/emoji/google/adult.png and b/public/images/emoji/google/adult.png differ
diff --git a/public/images/emoji/google/adult/2.png b/public/images/emoji/google/adult/2.png
index 49b6323c70..7a49281763 100644
Binary files a/public/images/emoji/google/adult/2.png and b/public/images/emoji/google/adult/2.png differ
diff --git a/public/images/emoji/google/adult/3.png b/public/images/emoji/google/adult/3.png
index 74211085d4..886b418f7c 100644
Binary files a/public/images/emoji/google/adult/3.png and b/public/images/emoji/google/adult/3.png differ
diff --git a/public/images/emoji/google/adult/4.png b/public/images/emoji/google/adult/4.png
index 3d1fea5870..d66179bbdc 100644
Binary files a/public/images/emoji/google/adult/4.png and b/public/images/emoji/google/adult/4.png differ
diff --git a/public/images/emoji/google/adult/5.png b/public/images/emoji/google/adult/5.png
index 4308a40388..c7cdcf9f14 100644
Binary files a/public/images/emoji/google/adult/5.png and b/public/images/emoji/google/adult/5.png differ
diff --git a/public/images/emoji/google/adult/6.png b/public/images/emoji/google/adult/6.png
index 402c4664ec..a4c55373f3 100644
Binary files a/public/images/emoji/google/adult/6.png and b/public/images/emoji/google/adult/6.png differ
diff --git a/public/images/emoji/google/aerial_tramway.png b/public/images/emoji/google/aerial_tramway.png
index 98f5d590e0..0e66e38b1f 100644
Binary files a/public/images/emoji/google/aerial_tramway.png and b/public/images/emoji/google/aerial_tramway.png differ
diff --git a/public/images/emoji/google/afghanistan.png b/public/images/emoji/google/afghanistan.png
index e9738a1765..4872b2f545 100644
Binary files a/public/images/emoji/google/afghanistan.png and b/public/images/emoji/google/afghanistan.png differ
diff --git a/public/images/emoji/google/airplane.png b/public/images/emoji/google/airplane.png
index 98772ecd4c..482fb4f4ae 100644
Binary files a/public/images/emoji/google/airplane.png and b/public/images/emoji/google/airplane.png differ
diff --git a/public/images/emoji/google/airplane_arriving.png b/public/images/emoji/google/airplane_arriving.png
index e50c3233c2..baf6de740c 100644
Binary files a/public/images/emoji/google/airplane_arriving.png and b/public/images/emoji/google/airplane_arriving.png differ
diff --git a/public/images/emoji/google/airplane_departure.png b/public/images/emoji/google/airplane_departure.png
index 0536d2b45b..c5b13dc088 100644
Binary files a/public/images/emoji/google/airplane_departure.png and b/public/images/emoji/google/airplane_departure.png differ
diff --git a/public/images/emoji/google/airplane_small.png b/public/images/emoji/google/airplane_small.png
index 5342466c30..1a44e4a7d1 100644
Binary files a/public/images/emoji/google/airplane_small.png and b/public/images/emoji/google/airplane_small.png differ
diff --git a/public/images/emoji/google/aland_islands.png b/public/images/emoji/google/aland_islands.png
index 3da364d615..5a1349cf6a 100644
Binary files a/public/images/emoji/google/aland_islands.png and b/public/images/emoji/google/aland_islands.png differ
diff --git a/public/images/emoji/google/alarm_clock.png b/public/images/emoji/google/alarm_clock.png
index c0278db268..3ad07b27e5 100644
Binary files a/public/images/emoji/google/alarm_clock.png and b/public/images/emoji/google/alarm_clock.png differ
diff --git a/public/images/emoji/google/albania.png b/public/images/emoji/google/albania.png
index 03ed7ebf0a..b83555df6b 100644
Binary files a/public/images/emoji/google/albania.png and b/public/images/emoji/google/albania.png differ
diff --git a/public/images/emoji/google/alembic.png b/public/images/emoji/google/alembic.png
index 436090af68..f6e68a91c6 100644
Binary files a/public/images/emoji/google/alembic.png and b/public/images/emoji/google/alembic.png differ
diff --git a/public/images/emoji/google/algeria.png b/public/images/emoji/google/algeria.png
index aaabbe9432..ccbb144187 100644
Binary files a/public/images/emoji/google/algeria.png and b/public/images/emoji/google/algeria.png differ
diff --git a/public/images/emoji/google/alien.png b/public/images/emoji/google/alien.png
index b21fb58a8e..90150e0ef0 100644
Binary files a/public/images/emoji/google/alien.png and b/public/images/emoji/google/alien.png differ
diff --git a/public/images/emoji/google/ambulance.png b/public/images/emoji/google/ambulance.png
index af5dba3d2d..95238d2858 100644
Binary files a/public/images/emoji/google/ambulance.png and b/public/images/emoji/google/ambulance.png differ
diff --git a/public/images/emoji/google/american_samoa.png b/public/images/emoji/google/american_samoa.png
index 7c6a59dc3d..267bb361f1 100644
Binary files a/public/images/emoji/google/american_samoa.png and b/public/images/emoji/google/american_samoa.png differ
diff --git a/public/images/emoji/google/amphora.png b/public/images/emoji/google/amphora.png
index ad738586d4..cb69f341d8 100644
Binary files a/public/images/emoji/google/amphora.png and b/public/images/emoji/google/amphora.png differ
diff --git a/public/images/emoji/google/anchor.png b/public/images/emoji/google/anchor.png
index 9ad6ffcef0..5ae2388b72 100644
Binary files a/public/images/emoji/google/anchor.png and b/public/images/emoji/google/anchor.png differ
diff --git a/public/images/emoji/google/andorra.png b/public/images/emoji/google/andorra.png
index ce11d43692..ffcf0a6ee5 100644
Binary files a/public/images/emoji/google/andorra.png and b/public/images/emoji/google/andorra.png differ
diff --git a/public/images/emoji/google/angel.png b/public/images/emoji/google/angel.png
index 93195336c2..4c755b4827 100644
Binary files a/public/images/emoji/google/angel.png and b/public/images/emoji/google/angel.png differ
diff --git a/public/images/emoji/google/angel/2.png b/public/images/emoji/google/angel/2.png
index f2b3b918a5..6721a8191c 100644
Binary files a/public/images/emoji/google/angel/2.png and b/public/images/emoji/google/angel/2.png differ
diff --git a/public/images/emoji/google/angel/3.png b/public/images/emoji/google/angel/3.png
index d40d3c8ba6..6f349efa41 100644
Binary files a/public/images/emoji/google/angel/3.png and b/public/images/emoji/google/angel/3.png differ
diff --git a/public/images/emoji/google/angel/4.png b/public/images/emoji/google/angel/4.png
index 894cfb72e7..07b176ab3e 100644
Binary files a/public/images/emoji/google/angel/4.png and b/public/images/emoji/google/angel/4.png differ
diff --git a/public/images/emoji/google/angel/5.png b/public/images/emoji/google/angel/5.png
index 196efe7c9d..363ec97992 100644
Binary files a/public/images/emoji/google/angel/5.png and b/public/images/emoji/google/angel/5.png differ
diff --git a/public/images/emoji/google/angel/6.png b/public/images/emoji/google/angel/6.png
index ba65e5bcd2..9c2e9f1451 100644
Binary files a/public/images/emoji/google/angel/6.png and b/public/images/emoji/google/angel/6.png differ
diff --git a/public/images/emoji/google/anger.png b/public/images/emoji/google/anger.png
index 6aa9f61415..eb5c4886c3 100644
Binary files a/public/images/emoji/google/anger.png and b/public/images/emoji/google/anger.png differ
diff --git a/public/images/emoji/google/anger_right.png b/public/images/emoji/google/anger_right.png
index 27b4462cbb..9ba99a5b35 100644
Binary files a/public/images/emoji/google/anger_right.png and b/public/images/emoji/google/anger_right.png differ
diff --git a/public/images/emoji/google/angola.png b/public/images/emoji/google/angola.png
index f6a8d186ed..0a4c13a436 100644
Binary files a/public/images/emoji/google/angola.png and b/public/images/emoji/google/angola.png differ
diff --git a/public/images/emoji/google/angry.png b/public/images/emoji/google/angry.png
index 6649257e2a..c0e39aa290 100644
Binary files a/public/images/emoji/google/angry.png and b/public/images/emoji/google/angry.png differ
diff --git a/public/images/emoji/google/anguilla.png b/public/images/emoji/google/anguilla.png
index 20311cb75c..6ba27e284c 100644
Binary files a/public/images/emoji/google/anguilla.png and b/public/images/emoji/google/anguilla.png differ
diff --git a/public/images/emoji/google/anguished.png b/public/images/emoji/google/anguished.png
index 5b943bac34..e2059f1bf0 100644
Binary files a/public/images/emoji/google/anguished.png and b/public/images/emoji/google/anguished.png differ
diff --git a/public/images/emoji/google/ant.png b/public/images/emoji/google/ant.png
index c0399ae6e5..8c66dbf0c7 100644
Binary files a/public/images/emoji/google/ant.png and b/public/images/emoji/google/ant.png differ
diff --git a/public/images/emoji/google/antarctica.png b/public/images/emoji/google/antarctica.png
index f4eee7ffa9..4aeb8e774c 100644
Binary files a/public/images/emoji/google/antarctica.png and b/public/images/emoji/google/antarctica.png differ
diff --git a/public/images/emoji/google/antigua_barbuda.png b/public/images/emoji/google/antigua_barbuda.png
index d9ac68ec8c..8be446d903 100644
Binary files a/public/images/emoji/google/antigua_barbuda.png and b/public/images/emoji/google/antigua_barbuda.png differ
diff --git a/public/images/emoji/google/apple.png b/public/images/emoji/google/apple.png
index a3df203715..452dc36214 100644
Binary files a/public/images/emoji/google/apple.png and b/public/images/emoji/google/apple.png differ
diff --git a/public/images/emoji/google/aquarius.png b/public/images/emoji/google/aquarius.png
index 52d8d5000b..322e51a694 100644
Binary files a/public/images/emoji/google/aquarius.png and b/public/images/emoji/google/aquarius.png differ
diff --git a/public/images/emoji/google/archery.png b/public/images/emoji/google/archery.png
index 6539d3b37e..130e029ea5 100644
Binary files a/public/images/emoji/google/archery.png and b/public/images/emoji/google/archery.png differ
diff --git a/public/images/emoji/google/argentina.png b/public/images/emoji/google/argentina.png
index 5f44faeddd..6bdb15abe2 100644
Binary files a/public/images/emoji/google/argentina.png and b/public/images/emoji/google/argentina.png differ
diff --git a/public/images/emoji/google/aries.png b/public/images/emoji/google/aries.png
index ab7fc9b03c..7d59f6ec86 100644
Binary files a/public/images/emoji/google/aries.png and b/public/images/emoji/google/aries.png differ
diff --git a/public/images/emoji/google/armenia.png b/public/images/emoji/google/armenia.png
index 4af6686cb6..1a585dd67f 100644
Binary files a/public/images/emoji/google/armenia.png and b/public/images/emoji/google/armenia.png differ
diff --git a/public/images/emoji/google/arrow_backward.png b/public/images/emoji/google/arrow_backward.png
index 2bec2d7c44..81b77f2444 100644
Binary files a/public/images/emoji/google/arrow_backward.png and b/public/images/emoji/google/arrow_backward.png differ
diff --git a/public/images/emoji/google/arrow_double_down.png b/public/images/emoji/google/arrow_double_down.png
index efbad59f09..b0bd62ec65 100644
Binary files a/public/images/emoji/google/arrow_double_down.png and b/public/images/emoji/google/arrow_double_down.png differ
diff --git a/public/images/emoji/google/arrow_double_up.png b/public/images/emoji/google/arrow_double_up.png
index 76f5e0ae14..1c5aea8cc3 100644
Binary files a/public/images/emoji/google/arrow_double_up.png and b/public/images/emoji/google/arrow_double_up.png differ
diff --git a/public/images/emoji/google/arrow_down.png b/public/images/emoji/google/arrow_down.png
index 0b9865184c..3adc145552 100644
Binary files a/public/images/emoji/google/arrow_down.png and b/public/images/emoji/google/arrow_down.png differ
diff --git a/public/images/emoji/google/arrow_down_small.png b/public/images/emoji/google/arrow_down_small.png
index 48297676a9..0a0d134044 100644
Binary files a/public/images/emoji/google/arrow_down_small.png and b/public/images/emoji/google/arrow_down_small.png differ
diff --git a/public/images/emoji/google/arrow_forward.png b/public/images/emoji/google/arrow_forward.png
index 3a6466fca7..a2521f3646 100644
Binary files a/public/images/emoji/google/arrow_forward.png and b/public/images/emoji/google/arrow_forward.png differ
diff --git a/public/images/emoji/google/arrow_heading_down.png b/public/images/emoji/google/arrow_heading_down.png
index c8597ae17b..00503be9fa 100644
Binary files a/public/images/emoji/google/arrow_heading_down.png and b/public/images/emoji/google/arrow_heading_down.png differ
diff --git a/public/images/emoji/google/arrow_heading_up.png b/public/images/emoji/google/arrow_heading_up.png
index fe00d09649..b9c2461d3b 100644
Binary files a/public/images/emoji/google/arrow_heading_up.png and b/public/images/emoji/google/arrow_heading_up.png differ
diff --git a/public/images/emoji/google/arrow_left.png b/public/images/emoji/google/arrow_left.png
index bff1717f9b..535043666b 100644
Binary files a/public/images/emoji/google/arrow_left.png and b/public/images/emoji/google/arrow_left.png differ
diff --git a/public/images/emoji/google/arrow_lower_left.png b/public/images/emoji/google/arrow_lower_left.png
index 517892c913..92e1a5c5a9 100644
Binary files a/public/images/emoji/google/arrow_lower_left.png and b/public/images/emoji/google/arrow_lower_left.png differ
diff --git a/public/images/emoji/google/arrow_lower_right.png b/public/images/emoji/google/arrow_lower_right.png
index a2ff7573d7..0c704dec18 100644
Binary files a/public/images/emoji/google/arrow_lower_right.png and b/public/images/emoji/google/arrow_lower_right.png differ
diff --git a/public/images/emoji/google/arrow_right.png b/public/images/emoji/google/arrow_right.png
index b61cb914e5..1188727ffa 100644
Binary files a/public/images/emoji/google/arrow_right.png and b/public/images/emoji/google/arrow_right.png differ
diff --git a/public/images/emoji/google/arrow_right_hook.png b/public/images/emoji/google/arrow_right_hook.png
index 1024ba2c28..508a10100a 100644
Binary files a/public/images/emoji/google/arrow_right_hook.png and b/public/images/emoji/google/arrow_right_hook.png differ
diff --git a/public/images/emoji/google/arrow_up.png b/public/images/emoji/google/arrow_up.png
index 012d625c6a..a2b5a49c8f 100644
Binary files a/public/images/emoji/google/arrow_up.png and b/public/images/emoji/google/arrow_up.png differ
diff --git a/public/images/emoji/google/arrow_up_down.png b/public/images/emoji/google/arrow_up_down.png
index 063fa8766c..a9a7dd7396 100644
Binary files a/public/images/emoji/google/arrow_up_down.png and b/public/images/emoji/google/arrow_up_down.png differ
diff --git a/public/images/emoji/google/arrow_up_small.png b/public/images/emoji/google/arrow_up_small.png
index 6f44a81020..4ed38f7095 100644
Binary files a/public/images/emoji/google/arrow_up_small.png and b/public/images/emoji/google/arrow_up_small.png differ
diff --git a/public/images/emoji/google/arrow_upper_left.png b/public/images/emoji/google/arrow_upper_left.png
index 8187a46b08..0c6e3a65d8 100644
Binary files a/public/images/emoji/google/arrow_upper_left.png and b/public/images/emoji/google/arrow_upper_left.png differ
diff --git a/public/images/emoji/google/arrow_upper_right.png b/public/images/emoji/google/arrow_upper_right.png
index c59c2f3585..a1df4c37f6 100644
Binary files a/public/images/emoji/google/arrow_upper_right.png and b/public/images/emoji/google/arrow_upper_right.png differ
diff --git a/public/images/emoji/google/arrows_clockwise.png b/public/images/emoji/google/arrows_clockwise.png
index 63cb99ff89..0806b60608 100644
Binary files a/public/images/emoji/google/arrows_clockwise.png and b/public/images/emoji/google/arrows_clockwise.png differ
diff --git a/public/images/emoji/google/arrows_counterclockwise.png b/public/images/emoji/google/arrows_counterclockwise.png
index 9811cdcec5..3362a4b424 100644
Binary files a/public/images/emoji/google/arrows_counterclockwise.png and b/public/images/emoji/google/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/google/art.png b/public/images/emoji/google/art.png
index 9bb7a1d9f9..38b3aa804d 100644
Binary files a/public/images/emoji/google/art.png and b/public/images/emoji/google/art.png differ
diff --git a/public/images/emoji/google/articulated_lorry.png b/public/images/emoji/google/articulated_lorry.png
index 35b3d9b991..8680f6b472 100644
Binary files a/public/images/emoji/google/articulated_lorry.png and b/public/images/emoji/google/articulated_lorry.png differ
diff --git a/public/images/emoji/google/artificial_satellite.png b/public/images/emoji/google/artificial_satellite.png
index 6b94efd773..8f60cf4fc4 100644
Binary files a/public/images/emoji/google/artificial_satellite.png and b/public/images/emoji/google/artificial_satellite.png differ
diff --git a/public/images/emoji/google/aruba.png b/public/images/emoji/google/aruba.png
index 74245636f2..2f6f6ab252 100644
Binary files a/public/images/emoji/google/aruba.png and b/public/images/emoji/google/aruba.png differ
diff --git a/public/images/emoji/google/ascension_island.png b/public/images/emoji/google/ascension_island.png
index 708a3c64aa..d314bbbc78 100644
Binary files a/public/images/emoji/google/ascension_island.png and b/public/images/emoji/google/ascension_island.png differ
diff --git a/public/images/emoji/google/asterisk.png b/public/images/emoji/google/asterisk.png
index 9c0101c7d7..ff8fbb5091 100644
Binary files a/public/images/emoji/google/asterisk.png and b/public/images/emoji/google/asterisk.png differ
diff --git a/public/images/emoji/google/astonished.png b/public/images/emoji/google/astonished.png
index 3016c48f58..ffa8c01680 100644
Binary files a/public/images/emoji/google/astonished.png and b/public/images/emoji/google/astonished.png differ
diff --git a/public/images/emoji/google/athletic_shoe.png b/public/images/emoji/google/athletic_shoe.png
index 9c169666aa..e3da2abcc5 100644
Binary files a/public/images/emoji/google/athletic_shoe.png and b/public/images/emoji/google/athletic_shoe.png differ
diff --git a/public/images/emoji/google/atm.png b/public/images/emoji/google/atm.png
index 1479b91ddb..475ac6578a 100644
Binary files a/public/images/emoji/google/atm.png and b/public/images/emoji/google/atm.png differ
diff --git a/public/images/emoji/google/atom.png b/public/images/emoji/google/atom.png
index 1bb290c851..9a6fb28ddf 100644
Binary files a/public/images/emoji/google/atom.png and b/public/images/emoji/google/atom.png differ
diff --git a/public/images/emoji/google/atom_symbol.png b/public/images/emoji/google/atom_symbol.png
index 1bb290c851..9a6fb28ddf 100644
Binary files a/public/images/emoji/google/atom_symbol.png and b/public/images/emoji/google/atom_symbol.png differ
diff --git a/public/images/emoji/google/australia.png b/public/images/emoji/google/australia.png
index 7ef6056c33..fe795f0891 100644
Binary files a/public/images/emoji/google/australia.png and b/public/images/emoji/google/australia.png differ
diff --git a/public/images/emoji/google/austria.png b/public/images/emoji/google/austria.png
index 84a21b7c85..c7854b7e0b 100644
Binary files a/public/images/emoji/google/austria.png and b/public/images/emoji/google/austria.png differ
diff --git a/public/images/emoji/google/automobile.png b/public/images/emoji/google/automobile.png
index 56f5cddc27..7df8de6eb8 100644
Binary files a/public/images/emoji/google/automobile.png and b/public/images/emoji/google/automobile.png differ
diff --git a/public/images/emoji/google/avocado.png b/public/images/emoji/google/avocado.png
index 7f3e78d55f..b72b7d0798 100644
Binary files a/public/images/emoji/google/avocado.png and b/public/images/emoji/google/avocado.png differ
diff --git a/public/images/emoji/google/azerbaijan.png b/public/images/emoji/google/azerbaijan.png
index 2ca8b33240..11022dcdf7 100644
Binary files a/public/images/emoji/google/azerbaijan.png and b/public/images/emoji/google/azerbaijan.png differ
diff --git a/public/images/emoji/google/b.png b/public/images/emoji/google/b.png
index 0c37cfbcc9..b095d78ac3 100644
Binary files a/public/images/emoji/google/b.png and b/public/images/emoji/google/b.png differ
diff --git a/public/images/emoji/google/baby.png b/public/images/emoji/google/baby.png
index 7bb8284202..b4a87685e0 100644
Binary files a/public/images/emoji/google/baby.png and b/public/images/emoji/google/baby.png differ
diff --git a/public/images/emoji/google/baby/2.png b/public/images/emoji/google/baby/2.png
index 1b453f752e..5ad7bfd76f 100644
Binary files a/public/images/emoji/google/baby/2.png and b/public/images/emoji/google/baby/2.png differ
diff --git a/public/images/emoji/google/baby/3.png b/public/images/emoji/google/baby/3.png
index e8bef481c9..5c828b27a7 100644
Binary files a/public/images/emoji/google/baby/3.png and b/public/images/emoji/google/baby/3.png differ
diff --git a/public/images/emoji/google/baby/4.png b/public/images/emoji/google/baby/4.png
index 3b6af055b6..c36b0e6860 100644
Binary files a/public/images/emoji/google/baby/4.png and b/public/images/emoji/google/baby/4.png differ
diff --git a/public/images/emoji/google/baby/5.png b/public/images/emoji/google/baby/5.png
index 7a6ffedb96..1305a0f27c 100644
Binary files a/public/images/emoji/google/baby/5.png and b/public/images/emoji/google/baby/5.png differ
diff --git a/public/images/emoji/google/baby/6.png b/public/images/emoji/google/baby/6.png
index 8c0d6788e4..fb94e05fb5 100644
Binary files a/public/images/emoji/google/baby/6.png and b/public/images/emoji/google/baby/6.png differ
diff --git a/public/images/emoji/google/baby_bottle.png b/public/images/emoji/google/baby_bottle.png
index 1db2ef3b01..927df75cff 100644
Binary files a/public/images/emoji/google/baby_bottle.png and b/public/images/emoji/google/baby_bottle.png differ
diff --git a/public/images/emoji/google/baby_chick.png b/public/images/emoji/google/baby_chick.png
index 109f05c0d4..06c417f3fb 100644
Binary files a/public/images/emoji/google/baby_chick.png and b/public/images/emoji/google/baby_chick.png differ
diff --git a/public/images/emoji/google/baby_symbol.png b/public/images/emoji/google/baby_symbol.png
index 8c3fcd2dcc..fa6939a61b 100644
Binary files a/public/images/emoji/google/baby_symbol.png and b/public/images/emoji/google/baby_symbol.png differ
diff --git a/public/images/emoji/google/back.png b/public/images/emoji/google/back.png
index 457e8dc3ac..0bd77817ce 100644
Binary files a/public/images/emoji/google/back.png and b/public/images/emoji/google/back.png differ
diff --git a/public/images/emoji/google/bacon.png b/public/images/emoji/google/bacon.png
index 96187058dd..f5c163e0fa 100644
Binary files a/public/images/emoji/google/bacon.png and b/public/images/emoji/google/bacon.png differ
diff --git a/public/images/emoji/google/badminton.png b/public/images/emoji/google/badminton.png
index 23d81a01c2..882a71ee34 100644
Binary files a/public/images/emoji/google/badminton.png and b/public/images/emoji/google/badminton.png differ
diff --git a/public/images/emoji/google/baggage_claim.png b/public/images/emoji/google/baggage_claim.png
index b64147d6a6..156124dc9b 100644
Binary files a/public/images/emoji/google/baggage_claim.png and b/public/images/emoji/google/baggage_claim.png differ
diff --git a/public/images/emoji/google/baguette_bread.png b/public/images/emoji/google/baguette_bread.png
index b05d2fd972..6ebe4711d3 100644
Binary files a/public/images/emoji/google/baguette_bread.png and b/public/images/emoji/google/baguette_bread.png differ
diff --git a/public/images/emoji/google/bahamas.png b/public/images/emoji/google/bahamas.png
index eb3e9140a6..2bc67c15e6 100644
Binary files a/public/images/emoji/google/bahamas.png and b/public/images/emoji/google/bahamas.png differ
diff --git a/public/images/emoji/google/bahrain.png b/public/images/emoji/google/bahrain.png
index defa6c0297..cd454e4fbd 100644
Binary files a/public/images/emoji/google/bahrain.png and b/public/images/emoji/google/bahrain.png differ
diff --git a/public/images/emoji/google/balance_scale.png b/public/images/emoji/google/balance_scale.png
index b13e29f36c..179fce7257 100644
Binary files a/public/images/emoji/google/balance_scale.png and b/public/images/emoji/google/balance_scale.png differ
diff --git a/public/images/emoji/google/balloon.png b/public/images/emoji/google/balloon.png
index e1d5408014..9d3b69e1c1 100644
Binary files a/public/images/emoji/google/balloon.png and b/public/images/emoji/google/balloon.png differ
diff --git a/public/images/emoji/google/ballot_box.png b/public/images/emoji/google/ballot_box.png
index 874b7e277f..4b730a859a 100644
Binary files a/public/images/emoji/google/ballot_box.png and b/public/images/emoji/google/ballot_box.png differ
diff --git a/public/images/emoji/google/ballot_box_with_ballot.png b/public/images/emoji/google/ballot_box_with_ballot.png
index 874b7e277f..4b730a859a 100644
Binary files a/public/images/emoji/google/ballot_box_with_ballot.png and b/public/images/emoji/google/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/google/ballot_box_with_check.png b/public/images/emoji/google/ballot_box_with_check.png
index f18496deaf..39d739cd09 100644
Binary files a/public/images/emoji/google/ballot_box_with_check.png and b/public/images/emoji/google/ballot_box_with_check.png differ
diff --git a/public/images/emoji/google/bamboo.png b/public/images/emoji/google/bamboo.png
index e9dc72c9f8..4d78882914 100644
Binary files a/public/images/emoji/google/bamboo.png and b/public/images/emoji/google/bamboo.png differ
diff --git a/public/images/emoji/google/banana.png b/public/images/emoji/google/banana.png
index f01da66942..300ab267ca 100644
Binary files a/public/images/emoji/google/banana.png and b/public/images/emoji/google/banana.png differ
diff --git a/public/images/emoji/google/bangbang.png b/public/images/emoji/google/bangbang.png
index 5160aad2a0..ea825f75f0 100644
Binary files a/public/images/emoji/google/bangbang.png and b/public/images/emoji/google/bangbang.png differ
diff --git a/public/images/emoji/google/bangladesh.png b/public/images/emoji/google/bangladesh.png
index 523e592826..78dc405958 100644
Binary files a/public/images/emoji/google/bangladesh.png and b/public/images/emoji/google/bangladesh.png differ
diff --git a/public/images/emoji/google/bank.png b/public/images/emoji/google/bank.png
index 4011d56208..89b62c90e8 100644
Binary files a/public/images/emoji/google/bank.png and b/public/images/emoji/google/bank.png differ
diff --git a/public/images/emoji/google/bar_chart.png b/public/images/emoji/google/bar_chart.png
index f32d1a3aa8..4428742d91 100644
Binary files a/public/images/emoji/google/bar_chart.png and b/public/images/emoji/google/bar_chart.png differ
diff --git a/public/images/emoji/google/barbados.png b/public/images/emoji/google/barbados.png
index de435239cb..523c99a550 100644
Binary files a/public/images/emoji/google/barbados.png and b/public/images/emoji/google/barbados.png differ
diff --git a/public/images/emoji/google/barber.png b/public/images/emoji/google/barber.png
index ba56bc5c97..cd0b1e0c91 100644
Binary files a/public/images/emoji/google/barber.png and b/public/images/emoji/google/barber.png differ
diff --git a/public/images/emoji/google/baseball.png b/public/images/emoji/google/baseball.png
index 97a73f6f8e..1c302367d9 100644
Binary files a/public/images/emoji/google/baseball.png and b/public/images/emoji/google/baseball.png differ
diff --git a/public/images/emoji/google/basketball.png b/public/images/emoji/google/basketball.png
index c7362826e6..12ac7e4720 100644
Binary files a/public/images/emoji/google/basketball.png and b/public/images/emoji/google/basketball.png differ
diff --git a/public/images/emoji/google/basketball_man.png b/public/images/emoji/google/basketball_man.png
index 2f234c1261..4441fc46c5 100644
Binary files a/public/images/emoji/google/basketball_man.png and b/public/images/emoji/google/basketball_man.png differ
diff --git a/public/images/emoji/google/basketball_man/2.png b/public/images/emoji/google/basketball_man/2.png
index 511ad7125c..d8c44421c8 100644
Binary files a/public/images/emoji/google/basketball_man/2.png and b/public/images/emoji/google/basketball_man/2.png differ
diff --git a/public/images/emoji/google/basketball_man/3.png b/public/images/emoji/google/basketball_man/3.png
index 652a2149b8..fbd4d90e0d 100644
Binary files a/public/images/emoji/google/basketball_man/3.png and b/public/images/emoji/google/basketball_man/3.png differ
diff --git a/public/images/emoji/google/basketball_man/4.png b/public/images/emoji/google/basketball_man/4.png
index 3ea11741d3..2c84919a15 100644
Binary files a/public/images/emoji/google/basketball_man/4.png and b/public/images/emoji/google/basketball_man/4.png differ
diff --git a/public/images/emoji/google/basketball_man/5.png b/public/images/emoji/google/basketball_man/5.png
index 28b8f86325..2e9df18f9f 100644
Binary files a/public/images/emoji/google/basketball_man/5.png and b/public/images/emoji/google/basketball_man/5.png differ
diff --git a/public/images/emoji/google/basketball_man/6.png b/public/images/emoji/google/basketball_man/6.png
index 5450f40d54..77fb03716f 100644
Binary files a/public/images/emoji/google/basketball_man/6.png and b/public/images/emoji/google/basketball_man/6.png differ
diff --git a/public/images/emoji/google/basketball_player.png b/public/images/emoji/google/basketball_player.png
index 2f234c1261..4441fc46c5 100644
Binary files a/public/images/emoji/google/basketball_player.png and b/public/images/emoji/google/basketball_player.png differ
diff --git a/public/images/emoji/google/basketball_player/2.png b/public/images/emoji/google/basketball_player/2.png
index 511ad7125c..d8c44421c8 100644
Binary files a/public/images/emoji/google/basketball_player/2.png and b/public/images/emoji/google/basketball_player/2.png differ
diff --git a/public/images/emoji/google/basketball_player/3.png b/public/images/emoji/google/basketball_player/3.png
index 652a2149b8..fbd4d90e0d 100644
Binary files a/public/images/emoji/google/basketball_player/3.png and b/public/images/emoji/google/basketball_player/3.png differ
diff --git a/public/images/emoji/google/basketball_player/4.png b/public/images/emoji/google/basketball_player/4.png
index 3ea11741d3..2c84919a15 100644
Binary files a/public/images/emoji/google/basketball_player/4.png and b/public/images/emoji/google/basketball_player/4.png differ
diff --git a/public/images/emoji/google/basketball_player/5.png b/public/images/emoji/google/basketball_player/5.png
index 28b8f86325..2e9df18f9f 100644
Binary files a/public/images/emoji/google/basketball_player/5.png and b/public/images/emoji/google/basketball_player/5.png differ
diff --git a/public/images/emoji/google/basketball_player/6.png b/public/images/emoji/google/basketball_player/6.png
index 5450f40d54..77fb03716f 100644
Binary files a/public/images/emoji/google/basketball_player/6.png and b/public/images/emoji/google/basketball_player/6.png differ
diff --git a/public/images/emoji/google/basketball_woman.png b/public/images/emoji/google/basketball_woman.png
index 1ebaa14502..1c90300615 100644
Binary files a/public/images/emoji/google/basketball_woman.png and b/public/images/emoji/google/basketball_woman.png differ
diff --git a/public/images/emoji/google/bat.png b/public/images/emoji/google/bat.png
index 7bcc07be3a..99551fb570 100644
Binary files a/public/images/emoji/google/bat.png and b/public/images/emoji/google/bat.png differ
diff --git a/public/images/emoji/google/bath.png b/public/images/emoji/google/bath.png
index 7446865226..bb1ec3f5c0 100644
Binary files a/public/images/emoji/google/bath.png and b/public/images/emoji/google/bath.png differ
diff --git a/public/images/emoji/google/bath/2.png b/public/images/emoji/google/bath/2.png
index 6fe566d964..8ef30d762a 100644
Binary files a/public/images/emoji/google/bath/2.png and b/public/images/emoji/google/bath/2.png differ
diff --git a/public/images/emoji/google/bath/3.png b/public/images/emoji/google/bath/3.png
index 918c109395..ad7963b9b6 100644
Binary files a/public/images/emoji/google/bath/3.png and b/public/images/emoji/google/bath/3.png differ
diff --git a/public/images/emoji/google/bath/4.png b/public/images/emoji/google/bath/4.png
index aa4fe481da..a4b5e2f6cf 100644
Binary files a/public/images/emoji/google/bath/4.png and b/public/images/emoji/google/bath/4.png differ
diff --git a/public/images/emoji/google/bath/5.png b/public/images/emoji/google/bath/5.png
index be0bcdbc28..dc4657b0d0 100644
Binary files a/public/images/emoji/google/bath/5.png and b/public/images/emoji/google/bath/5.png differ
diff --git a/public/images/emoji/google/bath/6.png b/public/images/emoji/google/bath/6.png
index 476327e201..4c66c159df 100644
Binary files a/public/images/emoji/google/bath/6.png and b/public/images/emoji/google/bath/6.png differ
diff --git a/public/images/emoji/google/bathtub.png b/public/images/emoji/google/bathtub.png
index 99c7d1ba91..f77fa95bf6 100644
Binary files a/public/images/emoji/google/bathtub.png and b/public/images/emoji/google/bathtub.png differ
diff --git a/public/images/emoji/google/battery.png b/public/images/emoji/google/battery.png
index f8f68e028d..0e64ef1e5c 100644
Binary files a/public/images/emoji/google/battery.png and b/public/images/emoji/google/battery.png differ
diff --git a/public/images/emoji/google/beach.png b/public/images/emoji/google/beach.png
index ac106a0f03..859c09dff4 100644
Binary files a/public/images/emoji/google/beach.png and b/public/images/emoji/google/beach.png differ
diff --git a/public/images/emoji/google/beach_umbrella.png b/public/images/emoji/google/beach_umbrella.png
index ac106a0f03..859c09dff4 100644
Binary files a/public/images/emoji/google/beach_umbrella.png and b/public/images/emoji/google/beach_umbrella.png differ
diff --git a/public/images/emoji/google/beach_with_umbrella.png b/public/images/emoji/google/beach_with_umbrella.png
index ac106a0f03..859c09dff4 100644
Binary files a/public/images/emoji/google/beach_with_umbrella.png and b/public/images/emoji/google/beach_with_umbrella.png differ
diff --git a/public/images/emoji/google/bear.png b/public/images/emoji/google/bear.png
index 6d486b6560..aeaf931f71 100644
Binary files a/public/images/emoji/google/bear.png and b/public/images/emoji/google/bear.png differ
diff --git a/public/images/emoji/google/bearded_person.png b/public/images/emoji/google/bearded_person.png
index 1cbeab61ab..8f22a46616 100644
Binary files a/public/images/emoji/google/bearded_person.png and b/public/images/emoji/google/bearded_person.png differ
diff --git a/public/images/emoji/google/bearded_person/2.png b/public/images/emoji/google/bearded_person/2.png
index 4bebe19440..1bbb888fb6 100644
Binary files a/public/images/emoji/google/bearded_person/2.png and b/public/images/emoji/google/bearded_person/2.png differ
diff --git a/public/images/emoji/google/bearded_person/3.png b/public/images/emoji/google/bearded_person/3.png
index 1468f3cfae..786779b45c 100644
Binary files a/public/images/emoji/google/bearded_person/3.png and b/public/images/emoji/google/bearded_person/3.png differ
diff --git a/public/images/emoji/google/bearded_person/4.png b/public/images/emoji/google/bearded_person/4.png
index bb0753cf8e..94184c46ca 100644
Binary files a/public/images/emoji/google/bearded_person/4.png and b/public/images/emoji/google/bearded_person/4.png differ
diff --git a/public/images/emoji/google/bearded_person/5.png b/public/images/emoji/google/bearded_person/5.png
index 9178fbef0a..7b1ddea84d 100644
Binary files a/public/images/emoji/google/bearded_person/5.png and b/public/images/emoji/google/bearded_person/5.png differ
diff --git a/public/images/emoji/google/bearded_person/6.png b/public/images/emoji/google/bearded_person/6.png
index ecbca1e845..4b93f63cda 100644
Binary files a/public/images/emoji/google/bearded_person/6.png and b/public/images/emoji/google/bearded_person/6.png differ
diff --git a/public/images/emoji/google/bed.png b/public/images/emoji/google/bed.png
index 0044d37c51..54f63be23f 100644
Binary files a/public/images/emoji/google/bed.png and b/public/images/emoji/google/bed.png differ
diff --git a/public/images/emoji/google/bee.png b/public/images/emoji/google/bee.png
index 4bcf0f5a5c..4f0f41d104 100644
Binary files a/public/images/emoji/google/bee.png and b/public/images/emoji/google/bee.png differ
diff --git a/public/images/emoji/google/beer.png b/public/images/emoji/google/beer.png
index 8f28caa27d..48aaa236e3 100644
Binary files a/public/images/emoji/google/beer.png and b/public/images/emoji/google/beer.png differ
diff --git a/public/images/emoji/google/beers.png b/public/images/emoji/google/beers.png
index b92d90adc6..4e8a97b982 100644
Binary files a/public/images/emoji/google/beers.png and b/public/images/emoji/google/beers.png differ
diff --git a/public/images/emoji/google/beetle.png b/public/images/emoji/google/beetle.png
index 62d39a1f55..ea8c81a3f1 100644
Binary files a/public/images/emoji/google/beetle.png and b/public/images/emoji/google/beetle.png differ
diff --git a/public/images/emoji/google/beginner.png b/public/images/emoji/google/beginner.png
index 30582c207b..5bb5dd09e8 100644
Binary files a/public/images/emoji/google/beginner.png and b/public/images/emoji/google/beginner.png differ
diff --git a/public/images/emoji/google/belarus.png b/public/images/emoji/google/belarus.png
index b177eb3d5c..4a38227469 100644
Binary files a/public/images/emoji/google/belarus.png and b/public/images/emoji/google/belarus.png differ
diff --git a/public/images/emoji/google/belgium.png b/public/images/emoji/google/belgium.png
index 23dec0aa5a..cf4a8b353b 100644
Binary files a/public/images/emoji/google/belgium.png and b/public/images/emoji/google/belgium.png differ
diff --git a/public/images/emoji/google/belize.png b/public/images/emoji/google/belize.png
index 40c0e4247e..b101bfc474 100644
Binary files a/public/images/emoji/google/belize.png and b/public/images/emoji/google/belize.png differ
diff --git a/public/images/emoji/google/bell.png b/public/images/emoji/google/bell.png
index 54f61d27d7..33b7e0231b 100644
Binary files a/public/images/emoji/google/bell.png and b/public/images/emoji/google/bell.png differ
diff --git a/public/images/emoji/google/bellhop.png b/public/images/emoji/google/bellhop.png
index fa5165b0f2..6c5233fc30 100644
Binary files a/public/images/emoji/google/bellhop.png and b/public/images/emoji/google/bellhop.png differ
diff --git a/public/images/emoji/google/bellhop_bell.png b/public/images/emoji/google/bellhop_bell.png
index fa5165b0f2..6c5233fc30 100644
Binary files a/public/images/emoji/google/bellhop_bell.png and b/public/images/emoji/google/bellhop_bell.png differ
diff --git a/public/images/emoji/google/benin.png b/public/images/emoji/google/benin.png
index c05de3702a..ea2a4d8981 100644
Binary files a/public/images/emoji/google/benin.png and b/public/images/emoji/google/benin.png differ
diff --git a/public/images/emoji/google/bento.png b/public/images/emoji/google/bento.png
index 412d219fa4..e172064a1b 100644
Binary files a/public/images/emoji/google/bento.png and b/public/images/emoji/google/bento.png differ
diff --git a/public/images/emoji/google/bermuda.png b/public/images/emoji/google/bermuda.png
index 8eb79e2f0d..c3f27a2def 100644
Binary files a/public/images/emoji/google/bermuda.png and b/public/images/emoji/google/bermuda.png differ
diff --git a/public/images/emoji/google/bhutan.png b/public/images/emoji/google/bhutan.png
index 7812ea3b2a..4d12abfba1 100644
Binary files a/public/images/emoji/google/bhutan.png and b/public/images/emoji/google/bhutan.png differ
diff --git a/public/images/emoji/google/bicyclist.png b/public/images/emoji/google/bicyclist.png
index 90af313504..5423030f49 100644
Binary files a/public/images/emoji/google/bicyclist.png and b/public/images/emoji/google/bicyclist.png differ
diff --git a/public/images/emoji/google/bicyclist/2.png b/public/images/emoji/google/bicyclist/2.png
index 9c7240de48..0768cee6f7 100644
Binary files a/public/images/emoji/google/bicyclist/2.png and b/public/images/emoji/google/bicyclist/2.png differ
diff --git a/public/images/emoji/google/bicyclist/3.png b/public/images/emoji/google/bicyclist/3.png
index 4c9ec6b5cf..bd8b54401d 100644
Binary files a/public/images/emoji/google/bicyclist/3.png and b/public/images/emoji/google/bicyclist/3.png differ
diff --git a/public/images/emoji/google/bicyclist/4.png b/public/images/emoji/google/bicyclist/4.png
index c24ba48c30..5efa9dadcc 100644
Binary files a/public/images/emoji/google/bicyclist/4.png and b/public/images/emoji/google/bicyclist/4.png differ
diff --git a/public/images/emoji/google/bicyclist/5.png b/public/images/emoji/google/bicyclist/5.png
index 20784cbbb5..be123afd7a 100644
Binary files a/public/images/emoji/google/bicyclist/5.png and b/public/images/emoji/google/bicyclist/5.png differ
diff --git a/public/images/emoji/google/bicyclist/6.png b/public/images/emoji/google/bicyclist/6.png
index 30dfc6a26d..4bb5f74af1 100644
Binary files a/public/images/emoji/google/bicyclist/6.png and b/public/images/emoji/google/bicyclist/6.png differ
diff --git a/public/images/emoji/google/bike.png b/public/images/emoji/google/bike.png
index aae5fc3066..05106eee6c 100644
Binary files a/public/images/emoji/google/bike.png and b/public/images/emoji/google/bike.png differ
diff --git a/public/images/emoji/google/biking_man.png b/public/images/emoji/google/biking_man.png
index 90af313504..5423030f49 100644
Binary files a/public/images/emoji/google/biking_man.png and b/public/images/emoji/google/biking_man.png differ
diff --git a/public/images/emoji/google/biking_man/2.png b/public/images/emoji/google/biking_man/2.png
index 9c7240de48..0768cee6f7 100644
Binary files a/public/images/emoji/google/biking_man/2.png and b/public/images/emoji/google/biking_man/2.png differ
diff --git a/public/images/emoji/google/biking_man/3.png b/public/images/emoji/google/biking_man/3.png
index 4c9ec6b5cf..bd8b54401d 100644
Binary files a/public/images/emoji/google/biking_man/3.png and b/public/images/emoji/google/biking_man/3.png differ
diff --git a/public/images/emoji/google/biking_man/4.png b/public/images/emoji/google/biking_man/4.png
index c24ba48c30..5efa9dadcc 100644
Binary files a/public/images/emoji/google/biking_man/4.png and b/public/images/emoji/google/biking_man/4.png differ
diff --git a/public/images/emoji/google/biking_man/5.png b/public/images/emoji/google/biking_man/5.png
index 20784cbbb5..be123afd7a 100644
Binary files a/public/images/emoji/google/biking_man/5.png and b/public/images/emoji/google/biking_man/5.png differ
diff --git a/public/images/emoji/google/biking_man/6.png b/public/images/emoji/google/biking_man/6.png
index 30dfc6a26d..4bb5f74af1 100644
Binary files a/public/images/emoji/google/biking_man/6.png and b/public/images/emoji/google/biking_man/6.png differ
diff --git a/public/images/emoji/google/biking_woman.png b/public/images/emoji/google/biking_woman.png
index d6a192f9b8..bb318aab4c 100644
Binary files a/public/images/emoji/google/biking_woman.png and b/public/images/emoji/google/biking_woman.png differ
diff --git a/public/images/emoji/google/biking_woman/2.png b/public/images/emoji/google/biking_woman/2.png
index e7eb57701d..bb0bf1e73a 100644
Binary files a/public/images/emoji/google/biking_woman/2.png and b/public/images/emoji/google/biking_woman/2.png differ
diff --git a/public/images/emoji/google/biking_woman/3.png b/public/images/emoji/google/biking_woman/3.png
index 6d80a1fe33..730624fe95 100644
Binary files a/public/images/emoji/google/biking_woman/3.png and b/public/images/emoji/google/biking_woman/3.png differ
diff --git a/public/images/emoji/google/biking_woman/4.png b/public/images/emoji/google/biking_woman/4.png
index d7613910d9..9fd19b7b4b 100644
Binary files a/public/images/emoji/google/biking_woman/4.png and b/public/images/emoji/google/biking_woman/4.png differ
diff --git a/public/images/emoji/google/biking_woman/5.png b/public/images/emoji/google/biking_woman/5.png
index bd543a4c64..079e7399af 100644
Binary files a/public/images/emoji/google/biking_woman/5.png and b/public/images/emoji/google/biking_woman/5.png differ
diff --git a/public/images/emoji/google/biking_woman/6.png b/public/images/emoji/google/biking_woman/6.png
index 25465277d7..d605a656ff 100644
Binary files a/public/images/emoji/google/biking_woman/6.png and b/public/images/emoji/google/biking_woman/6.png differ
diff --git a/public/images/emoji/google/bikini.png b/public/images/emoji/google/bikini.png
index ad6fdaff31..9882db89fd 100644
Binary files a/public/images/emoji/google/bikini.png and b/public/images/emoji/google/bikini.png differ
diff --git a/public/images/emoji/google/billed_cap.png b/public/images/emoji/google/billed_cap.png
index a09913e21b..a4739440f3 100644
Binary files a/public/images/emoji/google/billed_cap.png and b/public/images/emoji/google/billed_cap.png differ
diff --git a/public/images/emoji/google/biohazard.png b/public/images/emoji/google/biohazard.png
index 867acac409..e345fcc45f 100644
Binary files a/public/images/emoji/google/biohazard.png and b/public/images/emoji/google/biohazard.png differ
diff --git a/public/images/emoji/google/biohazard_sign.png b/public/images/emoji/google/biohazard_sign.png
index 867acac409..e345fcc45f 100644
Binary files a/public/images/emoji/google/biohazard_sign.png and b/public/images/emoji/google/biohazard_sign.png differ
diff --git a/public/images/emoji/google/bird.png b/public/images/emoji/google/bird.png
index f29f1aa903..1231be5e0a 100644
Binary files a/public/images/emoji/google/bird.png and b/public/images/emoji/google/bird.png differ
diff --git a/public/images/emoji/google/birthday.png b/public/images/emoji/google/birthday.png
index 9800dbc9ae..fd23ead864 100644
Binary files a/public/images/emoji/google/birthday.png and b/public/images/emoji/google/birthday.png differ
diff --git a/public/images/emoji/google/black_circle.png b/public/images/emoji/google/black_circle.png
index 19a1b9ebc1..4e51b2a577 100644
Binary files a/public/images/emoji/google/black_circle.png and b/public/images/emoji/google/black_circle.png differ
diff --git a/public/images/emoji/google/black_flag.png b/public/images/emoji/google/black_flag.png
index a7fce0c581..fd30f1d882 100644
Binary files a/public/images/emoji/google/black_flag.png and b/public/images/emoji/google/black_flag.png differ
diff --git a/public/images/emoji/google/black_heart.png b/public/images/emoji/google/black_heart.png
index 38b5ac9fa5..4c4f97fcae 100644
Binary files a/public/images/emoji/google/black_heart.png and b/public/images/emoji/google/black_heart.png differ
diff --git a/public/images/emoji/google/black_joker.png b/public/images/emoji/google/black_joker.png
index 5a2de82787..f483d06284 100644
Binary files a/public/images/emoji/google/black_joker.png and b/public/images/emoji/google/black_joker.png differ
diff --git a/public/images/emoji/google/black_large_square.png b/public/images/emoji/google/black_large_square.png
index 5d5a3e0087..f55e1e34b5 100644
Binary files a/public/images/emoji/google/black_large_square.png and b/public/images/emoji/google/black_large_square.png differ
diff --git a/public/images/emoji/google/black_medium_small_square.png b/public/images/emoji/google/black_medium_small_square.png
index 2e1abb616e..d61362f516 100644
Binary files a/public/images/emoji/google/black_medium_small_square.png and b/public/images/emoji/google/black_medium_small_square.png differ
diff --git a/public/images/emoji/google/black_medium_square.png b/public/images/emoji/google/black_medium_square.png
index e632311ccb..f2b911b63b 100644
Binary files a/public/images/emoji/google/black_medium_square.png and b/public/images/emoji/google/black_medium_square.png differ
diff --git a/public/images/emoji/google/black_nib.png b/public/images/emoji/google/black_nib.png
index 730254037f..3efcc08d13 100644
Binary files a/public/images/emoji/google/black_nib.png and b/public/images/emoji/google/black_nib.png differ
diff --git a/public/images/emoji/google/black_small_square.png b/public/images/emoji/google/black_small_square.png
index bbdcbef554..1afd623ea0 100644
Binary files a/public/images/emoji/google/black_small_square.png and b/public/images/emoji/google/black_small_square.png differ
diff --git a/public/images/emoji/google/black_square_button.png b/public/images/emoji/google/black_square_button.png
index 242889f063..8241ed313e 100644
Binary files a/public/images/emoji/google/black_square_button.png and b/public/images/emoji/google/black_square_button.png differ
diff --git a/public/images/emoji/google/blonde_man.png b/public/images/emoji/google/blonde_man.png
index 69d6b0b5a7..f5d7e0009b 100644
Binary files a/public/images/emoji/google/blonde_man.png and b/public/images/emoji/google/blonde_man.png differ
diff --git a/public/images/emoji/google/blonde_man/2.png b/public/images/emoji/google/blonde_man/2.png
index 71286ddbf4..2845b0f0d3 100644
Binary files a/public/images/emoji/google/blonde_man/2.png and b/public/images/emoji/google/blonde_man/2.png differ
diff --git a/public/images/emoji/google/blonde_man/3.png b/public/images/emoji/google/blonde_man/3.png
index f5ccb5bc26..e9866fd956 100644
Binary files a/public/images/emoji/google/blonde_man/3.png and b/public/images/emoji/google/blonde_man/3.png differ
diff --git a/public/images/emoji/google/blonde_man/4.png b/public/images/emoji/google/blonde_man/4.png
index 2d068f1de9..9a83dc6e5f 100644
Binary files a/public/images/emoji/google/blonde_man/4.png and b/public/images/emoji/google/blonde_man/4.png differ
diff --git a/public/images/emoji/google/blonde_man/5.png b/public/images/emoji/google/blonde_man/5.png
index af6fe7aa98..9960400006 100644
Binary files a/public/images/emoji/google/blonde_man/5.png and b/public/images/emoji/google/blonde_man/5.png differ
diff --git a/public/images/emoji/google/blonde_man/6.png b/public/images/emoji/google/blonde_man/6.png
index 85e4e9885b..c2a4a4256b 100644
Binary files a/public/images/emoji/google/blonde_man/6.png and b/public/images/emoji/google/blonde_man/6.png differ
diff --git a/public/images/emoji/google/blonde_woman.png b/public/images/emoji/google/blonde_woman.png
index 30bdd3f9d7..9264a40c97 100644
Binary files a/public/images/emoji/google/blonde_woman.png and b/public/images/emoji/google/blonde_woman.png differ
diff --git a/public/images/emoji/google/blonde_woman/2.png b/public/images/emoji/google/blonde_woman/2.png
index 470f202bee..bb4e146919 100644
Binary files a/public/images/emoji/google/blonde_woman/2.png and b/public/images/emoji/google/blonde_woman/2.png differ
diff --git a/public/images/emoji/google/blonde_woman/3.png b/public/images/emoji/google/blonde_woman/3.png
index 932587e8d5..d20c874e84 100644
Binary files a/public/images/emoji/google/blonde_woman/3.png and b/public/images/emoji/google/blonde_woman/3.png differ
diff --git a/public/images/emoji/google/blonde_woman/4.png b/public/images/emoji/google/blonde_woman/4.png
index c142bc62cf..8a09e1cffe 100644
Binary files a/public/images/emoji/google/blonde_woman/4.png and b/public/images/emoji/google/blonde_woman/4.png differ
diff --git a/public/images/emoji/google/blonde_woman/5.png b/public/images/emoji/google/blonde_woman/5.png
index 2d5d18886f..ec93bfc36d 100644
Binary files a/public/images/emoji/google/blonde_woman/5.png and b/public/images/emoji/google/blonde_woman/5.png differ
diff --git a/public/images/emoji/google/blonde_woman/6.png b/public/images/emoji/google/blonde_woman/6.png
index fb1e8757ea..ad669e118f 100644
Binary files a/public/images/emoji/google/blonde_woman/6.png and b/public/images/emoji/google/blonde_woman/6.png differ
diff --git a/public/images/emoji/google/blossom.png b/public/images/emoji/google/blossom.png
index 0f3b661adb..3fc27e61b1 100644
Binary files a/public/images/emoji/google/blossom.png and b/public/images/emoji/google/blossom.png differ
diff --git a/public/images/emoji/google/blowfish.png b/public/images/emoji/google/blowfish.png
index 1ab19958f1..0c18d3477c 100644
Binary files a/public/images/emoji/google/blowfish.png and b/public/images/emoji/google/blowfish.png differ
diff --git a/public/images/emoji/google/blue_book.png b/public/images/emoji/google/blue_book.png
index 5edf72ede7..27a97ee236 100644
Binary files a/public/images/emoji/google/blue_book.png and b/public/images/emoji/google/blue_book.png differ
diff --git a/public/images/emoji/google/blue_car.png b/public/images/emoji/google/blue_car.png
index 6234478d68..c51bfe3e31 100644
Binary files a/public/images/emoji/google/blue_car.png and b/public/images/emoji/google/blue_car.png differ
diff --git a/public/images/emoji/google/blue_heart.png b/public/images/emoji/google/blue_heart.png
index 31a8f805db..6e0ba37fe1 100644
Binary files a/public/images/emoji/google/blue_heart.png and b/public/images/emoji/google/blue_heart.png differ
diff --git a/public/images/emoji/google/blush.png b/public/images/emoji/google/blush.png
index eea497bc22..67b84af327 100644
Binary files a/public/images/emoji/google/blush.png and b/public/images/emoji/google/blush.png differ
diff --git a/public/images/emoji/google/boar.png b/public/images/emoji/google/boar.png
index aeb75ed0f3..131508ad8e 100644
Binary files a/public/images/emoji/google/boar.png and b/public/images/emoji/google/boar.png differ
diff --git a/public/images/emoji/google/boat.png b/public/images/emoji/google/boat.png
index 42799a3b74..e26c5116c4 100644
Binary files a/public/images/emoji/google/boat.png and b/public/images/emoji/google/boat.png differ
diff --git a/public/images/emoji/google/bolivia.png b/public/images/emoji/google/bolivia.png
index 0f16302055..f25eb38f7a 100644
Binary files a/public/images/emoji/google/bolivia.png and b/public/images/emoji/google/bolivia.png differ
diff --git a/public/images/emoji/google/bomb.png b/public/images/emoji/google/bomb.png
index 9cd29f7a6c..7fb5f4e05d 100644
Binary files a/public/images/emoji/google/bomb.png and b/public/images/emoji/google/bomb.png differ
diff --git a/public/images/emoji/google/book.png b/public/images/emoji/google/book.png
index 2f4edfa032..fa30a7da66 100644
Binary files a/public/images/emoji/google/book.png and b/public/images/emoji/google/book.png differ
diff --git a/public/images/emoji/google/bookmark.png b/public/images/emoji/google/bookmark.png
index e74cd34614..494dc306a8 100644
Binary files a/public/images/emoji/google/bookmark.png and b/public/images/emoji/google/bookmark.png differ
diff --git a/public/images/emoji/google/bookmark_tabs.png b/public/images/emoji/google/bookmark_tabs.png
index a582c19945..058dad0518 100644
Binary files a/public/images/emoji/google/bookmark_tabs.png and b/public/images/emoji/google/bookmark_tabs.png differ
diff --git a/public/images/emoji/google/books.png b/public/images/emoji/google/books.png
index 9e065d7caa..d703234b81 100644
Binary files a/public/images/emoji/google/books.png and b/public/images/emoji/google/books.png differ
diff --git a/public/images/emoji/google/boom.png b/public/images/emoji/google/boom.png
index 3f9acdb1cc..43bddade27 100644
Binary files a/public/images/emoji/google/boom.png and b/public/images/emoji/google/boom.png differ
diff --git a/public/images/emoji/google/boot.png b/public/images/emoji/google/boot.png
index 6a96d4f3b7..f37a13893d 100644
Binary files a/public/images/emoji/google/boot.png and b/public/images/emoji/google/boot.png differ
diff --git a/public/images/emoji/google/bosnia_herzegovina.png b/public/images/emoji/google/bosnia_herzegovina.png
index 34109f18c9..4245196945 100644
Binary files a/public/images/emoji/google/bosnia_herzegovina.png and b/public/images/emoji/google/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/google/botswana.png b/public/images/emoji/google/botswana.png
index ebb46a9fd0..46d7ba7540 100644
Binary files a/public/images/emoji/google/botswana.png and b/public/images/emoji/google/botswana.png differ
diff --git a/public/images/emoji/google/bottle_with_popping_cork.png b/public/images/emoji/google/bottle_with_popping_cork.png
index ea9d7ec6bc..998f04124e 100644
Binary files a/public/images/emoji/google/bottle_with_popping_cork.png and b/public/images/emoji/google/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/google/bouquet.png b/public/images/emoji/google/bouquet.png
index 94582587d6..2bc758860f 100644
Binary files a/public/images/emoji/google/bouquet.png and b/public/images/emoji/google/bouquet.png differ
diff --git a/public/images/emoji/google/bouvet_island.png b/public/images/emoji/google/bouvet_island.png
index 5330d9794c..d348a446ad 100644
Binary files a/public/images/emoji/google/bouvet_island.png and b/public/images/emoji/google/bouvet_island.png differ
diff --git a/public/images/emoji/google/bow.png b/public/images/emoji/google/bow.png
index 3a5c6371d1..9d660d3d6c 100644
Binary files a/public/images/emoji/google/bow.png and b/public/images/emoji/google/bow.png differ
diff --git a/public/images/emoji/google/bow/2.png b/public/images/emoji/google/bow/2.png
index b8f3b1fb52..565acc695a 100644
Binary files a/public/images/emoji/google/bow/2.png and b/public/images/emoji/google/bow/2.png differ
diff --git a/public/images/emoji/google/bow/3.png b/public/images/emoji/google/bow/3.png
index e41b4963a8..06457156bc 100644
Binary files a/public/images/emoji/google/bow/3.png and b/public/images/emoji/google/bow/3.png differ
diff --git a/public/images/emoji/google/bow/4.png b/public/images/emoji/google/bow/4.png
index 9523613280..59f0a8d2be 100644
Binary files a/public/images/emoji/google/bow/4.png and b/public/images/emoji/google/bow/4.png differ
diff --git a/public/images/emoji/google/bow/5.png b/public/images/emoji/google/bow/5.png
index e4d4e3c894..8733060547 100644
Binary files a/public/images/emoji/google/bow/5.png and b/public/images/emoji/google/bow/5.png differ
diff --git a/public/images/emoji/google/bow/6.png b/public/images/emoji/google/bow/6.png
index 94bce13825..b78d09b261 100644
Binary files a/public/images/emoji/google/bow/6.png and b/public/images/emoji/google/bow/6.png differ
diff --git a/public/images/emoji/google/bow_and_arrow.png b/public/images/emoji/google/bow_and_arrow.png
index 6539d3b37e..130e029ea5 100644
Binary files a/public/images/emoji/google/bow_and_arrow.png and b/public/images/emoji/google/bow_and_arrow.png differ
diff --git a/public/images/emoji/google/bowing_man.png b/public/images/emoji/google/bowing_man.png
index 3a5c6371d1..9d660d3d6c 100644
Binary files a/public/images/emoji/google/bowing_man.png and b/public/images/emoji/google/bowing_man.png differ
diff --git a/public/images/emoji/google/bowing_man/2.png b/public/images/emoji/google/bowing_man/2.png
index b8f3b1fb52..565acc695a 100644
Binary files a/public/images/emoji/google/bowing_man/2.png and b/public/images/emoji/google/bowing_man/2.png differ
diff --git a/public/images/emoji/google/bowing_man/3.png b/public/images/emoji/google/bowing_man/3.png
index e41b4963a8..06457156bc 100644
Binary files a/public/images/emoji/google/bowing_man/3.png and b/public/images/emoji/google/bowing_man/3.png differ
diff --git a/public/images/emoji/google/bowing_man/4.png b/public/images/emoji/google/bowing_man/4.png
index 9523613280..59f0a8d2be 100644
Binary files a/public/images/emoji/google/bowing_man/4.png and b/public/images/emoji/google/bowing_man/4.png differ
diff --git a/public/images/emoji/google/bowing_man/5.png b/public/images/emoji/google/bowing_man/5.png
index e4d4e3c894..8733060547 100644
Binary files a/public/images/emoji/google/bowing_man/5.png and b/public/images/emoji/google/bowing_man/5.png differ
diff --git a/public/images/emoji/google/bowing_man/6.png b/public/images/emoji/google/bowing_man/6.png
index 94bce13825..b78d09b261 100644
Binary files a/public/images/emoji/google/bowing_man/6.png and b/public/images/emoji/google/bowing_man/6.png differ
diff --git a/public/images/emoji/google/bowing_woman.png b/public/images/emoji/google/bowing_woman.png
index 44e482e39f..b8cd8240c8 100644
Binary files a/public/images/emoji/google/bowing_woman.png and b/public/images/emoji/google/bowing_woman.png differ
diff --git a/public/images/emoji/google/bowing_woman/2.png b/public/images/emoji/google/bowing_woman/2.png
index 5b4930a1df..31d767ddd4 100644
Binary files a/public/images/emoji/google/bowing_woman/2.png and b/public/images/emoji/google/bowing_woman/2.png differ
diff --git a/public/images/emoji/google/bowing_woman/3.png b/public/images/emoji/google/bowing_woman/3.png
index 24063f7eac..f2a3cbe805 100644
Binary files a/public/images/emoji/google/bowing_woman/3.png and b/public/images/emoji/google/bowing_woman/3.png differ
diff --git a/public/images/emoji/google/bowing_woman/4.png b/public/images/emoji/google/bowing_woman/4.png
index 1352161b08..6ff58d8a93 100644
Binary files a/public/images/emoji/google/bowing_woman/4.png and b/public/images/emoji/google/bowing_woman/4.png differ
diff --git a/public/images/emoji/google/bowing_woman/5.png b/public/images/emoji/google/bowing_woman/5.png
index 989caced3b..e7a0eb3138 100644
Binary files a/public/images/emoji/google/bowing_woman/5.png and b/public/images/emoji/google/bowing_woman/5.png differ
diff --git a/public/images/emoji/google/bowing_woman/6.png b/public/images/emoji/google/bowing_woman/6.png
index 3631f79ed4..32ae32c519 100644
Binary files a/public/images/emoji/google/bowing_woman/6.png and b/public/images/emoji/google/bowing_woman/6.png differ
diff --git a/public/images/emoji/google/bowl_with_spoon.png b/public/images/emoji/google/bowl_with_spoon.png
index 95d115c676..1766741e16 100644
Binary files a/public/images/emoji/google/bowl_with_spoon.png and b/public/images/emoji/google/bowl_with_spoon.png differ
diff --git a/public/images/emoji/google/bowling.png b/public/images/emoji/google/bowling.png
index 3b75167742..0f93021148 100644
Binary files a/public/images/emoji/google/bowling.png and b/public/images/emoji/google/bowling.png differ
diff --git a/public/images/emoji/google/boxing_glove.png b/public/images/emoji/google/boxing_glove.png
index 96fba7e038..1dd45489f7 100644
Binary files a/public/images/emoji/google/boxing_glove.png and b/public/images/emoji/google/boxing_glove.png differ
diff --git a/public/images/emoji/google/boy.png b/public/images/emoji/google/boy.png
index 7764083787..8450f1acf2 100644
Binary files a/public/images/emoji/google/boy.png and b/public/images/emoji/google/boy.png differ
diff --git a/public/images/emoji/google/boy/2.png b/public/images/emoji/google/boy/2.png
index a2bc54b520..2cd5abdb53 100644
Binary files a/public/images/emoji/google/boy/2.png and b/public/images/emoji/google/boy/2.png differ
diff --git a/public/images/emoji/google/boy/3.png b/public/images/emoji/google/boy/3.png
index 1d1a18acac..e0ce4c35c3 100644
Binary files a/public/images/emoji/google/boy/3.png and b/public/images/emoji/google/boy/3.png differ
diff --git a/public/images/emoji/google/boy/4.png b/public/images/emoji/google/boy/4.png
index 732aa7ae8f..a3667b4936 100644
Binary files a/public/images/emoji/google/boy/4.png and b/public/images/emoji/google/boy/4.png differ
diff --git a/public/images/emoji/google/boy/5.png b/public/images/emoji/google/boy/5.png
index c90aaa9978..7207674a19 100644
Binary files a/public/images/emoji/google/boy/5.png and b/public/images/emoji/google/boy/5.png differ
diff --git a/public/images/emoji/google/boy/6.png b/public/images/emoji/google/boy/6.png
index dc62add0fa..839cb2fa51 100644
Binary files a/public/images/emoji/google/boy/6.png and b/public/images/emoji/google/boy/6.png differ
diff --git a/public/images/emoji/google/brain.png b/public/images/emoji/google/brain.png
index a25c362973..ca90998fde 100644
Binary files a/public/images/emoji/google/brain.png and b/public/images/emoji/google/brain.png differ
diff --git a/public/images/emoji/google/brazil.png b/public/images/emoji/google/brazil.png
index 0b4cf93fd6..209e783894 100644
Binary files a/public/images/emoji/google/brazil.png and b/public/images/emoji/google/brazil.png differ
diff --git a/public/images/emoji/google/bread.png b/public/images/emoji/google/bread.png
index 35c1d10247..521d17d1bc 100644
Binary files a/public/images/emoji/google/bread.png and b/public/images/emoji/google/bread.png differ
diff --git a/public/images/emoji/google/breast_feeding.png b/public/images/emoji/google/breast_feeding.png
index 06bf48a8dd..78abcbe47e 100644
Binary files a/public/images/emoji/google/breast_feeding.png and b/public/images/emoji/google/breast_feeding.png differ
diff --git a/public/images/emoji/google/breast_feeding/2.png b/public/images/emoji/google/breast_feeding/2.png
index 0a1c42a6de..4829861577 100644
Binary files a/public/images/emoji/google/breast_feeding/2.png and b/public/images/emoji/google/breast_feeding/2.png differ
diff --git a/public/images/emoji/google/breast_feeding/3.png b/public/images/emoji/google/breast_feeding/3.png
index e57faa9745..43f0b1f078 100644
Binary files a/public/images/emoji/google/breast_feeding/3.png and b/public/images/emoji/google/breast_feeding/3.png differ
diff --git a/public/images/emoji/google/breast_feeding/4.png b/public/images/emoji/google/breast_feeding/4.png
index 0732edb9fa..267ea7a66d 100644
Binary files a/public/images/emoji/google/breast_feeding/4.png and b/public/images/emoji/google/breast_feeding/4.png differ
diff --git a/public/images/emoji/google/breast_feeding/5.png b/public/images/emoji/google/breast_feeding/5.png
index 9f013ec199..e88ee7c22e 100644
Binary files a/public/images/emoji/google/breast_feeding/5.png and b/public/images/emoji/google/breast_feeding/5.png differ
diff --git a/public/images/emoji/google/breast_feeding/6.png b/public/images/emoji/google/breast_feeding/6.png
index b18f79b1af..26daaf68f5 100644
Binary files a/public/images/emoji/google/breast_feeding/6.png and b/public/images/emoji/google/breast_feeding/6.png differ
diff --git a/public/images/emoji/google/bride_with_veil.png b/public/images/emoji/google/bride_with_veil.png
index 4734c8155f..f831824732 100644
Binary files a/public/images/emoji/google/bride_with_veil.png and b/public/images/emoji/google/bride_with_veil.png differ
diff --git a/public/images/emoji/google/bride_with_veil/2.png b/public/images/emoji/google/bride_with_veil/2.png
index 8ec4d88350..a60e401976 100644
Binary files a/public/images/emoji/google/bride_with_veil/2.png and b/public/images/emoji/google/bride_with_veil/2.png differ
diff --git a/public/images/emoji/google/bride_with_veil/3.png b/public/images/emoji/google/bride_with_veil/3.png
index fa3fe8746b..0cf6db5338 100644
Binary files a/public/images/emoji/google/bride_with_veil/3.png and b/public/images/emoji/google/bride_with_veil/3.png differ
diff --git a/public/images/emoji/google/bride_with_veil/4.png b/public/images/emoji/google/bride_with_veil/4.png
index fce877ded3..1f686e545b 100644
Binary files a/public/images/emoji/google/bride_with_veil/4.png and b/public/images/emoji/google/bride_with_veil/4.png differ
diff --git a/public/images/emoji/google/bride_with_veil/5.png b/public/images/emoji/google/bride_with_veil/5.png
index 00368c7c7b..ec4ea0748a 100644
Binary files a/public/images/emoji/google/bride_with_veil/5.png and b/public/images/emoji/google/bride_with_veil/5.png differ
diff --git a/public/images/emoji/google/bride_with_veil/6.png b/public/images/emoji/google/bride_with_veil/6.png
index 5a898b3cb2..2d57cca4ae 100644
Binary files a/public/images/emoji/google/bride_with_veil/6.png and b/public/images/emoji/google/bride_with_veil/6.png differ
diff --git a/public/images/emoji/google/bridge_at_night.png b/public/images/emoji/google/bridge_at_night.png
index d80d5367f1..cba4aa13a6 100644
Binary files a/public/images/emoji/google/bridge_at_night.png and b/public/images/emoji/google/bridge_at_night.png differ
diff --git a/public/images/emoji/google/briefcase.png b/public/images/emoji/google/briefcase.png
index 56d1fa4c3a..4823cdbd64 100644
Binary files a/public/images/emoji/google/briefcase.png and b/public/images/emoji/google/briefcase.png differ
diff --git a/public/images/emoji/google/british_indian_ocean_territory.png b/public/images/emoji/google/british_indian_ocean_territory.png
index 570ac96730..b450c90ccd 100644
Binary files a/public/images/emoji/google/british_indian_ocean_territory.png and b/public/images/emoji/google/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/google/british_virgin_islands.png b/public/images/emoji/google/british_virgin_islands.png
index dd3399c213..3a79c95c9f 100644
Binary files a/public/images/emoji/google/british_virgin_islands.png and b/public/images/emoji/google/british_virgin_islands.png differ
diff --git a/public/images/emoji/google/broccoli.png b/public/images/emoji/google/broccoli.png
index 067cfa08e4..842c33be49 100644
Binary files a/public/images/emoji/google/broccoli.png and b/public/images/emoji/google/broccoli.png differ
diff --git a/public/images/emoji/google/broken_heart.png b/public/images/emoji/google/broken_heart.png
index 115bf873f2..0c82944d8b 100644
Binary files a/public/images/emoji/google/broken_heart.png and b/public/images/emoji/google/broken_heart.png differ
diff --git a/public/images/emoji/google/brunei.png b/public/images/emoji/google/brunei.png
index f6257892f4..15bf9bb5b4 100644
Binary files a/public/images/emoji/google/brunei.png and b/public/images/emoji/google/brunei.png differ
diff --git a/public/images/emoji/google/bug.png b/public/images/emoji/google/bug.png
index f690ec234f..f5c2815622 100644
Binary files a/public/images/emoji/google/bug.png and b/public/images/emoji/google/bug.png differ
diff --git a/public/images/emoji/google/building_construction.png b/public/images/emoji/google/building_construction.png
index 625247fd7c..444e3cd1ab 100644
Binary files a/public/images/emoji/google/building_construction.png and b/public/images/emoji/google/building_construction.png differ
diff --git a/public/images/emoji/google/bulb.png b/public/images/emoji/google/bulb.png
index 92456879f7..002db3330c 100644
Binary files a/public/images/emoji/google/bulb.png and b/public/images/emoji/google/bulb.png differ
diff --git a/public/images/emoji/google/bulgaria.png b/public/images/emoji/google/bulgaria.png
index d8a43cd03b..69e671d403 100644
Binary files a/public/images/emoji/google/bulgaria.png and b/public/images/emoji/google/bulgaria.png differ
diff --git a/public/images/emoji/google/bullettrain_front.png b/public/images/emoji/google/bullettrain_front.png
index 3c117d8bac..ff0ac0cdfa 100644
Binary files a/public/images/emoji/google/bullettrain_front.png and b/public/images/emoji/google/bullettrain_front.png differ
diff --git a/public/images/emoji/google/bullettrain_side.png b/public/images/emoji/google/bullettrain_side.png
index dae0881c98..948d6598cb 100644
Binary files a/public/images/emoji/google/bullettrain_side.png and b/public/images/emoji/google/bullettrain_side.png differ
diff --git a/public/images/emoji/google/burkina_faso.png b/public/images/emoji/google/burkina_faso.png
index ebebb32fbd..eea5085cac 100644
Binary files a/public/images/emoji/google/burkina_faso.png and b/public/images/emoji/google/burkina_faso.png differ
diff --git a/public/images/emoji/google/burrito.png b/public/images/emoji/google/burrito.png
index 807f0aa533..cb5d485777 100644
Binary files a/public/images/emoji/google/burrito.png and b/public/images/emoji/google/burrito.png differ
diff --git a/public/images/emoji/google/burundi.png b/public/images/emoji/google/burundi.png
index 487c4ccd61..1289ce0672 100644
Binary files a/public/images/emoji/google/burundi.png and b/public/images/emoji/google/burundi.png differ
diff --git a/public/images/emoji/google/bus.png b/public/images/emoji/google/bus.png
index 210d7f2ae9..bcd70c5080 100644
Binary files a/public/images/emoji/google/bus.png and b/public/images/emoji/google/bus.png differ
diff --git a/public/images/emoji/google/business_suit_levitating.png b/public/images/emoji/google/business_suit_levitating.png
index 88918f97b3..b7eea2e014 100644
Binary files a/public/images/emoji/google/business_suit_levitating.png and b/public/images/emoji/google/business_suit_levitating.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/2.png b/public/images/emoji/google/business_suit_levitating/2.png
index ddeda2a43b..28bf50d0d2 100644
Binary files a/public/images/emoji/google/business_suit_levitating/2.png and b/public/images/emoji/google/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/3.png b/public/images/emoji/google/business_suit_levitating/3.png
index e62d08a901..2e9ca43ed9 100644
Binary files a/public/images/emoji/google/business_suit_levitating/3.png and b/public/images/emoji/google/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/4.png b/public/images/emoji/google/business_suit_levitating/4.png
index 27012dfbe9..1f9720f962 100644
Binary files a/public/images/emoji/google/business_suit_levitating/4.png and b/public/images/emoji/google/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/5.png b/public/images/emoji/google/business_suit_levitating/5.png
index c8863f5833..889a3dcd0b 100644
Binary files a/public/images/emoji/google/business_suit_levitating/5.png and b/public/images/emoji/google/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/6.png b/public/images/emoji/google/business_suit_levitating/6.png
index 62e5e00578..6b55d4fcd7 100644
Binary files a/public/images/emoji/google/business_suit_levitating/6.png and b/public/images/emoji/google/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/google/busstop.png b/public/images/emoji/google/busstop.png
index a5f1d98efd..a6bfe6945e 100644
Binary files a/public/images/emoji/google/busstop.png and b/public/images/emoji/google/busstop.png differ
diff --git a/public/images/emoji/google/bust_in_silhouette.png b/public/images/emoji/google/bust_in_silhouette.png
index 37e0afd46e..cab9010968 100644
Binary files a/public/images/emoji/google/bust_in_silhouette.png and b/public/images/emoji/google/bust_in_silhouette.png differ
diff --git a/public/images/emoji/google/busts_in_silhouette.png b/public/images/emoji/google/busts_in_silhouette.png
index d6dc081cdc..9457af969e 100644
Binary files a/public/images/emoji/google/busts_in_silhouette.png and b/public/images/emoji/google/busts_in_silhouette.png differ
diff --git a/public/images/emoji/google/butterfly.png b/public/images/emoji/google/butterfly.png
index 02337caf6d..6f98b123ed 100644
Binary files a/public/images/emoji/google/butterfly.png and b/public/images/emoji/google/butterfly.png differ
diff --git a/public/images/emoji/google/cactus.png b/public/images/emoji/google/cactus.png
index b0fcc9ae76..7d67af3c9e 100644
Binary files a/public/images/emoji/google/cactus.png and b/public/images/emoji/google/cactus.png differ
diff --git a/public/images/emoji/google/cake.png b/public/images/emoji/google/cake.png
index 9e7af8c5ec..d7a4947df9 100644
Binary files a/public/images/emoji/google/cake.png and b/public/images/emoji/google/cake.png differ
diff --git a/public/images/emoji/google/calendar.png b/public/images/emoji/google/calendar.png
index 748d582db3..c216fcd633 100644
Binary files a/public/images/emoji/google/calendar.png and b/public/images/emoji/google/calendar.png differ
diff --git a/public/images/emoji/google/calendar_spiral.png b/public/images/emoji/google/calendar_spiral.png
index 0997b42f0c..8c19dc8104 100644
Binary files a/public/images/emoji/google/calendar_spiral.png and b/public/images/emoji/google/calendar_spiral.png differ
diff --git a/public/images/emoji/google/call_me_hand.png b/public/images/emoji/google/call_me_hand.png
index 2e60f8c84c..1aabe9df1d 100644
Binary files a/public/images/emoji/google/call_me_hand.png and b/public/images/emoji/google/call_me_hand.png differ
diff --git a/public/images/emoji/google/call_me_hand/2.png b/public/images/emoji/google/call_me_hand/2.png
index 4fb8a6c066..4f7bcee52f 100644
Binary files a/public/images/emoji/google/call_me_hand/2.png and b/public/images/emoji/google/call_me_hand/2.png differ
diff --git a/public/images/emoji/google/call_me_hand/3.png b/public/images/emoji/google/call_me_hand/3.png
index 3144c7a46c..2060bf0d3a 100644
Binary files a/public/images/emoji/google/call_me_hand/3.png and b/public/images/emoji/google/call_me_hand/3.png differ
diff --git a/public/images/emoji/google/call_me_hand/4.png b/public/images/emoji/google/call_me_hand/4.png
index 440776f885..73690838b1 100644
Binary files a/public/images/emoji/google/call_me_hand/4.png and b/public/images/emoji/google/call_me_hand/4.png differ
diff --git a/public/images/emoji/google/call_me_hand/5.png b/public/images/emoji/google/call_me_hand/5.png
index 6eb543f4cc..dcc7588aa4 100644
Binary files a/public/images/emoji/google/call_me_hand/5.png and b/public/images/emoji/google/call_me_hand/5.png differ
diff --git a/public/images/emoji/google/call_me_hand/6.png b/public/images/emoji/google/call_me_hand/6.png
index 99f568f9b1..8b1ececb37 100644
Binary files a/public/images/emoji/google/call_me_hand/6.png and b/public/images/emoji/google/call_me_hand/6.png differ
diff --git a/public/images/emoji/google/calling.png b/public/images/emoji/google/calling.png
index 4d3bfd087f..d64cb99599 100644
Binary files a/public/images/emoji/google/calling.png and b/public/images/emoji/google/calling.png differ
diff --git a/public/images/emoji/google/cambodia.png b/public/images/emoji/google/cambodia.png
index cfbedf91ac..fa94a8925b 100644
Binary files a/public/images/emoji/google/cambodia.png and b/public/images/emoji/google/cambodia.png differ
diff --git a/public/images/emoji/google/camel.png b/public/images/emoji/google/camel.png
index 5da0d4620a..55ed7d6703 100644
Binary files a/public/images/emoji/google/camel.png and b/public/images/emoji/google/camel.png differ
diff --git a/public/images/emoji/google/camera.png b/public/images/emoji/google/camera.png
index 56a6109fd4..d656e290fa 100644
Binary files a/public/images/emoji/google/camera.png and b/public/images/emoji/google/camera.png differ
diff --git a/public/images/emoji/google/camera_flash.png b/public/images/emoji/google/camera_flash.png
index 327fbd507e..2d9bccceeb 100644
Binary files a/public/images/emoji/google/camera_flash.png and b/public/images/emoji/google/camera_flash.png differ
diff --git a/public/images/emoji/google/camera_with_flash.png b/public/images/emoji/google/camera_with_flash.png
index 327fbd507e..2d9bccceeb 100644
Binary files a/public/images/emoji/google/camera_with_flash.png and b/public/images/emoji/google/camera_with_flash.png differ
diff --git a/public/images/emoji/google/cameroon.png b/public/images/emoji/google/cameroon.png
index 0c49ba9df8..32cfd8f65c 100644
Binary files a/public/images/emoji/google/cameroon.png and b/public/images/emoji/google/cameroon.png differ
diff --git a/public/images/emoji/google/camping.png b/public/images/emoji/google/camping.png
index eb062ee1e4..c8f98531ba 100644
Binary files a/public/images/emoji/google/camping.png and b/public/images/emoji/google/camping.png differ
diff --git a/public/images/emoji/google/canada.png b/public/images/emoji/google/canada.png
index 97744af556..f4d80e2603 100644
Binary files a/public/images/emoji/google/canada.png and b/public/images/emoji/google/canada.png differ
diff --git a/public/images/emoji/google/canary_islands.png b/public/images/emoji/google/canary_islands.png
index 4a33a5b653..aec8595da1 100644
Binary files a/public/images/emoji/google/canary_islands.png and b/public/images/emoji/google/canary_islands.png differ
diff --git a/public/images/emoji/google/cancer.png b/public/images/emoji/google/cancer.png
index 275373bd95..84f5880338 100644
Binary files a/public/images/emoji/google/cancer.png and b/public/images/emoji/google/cancer.png differ
diff --git a/public/images/emoji/google/candle.png b/public/images/emoji/google/candle.png
index e131340388..bbea78b101 100644
Binary files a/public/images/emoji/google/candle.png and b/public/images/emoji/google/candle.png differ
diff --git a/public/images/emoji/google/candy.png b/public/images/emoji/google/candy.png
index 40a0b252b5..758fe2a6dc 100644
Binary files a/public/images/emoji/google/candy.png and b/public/images/emoji/google/candy.png differ
diff --git a/public/images/emoji/google/canned_food.png b/public/images/emoji/google/canned_food.png
index 2fdb07a070..dfed4b50be 100644
Binary files a/public/images/emoji/google/canned_food.png and b/public/images/emoji/google/canned_food.png differ
diff --git a/public/images/emoji/google/canoe.png b/public/images/emoji/google/canoe.png
index 7464ae1e29..2b64f57832 100644
Binary files a/public/images/emoji/google/canoe.png and b/public/images/emoji/google/canoe.png differ
diff --git a/public/images/emoji/google/cape_verde.png b/public/images/emoji/google/cape_verde.png
index 42fc1f87f6..20058f6543 100644
Binary files a/public/images/emoji/google/cape_verde.png and b/public/images/emoji/google/cape_verde.png differ
diff --git a/public/images/emoji/google/capital_abcd.png b/public/images/emoji/google/capital_abcd.png
index 3c2d4dd68c..7fc35935d3 100644
Binary files a/public/images/emoji/google/capital_abcd.png and b/public/images/emoji/google/capital_abcd.png differ
diff --git a/public/images/emoji/google/capricorn.png b/public/images/emoji/google/capricorn.png
index f4dd4a1880..6d9df53e65 100644
Binary files a/public/images/emoji/google/capricorn.png and b/public/images/emoji/google/capricorn.png differ
diff --git a/public/images/emoji/google/car.png b/public/images/emoji/google/car.png
index 56f5cddc27..7df8de6eb8 100644
Binary files a/public/images/emoji/google/car.png and b/public/images/emoji/google/car.png differ
diff --git a/public/images/emoji/google/card_box.png b/public/images/emoji/google/card_box.png
index 68c5cb5935..40e8eea818 100644
Binary files a/public/images/emoji/google/card_box.png and b/public/images/emoji/google/card_box.png differ
diff --git a/public/images/emoji/google/card_file_box.png b/public/images/emoji/google/card_file_box.png
index 68c5cb5935..40e8eea818 100644
Binary files a/public/images/emoji/google/card_file_box.png and b/public/images/emoji/google/card_file_box.png differ
diff --git a/public/images/emoji/google/card_index.png b/public/images/emoji/google/card_index.png
index 0403d3f48b..ea1769deea 100644
Binary files a/public/images/emoji/google/card_index.png and b/public/images/emoji/google/card_index.png differ
diff --git a/public/images/emoji/google/card_index_dividers.png b/public/images/emoji/google/card_index_dividers.png
index dd8929d64a..b07bdc1135 100644
Binary files a/public/images/emoji/google/card_index_dividers.png and b/public/images/emoji/google/card_index_dividers.png differ
diff --git a/public/images/emoji/google/caribbean_netherlands.png b/public/images/emoji/google/caribbean_netherlands.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/caribbean_netherlands.png and b/public/images/emoji/google/caribbean_netherlands.png differ
diff --git a/public/images/emoji/google/carousel_horse.png b/public/images/emoji/google/carousel_horse.png
index cbe2d1c7cb..0b88504ac8 100644
Binary files a/public/images/emoji/google/carousel_horse.png and b/public/images/emoji/google/carousel_horse.png differ
diff --git a/public/images/emoji/google/carrot.png b/public/images/emoji/google/carrot.png
index 08bde96748..de775a0ac4 100644
Binary files a/public/images/emoji/google/carrot.png and b/public/images/emoji/google/carrot.png differ
diff --git a/public/images/emoji/google/cat.png b/public/images/emoji/google/cat.png
index 78249af6b1..5c5cb3cf38 100644
Binary files a/public/images/emoji/google/cat.png and b/public/images/emoji/google/cat.png differ
diff --git a/public/images/emoji/google/cat2.png b/public/images/emoji/google/cat2.png
index 90f7ccac42..ebde91befe 100644
Binary files a/public/images/emoji/google/cat2.png and b/public/images/emoji/google/cat2.png differ
diff --git a/public/images/emoji/google/cayman_islands.png b/public/images/emoji/google/cayman_islands.png
index d08b13b5ff..d0abde39fc 100644
Binary files a/public/images/emoji/google/cayman_islands.png and b/public/images/emoji/google/cayman_islands.png differ
diff --git a/public/images/emoji/google/cd.png b/public/images/emoji/google/cd.png
index a8eb514370..487a77fe2e 100644
Binary files a/public/images/emoji/google/cd.png and b/public/images/emoji/google/cd.png differ
diff --git a/public/images/emoji/google/central_african_republic.png b/public/images/emoji/google/central_african_republic.png
index c848f392e0..4537067070 100644
Binary files a/public/images/emoji/google/central_african_republic.png and b/public/images/emoji/google/central_african_republic.png differ
diff --git a/public/images/emoji/google/ceuta_and_melilla.png b/public/images/emoji/google/ceuta_and_melilla.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/ceuta_and_melilla.png and b/public/images/emoji/google/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/google/chad.png b/public/images/emoji/google/chad.png
index 969e249fa0..522d7b59a2 100644
Binary files a/public/images/emoji/google/chad.png and b/public/images/emoji/google/chad.png differ
diff --git a/public/images/emoji/google/chains.png b/public/images/emoji/google/chains.png
index 21b9cba7ad..b80ecc7991 100644
Binary files a/public/images/emoji/google/chains.png and b/public/images/emoji/google/chains.png differ
diff --git a/public/images/emoji/google/champagne.png b/public/images/emoji/google/champagne.png
index ea9d7ec6bc..998f04124e 100644
Binary files a/public/images/emoji/google/champagne.png and b/public/images/emoji/google/champagne.png differ
diff --git a/public/images/emoji/google/chart.png b/public/images/emoji/google/chart.png
index 63e45562f4..11cbf557d3 100644
Binary files a/public/images/emoji/google/chart.png and b/public/images/emoji/google/chart.png differ
diff --git a/public/images/emoji/google/chart_with_downwards_trend.png b/public/images/emoji/google/chart_with_downwards_trend.png
index b7b1f63b8a..b92c1479b8 100644
Binary files a/public/images/emoji/google/chart_with_downwards_trend.png and b/public/images/emoji/google/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/google/chart_with_upwards_trend.png b/public/images/emoji/google/chart_with_upwards_trend.png
index 61fe759b33..b1427d92b3 100644
Binary files a/public/images/emoji/google/chart_with_upwards_trend.png and b/public/images/emoji/google/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/google/checkered_flag.png b/public/images/emoji/google/checkered_flag.png
index f3bb7f449b..15a07fcdb2 100644
Binary files a/public/images/emoji/google/checkered_flag.png and b/public/images/emoji/google/checkered_flag.png differ
diff --git a/public/images/emoji/google/cheese.png b/public/images/emoji/google/cheese.png
index 383912db45..4ec9446dd9 100644
Binary files a/public/images/emoji/google/cheese.png and b/public/images/emoji/google/cheese.png differ
diff --git a/public/images/emoji/google/cheese_wedge.png b/public/images/emoji/google/cheese_wedge.png
index 383912db45..4ec9446dd9 100644
Binary files a/public/images/emoji/google/cheese_wedge.png and b/public/images/emoji/google/cheese_wedge.png differ
diff --git a/public/images/emoji/google/cherries.png b/public/images/emoji/google/cherries.png
index f73b77ea8e..3e8eeeea52 100644
Binary files a/public/images/emoji/google/cherries.png and b/public/images/emoji/google/cherries.png differ
diff --git a/public/images/emoji/google/cherry_blossom.png b/public/images/emoji/google/cherry_blossom.png
index f390147a2f..14464430d3 100644
Binary files a/public/images/emoji/google/cherry_blossom.png and b/public/images/emoji/google/cherry_blossom.png differ
diff --git a/public/images/emoji/google/chestnut.png b/public/images/emoji/google/chestnut.png
index f6357e3220..18a18705b7 100644
Binary files a/public/images/emoji/google/chestnut.png and b/public/images/emoji/google/chestnut.png differ
diff --git a/public/images/emoji/google/chicken.png b/public/images/emoji/google/chicken.png
index 7afff72f1a..4d38939cd6 100644
Binary files a/public/images/emoji/google/chicken.png and b/public/images/emoji/google/chicken.png differ
diff --git a/public/images/emoji/google/child.png b/public/images/emoji/google/child.png
index 50c98992c4..c3bfaaab09 100644
Binary files a/public/images/emoji/google/child.png and b/public/images/emoji/google/child.png differ
diff --git a/public/images/emoji/google/child/2.png b/public/images/emoji/google/child/2.png
index fcb4518f4c..3c06b8edfd 100644
Binary files a/public/images/emoji/google/child/2.png and b/public/images/emoji/google/child/2.png differ
diff --git a/public/images/emoji/google/child/3.png b/public/images/emoji/google/child/3.png
index 14d11ce1f0..8254c852c8 100644
Binary files a/public/images/emoji/google/child/3.png and b/public/images/emoji/google/child/3.png differ
diff --git a/public/images/emoji/google/child/4.png b/public/images/emoji/google/child/4.png
index 8e1f733e47..81fea67872 100644
Binary files a/public/images/emoji/google/child/4.png and b/public/images/emoji/google/child/4.png differ
diff --git a/public/images/emoji/google/child/5.png b/public/images/emoji/google/child/5.png
index bd7cf557ce..808be3a385 100644
Binary files a/public/images/emoji/google/child/5.png and b/public/images/emoji/google/child/5.png differ
diff --git a/public/images/emoji/google/child/6.png b/public/images/emoji/google/child/6.png
index 9a20bf5feb..4bb61f349f 100644
Binary files a/public/images/emoji/google/child/6.png and b/public/images/emoji/google/child/6.png differ
diff --git a/public/images/emoji/google/children_crossing.png b/public/images/emoji/google/children_crossing.png
index 070212c0b3..773c93de5a 100644
Binary files a/public/images/emoji/google/children_crossing.png and b/public/images/emoji/google/children_crossing.png differ
diff --git a/public/images/emoji/google/chile.png b/public/images/emoji/google/chile.png
index 26d789675a..e35e328a2f 100644
Binary files a/public/images/emoji/google/chile.png and b/public/images/emoji/google/chile.png differ
diff --git a/public/images/emoji/google/chipmunk.png b/public/images/emoji/google/chipmunk.png
index b1a971d38c..cacd8b9606 100644
Binary files a/public/images/emoji/google/chipmunk.png and b/public/images/emoji/google/chipmunk.png differ
diff --git a/public/images/emoji/google/chocolate_bar.png b/public/images/emoji/google/chocolate_bar.png
index 71998f818e..5e3313d8db 100644
Binary files a/public/images/emoji/google/chocolate_bar.png and b/public/images/emoji/google/chocolate_bar.png differ
diff --git a/public/images/emoji/google/chopsticks.png b/public/images/emoji/google/chopsticks.png
index 1f37514d5a..75b7fb3138 100644
Binary files a/public/images/emoji/google/chopsticks.png and b/public/images/emoji/google/chopsticks.png differ
diff --git a/public/images/emoji/google/christmas_island.png b/public/images/emoji/google/christmas_island.png
index 48f139fdce..9b48743ac6 100644
Binary files a/public/images/emoji/google/christmas_island.png and b/public/images/emoji/google/christmas_island.png differ
diff --git a/public/images/emoji/google/christmas_tree.png b/public/images/emoji/google/christmas_tree.png
index fdaa2f2f2a..4f34500546 100644
Binary files a/public/images/emoji/google/christmas_tree.png and b/public/images/emoji/google/christmas_tree.png differ
diff --git a/public/images/emoji/google/church.png b/public/images/emoji/google/church.png
index 0efd95ee04..d1d186d7e9 100644
Binary files a/public/images/emoji/google/church.png and b/public/images/emoji/google/church.png differ
diff --git a/public/images/emoji/google/cinema.png b/public/images/emoji/google/cinema.png
index 615ec6150b..5f0b648f95 100644
Binary files a/public/images/emoji/google/cinema.png and b/public/images/emoji/google/cinema.png differ
diff --git a/public/images/emoji/google/circus_tent.png b/public/images/emoji/google/circus_tent.png
index 4e49fd8ab7..71f546a4ca 100644
Binary files a/public/images/emoji/google/circus_tent.png and b/public/images/emoji/google/circus_tent.png differ
diff --git a/public/images/emoji/google/city_dusk.png b/public/images/emoji/google/city_dusk.png
index a04bf36551..846f9e2ff4 100644
Binary files a/public/images/emoji/google/city_dusk.png and b/public/images/emoji/google/city_dusk.png differ
diff --git a/public/images/emoji/google/city_sunrise.png b/public/images/emoji/google/city_sunrise.png
index 760a68ca82..94d6d5d5dc 100644
Binary files a/public/images/emoji/google/city_sunrise.png and b/public/images/emoji/google/city_sunrise.png differ
diff --git a/public/images/emoji/google/city_sunset.png b/public/images/emoji/google/city_sunset.png
index a04bf36551..846f9e2ff4 100644
Binary files a/public/images/emoji/google/city_sunset.png and b/public/images/emoji/google/city_sunset.png differ
diff --git a/public/images/emoji/google/cityscape.png b/public/images/emoji/google/cityscape.png
index 431e0bbffd..eeb70dfd68 100644
Binary files a/public/images/emoji/google/cityscape.png and b/public/images/emoji/google/cityscape.png differ
diff --git a/public/images/emoji/google/cl.png b/public/images/emoji/google/cl.png
index 1368a85cd1..5a9debdf28 100644
Binary files a/public/images/emoji/google/cl.png and b/public/images/emoji/google/cl.png differ
diff --git a/public/images/emoji/google/clamp.png b/public/images/emoji/google/clamp.png
index 245635724e..b70ff09592 100644
Binary files a/public/images/emoji/google/clamp.png and b/public/images/emoji/google/clamp.png differ
diff --git a/public/images/emoji/google/clap.png b/public/images/emoji/google/clap.png
index 8270b96203..4834ca7b4f 100644
Binary files a/public/images/emoji/google/clap.png and b/public/images/emoji/google/clap.png differ
diff --git a/public/images/emoji/google/clap/2.png b/public/images/emoji/google/clap/2.png
index 7497ec0698..5d20e2117d 100644
Binary files a/public/images/emoji/google/clap/2.png and b/public/images/emoji/google/clap/2.png differ
diff --git a/public/images/emoji/google/clap/3.png b/public/images/emoji/google/clap/3.png
index 77229e9f2b..7ebd8f7ffa 100644
Binary files a/public/images/emoji/google/clap/3.png and b/public/images/emoji/google/clap/3.png differ
diff --git a/public/images/emoji/google/clap/4.png b/public/images/emoji/google/clap/4.png
index 34365ff548..1dc1e20c5b 100644
Binary files a/public/images/emoji/google/clap/4.png and b/public/images/emoji/google/clap/4.png differ
diff --git a/public/images/emoji/google/clap/5.png b/public/images/emoji/google/clap/5.png
index 699baff1d6..b91203671a 100644
Binary files a/public/images/emoji/google/clap/5.png and b/public/images/emoji/google/clap/5.png differ
diff --git a/public/images/emoji/google/clap/6.png b/public/images/emoji/google/clap/6.png
index 8015a4ffa6..bfba44033e 100644
Binary files a/public/images/emoji/google/clap/6.png and b/public/images/emoji/google/clap/6.png differ
diff --git a/public/images/emoji/google/clapper.png b/public/images/emoji/google/clapper.png
index 8827220310..8cef95f95f 100644
Binary files a/public/images/emoji/google/clapper.png and b/public/images/emoji/google/clapper.png differ
diff --git a/public/images/emoji/google/classical_building.png b/public/images/emoji/google/classical_building.png
index b0a41c6c34..430c44a81c 100644
Binary files a/public/images/emoji/google/classical_building.png and b/public/images/emoji/google/classical_building.png differ
diff --git a/public/images/emoji/google/clinking_glasses.png b/public/images/emoji/google/clinking_glasses.png
index e5a357035d..3fabb8679f 100644
Binary files a/public/images/emoji/google/clinking_glasses.png and b/public/images/emoji/google/clinking_glasses.png differ
diff --git a/public/images/emoji/google/clipboard.png b/public/images/emoji/google/clipboard.png
index 4b831ffb8b..b146b4383b 100644
Binary files a/public/images/emoji/google/clipboard.png and b/public/images/emoji/google/clipboard.png differ
diff --git a/public/images/emoji/google/clipperton_island.png b/public/images/emoji/google/clipperton_island.png
index bc63af1def..b836e555de 100644
Binary files a/public/images/emoji/google/clipperton_island.png and b/public/images/emoji/google/clipperton_island.png differ
diff --git a/public/images/emoji/google/clock.png b/public/images/emoji/google/clock.png
index b326630c04..ae0fcb7c98 100644
Binary files a/public/images/emoji/google/clock.png and b/public/images/emoji/google/clock.png differ
diff --git a/public/images/emoji/google/clock1.png b/public/images/emoji/google/clock1.png
index ee992f671f..b969d97237 100644
Binary files a/public/images/emoji/google/clock1.png and b/public/images/emoji/google/clock1.png differ
diff --git a/public/images/emoji/google/clock10.png b/public/images/emoji/google/clock10.png
index 41ec385cf8..0e3e8cc098 100644
Binary files a/public/images/emoji/google/clock10.png and b/public/images/emoji/google/clock10.png differ
diff --git a/public/images/emoji/google/clock1030.png b/public/images/emoji/google/clock1030.png
index 19ca949e66..e4229a52d1 100644
Binary files a/public/images/emoji/google/clock1030.png and b/public/images/emoji/google/clock1030.png differ
diff --git a/public/images/emoji/google/clock11.png b/public/images/emoji/google/clock11.png
index 43add251aa..1056075d74 100644
Binary files a/public/images/emoji/google/clock11.png and b/public/images/emoji/google/clock11.png differ
diff --git a/public/images/emoji/google/clock1130.png b/public/images/emoji/google/clock1130.png
index c28f78163c..46b4f4b8df 100644
Binary files a/public/images/emoji/google/clock1130.png and b/public/images/emoji/google/clock1130.png differ
diff --git a/public/images/emoji/google/clock12.png b/public/images/emoji/google/clock12.png
index 63f46ae2a4..5528c719bf 100644
Binary files a/public/images/emoji/google/clock12.png and b/public/images/emoji/google/clock12.png differ
diff --git a/public/images/emoji/google/clock1230.png b/public/images/emoji/google/clock1230.png
index 2377296360..38e78462a5 100644
Binary files a/public/images/emoji/google/clock1230.png and b/public/images/emoji/google/clock1230.png differ
diff --git a/public/images/emoji/google/clock130.png b/public/images/emoji/google/clock130.png
index 677203adc4..9312f24f4e 100644
Binary files a/public/images/emoji/google/clock130.png and b/public/images/emoji/google/clock130.png differ
diff --git a/public/images/emoji/google/clock2.png b/public/images/emoji/google/clock2.png
index eecb3ab9b5..dd6f8e81bf 100644
Binary files a/public/images/emoji/google/clock2.png and b/public/images/emoji/google/clock2.png differ
diff --git a/public/images/emoji/google/clock230.png b/public/images/emoji/google/clock230.png
index 1042202b56..13043c02fc 100644
Binary files a/public/images/emoji/google/clock230.png and b/public/images/emoji/google/clock230.png differ
diff --git a/public/images/emoji/google/clock3.png b/public/images/emoji/google/clock3.png
index b7bc5fad42..8518680fd9 100644
Binary files a/public/images/emoji/google/clock3.png and b/public/images/emoji/google/clock3.png differ
diff --git a/public/images/emoji/google/clock330.png b/public/images/emoji/google/clock330.png
index a03cc49d9b..97074ef680 100644
Binary files a/public/images/emoji/google/clock330.png and b/public/images/emoji/google/clock330.png differ
diff --git a/public/images/emoji/google/clock4.png b/public/images/emoji/google/clock4.png
index 9691167de8..18ba2d702f 100644
Binary files a/public/images/emoji/google/clock4.png and b/public/images/emoji/google/clock4.png differ
diff --git a/public/images/emoji/google/clock430.png b/public/images/emoji/google/clock430.png
index e3f45cb470..6f88dab03a 100644
Binary files a/public/images/emoji/google/clock430.png and b/public/images/emoji/google/clock430.png differ
diff --git a/public/images/emoji/google/clock5.png b/public/images/emoji/google/clock5.png
index 9915dc19a1..021346475e 100644
Binary files a/public/images/emoji/google/clock5.png and b/public/images/emoji/google/clock5.png differ
diff --git a/public/images/emoji/google/clock530.png b/public/images/emoji/google/clock530.png
index 235ea8c4c3..577fd77c30 100644
Binary files a/public/images/emoji/google/clock530.png and b/public/images/emoji/google/clock530.png differ
diff --git a/public/images/emoji/google/clock6.png b/public/images/emoji/google/clock6.png
index e66f2b6191..dd2a20cae5 100644
Binary files a/public/images/emoji/google/clock6.png and b/public/images/emoji/google/clock6.png differ
diff --git a/public/images/emoji/google/clock630.png b/public/images/emoji/google/clock630.png
index 2f27e90a38..0fe5b0a746 100644
Binary files a/public/images/emoji/google/clock630.png and b/public/images/emoji/google/clock630.png differ
diff --git a/public/images/emoji/google/clock7.png b/public/images/emoji/google/clock7.png
index 709337d8f7..c2d3db29db 100644
Binary files a/public/images/emoji/google/clock7.png and b/public/images/emoji/google/clock7.png differ
diff --git a/public/images/emoji/google/clock730.png b/public/images/emoji/google/clock730.png
index d625bebd2a..918bda86c4 100644
Binary files a/public/images/emoji/google/clock730.png and b/public/images/emoji/google/clock730.png differ
diff --git a/public/images/emoji/google/clock8.png b/public/images/emoji/google/clock8.png
index dd9c9eae54..eb74217338 100644
Binary files a/public/images/emoji/google/clock8.png and b/public/images/emoji/google/clock8.png differ
diff --git a/public/images/emoji/google/clock830.png b/public/images/emoji/google/clock830.png
index bc476488cd..b2c8a9d9d7 100644
Binary files a/public/images/emoji/google/clock830.png and b/public/images/emoji/google/clock830.png differ
diff --git a/public/images/emoji/google/clock9.png b/public/images/emoji/google/clock9.png
index f582c8a3cc..70deddca37 100644
Binary files a/public/images/emoji/google/clock9.png and b/public/images/emoji/google/clock9.png differ
diff --git a/public/images/emoji/google/clock930.png b/public/images/emoji/google/clock930.png
index 36a3615e97..cadf2f184e 100644
Binary files a/public/images/emoji/google/clock930.png and b/public/images/emoji/google/clock930.png differ
diff --git a/public/images/emoji/google/closed_book.png b/public/images/emoji/google/closed_book.png
index 99d377f072..7ba63b1128 100644
Binary files a/public/images/emoji/google/closed_book.png and b/public/images/emoji/google/closed_book.png differ
diff --git a/public/images/emoji/google/closed_lock_with_key.png b/public/images/emoji/google/closed_lock_with_key.png
index 8dba5354a8..d3c4cbefc9 100644
Binary files a/public/images/emoji/google/closed_lock_with_key.png and b/public/images/emoji/google/closed_lock_with_key.png differ
diff --git a/public/images/emoji/google/closed_umbrella.png b/public/images/emoji/google/closed_umbrella.png
index cdc2739a51..d62331eb2f 100644
Binary files a/public/images/emoji/google/closed_umbrella.png and b/public/images/emoji/google/closed_umbrella.png differ
diff --git a/public/images/emoji/google/cloud.png b/public/images/emoji/google/cloud.png
index 31008df2a0..cf348825c6 100644
Binary files a/public/images/emoji/google/cloud.png and b/public/images/emoji/google/cloud.png differ
diff --git a/public/images/emoji/google/cloud_lightning.png b/public/images/emoji/google/cloud_lightning.png
index 945a25d066..0b7c9b0e4c 100644
Binary files a/public/images/emoji/google/cloud_lightning.png and b/public/images/emoji/google/cloud_lightning.png differ
diff --git a/public/images/emoji/google/cloud_rain.png b/public/images/emoji/google/cloud_rain.png
index 2795a15917..736dc43659 100644
Binary files a/public/images/emoji/google/cloud_rain.png and b/public/images/emoji/google/cloud_rain.png differ
diff --git a/public/images/emoji/google/cloud_snow.png b/public/images/emoji/google/cloud_snow.png
index cdaf2830b5..c941135d9c 100644
Binary files a/public/images/emoji/google/cloud_snow.png and b/public/images/emoji/google/cloud_snow.png differ
diff --git a/public/images/emoji/google/cloud_tornado.png b/public/images/emoji/google/cloud_tornado.png
index 7f488bc983..b2e18065c1 100644
Binary files a/public/images/emoji/google/cloud_tornado.png and b/public/images/emoji/google/cloud_tornado.png differ
diff --git a/public/images/emoji/google/cloud_with_lightning.png b/public/images/emoji/google/cloud_with_lightning.png
index 945a25d066..0b7c9b0e4c 100644
Binary files a/public/images/emoji/google/cloud_with_lightning.png and b/public/images/emoji/google/cloud_with_lightning.png differ
diff --git a/public/images/emoji/google/cloud_with_lightning_and_rain.png b/public/images/emoji/google/cloud_with_lightning_and_rain.png
index 5cb64e49e4..8cf3322c7d 100644
Binary files a/public/images/emoji/google/cloud_with_lightning_and_rain.png and b/public/images/emoji/google/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/google/cloud_with_rain.png b/public/images/emoji/google/cloud_with_rain.png
index 2795a15917..736dc43659 100644
Binary files a/public/images/emoji/google/cloud_with_rain.png and b/public/images/emoji/google/cloud_with_rain.png differ
diff --git a/public/images/emoji/google/cloud_with_snow.png b/public/images/emoji/google/cloud_with_snow.png
index cdaf2830b5..c941135d9c 100644
Binary files a/public/images/emoji/google/cloud_with_snow.png and b/public/images/emoji/google/cloud_with_snow.png differ
diff --git a/public/images/emoji/google/cloud_with_tornado.png b/public/images/emoji/google/cloud_with_tornado.png
index 7f488bc983..b2e18065c1 100644
Binary files a/public/images/emoji/google/cloud_with_tornado.png and b/public/images/emoji/google/cloud_with_tornado.png differ
diff --git a/public/images/emoji/google/clown_face.png b/public/images/emoji/google/clown_face.png
index 0f3fdf1fcc..7bb43404b1 100644
Binary files a/public/images/emoji/google/clown_face.png and b/public/images/emoji/google/clown_face.png differ
diff --git a/public/images/emoji/google/clubs.png b/public/images/emoji/google/clubs.png
index 5a5b71f15d..3be8fce7da 100644
Binary files a/public/images/emoji/google/clubs.png and b/public/images/emoji/google/clubs.png differ
diff --git a/public/images/emoji/google/cn.png b/public/images/emoji/google/cn.png
index 010dddd107..05a72fed32 100644
Binary files a/public/images/emoji/google/cn.png and b/public/images/emoji/google/cn.png differ
diff --git a/public/images/emoji/google/coat.png b/public/images/emoji/google/coat.png
index f772650670..661f213c45 100644
Binary files a/public/images/emoji/google/coat.png and b/public/images/emoji/google/coat.png differ
diff --git a/public/images/emoji/google/cocktail.png b/public/images/emoji/google/cocktail.png
index 48c95fd64f..b62109ebf3 100644
Binary files a/public/images/emoji/google/cocktail.png and b/public/images/emoji/google/cocktail.png differ
diff --git a/public/images/emoji/google/coconut.png b/public/images/emoji/google/coconut.png
index 273946dcdd..fcb9d4f13b 100644
Binary files a/public/images/emoji/google/coconut.png and b/public/images/emoji/google/coconut.png differ
diff --git a/public/images/emoji/google/cocos_islands.png b/public/images/emoji/google/cocos_islands.png
index 040fe6aa8b..a89d19e515 100644
Binary files a/public/images/emoji/google/cocos_islands.png and b/public/images/emoji/google/cocos_islands.png differ
diff --git a/public/images/emoji/google/coffee.png b/public/images/emoji/google/coffee.png
index 06756dc539..49ab8d2685 100644
Binary files a/public/images/emoji/google/coffee.png and b/public/images/emoji/google/coffee.png differ
diff --git a/public/images/emoji/google/coffin.png b/public/images/emoji/google/coffin.png
index ec867a6635..0a7e93cf87 100644
Binary files a/public/images/emoji/google/coffin.png and b/public/images/emoji/google/coffin.png differ
diff --git a/public/images/emoji/google/cold_sweat.png b/public/images/emoji/google/cold_sweat.png
index dc7c922d64..ea6ce85653 100644
Binary files a/public/images/emoji/google/cold_sweat.png and b/public/images/emoji/google/cold_sweat.png differ
diff --git a/public/images/emoji/google/colombia.png b/public/images/emoji/google/colombia.png
index e7c1d5e660..34b679f6b0 100644
Binary files a/public/images/emoji/google/colombia.png and b/public/images/emoji/google/colombia.png differ
diff --git a/public/images/emoji/google/comet.png b/public/images/emoji/google/comet.png
index 5eb8e54750..a733737ca6 100644
Binary files a/public/images/emoji/google/comet.png and b/public/images/emoji/google/comet.png differ
diff --git a/public/images/emoji/google/comoros.png b/public/images/emoji/google/comoros.png
index 7f2ee7da42..5ba20ffe6a 100644
Binary files a/public/images/emoji/google/comoros.png and b/public/images/emoji/google/comoros.png differ
diff --git a/public/images/emoji/google/compression.png b/public/images/emoji/google/compression.png
index 245635724e..b70ff09592 100644
Binary files a/public/images/emoji/google/compression.png and b/public/images/emoji/google/compression.png differ
diff --git a/public/images/emoji/google/computer.png b/public/images/emoji/google/computer.png
index 9185ea466f..cd6240d204 100644
Binary files a/public/images/emoji/google/computer.png and b/public/images/emoji/google/computer.png differ
diff --git a/public/images/emoji/google/computer_mouse.png b/public/images/emoji/google/computer_mouse.png
index 606ada2ed4..28785439fc 100644
Binary files a/public/images/emoji/google/computer_mouse.png and b/public/images/emoji/google/computer_mouse.png differ
diff --git a/public/images/emoji/google/confetti_ball.png b/public/images/emoji/google/confetti_ball.png
index 301f662e21..a5e8d180de 100644
Binary files a/public/images/emoji/google/confetti_ball.png and b/public/images/emoji/google/confetti_ball.png differ
diff --git a/public/images/emoji/google/confounded.png b/public/images/emoji/google/confounded.png
index 05468a6f90..bcb5fe8545 100644
Binary files a/public/images/emoji/google/confounded.png and b/public/images/emoji/google/confounded.png differ
diff --git a/public/images/emoji/google/confused.png b/public/images/emoji/google/confused.png
index 10f6853502..d87de27196 100644
Binary files a/public/images/emoji/google/confused.png and b/public/images/emoji/google/confused.png differ
diff --git a/public/images/emoji/google/congo_brazzaville.png b/public/images/emoji/google/congo_brazzaville.png
index 86ba2b7c53..2ee620fd1f 100644
Binary files a/public/images/emoji/google/congo_brazzaville.png and b/public/images/emoji/google/congo_brazzaville.png differ
diff --git a/public/images/emoji/google/congo_kinshasa.png b/public/images/emoji/google/congo_kinshasa.png
index bc6103b992..ad278a35a8 100644
Binary files a/public/images/emoji/google/congo_kinshasa.png and b/public/images/emoji/google/congo_kinshasa.png differ
diff --git a/public/images/emoji/google/congratulations.png b/public/images/emoji/google/congratulations.png
index bdf20971b0..8ec344c39f 100644
Binary files a/public/images/emoji/google/congratulations.png and b/public/images/emoji/google/congratulations.png differ
diff --git a/public/images/emoji/google/construction.png b/public/images/emoji/google/construction.png
index 2410e41ffb..879a85c1bf 100644
Binary files a/public/images/emoji/google/construction.png and b/public/images/emoji/google/construction.png differ
diff --git a/public/images/emoji/google/construction_site.png b/public/images/emoji/google/construction_site.png
index 625247fd7c..444e3cd1ab 100644
Binary files a/public/images/emoji/google/construction_site.png and b/public/images/emoji/google/construction_site.png differ
diff --git a/public/images/emoji/google/construction_worker.png b/public/images/emoji/google/construction_worker.png
index aadfbfd27f..5b258a4408 100644
Binary files a/public/images/emoji/google/construction_worker.png and b/public/images/emoji/google/construction_worker.png differ
diff --git a/public/images/emoji/google/construction_worker/2.png b/public/images/emoji/google/construction_worker/2.png
index 72c777135a..d6a3e5d691 100644
Binary files a/public/images/emoji/google/construction_worker/2.png and b/public/images/emoji/google/construction_worker/2.png differ
diff --git a/public/images/emoji/google/construction_worker/3.png b/public/images/emoji/google/construction_worker/3.png
index 68b5d586a1..e5d3e98047 100644
Binary files a/public/images/emoji/google/construction_worker/3.png and b/public/images/emoji/google/construction_worker/3.png differ
diff --git a/public/images/emoji/google/construction_worker/4.png b/public/images/emoji/google/construction_worker/4.png
index e20b2d69ce..7879c3c2f9 100644
Binary files a/public/images/emoji/google/construction_worker/4.png and b/public/images/emoji/google/construction_worker/4.png differ
diff --git a/public/images/emoji/google/construction_worker/5.png b/public/images/emoji/google/construction_worker/5.png
index 256587ff5a..13f64f14e7 100644
Binary files a/public/images/emoji/google/construction_worker/5.png and b/public/images/emoji/google/construction_worker/5.png differ
diff --git a/public/images/emoji/google/construction_worker/6.png b/public/images/emoji/google/construction_worker/6.png
index 2f4c5c40ab..4a1287f9c5 100644
Binary files a/public/images/emoji/google/construction_worker/6.png and b/public/images/emoji/google/construction_worker/6.png differ
diff --git a/public/images/emoji/google/construction_worker_man.png b/public/images/emoji/google/construction_worker_man.png
index aadfbfd27f..5b258a4408 100644
Binary files a/public/images/emoji/google/construction_worker_man.png and b/public/images/emoji/google/construction_worker_man.png differ
diff --git a/public/images/emoji/google/construction_worker_man/2.png b/public/images/emoji/google/construction_worker_man/2.png
index 72c777135a..d6a3e5d691 100644
Binary files a/public/images/emoji/google/construction_worker_man/2.png and b/public/images/emoji/google/construction_worker_man/2.png differ
diff --git a/public/images/emoji/google/construction_worker_man/3.png b/public/images/emoji/google/construction_worker_man/3.png
index 68b5d586a1..e5d3e98047 100644
Binary files a/public/images/emoji/google/construction_worker_man/3.png and b/public/images/emoji/google/construction_worker_man/3.png differ
diff --git a/public/images/emoji/google/construction_worker_man/4.png b/public/images/emoji/google/construction_worker_man/4.png
index e20b2d69ce..7879c3c2f9 100644
Binary files a/public/images/emoji/google/construction_worker_man/4.png and b/public/images/emoji/google/construction_worker_man/4.png differ
diff --git a/public/images/emoji/google/construction_worker_man/5.png b/public/images/emoji/google/construction_worker_man/5.png
index 256587ff5a..13f64f14e7 100644
Binary files a/public/images/emoji/google/construction_worker_man/5.png and b/public/images/emoji/google/construction_worker_man/5.png differ
diff --git a/public/images/emoji/google/construction_worker_man/6.png b/public/images/emoji/google/construction_worker_man/6.png
index 2f4c5c40ab..4a1287f9c5 100644
Binary files a/public/images/emoji/google/construction_worker_man/6.png and b/public/images/emoji/google/construction_worker_man/6.png differ
diff --git a/public/images/emoji/google/construction_worker_woman.png b/public/images/emoji/google/construction_worker_woman.png
index 3c8f4806a7..854f6106be 100644
Binary files a/public/images/emoji/google/construction_worker_woman.png and b/public/images/emoji/google/construction_worker_woman.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/2.png b/public/images/emoji/google/construction_worker_woman/2.png
index cae3c67fd5..6e29153ce0 100644
Binary files a/public/images/emoji/google/construction_worker_woman/2.png and b/public/images/emoji/google/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/3.png b/public/images/emoji/google/construction_worker_woman/3.png
index 3dc7ae5dfc..5607b249d5 100644
Binary files a/public/images/emoji/google/construction_worker_woman/3.png and b/public/images/emoji/google/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/4.png b/public/images/emoji/google/construction_worker_woman/4.png
index f20f783509..ee676808b2 100644
Binary files a/public/images/emoji/google/construction_worker_woman/4.png and b/public/images/emoji/google/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/5.png b/public/images/emoji/google/construction_worker_woman/5.png
index 7e9217adbc..9b3b5fc25f 100644
Binary files a/public/images/emoji/google/construction_worker_woman/5.png and b/public/images/emoji/google/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/6.png b/public/images/emoji/google/construction_worker_woman/6.png
index 1098adbc8b..92c67a29e8 100644
Binary files a/public/images/emoji/google/construction_worker_woman/6.png and b/public/images/emoji/google/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/google/control_knobs.png b/public/images/emoji/google/control_knobs.png
index ac664d8057..46c651d40d 100644
Binary files a/public/images/emoji/google/control_knobs.png and b/public/images/emoji/google/control_knobs.png differ
diff --git a/public/images/emoji/google/convenience_store.png b/public/images/emoji/google/convenience_store.png
index 5043fa6611..327f9635ce 100644
Binary files a/public/images/emoji/google/convenience_store.png and b/public/images/emoji/google/convenience_store.png differ
diff --git a/public/images/emoji/google/cook_islands.png b/public/images/emoji/google/cook_islands.png
index fda8d2ba62..65c4c79bf2 100644
Binary files a/public/images/emoji/google/cook_islands.png and b/public/images/emoji/google/cook_islands.png differ
diff --git a/public/images/emoji/google/cookie.png b/public/images/emoji/google/cookie.png
index 8db73aa8f6..486a52c7c4 100644
Binary files a/public/images/emoji/google/cookie.png and b/public/images/emoji/google/cookie.png differ
diff --git a/public/images/emoji/google/cool.png b/public/images/emoji/google/cool.png
index 7b61153634..2601ef888a 100644
Binary files a/public/images/emoji/google/cool.png and b/public/images/emoji/google/cool.png differ
diff --git a/public/images/emoji/google/cop.png b/public/images/emoji/google/cop.png
index c6e424f54a..7cdf83e122 100644
Binary files a/public/images/emoji/google/cop.png and b/public/images/emoji/google/cop.png differ
diff --git a/public/images/emoji/google/cop/2.png b/public/images/emoji/google/cop/2.png
index 74bc0da8f2..12d6403810 100644
Binary files a/public/images/emoji/google/cop/2.png and b/public/images/emoji/google/cop/2.png differ
diff --git a/public/images/emoji/google/cop/3.png b/public/images/emoji/google/cop/3.png
index d461370fdb..119290b976 100644
Binary files a/public/images/emoji/google/cop/3.png and b/public/images/emoji/google/cop/3.png differ
diff --git a/public/images/emoji/google/cop/4.png b/public/images/emoji/google/cop/4.png
index 12d654b4e5..49d3df0339 100644
Binary files a/public/images/emoji/google/cop/4.png and b/public/images/emoji/google/cop/4.png differ
diff --git a/public/images/emoji/google/cop/5.png b/public/images/emoji/google/cop/5.png
index d555c18f79..7e961289d2 100644
Binary files a/public/images/emoji/google/cop/5.png and b/public/images/emoji/google/cop/5.png differ
diff --git a/public/images/emoji/google/cop/6.png b/public/images/emoji/google/cop/6.png
index 0542d87a6a..8e59e6654e 100644
Binary files a/public/images/emoji/google/cop/6.png and b/public/images/emoji/google/cop/6.png differ
diff --git a/public/images/emoji/google/copyright.png b/public/images/emoji/google/copyright.png
index 220384e7ca..3ea187513d 100644
Binary files a/public/images/emoji/google/copyright.png and b/public/images/emoji/google/copyright.png differ
diff --git a/public/images/emoji/google/corn.png b/public/images/emoji/google/corn.png
index d608093dca..86acf71da5 100644
Binary files a/public/images/emoji/google/corn.png and b/public/images/emoji/google/corn.png differ
diff --git a/public/images/emoji/google/costa_rica.png b/public/images/emoji/google/costa_rica.png
index 57d6736bf1..d8602d36dc 100644
Binary files a/public/images/emoji/google/costa_rica.png and b/public/images/emoji/google/costa_rica.png differ
diff --git a/public/images/emoji/google/cote_divoire.png b/public/images/emoji/google/cote_divoire.png
index 44cd3a3842..76dfead63e 100644
Binary files a/public/images/emoji/google/cote_divoire.png and b/public/images/emoji/google/cote_divoire.png differ
diff --git a/public/images/emoji/google/couch.png b/public/images/emoji/google/couch.png
index 3e22d05afa..3d13dbc4e7 100644
Binary files a/public/images/emoji/google/couch.png and b/public/images/emoji/google/couch.png differ
diff --git a/public/images/emoji/google/couch_and_lamp.png b/public/images/emoji/google/couch_and_lamp.png
index 3e22d05afa..3d13dbc4e7 100644
Binary files a/public/images/emoji/google/couch_and_lamp.png and b/public/images/emoji/google/couch_and_lamp.png differ
diff --git a/public/images/emoji/google/couple.png b/public/images/emoji/google/couple.png
index e4faa7aca4..cb562811b2 100644
Binary files a/public/images/emoji/google/couple.png and b/public/images/emoji/google/couple.png differ
diff --git a/public/images/emoji/google/couple_with_heart.png b/public/images/emoji/google/couple_with_heart.png
index 8964580850..d201b1a784 100644
Binary files a/public/images/emoji/google/couple_with_heart.png and b/public/images/emoji/google/couple_with_heart.png differ
diff --git a/public/images/emoji/google/couple_with_heart_man_man.png b/public/images/emoji/google/couple_with_heart_man_man.png
index 8c30736f98..edfa25c9a0 100644
Binary files a/public/images/emoji/google/couple_with_heart_man_man.png and b/public/images/emoji/google/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/google/couple_with_heart_woman_man.png b/public/images/emoji/google/couple_with_heart_woman_man.png
index 8964580850..d201b1a784 100644
Binary files a/public/images/emoji/google/couple_with_heart_woman_man.png and b/public/images/emoji/google/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/google/couple_with_heart_woman_woman.png b/public/images/emoji/google/couple_with_heart_woman_woman.png
index 8eda1e8d84..f4b433aa95 100644
Binary files a/public/images/emoji/google/couple_with_heart_woman_woman.png and b/public/images/emoji/google/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/google/couplekiss.png b/public/images/emoji/google/couplekiss.png
index 0b0adb59f6..eb5249499a 100644
Binary files a/public/images/emoji/google/couplekiss.png and b/public/images/emoji/google/couplekiss.png differ
diff --git a/public/images/emoji/google/couplekiss_man_man.png b/public/images/emoji/google/couplekiss_man_man.png
index 60aff93dd7..231fc8e523 100644
Binary files a/public/images/emoji/google/couplekiss_man_man.png and b/public/images/emoji/google/couplekiss_man_man.png differ
diff --git a/public/images/emoji/google/couplekiss_man_woman.png b/public/images/emoji/google/couplekiss_man_woman.png
index 0b0adb59f6..eb5249499a 100644
Binary files a/public/images/emoji/google/couplekiss_man_woman.png and b/public/images/emoji/google/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/google/couplekiss_woman_woman.png b/public/images/emoji/google/couplekiss_woman_woman.png
index 7cd2d2ebdd..0e516e9376 100644
Binary files a/public/images/emoji/google/couplekiss_woman_woman.png and b/public/images/emoji/google/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/google/cow.png b/public/images/emoji/google/cow.png
index 5cfba50398..3b0ed308f1 100644
Binary files a/public/images/emoji/google/cow.png and b/public/images/emoji/google/cow.png differ
diff --git a/public/images/emoji/google/cow2.png b/public/images/emoji/google/cow2.png
index 0253a70263..443b210900 100644
Binary files a/public/images/emoji/google/cow2.png and b/public/images/emoji/google/cow2.png differ
diff --git a/public/images/emoji/google/cowboy_hat_face.png b/public/images/emoji/google/cowboy_hat_face.png
index 40f43ca47c..69a4bf6684 100644
Binary files a/public/images/emoji/google/cowboy_hat_face.png and b/public/images/emoji/google/cowboy_hat_face.png differ
diff --git a/public/images/emoji/google/crab.png b/public/images/emoji/google/crab.png
index 3385c068fe..ba5e08c3bf 100644
Binary files a/public/images/emoji/google/crab.png and b/public/images/emoji/google/crab.png differ
diff --git a/public/images/emoji/google/crayon.png b/public/images/emoji/google/crayon.png
index e82c0d2d5e..bec3b70573 100644
Binary files a/public/images/emoji/google/crayon.png and b/public/images/emoji/google/crayon.png differ
diff --git a/public/images/emoji/google/crazy_face.png b/public/images/emoji/google/crazy_face.png
index bdd2c62740..8637fa7bf4 100644
Binary files a/public/images/emoji/google/crazy_face.png and b/public/images/emoji/google/crazy_face.png differ
diff --git a/public/images/emoji/google/credit_card.png b/public/images/emoji/google/credit_card.png
index ba1d605923..37ba1069d2 100644
Binary files a/public/images/emoji/google/credit_card.png and b/public/images/emoji/google/credit_card.png differ
diff --git a/public/images/emoji/google/crescent_moon.png b/public/images/emoji/google/crescent_moon.png
index dd893e982f..50e2bdb4a5 100644
Binary files a/public/images/emoji/google/crescent_moon.png and b/public/images/emoji/google/crescent_moon.png differ
diff --git a/public/images/emoji/google/cricket.png b/public/images/emoji/google/cricket.png
index 46b39fae4a..fc747258e8 100644
Binary files a/public/images/emoji/google/cricket.png and b/public/images/emoji/google/cricket.png differ
diff --git a/public/images/emoji/google/cricket_bat_and_ball.png b/public/images/emoji/google/cricket_bat_and_ball.png
index 98bac43e6c..d5309a3626 100644
Binary files a/public/images/emoji/google/cricket_bat_and_ball.png and b/public/images/emoji/google/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/google/cricket_bat_ball.png b/public/images/emoji/google/cricket_bat_ball.png
index 98bac43e6c..d5309a3626 100644
Binary files a/public/images/emoji/google/cricket_bat_ball.png and b/public/images/emoji/google/cricket_bat_ball.png differ
diff --git a/public/images/emoji/google/croatia.png b/public/images/emoji/google/croatia.png
index 3dff9861d0..744eb40aba 100644
Binary files a/public/images/emoji/google/croatia.png and b/public/images/emoji/google/croatia.png differ
diff --git a/public/images/emoji/google/crocodile.png b/public/images/emoji/google/crocodile.png
index 1269841e36..c8363736ba 100644
Binary files a/public/images/emoji/google/crocodile.png and b/public/images/emoji/google/crocodile.png differ
diff --git a/public/images/emoji/google/croissant.png b/public/images/emoji/google/croissant.png
index 879284fcb0..48be4a4c35 100644
Binary files a/public/images/emoji/google/croissant.png and b/public/images/emoji/google/croissant.png differ
diff --git a/public/images/emoji/google/cross.png b/public/images/emoji/google/cross.png
index 0a367b0233..f0608264bb 100644
Binary files a/public/images/emoji/google/cross.png and b/public/images/emoji/google/cross.png differ
diff --git a/public/images/emoji/google/crossed_fingers.png b/public/images/emoji/google/crossed_fingers.png
index cae9b3d41c..6fd03b7dcf 100644
Binary files a/public/images/emoji/google/crossed_fingers.png and b/public/images/emoji/google/crossed_fingers.png differ
diff --git a/public/images/emoji/google/crossed_fingers/2.png b/public/images/emoji/google/crossed_fingers/2.png
index 0ebff8d5b4..824f3acf9e 100644
Binary files a/public/images/emoji/google/crossed_fingers/2.png and b/public/images/emoji/google/crossed_fingers/2.png differ
diff --git a/public/images/emoji/google/crossed_fingers/3.png b/public/images/emoji/google/crossed_fingers/3.png
index 122c1d7ca1..e5e0112fdf 100644
Binary files a/public/images/emoji/google/crossed_fingers/3.png and b/public/images/emoji/google/crossed_fingers/3.png differ
diff --git a/public/images/emoji/google/crossed_fingers/4.png b/public/images/emoji/google/crossed_fingers/4.png
index dd5c35e178..10a4126fa9 100644
Binary files a/public/images/emoji/google/crossed_fingers/4.png and b/public/images/emoji/google/crossed_fingers/4.png differ
diff --git a/public/images/emoji/google/crossed_fingers/5.png b/public/images/emoji/google/crossed_fingers/5.png
index 3371fbf413..675c367ad9 100644
Binary files a/public/images/emoji/google/crossed_fingers/5.png and b/public/images/emoji/google/crossed_fingers/5.png differ
diff --git a/public/images/emoji/google/crossed_fingers/6.png b/public/images/emoji/google/crossed_fingers/6.png
index c22fcea63d..36edbcc63b 100644
Binary files a/public/images/emoji/google/crossed_fingers/6.png and b/public/images/emoji/google/crossed_fingers/6.png differ
diff --git a/public/images/emoji/google/crossed_flags.png b/public/images/emoji/google/crossed_flags.png
index 852ba9a702..a73fd11f40 100644
Binary files a/public/images/emoji/google/crossed_flags.png and b/public/images/emoji/google/crossed_flags.png differ
diff --git a/public/images/emoji/google/crossed_swords.png b/public/images/emoji/google/crossed_swords.png
index aa8ef85a77..ce64a83108 100644
Binary files a/public/images/emoji/google/crossed_swords.png and b/public/images/emoji/google/crossed_swords.png differ
diff --git a/public/images/emoji/google/crown.png b/public/images/emoji/google/crown.png
index 1c9d776e82..8b8fc97136 100644
Binary files a/public/images/emoji/google/crown.png and b/public/images/emoji/google/crown.png differ
diff --git a/public/images/emoji/google/cruise_ship.png b/public/images/emoji/google/cruise_ship.png
index 5ffa1e17dc..be03fc1343 100644
Binary files a/public/images/emoji/google/cruise_ship.png and b/public/images/emoji/google/cruise_ship.png differ
diff --git a/public/images/emoji/google/cry.png b/public/images/emoji/google/cry.png
index 0e9daa41ef..793dc9c1c9 100644
Binary files a/public/images/emoji/google/cry.png and b/public/images/emoji/google/cry.png differ
diff --git a/public/images/emoji/google/crying_cat_face.png b/public/images/emoji/google/crying_cat_face.png
index 9bf1a397af..e79e6ab2f4 100644
Binary files a/public/images/emoji/google/crying_cat_face.png and b/public/images/emoji/google/crying_cat_face.png differ
diff --git a/public/images/emoji/google/crystal_ball.png b/public/images/emoji/google/crystal_ball.png
index e27b2c5c8d..af49854884 100644
Binary files a/public/images/emoji/google/crystal_ball.png and b/public/images/emoji/google/crystal_ball.png differ
diff --git a/public/images/emoji/google/cuba.png b/public/images/emoji/google/cuba.png
index feae50ff4b..0167f57462 100644
Binary files a/public/images/emoji/google/cuba.png and b/public/images/emoji/google/cuba.png differ
diff --git a/public/images/emoji/google/cucumber.png b/public/images/emoji/google/cucumber.png
index 28bb40fe29..959ee6e3a7 100644
Binary files a/public/images/emoji/google/cucumber.png and b/public/images/emoji/google/cucumber.png differ
diff --git a/public/images/emoji/google/cup_with_straw.png b/public/images/emoji/google/cup_with_straw.png
index cb421be671..5ee2beb2ab 100644
Binary files a/public/images/emoji/google/cup_with_straw.png and b/public/images/emoji/google/cup_with_straw.png differ
diff --git a/public/images/emoji/google/cupid.png b/public/images/emoji/google/cupid.png
index 6e26e46afd..f5652e31c0 100644
Binary files a/public/images/emoji/google/cupid.png and b/public/images/emoji/google/cupid.png differ
diff --git a/public/images/emoji/google/curacao.png b/public/images/emoji/google/curacao.png
index 6853a1c99f..7fbc2eda4e 100644
Binary files a/public/images/emoji/google/curacao.png and b/public/images/emoji/google/curacao.png differ
diff --git a/public/images/emoji/google/curling_stone.png b/public/images/emoji/google/curling_stone.png
index 99dace0346..2403ad6699 100644
Binary files a/public/images/emoji/google/curling_stone.png and b/public/images/emoji/google/curling_stone.png differ
diff --git a/public/images/emoji/google/curly_loop.png b/public/images/emoji/google/curly_loop.png
index 860b72bf40..5e5f2c88c1 100644
Binary files a/public/images/emoji/google/curly_loop.png and b/public/images/emoji/google/curly_loop.png differ
diff --git a/public/images/emoji/google/currency_exchange.png b/public/images/emoji/google/currency_exchange.png
index 55b41fd570..adeb33caa7 100644
Binary files a/public/images/emoji/google/currency_exchange.png and b/public/images/emoji/google/currency_exchange.png differ
diff --git a/public/images/emoji/google/curry.png b/public/images/emoji/google/curry.png
index 2d1f927053..02d76bbf84 100644
Binary files a/public/images/emoji/google/curry.png and b/public/images/emoji/google/curry.png differ
diff --git a/public/images/emoji/google/custard.png b/public/images/emoji/google/custard.png
index 6373ce2a54..8d9ab7e81e 100644
Binary files a/public/images/emoji/google/custard.png and b/public/images/emoji/google/custard.png differ
diff --git a/public/images/emoji/google/customs.png b/public/images/emoji/google/customs.png
index 58801f2046..90af5690fa 100644
Binary files a/public/images/emoji/google/customs.png and b/public/images/emoji/google/customs.png differ
diff --git a/public/images/emoji/google/cut_of_meat.png b/public/images/emoji/google/cut_of_meat.png
index f801d2c480..c224fe3616 100644
Binary files a/public/images/emoji/google/cut_of_meat.png and b/public/images/emoji/google/cut_of_meat.png differ
diff --git a/public/images/emoji/google/cyclone.png b/public/images/emoji/google/cyclone.png
index e172a92653..cd30e74536 100644
Binary files a/public/images/emoji/google/cyclone.png and b/public/images/emoji/google/cyclone.png differ
diff --git a/public/images/emoji/google/cyprus.png b/public/images/emoji/google/cyprus.png
index e063ccf4df..0111d9915c 100644
Binary files a/public/images/emoji/google/cyprus.png and b/public/images/emoji/google/cyprus.png differ
diff --git a/public/images/emoji/google/czech_republic.png b/public/images/emoji/google/czech_republic.png
index c9b0edb988..84be3832e7 100644
Binary files a/public/images/emoji/google/czech_republic.png and b/public/images/emoji/google/czech_republic.png differ
diff --git a/public/images/emoji/google/dagger.png b/public/images/emoji/google/dagger.png
index 8e19150779..64e94594cf 100644
Binary files a/public/images/emoji/google/dagger.png and b/public/images/emoji/google/dagger.png differ
diff --git a/public/images/emoji/google/dagger_knife.png b/public/images/emoji/google/dagger_knife.png
index 8e19150779..64e94594cf 100644
Binary files a/public/images/emoji/google/dagger_knife.png and b/public/images/emoji/google/dagger_knife.png differ
diff --git a/public/images/emoji/google/dancer.png b/public/images/emoji/google/dancer.png
index 415741ec13..243ede417d 100644
Binary files a/public/images/emoji/google/dancer.png and b/public/images/emoji/google/dancer.png differ
diff --git a/public/images/emoji/google/dancer/2.png b/public/images/emoji/google/dancer/2.png
index 74d9350f38..f0973ccb97 100644
Binary files a/public/images/emoji/google/dancer/2.png and b/public/images/emoji/google/dancer/2.png differ
diff --git a/public/images/emoji/google/dancer/3.png b/public/images/emoji/google/dancer/3.png
index 5d1b9b2e84..b14009fe34 100644
Binary files a/public/images/emoji/google/dancer/3.png and b/public/images/emoji/google/dancer/3.png differ
diff --git a/public/images/emoji/google/dancer/4.png b/public/images/emoji/google/dancer/4.png
index e34f3fd12f..0ab4b166b9 100644
Binary files a/public/images/emoji/google/dancer/4.png and b/public/images/emoji/google/dancer/4.png differ
diff --git a/public/images/emoji/google/dancer/5.png b/public/images/emoji/google/dancer/5.png
index 7bceb0c9c6..df38959f00 100644
Binary files a/public/images/emoji/google/dancer/5.png and b/public/images/emoji/google/dancer/5.png differ
diff --git a/public/images/emoji/google/dancer/6.png b/public/images/emoji/google/dancer/6.png
index 6483f6966c..5cd0842d70 100644
Binary files a/public/images/emoji/google/dancer/6.png and b/public/images/emoji/google/dancer/6.png differ
diff --git a/public/images/emoji/google/dancers.png b/public/images/emoji/google/dancers.png
index 30018f29ed..7f6e7c3747 100644
Binary files a/public/images/emoji/google/dancers.png and b/public/images/emoji/google/dancers.png differ
diff --git a/public/images/emoji/google/dancing_men.png b/public/images/emoji/google/dancing_men.png
index 879d26a98d..fc5f8d1ec5 100644
Binary files a/public/images/emoji/google/dancing_men.png and b/public/images/emoji/google/dancing_men.png differ
diff --git a/public/images/emoji/google/dancing_women.png b/public/images/emoji/google/dancing_women.png
index 30018f29ed..7f6e7c3747 100644
Binary files a/public/images/emoji/google/dancing_women.png and b/public/images/emoji/google/dancing_women.png differ
diff --git a/public/images/emoji/google/dango.png b/public/images/emoji/google/dango.png
index a9e27e8991..e53b08a7eb 100644
Binary files a/public/images/emoji/google/dango.png and b/public/images/emoji/google/dango.png differ
diff --git a/public/images/emoji/google/dark_sunglasses.png b/public/images/emoji/google/dark_sunglasses.png
index 34866a4a06..c808bd9c1f 100644
Binary files a/public/images/emoji/google/dark_sunglasses.png and b/public/images/emoji/google/dark_sunglasses.png differ
diff --git a/public/images/emoji/google/dart.png b/public/images/emoji/google/dart.png
index 4748ca6846..e001162b8a 100644
Binary files a/public/images/emoji/google/dart.png and b/public/images/emoji/google/dart.png differ
diff --git a/public/images/emoji/google/dash.png b/public/images/emoji/google/dash.png
index 53fb9f1832..ae2834b322 100644
Binary files a/public/images/emoji/google/dash.png and b/public/images/emoji/google/dash.png differ
diff --git a/public/images/emoji/google/date.png b/public/images/emoji/google/date.png
index 91125e15b7..6318265bb9 100644
Binary files a/public/images/emoji/google/date.png and b/public/images/emoji/google/date.png differ
diff --git a/public/images/emoji/google/de.png b/public/images/emoji/google/de.png
index e18953b9be..5110b322d1 100644
Binary files a/public/images/emoji/google/de.png and b/public/images/emoji/google/de.png differ
diff --git a/public/images/emoji/google/deciduous_tree.png b/public/images/emoji/google/deciduous_tree.png
index 7ef80df780..33c2ff94ef 100644
Binary files a/public/images/emoji/google/deciduous_tree.png and b/public/images/emoji/google/deciduous_tree.png differ
diff --git a/public/images/emoji/google/deer.png b/public/images/emoji/google/deer.png
index 72ce447593..1b957d53e9 100644
Binary files a/public/images/emoji/google/deer.png and b/public/images/emoji/google/deer.png differ
diff --git a/public/images/emoji/google/denmark.png b/public/images/emoji/google/denmark.png
index c56dcdfb17..936d7cbb87 100644
Binary files a/public/images/emoji/google/denmark.png and b/public/images/emoji/google/denmark.png differ
diff --git a/public/images/emoji/google/department_store.png b/public/images/emoji/google/department_store.png
index ebb3b4f113..f92d750cea 100644
Binary files a/public/images/emoji/google/department_store.png and b/public/images/emoji/google/department_store.png differ
diff --git a/public/images/emoji/google/derelict_house.png b/public/images/emoji/google/derelict_house.png
index 5a4faead95..7b14c6c6cd 100644
Binary files a/public/images/emoji/google/derelict_house.png and b/public/images/emoji/google/derelict_house.png differ
diff --git a/public/images/emoji/google/derelict_house_building.png b/public/images/emoji/google/derelict_house_building.png
index 5a4faead95..7b14c6c6cd 100644
Binary files a/public/images/emoji/google/derelict_house_building.png and b/public/images/emoji/google/derelict_house_building.png differ
diff --git a/public/images/emoji/google/desert.png b/public/images/emoji/google/desert.png
index 10cb404801..410b28f0a7 100644
Binary files a/public/images/emoji/google/desert.png and b/public/images/emoji/google/desert.png differ
diff --git a/public/images/emoji/google/desert_island.png b/public/images/emoji/google/desert_island.png
index 30ee864648..e68a3fe14f 100644
Binary files a/public/images/emoji/google/desert_island.png and b/public/images/emoji/google/desert_island.png differ
diff --git a/public/images/emoji/google/desktop.png b/public/images/emoji/google/desktop.png
index d967edd0e7..8345b9fd6f 100644
Binary files a/public/images/emoji/google/desktop.png and b/public/images/emoji/google/desktop.png differ
diff --git a/public/images/emoji/google/desktop_computer.png b/public/images/emoji/google/desktop_computer.png
index d967edd0e7..8345b9fd6f 100644
Binary files a/public/images/emoji/google/desktop_computer.png and b/public/images/emoji/google/desktop_computer.png differ
diff --git a/public/images/emoji/google/diamond_shape_with_a_dot_inside.png b/public/images/emoji/google/diamond_shape_with_a_dot_inside.png
index aeda139b22..f9c79355ce 100644
Binary files a/public/images/emoji/google/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/google/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/google/diamonds.png b/public/images/emoji/google/diamonds.png
index 13d047c0fe..055e6b8c9b 100644
Binary files a/public/images/emoji/google/diamonds.png and b/public/images/emoji/google/diamonds.png differ
diff --git a/public/images/emoji/google/diego_garcia.png b/public/images/emoji/google/diego_garcia.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/diego_garcia.png and b/public/images/emoji/google/diego_garcia.png differ
diff --git a/public/images/emoji/google/disappointed.png b/public/images/emoji/google/disappointed.png
index f7e0e453e8..4c532a6af4 100644
Binary files a/public/images/emoji/google/disappointed.png and b/public/images/emoji/google/disappointed.png differ
diff --git a/public/images/emoji/google/disappointed_relieved.png b/public/images/emoji/google/disappointed_relieved.png
index 70d7736cd4..c867494906 100644
Binary files a/public/images/emoji/google/disappointed_relieved.png and b/public/images/emoji/google/disappointed_relieved.png differ
diff --git a/public/images/emoji/google/dividers.png b/public/images/emoji/google/dividers.png
index dd8929d64a..b07bdc1135 100644
Binary files a/public/images/emoji/google/dividers.png and b/public/images/emoji/google/dividers.png differ
diff --git a/public/images/emoji/google/dizzy.png b/public/images/emoji/google/dizzy.png
index 6792b1f955..bc4b31029a 100644
Binary files a/public/images/emoji/google/dizzy.png and b/public/images/emoji/google/dizzy.png differ
diff --git a/public/images/emoji/google/dizzy_face.png b/public/images/emoji/google/dizzy_face.png
index eccac861a8..2956cb9e23 100644
Binary files a/public/images/emoji/google/dizzy_face.png and b/public/images/emoji/google/dizzy_face.png differ
diff --git a/public/images/emoji/google/djibouti.png b/public/images/emoji/google/djibouti.png
index 7bc474b64d..18f4c83cff 100644
Binary files a/public/images/emoji/google/djibouti.png and b/public/images/emoji/google/djibouti.png differ
diff --git a/public/images/emoji/google/do_not_litter.png b/public/images/emoji/google/do_not_litter.png
index 8aab5b26dc..64e22aa45a 100644
Binary files a/public/images/emoji/google/do_not_litter.png and b/public/images/emoji/google/do_not_litter.png differ
diff --git a/public/images/emoji/google/dog.png b/public/images/emoji/google/dog.png
index 76429a4bdb..10d887f5ec 100644
Binary files a/public/images/emoji/google/dog.png and b/public/images/emoji/google/dog.png differ
diff --git a/public/images/emoji/google/dog2.png b/public/images/emoji/google/dog2.png
index 6b987ceb72..4ae8781a8b 100644
Binary files a/public/images/emoji/google/dog2.png and b/public/images/emoji/google/dog2.png differ
diff --git a/public/images/emoji/google/dollar.png b/public/images/emoji/google/dollar.png
index b85051719c..cd2a5892d4 100644
Binary files a/public/images/emoji/google/dollar.png and b/public/images/emoji/google/dollar.png differ
diff --git a/public/images/emoji/google/dolls.png b/public/images/emoji/google/dolls.png
index b92315527e..1462ab5558 100644
Binary files a/public/images/emoji/google/dolls.png and b/public/images/emoji/google/dolls.png differ
diff --git a/public/images/emoji/google/dolphin.png b/public/images/emoji/google/dolphin.png
index e768e4031c..6a4db6a8b3 100644
Binary files a/public/images/emoji/google/dolphin.png and b/public/images/emoji/google/dolphin.png differ
diff --git a/public/images/emoji/google/dominica.png b/public/images/emoji/google/dominica.png
index b9a27a6846..857e5d3db0 100644
Binary files a/public/images/emoji/google/dominica.png and b/public/images/emoji/google/dominica.png differ
diff --git a/public/images/emoji/google/dominican_republic.png b/public/images/emoji/google/dominican_republic.png
index 19dd042bb6..ab8c9c2570 100644
Binary files a/public/images/emoji/google/dominican_republic.png and b/public/images/emoji/google/dominican_republic.png differ
diff --git a/public/images/emoji/google/door.png b/public/images/emoji/google/door.png
index 71ad017a2a..9cd796acf3 100644
Binary files a/public/images/emoji/google/door.png and b/public/images/emoji/google/door.png differ
diff --git a/public/images/emoji/google/double_vertical_bar.png b/public/images/emoji/google/double_vertical_bar.png
index 31613a9320..6e0b69634e 100644
Binary files a/public/images/emoji/google/double_vertical_bar.png and b/public/images/emoji/google/double_vertical_bar.png differ
diff --git a/public/images/emoji/google/doughnut.png b/public/images/emoji/google/doughnut.png
index ff13ae964d..9e5d43ee74 100644
Binary files a/public/images/emoji/google/doughnut.png and b/public/images/emoji/google/doughnut.png differ
diff --git a/public/images/emoji/google/dove.png b/public/images/emoji/google/dove.png
index 985b545493..60bc1f9e9a 100644
Binary files a/public/images/emoji/google/dove.png and b/public/images/emoji/google/dove.png differ
diff --git a/public/images/emoji/google/dove_of_peace.png b/public/images/emoji/google/dove_of_peace.png
index 985b545493..60bc1f9e9a 100644
Binary files a/public/images/emoji/google/dove_of_peace.png and b/public/images/emoji/google/dove_of_peace.png differ
diff --git a/public/images/emoji/google/dragon.png b/public/images/emoji/google/dragon.png
index ec1ae43233..618bbf1599 100644
Binary files a/public/images/emoji/google/dragon.png and b/public/images/emoji/google/dragon.png differ
diff --git a/public/images/emoji/google/dragon_face.png b/public/images/emoji/google/dragon_face.png
index a22bf81f9a..b256dc5311 100644
Binary files a/public/images/emoji/google/dragon_face.png and b/public/images/emoji/google/dragon_face.png differ
diff --git a/public/images/emoji/google/dress.png b/public/images/emoji/google/dress.png
index fade5244a6..981f76bbe5 100644
Binary files a/public/images/emoji/google/dress.png and b/public/images/emoji/google/dress.png differ
diff --git a/public/images/emoji/google/dromedary_camel.png b/public/images/emoji/google/dromedary_camel.png
index 4a10722800..ca3eb91d09 100644
Binary files a/public/images/emoji/google/dromedary_camel.png and b/public/images/emoji/google/dromedary_camel.png differ
diff --git a/public/images/emoji/google/drooling_face.png b/public/images/emoji/google/drooling_face.png
index ea720c9125..9659d5c56d 100644
Binary files a/public/images/emoji/google/drooling_face.png and b/public/images/emoji/google/drooling_face.png differ
diff --git a/public/images/emoji/google/droplet.png b/public/images/emoji/google/droplet.png
index 2e57daba01..6c0d7d2e06 100644
Binary files a/public/images/emoji/google/droplet.png and b/public/images/emoji/google/droplet.png differ
diff --git a/public/images/emoji/google/drum.png b/public/images/emoji/google/drum.png
index 884c12370a..769b8750ee 100644
Binary files a/public/images/emoji/google/drum.png and b/public/images/emoji/google/drum.png differ
diff --git a/public/images/emoji/google/duck.png b/public/images/emoji/google/duck.png
index 3a00bf4527..c010d6687b 100644
Binary files a/public/images/emoji/google/duck.png and b/public/images/emoji/google/duck.png differ
diff --git a/public/images/emoji/google/dumpling.png b/public/images/emoji/google/dumpling.png
index c013fe1d7a..86a7034319 100644
Binary files a/public/images/emoji/google/dumpling.png and b/public/images/emoji/google/dumpling.png differ
diff --git a/public/images/emoji/google/dvd.png b/public/images/emoji/google/dvd.png
index ae36022639..467a13c313 100644
Binary files a/public/images/emoji/google/dvd.png and b/public/images/emoji/google/dvd.png differ
diff --git a/public/images/emoji/google/e-mail.png b/public/images/emoji/google/e-mail.png
index 333a70ea08..8d22dbe77c 100644
Binary files a/public/images/emoji/google/e-mail.png and b/public/images/emoji/google/e-mail.png differ
diff --git a/public/images/emoji/google/eagle.png b/public/images/emoji/google/eagle.png
index 8bed5acca5..4450af32f5 100644
Binary files a/public/images/emoji/google/eagle.png and b/public/images/emoji/google/eagle.png differ
diff --git a/public/images/emoji/google/ear.png b/public/images/emoji/google/ear.png
index 48c27113ff..79f258c08c 100644
Binary files a/public/images/emoji/google/ear.png and b/public/images/emoji/google/ear.png differ
diff --git a/public/images/emoji/google/ear/2.png b/public/images/emoji/google/ear/2.png
index 7d3c1ad12a..2c6a11e6ed 100644
Binary files a/public/images/emoji/google/ear/2.png and b/public/images/emoji/google/ear/2.png differ
diff --git a/public/images/emoji/google/ear/3.png b/public/images/emoji/google/ear/3.png
index 68b0ce8858..6b5d1eb263 100644
Binary files a/public/images/emoji/google/ear/3.png and b/public/images/emoji/google/ear/3.png differ
diff --git a/public/images/emoji/google/ear/4.png b/public/images/emoji/google/ear/4.png
index b8b95f071f..954725c0f9 100644
Binary files a/public/images/emoji/google/ear/4.png and b/public/images/emoji/google/ear/4.png differ
diff --git a/public/images/emoji/google/ear/5.png b/public/images/emoji/google/ear/5.png
index 80974cba32..e993393e33 100644
Binary files a/public/images/emoji/google/ear/5.png and b/public/images/emoji/google/ear/5.png differ
diff --git a/public/images/emoji/google/ear/6.png b/public/images/emoji/google/ear/6.png
index c8daaed81e..aabe4328a3 100644
Binary files a/public/images/emoji/google/ear/6.png and b/public/images/emoji/google/ear/6.png differ
diff --git a/public/images/emoji/google/ear_of_rice.png b/public/images/emoji/google/ear_of_rice.png
index ae65174881..be92823950 100644
Binary files a/public/images/emoji/google/ear_of_rice.png and b/public/images/emoji/google/ear_of_rice.png differ
diff --git a/public/images/emoji/google/earth_africa.png b/public/images/emoji/google/earth_africa.png
index cd2cb281dc..0f37c9adad 100644
Binary files a/public/images/emoji/google/earth_africa.png and b/public/images/emoji/google/earth_africa.png differ
diff --git a/public/images/emoji/google/earth_americas.png b/public/images/emoji/google/earth_americas.png
index fa95574e90..c7d6b9f10d 100644
Binary files a/public/images/emoji/google/earth_americas.png and b/public/images/emoji/google/earth_americas.png differ
diff --git a/public/images/emoji/google/earth_asia.png b/public/images/emoji/google/earth_asia.png
index 0706e95e92..778ed8f5e8 100644
Binary files a/public/images/emoji/google/earth_asia.png and b/public/images/emoji/google/earth_asia.png differ
diff --git a/public/images/emoji/google/ecuador.png b/public/images/emoji/google/ecuador.png
index a4c0b557b0..af0505296c 100644
Binary files a/public/images/emoji/google/ecuador.png and b/public/images/emoji/google/ecuador.png differ
diff --git a/public/images/emoji/google/egg.png b/public/images/emoji/google/egg.png
index 5c2ba19f51..a90281c839 100644
Binary files a/public/images/emoji/google/egg.png and b/public/images/emoji/google/egg.png differ
diff --git a/public/images/emoji/google/eggplant.png b/public/images/emoji/google/eggplant.png
index ef1fcd659f..3f9e393587 100644
Binary files a/public/images/emoji/google/eggplant.png and b/public/images/emoji/google/eggplant.png differ
diff --git a/public/images/emoji/google/egypt.png b/public/images/emoji/google/egypt.png
index dc64def716..59854066ef 100644
Binary files a/public/images/emoji/google/egypt.png and b/public/images/emoji/google/egypt.png differ
diff --git a/public/images/emoji/google/eight.png b/public/images/emoji/google/eight.png
index d6bfa97b33..c1d5dfc9e5 100644
Binary files a/public/images/emoji/google/eight.png and b/public/images/emoji/google/eight.png differ
diff --git a/public/images/emoji/google/eight_pointed_black_star.png b/public/images/emoji/google/eight_pointed_black_star.png
index c579846b3c..a1a4e41a56 100644
Binary files a/public/images/emoji/google/eight_pointed_black_star.png and b/public/images/emoji/google/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/google/eight_spoked_asterisk.png b/public/images/emoji/google/eight_spoked_asterisk.png
index ac9a777cd1..58d1ad6b24 100644
Binary files a/public/images/emoji/google/eight_spoked_asterisk.png and b/public/images/emoji/google/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/google/el_salvador.png b/public/images/emoji/google/el_salvador.png
index f5bf8e8fbd..d76c5efd16 100644
Binary files a/public/images/emoji/google/el_salvador.png and b/public/images/emoji/google/el_salvador.png differ
diff --git a/public/images/emoji/google/electric_plug.png b/public/images/emoji/google/electric_plug.png
index 0ed8973271..e42fcabaee 100644
Binary files a/public/images/emoji/google/electric_plug.png and b/public/images/emoji/google/electric_plug.png differ
diff --git a/public/images/emoji/google/elephant.png b/public/images/emoji/google/elephant.png
index 82ffbef366..35d2d38953 100644
Binary files a/public/images/emoji/google/elephant.png and b/public/images/emoji/google/elephant.png differ
diff --git a/public/images/emoji/google/elf.png b/public/images/emoji/google/elf.png
index 7f13711c3e..7a5181c2a6 100644
Binary files a/public/images/emoji/google/elf.png and b/public/images/emoji/google/elf.png differ
diff --git a/public/images/emoji/google/elf/2.png b/public/images/emoji/google/elf/2.png
index 18183cdf5d..b2de301099 100644
Binary files a/public/images/emoji/google/elf/2.png and b/public/images/emoji/google/elf/2.png differ
diff --git a/public/images/emoji/google/elf/3.png b/public/images/emoji/google/elf/3.png
index 5f3bd85830..1262ce02d6 100644
Binary files a/public/images/emoji/google/elf/3.png and b/public/images/emoji/google/elf/3.png differ
diff --git a/public/images/emoji/google/elf/4.png b/public/images/emoji/google/elf/4.png
index 7b936f8f59..02b1f1fbde 100644
Binary files a/public/images/emoji/google/elf/4.png and b/public/images/emoji/google/elf/4.png differ
diff --git a/public/images/emoji/google/elf/5.png b/public/images/emoji/google/elf/5.png
index 5af1e1f219..0c7eb72d40 100644
Binary files a/public/images/emoji/google/elf/5.png and b/public/images/emoji/google/elf/5.png differ
diff --git a/public/images/emoji/google/elf/6.png b/public/images/emoji/google/elf/6.png
index 3db350cc16..b8e8a30183 100644
Binary files a/public/images/emoji/google/elf/6.png and b/public/images/emoji/google/elf/6.png differ
diff --git a/public/images/emoji/google/email.png b/public/images/emoji/google/email.png
index 333a70ea08..8d22dbe77c 100644
Binary files a/public/images/emoji/google/email.png and b/public/images/emoji/google/email.png differ
diff --git a/public/images/emoji/google/end.png b/public/images/emoji/google/end.png
index 2ff3a095e6..c19398bc5a 100644
Binary files a/public/images/emoji/google/end.png and b/public/images/emoji/google/end.png differ
diff --git a/public/images/emoji/google/envelope.png b/public/images/emoji/google/envelope.png
index 333a70ea08..8d22dbe77c 100644
Binary files a/public/images/emoji/google/envelope.png and b/public/images/emoji/google/envelope.png differ
diff --git a/public/images/emoji/google/envelope_with_arrow.png b/public/images/emoji/google/envelope_with_arrow.png
index 29ddb7ea63..ea4cfc79c4 100644
Binary files a/public/images/emoji/google/envelope_with_arrow.png and b/public/images/emoji/google/envelope_with_arrow.png differ
diff --git a/public/images/emoji/google/equatorial_guinea.png b/public/images/emoji/google/equatorial_guinea.png
index 1847227c71..61fe3a6ae7 100644
Binary files a/public/images/emoji/google/equatorial_guinea.png and b/public/images/emoji/google/equatorial_guinea.png differ
diff --git a/public/images/emoji/google/eritrea.png b/public/images/emoji/google/eritrea.png
index fbd7ce17bb..7a8134e58d 100644
Binary files a/public/images/emoji/google/eritrea.png and b/public/images/emoji/google/eritrea.png differ
diff --git a/public/images/emoji/google/es.png b/public/images/emoji/google/es.png
index 55bba05171..d46ba95844 100644
Binary files a/public/images/emoji/google/es.png and b/public/images/emoji/google/es.png differ
diff --git a/public/images/emoji/google/estonia.png b/public/images/emoji/google/estonia.png
index cbee9fc6ae..f7957ed223 100644
Binary files a/public/images/emoji/google/estonia.png and b/public/images/emoji/google/estonia.png differ
diff --git a/public/images/emoji/google/ethiopia.png b/public/images/emoji/google/ethiopia.png
index 7ba22073eb..026e49b254 100644
Binary files a/public/images/emoji/google/ethiopia.png and b/public/images/emoji/google/ethiopia.png differ
diff --git a/public/images/emoji/google/eu.png b/public/images/emoji/google/eu.png
index 02f79b58a5..23496febc7 100644
Binary files a/public/images/emoji/google/eu.png and b/public/images/emoji/google/eu.png differ
diff --git a/public/images/emoji/google/euro.png b/public/images/emoji/google/euro.png
index 4bd0e68827..d9d4013aba 100644
Binary files a/public/images/emoji/google/euro.png and b/public/images/emoji/google/euro.png differ
diff --git a/public/images/emoji/google/european_castle.png b/public/images/emoji/google/european_castle.png
index 0be9efa539..b818e32b18 100644
Binary files a/public/images/emoji/google/european_castle.png and b/public/images/emoji/google/european_castle.png differ
diff --git a/public/images/emoji/google/european_post_office.png b/public/images/emoji/google/european_post_office.png
index 4f6fc8c247..39fb3f261b 100644
Binary files a/public/images/emoji/google/european_post_office.png and b/public/images/emoji/google/european_post_office.png differ
diff --git a/public/images/emoji/google/evergreen_tree.png b/public/images/emoji/google/evergreen_tree.png
index 5df8a196db..1e29a1be5a 100644
Binary files a/public/images/emoji/google/evergreen_tree.png and b/public/images/emoji/google/evergreen_tree.png differ
diff --git a/public/images/emoji/google/exclamation.png b/public/images/emoji/google/exclamation.png
index 71429ae649..b9037e77aa 100644
Binary files a/public/images/emoji/google/exclamation.png and b/public/images/emoji/google/exclamation.png differ
diff --git a/public/images/emoji/google/exploding_head.png b/public/images/emoji/google/exploding_head.png
index fc76cf40b3..42ea76dc0b 100644
Binary files a/public/images/emoji/google/exploding_head.png and b/public/images/emoji/google/exploding_head.png differ
diff --git a/public/images/emoji/google/expressionless.png b/public/images/emoji/google/expressionless.png
index 8a57855d70..6ffc551b69 100644
Binary files a/public/images/emoji/google/expressionless.png and b/public/images/emoji/google/expressionless.png differ
diff --git a/public/images/emoji/google/eye.png b/public/images/emoji/google/eye.png
index 3f7c182094..6dbd5a0341 100644
Binary files a/public/images/emoji/google/eye.png and b/public/images/emoji/google/eye.png differ
diff --git a/public/images/emoji/google/eyeglasses.png b/public/images/emoji/google/eyeglasses.png
index 8507c7f9ab..eff784e5d3 100644
Binary files a/public/images/emoji/google/eyeglasses.png and b/public/images/emoji/google/eyeglasses.png differ
diff --git a/public/images/emoji/google/eyes.png b/public/images/emoji/google/eyes.png
index 52dd4f221d..35e9ed21be 100644
Binary files a/public/images/emoji/google/eyes.png and b/public/images/emoji/google/eyes.png differ
diff --git a/public/images/emoji/google/face_vomiting.png b/public/images/emoji/google/face_vomiting.png
index 017495f7e0..d3ce5f69bd 100644
Binary files a/public/images/emoji/google/face_vomiting.png and b/public/images/emoji/google/face_vomiting.png differ
diff --git a/public/images/emoji/google/face_with_hand_over_mouth.png b/public/images/emoji/google/face_with_hand_over_mouth.png
index 1f15c0df7e..d965e07a83 100644
Binary files a/public/images/emoji/google/face_with_hand_over_mouth.png and b/public/images/emoji/google/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/google/face_with_head_bandage.png b/public/images/emoji/google/face_with_head_bandage.png
index e07d929a27..8618abf0ee 100644
Binary files a/public/images/emoji/google/face_with_head_bandage.png and b/public/images/emoji/google/face_with_head_bandage.png differ
diff --git a/public/images/emoji/google/face_with_monocle.png b/public/images/emoji/google/face_with_monocle.png
index 129e9e4f54..b08f768088 100644
Binary files a/public/images/emoji/google/face_with_monocle.png and b/public/images/emoji/google/face_with_monocle.png differ
diff --git a/public/images/emoji/google/face_with_raised_eyebrow.png b/public/images/emoji/google/face_with_raised_eyebrow.png
index f407c190e3..778435a939 100644
Binary files a/public/images/emoji/google/face_with_raised_eyebrow.png and b/public/images/emoji/google/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/google/face_with_rolling_eyes.png b/public/images/emoji/google/face_with_rolling_eyes.png
index 8485fcbe1c..55577e34a9 100644
Binary files a/public/images/emoji/google/face_with_rolling_eyes.png and b/public/images/emoji/google/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/google/face_with_symbols_over_mouth.png b/public/images/emoji/google/face_with_symbols_over_mouth.png
index 43d27aea0b..ae0735e8bf 100644
Binary files a/public/images/emoji/google/face_with_symbols_over_mouth.png and b/public/images/emoji/google/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/google/face_with_thermometer.png b/public/images/emoji/google/face_with_thermometer.png
index 82bdbf6335..296fe80618 100644
Binary files a/public/images/emoji/google/face_with_thermometer.png and b/public/images/emoji/google/face_with_thermometer.png differ
diff --git a/public/images/emoji/google/facepunch.png b/public/images/emoji/google/facepunch.png
index f05a3f6d14..2ef7ed2091 100644
Binary files a/public/images/emoji/google/facepunch.png and b/public/images/emoji/google/facepunch.png differ
diff --git a/public/images/emoji/google/facepunch/2.png b/public/images/emoji/google/facepunch/2.png
index bba3d6fe12..a545c376ac 100644
Binary files a/public/images/emoji/google/facepunch/2.png and b/public/images/emoji/google/facepunch/2.png differ
diff --git a/public/images/emoji/google/facepunch/3.png b/public/images/emoji/google/facepunch/3.png
index 123e445030..03e2a4fc1b 100644
Binary files a/public/images/emoji/google/facepunch/3.png and b/public/images/emoji/google/facepunch/3.png differ
diff --git a/public/images/emoji/google/facepunch/4.png b/public/images/emoji/google/facepunch/4.png
index 974055c628..bfb48350fc 100644
Binary files a/public/images/emoji/google/facepunch/4.png and b/public/images/emoji/google/facepunch/4.png differ
diff --git a/public/images/emoji/google/facepunch/5.png b/public/images/emoji/google/facepunch/5.png
index 3f068a0f95..5f57f2ba46 100644
Binary files a/public/images/emoji/google/facepunch/5.png and b/public/images/emoji/google/facepunch/5.png differ
diff --git a/public/images/emoji/google/facepunch/6.png b/public/images/emoji/google/facepunch/6.png
index 798a95d9fd..66067147f9 100644
Binary files a/public/images/emoji/google/facepunch/6.png and b/public/images/emoji/google/facepunch/6.png differ
diff --git a/public/images/emoji/google/factory.png b/public/images/emoji/google/factory.png
index 4ba2516a85..5ba250b02e 100644
Binary files a/public/images/emoji/google/factory.png and b/public/images/emoji/google/factory.png differ
diff --git a/public/images/emoji/google/fairy.png b/public/images/emoji/google/fairy.png
index a50d75d624..ddec9b8338 100644
Binary files a/public/images/emoji/google/fairy.png and b/public/images/emoji/google/fairy.png differ
diff --git a/public/images/emoji/google/fairy/2.png b/public/images/emoji/google/fairy/2.png
index 71db8fcbb2..3f47fea29d 100644
Binary files a/public/images/emoji/google/fairy/2.png and b/public/images/emoji/google/fairy/2.png differ
diff --git a/public/images/emoji/google/fairy/3.png b/public/images/emoji/google/fairy/3.png
index 939c3fec82..d3979eaa6d 100644
Binary files a/public/images/emoji/google/fairy/3.png and b/public/images/emoji/google/fairy/3.png differ
diff --git a/public/images/emoji/google/fairy/4.png b/public/images/emoji/google/fairy/4.png
index 4f7ea1dac7..702f5401b7 100644
Binary files a/public/images/emoji/google/fairy/4.png and b/public/images/emoji/google/fairy/4.png differ
diff --git a/public/images/emoji/google/fairy/5.png b/public/images/emoji/google/fairy/5.png
index 80e3e07ff9..0b30afcb04 100644
Binary files a/public/images/emoji/google/fairy/5.png and b/public/images/emoji/google/fairy/5.png differ
diff --git a/public/images/emoji/google/fairy/6.png b/public/images/emoji/google/fairy/6.png
index 72e4457ec1..795a0d301f 100644
Binary files a/public/images/emoji/google/fairy/6.png and b/public/images/emoji/google/fairy/6.png differ
diff --git a/public/images/emoji/google/falkland_islands.png b/public/images/emoji/google/falkland_islands.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/falkland_islands.png and b/public/images/emoji/google/falkland_islands.png differ
diff --git a/public/images/emoji/google/fallen_leaf.png b/public/images/emoji/google/fallen_leaf.png
index a64ee52526..36558e98e3 100644
Binary files a/public/images/emoji/google/fallen_leaf.png and b/public/images/emoji/google/fallen_leaf.png differ
diff --git a/public/images/emoji/google/family.png b/public/images/emoji/google/family.png
index 3b719a82a0..8ab2ce0b95 100644
Binary files a/public/images/emoji/google/family.png and b/public/images/emoji/google/family.png differ
diff --git a/public/images/emoji/google/family_man_boy.png b/public/images/emoji/google/family_man_boy.png
index ea1ba13d52..93014de1c2 100644
Binary files a/public/images/emoji/google/family_man_boy.png and b/public/images/emoji/google/family_man_boy.png differ
diff --git a/public/images/emoji/google/family_man_boy_boy.png b/public/images/emoji/google/family_man_boy_boy.png
index 6739fec828..210034c60c 100644
Binary files a/public/images/emoji/google/family_man_boy_boy.png and b/public/images/emoji/google/family_man_boy_boy.png differ
diff --git a/public/images/emoji/google/family_man_girl.png b/public/images/emoji/google/family_man_girl.png
index 0bd8bb9085..8b78af075f 100644
Binary files a/public/images/emoji/google/family_man_girl.png and b/public/images/emoji/google/family_man_girl.png differ
diff --git a/public/images/emoji/google/family_man_girl_boy.png b/public/images/emoji/google/family_man_girl_boy.png
index 407f88f33b..1c0e714a74 100644
Binary files a/public/images/emoji/google/family_man_girl_boy.png and b/public/images/emoji/google/family_man_girl_boy.png differ
diff --git a/public/images/emoji/google/family_man_girl_girl.png b/public/images/emoji/google/family_man_girl_girl.png
index f9626d9ef6..4de877ae33 100644
Binary files a/public/images/emoji/google/family_man_girl_girl.png and b/public/images/emoji/google/family_man_girl_girl.png differ
diff --git a/public/images/emoji/google/family_man_man_boy.png b/public/images/emoji/google/family_man_man_boy.png
index 47f7d7b3a4..207ec96ce5 100644
Binary files a/public/images/emoji/google/family_man_man_boy.png and b/public/images/emoji/google/family_man_man_boy.png differ
diff --git a/public/images/emoji/google/family_man_man_boy_boy.png b/public/images/emoji/google/family_man_man_boy_boy.png
index 631a4aa6f2..50cb7f5225 100644
Binary files a/public/images/emoji/google/family_man_man_boy_boy.png and b/public/images/emoji/google/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/google/family_man_man_girl.png b/public/images/emoji/google/family_man_man_girl.png
index 58e99a1d31..efd6fcfeb7 100644
Binary files a/public/images/emoji/google/family_man_man_girl.png and b/public/images/emoji/google/family_man_man_girl.png differ
diff --git a/public/images/emoji/google/family_man_man_girl_boy.png b/public/images/emoji/google/family_man_man_girl_boy.png
index 9f48292151..b2cab1c97d 100644
Binary files a/public/images/emoji/google/family_man_man_girl_boy.png and b/public/images/emoji/google/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/google/family_man_man_girl_girl.png b/public/images/emoji/google/family_man_man_girl_girl.png
index 31b20d2aa8..e913a910fc 100644
Binary files a/public/images/emoji/google/family_man_man_girl_girl.png and b/public/images/emoji/google/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/google/family_man_woman_boy.png b/public/images/emoji/google/family_man_woman_boy.png
index da5b683e78..141f756a55 100644
Binary files a/public/images/emoji/google/family_man_woman_boy.png and b/public/images/emoji/google/family_man_woman_boy.png differ
diff --git a/public/images/emoji/google/family_man_woman_boy_boy.png b/public/images/emoji/google/family_man_woman_boy_boy.png
index 2322faad90..6eb38cba5b 100644
Binary files a/public/images/emoji/google/family_man_woman_boy_boy.png and b/public/images/emoji/google/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/google/family_man_woman_boys.png b/public/images/emoji/google/family_man_woman_boys.png
index 2322faad90..6eb38cba5b 100644
Binary files a/public/images/emoji/google/family_man_woman_boys.png and b/public/images/emoji/google/family_man_woman_boys.png differ
diff --git a/public/images/emoji/google/family_man_woman_girl.png b/public/images/emoji/google/family_man_woman_girl.png
index 63af73ac22..4ba95b4bde 100644
Binary files a/public/images/emoji/google/family_man_woman_girl.png and b/public/images/emoji/google/family_man_woman_girl.png differ
diff --git a/public/images/emoji/google/family_man_woman_girl_boy.png b/public/images/emoji/google/family_man_woman_girl_boy.png
index 3b719a82a0..8ab2ce0b95 100644
Binary files a/public/images/emoji/google/family_man_woman_girl_boy.png and b/public/images/emoji/google/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/google/family_man_woman_girl_girl.png b/public/images/emoji/google/family_man_woman_girl_girl.png
index c62b2c0e81..83d6ec866f 100644
Binary files a/public/images/emoji/google/family_man_woman_girl_girl.png and b/public/images/emoji/google/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/google/family_man_woman_girls.png b/public/images/emoji/google/family_man_woman_girls.png
index c62b2c0e81..83d6ec866f 100644
Binary files a/public/images/emoji/google/family_man_woman_girls.png and b/public/images/emoji/google/family_man_woman_girls.png differ
diff --git a/public/images/emoji/google/family_men_boy.png b/public/images/emoji/google/family_men_boy.png
index 47f7d7b3a4..207ec96ce5 100644
Binary files a/public/images/emoji/google/family_men_boy.png and b/public/images/emoji/google/family_men_boy.png differ
diff --git a/public/images/emoji/google/family_men_boys.png b/public/images/emoji/google/family_men_boys.png
index 631a4aa6f2..50cb7f5225 100644
Binary files a/public/images/emoji/google/family_men_boys.png and b/public/images/emoji/google/family_men_boys.png differ
diff --git a/public/images/emoji/google/family_men_girl.png b/public/images/emoji/google/family_men_girl.png
index 58e99a1d31..efd6fcfeb7 100644
Binary files a/public/images/emoji/google/family_men_girl.png and b/public/images/emoji/google/family_men_girl.png differ
diff --git a/public/images/emoji/google/family_men_girl_boy.png b/public/images/emoji/google/family_men_girl_boy.png
index 9f48292151..b2cab1c97d 100644
Binary files a/public/images/emoji/google/family_men_girl_boy.png and b/public/images/emoji/google/family_men_girl_boy.png differ
diff --git a/public/images/emoji/google/family_men_girls.png b/public/images/emoji/google/family_men_girls.png
index 31b20d2aa8..e913a910fc 100644
Binary files a/public/images/emoji/google/family_men_girls.png and b/public/images/emoji/google/family_men_girls.png differ
diff --git a/public/images/emoji/google/family_woman_boy.png b/public/images/emoji/google/family_woman_boy.png
index 7c96ecd94f..2858bbedf1 100644
Binary files a/public/images/emoji/google/family_woman_boy.png and b/public/images/emoji/google/family_woman_boy.png differ
diff --git a/public/images/emoji/google/family_woman_boy_boy.png b/public/images/emoji/google/family_woman_boy_boy.png
index 0a8214dd6b..7f45656e36 100644
Binary files a/public/images/emoji/google/family_woman_boy_boy.png and b/public/images/emoji/google/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/google/family_woman_girl.png b/public/images/emoji/google/family_woman_girl.png
index 16fd9b1e56..2948674f29 100644
Binary files a/public/images/emoji/google/family_woman_girl.png and b/public/images/emoji/google/family_woman_girl.png differ
diff --git a/public/images/emoji/google/family_woman_girl_boy.png b/public/images/emoji/google/family_woman_girl_boy.png
index 0e36fc3fe3..50a2510a74 100644
Binary files a/public/images/emoji/google/family_woman_girl_boy.png and b/public/images/emoji/google/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/google/family_woman_girl_girl.png b/public/images/emoji/google/family_woman_girl_girl.png
index 7d261d1806..4751357bb0 100644
Binary files a/public/images/emoji/google/family_woman_girl_girl.png and b/public/images/emoji/google/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/google/family_woman_woman_boy.png b/public/images/emoji/google/family_woman_woman_boy.png
index 55c5716c6b..55a0ea5814 100644
Binary files a/public/images/emoji/google/family_woman_woman_boy.png and b/public/images/emoji/google/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/google/family_woman_woman_boy_boy.png b/public/images/emoji/google/family_woman_woman_boy_boy.png
index a0c6560b50..793d5e3432 100644
Binary files a/public/images/emoji/google/family_woman_woman_boy_boy.png and b/public/images/emoji/google/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/google/family_woman_woman_girl.png b/public/images/emoji/google/family_woman_woman_girl.png
index dfd392a489..abafe71f60 100644
Binary files a/public/images/emoji/google/family_woman_woman_girl.png and b/public/images/emoji/google/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/google/family_woman_woman_girl_boy.png b/public/images/emoji/google/family_woman_woman_girl_boy.png
index 4f9d9b92ce..7a2c267fc7 100644
Binary files a/public/images/emoji/google/family_woman_woman_girl_boy.png and b/public/images/emoji/google/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/google/family_woman_woman_girl_girl.png b/public/images/emoji/google/family_woman_woman_girl_girl.png
index 1c1cbe3dd4..7e07c19c2e 100644
Binary files a/public/images/emoji/google/family_woman_woman_girl_girl.png and b/public/images/emoji/google/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/google/family_women_boy.png b/public/images/emoji/google/family_women_boy.png
index 55c5716c6b..55a0ea5814 100644
Binary files a/public/images/emoji/google/family_women_boy.png and b/public/images/emoji/google/family_women_boy.png differ
diff --git a/public/images/emoji/google/family_women_boys.png b/public/images/emoji/google/family_women_boys.png
index a0c6560b50..793d5e3432 100644
Binary files a/public/images/emoji/google/family_women_boys.png and b/public/images/emoji/google/family_women_boys.png differ
diff --git a/public/images/emoji/google/family_women_girl.png b/public/images/emoji/google/family_women_girl.png
index dfd392a489..abafe71f60 100644
Binary files a/public/images/emoji/google/family_women_girl.png and b/public/images/emoji/google/family_women_girl.png differ
diff --git a/public/images/emoji/google/family_women_girl_boy.png b/public/images/emoji/google/family_women_girl_boy.png
index 4f9d9b92ce..7a2c267fc7 100644
Binary files a/public/images/emoji/google/family_women_girl_boy.png and b/public/images/emoji/google/family_women_girl_boy.png differ
diff --git a/public/images/emoji/google/family_women_girls.png b/public/images/emoji/google/family_women_girls.png
index 1c1cbe3dd4..7e07c19c2e 100644
Binary files a/public/images/emoji/google/family_women_girls.png and b/public/images/emoji/google/family_women_girls.png differ
diff --git a/public/images/emoji/google/faroe_islands.png b/public/images/emoji/google/faroe_islands.png
index 310868b981..70546f10e1 100644
Binary files a/public/images/emoji/google/faroe_islands.png and b/public/images/emoji/google/faroe_islands.png differ
diff --git a/public/images/emoji/google/fast_forward.png b/public/images/emoji/google/fast_forward.png
index 55a179f18e..b71d3c68ba 100644
Binary files a/public/images/emoji/google/fast_forward.png and b/public/images/emoji/google/fast_forward.png differ
diff --git a/public/images/emoji/google/fax.png b/public/images/emoji/google/fax.png
index fc119f7408..633119cf9a 100644
Binary files a/public/images/emoji/google/fax.png and b/public/images/emoji/google/fax.png differ
diff --git a/public/images/emoji/google/fearful.png b/public/images/emoji/google/fearful.png
index c0ff5ed9a3..04e86b5709 100644
Binary files a/public/images/emoji/google/fearful.png and b/public/images/emoji/google/fearful.png differ
diff --git a/public/images/emoji/google/feet.png b/public/images/emoji/google/feet.png
index 3174810628..afb3166151 100644
Binary files a/public/images/emoji/google/feet.png and b/public/images/emoji/google/feet.png differ
diff --git a/public/images/emoji/google/female_couple_with_heart.png b/public/images/emoji/google/female_couple_with_heart.png
index 8eda1e8d84..f4b433aa95 100644
Binary files a/public/images/emoji/google/female_couple_with_heart.png and b/public/images/emoji/google/female_couple_with_heart.png differ
diff --git a/public/images/emoji/google/female_couplekiss.png b/public/images/emoji/google/female_couplekiss.png
index 7cd2d2ebdd..0e516e9376 100644
Binary files a/public/images/emoji/google/female_couplekiss.png and b/public/images/emoji/google/female_couplekiss.png differ
diff --git a/public/images/emoji/google/female_detective.png b/public/images/emoji/google/female_detective.png
index 2b5f2e9dcc..256199d4aa 100644
Binary files a/public/images/emoji/google/female_detective.png and b/public/images/emoji/google/female_detective.png differ
diff --git a/public/images/emoji/google/ferris_wheel.png b/public/images/emoji/google/ferris_wheel.png
index 2ebf2a6fab..ef08c478ac 100644
Binary files a/public/images/emoji/google/ferris_wheel.png and b/public/images/emoji/google/ferris_wheel.png differ
diff --git a/public/images/emoji/google/ferry.png b/public/images/emoji/google/ferry.png
index 67e10337a2..e81c20eddc 100644
Binary files a/public/images/emoji/google/ferry.png and b/public/images/emoji/google/ferry.png differ
diff --git a/public/images/emoji/google/field_hockey.png b/public/images/emoji/google/field_hockey.png
index 1ef09cb540..af49131fb2 100644
Binary files a/public/images/emoji/google/field_hockey.png and b/public/images/emoji/google/field_hockey.png differ
diff --git a/public/images/emoji/google/fiji.png b/public/images/emoji/google/fiji.png
index fd2325f796..1ce07af931 100644
Binary files a/public/images/emoji/google/fiji.png and b/public/images/emoji/google/fiji.png differ
diff --git a/public/images/emoji/google/file_cabinet.png b/public/images/emoji/google/file_cabinet.png
index 1b038f0701..dd1ded02b5 100644
Binary files a/public/images/emoji/google/file_cabinet.png and b/public/images/emoji/google/file_cabinet.png differ
diff --git a/public/images/emoji/google/file_folder.png b/public/images/emoji/google/file_folder.png
index b35d7b6615..202bf1217f 100644
Binary files a/public/images/emoji/google/file_folder.png and b/public/images/emoji/google/file_folder.png differ
diff --git a/public/images/emoji/google/film_frames.png b/public/images/emoji/google/film_frames.png
index 16a6d1da41..ddd02c16eb 100644
Binary files a/public/images/emoji/google/film_frames.png and b/public/images/emoji/google/film_frames.png differ
diff --git a/public/images/emoji/google/film_projector.png b/public/images/emoji/google/film_projector.png
index f957286ba2..a420005a79 100644
Binary files a/public/images/emoji/google/film_projector.png and b/public/images/emoji/google/film_projector.png differ
diff --git a/public/images/emoji/google/film_strip.png b/public/images/emoji/google/film_strip.png
index 16a6d1da41..ddd02c16eb 100644
Binary files a/public/images/emoji/google/film_strip.png and b/public/images/emoji/google/film_strip.png differ
diff --git a/public/images/emoji/google/finland.png b/public/images/emoji/google/finland.png
index 861e00aea2..2e4109ca0c 100644
Binary files a/public/images/emoji/google/finland.png and b/public/images/emoji/google/finland.png differ
diff --git a/public/images/emoji/google/fire.png b/public/images/emoji/google/fire.png
index 7b17db8d7a..56800b219d 100644
Binary files a/public/images/emoji/google/fire.png and b/public/images/emoji/google/fire.png differ
diff --git a/public/images/emoji/google/fire_engine.png b/public/images/emoji/google/fire_engine.png
index e144b15efd..b64569c9cd 100644
Binary files a/public/images/emoji/google/fire_engine.png and b/public/images/emoji/google/fire_engine.png differ
diff --git a/public/images/emoji/google/fireworks.png b/public/images/emoji/google/fireworks.png
index aa6c7d7ea6..48bd693d79 100644
Binary files a/public/images/emoji/google/fireworks.png and b/public/images/emoji/google/fireworks.png differ
diff --git a/public/images/emoji/google/first_quarter_moon.png b/public/images/emoji/google/first_quarter_moon.png
index 1137028aa8..bca9cc51ab 100644
Binary files a/public/images/emoji/google/first_quarter_moon.png and b/public/images/emoji/google/first_quarter_moon.png differ
diff --git a/public/images/emoji/google/first_quarter_moon_with_face.png b/public/images/emoji/google/first_quarter_moon_with_face.png
index f16569616f..7699a212d8 100644
Binary files a/public/images/emoji/google/first_quarter_moon_with_face.png and b/public/images/emoji/google/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/google/fish.png b/public/images/emoji/google/fish.png
index eaafb3810e..f83107734a 100644
Binary files a/public/images/emoji/google/fish.png and b/public/images/emoji/google/fish.png differ
diff --git a/public/images/emoji/google/fish_cake.png b/public/images/emoji/google/fish_cake.png
index 8d6ef5e671..e35ca0af9a 100644
Binary files a/public/images/emoji/google/fish_cake.png and b/public/images/emoji/google/fish_cake.png differ
diff --git a/public/images/emoji/google/fishing_pole_and_fish.png b/public/images/emoji/google/fishing_pole_and_fish.png
index ddecf5b68f..15989dda8a 100644
Binary files a/public/images/emoji/google/fishing_pole_and_fish.png and b/public/images/emoji/google/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/google/fist.png b/public/images/emoji/google/fist.png
index 78968a9a09..c552652293 100644
Binary files a/public/images/emoji/google/fist.png and b/public/images/emoji/google/fist.png differ
diff --git a/public/images/emoji/google/fist/2.png b/public/images/emoji/google/fist/2.png
index 0d41260837..e8d51cb253 100644
Binary files a/public/images/emoji/google/fist/2.png and b/public/images/emoji/google/fist/2.png differ
diff --git a/public/images/emoji/google/fist/3.png b/public/images/emoji/google/fist/3.png
index 14849f92d1..19e06ca32e 100644
Binary files a/public/images/emoji/google/fist/3.png and b/public/images/emoji/google/fist/3.png differ
diff --git a/public/images/emoji/google/fist/4.png b/public/images/emoji/google/fist/4.png
index 46d18a8852..0aee120691 100644
Binary files a/public/images/emoji/google/fist/4.png and b/public/images/emoji/google/fist/4.png differ
diff --git a/public/images/emoji/google/fist/5.png b/public/images/emoji/google/fist/5.png
index fc1435be79..57435b97ce 100644
Binary files a/public/images/emoji/google/fist/5.png and b/public/images/emoji/google/fist/5.png differ
diff --git a/public/images/emoji/google/fist/6.png b/public/images/emoji/google/fist/6.png
index 21a74197bd..682dcdb550 100644
Binary files a/public/images/emoji/google/fist/6.png and b/public/images/emoji/google/fist/6.png differ
diff --git a/public/images/emoji/google/fist_left.png b/public/images/emoji/google/fist_left.png
index 170444849c..8f6421169b 100644
Binary files a/public/images/emoji/google/fist_left.png and b/public/images/emoji/google/fist_left.png differ
diff --git a/public/images/emoji/google/fist_left/2.png b/public/images/emoji/google/fist_left/2.png
index 724c63a767..63c730b9bc 100644
Binary files a/public/images/emoji/google/fist_left/2.png and b/public/images/emoji/google/fist_left/2.png differ
diff --git a/public/images/emoji/google/fist_left/3.png b/public/images/emoji/google/fist_left/3.png
index 8ab9813150..42b24e5ab7 100644
Binary files a/public/images/emoji/google/fist_left/3.png and b/public/images/emoji/google/fist_left/3.png differ
diff --git a/public/images/emoji/google/fist_left/4.png b/public/images/emoji/google/fist_left/4.png
index c7d58e309b..829fb996f3 100644
Binary files a/public/images/emoji/google/fist_left/4.png and b/public/images/emoji/google/fist_left/4.png differ
diff --git a/public/images/emoji/google/fist_left/5.png b/public/images/emoji/google/fist_left/5.png
index 06684b2a47..967d022633 100644
Binary files a/public/images/emoji/google/fist_left/5.png and b/public/images/emoji/google/fist_left/5.png differ
diff --git a/public/images/emoji/google/fist_left/6.png b/public/images/emoji/google/fist_left/6.png
index 2070d12016..591f8d463a 100644
Binary files a/public/images/emoji/google/fist_left/6.png and b/public/images/emoji/google/fist_left/6.png differ
diff --git a/public/images/emoji/google/fist_right.png b/public/images/emoji/google/fist_right.png
index 8b5c83ae57..619830874c 100644
Binary files a/public/images/emoji/google/fist_right.png and b/public/images/emoji/google/fist_right.png differ
diff --git a/public/images/emoji/google/fist_right/2.png b/public/images/emoji/google/fist_right/2.png
index 07e2e7bbfc..6289ded635 100644
Binary files a/public/images/emoji/google/fist_right/2.png and b/public/images/emoji/google/fist_right/2.png differ
diff --git a/public/images/emoji/google/fist_right/3.png b/public/images/emoji/google/fist_right/3.png
index 86dbaf843b..e930c9414e 100644
Binary files a/public/images/emoji/google/fist_right/3.png and b/public/images/emoji/google/fist_right/3.png differ
diff --git a/public/images/emoji/google/fist_right/4.png b/public/images/emoji/google/fist_right/4.png
index 4cd975fa2d..265cef2f21 100644
Binary files a/public/images/emoji/google/fist_right/4.png and b/public/images/emoji/google/fist_right/4.png differ
diff --git a/public/images/emoji/google/fist_right/5.png b/public/images/emoji/google/fist_right/5.png
index c6cc84c9b7..387686201d 100644
Binary files a/public/images/emoji/google/fist_right/5.png and b/public/images/emoji/google/fist_right/5.png differ
diff --git a/public/images/emoji/google/fist_right/6.png b/public/images/emoji/google/fist_right/6.png
index b30ad1986f..418ea9a416 100644
Binary files a/public/images/emoji/google/fist_right/6.png and b/public/images/emoji/google/fist_right/6.png differ
diff --git a/public/images/emoji/google/five.png b/public/images/emoji/google/five.png
index e3557d2324..b1fa2d376d 100644
Binary files a/public/images/emoji/google/five.png and b/public/images/emoji/google/five.png differ
diff --git a/public/images/emoji/google/flag_black.png b/public/images/emoji/google/flag_black.png
index a7fce0c581..fd30f1d882 100644
Binary files a/public/images/emoji/google/flag_black.png and b/public/images/emoji/google/flag_black.png differ
diff --git a/public/images/emoji/google/flag_cn.png b/public/images/emoji/google/flag_cn.png
index 010dddd107..05a72fed32 100644
Binary files a/public/images/emoji/google/flag_cn.png and b/public/images/emoji/google/flag_cn.png differ
diff --git a/public/images/emoji/google/flag_de.png b/public/images/emoji/google/flag_de.png
index e18953b9be..5110b322d1 100644
Binary files a/public/images/emoji/google/flag_de.png and b/public/images/emoji/google/flag_de.png differ
diff --git a/public/images/emoji/google/flag_es.png b/public/images/emoji/google/flag_es.png
index 55bba05171..d46ba95844 100644
Binary files a/public/images/emoji/google/flag_es.png and b/public/images/emoji/google/flag_es.png differ
diff --git a/public/images/emoji/google/flag_fr.png b/public/images/emoji/google/flag_fr.png
index bc63af1def..b836e555de 100644
Binary files a/public/images/emoji/google/flag_fr.png and b/public/images/emoji/google/flag_fr.png differ
diff --git a/public/images/emoji/google/flag_gb.png b/public/images/emoji/google/flag_gb.png
index 798328a1ee..e7f3da7ea8 100644
Binary files a/public/images/emoji/google/flag_gb.png and b/public/images/emoji/google/flag_gb.png differ
diff --git a/public/images/emoji/google/flag_it.png b/public/images/emoji/google/flag_it.png
index 5ae7c53b6f..605e128012 100644
Binary files a/public/images/emoji/google/flag_it.png and b/public/images/emoji/google/flag_it.png differ
diff --git a/public/images/emoji/google/flag_jp.png b/public/images/emoji/google/flag_jp.png
index 72cbebef78..c75dad0d10 100644
Binary files a/public/images/emoji/google/flag_jp.png and b/public/images/emoji/google/flag_jp.png differ
diff --git a/public/images/emoji/google/flag_kr.png b/public/images/emoji/google/flag_kr.png
index 33ead18d8c..048ceeb3e4 100644
Binary files a/public/images/emoji/google/flag_kr.png and b/public/images/emoji/google/flag_kr.png differ
diff --git a/public/images/emoji/google/flag_ru.png b/public/images/emoji/google/flag_ru.png
index a92bbdbb8a..f42d2705cf 100644
Binary files a/public/images/emoji/google/flag_ru.png and b/public/images/emoji/google/flag_ru.png differ
diff --git a/public/images/emoji/google/flag_us.png b/public/images/emoji/google/flag_us.png
index fae4271511..44daa43947 100644
Binary files a/public/images/emoji/google/flag_us.png and b/public/images/emoji/google/flag_us.png differ
diff --git a/public/images/emoji/google/flag_white.png b/public/images/emoji/google/flag_white.png
index 7876a1b95c..07d1f0ac70 100644
Binary files a/public/images/emoji/google/flag_white.png and b/public/images/emoji/google/flag_white.png differ
diff --git a/public/images/emoji/google/flags.png b/public/images/emoji/google/flags.png
index ed7ac4373a..43fb86cb94 100644
Binary files a/public/images/emoji/google/flags.png and b/public/images/emoji/google/flags.png differ
diff --git a/public/images/emoji/google/flame.png b/public/images/emoji/google/flame.png
index 7b17db8d7a..56800b219d 100644
Binary files a/public/images/emoji/google/flame.png and b/public/images/emoji/google/flame.png differ
diff --git a/public/images/emoji/google/flashlight.png b/public/images/emoji/google/flashlight.png
index 5a7b994994..9fa7a8855d 100644
Binary files a/public/images/emoji/google/flashlight.png and b/public/images/emoji/google/flashlight.png differ
diff --git a/public/images/emoji/google/fleur-de-lis.png b/public/images/emoji/google/fleur-de-lis.png
index 04b03079f5..84f1ecdcd7 100644
Binary files a/public/images/emoji/google/fleur-de-lis.png and b/public/images/emoji/google/fleur-de-lis.png differ
diff --git a/public/images/emoji/google/fleur_de_lis.png b/public/images/emoji/google/fleur_de_lis.png
index 04b03079f5..84f1ecdcd7 100644
Binary files a/public/images/emoji/google/fleur_de_lis.png and b/public/images/emoji/google/fleur_de_lis.png differ
diff --git a/public/images/emoji/google/flight_arrival.png b/public/images/emoji/google/flight_arrival.png
index e50c3233c2..baf6de740c 100644
Binary files a/public/images/emoji/google/flight_arrival.png and b/public/images/emoji/google/flight_arrival.png differ
diff --git a/public/images/emoji/google/flight_departure.png b/public/images/emoji/google/flight_departure.png
index 0536d2b45b..c5b13dc088 100644
Binary files a/public/images/emoji/google/flight_departure.png and b/public/images/emoji/google/flight_departure.png differ
diff --git a/public/images/emoji/google/floppy_disk.png b/public/images/emoji/google/floppy_disk.png
index bb0382d33a..e94e5adb09 100644
Binary files a/public/images/emoji/google/floppy_disk.png and b/public/images/emoji/google/floppy_disk.png differ
diff --git a/public/images/emoji/google/flower_playing_cards.png b/public/images/emoji/google/flower_playing_cards.png
index 46102e1a47..347bf56aca 100644
Binary files a/public/images/emoji/google/flower_playing_cards.png and b/public/images/emoji/google/flower_playing_cards.png differ
diff --git a/public/images/emoji/google/flushed.png b/public/images/emoji/google/flushed.png
index 710d69d885..023cde180d 100644
Binary files a/public/images/emoji/google/flushed.png and b/public/images/emoji/google/flushed.png differ
diff --git a/public/images/emoji/google/flying_saucer.png b/public/images/emoji/google/flying_saucer.png
index 084840430f..c1a5dc84ce 100644
Binary files a/public/images/emoji/google/flying_saucer.png and b/public/images/emoji/google/flying_saucer.png differ
diff --git a/public/images/emoji/google/fog.png b/public/images/emoji/google/fog.png
index 223bc9d4ed..6693869c10 100644
Binary files a/public/images/emoji/google/fog.png and b/public/images/emoji/google/fog.png differ
diff --git a/public/images/emoji/google/foggy.png b/public/images/emoji/google/foggy.png
index 825600a627..88b02cdbbd 100644
Binary files a/public/images/emoji/google/foggy.png and b/public/images/emoji/google/foggy.png differ
diff --git a/public/images/emoji/google/football.png b/public/images/emoji/google/football.png
index 99b3759397..40a9177beb 100644
Binary files a/public/images/emoji/google/football.png and b/public/images/emoji/google/football.png differ
diff --git a/public/images/emoji/google/footprints.png b/public/images/emoji/google/footprints.png
index 3174810628..afb3166151 100644
Binary files a/public/images/emoji/google/footprints.png and b/public/images/emoji/google/footprints.png differ
diff --git a/public/images/emoji/google/fork_and_knife.png b/public/images/emoji/google/fork_and_knife.png
index ef075aaa23..25d8e5a2a4 100644
Binary files a/public/images/emoji/google/fork_and_knife.png and b/public/images/emoji/google/fork_and_knife.png differ
diff --git a/public/images/emoji/google/fork_and_knife_with_plate.png b/public/images/emoji/google/fork_and_knife_with_plate.png
index a990ed2cbe..c0ed1e0ed6 100644
Binary files a/public/images/emoji/google/fork_and_knife_with_plate.png and b/public/images/emoji/google/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/google/fork_knife_plate.png b/public/images/emoji/google/fork_knife_plate.png
index a990ed2cbe..c0ed1e0ed6 100644
Binary files a/public/images/emoji/google/fork_knife_plate.png and b/public/images/emoji/google/fork_knife_plate.png differ
diff --git a/public/images/emoji/google/fortune_cookie.png b/public/images/emoji/google/fortune_cookie.png
index 2a869b3482..9874e4d428 100644
Binary files a/public/images/emoji/google/fortune_cookie.png and b/public/images/emoji/google/fortune_cookie.png differ
diff --git a/public/images/emoji/google/fountain.png b/public/images/emoji/google/fountain.png
index 991937cf77..69e14cd2ea 100644
Binary files a/public/images/emoji/google/fountain.png and b/public/images/emoji/google/fountain.png differ
diff --git a/public/images/emoji/google/fountain_pen.png b/public/images/emoji/google/fountain_pen.png
index a06fcdc40e..3d8ba60471 100644
Binary files a/public/images/emoji/google/fountain_pen.png and b/public/images/emoji/google/fountain_pen.png differ
diff --git a/public/images/emoji/google/four.png b/public/images/emoji/google/four.png
index 819b70348c..fa8956aeb5 100644
Binary files a/public/images/emoji/google/four.png and b/public/images/emoji/google/four.png differ
diff --git a/public/images/emoji/google/four_leaf_clover.png b/public/images/emoji/google/four_leaf_clover.png
index cdd7c8219a..120a9a6dd8 100644
Binary files a/public/images/emoji/google/four_leaf_clover.png and b/public/images/emoji/google/four_leaf_clover.png differ
diff --git a/public/images/emoji/google/fox_face.png b/public/images/emoji/google/fox_face.png
index 4cbbe2f566..c53e239571 100644
Binary files a/public/images/emoji/google/fox_face.png and b/public/images/emoji/google/fox_face.png differ
diff --git a/public/images/emoji/google/fr.png b/public/images/emoji/google/fr.png
index bc63af1def..b836e555de 100644
Binary files a/public/images/emoji/google/fr.png and b/public/images/emoji/google/fr.png differ
diff --git a/public/images/emoji/google/frame_photo.png b/public/images/emoji/google/frame_photo.png
index 2e0fbe54bb..ff74a48b6e 100644
Binary files a/public/images/emoji/google/frame_photo.png and b/public/images/emoji/google/frame_photo.png differ
diff --git a/public/images/emoji/google/frame_with_picture.png b/public/images/emoji/google/frame_with_picture.png
index 2e0fbe54bb..ff74a48b6e 100644
Binary files a/public/images/emoji/google/frame_with_picture.png and b/public/images/emoji/google/frame_with_picture.png differ
diff --git a/public/images/emoji/google/framed_picture.png b/public/images/emoji/google/framed_picture.png
index 2e0fbe54bb..ff74a48b6e 100644
Binary files a/public/images/emoji/google/framed_picture.png and b/public/images/emoji/google/framed_picture.png differ
diff --git a/public/images/emoji/google/free.png b/public/images/emoji/google/free.png
index ae1a169d4d..45019d566a 100644
Binary files a/public/images/emoji/google/free.png and b/public/images/emoji/google/free.png differ
diff --git a/public/images/emoji/google/french_guiana.png b/public/images/emoji/google/french_guiana.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/french_guiana.png and b/public/images/emoji/google/french_guiana.png differ
diff --git a/public/images/emoji/google/french_polynesia.png b/public/images/emoji/google/french_polynesia.png
index 2950f28c7a..c9bdb3ae62 100644
Binary files a/public/images/emoji/google/french_polynesia.png and b/public/images/emoji/google/french_polynesia.png differ
diff --git a/public/images/emoji/google/french_southern_territories.png b/public/images/emoji/google/french_southern_territories.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/french_southern_territories.png and b/public/images/emoji/google/french_southern_territories.png differ
diff --git a/public/images/emoji/google/fried_egg.png b/public/images/emoji/google/fried_egg.png
index 5259cc766c..3091a82901 100644
Binary files a/public/images/emoji/google/fried_egg.png and b/public/images/emoji/google/fried_egg.png differ
diff --git a/public/images/emoji/google/fried_shrimp.png b/public/images/emoji/google/fried_shrimp.png
index 6fd40834ea..03d4376047 100644
Binary files a/public/images/emoji/google/fried_shrimp.png and b/public/images/emoji/google/fried_shrimp.png differ
diff --git a/public/images/emoji/google/fries.png b/public/images/emoji/google/fries.png
index be0344d9c2..fa6218a5f1 100644
Binary files a/public/images/emoji/google/fries.png and b/public/images/emoji/google/fries.png differ
diff --git a/public/images/emoji/google/frog.png b/public/images/emoji/google/frog.png
index 52eb71fa2b..f29051d817 100644
Binary files a/public/images/emoji/google/frog.png and b/public/images/emoji/google/frog.png differ
diff --git a/public/images/emoji/google/frowning.png b/public/images/emoji/google/frowning.png
index 401412e202..6ea95a7ce0 100644
Binary files a/public/images/emoji/google/frowning.png and b/public/images/emoji/google/frowning.png differ
diff --git a/public/images/emoji/google/frowning2.png b/public/images/emoji/google/frowning2.png
index 7248eaba8a..a8a41ad7c2 100644
Binary files a/public/images/emoji/google/frowning2.png and b/public/images/emoji/google/frowning2.png differ
diff --git a/public/images/emoji/google/frowning_face.png b/public/images/emoji/google/frowning_face.png
index 7248eaba8a..a8a41ad7c2 100644
Binary files a/public/images/emoji/google/frowning_face.png and b/public/images/emoji/google/frowning_face.png differ
diff --git a/public/images/emoji/google/frowning_man.png b/public/images/emoji/google/frowning_man.png
index e09bd0a790..7c04b60e67 100644
Binary files a/public/images/emoji/google/frowning_man.png and b/public/images/emoji/google/frowning_man.png differ
diff --git a/public/images/emoji/google/frowning_man/2.png b/public/images/emoji/google/frowning_man/2.png
index 8f5bbc4c8c..f62a4e43e9 100644
Binary files a/public/images/emoji/google/frowning_man/2.png and b/public/images/emoji/google/frowning_man/2.png differ
diff --git a/public/images/emoji/google/frowning_man/3.png b/public/images/emoji/google/frowning_man/3.png
index 57bbd5e645..dc9c7b19e9 100644
Binary files a/public/images/emoji/google/frowning_man/3.png and b/public/images/emoji/google/frowning_man/3.png differ
diff --git a/public/images/emoji/google/frowning_man/4.png b/public/images/emoji/google/frowning_man/4.png
index b012c61440..3b6d32f2d8 100644
Binary files a/public/images/emoji/google/frowning_man/4.png and b/public/images/emoji/google/frowning_man/4.png differ
diff --git a/public/images/emoji/google/frowning_man/5.png b/public/images/emoji/google/frowning_man/5.png
index a78912cd69..c7f3f3af05 100644
Binary files a/public/images/emoji/google/frowning_man/5.png and b/public/images/emoji/google/frowning_man/5.png differ
diff --git a/public/images/emoji/google/frowning_man/6.png b/public/images/emoji/google/frowning_man/6.png
index 4da9b0198e..81b5c20f8a 100644
Binary files a/public/images/emoji/google/frowning_man/6.png and b/public/images/emoji/google/frowning_man/6.png differ
diff --git a/public/images/emoji/google/frowning_woman.png b/public/images/emoji/google/frowning_woman.png
index 4667b907dd..0378dfe42e 100644
Binary files a/public/images/emoji/google/frowning_woman.png and b/public/images/emoji/google/frowning_woman.png differ
diff --git a/public/images/emoji/google/frowning_woman/2.png b/public/images/emoji/google/frowning_woman/2.png
index 16f321b8ae..5dfe5baa82 100644
Binary files a/public/images/emoji/google/frowning_woman/2.png and b/public/images/emoji/google/frowning_woman/2.png differ
diff --git a/public/images/emoji/google/frowning_woman/3.png b/public/images/emoji/google/frowning_woman/3.png
index bd6c5e162f..7078357053 100644
Binary files a/public/images/emoji/google/frowning_woman/3.png and b/public/images/emoji/google/frowning_woman/3.png differ
diff --git a/public/images/emoji/google/frowning_woman/4.png b/public/images/emoji/google/frowning_woman/4.png
index 72f848c863..6671e11299 100644
Binary files a/public/images/emoji/google/frowning_woman/4.png and b/public/images/emoji/google/frowning_woman/4.png differ
diff --git a/public/images/emoji/google/frowning_woman/5.png b/public/images/emoji/google/frowning_woman/5.png
index 863caa5433..9d0a301c07 100644
Binary files a/public/images/emoji/google/frowning_woman/5.png and b/public/images/emoji/google/frowning_woman/5.png differ
diff --git a/public/images/emoji/google/frowning_woman/6.png b/public/images/emoji/google/frowning_woman/6.png
index d1936f1123..f41f82046b 100644
Binary files a/public/images/emoji/google/frowning_woman/6.png and b/public/images/emoji/google/frowning_woman/6.png differ
diff --git a/public/images/emoji/google/fu.png b/public/images/emoji/google/fu.png
index 8ce128b147..71e8d8b3e9 100644
Binary files a/public/images/emoji/google/fu.png and b/public/images/emoji/google/fu.png differ
diff --git a/public/images/emoji/google/fu/2.png b/public/images/emoji/google/fu/2.png
index 3313e7e2f0..da4e50ac5e 100644
Binary files a/public/images/emoji/google/fu/2.png and b/public/images/emoji/google/fu/2.png differ
diff --git a/public/images/emoji/google/fu/3.png b/public/images/emoji/google/fu/3.png
index 916b42be04..785bc19455 100644
Binary files a/public/images/emoji/google/fu/3.png and b/public/images/emoji/google/fu/3.png differ
diff --git a/public/images/emoji/google/fu/4.png b/public/images/emoji/google/fu/4.png
index 7ab3507e2c..f55cc136fc 100644
Binary files a/public/images/emoji/google/fu/4.png and b/public/images/emoji/google/fu/4.png differ
diff --git a/public/images/emoji/google/fu/5.png b/public/images/emoji/google/fu/5.png
index aeb15696e6..a2ed1b0443 100644
Binary files a/public/images/emoji/google/fu/5.png and b/public/images/emoji/google/fu/5.png differ
diff --git a/public/images/emoji/google/fu/6.png b/public/images/emoji/google/fu/6.png
index 8e86466514..cf73dfc640 100644
Binary files a/public/images/emoji/google/fu/6.png and b/public/images/emoji/google/fu/6.png differ
diff --git a/public/images/emoji/google/fuelpump.png b/public/images/emoji/google/fuelpump.png
index 1c64f34d06..7f5ed77e62 100644
Binary files a/public/images/emoji/google/fuelpump.png and b/public/images/emoji/google/fuelpump.png differ
diff --git a/public/images/emoji/google/full_moon.png b/public/images/emoji/google/full_moon.png
index 8e591964a8..52e5f1b1d4 100644
Binary files a/public/images/emoji/google/full_moon.png and b/public/images/emoji/google/full_moon.png differ
diff --git a/public/images/emoji/google/full_moon_with_face.png b/public/images/emoji/google/full_moon_with_face.png
index b43bda183a..cdafaa94a1 100644
Binary files a/public/images/emoji/google/full_moon_with_face.png and b/public/images/emoji/google/full_moon_with_face.png differ
diff --git a/public/images/emoji/google/funeral_urn.png b/public/images/emoji/google/funeral_urn.png
index 864d903a35..2276468356 100644
Binary files a/public/images/emoji/google/funeral_urn.png and b/public/images/emoji/google/funeral_urn.png differ
diff --git a/public/images/emoji/google/gabon.png b/public/images/emoji/google/gabon.png
index 34a2461648..0d07cbdb15 100644
Binary files a/public/images/emoji/google/gabon.png and b/public/images/emoji/google/gabon.png differ
diff --git a/public/images/emoji/google/gambia.png b/public/images/emoji/google/gambia.png
index 96e8ea845c..09cf69ab20 100644
Binary files a/public/images/emoji/google/gambia.png and b/public/images/emoji/google/gambia.png differ
diff --git a/public/images/emoji/google/game_die.png b/public/images/emoji/google/game_die.png
index 4e0b58ab27..90def81e5d 100644
Binary files a/public/images/emoji/google/game_die.png and b/public/images/emoji/google/game_die.png differ
diff --git a/public/images/emoji/google/gb.png b/public/images/emoji/google/gb.png
index 798328a1ee..e7f3da7ea8 100644
Binary files a/public/images/emoji/google/gb.png and b/public/images/emoji/google/gb.png differ
diff --git a/public/images/emoji/google/gear.png b/public/images/emoji/google/gear.png
index 10881a4802..388f1cc6b5 100644
Binary files a/public/images/emoji/google/gear.png and b/public/images/emoji/google/gear.png differ
diff --git a/public/images/emoji/google/gem.png b/public/images/emoji/google/gem.png
index d5e8f5220e..f0518d8cf9 100644
Binary files a/public/images/emoji/google/gem.png and b/public/images/emoji/google/gem.png differ
diff --git a/public/images/emoji/google/gemini.png b/public/images/emoji/google/gemini.png
index 08e86865dd..a7c2a1448e 100644
Binary files a/public/images/emoji/google/gemini.png and b/public/images/emoji/google/gemini.png differ
diff --git a/public/images/emoji/google/genie.png b/public/images/emoji/google/genie.png
index 2edad6a9a1..19c606d424 100644
Binary files a/public/images/emoji/google/genie.png and b/public/images/emoji/google/genie.png differ
diff --git a/public/images/emoji/google/georgia.png b/public/images/emoji/google/georgia.png
index 0bb8fbc738..9f21b04f7e 100644
Binary files a/public/images/emoji/google/georgia.png and b/public/images/emoji/google/georgia.png differ
diff --git a/public/images/emoji/google/ghana.png b/public/images/emoji/google/ghana.png
index e9a9cef6a1..f145d43c5a 100644
Binary files a/public/images/emoji/google/ghana.png and b/public/images/emoji/google/ghana.png differ
diff --git a/public/images/emoji/google/ghost.png b/public/images/emoji/google/ghost.png
index 5a480fdd90..0733991c67 100644
Binary files a/public/images/emoji/google/ghost.png and b/public/images/emoji/google/ghost.png differ
diff --git a/public/images/emoji/google/gibraltar.png b/public/images/emoji/google/gibraltar.png
index c84d89c6ec..e874972a0f 100644
Binary files a/public/images/emoji/google/gibraltar.png and b/public/images/emoji/google/gibraltar.png differ
diff --git a/public/images/emoji/google/gift.png b/public/images/emoji/google/gift.png
index 4b64280a4a..15442c00b8 100644
Binary files a/public/images/emoji/google/gift.png and b/public/images/emoji/google/gift.png differ
diff --git a/public/images/emoji/google/gift_heart.png b/public/images/emoji/google/gift_heart.png
index 095265e17a..5cfe77ab2e 100644
Binary files a/public/images/emoji/google/gift_heart.png and b/public/images/emoji/google/gift_heart.png differ
diff --git a/public/images/emoji/google/giraffe.png b/public/images/emoji/google/giraffe.png
index 1bfe48b2ce..9f5d19d3b4 100644
Binary files a/public/images/emoji/google/giraffe.png and b/public/images/emoji/google/giraffe.png differ
diff --git a/public/images/emoji/google/girl.png b/public/images/emoji/google/girl.png
index e7c8862e08..8d0daa3dcd 100644
Binary files a/public/images/emoji/google/girl.png and b/public/images/emoji/google/girl.png differ
diff --git a/public/images/emoji/google/girl/2.png b/public/images/emoji/google/girl/2.png
index 6116182f27..8e0b69c2cd 100644
Binary files a/public/images/emoji/google/girl/2.png and b/public/images/emoji/google/girl/2.png differ
diff --git a/public/images/emoji/google/girl/3.png b/public/images/emoji/google/girl/3.png
index 0179a03094..b279f785ce 100644
Binary files a/public/images/emoji/google/girl/3.png and b/public/images/emoji/google/girl/3.png differ
diff --git a/public/images/emoji/google/girl/4.png b/public/images/emoji/google/girl/4.png
index 46b6a6a708..037a44bb3c 100644
Binary files a/public/images/emoji/google/girl/4.png and b/public/images/emoji/google/girl/4.png differ
diff --git a/public/images/emoji/google/girl/5.png b/public/images/emoji/google/girl/5.png
index 49613bc6c3..25ac620196 100644
Binary files a/public/images/emoji/google/girl/5.png and b/public/images/emoji/google/girl/5.png differ
diff --git a/public/images/emoji/google/girl/6.png b/public/images/emoji/google/girl/6.png
index d8532bee94..9462caebec 100644
Binary files a/public/images/emoji/google/girl/6.png and b/public/images/emoji/google/girl/6.png differ
diff --git a/public/images/emoji/google/globe_with_meridians.png b/public/images/emoji/google/globe_with_meridians.png
index fbf3a52cc5..fb2d85c999 100644
Binary files a/public/images/emoji/google/globe_with_meridians.png and b/public/images/emoji/google/globe_with_meridians.png differ
diff --git a/public/images/emoji/google/gloves.png b/public/images/emoji/google/gloves.png
index 099b209a92..f7a133190a 100644
Binary files a/public/images/emoji/google/gloves.png and b/public/images/emoji/google/gloves.png differ
diff --git a/public/images/emoji/google/goal_net.png b/public/images/emoji/google/goal_net.png
index b697e2a2e3..12e3b0dc32 100644
Binary files a/public/images/emoji/google/goal_net.png and b/public/images/emoji/google/goal_net.png differ
diff --git a/public/images/emoji/google/goat.png b/public/images/emoji/google/goat.png
index 9b4be817e3..7958b1d38f 100644
Binary files a/public/images/emoji/google/goat.png and b/public/images/emoji/google/goat.png differ
diff --git a/public/images/emoji/google/golf.png b/public/images/emoji/google/golf.png
index 79a7bca074..894702a9b0 100644
Binary files a/public/images/emoji/google/golf.png and b/public/images/emoji/google/golf.png differ
diff --git a/public/images/emoji/google/golfer.png b/public/images/emoji/google/golfer.png
index c1f1277d41..62d945bfe8 100644
Binary files a/public/images/emoji/google/golfer.png and b/public/images/emoji/google/golfer.png differ
diff --git a/public/images/emoji/google/golfer/2.png b/public/images/emoji/google/golfer/2.png
index e0a520c4c1..766db89138 100644
Binary files a/public/images/emoji/google/golfer/2.png and b/public/images/emoji/google/golfer/2.png differ
diff --git a/public/images/emoji/google/golfer/3.png b/public/images/emoji/google/golfer/3.png
index dc70809ff3..59371d55ea 100644
Binary files a/public/images/emoji/google/golfer/3.png and b/public/images/emoji/google/golfer/3.png differ
diff --git a/public/images/emoji/google/golfer/4.png b/public/images/emoji/google/golfer/4.png
index 482d5d5dad..61c8022fe1 100644
Binary files a/public/images/emoji/google/golfer/4.png and b/public/images/emoji/google/golfer/4.png differ
diff --git a/public/images/emoji/google/golfer/5.png b/public/images/emoji/google/golfer/5.png
index e3a8b44424..cd5dffdc33 100644
Binary files a/public/images/emoji/google/golfer/5.png and b/public/images/emoji/google/golfer/5.png differ
diff --git a/public/images/emoji/google/golfer/6.png b/public/images/emoji/google/golfer/6.png
index 19550ce7ce..8f34f5bdb9 100644
Binary files a/public/images/emoji/google/golfer/6.png and b/public/images/emoji/google/golfer/6.png differ
diff --git a/public/images/emoji/google/golfing_man.png b/public/images/emoji/google/golfing_man.png
index c1f1277d41..62d945bfe8 100644
Binary files a/public/images/emoji/google/golfing_man.png and b/public/images/emoji/google/golfing_man.png differ
diff --git a/public/images/emoji/google/golfing_man/2.png b/public/images/emoji/google/golfing_man/2.png
index e0a520c4c1..766db89138 100644
Binary files a/public/images/emoji/google/golfing_man/2.png and b/public/images/emoji/google/golfing_man/2.png differ
diff --git a/public/images/emoji/google/golfing_man/3.png b/public/images/emoji/google/golfing_man/3.png
index dc70809ff3..59371d55ea 100644
Binary files a/public/images/emoji/google/golfing_man/3.png and b/public/images/emoji/google/golfing_man/3.png differ
diff --git a/public/images/emoji/google/golfing_man/4.png b/public/images/emoji/google/golfing_man/4.png
index 482d5d5dad..61c8022fe1 100644
Binary files a/public/images/emoji/google/golfing_man/4.png and b/public/images/emoji/google/golfing_man/4.png differ
diff --git a/public/images/emoji/google/golfing_man/5.png b/public/images/emoji/google/golfing_man/5.png
index e3a8b44424..cd5dffdc33 100644
Binary files a/public/images/emoji/google/golfing_man/5.png and b/public/images/emoji/google/golfing_man/5.png differ
diff --git a/public/images/emoji/google/golfing_man/6.png b/public/images/emoji/google/golfing_man/6.png
index 19550ce7ce..8f34f5bdb9 100644
Binary files a/public/images/emoji/google/golfing_man/6.png and b/public/images/emoji/google/golfing_man/6.png differ
diff --git a/public/images/emoji/google/golfing_woman.png b/public/images/emoji/google/golfing_woman.png
index 652de949dc..0b2cec7411 100644
Binary files a/public/images/emoji/google/golfing_woman.png and b/public/images/emoji/google/golfing_woman.png differ
diff --git a/public/images/emoji/google/gorilla.png b/public/images/emoji/google/gorilla.png
index 979e729d22..89bd5c51ed 100644
Binary files a/public/images/emoji/google/gorilla.png and b/public/images/emoji/google/gorilla.png differ
diff --git a/public/images/emoji/google/grandma.png b/public/images/emoji/google/grandma.png
index 4aeba637f7..1d07afb892 100644
Binary files a/public/images/emoji/google/grandma.png and b/public/images/emoji/google/grandma.png differ
diff --git a/public/images/emoji/google/grandma/2.png b/public/images/emoji/google/grandma/2.png
index 905e8a98b3..f90619f8b6 100644
Binary files a/public/images/emoji/google/grandma/2.png and b/public/images/emoji/google/grandma/2.png differ
diff --git a/public/images/emoji/google/grandma/3.png b/public/images/emoji/google/grandma/3.png
index 7d9c997674..2147d16fd6 100644
Binary files a/public/images/emoji/google/grandma/3.png and b/public/images/emoji/google/grandma/3.png differ
diff --git a/public/images/emoji/google/grandma/4.png b/public/images/emoji/google/grandma/4.png
index 69a9c17910..696d222a84 100644
Binary files a/public/images/emoji/google/grandma/4.png and b/public/images/emoji/google/grandma/4.png differ
diff --git a/public/images/emoji/google/grandma/5.png b/public/images/emoji/google/grandma/5.png
index 7ae4d8ea04..a23935d452 100644
Binary files a/public/images/emoji/google/grandma/5.png and b/public/images/emoji/google/grandma/5.png differ
diff --git a/public/images/emoji/google/grandma/6.png b/public/images/emoji/google/grandma/6.png
index 89542a2330..00c9ec642c 100644
Binary files a/public/images/emoji/google/grandma/6.png and b/public/images/emoji/google/grandma/6.png differ
diff --git a/public/images/emoji/google/grapes.png b/public/images/emoji/google/grapes.png
index c089a8c087..391f9005dc 100644
Binary files a/public/images/emoji/google/grapes.png and b/public/images/emoji/google/grapes.png differ
diff --git a/public/images/emoji/google/greece.png b/public/images/emoji/google/greece.png
index 151e38cec9..a54c5a3853 100644
Binary files a/public/images/emoji/google/greece.png and b/public/images/emoji/google/greece.png differ
diff --git a/public/images/emoji/google/green_apple.png b/public/images/emoji/google/green_apple.png
index 5ed58e60e1..1ce9eaa20e 100644
Binary files a/public/images/emoji/google/green_apple.png and b/public/images/emoji/google/green_apple.png differ
diff --git a/public/images/emoji/google/green_book.png b/public/images/emoji/google/green_book.png
index 635cf13f99..ae6885adc5 100644
Binary files a/public/images/emoji/google/green_book.png and b/public/images/emoji/google/green_book.png differ
diff --git a/public/images/emoji/google/green_heart.png b/public/images/emoji/google/green_heart.png
index dc4d3acea3..cde0bf984e 100644
Binary files a/public/images/emoji/google/green_heart.png and b/public/images/emoji/google/green_heart.png differ
diff --git a/public/images/emoji/google/green_salad.png b/public/images/emoji/google/green_salad.png
index adce205180..4f88c9842e 100644
Binary files a/public/images/emoji/google/green_salad.png and b/public/images/emoji/google/green_salad.png differ
diff --git a/public/images/emoji/google/greenland.png b/public/images/emoji/google/greenland.png
index 01d30e7701..1ab257cd06 100644
Binary files a/public/images/emoji/google/greenland.png and b/public/images/emoji/google/greenland.png differ
diff --git a/public/images/emoji/google/grenada.png b/public/images/emoji/google/grenada.png
index f010bf6f4e..43f6d8c2cd 100644
Binary files a/public/images/emoji/google/grenada.png and b/public/images/emoji/google/grenada.png differ
diff --git a/public/images/emoji/google/grey_exclamation.png b/public/images/emoji/google/grey_exclamation.png
index 61587566be..fe132124ae 100644
Binary files a/public/images/emoji/google/grey_exclamation.png and b/public/images/emoji/google/grey_exclamation.png differ
diff --git a/public/images/emoji/google/grey_question.png b/public/images/emoji/google/grey_question.png
index 7ac39ecd09..2078b5ed74 100644
Binary files a/public/images/emoji/google/grey_question.png and b/public/images/emoji/google/grey_question.png differ
diff --git a/public/images/emoji/google/grimacing.png b/public/images/emoji/google/grimacing.png
index 7ea69942a8..6053a903cb 100644
Binary files a/public/images/emoji/google/grimacing.png and b/public/images/emoji/google/grimacing.png differ
diff --git a/public/images/emoji/google/grin.png b/public/images/emoji/google/grin.png
index 09a880d2f0..963c41fa42 100644
Binary files a/public/images/emoji/google/grin.png and b/public/images/emoji/google/grin.png differ
diff --git a/public/images/emoji/google/grinning.png b/public/images/emoji/google/grinning.png
index 4ab16b8d76..75116805a9 100644
Binary files a/public/images/emoji/google/grinning.png and b/public/images/emoji/google/grinning.png differ
diff --git a/public/images/emoji/google/guadeloupe.png b/public/images/emoji/google/guadeloupe.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/guadeloupe.png and b/public/images/emoji/google/guadeloupe.png differ
diff --git a/public/images/emoji/google/guam.png b/public/images/emoji/google/guam.png
index efc6cb9d32..9a679174cb 100644
Binary files a/public/images/emoji/google/guam.png and b/public/images/emoji/google/guam.png differ
diff --git a/public/images/emoji/google/guardsman.png b/public/images/emoji/google/guardsman.png
index 019f2c6bba..bbaa4b095f 100644
Binary files a/public/images/emoji/google/guardsman.png and b/public/images/emoji/google/guardsman.png differ
diff --git a/public/images/emoji/google/guardsman/2.png b/public/images/emoji/google/guardsman/2.png
index d8e776c409..f5a8770fed 100644
Binary files a/public/images/emoji/google/guardsman/2.png and b/public/images/emoji/google/guardsman/2.png differ
diff --git a/public/images/emoji/google/guardsman/3.png b/public/images/emoji/google/guardsman/3.png
index eae8cd6091..e124be18fa 100644
Binary files a/public/images/emoji/google/guardsman/3.png and b/public/images/emoji/google/guardsman/3.png differ
diff --git a/public/images/emoji/google/guardsman/4.png b/public/images/emoji/google/guardsman/4.png
index 497251d350..29c835d935 100644
Binary files a/public/images/emoji/google/guardsman/4.png and b/public/images/emoji/google/guardsman/4.png differ
diff --git a/public/images/emoji/google/guardsman/5.png b/public/images/emoji/google/guardsman/5.png
index ce94c2f934..e790f16f05 100644
Binary files a/public/images/emoji/google/guardsman/5.png and b/public/images/emoji/google/guardsman/5.png differ
diff --git a/public/images/emoji/google/guardsman/6.png b/public/images/emoji/google/guardsman/6.png
index 5474f51f93..d54280f95e 100644
Binary files a/public/images/emoji/google/guardsman/6.png and b/public/images/emoji/google/guardsman/6.png differ
diff --git a/public/images/emoji/google/guardswoman.png b/public/images/emoji/google/guardswoman.png
index 4719e71121..b7b1af5e2c 100644
Binary files a/public/images/emoji/google/guardswoman.png and b/public/images/emoji/google/guardswoman.png differ
diff --git a/public/images/emoji/google/guardswoman/2.png b/public/images/emoji/google/guardswoman/2.png
index 511ba38698..a0d6429c1e 100644
Binary files a/public/images/emoji/google/guardswoman/2.png and b/public/images/emoji/google/guardswoman/2.png differ
diff --git a/public/images/emoji/google/guardswoman/3.png b/public/images/emoji/google/guardswoman/3.png
index 9c07dc8ed1..ead71af605 100644
Binary files a/public/images/emoji/google/guardswoman/3.png and b/public/images/emoji/google/guardswoman/3.png differ
diff --git a/public/images/emoji/google/guardswoman/4.png b/public/images/emoji/google/guardswoman/4.png
index 3b0958971e..8b20610b98 100644
Binary files a/public/images/emoji/google/guardswoman/4.png and b/public/images/emoji/google/guardswoman/4.png differ
diff --git a/public/images/emoji/google/guardswoman/5.png b/public/images/emoji/google/guardswoman/5.png
index 4596eb5248..80f525f6c9 100644
Binary files a/public/images/emoji/google/guardswoman/5.png and b/public/images/emoji/google/guardswoman/5.png differ
diff --git a/public/images/emoji/google/guardswoman/6.png b/public/images/emoji/google/guardswoman/6.png
index dff612d4ca..332a4191f9 100644
Binary files a/public/images/emoji/google/guardswoman/6.png and b/public/images/emoji/google/guardswoman/6.png differ
diff --git a/public/images/emoji/google/guatemala.png b/public/images/emoji/google/guatemala.png
index 48293adac1..e0e6188ff7 100644
Binary files a/public/images/emoji/google/guatemala.png and b/public/images/emoji/google/guatemala.png differ
diff --git a/public/images/emoji/google/guernsey.png b/public/images/emoji/google/guernsey.png
index 3afd4eb943..8d16284123 100644
Binary files a/public/images/emoji/google/guernsey.png and b/public/images/emoji/google/guernsey.png differ
diff --git a/public/images/emoji/google/guinea.png b/public/images/emoji/google/guinea.png
index d366654a2b..86b4aa84b0 100644
Binary files a/public/images/emoji/google/guinea.png and b/public/images/emoji/google/guinea.png differ
diff --git a/public/images/emoji/google/guinea_bissau.png b/public/images/emoji/google/guinea_bissau.png
index 0eb63867a4..0fc5486c2a 100644
Binary files a/public/images/emoji/google/guinea_bissau.png and b/public/images/emoji/google/guinea_bissau.png differ
diff --git a/public/images/emoji/google/guitar.png b/public/images/emoji/google/guitar.png
index 7e84d2f429..4fd8cccea5 100644
Binary files a/public/images/emoji/google/guitar.png and b/public/images/emoji/google/guitar.png differ
diff --git a/public/images/emoji/google/gun.png b/public/images/emoji/google/gun.png
index d13d1f81a6..0e86cc080a 100644
Binary files a/public/images/emoji/google/gun.png and b/public/images/emoji/google/gun.png differ
diff --git a/public/images/emoji/google/guyana.png b/public/images/emoji/google/guyana.png
index 53a0bdf172..3452f5bf8d 100644
Binary files a/public/images/emoji/google/guyana.png and b/public/images/emoji/google/guyana.png differ
diff --git a/public/images/emoji/google/haircut.png b/public/images/emoji/google/haircut.png
index b64dccf57d..dad82f0f4e 100644
Binary files a/public/images/emoji/google/haircut.png and b/public/images/emoji/google/haircut.png differ
diff --git a/public/images/emoji/google/haircut/2.png b/public/images/emoji/google/haircut/2.png
index 9b287229ed..35bccc0ceb 100644
Binary files a/public/images/emoji/google/haircut/2.png and b/public/images/emoji/google/haircut/2.png differ
diff --git a/public/images/emoji/google/haircut/3.png b/public/images/emoji/google/haircut/3.png
index 4f8a650ba7..a4e9d3e382 100644
Binary files a/public/images/emoji/google/haircut/3.png and b/public/images/emoji/google/haircut/3.png differ
diff --git a/public/images/emoji/google/haircut/4.png b/public/images/emoji/google/haircut/4.png
index b2132465b8..091d0ae377 100644
Binary files a/public/images/emoji/google/haircut/4.png and b/public/images/emoji/google/haircut/4.png differ
diff --git a/public/images/emoji/google/haircut/5.png b/public/images/emoji/google/haircut/5.png
index e90a8932a0..4a1f0e9f28 100644
Binary files a/public/images/emoji/google/haircut/5.png and b/public/images/emoji/google/haircut/5.png differ
diff --git a/public/images/emoji/google/haircut/6.png b/public/images/emoji/google/haircut/6.png
index ae756aad3d..195e7d8409 100644
Binary files a/public/images/emoji/google/haircut/6.png and b/public/images/emoji/google/haircut/6.png differ
diff --git a/public/images/emoji/google/haircut_man.png b/public/images/emoji/google/haircut_man.png
index b3a1d14243..f629747bf6 100644
Binary files a/public/images/emoji/google/haircut_man.png and b/public/images/emoji/google/haircut_man.png differ
diff --git a/public/images/emoji/google/haircut_man/2.png b/public/images/emoji/google/haircut_man/2.png
index fbc63a18f4..92768708df 100644
Binary files a/public/images/emoji/google/haircut_man/2.png and b/public/images/emoji/google/haircut_man/2.png differ
diff --git a/public/images/emoji/google/haircut_man/3.png b/public/images/emoji/google/haircut_man/3.png
index 97bc65feea..473925915d 100644
Binary files a/public/images/emoji/google/haircut_man/3.png and b/public/images/emoji/google/haircut_man/3.png differ
diff --git a/public/images/emoji/google/haircut_man/4.png b/public/images/emoji/google/haircut_man/4.png
index b3cc9b94d2..8dcd25e46e 100644
Binary files a/public/images/emoji/google/haircut_man/4.png and b/public/images/emoji/google/haircut_man/4.png differ
diff --git a/public/images/emoji/google/haircut_man/5.png b/public/images/emoji/google/haircut_man/5.png
index 1a8e477d57..060ecb08ca 100644
Binary files a/public/images/emoji/google/haircut_man/5.png and b/public/images/emoji/google/haircut_man/5.png differ
diff --git a/public/images/emoji/google/haircut_man/6.png b/public/images/emoji/google/haircut_man/6.png
index 1194faf984..4575995309 100644
Binary files a/public/images/emoji/google/haircut_man/6.png and b/public/images/emoji/google/haircut_man/6.png differ
diff --git a/public/images/emoji/google/haircut_woman.png b/public/images/emoji/google/haircut_woman.png
index b64dccf57d..dad82f0f4e 100644
Binary files a/public/images/emoji/google/haircut_woman.png and b/public/images/emoji/google/haircut_woman.png differ
diff --git a/public/images/emoji/google/haircut_woman/2.png b/public/images/emoji/google/haircut_woman/2.png
index 9b287229ed..35bccc0ceb 100644
Binary files a/public/images/emoji/google/haircut_woman/2.png and b/public/images/emoji/google/haircut_woman/2.png differ
diff --git a/public/images/emoji/google/haircut_woman/3.png b/public/images/emoji/google/haircut_woman/3.png
index 4f8a650ba7..a4e9d3e382 100644
Binary files a/public/images/emoji/google/haircut_woman/3.png and b/public/images/emoji/google/haircut_woman/3.png differ
diff --git a/public/images/emoji/google/haircut_woman/4.png b/public/images/emoji/google/haircut_woman/4.png
index b2132465b8..091d0ae377 100644
Binary files a/public/images/emoji/google/haircut_woman/4.png and b/public/images/emoji/google/haircut_woman/4.png differ
diff --git a/public/images/emoji/google/haircut_woman/5.png b/public/images/emoji/google/haircut_woman/5.png
index e90a8932a0..4a1f0e9f28 100644
Binary files a/public/images/emoji/google/haircut_woman/5.png and b/public/images/emoji/google/haircut_woman/5.png differ
diff --git a/public/images/emoji/google/haircut_woman/6.png b/public/images/emoji/google/haircut_woman/6.png
index ae756aad3d..195e7d8409 100644
Binary files a/public/images/emoji/google/haircut_woman/6.png and b/public/images/emoji/google/haircut_woman/6.png differ
diff --git a/public/images/emoji/google/haiti.png b/public/images/emoji/google/haiti.png
index 31aabf88a1..14359b7264 100644
Binary files a/public/images/emoji/google/haiti.png and b/public/images/emoji/google/haiti.png differ
diff --git a/public/images/emoji/google/hamburger.png b/public/images/emoji/google/hamburger.png
index 7b5619b619..9cf2945dbe 100644
Binary files a/public/images/emoji/google/hamburger.png and b/public/images/emoji/google/hamburger.png differ
diff --git a/public/images/emoji/google/hammer.png b/public/images/emoji/google/hammer.png
index 055b25f23a..9de50231ec 100644
Binary files a/public/images/emoji/google/hammer.png and b/public/images/emoji/google/hammer.png differ
diff --git a/public/images/emoji/google/hammer_and_pick.png b/public/images/emoji/google/hammer_and_pick.png
index 8477e47e4c..fe453343d8 100644
Binary files a/public/images/emoji/google/hammer_and_pick.png and b/public/images/emoji/google/hammer_and_pick.png differ
diff --git a/public/images/emoji/google/hammer_and_wrench.png b/public/images/emoji/google/hammer_and_wrench.png
index 174926ff02..f0fe70817f 100644
Binary files a/public/images/emoji/google/hammer_and_wrench.png and b/public/images/emoji/google/hammer_and_wrench.png differ
diff --git a/public/images/emoji/google/hammer_pick.png b/public/images/emoji/google/hammer_pick.png
index 8477e47e4c..fe453343d8 100644
Binary files a/public/images/emoji/google/hammer_pick.png and b/public/images/emoji/google/hammer_pick.png differ
diff --git a/public/images/emoji/google/hamster.png b/public/images/emoji/google/hamster.png
index cdb2d29d8a..8a5c4cb479 100644
Binary files a/public/images/emoji/google/hamster.png and b/public/images/emoji/google/hamster.png differ
diff --git a/public/images/emoji/google/hand.png b/public/images/emoji/google/hand.png
index b916dc7f87..de95a84981 100644
Binary files a/public/images/emoji/google/hand.png and b/public/images/emoji/google/hand.png differ
diff --git a/public/images/emoji/google/hand/2.png b/public/images/emoji/google/hand/2.png
index e60690c77e..d836026dac 100644
Binary files a/public/images/emoji/google/hand/2.png and b/public/images/emoji/google/hand/2.png differ
diff --git a/public/images/emoji/google/hand/3.png b/public/images/emoji/google/hand/3.png
index 9aabb63f85..be7f2cba1c 100644
Binary files a/public/images/emoji/google/hand/3.png and b/public/images/emoji/google/hand/3.png differ
diff --git a/public/images/emoji/google/hand/4.png b/public/images/emoji/google/hand/4.png
index 86696653b5..e19034a4e0 100644
Binary files a/public/images/emoji/google/hand/4.png and b/public/images/emoji/google/hand/4.png differ
diff --git a/public/images/emoji/google/hand/5.png b/public/images/emoji/google/hand/5.png
index 1e92c70971..d564c273c7 100644
Binary files a/public/images/emoji/google/hand/5.png and b/public/images/emoji/google/hand/5.png differ
diff --git a/public/images/emoji/google/hand/6.png b/public/images/emoji/google/hand/6.png
index 1e260d4461..6d24244b38 100644
Binary files a/public/images/emoji/google/hand/6.png and b/public/images/emoji/google/hand/6.png differ
diff --git a/public/images/emoji/google/hand_splayed.png b/public/images/emoji/google/hand_splayed.png
index f99fef5296..12fee02f17 100644
Binary files a/public/images/emoji/google/hand_splayed.png and b/public/images/emoji/google/hand_splayed.png differ
diff --git a/public/images/emoji/google/hand_splayed/2.png b/public/images/emoji/google/hand_splayed/2.png
index 3f6b667ebe..f9b441bae2 100644
Binary files a/public/images/emoji/google/hand_splayed/2.png and b/public/images/emoji/google/hand_splayed/2.png differ
diff --git a/public/images/emoji/google/hand_splayed/3.png b/public/images/emoji/google/hand_splayed/3.png
index 0a811f93d5..46bb5b97c3 100644
Binary files a/public/images/emoji/google/hand_splayed/3.png and b/public/images/emoji/google/hand_splayed/3.png differ
diff --git a/public/images/emoji/google/hand_splayed/4.png b/public/images/emoji/google/hand_splayed/4.png
index 21a92e444c..244dbb61a6 100644
Binary files a/public/images/emoji/google/hand_splayed/4.png and b/public/images/emoji/google/hand_splayed/4.png differ
diff --git a/public/images/emoji/google/hand_splayed/5.png b/public/images/emoji/google/hand_splayed/5.png
index f40f860c16..f2c26a0267 100644
Binary files a/public/images/emoji/google/hand_splayed/5.png and b/public/images/emoji/google/hand_splayed/5.png differ
diff --git a/public/images/emoji/google/hand_splayed/6.png b/public/images/emoji/google/hand_splayed/6.png
index b87967ff84..2cc07edb58 100644
Binary files a/public/images/emoji/google/hand_splayed/6.png and b/public/images/emoji/google/hand_splayed/6.png differ
diff --git a/public/images/emoji/google/handbag.png b/public/images/emoji/google/handbag.png
index 3c9e331817..2c20f745fb 100644
Binary files a/public/images/emoji/google/handbag.png and b/public/images/emoji/google/handbag.png differ
diff --git a/public/images/emoji/google/handshake.png b/public/images/emoji/google/handshake.png
index 39a65a8d66..26dd6b5491 100644
Binary files a/public/images/emoji/google/handshake.png and b/public/images/emoji/google/handshake.png differ
diff --git a/public/images/emoji/google/hankey.png b/public/images/emoji/google/hankey.png
index b1d921d96c..de476df01c 100644
Binary files a/public/images/emoji/google/hankey.png and b/public/images/emoji/google/hankey.png differ
diff --git a/public/images/emoji/google/hash.png b/public/images/emoji/google/hash.png
index 3110e701f7..c0b84b964a 100644
Binary files a/public/images/emoji/google/hash.png and b/public/images/emoji/google/hash.png differ
diff --git a/public/images/emoji/google/hatched_chick.png b/public/images/emoji/google/hatched_chick.png
index 59513c6a1d..aea53232bd 100644
Binary files a/public/images/emoji/google/hatched_chick.png and b/public/images/emoji/google/hatched_chick.png differ
diff --git a/public/images/emoji/google/hatching_chick.png b/public/images/emoji/google/hatching_chick.png
index 65b2c5b278..cb467cf4d9 100644
Binary files a/public/images/emoji/google/hatching_chick.png and b/public/images/emoji/google/hatching_chick.png differ
diff --git a/public/images/emoji/google/head_bandage.png b/public/images/emoji/google/head_bandage.png
index e07d929a27..8618abf0ee 100644
Binary files a/public/images/emoji/google/head_bandage.png and b/public/images/emoji/google/head_bandage.png differ
diff --git a/public/images/emoji/google/headphones.png b/public/images/emoji/google/headphones.png
index 294982aa8e..d192700359 100644
Binary files a/public/images/emoji/google/headphones.png and b/public/images/emoji/google/headphones.png differ
diff --git a/public/images/emoji/google/hear_no_evil.png b/public/images/emoji/google/hear_no_evil.png
index 31f768cf1a..babbbc3114 100644
Binary files a/public/images/emoji/google/hear_no_evil.png and b/public/images/emoji/google/hear_no_evil.png differ
diff --git a/public/images/emoji/google/heard_and_mc_donald_islands.png b/public/images/emoji/google/heard_and_mc_donald_islands.png
index 7ef6056c33..fe795f0891 100644
Binary files a/public/images/emoji/google/heard_and_mc_donald_islands.png and b/public/images/emoji/google/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/google/heart.png b/public/images/emoji/google/heart.png
index ab5223c5a0..efe5045aaf 100644
Binary files a/public/images/emoji/google/heart.png and b/public/images/emoji/google/heart.png differ
diff --git a/public/images/emoji/google/heart_decoration.png b/public/images/emoji/google/heart_decoration.png
index 7b44e07153..61efd3a7d0 100644
Binary files a/public/images/emoji/google/heart_decoration.png and b/public/images/emoji/google/heart_decoration.png differ
diff --git a/public/images/emoji/google/heart_exclamation.png b/public/images/emoji/google/heart_exclamation.png
index dd204a5c3e..a465293831 100644
Binary files a/public/images/emoji/google/heart_exclamation.png and b/public/images/emoji/google/heart_exclamation.png differ
diff --git a/public/images/emoji/google/heart_eyes.png b/public/images/emoji/google/heart_eyes.png
index 20585dfdec..153a193297 100644
Binary files a/public/images/emoji/google/heart_eyes.png and b/public/images/emoji/google/heart_eyes.png differ
diff --git a/public/images/emoji/google/heart_eyes_cat.png b/public/images/emoji/google/heart_eyes_cat.png
index 767f119d77..bcfeed0d8a 100644
Binary files a/public/images/emoji/google/heart_eyes_cat.png and b/public/images/emoji/google/heart_eyes_cat.png differ
diff --git a/public/images/emoji/google/heartbeat.png b/public/images/emoji/google/heartbeat.png
index f60c3b9565..eb73e5b128 100644
Binary files a/public/images/emoji/google/heartbeat.png and b/public/images/emoji/google/heartbeat.png differ
diff --git a/public/images/emoji/google/heartpulse.png b/public/images/emoji/google/heartpulse.png
index 130312d82c..6afab2f1ed 100644
Binary files a/public/images/emoji/google/heartpulse.png and b/public/images/emoji/google/heartpulse.png differ
diff --git a/public/images/emoji/google/hearts.png b/public/images/emoji/google/hearts.png
index c081114da5..80a50d493c 100644
Binary files a/public/images/emoji/google/hearts.png and b/public/images/emoji/google/hearts.png differ
diff --git a/public/images/emoji/google/heavy_check_mark.png b/public/images/emoji/google/heavy_check_mark.png
index 73e2a7ccc6..633cf8d619 100644
Binary files a/public/images/emoji/google/heavy_check_mark.png and b/public/images/emoji/google/heavy_check_mark.png differ
diff --git a/public/images/emoji/google/heavy_division_sign.png b/public/images/emoji/google/heavy_division_sign.png
index 10cfd95b24..0f8274255c 100644
Binary files a/public/images/emoji/google/heavy_division_sign.png and b/public/images/emoji/google/heavy_division_sign.png differ
diff --git a/public/images/emoji/google/heavy_dollar_sign.png b/public/images/emoji/google/heavy_dollar_sign.png
index 7958910d97..9ca374652a 100644
Binary files a/public/images/emoji/google/heavy_dollar_sign.png and b/public/images/emoji/google/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/google/heavy_heart_exclamation.png b/public/images/emoji/google/heavy_heart_exclamation.png
index dd204a5c3e..a465293831 100644
Binary files a/public/images/emoji/google/heavy_heart_exclamation.png and b/public/images/emoji/google/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png
index dd204a5c3e..a465293831 100644
Binary files a/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/google/heavy_minus_sign.png b/public/images/emoji/google/heavy_minus_sign.png
index c5be3ff05f..3f6a745872 100644
Binary files a/public/images/emoji/google/heavy_minus_sign.png and b/public/images/emoji/google/heavy_minus_sign.png differ
diff --git a/public/images/emoji/google/heavy_multiplication_x.png b/public/images/emoji/google/heavy_multiplication_x.png
index ec8c470181..ea6c96babe 100644
Binary files a/public/images/emoji/google/heavy_multiplication_x.png and b/public/images/emoji/google/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/google/heavy_plus_sign.png b/public/images/emoji/google/heavy_plus_sign.png
index 3a092fdb30..c018223ed0 100644
Binary files a/public/images/emoji/google/heavy_plus_sign.png and b/public/images/emoji/google/heavy_plus_sign.png differ
diff --git a/public/images/emoji/google/hedgehog.png b/public/images/emoji/google/hedgehog.png
index fc0a823376..e7de055476 100644
Binary files a/public/images/emoji/google/hedgehog.png and b/public/images/emoji/google/hedgehog.png differ
diff --git a/public/images/emoji/google/helicopter.png b/public/images/emoji/google/helicopter.png
index eeefbae590..c60b6ed1ee 100644
Binary files a/public/images/emoji/google/helicopter.png and b/public/images/emoji/google/helicopter.png differ
diff --git a/public/images/emoji/google/helmet_with_cross.png b/public/images/emoji/google/helmet_with_cross.png
index e1306b90dc..8d3d37d3ea 100644
Binary files a/public/images/emoji/google/helmet_with_cross.png and b/public/images/emoji/google/helmet_with_cross.png differ
diff --git a/public/images/emoji/google/helmet_with_white_cross.png b/public/images/emoji/google/helmet_with_white_cross.png
index e1306b90dc..8d3d37d3ea 100644
Binary files a/public/images/emoji/google/helmet_with_white_cross.png and b/public/images/emoji/google/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/google/herb.png b/public/images/emoji/google/herb.png
index ced3a53f7b..8527bdd60b 100644
Binary files a/public/images/emoji/google/herb.png and b/public/images/emoji/google/herb.png differ
diff --git a/public/images/emoji/google/hibiscus.png b/public/images/emoji/google/hibiscus.png
index 085184daa1..5addab1524 100644
Binary files a/public/images/emoji/google/hibiscus.png and b/public/images/emoji/google/hibiscus.png differ
diff --git a/public/images/emoji/google/high_brightness.png b/public/images/emoji/google/high_brightness.png
index 16527f5ed2..1251c058e2 100644
Binary files a/public/images/emoji/google/high_brightness.png and b/public/images/emoji/google/high_brightness.png differ
diff --git a/public/images/emoji/google/high_heel.png b/public/images/emoji/google/high_heel.png
index 80446be7eb..521b4c044c 100644
Binary files a/public/images/emoji/google/high_heel.png and b/public/images/emoji/google/high_heel.png differ
diff --git a/public/images/emoji/google/hocho.png b/public/images/emoji/google/hocho.png
index f0260024b6..d9e532c12b 100644
Binary files a/public/images/emoji/google/hocho.png and b/public/images/emoji/google/hocho.png differ
diff --git a/public/images/emoji/google/hockey.png b/public/images/emoji/google/hockey.png
index ded1adbd2b..81cb026d24 100644
Binary files a/public/images/emoji/google/hockey.png and b/public/images/emoji/google/hockey.png differ
diff --git a/public/images/emoji/google/hole.png b/public/images/emoji/google/hole.png
index 7889e64531..10eff943c1 100644
Binary files a/public/images/emoji/google/hole.png and b/public/images/emoji/google/hole.png differ
diff --git a/public/images/emoji/google/homes.png b/public/images/emoji/google/homes.png
index fa9363ada4..4e312a6768 100644
Binary files a/public/images/emoji/google/homes.png and b/public/images/emoji/google/homes.png differ
diff --git a/public/images/emoji/google/honduras.png b/public/images/emoji/google/honduras.png
index 3c021c40ef..fa15bde301 100644
Binary files a/public/images/emoji/google/honduras.png and b/public/images/emoji/google/honduras.png differ
diff --git a/public/images/emoji/google/honey_pot.png b/public/images/emoji/google/honey_pot.png
index e52dc00f23..da49c8ce70 100644
Binary files a/public/images/emoji/google/honey_pot.png and b/public/images/emoji/google/honey_pot.png differ
diff --git a/public/images/emoji/google/honeybee.png b/public/images/emoji/google/honeybee.png
index 4bcf0f5a5c..4f0f41d104 100644
Binary files a/public/images/emoji/google/honeybee.png and b/public/images/emoji/google/honeybee.png differ
diff --git a/public/images/emoji/google/hong_kong.png b/public/images/emoji/google/hong_kong.png
index 691da0cc65..1ec01f1589 100644
Binary files a/public/images/emoji/google/hong_kong.png and b/public/images/emoji/google/hong_kong.png differ
diff --git a/public/images/emoji/google/horse.png b/public/images/emoji/google/horse.png
index 0dd1dc3140..0bcd34f330 100644
Binary files a/public/images/emoji/google/horse.png and b/public/images/emoji/google/horse.png differ
diff --git a/public/images/emoji/google/horse_racing.png b/public/images/emoji/google/horse_racing.png
index d347767aa9..c6f10035c3 100644
Binary files a/public/images/emoji/google/horse_racing.png and b/public/images/emoji/google/horse_racing.png differ
diff --git a/public/images/emoji/google/horse_racing/2.png b/public/images/emoji/google/horse_racing/2.png
index c16c586ab6..9a5d5b307c 100644
Binary files a/public/images/emoji/google/horse_racing/2.png and b/public/images/emoji/google/horse_racing/2.png differ
diff --git a/public/images/emoji/google/horse_racing/3.png b/public/images/emoji/google/horse_racing/3.png
index 5bff25a2e8..ca11236a21 100644
Binary files a/public/images/emoji/google/horse_racing/3.png and b/public/images/emoji/google/horse_racing/3.png differ
diff --git a/public/images/emoji/google/horse_racing/4.png b/public/images/emoji/google/horse_racing/4.png
index c0f4c4db36..d92917a7c6 100644
Binary files a/public/images/emoji/google/horse_racing/4.png and b/public/images/emoji/google/horse_racing/4.png differ
diff --git a/public/images/emoji/google/horse_racing/5.png b/public/images/emoji/google/horse_racing/5.png
index 0f3be6013f..df6de2b656 100644
Binary files a/public/images/emoji/google/horse_racing/5.png and b/public/images/emoji/google/horse_racing/5.png differ
diff --git a/public/images/emoji/google/horse_racing/6.png b/public/images/emoji/google/horse_racing/6.png
index 749f989220..90418360be 100644
Binary files a/public/images/emoji/google/horse_racing/6.png and b/public/images/emoji/google/horse_racing/6.png differ
diff --git a/public/images/emoji/google/hospital.png b/public/images/emoji/google/hospital.png
index f7fefbaad8..93842ebe24 100644
Binary files a/public/images/emoji/google/hospital.png and b/public/images/emoji/google/hospital.png differ
diff --git a/public/images/emoji/google/hot_dog.png b/public/images/emoji/google/hot_dog.png
index 1221191c3f..535696a755 100644
Binary files a/public/images/emoji/google/hot_dog.png and b/public/images/emoji/google/hot_dog.png differ
diff --git a/public/images/emoji/google/hot_pepper.png b/public/images/emoji/google/hot_pepper.png
index 87d576a950..81ec80a8f1 100644
Binary files a/public/images/emoji/google/hot_pepper.png and b/public/images/emoji/google/hot_pepper.png differ
diff --git a/public/images/emoji/google/hotdog.png b/public/images/emoji/google/hotdog.png
index 1221191c3f..535696a755 100644
Binary files a/public/images/emoji/google/hotdog.png and b/public/images/emoji/google/hotdog.png differ
diff --git a/public/images/emoji/google/hotel.png b/public/images/emoji/google/hotel.png
index 661f6f4d2a..4ba11ec09d 100644
Binary files a/public/images/emoji/google/hotel.png and b/public/images/emoji/google/hotel.png differ
diff --git a/public/images/emoji/google/hotsprings.png b/public/images/emoji/google/hotsprings.png
index 9cd9a447c9..f4e7d6e15c 100644
Binary files a/public/images/emoji/google/hotsprings.png and b/public/images/emoji/google/hotsprings.png differ
diff --git a/public/images/emoji/google/hourglass.png b/public/images/emoji/google/hourglass.png
index dc20e70e26..20ef82a19e 100644
Binary files a/public/images/emoji/google/hourglass.png and b/public/images/emoji/google/hourglass.png differ
diff --git a/public/images/emoji/google/hourglass_flowing_sand.png b/public/images/emoji/google/hourglass_flowing_sand.png
index 2947ddb230..31203e46e5 100644
Binary files a/public/images/emoji/google/hourglass_flowing_sand.png and b/public/images/emoji/google/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/google/house.png b/public/images/emoji/google/house.png
index c34cf9df67..c16b89e3e3 100644
Binary files a/public/images/emoji/google/house.png and b/public/images/emoji/google/house.png differ
diff --git a/public/images/emoji/google/house_abandoned.png b/public/images/emoji/google/house_abandoned.png
index 5a4faead95..7b14c6c6cd 100644
Binary files a/public/images/emoji/google/house_abandoned.png and b/public/images/emoji/google/house_abandoned.png differ
diff --git a/public/images/emoji/google/house_buildings.png b/public/images/emoji/google/house_buildings.png
index fa9363ada4..4e312a6768 100644
Binary files a/public/images/emoji/google/house_buildings.png and b/public/images/emoji/google/house_buildings.png differ
diff --git a/public/images/emoji/google/house_with_garden.png b/public/images/emoji/google/house_with_garden.png
index 1c31e2d141..a0007d6608 100644
Binary files a/public/images/emoji/google/house_with_garden.png and b/public/images/emoji/google/house_with_garden.png differ
diff --git a/public/images/emoji/google/houses.png b/public/images/emoji/google/houses.png
index fa9363ada4..4e312a6768 100644
Binary files a/public/images/emoji/google/houses.png and b/public/images/emoji/google/houses.png differ
diff --git a/public/images/emoji/google/hugging.png b/public/images/emoji/google/hugging.png
index bf104611e9..f951d015c8 100644
Binary files a/public/images/emoji/google/hugging.png and b/public/images/emoji/google/hugging.png differ
diff --git a/public/images/emoji/google/hugging_face.png b/public/images/emoji/google/hugging_face.png
index bf104611e9..f951d015c8 100644
Binary files a/public/images/emoji/google/hugging_face.png and b/public/images/emoji/google/hugging_face.png differ
diff --git a/public/images/emoji/google/hugs.png b/public/images/emoji/google/hugs.png
index bf104611e9..f951d015c8 100644
Binary files a/public/images/emoji/google/hugs.png and b/public/images/emoji/google/hugs.png differ
diff --git a/public/images/emoji/google/hungary.png b/public/images/emoji/google/hungary.png
index 2fbf82b0e4..94646900ed 100644
Binary files a/public/images/emoji/google/hungary.png and b/public/images/emoji/google/hungary.png differ
diff --git a/public/images/emoji/google/hushed.png b/public/images/emoji/google/hushed.png
index 1017735584..c9e3b896ef 100644
Binary files a/public/images/emoji/google/hushed.png and b/public/images/emoji/google/hushed.png differ
diff --git a/public/images/emoji/google/ice_cream.png b/public/images/emoji/google/ice_cream.png
index 82e6d5352e..3c8459f6f8 100644
Binary files a/public/images/emoji/google/ice_cream.png and b/public/images/emoji/google/ice_cream.png differ
diff --git a/public/images/emoji/google/ice_hockey.png b/public/images/emoji/google/ice_hockey.png
index ded1adbd2b..81cb026d24 100644
Binary files a/public/images/emoji/google/ice_hockey.png and b/public/images/emoji/google/ice_hockey.png differ
diff --git a/public/images/emoji/google/ice_skate.png b/public/images/emoji/google/ice_skate.png
index 06a7f168f5..bee3a0681f 100644
Binary files a/public/images/emoji/google/ice_skate.png and b/public/images/emoji/google/ice_skate.png differ
diff --git a/public/images/emoji/google/icecream.png b/public/images/emoji/google/icecream.png
index 14d831d0da..b3c6bac259 100644
Binary files a/public/images/emoji/google/icecream.png and b/public/images/emoji/google/icecream.png differ
diff --git a/public/images/emoji/google/iceland.png b/public/images/emoji/google/iceland.png
index cfc4b15f17..21e1e41471 100644
Binary files a/public/images/emoji/google/iceland.png and b/public/images/emoji/google/iceland.png differ
diff --git a/public/images/emoji/google/id.png b/public/images/emoji/google/id.png
index 9d2fc98421..4d7df3b1d6 100644
Binary files a/public/images/emoji/google/id.png and b/public/images/emoji/google/id.png differ
diff --git a/public/images/emoji/google/ideograph_advantage.png b/public/images/emoji/google/ideograph_advantage.png
index 8e230f8074..02338e73e3 100644
Binary files a/public/images/emoji/google/ideograph_advantage.png and b/public/images/emoji/google/ideograph_advantage.png differ
diff --git a/public/images/emoji/google/imp.png b/public/images/emoji/google/imp.png
index 391197c797..fc24a43237 100644
Binary files a/public/images/emoji/google/imp.png and b/public/images/emoji/google/imp.png differ
diff --git a/public/images/emoji/google/inbox_tray.png b/public/images/emoji/google/inbox_tray.png
index f4adb55735..2b63923817 100644
Binary files a/public/images/emoji/google/inbox_tray.png and b/public/images/emoji/google/inbox_tray.png differ
diff --git a/public/images/emoji/google/incoming_envelope.png b/public/images/emoji/google/incoming_envelope.png
index 3be1a3b5ac..4ada98ed64 100644
Binary files a/public/images/emoji/google/incoming_envelope.png and b/public/images/emoji/google/incoming_envelope.png differ
diff --git a/public/images/emoji/google/india.png b/public/images/emoji/google/india.png
index 3d7da87187..e8b79d2986 100644
Binary files a/public/images/emoji/google/india.png and b/public/images/emoji/google/india.png differ
diff --git a/public/images/emoji/google/indonesia.png b/public/images/emoji/google/indonesia.png
index b2c334fd91..a409c19f42 100644
Binary files a/public/images/emoji/google/indonesia.png and b/public/images/emoji/google/indonesia.png differ
diff --git a/public/images/emoji/google/information_desk_person.png b/public/images/emoji/google/information_desk_person.png
index f84a2e0281..5a1a1083dd 100644
Binary files a/public/images/emoji/google/information_desk_person.png and b/public/images/emoji/google/information_desk_person.png differ
diff --git a/public/images/emoji/google/information_desk_person/2.png b/public/images/emoji/google/information_desk_person/2.png
index 448acc172a..57d49cd71e 100644
Binary files a/public/images/emoji/google/information_desk_person/2.png and b/public/images/emoji/google/information_desk_person/2.png differ
diff --git a/public/images/emoji/google/information_desk_person/3.png b/public/images/emoji/google/information_desk_person/3.png
index 23c4c592bc..acd7d01ccd 100644
Binary files a/public/images/emoji/google/information_desk_person/3.png and b/public/images/emoji/google/information_desk_person/3.png differ
diff --git a/public/images/emoji/google/information_desk_person/4.png b/public/images/emoji/google/information_desk_person/4.png
index be3b2d1e72..57834f9c19 100644
Binary files a/public/images/emoji/google/information_desk_person/4.png and b/public/images/emoji/google/information_desk_person/4.png differ
diff --git a/public/images/emoji/google/information_desk_person/5.png b/public/images/emoji/google/information_desk_person/5.png
index 35c12c4903..aef6e61829 100644
Binary files a/public/images/emoji/google/information_desk_person/5.png and b/public/images/emoji/google/information_desk_person/5.png differ
diff --git a/public/images/emoji/google/information_desk_person/6.png b/public/images/emoji/google/information_desk_person/6.png
index 67e0a0ca12..e5e401338a 100644
Binary files a/public/images/emoji/google/information_desk_person/6.png and b/public/images/emoji/google/information_desk_person/6.png differ
diff --git a/public/images/emoji/google/information_source.png b/public/images/emoji/google/information_source.png
index b9c0993fc9..7e44ae84e9 100644
Binary files a/public/images/emoji/google/information_source.png and b/public/images/emoji/google/information_source.png differ
diff --git a/public/images/emoji/google/innocent.png b/public/images/emoji/google/innocent.png
index f2eaaf228c..acaf768d45 100644
Binary files a/public/images/emoji/google/innocent.png and b/public/images/emoji/google/innocent.png differ
diff --git a/public/images/emoji/google/interrobang.png b/public/images/emoji/google/interrobang.png
index 12d21b9834..d7edc4dc6d 100644
Binary files a/public/images/emoji/google/interrobang.png and b/public/images/emoji/google/interrobang.png differ
diff --git a/public/images/emoji/google/iphone.png b/public/images/emoji/google/iphone.png
index 93dcb50850..bf384be461 100644
Binary files a/public/images/emoji/google/iphone.png and b/public/images/emoji/google/iphone.png differ
diff --git a/public/images/emoji/google/iran.png b/public/images/emoji/google/iran.png
index 846c655850..1105d156fd 100644
Binary files a/public/images/emoji/google/iran.png and b/public/images/emoji/google/iran.png differ
diff --git a/public/images/emoji/google/iraq.png b/public/images/emoji/google/iraq.png
index 7afbf0e6da..b5ae6b8de9 100644
Binary files a/public/images/emoji/google/iraq.png and b/public/images/emoji/google/iraq.png differ
diff --git a/public/images/emoji/google/ireland.png b/public/images/emoji/google/ireland.png
index 1a3efeb4ce..9d5cc18875 100644
Binary files a/public/images/emoji/google/ireland.png and b/public/images/emoji/google/ireland.png differ
diff --git a/public/images/emoji/google/island.png b/public/images/emoji/google/island.png
index 30ee864648..e68a3fe14f 100644
Binary files a/public/images/emoji/google/island.png and b/public/images/emoji/google/island.png differ
diff --git a/public/images/emoji/google/isle_of_man.png b/public/images/emoji/google/isle_of_man.png
index 81b217b4d3..4f30ad3ffd 100644
Binary files a/public/images/emoji/google/isle_of_man.png and b/public/images/emoji/google/isle_of_man.png differ
diff --git a/public/images/emoji/google/israel.png b/public/images/emoji/google/israel.png
index 6554f75f87..e32f46c9c2 100644
Binary files a/public/images/emoji/google/israel.png and b/public/images/emoji/google/israel.png differ
diff --git a/public/images/emoji/google/it.png b/public/images/emoji/google/it.png
index 5ae7c53b6f..605e128012 100644
Binary files a/public/images/emoji/google/it.png and b/public/images/emoji/google/it.png differ
diff --git a/public/images/emoji/google/izakaya_lantern.png b/public/images/emoji/google/izakaya_lantern.png
index d8407f417f..3e34d70fd1 100644
Binary files a/public/images/emoji/google/izakaya_lantern.png and b/public/images/emoji/google/izakaya_lantern.png differ
diff --git a/public/images/emoji/google/jack_o_lantern.png b/public/images/emoji/google/jack_o_lantern.png
index fe92e2bbab..60a2363975 100644
Binary files a/public/images/emoji/google/jack_o_lantern.png and b/public/images/emoji/google/jack_o_lantern.png differ
diff --git a/public/images/emoji/google/jamaica.png b/public/images/emoji/google/jamaica.png
index a956adfab9..71f190ac1c 100644
Binary files a/public/images/emoji/google/jamaica.png and b/public/images/emoji/google/jamaica.png differ
diff --git a/public/images/emoji/google/japan.png b/public/images/emoji/google/japan.png
index 19a1aceed1..79fd5a80af 100644
Binary files a/public/images/emoji/google/japan.png and b/public/images/emoji/google/japan.png differ
diff --git a/public/images/emoji/google/japanese_castle.png b/public/images/emoji/google/japanese_castle.png
index d42ac569fe..fc55df18a3 100644
Binary files a/public/images/emoji/google/japanese_castle.png and b/public/images/emoji/google/japanese_castle.png differ
diff --git a/public/images/emoji/google/japanese_goblin.png b/public/images/emoji/google/japanese_goblin.png
index 0ebf700398..c4c1181803 100644
Binary files a/public/images/emoji/google/japanese_goblin.png and b/public/images/emoji/google/japanese_goblin.png differ
diff --git a/public/images/emoji/google/japanese_ogre.png b/public/images/emoji/google/japanese_ogre.png
index 4a08e8e81b..5dfe0cb039 100644
Binary files a/public/images/emoji/google/japanese_ogre.png and b/public/images/emoji/google/japanese_ogre.png differ
diff --git a/public/images/emoji/google/jeans.png b/public/images/emoji/google/jeans.png
index 3bdd9ca3ba..2c85072f3c 100644
Binary files a/public/images/emoji/google/jeans.png and b/public/images/emoji/google/jeans.png differ
diff --git a/public/images/emoji/google/jersey.png b/public/images/emoji/google/jersey.png
index 47b536a621..03fc51703e 100644
Binary files a/public/images/emoji/google/jersey.png and b/public/images/emoji/google/jersey.png differ
diff --git a/public/images/emoji/google/jordan.png b/public/images/emoji/google/jordan.png
index f8c6ca07eb..53697f64ca 100644
Binary files a/public/images/emoji/google/jordan.png and b/public/images/emoji/google/jordan.png differ
diff --git a/public/images/emoji/google/joy.png b/public/images/emoji/google/joy.png
index 098ce2f4f9..30bc7110dd 100644
Binary files a/public/images/emoji/google/joy.png and b/public/images/emoji/google/joy.png differ
diff --git a/public/images/emoji/google/joy_cat.png b/public/images/emoji/google/joy_cat.png
index a858d4615e..dc7e21465f 100644
Binary files a/public/images/emoji/google/joy_cat.png and b/public/images/emoji/google/joy_cat.png differ
diff --git a/public/images/emoji/google/joystick.png b/public/images/emoji/google/joystick.png
index f5aa91b2d4..18598ecb9a 100644
Binary files a/public/images/emoji/google/joystick.png and b/public/images/emoji/google/joystick.png differ
diff --git a/public/images/emoji/google/jp.png b/public/images/emoji/google/jp.png
index 72cbebef78..c75dad0d10 100644
Binary files a/public/images/emoji/google/jp.png and b/public/images/emoji/google/jp.png differ
diff --git a/public/images/emoji/google/kaaba.png b/public/images/emoji/google/kaaba.png
index 82aaffbd95..9e552ab0f6 100644
Binary files a/public/images/emoji/google/kaaba.png and b/public/images/emoji/google/kaaba.png differ
diff --git a/public/images/emoji/google/kazakhstan.png b/public/images/emoji/google/kazakhstan.png
index ec2cffaecf..d2a5e07df6 100644
Binary files a/public/images/emoji/google/kazakhstan.png and b/public/images/emoji/google/kazakhstan.png differ
diff --git a/public/images/emoji/google/kenya.png b/public/images/emoji/google/kenya.png
index 59f5ae68a7..f1bf336597 100644
Binary files a/public/images/emoji/google/kenya.png and b/public/images/emoji/google/kenya.png differ
diff --git a/public/images/emoji/google/key.png b/public/images/emoji/google/key.png
index 7aca32f21d..e54c3b358c 100644
Binary files a/public/images/emoji/google/key.png and b/public/images/emoji/google/key.png differ
diff --git a/public/images/emoji/google/key2.png b/public/images/emoji/google/key2.png
index d6739c8457..6083982335 100644
Binary files a/public/images/emoji/google/key2.png and b/public/images/emoji/google/key2.png differ
diff --git a/public/images/emoji/google/keyboard.png b/public/images/emoji/google/keyboard.png
index f6190e74af..d040041c67 100644
Binary files a/public/images/emoji/google/keyboard.png and b/public/images/emoji/google/keyboard.png differ
diff --git a/public/images/emoji/google/keycap_star.png b/public/images/emoji/google/keycap_star.png
index 9c0101c7d7..ff8fbb5091 100644
Binary files a/public/images/emoji/google/keycap_star.png and b/public/images/emoji/google/keycap_star.png differ
diff --git a/public/images/emoji/google/keycap_ten.png b/public/images/emoji/google/keycap_ten.png
index 60b3c3787c..26d2af616c 100644
Binary files a/public/images/emoji/google/keycap_ten.png and b/public/images/emoji/google/keycap_ten.png differ
diff --git a/public/images/emoji/google/kick_scooter.png b/public/images/emoji/google/kick_scooter.png
index ebe5c37082..12949d8c6e 100644
Binary files a/public/images/emoji/google/kick_scooter.png and b/public/images/emoji/google/kick_scooter.png differ
diff --git a/public/images/emoji/google/kimono.png b/public/images/emoji/google/kimono.png
index b252f0f2a7..2699b7cc0f 100644
Binary files a/public/images/emoji/google/kimono.png and b/public/images/emoji/google/kimono.png differ
diff --git a/public/images/emoji/google/kiribati.png b/public/images/emoji/google/kiribati.png
index 2f005d2487..98ccbd9c5a 100644
Binary files a/public/images/emoji/google/kiribati.png and b/public/images/emoji/google/kiribati.png differ
diff --git a/public/images/emoji/google/kiss.png b/public/images/emoji/google/kiss.png
index a7f50bbe04..96fbc506de 100644
Binary files a/public/images/emoji/google/kiss.png and b/public/images/emoji/google/kiss.png differ
diff --git a/public/images/emoji/google/kissing.png b/public/images/emoji/google/kissing.png
index 6033b2eb12..e4c9b7196c 100644
Binary files a/public/images/emoji/google/kissing.png and b/public/images/emoji/google/kissing.png differ
diff --git a/public/images/emoji/google/kissing_cat.png b/public/images/emoji/google/kissing_cat.png
index 96ab3ba308..d5d9962f76 100644
Binary files a/public/images/emoji/google/kissing_cat.png and b/public/images/emoji/google/kissing_cat.png differ
diff --git a/public/images/emoji/google/kissing_closed_eyes.png b/public/images/emoji/google/kissing_closed_eyes.png
index 5118f05e7a..90c7791db5 100644
Binary files a/public/images/emoji/google/kissing_closed_eyes.png and b/public/images/emoji/google/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/google/kissing_heart.png b/public/images/emoji/google/kissing_heart.png
index 1b16a522c9..99c1f3981e 100644
Binary files a/public/images/emoji/google/kissing_heart.png and b/public/images/emoji/google/kissing_heart.png differ
diff --git a/public/images/emoji/google/kissing_smiling_eyes.png b/public/images/emoji/google/kissing_smiling_eyes.png
index 32d9aed152..e376812155 100644
Binary files a/public/images/emoji/google/kissing_smiling_eyes.png and b/public/images/emoji/google/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/google/kiwi_fruit.png b/public/images/emoji/google/kiwi_fruit.png
index d2834a517a..fee1445b0f 100644
Binary files a/public/images/emoji/google/kiwi_fruit.png and b/public/images/emoji/google/kiwi_fruit.png differ
diff --git a/public/images/emoji/google/knife.png b/public/images/emoji/google/knife.png
index f0260024b6..d9e532c12b 100644
Binary files a/public/images/emoji/google/knife.png and b/public/images/emoji/google/knife.png differ
diff --git a/public/images/emoji/google/koala.png b/public/images/emoji/google/koala.png
index bcdca18c76..a70f78e23d 100644
Binary files a/public/images/emoji/google/koala.png and b/public/images/emoji/google/koala.png differ
diff --git a/public/images/emoji/google/koko.png b/public/images/emoji/google/koko.png
index eb223efbb5..ccabba4449 100644
Binary files a/public/images/emoji/google/koko.png and b/public/images/emoji/google/koko.png differ
diff --git a/public/images/emoji/google/kosovo.png b/public/images/emoji/google/kosovo.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/kosovo.png and b/public/images/emoji/google/kosovo.png differ
diff --git a/public/images/emoji/google/kr.png b/public/images/emoji/google/kr.png
index 33ead18d8c..048ceeb3e4 100644
Binary files a/public/images/emoji/google/kr.png and b/public/images/emoji/google/kr.png differ
diff --git a/public/images/emoji/google/kuwait.png b/public/images/emoji/google/kuwait.png
index bf42ac971d..da41db123e 100644
Binary files a/public/images/emoji/google/kuwait.png and b/public/images/emoji/google/kuwait.png differ
diff --git a/public/images/emoji/google/kyrgyzstan.png b/public/images/emoji/google/kyrgyzstan.png
index 9ee2d3808f..1fb2105a91 100644
Binary files a/public/images/emoji/google/kyrgyzstan.png and b/public/images/emoji/google/kyrgyzstan.png differ
diff --git a/public/images/emoji/google/label.png b/public/images/emoji/google/label.png
index 2473deefe6..2544282029 100644
Binary files a/public/images/emoji/google/label.png and b/public/images/emoji/google/label.png differ
diff --git a/public/images/emoji/google/laos.png b/public/images/emoji/google/laos.png
index 5762ccf297..2ac96b742b 100644
Binary files a/public/images/emoji/google/laos.png and b/public/images/emoji/google/laos.png differ
diff --git a/public/images/emoji/google/large_blue_circle.png b/public/images/emoji/google/large_blue_circle.png
index 183d6c3791..79e1630641 100644
Binary files a/public/images/emoji/google/large_blue_circle.png and b/public/images/emoji/google/large_blue_circle.png differ
diff --git a/public/images/emoji/google/large_blue_diamond.png b/public/images/emoji/google/large_blue_diamond.png
index 5479de75b3..2086e95adb 100644
Binary files a/public/images/emoji/google/large_blue_diamond.png and b/public/images/emoji/google/large_blue_diamond.png differ
diff --git a/public/images/emoji/google/large_orange_diamond.png b/public/images/emoji/google/large_orange_diamond.png
index 41af4a51d4..fce5aeae50 100644
Binary files a/public/images/emoji/google/large_orange_diamond.png and b/public/images/emoji/google/large_orange_diamond.png differ
diff --git a/public/images/emoji/google/last_quarter_moon.png b/public/images/emoji/google/last_quarter_moon.png
index ae12e2a821..474ad185a6 100644
Binary files a/public/images/emoji/google/last_quarter_moon.png and b/public/images/emoji/google/last_quarter_moon.png differ
diff --git a/public/images/emoji/google/last_quarter_moon_with_face.png b/public/images/emoji/google/last_quarter_moon_with_face.png
index 7900a9f942..c4bea25ef7 100644
Binary files a/public/images/emoji/google/last_quarter_moon_with_face.png and b/public/images/emoji/google/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/google/latin_cross.png b/public/images/emoji/google/latin_cross.png
index 0a367b0233..f0608264bb 100644
Binary files a/public/images/emoji/google/latin_cross.png and b/public/images/emoji/google/latin_cross.png differ
diff --git a/public/images/emoji/google/latvia.png b/public/images/emoji/google/latvia.png
index 963f774bb2..8bd9d34140 100644
Binary files a/public/images/emoji/google/latvia.png and b/public/images/emoji/google/latvia.png differ
diff --git a/public/images/emoji/google/laughing.png b/public/images/emoji/google/laughing.png
index 1b64148f97..2fdeacfbbc 100644
Binary files a/public/images/emoji/google/laughing.png and b/public/images/emoji/google/laughing.png differ
diff --git a/public/images/emoji/google/leaves.png b/public/images/emoji/google/leaves.png
index 5dc15b3da4..68220fe003 100644
Binary files a/public/images/emoji/google/leaves.png and b/public/images/emoji/google/leaves.png differ
diff --git a/public/images/emoji/google/lebanon.png b/public/images/emoji/google/lebanon.png
index b8b4709043..bbcf9c9cf5 100644
Binary files a/public/images/emoji/google/lebanon.png and b/public/images/emoji/google/lebanon.png differ
diff --git a/public/images/emoji/google/ledger.png b/public/images/emoji/google/ledger.png
index 78915dd655..759754c471 100644
Binary files a/public/images/emoji/google/ledger.png and b/public/images/emoji/google/ledger.png differ
diff --git a/public/images/emoji/google/left_luggage.png b/public/images/emoji/google/left_luggage.png
index a81a7f4048..53fdbe4e47 100644
Binary files a/public/images/emoji/google/left_luggage.png and b/public/images/emoji/google/left_luggage.png differ
diff --git a/public/images/emoji/google/left_right_arrow.png b/public/images/emoji/google/left_right_arrow.png
index dc064561f0..cbc0c43e0e 100644
Binary files a/public/images/emoji/google/left_right_arrow.png and b/public/images/emoji/google/left_right_arrow.png differ
diff --git a/public/images/emoji/google/left_speech_bubble.png b/public/images/emoji/google/left_speech_bubble.png
index 4dd9f1330e..f9c1779ebe 100644
Binary files a/public/images/emoji/google/left_speech_bubble.png and b/public/images/emoji/google/left_speech_bubble.png differ
diff --git a/public/images/emoji/google/leftwards_arrow_with_hook.png b/public/images/emoji/google/leftwards_arrow_with_hook.png
index da648022ba..6ea31fa331 100644
Binary files a/public/images/emoji/google/leftwards_arrow_with_hook.png and b/public/images/emoji/google/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/google/lemon.png b/public/images/emoji/google/lemon.png
index f2748b54b3..c4fb9838ff 100644
Binary files a/public/images/emoji/google/lemon.png and b/public/images/emoji/google/lemon.png differ
diff --git a/public/images/emoji/google/leo.png b/public/images/emoji/google/leo.png
index ddb39122b6..1397081a26 100644
Binary files a/public/images/emoji/google/leo.png and b/public/images/emoji/google/leo.png differ
diff --git a/public/images/emoji/google/leopard.png b/public/images/emoji/google/leopard.png
index cc31eb647e..bef21cdd35 100644
Binary files a/public/images/emoji/google/leopard.png and b/public/images/emoji/google/leopard.png differ
diff --git a/public/images/emoji/google/lesotho.png b/public/images/emoji/google/lesotho.png
index d0455846dd..d175a10c77 100644
Binary files a/public/images/emoji/google/lesotho.png and b/public/images/emoji/google/lesotho.png differ
diff --git a/public/images/emoji/google/level_slider.png b/public/images/emoji/google/level_slider.png
index 5991ab94a8..e3840083c2 100644
Binary files a/public/images/emoji/google/level_slider.png and b/public/images/emoji/google/level_slider.png differ
diff --git a/public/images/emoji/google/levitate.png b/public/images/emoji/google/levitate.png
index 88918f97b3..b7eea2e014 100644
Binary files a/public/images/emoji/google/levitate.png and b/public/images/emoji/google/levitate.png differ
diff --git a/public/images/emoji/google/levitate/2.png b/public/images/emoji/google/levitate/2.png
index ddeda2a43b..28bf50d0d2 100644
Binary files a/public/images/emoji/google/levitate/2.png and b/public/images/emoji/google/levitate/2.png differ
diff --git a/public/images/emoji/google/levitate/3.png b/public/images/emoji/google/levitate/3.png
index e62d08a901..2e9ca43ed9 100644
Binary files a/public/images/emoji/google/levitate/3.png and b/public/images/emoji/google/levitate/3.png differ
diff --git a/public/images/emoji/google/levitate/4.png b/public/images/emoji/google/levitate/4.png
index 27012dfbe9..1f9720f962 100644
Binary files a/public/images/emoji/google/levitate/4.png and b/public/images/emoji/google/levitate/4.png differ
diff --git a/public/images/emoji/google/levitate/5.png b/public/images/emoji/google/levitate/5.png
index c8863f5833..889a3dcd0b 100644
Binary files a/public/images/emoji/google/levitate/5.png and b/public/images/emoji/google/levitate/5.png differ
diff --git a/public/images/emoji/google/levitate/6.png b/public/images/emoji/google/levitate/6.png
index 62e5e00578..6b55d4fcd7 100644
Binary files a/public/images/emoji/google/levitate/6.png and b/public/images/emoji/google/levitate/6.png differ
diff --git a/public/images/emoji/google/liberia.png b/public/images/emoji/google/liberia.png
index 388c2f35d7..7e962415d4 100644
Binary files a/public/images/emoji/google/liberia.png and b/public/images/emoji/google/liberia.png differ
diff --git a/public/images/emoji/google/libra.png b/public/images/emoji/google/libra.png
index 1d8132623b..55862258b1 100644
Binary files a/public/images/emoji/google/libra.png and b/public/images/emoji/google/libra.png differ
diff --git a/public/images/emoji/google/libya.png b/public/images/emoji/google/libya.png
index 303b3fc66f..ec473782ae 100644
Binary files a/public/images/emoji/google/libya.png and b/public/images/emoji/google/libya.png differ
diff --git a/public/images/emoji/google/liechtenstein.png b/public/images/emoji/google/liechtenstein.png
index 3c90874cca..e429b5bc3e 100644
Binary files a/public/images/emoji/google/liechtenstein.png and b/public/images/emoji/google/liechtenstein.png differ
diff --git a/public/images/emoji/google/lifter.png b/public/images/emoji/google/lifter.png
index 47689fc292..d570f812ae 100644
Binary files a/public/images/emoji/google/lifter.png and b/public/images/emoji/google/lifter.png differ
diff --git a/public/images/emoji/google/lifter/2.png b/public/images/emoji/google/lifter/2.png
index 56ac45601a..711814184f 100644
Binary files a/public/images/emoji/google/lifter/2.png and b/public/images/emoji/google/lifter/2.png differ
diff --git a/public/images/emoji/google/lifter/3.png b/public/images/emoji/google/lifter/3.png
index e4f89233ed..87ea4ab0bd 100644
Binary files a/public/images/emoji/google/lifter/3.png and b/public/images/emoji/google/lifter/3.png differ
diff --git a/public/images/emoji/google/lifter/4.png b/public/images/emoji/google/lifter/4.png
index a0a5133cf4..7b424da2ad 100644
Binary files a/public/images/emoji/google/lifter/4.png and b/public/images/emoji/google/lifter/4.png differ
diff --git a/public/images/emoji/google/lifter/5.png b/public/images/emoji/google/lifter/5.png
index a38a3c841a..62304ee8ea 100644
Binary files a/public/images/emoji/google/lifter/5.png and b/public/images/emoji/google/lifter/5.png differ
diff --git a/public/images/emoji/google/lifter/6.png b/public/images/emoji/google/lifter/6.png
index f5b5614463..e1a4357862 100644
Binary files a/public/images/emoji/google/lifter/6.png and b/public/images/emoji/google/lifter/6.png differ
diff --git a/public/images/emoji/google/light_rail.png b/public/images/emoji/google/light_rail.png
index 3864cc3879..514374ec9e 100644
Binary files a/public/images/emoji/google/light_rail.png and b/public/images/emoji/google/light_rail.png differ
diff --git a/public/images/emoji/google/link.png b/public/images/emoji/google/link.png
index 5c4d7c4923..cda895e350 100644
Binary files a/public/images/emoji/google/link.png and b/public/images/emoji/google/link.png differ
diff --git a/public/images/emoji/google/linked_paperclips.png b/public/images/emoji/google/linked_paperclips.png
index b3b7e0de41..56d7279a5c 100644
Binary files a/public/images/emoji/google/linked_paperclips.png and b/public/images/emoji/google/linked_paperclips.png differ
diff --git a/public/images/emoji/google/lion.png b/public/images/emoji/google/lion.png
index d8b4d7e224..52448031ce 100644
Binary files a/public/images/emoji/google/lion.png and b/public/images/emoji/google/lion.png differ
diff --git a/public/images/emoji/google/lion_face.png b/public/images/emoji/google/lion_face.png
index d8b4d7e224..52448031ce 100644
Binary files a/public/images/emoji/google/lion_face.png and b/public/images/emoji/google/lion_face.png differ
diff --git a/public/images/emoji/google/lips.png b/public/images/emoji/google/lips.png
index 93bbe027d5..9f78922d42 100644
Binary files a/public/images/emoji/google/lips.png and b/public/images/emoji/google/lips.png differ
diff --git a/public/images/emoji/google/lipstick.png b/public/images/emoji/google/lipstick.png
index 9e0b371386..86b59270fd 100644
Binary files a/public/images/emoji/google/lipstick.png and b/public/images/emoji/google/lipstick.png differ
diff --git a/public/images/emoji/google/lithuania.png b/public/images/emoji/google/lithuania.png
index 41d85c692b..598a8e5663 100644
Binary files a/public/images/emoji/google/lithuania.png and b/public/images/emoji/google/lithuania.png differ
diff --git a/public/images/emoji/google/lizard.png b/public/images/emoji/google/lizard.png
index 4932ac5dbb..1026acfbcd 100644
Binary files a/public/images/emoji/google/lizard.png and b/public/images/emoji/google/lizard.png differ
diff --git a/public/images/emoji/google/lock.png b/public/images/emoji/google/lock.png
index 07550237ed..b74fad6ead 100644
Binary files a/public/images/emoji/google/lock.png and b/public/images/emoji/google/lock.png differ
diff --git a/public/images/emoji/google/lock_with_ink_pen.png b/public/images/emoji/google/lock_with_ink_pen.png
index 69b7d0cc63..dc89f2c993 100644
Binary files a/public/images/emoji/google/lock_with_ink_pen.png and b/public/images/emoji/google/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/google/lollipop.png b/public/images/emoji/google/lollipop.png
index 2d016c365e..a381976a26 100644
Binary files a/public/images/emoji/google/lollipop.png and b/public/images/emoji/google/lollipop.png differ
diff --git a/public/images/emoji/google/loop.png b/public/images/emoji/google/loop.png
index 633119f0fc..14faa3939e 100644
Binary files a/public/images/emoji/google/loop.png and b/public/images/emoji/google/loop.png differ
diff --git a/public/images/emoji/google/loud_sound.png b/public/images/emoji/google/loud_sound.png
index dc3879609d..749dc5a816 100644
Binary files a/public/images/emoji/google/loud_sound.png and b/public/images/emoji/google/loud_sound.png differ
diff --git a/public/images/emoji/google/loudspeaker.png b/public/images/emoji/google/loudspeaker.png
index 94402b054d..b844d9ce7c 100644
Binary files a/public/images/emoji/google/loudspeaker.png and b/public/images/emoji/google/loudspeaker.png differ
diff --git a/public/images/emoji/google/love_hotel.png b/public/images/emoji/google/love_hotel.png
index f56e26d106..eed33686f4 100644
Binary files a/public/images/emoji/google/love_hotel.png and b/public/images/emoji/google/love_hotel.png differ
diff --git a/public/images/emoji/google/love_letter.png b/public/images/emoji/google/love_letter.png
index 198be2dce1..5edb3681f0 100644
Binary files a/public/images/emoji/google/love_letter.png and b/public/images/emoji/google/love_letter.png differ
diff --git a/public/images/emoji/google/love_you_gesture.png b/public/images/emoji/google/love_you_gesture.png
index d1b677e4fe..ad51606a93 100644
Binary files a/public/images/emoji/google/love_you_gesture.png and b/public/images/emoji/google/love_you_gesture.png differ
diff --git a/public/images/emoji/google/love_you_gesture/2.png b/public/images/emoji/google/love_you_gesture/2.png
index 2731aa143f..892e9facdf 100644
Binary files a/public/images/emoji/google/love_you_gesture/2.png and b/public/images/emoji/google/love_you_gesture/2.png differ
diff --git a/public/images/emoji/google/love_you_gesture/3.png b/public/images/emoji/google/love_you_gesture/3.png
index 153ab728af..bb03327925 100644
Binary files a/public/images/emoji/google/love_you_gesture/3.png and b/public/images/emoji/google/love_you_gesture/3.png differ
diff --git a/public/images/emoji/google/love_you_gesture/4.png b/public/images/emoji/google/love_you_gesture/4.png
index 4a7b85c9ff..985e290472 100644
Binary files a/public/images/emoji/google/love_you_gesture/4.png and b/public/images/emoji/google/love_you_gesture/4.png differ
diff --git a/public/images/emoji/google/love_you_gesture/5.png b/public/images/emoji/google/love_you_gesture/5.png
index bac00236ea..6fc51bef3a 100644
Binary files a/public/images/emoji/google/love_you_gesture/5.png and b/public/images/emoji/google/love_you_gesture/5.png differ
diff --git a/public/images/emoji/google/love_you_gesture/6.png b/public/images/emoji/google/love_you_gesture/6.png
index aac2741530..a4db7e8fba 100644
Binary files a/public/images/emoji/google/love_you_gesture/6.png and b/public/images/emoji/google/love_you_gesture/6.png differ
diff --git a/public/images/emoji/google/low_brightness.png b/public/images/emoji/google/low_brightness.png
index 0a7d09ad2d..26fe0fc95f 100644
Binary files a/public/images/emoji/google/low_brightness.png and b/public/images/emoji/google/low_brightness.png differ
diff --git a/public/images/emoji/google/lower_left_ballpoint_pen.png b/public/images/emoji/google/lower_left_ballpoint_pen.png
index a67644b0ac..a3312810ec 100644
Binary files a/public/images/emoji/google/lower_left_ballpoint_pen.png and b/public/images/emoji/google/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/google/lower_left_crayon.png b/public/images/emoji/google/lower_left_crayon.png
index e82c0d2d5e..bec3b70573 100644
Binary files a/public/images/emoji/google/lower_left_crayon.png and b/public/images/emoji/google/lower_left_crayon.png differ
diff --git a/public/images/emoji/google/lower_left_fountain_pen.png b/public/images/emoji/google/lower_left_fountain_pen.png
index a06fcdc40e..3d8ba60471 100644
Binary files a/public/images/emoji/google/lower_left_fountain_pen.png and b/public/images/emoji/google/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/google/lower_left_paintbrush.png b/public/images/emoji/google/lower_left_paintbrush.png
index 5869736646..bde63a8092 100644
Binary files a/public/images/emoji/google/lower_left_paintbrush.png and b/public/images/emoji/google/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/google/luxembourg.png b/public/images/emoji/google/luxembourg.png
index d86b5c65bb..f1b83bbc52 100644
Binary files a/public/images/emoji/google/luxembourg.png and b/public/images/emoji/google/luxembourg.png differ
diff --git a/public/images/emoji/google/lying_face.png b/public/images/emoji/google/lying_face.png
index aeb972bd26..8a33f01cf5 100644
Binary files a/public/images/emoji/google/lying_face.png and b/public/images/emoji/google/lying_face.png differ
diff --git a/public/images/emoji/google/m.png b/public/images/emoji/google/m.png
index 7d37bedb9b..eac88f2c31 100644
Binary files a/public/images/emoji/google/m.png and b/public/images/emoji/google/m.png differ
diff --git a/public/images/emoji/google/macau.png b/public/images/emoji/google/macau.png
index 918444ff16..551bd77cf0 100644
Binary files a/public/images/emoji/google/macau.png and b/public/images/emoji/google/macau.png differ
diff --git a/public/images/emoji/google/macedonia.png b/public/images/emoji/google/macedonia.png
index 68d7eeda31..f1f975d94d 100644
Binary files a/public/images/emoji/google/macedonia.png and b/public/images/emoji/google/macedonia.png differ
diff --git a/public/images/emoji/google/madagascar.png b/public/images/emoji/google/madagascar.png
index b166d103c7..36745e2626 100644
Binary files a/public/images/emoji/google/madagascar.png and b/public/images/emoji/google/madagascar.png differ
diff --git a/public/images/emoji/google/mag.png b/public/images/emoji/google/mag.png
index 009a8b29e7..ef6581c19e 100644
Binary files a/public/images/emoji/google/mag.png and b/public/images/emoji/google/mag.png differ
diff --git a/public/images/emoji/google/mag_right.png b/public/images/emoji/google/mag_right.png
index 48158489f9..3a6245beb7 100644
Binary files a/public/images/emoji/google/mag_right.png and b/public/images/emoji/google/mag_right.png differ
diff --git a/public/images/emoji/google/mage.png b/public/images/emoji/google/mage.png
index 95b77cab85..887a5bbfa9 100644
Binary files a/public/images/emoji/google/mage.png and b/public/images/emoji/google/mage.png differ
diff --git a/public/images/emoji/google/mage/2.png b/public/images/emoji/google/mage/2.png
index 45f93bbf66..8b011be490 100644
Binary files a/public/images/emoji/google/mage/2.png and b/public/images/emoji/google/mage/2.png differ
diff --git a/public/images/emoji/google/mage/3.png b/public/images/emoji/google/mage/3.png
index 11ad26c120..1144565e1a 100644
Binary files a/public/images/emoji/google/mage/3.png and b/public/images/emoji/google/mage/3.png differ
diff --git a/public/images/emoji/google/mage/4.png b/public/images/emoji/google/mage/4.png
index 4af7b2eb6b..2f1a7b2a2c 100644
Binary files a/public/images/emoji/google/mage/4.png and b/public/images/emoji/google/mage/4.png differ
diff --git a/public/images/emoji/google/mage/5.png b/public/images/emoji/google/mage/5.png
index 76ef339d1c..58aef187b7 100644
Binary files a/public/images/emoji/google/mage/5.png and b/public/images/emoji/google/mage/5.png differ
diff --git a/public/images/emoji/google/mage/6.png b/public/images/emoji/google/mage/6.png
index 1563142f30..86d9fc7929 100644
Binary files a/public/images/emoji/google/mage/6.png and b/public/images/emoji/google/mage/6.png differ
diff --git a/public/images/emoji/google/mahjong.png b/public/images/emoji/google/mahjong.png
index 28e9b95f36..c235b290bf 100644
Binary files a/public/images/emoji/google/mahjong.png and b/public/images/emoji/google/mahjong.png differ
diff --git a/public/images/emoji/google/mailbox.png b/public/images/emoji/google/mailbox.png
index 5eaa096230..b61b523ab8 100644
Binary files a/public/images/emoji/google/mailbox.png and b/public/images/emoji/google/mailbox.png differ
diff --git a/public/images/emoji/google/mailbox_closed.png b/public/images/emoji/google/mailbox_closed.png
index 6a9717aa1e..c8c931456c 100644
Binary files a/public/images/emoji/google/mailbox_closed.png and b/public/images/emoji/google/mailbox_closed.png differ
diff --git a/public/images/emoji/google/mailbox_with_mail.png b/public/images/emoji/google/mailbox_with_mail.png
index f7ce167ec0..5d4408c2eb 100644
Binary files a/public/images/emoji/google/mailbox_with_mail.png and b/public/images/emoji/google/mailbox_with_mail.png differ
diff --git a/public/images/emoji/google/mailbox_with_no_mail.png b/public/images/emoji/google/mailbox_with_no_mail.png
index d6a6a1c534..b08cbc6c3a 100644
Binary files a/public/images/emoji/google/mailbox_with_no_mail.png and b/public/images/emoji/google/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/google/malawi.png b/public/images/emoji/google/malawi.png
index acc82bc5af..3c510c7b2b 100644
Binary files a/public/images/emoji/google/malawi.png and b/public/images/emoji/google/malawi.png differ
diff --git a/public/images/emoji/google/malaysia.png b/public/images/emoji/google/malaysia.png
index 2e693c11eb..e26107e19d 100644
Binary files a/public/images/emoji/google/malaysia.png and b/public/images/emoji/google/malaysia.png differ
diff --git a/public/images/emoji/google/maldives.png b/public/images/emoji/google/maldives.png
index 99b18ac8d3..6b87598488 100644
Binary files a/public/images/emoji/google/maldives.png and b/public/images/emoji/google/maldives.png differ
diff --git a/public/images/emoji/google/male_couple_with_heart.png b/public/images/emoji/google/male_couple_with_heart.png
index 8c30736f98..edfa25c9a0 100644
Binary files a/public/images/emoji/google/male_couple_with_heart.png and b/public/images/emoji/google/male_couple_with_heart.png differ
diff --git a/public/images/emoji/google/male_couplekiss.png b/public/images/emoji/google/male_couplekiss.png
index 60aff93dd7..231fc8e523 100644
Binary files a/public/images/emoji/google/male_couplekiss.png and b/public/images/emoji/google/male_couplekiss.png differ
diff --git a/public/images/emoji/google/male_detective.png b/public/images/emoji/google/male_detective.png
index 13ef63b0aa..cee46f4861 100644
Binary files a/public/images/emoji/google/male_detective.png and b/public/images/emoji/google/male_detective.png differ
diff --git a/public/images/emoji/google/male_detective/2.png b/public/images/emoji/google/male_detective/2.png
index 130424ff53..2bc4718252 100644
Binary files a/public/images/emoji/google/male_detective/2.png and b/public/images/emoji/google/male_detective/2.png differ
diff --git a/public/images/emoji/google/male_detective/3.png b/public/images/emoji/google/male_detective/3.png
index 6fb56a789c..a867a4d30e 100644
Binary files a/public/images/emoji/google/male_detective/3.png and b/public/images/emoji/google/male_detective/3.png differ
diff --git a/public/images/emoji/google/male_detective/4.png b/public/images/emoji/google/male_detective/4.png
index c021157981..2a1935a30c 100644
Binary files a/public/images/emoji/google/male_detective/4.png and b/public/images/emoji/google/male_detective/4.png differ
diff --git a/public/images/emoji/google/male_detective/5.png b/public/images/emoji/google/male_detective/5.png
index fcd3411232..f261d8dc3b 100644
Binary files a/public/images/emoji/google/male_detective/5.png and b/public/images/emoji/google/male_detective/5.png differ
diff --git a/public/images/emoji/google/male_detective/6.png b/public/images/emoji/google/male_detective/6.png
index e4b939c908..ffa90c5392 100644
Binary files a/public/images/emoji/google/male_detective/6.png and b/public/images/emoji/google/male_detective/6.png differ
diff --git a/public/images/emoji/google/mali.png b/public/images/emoji/google/mali.png
index 8e30b34eb9..00d9d28bfd 100644
Binary files a/public/images/emoji/google/mali.png and b/public/images/emoji/google/mali.png differ
diff --git a/public/images/emoji/google/malta.png b/public/images/emoji/google/malta.png
index dc1cf128ca..11ac5dc598 100644
Binary files a/public/images/emoji/google/malta.png and b/public/images/emoji/google/malta.png differ
diff --git a/public/images/emoji/google/man.png b/public/images/emoji/google/man.png
index 419b9c8365..73248596d2 100644
Binary files a/public/images/emoji/google/man.png and b/public/images/emoji/google/man.png differ
diff --git a/public/images/emoji/google/man/2.png b/public/images/emoji/google/man/2.png
index 9168046603..4752f1d694 100644
Binary files a/public/images/emoji/google/man/2.png and b/public/images/emoji/google/man/2.png differ
diff --git a/public/images/emoji/google/man/3.png b/public/images/emoji/google/man/3.png
index c07120932f..e608e1167c 100644
Binary files a/public/images/emoji/google/man/3.png and b/public/images/emoji/google/man/3.png differ
diff --git a/public/images/emoji/google/man/4.png b/public/images/emoji/google/man/4.png
index d8174a6ff0..d645f40ced 100644
Binary files a/public/images/emoji/google/man/4.png and b/public/images/emoji/google/man/4.png differ
diff --git a/public/images/emoji/google/man/5.png b/public/images/emoji/google/man/5.png
index b21c4b7b44..8e630d025e 100644
Binary files a/public/images/emoji/google/man/5.png and b/public/images/emoji/google/man/5.png differ
diff --git a/public/images/emoji/google/man/6.png b/public/images/emoji/google/man/6.png
index f8c77a50ea..2eea24cdfd 100644
Binary files a/public/images/emoji/google/man/6.png and b/public/images/emoji/google/man/6.png differ
diff --git a/public/images/emoji/google/man_artist.png b/public/images/emoji/google/man_artist.png
index 79ed156b47..a2d882de41 100644
Binary files a/public/images/emoji/google/man_artist.png and b/public/images/emoji/google/man_artist.png differ
diff --git a/public/images/emoji/google/man_artist/2.png b/public/images/emoji/google/man_artist/2.png
index 7a1da707a0..4d766bb475 100644
Binary files a/public/images/emoji/google/man_artist/2.png and b/public/images/emoji/google/man_artist/2.png differ
diff --git a/public/images/emoji/google/man_artist/3.png b/public/images/emoji/google/man_artist/3.png
index aa84048bbd..a58aa5796e 100644
Binary files a/public/images/emoji/google/man_artist/3.png and b/public/images/emoji/google/man_artist/3.png differ
diff --git a/public/images/emoji/google/man_artist/4.png b/public/images/emoji/google/man_artist/4.png
index fa5cf0518e..a59069b802 100644
Binary files a/public/images/emoji/google/man_artist/4.png and b/public/images/emoji/google/man_artist/4.png differ
diff --git a/public/images/emoji/google/man_artist/5.png b/public/images/emoji/google/man_artist/5.png
index 6614041b7e..05c79b5215 100644
Binary files a/public/images/emoji/google/man_artist/5.png and b/public/images/emoji/google/man_artist/5.png differ
diff --git a/public/images/emoji/google/man_artist/6.png b/public/images/emoji/google/man_artist/6.png
index f03ed78967..c6af86c0a1 100644
Binary files a/public/images/emoji/google/man_artist/6.png and b/public/images/emoji/google/man_artist/6.png differ
diff --git a/public/images/emoji/google/man_astronaut.png b/public/images/emoji/google/man_astronaut.png
index 7d4997a28b..f471dfb2ea 100644
Binary files a/public/images/emoji/google/man_astronaut.png and b/public/images/emoji/google/man_astronaut.png differ
diff --git a/public/images/emoji/google/man_astronaut/2.png b/public/images/emoji/google/man_astronaut/2.png
index b43a058475..ff2868d4a5 100644
Binary files a/public/images/emoji/google/man_astronaut/2.png and b/public/images/emoji/google/man_astronaut/2.png differ
diff --git a/public/images/emoji/google/man_astronaut/3.png b/public/images/emoji/google/man_astronaut/3.png
index 95b1bd8149..d36d98dd51 100644
Binary files a/public/images/emoji/google/man_astronaut/3.png and b/public/images/emoji/google/man_astronaut/3.png differ
diff --git a/public/images/emoji/google/man_astronaut/4.png b/public/images/emoji/google/man_astronaut/4.png
index 2ed638ebb5..c9ddcaaae3 100644
Binary files a/public/images/emoji/google/man_astronaut/4.png and b/public/images/emoji/google/man_astronaut/4.png differ
diff --git a/public/images/emoji/google/man_astronaut/5.png b/public/images/emoji/google/man_astronaut/5.png
index 72d62f9a04..105afa516d 100644
Binary files a/public/images/emoji/google/man_astronaut/5.png and b/public/images/emoji/google/man_astronaut/5.png differ
diff --git a/public/images/emoji/google/man_astronaut/6.png b/public/images/emoji/google/man_astronaut/6.png
index da9e12ed5d..08c7278771 100644
Binary files a/public/images/emoji/google/man_astronaut/6.png and b/public/images/emoji/google/man_astronaut/6.png differ
diff --git a/public/images/emoji/google/man_cartwheeling.png b/public/images/emoji/google/man_cartwheeling.png
index dbc6a77427..eee329a726 100644
Binary files a/public/images/emoji/google/man_cartwheeling.png and b/public/images/emoji/google/man_cartwheeling.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/2.png b/public/images/emoji/google/man_cartwheeling/2.png
index 46199977e2..247ce004c1 100644
Binary files a/public/images/emoji/google/man_cartwheeling/2.png and b/public/images/emoji/google/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/3.png b/public/images/emoji/google/man_cartwheeling/3.png
index 66d5a06d75..b0fa95cc03 100644
Binary files a/public/images/emoji/google/man_cartwheeling/3.png and b/public/images/emoji/google/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/4.png b/public/images/emoji/google/man_cartwheeling/4.png
index 1a209c3ec2..2073c98713 100644
Binary files a/public/images/emoji/google/man_cartwheeling/4.png and b/public/images/emoji/google/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/5.png b/public/images/emoji/google/man_cartwheeling/5.png
index 433b97cc8d..1d2b18aee1 100644
Binary files a/public/images/emoji/google/man_cartwheeling/5.png and b/public/images/emoji/google/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/6.png b/public/images/emoji/google/man_cartwheeling/6.png
index 518d6d31b7..db5a031163 100644
Binary files a/public/images/emoji/google/man_cartwheeling/6.png and b/public/images/emoji/google/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/google/man_cook.png b/public/images/emoji/google/man_cook.png
index da49a40985..bddc359d00 100644
Binary files a/public/images/emoji/google/man_cook.png and b/public/images/emoji/google/man_cook.png differ
diff --git a/public/images/emoji/google/man_cook/2.png b/public/images/emoji/google/man_cook/2.png
index 05d57fdb53..a70c566849 100644
Binary files a/public/images/emoji/google/man_cook/2.png and b/public/images/emoji/google/man_cook/2.png differ
diff --git a/public/images/emoji/google/man_cook/3.png b/public/images/emoji/google/man_cook/3.png
index 4c279c0b17..fddd25e38d 100644
Binary files a/public/images/emoji/google/man_cook/3.png and b/public/images/emoji/google/man_cook/3.png differ
diff --git a/public/images/emoji/google/man_cook/4.png b/public/images/emoji/google/man_cook/4.png
index eabdead72a..9dc4869ef1 100644
Binary files a/public/images/emoji/google/man_cook/4.png and b/public/images/emoji/google/man_cook/4.png differ
diff --git a/public/images/emoji/google/man_cook/5.png b/public/images/emoji/google/man_cook/5.png
index 586449d287..3fa465444b 100644
Binary files a/public/images/emoji/google/man_cook/5.png and b/public/images/emoji/google/man_cook/5.png differ
diff --git a/public/images/emoji/google/man_cook/6.png b/public/images/emoji/google/man_cook/6.png
index 50b95d4b16..ec99bd19cd 100644
Binary files a/public/images/emoji/google/man_cook/6.png and b/public/images/emoji/google/man_cook/6.png differ
diff --git a/public/images/emoji/google/man_dancing.png b/public/images/emoji/google/man_dancing.png
index 7c06dae781..f2ffd6a849 100644
Binary files a/public/images/emoji/google/man_dancing.png and b/public/images/emoji/google/man_dancing.png differ
diff --git a/public/images/emoji/google/man_dancing/2.png b/public/images/emoji/google/man_dancing/2.png
index dfcc4522e1..874e361e33 100644
Binary files a/public/images/emoji/google/man_dancing/2.png and b/public/images/emoji/google/man_dancing/2.png differ
diff --git a/public/images/emoji/google/man_dancing/3.png b/public/images/emoji/google/man_dancing/3.png
index 671d89d6f4..8bcff4dcf5 100644
Binary files a/public/images/emoji/google/man_dancing/3.png and b/public/images/emoji/google/man_dancing/3.png differ
diff --git a/public/images/emoji/google/man_dancing/4.png b/public/images/emoji/google/man_dancing/4.png
index a5575df531..9e86eada92 100644
Binary files a/public/images/emoji/google/man_dancing/4.png and b/public/images/emoji/google/man_dancing/4.png differ
diff --git a/public/images/emoji/google/man_dancing/5.png b/public/images/emoji/google/man_dancing/5.png
index b33d213a82..aac4988a07 100644
Binary files a/public/images/emoji/google/man_dancing/5.png and b/public/images/emoji/google/man_dancing/5.png differ
diff --git a/public/images/emoji/google/man_dancing/6.png b/public/images/emoji/google/man_dancing/6.png
index faed7a0985..53cefd0abd 100644
Binary files a/public/images/emoji/google/man_dancing/6.png and b/public/images/emoji/google/man_dancing/6.png differ
diff --git a/public/images/emoji/google/man_facepalming.png b/public/images/emoji/google/man_facepalming.png
index 59aa5d58f3..2b20104ca7 100644
Binary files a/public/images/emoji/google/man_facepalming.png and b/public/images/emoji/google/man_facepalming.png differ
diff --git a/public/images/emoji/google/man_facepalming/2.png b/public/images/emoji/google/man_facepalming/2.png
index cfb55f5866..7c4dbfad2d 100644
Binary files a/public/images/emoji/google/man_facepalming/2.png and b/public/images/emoji/google/man_facepalming/2.png differ
diff --git a/public/images/emoji/google/man_facepalming/3.png b/public/images/emoji/google/man_facepalming/3.png
index 01e26582fd..10622b9ab1 100644
Binary files a/public/images/emoji/google/man_facepalming/3.png and b/public/images/emoji/google/man_facepalming/3.png differ
diff --git a/public/images/emoji/google/man_facepalming/4.png b/public/images/emoji/google/man_facepalming/4.png
index ccfae915f2..10a220278f 100644
Binary files a/public/images/emoji/google/man_facepalming/4.png and b/public/images/emoji/google/man_facepalming/4.png differ
diff --git a/public/images/emoji/google/man_facepalming/5.png b/public/images/emoji/google/man_facepalming/5.png
index 9ac68142d9..a734425018 100644
Binary files a/public/images/emoji/google/man_facepalming/5.png and b/public/images/emoji/google/man_facepalming/5.png differ
diff --git a/public/images/emoji/google/man_facepalming/6.png b/public/images/emoji/google/man_facepalming/6.png
index 23a150b900..342546aa60 100644
Binary files a/public/images/emoji/google/man_facepalming/6.png and b/public/images/emoji/google/man_facepalming/6.png differ
diff --git a/public/images/emoji/google/man_factory_worker.png b/public/images/emoji/google/man_factory_worker.png
index b85f161ad4..ccb3ff070d 100644
Binary files a/public/images/emoji/google/man_factory_worker.png and b/public/images/emoji/google/man_factory_worker.png differ
diff --git a/public/images/emoji/google/man_factory_worker/2.png b/public/images/emoji/google/man_factory_worker/2.png
index 9bf7471510..dbffa21f78 100644
Binary files a/public/images/emoji/google/man_factory_worker/2.png and b/public/images/emoji/google/man_factory_worker/2.png differ
diff --git a/public/images/emoji/google/man_factory_worker/3.png b/public/images/emoji/google/man_factory_worker/3.png
index 438a21a291..f76776b1d0 100644
Binary files a/public/images/emoji/google/man_factory_worker/3.png and b/public/images/emoji/google/man_factory_worker/3.png differ
diff --git a/public/images/emoji/google/man_factory_worker/4.png b/public/images/emoji/google/man_factory_worker/4.png
index 2a04997fb2..f2ec1060fa 100644
Binary files a/public/images/emoji/google/man_factory_worker/4.png and b/public/images/emoji/google/man_factory_worker/4.png differ
diff --git a/public/images/emoji/google/man_factory_worker/5.png b/public/images/emoji/google/man_factory_worker/5.png
index 864292c4be..3690155cf4 100644
Binary files a/public/images/emoji/google/man_factory_worker/5.png and b/public/images/emoji/google/man_factory_worker/5.png differ
diff --git a/public/images/emoji/google/man_factory_worker/6.png b/public/images/emoji/google/man_factory_worker/6.png
index 6b517faebc..758fcf8c02 100644
Binary files a/public/images/emoji/google/man_factory_worker/6.png and b/public/images/emoji/google/man_factory_worker/6.png differ
diff --git a/public/images/emoji/google/man_farmer.png b/public/images/emoji/google/man_farmer.png
index 58f7f37810..434efc59f4 100644
Binary files a/public/images/emoji/google/man_farmer.png and b/public/images/emoji/google/man_farmer.png differ
diff --git a/public/images/emoji/google/man_farmer/2.png b/public/images/emoji/google/man_farmer/2.png
index 6e581d42d2..1890e69867 100644
Binary files a/public/images/emoji/google/man_farmer/2.png and b/public/images/emoji/google/man_farmer/2.png differ
diff --git a/public/images/emoji/google/man_farmer/3.png b/public/images/emoji/google/man_farmer/3.png
index a50fbcc578..6ac0aa9b12 100644
Binary files a/public/images/emoji/google/man_farmer/3.png and b/public/images/emoji/google/man_farmer/3.png differ
diff --git a/public/images/emoji/google/man_farmer/4.png b/public/images/emoji/google/man_farmer/4.png
index 3a9d370941..e830d97a5c 100644
Binary files a/public/images/emoji/google/man_farmer/4.png and b/public/images/emoji/google/man_farmer/4.png differ
diff --git a/public/images/emoji/google/man_farmer/5.png b/public/images/emoji/google/man_farmer/5.png
index 5e9190d0e5..ba40355354 100644
Binary files a/public/images/emoji/google/man_farmer/5.png and b/public/images/emoji/google/man_farmer/5.png differ
diff --git a/public/images/emoji/google/man_farmer/6.png b/public/images/emoji/google/man_farmer/6.png
index 20d193dbba..479933bb41 100644
Binary files a/public/images/emoji/google/man_farmer/6.png and b/public/images/emoji/google/man_farmer/6.png differ
diff --git a/public/images/emoji/google/man_firefighter.png b/public/images/emoji/google/man_firefighter.png
index 3949db60f6..4422f5aa0a 100644
Binary files a/public/images/emoji/google/man_firefighter.png and b/public/images/emoji/google/man_firefighter.png differ
diff --git a/public/images/emoji/google/man_firefighter/2.png b/public/images/emoji/google/man_firefighter/2.png
index 658b342252..0be93314c4 100644
Binary files a/public/images/emoji/google/man_firefighter/2.png and b/public/images/emoji/google/man_firefighter/2.png differ
diff --git a/public/images/emoji/google/man_firefighter/3.png b/public/images/emoji/google/man_firefighter/3.png
index 178231b6b3..5b87084471 100644
Binary files a/public/images/emoji/google/man_firefighter/3.png and b/public/images/emoji/google/man_firefighter/3.png differ
diff --git a/public/images/emoji/google/man_firefighter/4.png b/public/images/emoji/google/man_firefighter/4.png
index df7e09de2a..830ab3ef2f 100644
Binary files a/public/images/emoji/google/man_firefighter/4.png and b/public/images/emoji/google/man_firefighter/4.png differ
diff --git a/public/images/emoji/google/man_firefighter/5.png b/public/images/emoji/google/man_firefighter/5.png
index 4dece2f32b..6351e5d02f 100644
Binary files a/public/images/emoji/google/man_firefighter/5.png and b/public/images/emoji/google/man_firefighter/5.png differ
diff --git a/public/images/emoji/google/man_firefighter/6.png b/public/images/emoji/google/man_firefighter/6.png
index 05ec509ffc..069cbe9587 100644
Binary files a/public/images/emoji/google/man_firefighter/6.png and b/public/images/emoji/google/man_firefighter/6.png differ
diff --git a/public/images/emoji/google/man_health_worker.png b/public/images/emoji/google/man_health_worker.png
index 1e8e92d26c..68ceb2fc83 100644
Binary files a/public/images/emoji/google/man_health_worker.png and b/public/images/emoji/google/man_health_worker.png differ
diff --git a/public/images/emoji/google/man_health_worker/2.png b/public/images/emoji/google/man_health_worker/2.png
index 11b275b3bd..124e63aee4 100644
Binary files a/public/images/emoji/google/man_health_worker/2.png and b/public/images/emoji/google/man_health_worker/2.png differ
diff --git a/public/images/emoji/google/man_health_worker/3.png b/public/images/emoji/google/man_health_worker/3.png
index 9f06605452..605b41a693 100644
Binary files a/public/images/emoji/google/man_health_worker/3.png and b/public/images/emoji/google/man_health_worker/3.png differ
diff --git a/public/images/emoji/google/man_health_worker/4.png b/public/images/emoji/google/man_health_worker/4.png
index 48c60e1a12..7f135bc491 100644
Binary files a/public/images/emoji/google/man_health_worker/4.png and b/public/images/emoji/google/man_health_worker/4.png differ
diff --git a/public/images/emoji/google/man_health_worker/5.png b/public/images/emoji/google/man_health_worker/5.png
index b289707381..ad818285cf 100644
Binary files a/public/images/emoji/google/man_health_worker/5.png and b/public/images/emoji/google/man_health_worker/5.png differ
diff --git a/public/images/emoji/google/man_health_worker/6.png b/public/images/emoji/google/man_health_worker/6.png
index 92f231e3fc..f2e18722fe 100644
Binary files a/public/images/emoji/google/man_health_worker/6.png and b/public/images/emoji/google/man_health_worker/6.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating.png b/public/images/emoji/google/man_in_business_suit_levitating.png
index 88918f97b3..b7eea2e014 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating.png and b/public/images/emoji/google/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/2.png b/public/images/emoji/google/man_in_business_suit_levitating/2.png
index ddeda2a43b..28bf50d0d2 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/2.png and b/public/images/emoji/google/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/3.png b/public/images/emoji/google/man_in_business_suit_levitating/3.png
index e62d08a901..2e9ca43ed9 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/3.png and b/public/images/emoji/google/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/4.png b/public/images/emoji/google/man_in_business_suit_levitating/4.png
index 27012dfbe9..1f9720f962 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/4.png and b/public/images/emoji/google/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/5.png b/public/images/emoji/google/man_in_business_suit_levitating/5.png
index c8863f5833..889a3dcd0b 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/5.png and b/public/images/emoji/google/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/6.png b/public/images/emoji/google/man_in_business_suit_levitating/6.png
index 62e5e00578..6b55d4fcd7 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating/6.png and b/public/images/emoji/google/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo.png b/public/images/emoji/google/man_in_tuxedo.png
index 5b96a66a35..3e63dafa40 100644
Binary files a/public/images/emoji/google/man_in_tuxedo.png and b/public/images/emoji/google/man_in_tuxedo.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/2.png b/public/images/emoji/google/man_in_tuxedo/2.png
index 88cc2266e2..b1c030abfa 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/2.png and b/public/images/emoji/google/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/3.png b/public/images/emoji/google/man_in_tuxedo/3.png
index 82a068f725..8c8145f71f 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/3.png and b/public/images/emoji/google/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/4.png b/public/images/emoji/google/man_in_tuxedo/4.png
index 8572971df0..60cdd2992f 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/4.png and b/public/images/emoji/google/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/5.png b/public/images/emoji/google/man_in_tuxedo/5.png
index 1122dfdd0f..499f3b96f7 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/5.png and b/public/images/emoji/google/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/6.png b/public/images/emoji/google/man_in_tuxedo/6.png
index 6c1febff29..9f4c8aacf3 100644
Binary files a/public/images/emoji/google/man_in_tuxedo/6.png and b/public/images/emoji/google/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/google/man_judge.png b/public/images/emoji/google/man_judge.png
index b33b3f9bea..f9368e5c71 100644
Binary files a/public/images/emoji/google/man_judge.png and b/public/images/emoji/google/man_judge.png differ
diff --git a/public/images/emoji/google/man_judge/2.png b/public/images/emoji/google/man_judge/2.png
index ca91263846..17f8dec0ef 100644
Binary files a/public/images/emoji/google/man_judge/2.png and b/public/images/emoji/google/man_judge/2.png differ
diff --git a/public/images/emoji/google/man_judge/3.png b/public/images/emoji/google/man_judge/3.png
index e0161ccba9..c6d01660c3 100644
Binary files a/public/images/emoji/google/man_judge/3.png and b/public/images/emoji/google/man_judge/3.png differ
diff --git a/public/images/emoji/google/man_judge/4.png b/public/images/emoji/google/man_judge/4.png
index 843abe2fa7..596d85d2ab 100644
Binary files a/public/images/emoji/google/man_judge/4.png and b/public/images/emoji/google/man_judge/4.png differ
diff --git a/public/images/emoji/google/man_judge/5.png b/public/images/emoji/google/man_judge/5.png
index 06337e0c95..38da72a6cd 100644
Binary files a/public/images/emoji/google/man_judge/5.png and b/public/images/emoji/google/man_judge/5.png differ
diff --git a/public/images/emoji/google/man_judge/6.png b/public/images/emoji/google/man_judge/6.png
index 1368c77831..0f039a6ace 100644
Binary files a/public/images/emoji/google/man_judge/6.png and b/public/images/emoji/google/man_judge/6.png differ
diff --git a/public/images/emoji/google/man_juggling.png b/public/images/emoji/google/man_juggling.png
index 0806890aec..ff435cc4ee 100644
Binary files a/public/images/emoji/google/man_juggling.png and b/public/images/emoji/google/man_juggling.png differ
diff --git a/public/images/emoji/google/man_juggling/2.png b/public/images/emoji/google/man_juggling/2.png
index 284272fad7..4766ad0951 100644
Binary files a/public/images/emoji/google/man_juggling/2.png and b/public/images/emoji/google/man_juggling/2.png differ
diff --git a/public/images/emoji/google/man_juggling/3.png b/public/images/emoji/google/man_juggling/3.png
index 97f9a1b02d..413c57d2b7 100644
Binary files a/public/images/emoji/google/man_juggling/3.png and b/public/images/emoji/google/man_juggling/3.png differ
diff --git a/public/images/emoji/google/man_juggling/4.png b/public/images/emoji/google/man_juggling/4.png
index 27743f990f..6294737953 100644
Binary files a/public/images/emoji/google/man_juggling/4.png and b/public/images/emoji/google/man_juggling/4.png differ
diff --git a/public/images/emoji/google/man_juggling/5.png b/public/images/emoji/google/man_juggling/5.png
index 9d92c8162b..ce57ddb238 100644
Binary files a/public/images/emoji/google/man_juggling/5.png and b/public/images/emoji/google/man_juggling/5.png differ
diff --git a/public/images/emoji/google/man_juggling/6.png b/public/images/emoji/google/man_juggling/6.png
index f58c338c0c..1d4061d1aa 100644
Binary files a/public/images/emoji/google/man_juggling/6.png and b/public/images/emoji/google/man_juggling/6.png differ
diff --git a/public/images/emoji/google/man_mechanic.png b/public/images/emoji/google/man_mechanic.png
index 25b420bee0..0bf3f5cc6f 100644
Binary files a/public/images/emoji/google/man_mechanic.png and b/public/images/emoji/google/man_mechanic.png differ
diff --git a/public/images/emoji/google/man_mechanic/2.png b/public/images/emoji/google/man_mechanic/2.png
index 6a09785396..b8d02ec84c 100644
Binary files a/public/images/emoji/google/man_mechanic/2.png and b/public/images/emoji/google/man_mechanic/2.png differ
diff --git a/public/images/emoji/google/man_mechanic/3.png b/public/images/emoji/google/man_mechanic/3.png
index a1301ff231..6a4838a772 100644
Binary files a/public/images/emoji/google/man_mechanic/3.png and b/public/images/emoji/google/man_mechanic/3.png differ
diff --git a/public/images/emoji/google/man_mechanic/4.png b/public/images/emoji/google/man_mechanic/4.png
index 1bab61fb6e..419e26193f 100644
Binary files a/public/images/emoji/google/man_mechanic/4.png and b/public/images/emoji/google/man_mechanic/4.png differ
diff --git a/public/images/emoji/google/man_mechanic/5.png b/public/images/emoji/google/man_mechanic/5.png
index b345797f35..749ce99c4f 100644
Binary files a/public/images/emoji/google/man_mechanic/5.png and b/public/images/emoji/google/man_mechanic/5.png differ
diff --git a/public/images/emoji/google/man_mechanic/6.png b/public/images/emoji/google/man_mechanic/6.png
index a66ccdb6b4..b6849c4fc1 100644
Binary files a/public/images/emoji/google/man_mechanic/6.png and b/public/images/emoji/google/man_mechanic/6.png differ
diff --git a/public/images/emoji/google/man_office_worker.png b/public/images/emoji/google/man_office_worker.png
index 9ef011e6e0..d771e728e2 100644
Binary files a/public/images/emoji/google/man_office_worker.png and b/public/images/emoji/google/man_office_worker.png differ
diff --git a/public/images/emoji/google/man_office_worker/2.png b/public/images/emoji/google/man_office_worker/2.png
index b555f03d96..97bd0b03aa 100644
Binary files a/public/images/emoji/google/man_office_worker/2.png and b/public/images/emoji/google/man_office_worker/2.png differ
diff --git a/public/images/emoji/google/man_office_worker/3.png b/public/images/emoji/google/man_office_worker/3.png
index 8b709a73bb..437133eb44 100644
Binary files a/public/images/emoji/google/man_office_worker/3.png and b/public/images/emoji/google/man_office_worker/3.png differ
diff --git a/public/images/emoji/google/man_office_worker/4.png b/public/images/emoji/google/man_office_worker/4.png
index 31948b5cdf..f520236e8c 100644
Binary files a/public/images/emoji/google/man_office_worker/4.png and b/public/images/emoji/google/man_office_worker/4.png differ
diff --git a/public/images/emoji/google/man_office_worker/5.png b/public/images/emoji/google/man_office_worker/5.png
index d4911d564d..a244f78c1d 100644
Binary files a/public/images/emoji/google/man_office_worker/5.png and b/public/images/emoji/google/man_office_worker/5.png differ
diff --git a/public/images/emoji/google/man_office_worker/6.png b/public/images/emoji/google/man_office_worker/6.png
index a6d7cbc948..bbf24bee5d 100644
Binary files a/public/images/emoji/google/man_office_worker/6.png and b/public/images/emoji/google/man_office_worker/6.png differ
diff --git a/public/images/emoji/google/man_pilot.png b/public/images/emoji/google/man_pilot.png
index 0c9e600e5d..1bc2daaa54 100644
Binary files a/public/images/emoji/google/man_pilot.png and b/public/images/emoji/google/man_pilot.png differ
diff --git a/public/images/emoji/google/man_pilot/2.png b/public/images/emoji/google/man_pilot/2.png
index a6ec1f2266..b113f14f25 100644
Binary files a/public/images/emoji/google/man_pilot/2.png and b/public/images/emoji/google/man_pilot/2.png differ
diff --git a/public/images/emoji/google/man_pilot/3.png b/public/images/emoji/google/man_pilot/3.png
index 3679a9a1d4..eede0c46a7 100644
Binary files a/public/images/emoji/google/man_pilot/3.png and b/public/images/emoji/google/man_pilot/3.png differ
diff --git a/public/images/emoji/google/man_pilot/4.png b/public/images/emoji/google/man_pilot/4.png
index 31bab226b5..dc1fdbc299 100644
Binary files a/public/images/emoji/google/man_pilot/4.png and b/public/images/emoji/google/man_pilot/4.png differ
diff --git a/public/images/emoji/google/man_pilot/5.png b/public/images/emoji/google/man_pilot/5.png
index 4b4b822495..5b4e518a5e 100644
Binary files a/public/images/emoji/google/man_pilot/5.png and b/public/images/emoji/google/man_pilot/5.png differ
diff --git a/public/images/emoji/google/man_pilot/6.png b/public/images/emoji/google/man_pilot/6.png
index 5c6a33a882..cfb0ba6796 100644
Binary files a/public/images/emoji/google/man_pilot/6.png and b/public/images/emoji/google/man_pilot/6.png differ
diff --git a/public/images/emoji/google/man_playing_handball.png b/public/images/emoji/google/man_playing_handball.png
index 2bfaab0895..34abedad54 100644
Binary files a/public/images/emoji/google/man_playing_handball.png and b/public/images/emoji/google/man_playing_handball.png differ
diff --git a/public/images/emoji/google/man_playing_handball/2.png b/public/images/emoji/google/man_playing_handball/2.png
index 234808c8d3..10273cbc11 100644
Binary files a/public/images/emoji/google/man_playing_handball/2.png and b/public/images/emoji/google/man_playing_handball/2.png differ
diff --git a/public/images/emoji/google/man_playing_handball/3.png b/public/images/emoji/google/man_playing_handball/3.png
index d9b0951d08..f989e39988 100644
Binary files a/public/images/emoji/google/man_playing_handball/3.png and b/public/images/emoji/google/man_playing_handball/3.png differ
diff --git a/public/images/emoji/google/man_playing_handball/4.png b/public/images/emoji/google/man_playing_handball/4.png
index 82d7d77964..2195421e60 100644
Binary files a/public/images/emoji/google/man_playing_handball/4.png and b/public/images/emoji/google/man_playing_handball/4.png differ
diff --git a/public/images/emoji/google/man_playing_handball/5.png b/public/images/emoji/google/man_playing_handball/5.png
index f6d4dc625c..f77e5c06f8 100644
Binary files a/public/images/emoji/google/man_playing_handball/5.png and b/public/images/emoji/google/man_playing_handball/5.png differ
diff --git a/public/images/emoji/google/man_playing_handball/6.png b/public/images/emoji/google/man_playing_handball/6.png
index cbf4e936c4..644ae02227 100644
Binary files a/public/images/emoji/google/man_playing_handball/6.png and b/public/images/emoji/google/man_playing_handball/6.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo.png b/public/images/emoji/google/man_playing_water_polo.png
index 92f9700c12..4ad26fc79c 100644
Binary files a/public/images/emoji/google/man_playing_water_polo.png and b/public/images/emoji/google/man_playing_water_polo.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/2.png b/public/images/emoji/google/man_playing_water_polo/2.png
index ce100a54c5..232cc743e0 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/2.png and b/public/images/emoji/google/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/3.png b/public/images/emoji/google/man_playing_water_polo/3.png
index e40d5a9132..23abbc3d93 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/3.png and b/public/images/emoji/google/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/4.png b/public/images/emoji/google/man_playing_water_polo/4.png
index 7cfed1d0c9..3f48f2f98c 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/4.png and b/public/images/emoji/google/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/5.png b/public/images/emoji/google/man_playing_water_polo/5.png
index 24419842aa..e364ec2ff4 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/5.png and b/public/images/emoji/google/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/6.png b/public/images/emoji/google/man_playing_water_polo/6.png
index e8ca7705a5..5a96561fd8 100644
Binary files a/public/images/emoji/google/man_playing_water_polo/6.png and b/public/images/emoji/google/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/google/man_scientist.png b/public/images/emoji/google/man_scientist.png
index cda779ea51..945ac639a9 100644
Binary files a/public/images/emoji/google/man_scientist.png and b/public/images/emoji/google/man_scientist.png differ
diff --git a/public/images/emoji/google/man_scientist/2.png b/public/images/emoji/google/man_scientist/2.png
index 40f51c3c13..62cba4c0a3 100644
Binary files a/public/images/emoji/google/man_scientist/2.png and b/public/images/emoji/google/man_scientist/2.png differ
diff --git a/public/images/emoji/google/man_scientist/3.png b/public/images/emoji/google/man_scientist/3.png
index 9fbac46c1b..376e7a7f45 100644
Binary files a/public/images/emoji/google/man_scientist/3.png and b/public/images/emoji/google/man_scientist/3.png differ
diff --git a/public/images/emoji/google/man_scientist/4.png b/public/images/emoji/google/man_scientist/4.png
index f122058b2d..84dedd0bb3 100644
Binary files a/public/images/emoji/google/man_scientist/4.png and b/public/images/emoji/google/man_scientist/4.png differ
diff --git a/public/images/emoji/google/man_scientist/5.png b/public/images/emoji/google/man_scientist/5.png
index 005259ae05..4b0214d37c 100644
Binary files a/public/images/emoji/google/man_scientist/5.png and b/public/images/emoji/google/man_scientist/5.png differ
diff --git a/public/images/emoji/google/man_scientist/6.png b/public/images/emoji/google/man_scientist/6.png
index 20cba10600..4fc8cc5377 100644
Binary files a/public/images/emoji/google/man_scientist/6.png and b/public/images/emoji/google/man_scientist/6.png differ
diff --git a/public/images/emoji/google/man_shrugging.png b/public/images/emoji/google/man_shrugging.png
index 1085867c73..a48a2eeae5 100644
Binary files a/public/images/emoji/google/man_shrugging.png and b/public/images/emoji/google/man_shrugging.png differ
diff --git a/public/images/emoji/google/man_shrugging/2.png b/public/images/emoji/google/man_shrugging/2.png
index 79f62f0537..e5dd55ddbf 100644
Binary files a/public/images/emoji/google/man_shrugging/2.png and b/public/images/emoji/google/man_shrugging/2.png differ
diff --git a/public/images/emoji/google/man_shrugging/3.png b/public/images/emoji/google/man_shrugging/3.png
index 4b2cf91829..d16defb263 100644
Binary files a/public/images/emoji/google/man_shrugging/3.png and b/public/images/emoji/google/man_shrugging/3.png differ
diff --git a/public/images/emoji/google/man_shrugging/4.png b/public/images/emoji/google/man_shrugging/4.png
index 2fc5dec156..7a449732f1 100644
Binary files a/public/images/emoji/google/man_shrugging/4.png and b/public/images/emoji/google/man_shrugging/4.png differ
diff --git a/public/images/emoji/google/man_shrugging/5.png b/public/images/emoji/google/man_shrugging/5.png
index e333c6e825..976ea1e42e 100644
Binary files a/public/images/emoji/google/man_shrugging/5.png and b/public/images/emoji/google/man_shrugging/5.png differ
diff --git a/public/images/emoji/google/man_shrugging/6.png b/public/images/emoji/google/man_shrugging/6.png
index 80de645fd5..8cd4edaa44 100644
Binary files a/public/images/emoji/google/man_shrugging/6.png and b/public/images/emoji/google/man_shrugging/6.png differ
diff --git a/public/images/emoji/google/man_singer.png b/public/images/emoji/google/man_singer.png
index b75730020a..33a6d67213 100644
Binary files a/public/images/emoji/google/man_singer.png and b/public/images/emoji/google/man_singer.png differ
diff --git a/public/images/emoji/google/man_singer/2.png b/public/images/emoji/google/man_singer/2.png
index f3615c790f..ef9f6ff2c7 100644
Binary files a/public/images/emoji/google/man_singer/2.png and b/public/images/emoji/google/man_singer/2.png differ
diff --git a/public/images/emoji/google/man_singer/3.png b/public/images/emoji/google/man_singer/3.png
index 4a87204dd3..75a6643788 100644
Binary files a/public/images/emoji/google/man_singer/3.png and b/public/images/emoji/google/man_singer/3.png differ
diff --git a/public/images/emoji/google/man_singer/4.png b/public/images/emoji/google/man_singer/4.png
index 503e721295..25903dcf59 100644
Binary files a/public/images/emoji/google/man_singer/4.png and b/public/images/emoji/google/man_singer/4.png differ
diff --git a/public/images/emoji/google/man_singer/5.png b/public/images/emoji/google/man_singer/5.png
index 8e27920ade..efba76b8ed 100644
Binary files a/public/images/emoji/google/man_singer/5.png and b/public/images/emoji/google/man_singer/5.png differ
diff --git a/public/images/emoji/google/man_singer/6.png b/public/images/emoji/google/man_singer/6.png
index 98b7b97e2d..33b5d670ad 100644
Binary files a/public/images/emoji/google/man_singer/6.png and b/public/images/emoji/google/man_singer/6.png differ
diff --git a/public/images/emoji/google/man_student.png b/public/images/emoji/google/man_student.png
index ce6609832a..9de5aec637 100644
Binary files a/public/images/emoji/google/man_student.png and b/public/images/emoji/google/man_student.png differ
diff --git a/public/images/emoji/google/man_student/2.png b/public/images/emoji/google/man_student/2.png
index 510bbd2857..034e3113cc 100644
Binary files a/public/images/emoji/google/man_student/2.png and b/public/images/emoji/google/man_student/2.png differ
diff --git a/public/images/emoji/google/man_student/3.png b/public/images/emoji/google/man_student/3.png
index f3473301ba..0d8478bcad 100644
Binary files a/public/images/emoji/google/man_student/3.png and b/public/images/emoji/google/man_student/3.png differ
diff --git a/public/images/emoji/google/man_student/4.png b/public/images/emoji/google/man_student/4.png
index 0e4c8a1eb6..9a85a6d1d4 100644
Binary files a/public/images/emoji/google/man_student/4.png and b/public/images/emoji/google/man_student/4.png differ
diff --git a/public/images/emoji/google/man_student/5.png b/public/images/emoji/google/man_student/5.png
index 3c11625112..5f627b153c 100644
Binary files a/public/images/emoji/google/man_student/5.png and b/public/images/emoji/google/man_student/5.png differ
diff --git a/public/images/emoji/google/man_student/6.png b/public/images/emoji/google/man_student/6.png
index 287b380aa9..099d5a126b 100644
Binary files a/public/images/emoji/google/man_student/6.png and b/public/images/emoji/google/man_student/6.png differ
diff --git a/public/images/emoji/google/man_teacher.png b/public/images/emoji/google/man_teacher.png
index 16762fdece..1854c8e5ca 100644
Binary files a/public/images/emoji/google/man_teacher.png and b/public/images/emoji/google/man_teacher.png differ
diff --git a/public/images/emoji/google/man_teacher/2.png b/public/images/emoji/google/man_teacher/2.png
index d9212996f0..e01193b6ce 100644
Binary files a/public/images/emoji/google/man_teacher/2.png and b/public/images/emoji/google/man_teacher/2.png differ
diff --git a/public/images/emoji/google/man_teacher/3.png b/public/images/emoji/google/man_teacher/3.png
index cc2a7d242f..1f1be057aa 100644
Binary files a/public/images/emoji/google/man_teacher/3.png and b/public/images/emoji/google/man_teacher/3.png differ
diff --git a/public/images/emoji/google/man_teacher/4.png b/public/images/emoji/google/man_teacher/4.png
index 7099b3286a..c3a0321399 100644
Binary files a/public/images/emoji/google/man_teacher/4.png and b/public/images/emoji/google/man_teacher/4.png differ
diff --git a/public/images/emoji/google/man_teacher/5.png b/public/images/emoji/google/man_teacher/5.png
index 10b6a7acf3..3b2f369372 100644
Binary files a/public/images/emoji/google/man_teacher/5.png and b/public/images/emoji/google/man_teacher/5.png differ
diff --git a/public/images/emoji/google/man_teacher/6.png b/public/images/emoji/google/man_teacher/6.png
index a37590307c..0c943f3834 100644
Binary files a/public/images/emoji/google/man_teacher/6.png and b/public/images/emoji/google/man_teacher/6.png differ
diff --git a/public/images/emoji/google/man_technologist.png b/public/images/emoji/google/man_technologist.png
index b8d03288c1..2f055257ba 100644
Binary files a/public/images/emoji/google/man_technologist.png and b/public/images/emoji/google/man_technologist.png differ
diff --git a/public/images/emoji/google/man_technologist/2.png b/public/images/emoji/google/man_technologist/2.png
index 1f17bfa5ec..5d01bf44da 100644
Binary files a/public/images/emoji/google/man_technologist/2.png and b/public/images/emoji/google/man_technologist/2.png differ
diff --git a/public/images/emoji/google/man_technologist/3.png b/public/images/emoji/google/man_technologist/3.png
index 2a70996134..395e61347c 100644
Binary files a/public/images/emoji/google/man_technologist/3.png and b/public/images/emoji/google/man_technologist/3.png differ
diff --git a/public/images/emoji/google/man_technologist/4.png b/public/images/emoji/google/man_technologist/4.png
index c5ef8e56f2..def49c1751 100644
Binary files a/public/images/emoji/google/man_technologist/4.png and b/public/images/emoji/google/man_technologist/4.png differ
diff --git a/public/images/emoji/google/man_technologist/5.png b/public/images/emoji/google/man_technologist/5.png
index e6fe4f5606..5c0a5d1fb7 100644
Binary files a/public/images/emoji/google/man_technologist/5.png and b/public/images/emoji/google/man_technologist/5.png differ
diff --git a/public/images/emoji/google/man_technologist/6.png b/public/images/emoji/google/man_technologist/6.png
index 640ac73aea..4c97d64e94 100644
Binary files a/public/images/emoji/google/man_technologist/6.png and b/public/images/emoji/google/man_technologist/6.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao.png b/public/images/emoji/google/man_with_gua_pi_mao.png
index fb65d54ebe..039935db1e 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao.png and b/public/images/emoji/google/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/2.png b/public/images/emoji/google/man_with_gua_pi_mao/2.png
index c030344660..bbaafaa789 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/2.png and b/public/images/emoji/google/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/3.png b/public/images/emoji/google/man_with_gua_pi_mao/3.png
index 26fc71e674..b4bfd04ec4 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/3.png and b/public/images/emoji/google/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/4.png b/public/images/emoji/google/man_with_gua_pi_mao/4.png
index 54d074db46..a023ea76d1 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/4.png and b/public/images/emoji/google/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/5.png b/public/images/emoji/google/man_with_gua_pi_mao/5.png
index b44d21527d..d66feb6e46 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/5.png and b/public/images/emoji/google/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/6.png b/public/images/emoji/google/man_with_gua_pi_mao/6.png
index 02f8d4bec9..2b0484202c 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao/6.png and b/public/images/emoji/google/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/google/man_with_turban.png b/public/images/emoji/google/man_with_turban.png
index 6552b1777c..bfb08a0607 100644
Binary files a/public/images/emoji/google/man_with_turban.png and b/public/images/emoji/google/man_with_turban.png differ
diff --git a/public/images/emoji/google/man_with_turban/2.png b/public/images/emoji/google/man_with_turban/2.png
index 717d147cef..fc88d224a1 100644
Binary files a/public/images/emoji/google/man_with_turban/2.png and b/public/images/emoji/google/man_with_turban/2.png differ
diff --git a/public/images/emoji/google/man_with_turban/3.png b/public/images/emoji/google/man_with_turban/3.png
index 33ffa77823..47c6897e20 100644
Binary files a/public/images/emoji/google/man_with_turban/3.png and b/public/images/emoji/google/man_with_turban/3.png differ
diff --git a/public/images/emoji/google/man_with_turban/4.png b/public/images/emoji/google/man_with_turban/4.png
index c28c0ddf41..0e6578801f 100644
Binary files a/public/images/emoji/google/man_with_turban/4.png and b/public/images/emoji/google/man_with_turban/4.png differ
diff --git a/public/images/emoji/google/man_with_turban/5.png b/public/images/emoji/google/man_with_turban/5.png
index 130ab75787..9d9e332642 100644
Binary files a/public/images/emoji/google/man_with_turban/5.png and b/public/images/emoji/google/man_with_turban/5.png differ
diff --git a/public/images/emoji/google/man_with_turban/6.png b/public/images/emoji/google/man_with_turban/6.png
index 55c5969cb2..5486d18133 100644
Binary files a/public/images/emoji/google/man_with_turban/6.png and b/public/images/emoji/google/man_with_turban/6.png differ
diff --git a/public/images/emoji/google/mans_shoe.png b/public/images/emoji/google/mans_shoe.png
index 1192b8766f..c2c6bc1514 100644
Binary files a/public/images/emoji/google/mans_shoe.png and b/public/images/emoji/google/mans_shoe.png differ
diff --git a/public/images/emoji/google/mantelpiece_clock.png b/public/images/emoji/google/mantelpiece_clock.png
index b326630c04..ae0fcb7c98 100644
Binary files a/public/images/emoji/google/mantelpiece_clock.png and b/public/images/emoji/google/mantelpiece_clock.png differ
diff --git a/public/images/emoji/google/map.png b/public/images/emoji/google/map.png
index dccb5d0512..349e4d46c3 100644
Binary files a/public/images/emoji/google/map.png and b/public/images/emoji/google/map.png differ
diff --git a/public/images/emoji/google/maple_leaf.png b/public/images/emoji/google/maple_leaf.png
index 21701f9d6a..3d4f34c4d5 100644
Binary files a/public/images/emoji/google/maple_leaf.png and b/public/images/emoji/google/maple_leaf.png differ
diff --git a/public/images/emoji/google/marshall_islands.png b/public/images/emoji/google/marshall_islands.png
index dfc0b63f0e..d32ede8967 100644
Binary files a/public/images/emoji/google/marshall_islands.png and b/public/images/emoji/google/marshall_islands.png differ
diff --git a/public/images/emoji/google/martial_arts_uniform.png b/public/images/emoji/google/martial_arts_uniform.png
index b9572f7542..7f0523ab92 100644
Binary files a/public/images/emoji/google/martial_arts_uniform.png and b/public/images/emoji/google/martial_arts_uniform.png differ
diff --git a/public/images/emoji/google/martinique.png b/public/images/emoji/google/martinique.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/martinique.png and b/public/images/emoji/google/martinique.png differ
diff --git a/public/images/emoji/google/mask.png b/public/images/emoji/google/mask.png
index 74dca611cb..cd6590ac5e 100644
Binary files a/public/images/emoji/google/mask.png and b/public/images/emoji/google/mask.png differ
diff --git a/public/images/emoji/google/massage.png b/public/images/emoji/google/massage.png
index b52a93fddb..7ebc6c0940 100644
Binary files a/public/images/emoji/google/massage.png and b/public/images/emoji/google/massage.png differ
diff --git a/public/images/emoji/google/massage/2.png b/public/images/emoji/google/massage/2.png
index b1d3dd0467..ec08c2820b 100644
Binary files a/public/images/emoji/google/massage/2.png and b/public/images/emoji/google/massage/2.png differ
diff --git a/public/images/emoji/google/massage/3.png b/public/images/emoji/google/massage/3.png
index ca82149d55..0ce3dba700 100644
Binary files a/public/images/emoji/google/massage/3.png and b/public/images/emoji/google/massage/3.png differ
diff --git a/public/images/emoji/google/massage/4.png b/public/images/emoji/google/massage/4.png
index 89c98ef904..c1ac9a26f1 100644
Binary files a/public/images/emoji/google/massage/4.png and b/public/images/emoji/google/massage/4.png differ
diff --git a/public/images/emoji/google/massage/5.png b/public/images/emoji/google/massage/5.png
index 5ec0746086..c1dbfbec23 100644
Binary files a/public/images/emoji/google/massage/5.png and b/public/images/emoji/google/massage/5.png differ
diff --git a/public/images/emoji/google/massage/6.png b/public/images/emoji/google/massage/6.png
index 46aa9ce832..40ea526645 100644
Binary files a/public/images/emoji/google/massage/6.png and b/public/images/emoji/google/massage/6.png differ
diff --git a/public/images/emoji/google/massage_man.png b/public/images/emoji/google/massage_man.png
index 44beaa030b..d329e3ffac 100644
Binary files a/public/images/emoji/google/massage_man.png and b/public/images/emoji/google/massage_man.png differ
diff --git a/public/images/emoji/google/massage_man/2.png b/public/images/emoji/google/massage_man/2.png
index f49c27433b..bfbdedaa67 100644
Binary files a/public/images/emoji/google/massage_man/2.png and b/public/images/emoji/google/massage_man/2.png differ
diff --git a/public/images/emoji/google/massage_man/3.png b/public/images/emoji/google/massage_man/3.png
index bc3e5faff5..95f56e37d3 100644
Binary files a/public/images/emoji/google/massage_man/3.png and b/public/images/emoji/google/massage_man/3.png differ
diff --git a/public/images/emoji/google/massage_man/4.png b/public/images/emoji/google/massage_man/4.png
index 78891ec1f0..08b78e6e17 100644
Binary files a/public/images/emoji/google/massage_man/4.png and b/public/images/emoji/google/massage_man/4.png differ
diff --git a/public/images/emoji/google/massage_man/5.png b/public/images/emoji/google/massage_man/5.png
index d2ed9d7d51..a9312c185c 100644
Binary files a/public/images/emoji/google/massage_man/5.png and b/public/images/emoji/google/massage_man/5.png differ
diff --git a/public/images/emoji/google/massage_man/6.png b/public/images/emoji/google/massage_man/6.png
index 170a4bb444..e22f74ab2d 100644
Binary files a/public/images/emoji/google/massage_man/6.png and b/public/images/emoji/google/massage_man/6.png differ
diff --git a/public/images/emoji/google/massage_woman.png b/public/images/emoji/google/massage_woman.png
index b52a93fddb..7ebc6c0940 100644
Binary files a/public/images/emoji/google/massage_woman.png and b/public/images/emoji/google/massage_woman.png differ
diff --git a/public/images/emoji/google/massage_woman/2.png b/public/images/emoji/google/massage_woman/2.png
index b1d3dd0467..ec08c2820b 100644
Binary files a/public/images/emoji/google/massage_woman/2.png and b/public/images/emoji/google/massage_woman/2.png differ
diff --git a/public/images/emoji/google/massage_woman/3.png b/public/images/emoji/google/massage_woman/3.png
index ca82149d55..0ce3dba700 100644
Binary files a/public/images/emoji/google/massage_woman/3.png and b/public/images/emoji/google/massage_woman/3.png differ
diff --git a/public/images/emoji/google/massage_woman/4.png b/public/images/emoji/google/massage_woman/4.png
index 89c98ef904..c1ac9a26f1 100644
Binary files a/public/images/emoji/google/massage_woman/4.png and b/public/images/emoji/google/massage_woman/4.png differ
diff --git a/public/images/emoji/google/massage_woman/5.png b/public/images/emoji/google/massage_woman/5.png
index 5ec0746086..c1dbfbec23 100644
Binary files a/public/images/emoji/google/massage_woman/5.png and b/public/images/emoji/google/massage_woman/5.png differ
diff --git a/public/images/emoji/google/massage_woman/6.png b/public/images/emoji/google/massage_woman/6.png
index 46aa9ce832..40ea526645 100644
Binary files a/public/images/emoji/google/massage_woman/6.png and b/public/images/emoji/google/massage_woman/6.png differ
diff --git a/public/images/emoji/google/mauritania.png b/public/images/emoji/google/mauritania.png
index 0e778d4d7e..2e2ef05ee8 100644
Binary files a/public/images/emoji/google/mauritania.png and b/public/images/emoji/google/mauritania.png differ
diff --git a/public/images/emoji/google/mauritius.png b/public/images/emoji/google/mauritius.png
index 91307b714b..e6808bc0ef 100644
Binary files a/public/images/emoji/google/mauritius.png and b/public/images/emoji/google/mauritius.png differ
diff --git a/public/images/emoji/google/mayotte.png b/public/images/emoji/google/mayotte.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/mayotte.png and b/public/images/emoji/google/mayotte.png differ
diff --git a/public/images/emoji/google/meat_on_bone.png b/public/images/emoji/google/meat_on_bone.png
index fbb5eef541..e7e76e39e4 100644
Binary files a/public/images/emoji/google/meat_on_bone.png and b/public/images/emoji/google/meat_on_bone.png differ
diff --git a/public/images/emoji/google/medal.png b/public/images/emoji/google/medal.png
index 3d321d89ed..2ff8d191cb 100644
Binary files a/public/images/emoji/google/medal.png and b/public/images/emoji/google/medal.png differ
diff --git a/public/images/emoji/google/medal_military.png b/public/images/emoji/google/medal_military.png
index 51c5c7027b..bf10fca3d8 100644
Binary files a/public/images/emoji/google/medal_military.png and b/public/images/emoji/google/medal_military.png differ
diff --git a/public/images/emoji/google/medal_sports.png b/public/images/emoji/google/medal_sports.png
index 3d321d89ed..2ff8d191cb 100644
Binary files a/public/images/emoji/google/medal_sports.png and b/public/images/emoji/google/medal_sports.png differ
diff --git a/public/images/emoji/google/mega.png b/public/images/emoji/google/mega.png
index f821145f10..4695a60e2f 100644
Binary files a/public/images/emoji/google/mega.png and b/public/images/emoji/google/mega.png differ
diff --git a/public/images/emoji/google/melon.png b/public/images/emoji/google/melon.png
index 67e5836ef3..0e104f75ee 100644
Binary files a/public/images/emoji/google/melon.png and b/public/images/emoji/google/melon.png differ
diff --git a/public/images/emoji/google/memo.png b/public/images/emoji/google/memo.png
index 355dcfe22d..5a3bd6cd09 100644
Binary files a/public/images/emoji/google/memo.png and b/public/images/emoji/google/memo.png differ
diff --git a/public/images/emoji/google/men_wrestling.png b/public/images/emoji/google/men_wrestling.png
index 8264daa9d3..e501870c4c 100644
Binary files a/public/images/emoji/google/men_wrestling.png and b/public/images/emoji/google/men_wrestling.png differ
diff --git a/public/images/emoji/google/menorah.png b/public/images/emoji/google/menorah.png
index 260477a2d4..377b9099c6 100644
Binary files a/public/images/emoji/google/menorah.png and b/public/images/emoji/google/menorah.png differ
diff --git a/public/images/emoji/google/mens.png b/public/images/emoji/google/mens.png
index cf8bd65a18..a2fee620c9 100644
Binary files a/public/images/emoji/google/mens.png and b/public/images/emoji/google/mens.png differ
diff --git a/public/images/emoji/google/merperson.png b/public/images/emoji/google/merperson.png
index 52ddaf7599..712ace66b6 100644
Binary files a/public/images/emoji/google/merperson.png and b/public/images/emoji/google/merperson.png differ
diff --git a/public/images/emoji/google/merperson/2.png b/public/images/emoji/google/merperson/2.png
index d39e1bf4b7..0fe0f2cd14 100644
Binary files a/public/images/emoji/google/merperson/2.png and b/public/images/emoji/google/merperson/2.png differ
diff --git a/public/images/emoji/google/merperson/3.png b/public/images/emoji/google/merperson/3.png
index 2f56a42407..312e72e640 100644
Binary files a/public/images/emoji/google/merperson/3.png and b/public/images/emoji/google/merperson/3.png differ
diff --git a/public/images/emoji/google/merperson/4.png b/public/images/emoji/google/merperson/4.png
index 31c61fadd4..b94a1cef41 100644
Binary files a/public/images/emoji/google/merperson/4.png and b/public/images/emoji/google/merperson/4.png differ
diff --git a/public/images/emoji/google/merperson/5.png b/public/images/emoji/google/merperson/5.png
index 183057d962..0d7e9b424c 100644
Binary files a/public/images/emoji/google/merperson/5.png and b/public/images/emoji/google/merperson/5.png differ
diff --git a/public/images/emoji/google/merperson/6.png b/public/images/emoji/google/merperson/6.png
index 8b3e5dd293..b81b43d903 100644
Binary files a/public/images/emoji/google/merperson/6.png and b/public/images/emoji/google/merperson/6.png differ
diff --git a/public/images/emoji/google/metal.png b/public/images/emoji/google/metal.png
index eeac747c65..8d868d12d5 100644
Binary files a/public/images/emoji/google/metal.png and b/public/images/emoji/google/metal.png differ
diff --git a/public/images/emoji/google/metal/2.png b/public/images/emoji/google/metal/2.png
index 614947ba81..310f52dfac 100644
Binary files a/public/images/emoji/google/metal/2.png and b/public/images/emoji/google/metal/2.png differ
diff --git a/public/images/emoji/google/metal/3.png b/public/images/emoji/google/metal/3.png
index 2f9891b480..74809c0946 100644
Binary files a/public/images/emoji/google/metal/3.png and b/public/images/emoji/google/metal/3.png differ
diff --git a/public/images/emoji/google/metal/4.png b/public/images/emoji/google/metal/4.png
index 44e8fc124c..11bf6e93c3 100644
Binary files a/public/images/emoji/google/metal/4.png and b/public/images/emoji/google/metal/4.png differ
diff --git a/public/images/emoji/google/metal/5.png b/public/images/emoji/google/metal/5.png
index 7016d1f0f8..767f7543d0 100644
Binary files a/public/images/emoji/google/metal/5.png and b/public/images/emoji/google/metal/5.png differ
diff --git a/public/images/emoji/google/metal/6.png b/public/images/emoji/google/metal/6.png
index 3921690250..f336dca800 100644
Binary files a/public/images/emoji/google/metal/6.png and b/public/images/emoji/google/metal/6.png differ
diff --git a/public/images/emoji/google/metro.png b/public/images/emoji/google/metro.png
index 87ac46e6e7..2efb9ec09a 100644
Binary files a/public/images/emoji/google/metro.png and b/public/images/emoji/google/metro.png differ
diff --git a/public/images/emoji/google/mexico.png b/public/images/emoji/google/mexico.png
index bfc31b76df..687334adf5 100644
Binary files a/public/images/emoji/google/mexico.png and b/public/images/emoji/google/mexico.png differ
diff --git a/public/images/emoji/google/micronesia.png b/public/images/emoji/google/micronesia.png
index 86cd1a6c80..b75cc40ccf 100644
Binary files a/public/images/emoji/google/micronesia.png and b/public/images/emoji/google/micronesia.png differ
diff --git a/public/images/emoji/google/microphone.png b/public/images/emoji/google/microphone.png
index d003da3ba1..7fe93419b7 100644
Binary files a/public/images/emoji/google/microphone.png and b/public/images/emoji/google/microphone.png differ
diff --git a/public/images/emoji/google/microphone2.png b/public/images/emoji/google/microphone2.png
index 9394168839..070e657d8c 100644
Binary files a/public/images/emoji/google/microphone2.png and b/public/images/emoji/google/microphone2.png differ
diff --git a/public/images/emoji/google/microscope.png b/public/images/emoji/google/microscope.png
index 1022205955..0aa19f044a 100644
Binary files a/public/images/emoji/google/microscope.png and b/public/images/emoji/google/microscope.png differ
diff --git a/public/images/emoji/google/middle_finger.png b/public/images/emoji/google/middle_finger.png
index 8ce128b147..71e8d8b3e9 100644
Binary files a/public/images/emoji/google/middle_finger.png and b/public/images/emoji/google/middle_finger.png differ
diff --git a/public/images/emoji/google/middle_finger/2.png b/public/images/emoji/google/middle_finger/2.png
index 3313e7e2f0..da4e50ac5e 100644
Binary files a/public/images/emoji/google/middle_finger/2.png and b/public/images/emoji/google/middle_finger/2.png differ
diff --git a/public/images/emoji/google/middle_finger/3.png b/public/images/emoji/google/middle_finger/3.png
index 916b42be04..785bc19455 100644
Binary files a/public/images/emoji/google/middle_finger/3.png and b/public/images/emoji/google/middle_finger/3.png differ
diff --git a/public/images/emoji/google/middle_finger/4.png b/public/images/emoji/google/middle_finger/4.png
index 7ab3507e2c..f55cc136fc 100644
Binary files a/public/images/emoji/google/middle_finger/4.png and b/public/images/emoji/google/middle_finger/4.png differ
diff --git a/public/images/emoji/google/middle_finger/5.png b/public/images/emoji/google/middle_finger/5.png
index aeb15696e6..a2ed1b0443 100644
Binary files a/public/images/emoji/google/middle_finger/5.png and b/public/images/emoji/google/middle_finger/5.png differ
diff --git a/public/images/emoji/google/middle_finger/6.png b/public/images/emoji/google/middle_finger/6.png
index 8e86466514..cf73dfc640 100644
Binary files a/public/images/emoji/google/middle_finger/6.png and b/public/images/emoji/google/middle_finger/6.png differ
diff --git a/public/images/emoji/google/military_medal.png b/public/images/emoji/google/military_medal.png
index 51c5c7027b..bf10fca3d8 100644
Binary files a/public/images/emoji/google/military_medal.png and b/public/images/emoji/google/military_medal.png differ
diff --git a/public/images/emoji/google/milk_glass.png b/public/images/emoji/google/milk_glass.png
index 256b562d4f..1313cda868 100644
Binary files a/public/images/emoji/google/milk_glass.png and b/public/images/emoji/google/milk_glass.png differ
diff --git a/public/images/emoji/google/milky_way.png b/public/images/emoji/google/milky_way.png
index af10ffa7e8..9af21154a3 100644
Binary files a/public/images/emoji/google/milky_way.png and b/public/images/emoji/google/milky_way.png differ
diff --git a/public/images/emoji/google/minibus.png b/public/images/emoji/google/minibus.png
index 2a9731584a..8a37e23c91 100644
Binary files a/public/images/emoji/google/minibus.png and b/public/images/emoji/google/minibus.png differ
diff --git a/public/images/emoji/google/minidisc.png b/public/images/emoji/google/minidisc.png
index e9b2420fa9..089fd50de9 100644
Binary files a/public/images/emoji/google/minidisc.png and b/public/images/emoji/google/minidisc.png differ
diff --git a/public/images/emoji/google/mobile_phone_off.png b/public/images/emoji/google/mobile_phone_off.png
index 2eb131de41..53fed21865 100644
Binary files a/public/images/emoji/google/mobile_phone_off.png and b/public/images/emoji/google/mobile_phone_off.png differ
diff --git a/public/images/emoji/google/moldova.png b/public/images/emoji/google/moldova.png
index bdd1daad75..a961b32adc 100644
Binary files a/public/images/emoji/google/moldova.png and b/public/images/emoji/google/moldova.png differ
diff --git a/public/images/emoji/google/monaco.png b/public/images/emoji/google/monaco.png
index 30c904e169..459a849095 100644
Binary files a/public/images/emoji/google/monaco.png and b/public/images/emoji/google/monaco.png differ
diff --git a/public/images/emoji/google/money_mouth.png b/public/images/emoji/google/money_mouth.png
index 15b7188abe..1d6bc0dc9e 100644
Binary files a/public/images/emoji/google/money_mouth.png and b/public/images/emoji/google/money_mouth.png differ
diff --git a/public/images/emoji/google/money_mouth_face.png b/public/images/emoji/google/money_mouth_face.png
index 15b7188abe..1d6bc0dc9e 100644
Binary files a/public/images/emoji/google/money_mouth_face.png and b/public/images/emoji/google/money_mouth_face.png differ
diff --git a/public/images/emoji/google/money_with_wings.png b/public/images/emoji/google/money_with_wings.png
index 7852c7b9be..b7f80015f8 100644
Binary files a/public/images/emoji/google/money_with_wings.png and b/public/images/emoji/google/money_with_wings.png differ
diff --git a/public/images/emoji/google/moneybag.png b/public/images/emoji/google/moneybag.png
index 18995016ea..9f0d81f2fe 100644
Binary files a/public/images/emoji/google/moneybag.png and b/public/images/emoji/google/moneybag.png differ
diff --git a/public/images/emoji/google/mongolia.png b/public/images/emoji/google/mongolia.png
index fc2c4d69d0..7beb51c703 100644
Binary files a/public/images/emoji/google/mongolia.png and b/public/images/emoji/google/mongolia.png differ
diff --git a/public/images/emoji/google/monkey.png b/public/images/emoji/google/monkey.png
index 06a97625d4..f8930cb0e3 100644
Binary files a/public/images/emoji/google/monkey.png and b/public/images/emoji/google/monkey.png differ
diff --git a/public/images/emoji/google/monkey_face.png b/public/images/emoji/google/monkey_face.png
index 7a726c3a78..d6b5f2a58b 100644
Binary files a/public/images/emoji/google/monkey_face.png and b/public/images/emoji/google/monkey_face.png differ
diff --git a/public/images/emoji/google/monorail.png b/public/images/emoji/google/monorail.png
index b6e7072262..160117ab2c 100644
Binary files a/public/images/emoji/google/monorail.png and b/public/images/emoji/google/monorail.png differ
diff --git a/public/images/emoji/google/montenegro.png b/public/images/emoji/google/montenegro.png
index 364f5af9bd..0e2cca21b9 100644
Binary files a/public/images/emoji/google/montenegro.png and b/public/images/emoji/google/montenegro.png differ
diff --git a/public/images/emoji/google/montserrat.png b/public/images/emoji/google/montserrat.png
index 3b15005541..a6069d9296 100644
Binary files a/public/images/emoji/google/montserrat.png and b/public/images/emoji/google/montserrat.png differ
diff --git a/public/images/emoji/google/moon.png b/public/images/emoji/google/moon.png
index 948d36d6a4..878497f3f8 100644
Binary files a/public/images/emoji/google/moon.png and b/public/images/emoji/google/moon.png differ
diff --git a/public/images/emoji/google/morocco.png b/public/images/emoji/google/morocco.png
index f9b158fd8c..8cdf1480ef 100644
Binary files a/public/images/emoji/google/morocco.png and b/public/images/emoji/google/morocco.png differ
diff --git a/public/images/emoji/google/mortar_board.png b/public/images/emoji/google/mortar_board.png
index 584c09dd0d..d1e7fa1283 100644
Binary files a/public/images/emoji/google/mortar_board.png and b/public/images/emoji/google/mortar_board.png differ
diff --git a/public/images/emoji/google/mosque.png b/public/images/emoji/google/mosque.png
index c2f372979f..b3fe9a9184 100644
Binary files a/public/images/emoji/google/mosque.png and b/public/images/emoji/google/mosque.png differ
diff --git a/public/images/emoji/google/motor_boat.png b/public/images/emoji/google/motor_boat.png
index 42799a3b74..e26c5116c4 100644
Binary files a/public/images/emoji/google/motor_boat.png and b/public/images/emoji/google/motor_boat.png differ
diff --git a/public/images/emoji/google/motor_scooter.png b/public/images/emoji/google/motor_scooter.png
index 1a80fb5f2e..ad0290cec4 100644
Binary files a/public/images/emoji/google/motor_scooter.png and b/public/images/emoji/google/motor_scooter.png differ
diff --git a/public/images/emoji/google/motorboat.png b/public/images/emoji/google/motorboat.png
index 42799a3b74..e26c5116c4 100644
Binary files a/public/images/emoji/google/motorboat.png and b/public/images/emoji/google/motorboat.png differ
diff --git a/public/images/emoji/google/motorcycle.png b/public/images/emoji/google/motorcycle.png
index d153c400ed..f665d143ef 100644
Binary files a/public/images/emoji/google/motorcycle.png and b/public/images/emoji/google/motorcycle.png differ
diff --git a/public/images/emoji/google/motorway.png b/public/images/emoji/google/motorway.png
index e37d6fa63c..1c8e95fed0 100644
Binary files a/public/images/emoji/google/motorway.png and b/public/images/emoji/google/motorway.png differ
diff --git a/public/images/emoji/google/mount_fuji.png b/public/images/emoji/google/mount_fuji.png
index f0a58a3715..2a6de78a10 100644
Binary files a/public/images/emoji/google/mount_fuji.png and b/public/images/emoji/google/mount_fuji.png differ
diff --git a/public/images/emoji/google/mountain.png b/public/images/emoji/google/mountain.png
index 27d8335093..fac790f782 100644
Binary files a/public/images/emoji/google/mountain.png and b/public/images/emoji/google/mountain.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist.png b/public/images/emoji/google/mountain_bicyclist.png
index 126a776acc..238e3f052e 100644
Binary files a/public/images/emoji/google/mountain_bicyclist.png and b/public/images/emoji/google/mountain_bicyclist.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/2.png b/public/images/emoji/google/mountain_bicyclist/2.png
index 7d49e1c916..40ecb4142a 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/2.png and b/public/images/emoji/google/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/3.png b/public/images/emoji/google/mountain_bicyclist/3.png
index bcb2c82318..940cf0f6f1 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/3.png and b/public/images/emoji/google/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/4.png b/public/images/emoji/google/mountain_bicyclist/4.png
index f864ee5ea9..9e955fae89 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/4.png and b/public/images/emoji/google/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/5.png b/public/images/emoji/google/mountain_bicyclist/5.png
index c9c73598b1..42bf24527a 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/5.png and b/public/images/emoji/google/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/6.png b/public/images/emoji/google/mountain_bicyclist/6.png
index 4cce156c14..e8e32ae2bd 100644
Binary files a/public/images/emoji/google/mountain_bicyclist/6.png and b/public/images/emoji/google/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/google/mountain_biking_man.png b/public/images/emoji/google/mountain_biking_man.png
index 126a776acc..238e3f052e 100644
Binary files a/public/images/emoji/google/mountain_biking_man.png and b/public/images/emoji/google/mountain_biking_man.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/2.png b/public/images/emoji/google/mountain_biking_man/2.png
index 7d49e1c916..40ecb4142a 100644
Binary files a/public/images/emoji/google/mountain_biking_man/2.png and b/public/images/emoji/google/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/3.png b/public/images/emoji/google/mountain_biking_man/3.png
index bcb2c82318..940cf0f6f1 100644
Binary files a/public/images/emoji/google/mountain_biking_man/3.png and b/public/images/emoji/google/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/4.png b/public/images/emoji/google/mountain_biking_man/4.png
index f864ee5ea9..9e955fae89 100644
Binary files a/public/images/emoji/google/mountain_biking_man/4.png and b/public/images/emoji/google/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/5.png b/public/images/emoji/google/mountain_biking_man/5.png
index c9c73598b1..42bf24527a 100644
Binary files a/public/images/emoji/google/mountain_biking_man/5.png and b/public/images/emoji/google/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/6.png b/public/images/emoji/google/mountain_biking_man/6.png
index 4cce156c14..e8e32ae2bd 100644
Binary files a/public/images/emoji/google/mountain_biking_man/6.png and b/public/images/emoji/google/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman.png b/public/images/emoji/google/mountain_biking_woman.png
index 94b07d31ac..1c22d49f94 100644
Binary files a/public/images/emoji/google/mountain_biking_woman.png and b/public/images/emoji/google/mountain_biking_woman.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/2.png b/public/images/emoji/google/mountain_biking_woman/2.png
index a9b9327692..20e3e8ebb1 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/2.png and b/public/images/emoji/google/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/3.png b/public/images/emoji/google/mountain_biking_woman/3.png
index f41c930680..75b20db35e 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/3.png and b/public/images/emoji/google/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/4.png b/public/images/emoji/google/mountain_biking_woman/4.png
index f1c13c6e0c..cbb335ef00 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/4.png and b/public/images/emoji/google/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/5.png b/public/images/emoji/google/mountain_biking_woman/5.png
index 27b10c24fb..91f7999230 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/5.png and b/public/images/emoji/google/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/6.png b/public/images/emoji/google/mountain_biking_woman/6.png
index d9f6ba7bba..bda4352f7c 100644
Binary files a/public/images/emoji/google/mountain_biking_woman/6.png and b/public/images/emoji/google/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/google/mountain_cableway.png b/public/images/emoji/google/mountain_cableway.png
index 109f480419..02ec4de089 100644
Binary files a/public/images/emoji/google/mountain_cableway.png and b/public/images/emoji/google/mountain_cableway.png differ
diff --git a/public/images/emoji/google/mountain_railway.png b/public/images/emoji/google/mountain_railway.png
index c68849f357..4793182118 100644
Binary files a/public/images/emoji/google/mountain_railway.png and b/public/images/emoji/google/mountain_railway.png differ
diff --git a/public/images/emoji/google/mountain_snow.png b/public/images/emoji/google/mountain_snow.png
index f7ab7c2c74..394c96bb61 100644
Binary files a/public/images/emoji/google/mountain_snow.png and b/public/images/emoji/google/mountain_snow.png differ
diff --git a/public/images/emoji/google/mouse.png b/public/images/emoji/google/mouse.png
index 2e10c6001a..1e157c89c0 100644
Binary files a/public/images/emoji/google/mouse.png and b/public/images/emoji/google/mouse.png differ
diff --git a/public/images/emoji/google/mouse2.png b/public/images/emoji/google/mouse2.png
index f32d8e136f..4c93a0d248 100644
Binary files a/public/images/emoji/google/mouse2.png and b/public/images/emoji/google/mouse2.png differ
diff --git a/public/images/emoji/google/mouse_three_button.png b/public/images/emoji/google/mouse_three_button.png
index 606ada2ed4..28785439fc 100644
Binary files a/public/images/emoji/google/mouse_three_button.png and b/public/images/emoji/google/mouse_three_button.png differ
diff --git a/public/images/emoji/google/movie_camera.png b/public/images/emoji/google/movie_camera.png
index c09d290c01..b1ba75a16d 100644
Binary files a/public/images/emoji/google/movie_camera.png and b/public/images/emoji/google/movie_camera.png differ
diff --git a/public/images/emoji/google/moyai.png b/public/images/emoji/google/moyai.png
index f9da231184..723cd7c626 100644
Binary files a/public/images/emoji/google/moyai.png and b/public/images/emoji/google/moyai.png differ
diff --git a/public/images/emoji/google/mozambique.png b/public/images/emoji/google/mozambique.png
index 72b32c188f..363860590d 100644
Binary files a/public/images/emoji/google/mozambique.png and b/public/images/emoji/google/mozambique.png differ
diff --git a/public/images/emoji/google/mrs_claus.png b/public/images/emoji/google/mrs_claus.png
index 694316523a..2edec50ec4 100644
Binary files a/public/images/emoji/google/mrs_claus.png and b/public/images/emoji/google/mrs_claus.png differ
diff --git a/public/images/emoji/google/mrs_claus/2.png b/public/images/emoji/google/mrs_claus/2.png
index dbb37173d7..db51cca09c 100644
Binary files a/public/images/emoji/google/mrs_claus/2.png and b/public/images/emoji/google/mrs_claus/2.png differ
diff --git a/public/images/emoji/google/mrs_claus/3.png b/public/images/emoji/google/mrs_claus/3.png
index c311381bce..0cd2668f06 100644
Binary files a/public/images/emoji/google/mrs_claus/3.png and b/public/images/emoji/google/mrs_claus/3.png differ
diff --git a/public/images/emoji/google/mrs_claus/4.png b/public/images/emoji/google/mrs_claus/4.png
index bc74e33fe1..10ab1f76c9 100644
Binary files a/public/images/emoji/google/mrs_claus/4.png and b/public/images/emoji/google/mrs_claus/4.png differ
diff --git a/public/images/emoji/google/mrs_claus/5.png b/public/images/emoji/google/mrs_claus/5.png
index ce7bb7cd12..394064f890 100644
Binary files a/public/images/emoji/google/mrs_claus/5.png and b/public/images/emoji/google/mrs_claus/5.png differ
diff --git a/public/images/emoji/google/mrs_claus/6.png b/public/images/emoji/google/mrs_claus/6.png
index c9fd8609bb..b9a60a1ffe 100644
Binary files a/public/images/emoji/google/mrs_claus/6.png and b/public/images/emoji/google/mrs_claus/6.png differ
diff --git a/public/images/emoji/google/muscle.png b/public/images/emoji/google/muscle.png
index 2f4e8a9d48..b905e7189c 100644
Binary files a/public/images/emoji/google/muscle.png and b/public/images/emoji/google/muscle.png differ
diff --git a/public/images/emoji/google/muscle/2.png b/public/images/emoji/google/muscle/2.png
index f5742eda91..229ef9fad7 100644
Binary files a/public/images/emoji/google/muscle/2.png and b/public/images/emoji/google/muscle/2.png differ
diff --git a/public/images/emoji/google/muscle/3.png b/public/images/emoji/google/muscle/3.png
index 4dd7352f77..e720691100 100644
Binary files a/public/images/emoji/google/muscle/3.png and b/public/images/emoji/google/muscle/3.png differ
diff --git a/public/images/emoji/google/muscle/4.png b/public/images/emoji/google/muscle/4.png
index 44dacb8a0c..02304a24e1 100644
Binary files a/public/images/emoji/google/muscle/4.png and b/public/images/emoji/google/muscle/4.png differ
diff --git a/public/images/emoji/google/muscle/5.png b/public/images/emoji/google/muscle/5.png
index e8affdf454..3490fc9d1f 100644
Binary files a/public/images/emoji/google/muscle/5.png and b/public/images/emoji/google/muscle/5.png differ
diff --git a/public/images/emoji/google/muscle/6.png b/public/images/emoji/google/muscle/6.png
index 042948c39a..53cf41e4d0 100644
Binary files a/public/images/emoji/google/muscle/6.png and b/public/images/emoji/google/muscle/6.png differ
diff --git a/public/images/emoji/google/mushroom.png b/public/images/emoji/google/mushroom.png
index 3bd413f268..bdddb34cd8 100644
Binary files a/public/images/emoji/google/mushroom.png and b/public/images/emoji/google/mushroom.png differ
diff --git a/public/images/emoji/google/musical_keyboard.png b/public/images/emoji/google/musical_keyboard.png
index d1bf210a77..cc794312f6 100644
Binary files a/public/images/emoji/google/musical_keyboard.png and b/public/images/emoji/google/musical_keyboard.png differ
diff --git a/public/images/emoji/google/musical_note.png b/public/images/emoji/google/musical_note.png
index ca4bd871c2..4e7e9a306d 100644
Binary files a/public/images/emoji/google/musical_note.png and b/public/images/emoji/google/musical_note.png differ
diff --git a/public/images/emoji/google/musical_score.png b/public/images/emoji/google/musical_score.png
index 38e5a652ab..4df0ffb8be 100644
Binary files a/public/images/emoji/google/musical_score.png and b/public/images/emoji/google/musical_score.png differ
diff --git a/public/images/emoji/google/mute.png b/public/images/emoji/google/mute.png
index 9c9dc80824..af176d1cda 100644
Binary files a/public/images/emoji/google/mute.png and b/public/images/emoji/google/mute.png differ
diff --git a/public/images/emoji/google/myanmar.png b/public/images/emoji/google/myanmar.png
index 521999380c..d28635d296 100644
Binary files a/public/images/emoji/google/myanmar.png and b/public/images/emoji/google/myanmar.png differ
diff --git a/public/images/emoji/google/nail_care.png b/public/images/emoji/google/nail_care.png
index e22ff7d1a6..a845554d6c 100644
Binary files a/public/images/emoji/google/nail_care.png and b/public/images/emoji/google/nail_care.png differ
diff --git a/public/images/emoji/google/nail_care/2.png b/public/images/emoji/google/nail_care/2.png
index 7959b94c39..eb0803d46b 100644
Binary files a/public/images/emoji/google/nail_care/2.png and b/public/images/emoji/google/nail_care/2.png differ
diff --git a/public/images/emoji/google/nail_care/3.png b/public/images/emoji/google/nail_care/3.png
index 735f0fd5c3..94f132b386 100644
Binary files a/public/images/emoji/google/nail_care/3.png and b/public/images/emoji/google/nail_care/3.png differ
diff --git a/public/images/emoji/google/nail_care/4.png b/public/images/emoji/google/nail_care/4.png
index e45bd79054..12ec1166af 100644
Binary files a/public/images/emoji/google/nail_care/4.png and b/public/images/emoji/google/nail_care/4.png differ
diff --git a/public/images/emoji/google/nail_care/5.png b/public/images/emoji/google/nail_care/5.png
index 55a09777d7..47ae039cfd 100644
Binary files a/public/images/emoji/google/nail_care/5.png and b/public/images/emoji/google/nail_care/5.png differ
diff --git a/public/images/emoji/google/nail_care/6.png b/public/images/emoji/google/nail_care/6.png
index 8f8a1668de..d1b0bfe1f3 100644
Binary files a/public/images/emoji/google/nail_care/6.png and b/public/images/emoji/google/nail_care/6.png differ
diff --git a/public/images/emoji/google/name_badge.png b/public/images/emoji/google/name_badge.png
index 6de01068db..0627940cc7 100644
Binary files a/public/images/emoji/google/name_badge.png and b/public/images/emoji/google/name_badge.png differ
diff --git a/public/images/emoji/google/namibia.png b/public/images/emoji/google/namibia.png
index ff94010440..ccc0114785 100644
Binary files a/public/images/emoji/google/namibia.png and b/public/images/emoji/google/namibia.png differ
diff --git a/public/images/emoji/google/national_park.png b/public/images/emoji/google/national_park.png
index 669eb54fbf..d98082e0cd 100644
Binary files a/public/images/emoji/google/national_park.png and b/public/images/emoji/google/national_park.png differ
diff --git a/public/images/emoji/google/nauru.png b/public/images/emoji/google/nauru.png
index d62600569a..5a3001c320 100644
Binary files a/public/images/emoji/google/nauru.png and b/public/images/emoji/google/nauru.png differ
diff --git a/public/images/emoji/google/nauseated_face.png b/public/images/emoji/google/nauseated_face.png
index 004026f11e..59787d849e 100644
Binary files a/public/images/emoji/google/nauseated_face.png and b/public/images/emoji/google/nauseated_face.png differ
diff --git a/public/images/emoji/google/necktie.png b/public/images/emoji/google/necktie.png
index f8e16d4a1f..8b011b7da6 100644
Binary files a/public/images/emoji/google/necktie.png and b/public/images/emoji/google/necktie.png differ
diff --git a/public/images/emoji/google/negative_squared_cross_mark.png b/public/images/emoji/google/negative_squared_cross_mark.png
index 3a8695d5f4..7dc46a44ba 100644
Binary files a/public/images/emoji/google/negative_squared_cross_mark.png and b/public/images/emoji/google/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/google/nepal.png b/public/images/emoji/google/nepal.png
index 737e60dcc8..0936526831 100644
Binary files a/public/images/emoji/google/nepal.png and b/public/images/emoji/google/nepal.png differ
diff --git a/public/images/emoji/google/nerd.png b/public/images/emoji/google/nerd.png
index 0028a1fe44..3d7385639f 100644
Binary files a/public/images/emoji/google/nerd.png and b/public/images/emoji/google/nerd.png differ
diff --git a/public/images/emoji/google/nerd_face.png b/public/images/emoji/google/nerd_face.png
index 0028a1fe44..3d7385639f 100644
Binary files a/public/images/emoji/google/nerd_face.png and b/public/images/emoji/google/nerd_face.png differ
diff --git a/public/images/emoji/google/netherlands.png b/public/images/emoji/google/netherlands.png
index a4701766ec..a7cce65956 100644
Binary files a/public/images/emoji/google/netherlands.png and b/public/images/emoji/google/netherlands.png differ
diff --git a/public/images/emoji/google/neutral_face.png b/public/images/emoji/google/neutral_face.png
index 67d8c2ef3d..440cbb2032 100644
Binary files a/public/images/emoji/google/neutral_face.png and b/public/images/emoji/google/neutral_face.png differ
diff --git a/public/images/emoji/google/new.png b/public/images/emoji/google/new.png
index 85ad0cc653..d3577384f7 100644
Binary files a/public/images/emoji/google/new.png and b/public/images/emoji/google/new.png differ
diff --git a/public/images/emoji/google/new_caledonia.png b/public/images/emoji/google/new_caledonia.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/new_caledonia.png and b/public/images/emoji/google/new_caledonia.png differ
diff --git a/public/images/emoji/google/new_moon.png b/public/images/emoji/google/new_moon.png
index 948d36d6a4..878497f3f8 100644
Binary files a/public/images/emoji/google/new_moon.png and b/public/images/emoji/google/new_moon.png differ
diff --git a/public/images/emoji/google/new_moon_with_face.png b/public/images/emoji/google/new_moon_with_face.png
index ccc3826641..927390dd78 100644
Binary files a/public/images/emoji/google/new_moon_with_face.png and b/public/images/emoji/google/new_moon_with_face.png differ
diff --git a/public/images/emoji/google/new_zealand.png b/public/images/emoji/google/new_zealand.png
index 7b9a30256c..0fed03d9d8 100644
Binary files a/public/images/emoji/google/new_zealand.png and b/public/images/emoji/google/new_zealand.png differ
diff --git a/public/images/emoji/google/newspaper.png b/public/images/emoji/google/newspaper.png
index 2138c8f8cd..1012580dc6 100644
Binary files a/public/images/emoji/google/newspaper.png and b/public/images/emoji/google/newspaper.png differ
diff --git a/public/images/emoji/google/newspaper2.png b/public/images/emoji/google/newspaper2.png
index 13fb245471..3cdda353ac 100644
Binary files a/public/images/emoji/google/newspaper2.png and b/public/images/emoji/google/newspaper2.png differ
diff --git a/public/images/emoji/google/newspaper_roll.png b/public/images/emoji/google/newspaper_roll.png
index 13fb245471..3cdda353ac 100644
Binary files a/public/images/emoji/google/newspaper_roll.png and b/public/images/emoji/google/newspaper_roll.png differ
diff --git a/public/images/emoji/google/next_track.png b/public/images/emoji/google/next_track.png
index 85f7bba60f..1faa13a2d5 100644
Binary files a/public/images/emoji/google/next_track.png and b/public/images/emoji/google/next_track.png differ
diff --git a/public/images/emoji/google/next_track_button.png b/public/images/emoji/google/next_track_button.png
index 85f7bba60f..1faa13a2d5 100644
Binary files a/public/images/emoji/google/next_track_button.png and b/public/images/emoji/google/next_track_button.png differ
diff --git a/public/images/emoji/google/ng.png b/public/images/emoji/google/ng.png
index 9f2e1f1f89..2a26ea50f9 100644
Binary files a/public/images/emoji/google/ng.png and b/public/images/emoji/google/ng.png differ
diff --git a/public/images/emoji/google/nicaragua.png b/public/images/emoji/google/nicaragua.png
index cf00cb5749..8280f1dcf8 100644
Binary files a/public/images/emoji/google/nicaragua.png and b/public/images/emoji/google/nicaragua.png differ
diff --git a/public/images/emoji/google/niger.png b/public/images/emoji/google/niger.png
index b03af80215..cc986c395c 100644
Binary files a/public/images/emoji/google/niger.png and b/public/images/emoji/google/niger.png differ
diff --git a/public/images/emoji/google/nigeria.png b/public/images/emoji/google/nigeria.png
index a4562939c7..755a7ba291 100644
Binary files a/public/images/emoji/google/nigeria.png and b/public/images/emoji/google/nigeria.png differ
diff --git a/public/images/emoji/google/night_with_stars.png b/public/images/emoji/google/night_with_stars.png
index d4d2aadd83..f408f477ab 100644
Binary files a/public/images/emoji/google/night_with_stars.png and b/public/images/emoji/google/night_with_stars.png differ
diff --git a/public/images/emoji/google/nine.png b/public/images/emoji/google/nine.png
index 2af7f8b823..f228da9f19 100644
Binary files a/public/images/emoji/google/nine.png and b/public/images/emoji/google/nine.png differ
diff --git a/public/images/emoji/google/niue.png b/public/images/emoji/google/niue.png
index 6d08f75c6b..af0081c41d 100644
Binary files a/public/images/emoji/google/niue.png and b/public/images/emoji/google/niue.png differ
diff --git a/public/images/emoji/google/no_bell.png b/public/images/emoji/google/no_bell.png
index a14d2bffae..f3530a0706 100644
Binary files a/public/images/emoji/google/no_bell.png and b/public/images/emoji/google/no_bell.png differ
diff --git a/public/images/emoji/google/no_bicycles.png b/public/images/emoji/google/no_bicycles.png
index bfe7b1dc02..71aec38e09 100644
Binary files a/public/images/emoji/google/no_bicycles.png and b/public/images/emoji/google/no_bicycles.png differ
diff --git a/public/images/emoji/google/no_entry.png b/public/images/emoji/google/no_entry.png
index 3544be5b03..6a5c2cb600 100644
Binary files a/public/images/emoji/google/no_entry.png and b/public/images/emoji/google/no_entry.png differ
diff --git a/public/images/emoji/google/no_entry_sign.png b/public/images/emoji/google/no_entry_sign.png
index caa3f51d2e..6b52bda422 100644
Binary files a/public/images/emoji/google/no_entry_sign.png and b/public/images/emoji/google/no_entry_sign.png differ
diff --git a/public/images/emoji/google/no_good.png b/public/images/emoji/google/no_good.png
index 797c435b70..a639813593 100644
Binary files a/public/images/emoji/google/no_good.png and b/public/images/emoji/google/no_good.png differ
diff --git a/public/images/emoji/google/no_good/2.png b/public/images/emoji/google/no_good/2.png
index c90ee91006..ac5db483fd 100644
Binary files a/public/images/emoji/google/no_good/2.png and b/public/images/emoji/google/no_good/2.png differ
diff --git a/public/images/emoji/google/no_good/3.png b/public/images/emoji/google/no_good/3.png
index b6ec827f38..ada3101256 100644
Binary files a/public/images/emoji/google/no_good/3.png and b/public/images/emoji/google/no_good/3.png differ
diff --git a/public/images/emoji/google/no_good/4.png b/public/images/emoji/google/no_good/4.png
index 8df51e056f..dc4f99f111 100644
Binary files a/public/images/emoji/google/no_good/4.png and b/public/images/emoji/google/no_good/4.png differ
diff --git a/public/images/emoji/google/no_good/5.png b/public/images/emoji/google/no_good/5.png
index 232495b5aa..a3aad8046b 100644
Binary files a/public/images/emoji/google/no_good/5.png and b/public/images/emoji/google/no_good/5.png differ
diff --git a/public/images/emoji/google/no_good/6.png b/public/images/emoji/google/no_good/6.png
index dc52c7b5d2..a57ae2f511 100644
Binary files a/public/images/emoji/google/no_good/6.png and b/public/images/emoji/google/no_good/6.png differ
diff --git a/public/images/emoji/google/no_good_man.png b/public/images/emoji/google/no_good_man.png
index 72455cef93..e938d0243c 100644
Binary files a/public/images/emoji/google/no_good_man.png and b/public/images/emoji/google/no_good_man.png differ
diff --git a/public/images/emoji/google/no_good_man/2.png b/public/images/emoji/google/no_good_man/2.png
index 24c952374a..7c15073a39 100644
Binary files a/public/images/emoji/google/no_good_man/2.png and b/public/images/emoji/google/no_good_man/2.png differ
diff --git a/public/images/emoji/google/no_good_man/3.png b/public/images/emoji/google/no_good_man/3.png
index b5746a4c78..83f6f6f699 100644
Binary files a/public/images/emoji/google/no_good_man/3.png and b/public/images/emoji/google/no_good_man/3.png differ
diff --git a/public/images/emoji/google/no_good_man/4.png b/public/images/emoji/google/no_good_man/4.png
index 92eded52fb..3d07c645f2 100644
Binary files a/public/images/emoji/google/no_good_man/4.png and b/public/images/emoji/google/no_good_man/4.png differ
diff --git a/public/images/emoji/google/no_good_man/5.png b/public/images/emoji/google/no_good_man/5.png
index a7a0fb9d5b..0be42e86b3 100644
Binary files a/public/images/emoji/google/no_good_man/5.png and b/public/images/emoji/google/no_good_man/5.png differ
diff --git a/public/images/emoji/google/no_good_man/6.png b/public/images/emoji/google/no_good_man/6.png
index 77663e5934..249e8909d0 100644
Binary files a/public/images/emoji/google/no_good_man/6.png and b/public/images/emoji/google/no_good_man/6.png differ
diff --git a/public/images/emoji/google/no_good_woman.png b/public/images/emoji/google/no_good_woman.png
index 797c435b70..a639813593 100644
Binary files a/public/images/emoji/google/no_good_woman.png and b/public/images/emoji/google/no_good_woman.png differ
diff --git a/public/images/emoji/google/no_good_woman/2.png b/public/images/emoji/google/no_good_woman/2.png
index c90ee91006..ac5db483fd 100644
Binary files a/public/images/emoji/google/no_good_woman/2.png and b/public/images/emoji/google/no_good_woman/2.png differ
diff --git a/public/images/emoji/google/no_good_woman/3.png b/public/images/emoji/google/no_good_woman/3.png
index b6ec827f38..ada3101256 100644
Binary files a/public/images/emoji/google/no_good_woman/3.png and b/public/images/emoji/google/no_good_woman/3.png differ
diff --git a/public/images/emoji/google/no_good_woman/4.png b/public/images/emoji/google/no_good_woman/4.png
index 8df51e056f..dc4f99f111 100644
Binary files a/public/images/emoji/google/no_good_woman/4.png and b/public/images/emoji/google/no_good_woman/4.png differ
diff --git a/public/images/emoji/google/no_good_woman/5.png b/public/images/emoji/google/no_good_woman/5.png
index 232495b5aa..a3aad8046b 100644
Binary files a/public/images/emoji/google/no_good_woman/5.png and b/public/images/emoji/google/no_good_woman/5.png differ
diff --git a/public/images/emoji/google/no_good_woman/6.png b/public/images/emoji/google/no_good_woman/6.png
index dc52c7b5d2..a57ae2f511 100644
Binary files a/public/images/emoji/google/no_good_woman/6.png and b/public/images/emoji/google/no_good_woman/6.png differ
diff --git a/public/images/emoji/google/no_mobile_phones.png b/public/images/emoji/google/no_mobile_phones.png
index efec493cae..e3b14e1415 100644
Binary files a/public/images/emoji/google/no_mobile_phones.png and b/public/images/emoji/google/no_mobile_phones.png differ
diff --git a/public/images/emoji/google/no_mouth.png b/public/images/emoji/google/no_mouth.png
index 8dd7edd458..04ffae31a1 100644
Binary files a/public/images/emoji/google/no_mouth.png and b/public/images/emoji/google/no_mouth.png differ
diff --git a/public/images/emoji/google/no_pedestrians.png b/public/images/emoji/google/no_pedestrians.png
index f948f3d255..1098d68e2a 100644
Binary files a/public/images/emoji/google/no_pedestrians.png and b/public/images/emoji/google/no_pedestrians.png differ
diff --git a/public/images/emoji/google/no_smoking.png b/public/images/emoji/google/no_smoking.png
index bf662e9a8f..43a3b70f7d 100644
Binary files a/public/images/emoji/google/no_smoking.png and b/public/images/emoji/google/no_smoking.png differ
diff --git a/public/images/emoji/google/non-potable_water.png b/public/images/emoji/google/non-potable_water.png
index d2daa6662c..28ca6fbfbd 100644
Binary files a/public/images/emoji/google/non-potable_water.png and b/public/images/emoji/google/non-potable_water.png differ
diff --git a/public/images/emoji/google/norfolk_island.png b/public/images/emoji/google/norfolk_island.png
index cf150763d9..113c7827c2 100644
Binary files a/public/images/emoji/google/norfolk_island.png and b/public/images/emoji/google/norfolk_island.png differ
diff --git a/public/images/emoji/google/north_korea.png b/public/images/emoji/google/north_korea.png
index 6bc5813b61..bc3460d32e 100644
Binary files a/public/images/emoji/google/north_korea.png and b/public/images/emoji/google/north_korea.png differ
diff --git a/public/images/emoji/google/northern_mariana_islands.png b/public/images/emoji/google/northern_mariana_islands.png
index 1e3243d7e5..5bc53d8da2 100644
Binary files a/public/images/emoji/google/northern_mariana_islands.png and b/public/images/emoji/google/northern_mariana_islands.png differ
diff --git a/public/images/emoji/google/norway.png b/public/images/emoji/google/norway.png
index 5330d9794c..d348a446ad 100644
Binary files a/public/images/emoji/google/norway.png and b/public/images/emoji/google/norway.png differ
diff --git a/public/images/emoji/google/nose.png b/public/images/emoji/google/nose.png
index 7561d03c25..6ae23f4271 100644
Binary files a/public/images/emoji/google/nose.png and b/public/images/emoji/google/nose.png differ
diff --git a/public/images/emoji/google/nose/2.png b/public/images/emoji/google/nose/2.png
index c474e1b2af..2506ec2fef 100644
Binary files a/public/images/emoji/google/nose/2.png and b/public/images/emoji/google/nose/2.png differ
diff --git a/public/images/emoji/google/nose/3.png b/public/images/emoji/google/nose/3.png
index a04dbf7c8a..544c6317f7 100644
Binary files a/public/images/emoji/google/nose/3.png and b/public/images/emoji/google/nose/3.png differ
diff --git a/public/images/emoji/google/nose/4.png b/public/images/emoji/google/nose/4.png
index f198511ec0..c0933765fe 100644
Binary files a/public/images/emoji/google/nose/4.png and b/public/images/emoji/google/nose/4.png differ
diff --git a/public/images/emoji/google/nose/5.png b/public/images/emoji/google/nose/5.png
index 48b7dab4fc..78377bc5c1 100644
Binary files a/public/images/emoji/google/nose/5.png and b/public/images/emoji/google/nose/5.png differ
diff --git a/public/images/emoji/google/nose/6.png b/public/images/emoji/google/nose/6.png
index 90e8771126..ea5d304216 100644
Binary files a/public/images/emoji/google/nose/6.png and b/public/images/emoji/google/nose/6.png differ
diff --git a/public/images/emoji/google/notebook.png b/public/images/emoji/google/notebook.png
index ff3e8f08b0..31238241c9 100644
Binary files a/public/images/emoji/google/notebook.png and b/public/images/emoji/google/notebook.png differ
diff --git a/public/images/emoji/google/notebook_with_decorative_cover.png b/public/images/emoji/google/notebook_with_decorative_cover.png
index 175bdd76a2..12176ab45d 100644
Binary files a/public/images/emoji/google/notebook_with_decorative_cover.png and b/public/images/emoji/google/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/google/notepad_spiral.png b/public/images/emoji/google/notepad_spiral.png
index ff382324e5..72e515dc60 100644
Binary files a/public/images/emoji/google/notepad_spiral.png and b/public/images/emoji/google/notepad_spiral.png differ
diff --git a/public/images/emoji/google/notes.png b/public/images/emoji/google/notes.png
index 0303907daf..e4c0acc7be 100644
Binary files a/public/images/emoji/google/notes.png and b/public/images/emoji/google/notes.png differ
diff --git a/public/images/emoji/google/nut_and_bolt.png b/public/images/emoji/google/nut_and_bolt.png
index 2ec42d068f..4e788ca5cc 100644
Binary files a/public/images/emoji/google/nut_and_bolt.png and b/public/images/emoji/google/nut_and_bolt.png differ
diff --git a/public/images/emoji/google/o.png b/public/images/emoji/google/o.png
index 958cb3858f..214e7b57db 100644
Binary files a/public/images/emoji/google/o.png and b/public/images/emoji/google/o.png differ
diff --git a/public/images/emoji/google/o2.png b/public/images/emoji/google/o2.png
index 60974e106d..2c809565c2 100644
Binary files a/public/images/emoji/google/o2.png and b/public/images/emoji/google/o2.png differ
diff --git a/public/images/emoji/google/ocean.png b/public/images/emoji/google/ocean.png
index db5786f95b..d536ba9b4b 100644
Binary files a/public/images/emoji/google/ocean.png and b/public/images/emoji/google/ocean.png differ
diff --git a/public/images/emoji/google/octopus.png b/public/images/emoji/google/octopus.png
index 356f9f3c64..34e1fa5ace 100644
Binary files a/public/images/emoji/google/octopus.png and b/public/images/emoji/google/octopus.png differ
diff --git a/public/images/emoji/google/oden.png b/public/images/emoji/google/oden.png
index e23a091cbf..0175691f49 100644
Binary files a/public/images/emoji/google/oden.png and b/public/images/emoji/google/oden.png differ
diff --git a/public/images/emoji/google/office.png b/public/images/emoji/google/office.png
index e12836eef9..e0da8d29ca 100644
Binary files a/public/images/emoji/google/office.png and b/public/images/emoji/google/office.png differ
diff --git a/public/images/emoji/google/oil.png b/public/images/emoji/google/oil.png
index 12f7f469aa..e2bea27a97 100644
Binary files a/public/images/emoji/google/oil.png and b/public/images/emoji/google/oil.png differ
diff --git a/public/images/emoji/google/oil_drum.png b/public/images/emoji/google/oil_drum.png
index 12f7f469aa..e2bea27a97 100644
Binary files a/public/images/emoji/google/oil_drum.png and b/public/images/emoji/google/oil_drum.png differ
diff --git a/public/images/emoji/google/ok.png b/public/images/emoji/google/ok.png
index ae8f6be07a..c596df58e5 100644
Binary files a/public/images/emoji/google/ok.png and b/public/images/emoji/google/ok.png differ
diff --git a/public/images/emoji/google/ok_hand.png b/public/images/emoji/google/ok_hand.png
index e1adb5fc01..446cfd0546 100644
Binary files a/public/images/emoji/google/ok_hand.png and b/public/images/emoji/google/ok_hand.png differ
diff --git a/public/images/emoji/google/ok_hand/2.png b/public/images/emoji/google/ok_hand/2.png
index 22dd5a6409..6b67a1e33e 100644
Binary files a/public/images/emoji/google/ok_hand/2.png and b/public/images/emoji/google/ok_hand/2.png differ
diff --git a/public/images/emoji/google/ok_hand/3.png b/public/images/emoji/google/ok_hand/3.png
index 3f6b9eefb6..38e3813990 100644
Binary files a/public/images/emoji/google/ok_hand/3.png and b/public/images/emoji/google/ok_hand/3.png differ
diff --git a/public/images/emoji/google/ok_hand/4.png b/public/images/emoji/google/ok_hand/4.png
index 74f9267b31..15ed6f49a0 100644
Binary files a/public/images/emoji/google/ok_hand/4.png and b/public/images/emoji/google/ok_hand/4.png differ
diff --git a/public/images/emoji/google/ok_hand/5.png b/public/images/emoji/google/ok_hand/5.png
index a2b4e9acc0..75ab5099f6 100644
Binary files a/public/images/emoji/google/ok_hand/5.png and b/public/images/emoji/google/ok_hand/5.png differ
diff --git a/public/images/emoji/google/ok_hand/6.png b/public/images/emoji/google/ok_hand/6.png
index 244e16aa6c..c351df9244 100644
Binary files a/public/images/emoji/google/ok_hand/6.png and b/public/images/emoji/google/ok_hand/6.png differ
diff --git a/public/images/emoji/google/ok_man.png b/public/images/emoji/google/ok_man.png
index c4636c1ae9..f508195e7c 100644
Binary files a/public/images/emoji/google/ok_man.png and b/public/images/emoji/google/ok_man.png differ
diff --git a/public/images/emoji/google/ok_man/2.png b/public/images/emoji/google/ok_man/2.png
index 8da030b734..ea8ec53b28 100644
Binary files a/public/images/emoji/google/ok_man/2.png and b/public/images/emoji/google/ok_man/2.png differ
diff --git a/public/images/emoji/google/ok_man/3.png b/public/images/emoji/google/ok_man/3.png
index d945cd09b4..04be7cd9ec 100644
Binary files a/public/images/emoji/google/ok_man/3.png and b/public/images/emoji/google/ok_man/3.png differ
diff --git a/public/images/emoji/google/ok_man/4.png b/public/images/emoji/google/ok_man/4.png
index f871e308c5..1c2511328c 100644
Binary files a/public/images/emoji/google/ok_man/4.png and b/public/images/emoji/google/ok_man/4.png differ
diff --git a/public/images/emoji/google/ok_man/5.png b/public/images/emoji/google/ok_man/5.png
index ef9c47d55b..b536c2112d 100644
Binary files a/public/images/emoji/google/ok_man/5.png and b/public/images/emoji/google/ok_man/5.png differ
diff --git a/public/images/emoji/google/ok_man/6.png b/public/images/emoji/google/ok_man/6.png
index bf469bf1f0..019f756564 100644
Binary files a/public/images/emoji/google/ok_man/6.png and b/public/images/emoji/google/ok_man/6.png differ
diff --git a/public/images/emoji/google/ok_woman.png b/public/images/emoji/google/ok_woman.png
index fc51dcfb06..4b8c844a3d 100644
Binary files a/public/images/emoji/google/ok_woman.png and b/public/images/emoji/google/ok_woman.png differ
diff --git a/public/images/emoji/google/ok_woman/2.png b/public/images/emoji/google/ok_woman/2.png
index 52cf1392a6..c040ca8334 100644
Binary files a/public/images/emoji/google/ok_woman/2.png and b/public/images/emoji/google/ok_woman/2.png differ
diff --git a/public/images/emoji/google/ok_woman/3.png b/public/images/emoji/google/ok_woman/3.png
index a8b9d7ec9a..b54ac12b4a 100644
Binary files a/public/images/emoji/google/ok_woman/3.png and b/public/images/emoji/google/ok_woman/3.png differ
diff --git a/public/images/emoji/google/ok_woman/4.png b/public/images/emoji/google/ok_woman/4.png
index cbedc79d8d..499f0052d7 100644
Binary files a/public/images/emoji/google/ok_woman/4.png and b/public/images/emoji/google/ok_woman/4.png differ
diff --git a/public/images/emoji/google/ok_woman/5.png b/public/images/emoji/google/ok_woman/5.png
index 7a6da71e87..6b31246feb 100644
Binary files a/public/images/emoji/google/ok_woman/5.png and b/public/images/emoji/google/ok_woman/5.png differ
diff --git a/public/images/emoji/google/ok_woman/6.png b/public/images/emoji/google/ok_woman/6.png
index 3236ad424f..049c4eb71f 100644
Binary files a/public/images/emoji/google/ok_woman/6.png and b/public/images/emoji/google/ok_woman/6.png differ
diff --git a/public/images/emoji/google/old_key.png b/public/images/emoji/google/old_key.png
index d6739c8457..6083982335 100644
Binary files a/public/images/emoji/google/old_key.png and b/public/images/emoji/google/old_key.png differ
diff --git a/public/images/emoji/google/older_adult.png b/public/images/emoji/google/older_adult.png
index 3b4a366171..7d94d0b329 100644
Binary files a/public/images/emoji/google/older_adult.png and b/public/images/emoji/google/older_adult.png differ
diff --git a/public/images/emoji/google/older_adult/2.png b/public/images/emoji/google/older_adult/2.png
index ffcda16308..e8afae7cec 100644
Binary files a/public/images/emoji/google/older_adult/2.png and b/public/images/emoji/google/older_adult/2.png differ
diff --git a/public/images/emoji/google/older_adult/3.png b/public/images/emoji/google/older_adult/3.png
index 46fb744035..b7dd4c996f 100644
Binary files a/public/images/emoji/google/older_adult/3.png and b/public/images/emoji/google/older_adult/3.png differ
diff --git a/public/images/emoji/google/older_adult/4.png b/public/images/emoji/google/older_adult/4.png
index 3c05309e58..4b35a67181 100644
Binary files a/public/images/emoji/google/older_adult/4.png and b/public/images/emoji/google/older_adult/4.png differ
diff --git a/public/images/emoji/google/older_adult/5.png b/public/images/emoji/google/older_adult/5.png
index 1acf2a4a54..9c85efcd7c 100644
Binary files a/public/images/emoji/google/older_adult/5.png and b/public/images/emoji/google/older_adult/5.png differ
diff --git a/public/images/emoji/google/older_adult/6.png b/public/images/emoji/google/older_adult/6.png
index 6ca350992a..51b2ec72bf 100644
Binary files a/public/images/emoji/google/older_adult/6.png and b/public/images/emoji/google/older_adult/6.png differ
diff --git a/public/images/emoji/google/older_man.png b/public/images/emoji/google/older_man.png
index 1efe6018b1..d2de212e7a 100644
Binary files a/public/images/emoji/google/older_man.png and b/public/images/emoji/google/older_man.png differ
diff --git a/public/images/emoji/google/older_man/2.png b/public/images/emoji/google/older_man/2.png
index 53d7098597..feb0107a1e 100644
Binary files a/public/images/emoji/google/older_man/2.png and b/public/images/emoji/google/older_man/2.png differ
diff --git a/public/images/emoji/google/older_man/3.png b/public/images/emoji/google/older_man/3.png
index c6175d6500..be1cb5d1c1 100644
Binary files a/public/images/emoji/google/older_man/3.png and b/public/images/emoji/google/older_man/3.png differ
diff --git a/public/images/emoji/google/older_man/4.png b/public/images/emoji/google/older_man/4.png
index 5b25856d3b..c20c0805ab 100644
Binary files a/public/images/emoji/google/older_man/4.png and b/public/images/emoji/google/older_man/4.png differ
diff --git a/public/images/emoji/google/older_man/5.png b/public/images/emoji/google/older_man/5.png
index ed9270ac9c..0605d4fa06 100644
Binary files a/public/images/emoji/google/older_man/5.png and b/public/images/emoji/google/older_man/5.png differ
diff --git a/public/images/emoji/google/older_man/6.png b/public/images/emoji/google/older_man/6.png
index 507b233703..3502b1d3bf 100644
Binary files a/public/images/emoji/google/older_man/6.png and b/public/images/emoji/google/older_man/6.png differ
diff --git a/public/images/emoji/google/older_woman.png b/public/images/emoji/google/older_woman.png
index 4aeba637f7..1d07afb892 100644
Binary files a/public/images/emoji/google/older_woman.png and b/public/images/emoji/google/older_woman.png differ
diff --git a/public/images/emoji/google/older_woman/2.png b/public/images/emoji/google/older_woman/2.png
index 905e8a98b3..f90619f8b6 100644
Binary files a/public/images/emoji/google/older_woman/2.png and b/public/images/emoji/google/older_woman/2.png differ
diff --git a/public/images/emoji/google/older_woman/3.png b/public/images/emoji/google/older_woman/3.png
index 7d9c997674..2147d16fd6 100644
Binary files a/public/images/emoji/google/older_woman/3.png and b/public/images/emoji/google/older_woman/3.png differ
diff --git a/public/images/emoji/google/older_woman/4.png b/public/images/emoji/google/older_woman/4.png
index 69a9c17910..696d222a84 100644
Binary files a/public/images/emoji/google/older_woman/4.png and b/public/images/emoji/google/older_woman/4.png differ
diff --git a/public/images/emoji/google/older_woman/5.png b/public/images/emoji/google/older_woman/5.png
index 7ae4d8ea04..a23935d452 100644
Binary files a/public/images/emoji/google/older_woman/5.png and b/public/images/emoji/google/older_woman/5.png differ
diff --git a/public/images/emoji/google/older_woman/6.png b/public/images/emoji/google/older_woman/6.png
index 89542a2330..00c9ec642c 100644
Binary files a/public/images/emoji/google/older_woman/6.png and b/public/images/emoji/google/older_woman/6.png differ
diff --git a/public/images/emoji/google/om.png b/public/images/emoji/google/om.png
index 1d732d75b3..f77f1842b1 100644
Binary files a/public/images/emoji/google/om.png and b/public/images/emoji/google/om.png differ
diff --git a/public/images/emoji/google/om_symbol.png b/public/images/emoji/google/om_symbol.png
index 1d732d75b3..f77f1842b1 100644
Binary files a/public/images/emoji/google/om_symbol.png and b/public/images/emoji/google/om_symbol.png differ
diff --git a/public/images/emoji/google/oman.png b/public/images/emoji/google/oman.png
index 7b20f241a4..23a64ef5d6 100644
Binary files a/public/images/emoji/google/oman.png and b/public/images/emoji/google/oman.png differ
diff --git a/public/images/emoji/google/on.png b/public/images/emoji/google/on.png
index b29c550cff..8dbf124728 100644
Binary files a/public/images/emoji/google/on.png and b/public/images/emoji/google/on.png differ
diff --git a/public/images/emoji/google/oncoming_automobile.png b/public/images/emoji/google/oncoming_automobile.png
index 56f5cddc27..7df8de6eb8 100644
Binary files a/public/images/emoji/google/oncoming_automobile.png and b/public/images/emoji/google/oncoming_automobile.png differ
diff --git a/public/images/emoji/google/oncoming_bus.png b/public/images/emoji/google/oncoming_bus.png
index b0684aa0b4..ed61c14726 100644
Binary files a/public/images/emoji/google/oncoming_bus.png and b/public/images/emoji/google/oncoming_bus.png differ
diff --git a/public/images/emoji/google/oncoming_police_car.png b/public/images/emoji/google/oncoming_police_car.png
index 7f3f138ccd..39015e59af 100644
Binary files a/public/images/emoji/google/oncoming_police_car.png and b/public/images/emoji/google/oncoming_police_car.png differ
diff --git a/public/images/emoji/google/oncoming_taxi.png b/public/images/emoji/google/oncoming_taxi.png
index af2ad6f3fa..8732bafedf 100644
Binary files a/public/images/emoji/google/oncoming_taxi.png and b/public/images/emoji/google/oncoming_taxi.png differ
diff --git a/public/images/emoji/google/one.png b/public/images/emoji/google/one.png
index 332d4cc90d..b6f6dac44f 100644
Binary files a/public/images/emoji/google/one.png and b/public/images/emoji/google/one.png differ
diff --git a/public/images/emoji/google/open_book.png b/public/images/emoji/google/open_book.png
index 2f4edfa032..fa30a7da66 100644
Binary files a/public/images/emoji/google/open_book.png and b/public/images/emoji/google/open_book.png differ
diff --git a/public/images/emoji/google/open_file_folder.png b/public/images/emoji/google/open_file_folder.png
index 342dc9e0d3..e057711924 100644
Binary files a/public/images/emoji/google/open_file_folder.png and b/public/images/emoji/google/open_file_folder.png differ
diff --git a/public/images/emoji/google/open_hands.png b/public/images/emoji/google/open_hands.png
index 49e8ab878c..ba6ecd42f4 100644
Binary files a/public/images/emoji/google/open_hands.png and b/public/images/emoji/google/open_hands.png differ
diff --git a/public/images/emoji/google/open_hands/2.png b/public/images/emoji/google/open_hands/2.png
index 2d5120ea0b..4ff87f7e86 100644
Binary files a/public/images/emoji/google/open_hands/2.png and b/public/images/emoji/google/open_hands/2.png differ
diff --git a/public/images/emoji/google/open_hands/3.png b/public/images/emoji/google/open_hands/3.png
index a6e32d6078..9ba390136b 100644
Binary files a/public/images/emoji/google/open_hands/3.png and b/public/images/emoji/google/open_hands/3.png differ
diff --git a/public/images/emoji/google/open_hands/4.png b/public/images/emoji/google/open_hands/4.png
index 79494951e3..5fa966e0a1 100644
Binary files a/public/images/emoji/google/open_hands/4.png and b/public/images/emoji/google/open_hands/4.png differ
diff --git a/public/images/emoji/google/open_hands/5.png b/public/images/emoji/google/open_hands/5.png
index 61f31b1cc4..37a10ea6d2 100644
Binary files a/public/images/emoji/google/open_hands/5.png and b/public/images/emoji/google/open_hands/5.png differ
diff --git a/public/images/emoji/google/open_hands/6.png b/public/images/emoji/google/open_hands/6.png
index b57f1f5cb3..10c1825ab6 100644
Binary files a/public/images/emoji/google/open_hands/6.png and b/public/images/emoji/google/open_hands/6.png differ
diff --git a/public/images/emoji/google/open_mouth.png b/public/images/emoji/google/open_mouth.png
index d3afb4c6eb..6d8a030605 100644
Binary files a/public/images/emoji/google/open_mouth.png and b/public/images/emoji/google/open_mouth.png differ
diff --git a/public/images/emoji/google/open_umbrella.png b/public/images/emoji/google/open_umbrella.png
index 21b025ea51..fb2f8bb58b 100644
Binary files a/public/images/emoji/google/open_umbrella.png and b/public/images/emoji/google/open_umbrella.png differ
diff --git a/public/images/emoji/google/ophiuchus.png b/public/images/emoji/google/ophiuchus.png
index 9dfcee2d47..ecb2822153 100644
Binary files a/public/images/emoji/google/ophiuchus.png and b/public/images/emoji/google/ophiuchus.png differ
diff --git a/public/images/emoji/google/orange_book.png b/public/images/emoji/google/orange_book.png
index 6a2a262aff..909be4d855 100644
Binary files a/public/images/emoji/google/orange_book.png and b/public/images/emoji/google/orange_book.png differ
diff --git a/public/images/emoji/google/orange_heart.png b/public/images/emoji/google/orange_heart.png
index 2239788f68..5f66108e03 100644
Binary files a/public/images/emoji/google/orange_heart.png and b/public/images/emoji/google/orange_heart.png differ
diff --git a/public/images/emoji/google/orthodox_cross.png b/public/images/emoji/google/orthodox_cross.png
index b7dd064c8f..98bda28535 100644
Binary files a/public/images/emoji/google/orthodox_cross.png and b/public/images/emoji/google/orthodox_cross.png differ
diff --git a/public/images/emoji/google/outbox_tray.png b/public/images/emoji/google/outbox_tray.png
index abac46b590..4204b73676 100644
Binary files a/public/images/emoji/google/outbox_tray.png and b/public/images/emoji/google/outbox_tray.png differ
diff --git a/public/images/emoji/google/owl.png b/public/images/emoji/google/owl.png
index cf6ae83d80..b5b8d7775a 100644
Binary files a/public/images/emoji/google/owl.png and b/public/images/emoji/google/owl.png differ
diff --git a/public/images/emoji/google/ox.png b/public/images/emoji/google/ox.png
index 796bfe4a84..c0e276e6d5 100644
Binary files a/public/images/emoji/google/ox.png and b/public/images/emoji/google/ox.png differ
diff --git a/public/images/emoji/google/package.png b/public/images/emoji/google/package.png
index 17b5db0e25..253553a2f2 100644
Binary files a/public/images/emoji/google/package.png and b/public/images/emoji/google/package.png differ
diff --git a/public/images/emoji/google/page_facing_up.png b/public/images/emoji/google/page_facing_up.png
index b3002ed4c3..a2c7af4a79 100644
Binary files a/public/images/emoji/google/page_facing_up.png and b/public/images/emoji/google/page_facing_up.png differ
diff --git a/public/images/emoji/google/page_with_curl.png b/public/images/emoji/google/page_with_curl.png
index 0a71b54c91..d4d9805e35 100644
Binary files a/public/images/emoji/google/page_with_curl.png and b/public/images/emoji/google/page_with_curl.png differ
diff --git a/public/images/emoji/google/pager.png b/public/images/emoji/google/pager.png
index e0e980854a..446e4dc64d 100644
Binary files a/public/images/emoji/google/pager.png and b/public/images/emoji/google/pager.png differ
diff --git a/public/images/emoji/google/paintbrush.png b/public/images/emoji/google/paintbrush.png
index 5869736646..bde63a8092 100644
Binary files a/public/images/emoji/google/paintbrush.png and b/public/images/emoji/google/paintbrush.png differ
diff --git a/public/images/emoji/google/pakistan.png b/public/images/emoji/google/pakistan.png
index e136514c9a..908744de36 100644
Binary files a/public/images/emoji/google/pakistan.png and b/public/images/emoji/google/pakistan.png differ
diff --git a/public/images/emoji/google/palau.png b/public/images/emoji/google/palau.png
index bcbfdea785..959e48a630 100644
Binary files a/public/images/emoji/google/palau.png and b/public/images/emoji/google/palau.png differ
diff --git a/public/images/emoji/google/palestinian_territories.png b/public/images/emoji/google/palestinian_territories.png
index 3a690eb7cc..ca3ab3a3b2 100644
Binary files a/public/images/emoji/google/palestinian_territories.png and b/public/images/emoji/google/palestinian_territories.png differ
diff --git a/public/images/emoji/google/palm_tree.png b/public/images/emoji/google/palm_tree.png
index 8d7a39f271..54f17fcab5 100644
Binary files a/public/images/emoji/google/palm_tree.png and b/public/images/emoji/google/palm_tree.png differ
diff --git a/public/images/emoji/google/palms_up_together.png b/public/images/emoji/google/palms_up_together.png
index 8878837866..91f2aee46b 100644
Binary files a/public/images/emoji/google/palms_up_together.png and b/public/images/emoji/google/palms_up_together.png differ
diff --git a/public/images/emoji/google/palms_up_together/2.png b/public/images/emoji/google/palms_up_together/2.png
index c25936413e..fe1dbc8bf7 100644
Binary files a/public/images/emoji/google/palms_up_together/2.png and b/public/images/emoji/google/palms_up_together/2.png differ
diff --git a/public/images/emoji/google/palms_up_together/3.png b/public/images/emoji/google/palms_up_together/3.png
index f2db60ab8b..e6a6d86e8f 100644
Binary files a/public/images/emoji/google/palms_up_together/3.png and b/public/images/emoji/google/palms_up_together/3.png differ
diff --git a/public/images/emoji/google/palms_up_together/4.png b/public/images/emoji/google/palms_up_together/4.png
index f3e88da168..af928c7165 100644
Binary files a/public/images/emoji/google/palms_up_together/4.png and b/public/images/emoji/google/palms_up_together/4.png differ
diff --git a/public/images/emoji/google/palms_up_together/5.png b/public/images/emoji/google/palms_up_together/5.png
index a11b9fac7a..9fff316304 100644
Binary files a/public/images/emoji/google/palms_up_together/5.png and b/public/images/emoji/google/palms_up_together/5.png differ
diff --git a/public/images/emoji/google/palms_up_together/6.png b/public/images/emoji/google/palms_up_together/6.png
index 93c4a67f41..6847f7cb59 100644
Binary files a/public/images/emoji/google/palms_up_together/6.png and b/public/images/emoji/google/palms_up_together/6.png differ
diff --git a/public/images/emoji/google/panama.png b/public/images/emoji/google/panama.png
index 62e08e4bcc..b673e35fd6 100644
Binary files a/public/images/emoji/google/panama.png and b/public/images/emoji/google/panama.png differ
diff --git a/public/images/emoji/google/pancakes.png b/public/images/emoji/google/pancakes.png
index ea40ec4e7b..b4afd25781 100644
Binary files a/public/images/emoji/google/pancakes.png and b/public/images/emoji/google/pancakes.png differ
diff --git a/public/images/emoji/google/panda_face.png b/public/images/emoji/google/panda_face.png
index 6f560198c2..db4f8c79af 100644
Binary files a/public/images/emoji/google/panda_face.png and b/public/images/emoji/google/panda_face.png differ
diff --git a/public/images/emoji/google/paperclip.png b/public/images/emoji/google/paperclip.png
index 791d9a70f3..ff08039930 100644
Binary files a/public/images/emoji/google/paperclip.png and b/public/images/emoji/google/paperclip.png differ
diff --git a/public/images/emoji/google/paperclips.png b/public/images/emoji/google/paperclips.png
index b3b7e0de41..56d7279a5c 100644
Binary files a/public/images/emoji/google/paperclips.png and b/public/images/emoji/google/paperclips.png differ
diff --git a/public/images/emoji/google/papua_new_guinea.png b/public/images/emoji/google/papua_new_guinea.png
index c3bc9e2bf8..6f90f6e147 100644
Binary files a/public/images/emoji/google/papua_new_guinea.png and b/public/images/emoji/google/papua_new_guinea.png differ
diff --git a/public/images/emoji/google/paraguay.png b/public/images/emoji/google/paraguay.png
index 5f81d2d2f0..81f2b67ed0 100644
Binary files a/public/images/emoji/google/paraguay.png and b/public/images/emoji/google/paraguay.png differ
diff --git a/public/images/emoji/google/parasol_on_ground.png b/public/images/emoji/google/parasol_on_ground.png
index 2a16b4d32a..c7358ec949 100644
Binary files a/public/images/emoji/google/parasol_on_ground.png and b/public/images/emoji/google/parasol_on_ground.png differ
diff --git a/public/images/emoji/google/park.png b/public/images/emoji/google/park.png
index 669eb54fbf..d98082e0cd 100644
Binary files a/public/images/emoji/google/park.png and b/public/images/emoji/google/park.png differ
diff --git a/public/images/emoji/google/parking.png b/public/images/emoji/google/parking.png
index 3450cb75c2..03dfb7c3db 100644
Binary files a/public/images/emoji/google/parking.png and b/public/images/emoji/google/parking.png differ
diff --git a/public/images/emoji/google/part_alternation_mark.png b/public/images/emoji/google/part_alternation_mark.png
index 41a93424e8..01e88ba945 100644
Binary files a/public/images/emoji/google/part_alternation_mark.png and b/public/images/emoji/google/part_alternation_mark.png differ
diff --git a/public/images/emoji/google/partly_sunny.png b/public/images/emoji/google/partly_sunny.png
index ca30e8990b..91998ebb31 100644
Binary files a/public/images/emoji/google/partly_sunny.png and b/public/images/emoji/google/partly_sunny.png differ
diff --git a/public/images/emoji/google/passenger_ship.png b/public/images/emoji/google/passenger_ship.png
index 5ffa1e17dc..be03fc1343 100644
Binary files a/public/images/emoji/google/passenger_ship.png and b/public/images/emoji/google/passenger_ship.png differ
diff --git a/public/images/emoji/google/passport_control.png b/public/images/emoji/google/passport_control.png
index 92fd116fff..a061db8257 100644
Binary files a/public/images/emoji/google/passport_control.png and b/public/images/emoji/google/passport_control.png differ
diff --git a/public/images/emoji/google/pause_button.png b/public/images/emoji/google/pause_button.png
index 31613a9320..6e0b69634e 100644
Binary files a/public/images/emoji/google/pause_button.png and b/public/images/emoji/google/pause_button.png differ
diff --git a/public/images/emoji/google/paw_prints.png b/public/images/emoji/google/paw_prints.png
index 29f068aaf0..6e4aa21695 100644
Binary files a/public/images/emoji/google/paw_prints.png and b/public/images/emoji/google/paw_prints.png differ
diff --git a/public/images/emoji/google/peace.png b/public/images/emoji/google/peace.png
index c085022e7d..54452f3f19 100644
Binary files a/public/images/emoji/google/peace.png and b/public/images/emoji/google/peace.png differ
diff --git a/public/images/emoji/google/peace_symbol.png b/public/images/emoji/google/peace_symbol.png
index c085022e7d..54452f3f19 100644
Binary files a/public/images/emoji/google/peace_symbol.png and b/public/images/emoji/google/peace_symbol.png differ
diff --git a/public/images/emoji/google/peach.png b/public/images/emoji/google/peach.png
index 19d86b3013..e386582c38 100644
Binary files a/public/images/emoji/google/peach.png and b/public/images/emoji/google/peach.png differ
diff --git a/public/images/emoji/google/peanuts.png b/public/images/emoji/google/peanuts.png
index ba87793ec1..55433e7b6c 100644
Binary files a/public/images/emoji/google/peanuts.png and b/public/images/emoji/google/peanuts.png differ
diff --git a/public/images/emoji/google/pear.png b/public/images/emoji/google/pear.png
index e622f3eaf8..cc672a6a2e 100644
Binary files a/public/images/emoji/google/pear.png and b/public/images/emoji/google/pear.png differ
diff --git a/public/images/emoji/google/pen.png b/public/images/emoji/google/pen.png
index a67644b0ac..a3312810ec 100644
Binary files a/public/images/emoji/google/pen.png and b/public/images/emoji/google/pen.png differ
diff --git a/public/images/emoji/google/pen_ballpoint.png b/public/images/emoji/google/pen_ballpoint.png
index a67644b0ac..a3312810ec 100644
Binary files a/public/images/emoji/google/pen_ballpoint.png and b/public/images/emoji/google/pen_ballpoint.png differ
diff --git a/public/images/emoji/google/pen_fountain.png b/public/images/emoji/google/pen_fountain.png
index a06fcdc40e..3d8ba60471 100644
Binary files a/public/images/emoji/google/pen_fountain.png and b/public/images/emoji/google/pen_fountain.png differ
diff --git a/public/images/emoji/google/pencil.png b/public/images/emoji/google/pencil.png
index 355dcfe22d..5a3bd6cd09 100644
Binary files a/public/images/emoji/google/pencil.png and b/public/images/emoji/google/pencil.png differ
diff --git a/public/images/emoji/google/pencil2.png b/public/images/emoji/google/pencil2.png
index e10b99fe92..7f7ebda566 100644
Binary files a/public/images/emoji/google/pencil2.png and b/public/images/emoji/google/pencil2.png differ
diff --git a/public/images/emoji/google/penguin.png b/public/images/emoji/google/penguin.png
index b31a77b5b9..4f4d284cc3 100644
Binary files a/public/images/emoji/google/penguin.png and b/public/images/emoji/google/penguin.png differ
diff --git a/public/images/emoji/google/pensive.png b/public/images/emoji/google/pensive.png
index 6cb7d76597..22e6e65f5b 100644
Binary files a/public/images/emoji/google/pensive.png and b/public/images/emoji/google/pensive.png differ
diff --git a/public/images/emoji/google/performing_arts.png b/public/images/emoji/google/performing_arts.png
index dbcd379911..96908a7533 100644
Binary files a/public/images/emoji/google/performing_arts.png and b/public/images/emoji/google/performing_arts.png differ
diff --git a/public/images/emoji/google/persevere.png b/public/images/emoji/google/persevere.png
index fd1501221d..7183637f2f 100644
Binary files a/public/images/emoji/google/persevere.png and b/public/images/emoji/google/persevere.png differ
diff --git a/public/images/emoji/google/person_climbing.png b/public/images/emoji/google/person_climbing.png
index 4064c30b89..021a0b719a 100644
Binary files a/public/images/emoji/google/person_climbing.png and b/public/images/emoji/google/person_climbing.png differ
diff --git a/public/images/emoji/google/person_climbing/2.png b/public/images/emoji/google/person_climbing/2.png
index ec05fe0695..652d3789cf 100644
Binary files a/public/images/emoji/google/person_climbing/2.png and b/public/images/emoji/google/person_climbing/2.png differ
diff --git a/public/images/emoji/google/person_climbing/3.png b/public/images/emoji/google/person_climbing/3.png
index 790a278e9b..22ec77f111 100644
Binary files a/public/images/emoji/google/person_climbing/3.png and b/public/images/emoji/google/person_climbing/3.png differ
diff --git a/public/images/emoji/google/person_climbing/4.png b/public/images/emoji/google/person_climbing/4.png
index 9fffed69e1..1fde823615 100644
Binary files a/public/images/emoji/google/person_climbing/4.png and b/public/images/emoji/google/person_climbing/4.png differ
diff --git a/public/images/emoji/google/person_climbing/5.png b/public/images/emoji/google/person_climbing/5.png
index cbd54a8b86..fbd6c35f9f 100644
Binary files a/public/images/emoji/google/person_climbing/5.png and b/public/images/emoji/google/person_climbing/5.png differ
diff --git a/public/images/emoji/google/person_climbing/6.png b/public/images/emoji/google/person_climbing/6.png
index 66b247fa5a..be71fe1419 100644
Binary files a/public/images/emoji/google/person_climbing/6.png and b/public/images/emoji/google/person_climbing/6.png differ
diff --git a/public/images/emoji/google/person_fencing.png b/public/images/emoji/google/person_fencing.png
index 2f19173888..d088819d7a 100644
Binary files a/public/images/emoji/google/person_fencing.png and b/public/images/emoji/google/person_fencing.png differ
diff --git a/public/images/emoji/google/person_frowning.png b/public/images/emoji/google/person_frowning.png
index 4667b907dd..0378dfe42e 100644
Binary files a/public/images/emoji/google/person_frowning.png and b/public/images/emoji/google/person_frowning.png differ
diff --git a/public/images/emoji/google/person_frowning/2.png b/public/images/emoji/google/person_frowning/2.png
index 16f321b8ae..5dfe5baa82 100644
Binary files a/public/images/emoji/google/person_frowning/2.png and b/public/images/emoji/google/person_frowning/2.png differ
diff --git a/public/images/emoji/google/person_frowning/3.png b/public/images/emoji/google/person_frowning/3.png
index bd6c5e162f..7078357053 100644
Binary files a/public/images/emoji/google/person_frowning/3.png and b/public/images/emoji/google/person_frowning/3.png differ
diff --git a/public/images/emoji/google/person_frowning/4.png b/public/images/emoji/google/person_frowning/4.png
index 72f848c863..6671e11299 100644
Binary files a/public/images/emoji/google/person_frowning/4.png and b/public/images/emoji/google/person_frowning/4.png differ
diff --git a/public/images/emoji/google/person_frowning/5.png b/public/images/emoji/google/person_frowning/5.png
index 863caa5433..9d0a301c07 100644
Binary files a/public/images/emoji/google/person_frowning/5.png and b/public/images/emoji/google/person_frowning/5.png differ
diff --git a/public/images/emoji/google/person_frowning/6.png b/public/images/emoji/google/person_frowning/6.png
index d1936f1123..f41f82046b 100644
Binary files a/public/images/emoji/google/person_frowning/6.png and b/public/images/emoji/google/person_frowning/6.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position.png b/public/images/emoji/google/person_in_lotus_position.png
index d0be0a3bb0..17aaf80ab6 100644
Binary files a/public/images/emoji/google/person_in_lotus_position.png and b/public/images/emoji/google/person_in_lotus_position.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/2.png b/public/images/emoji/google/person_in_lotus_position/2.png
index 2ccd6c7254..bfee0b8138 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/2.png and b/public/images/emoji/google/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/3.png b/public/images/emoji/google/person_in_lotus_position/3.png
index ac3ae39e31..a915b1535a 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/3.png and b/public/images/emoji/google/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/4.png b/public/images/emoji/google/person_in_lotus_position/4.png
index 37446ec6e3..c73d4b0acc 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/4.png and b/public/images/emoji/google/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/5.png b/public/images/emoji/google/person_in_lotus_position/5.png
index d6734f1e3d..632ae6aa51 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/5.png and b/public/images/emoji/google/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/6.png b/public/images/emoji/google/person_in_lotus_position/6.png
index 79852cb807..1551833ad2 100644
Binary files a/public/images/emoji/google/person_in_lotus_position/6.png and b/public/images/emoji/google/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room.png b/public/images/emoji/google/person_in_steamy_room.png
index 2e6d5c2069..1395f737c3 100644
Binary files a/public/images/emoji/google/person_in_steamy_room.png and b/public/images/emoji/google/person_in_steamy_room.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/2.png b/public/images/emoji/google/person_in_steamy_room/2.png
index c85e42308d..a1da82b2f6 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/2.png and b/public/images/emoji/google/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/3.png b/public/images/emoji/google/person_in_steamy_room/3.png
index 9e3488f99b..e47ef7c951 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/3.png and b/public/images/emoji/google/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/4.png b/public/images/emoji/google/person_in_steamy_room/4.png
index 9028b985f3..fd476ea7d0 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/4.png and b/public/images/emoji/google/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/5.png b/public/images/emoji/google/person_in_steamy_room/5.png
index 840f346f83..a1f21491a0 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/5.png and b/public/images/emoji/google/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/6.png b/public/images/emoji/google/person_in_steamy_room/6.png
index 54dbe80a39..7a99054761 100644
Binary files a/public/images/emoji/google/person_in_steamy_room/6.png and b/public/images/emoji/google/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/google/person_with_ball.png b/public/images/emoji/google/person_with_ball.png
index 2f234c1261..4441fc46c5 100644
Binary files a/public/images/emoji/google/person_with_ball.png and b/public/images/emoji/google/person_with_ball.png differ
diff --git a/public/images/emoji/google/person_with_ball/2.png b/public/images/emoji/google/person_with_ball/2.png
index 511ad7125c..d8c44421c8 100644
Binary files a/public/images/emoji/google/person_with_ball/2.png and b/public/images/emoji/google/person_with_ball/2.png differ
diff --git a/public/images/emoji/google/person_with_ball/3.png b/public/images/emoji/google/person_with_ball/3.png
index 652a2149b8..fbd4d90e0d 100644
Binary files a/public/images/emoji/google/person_with_ball/3.png and b/public/images/emoji/google/person_with_ball/3.png differ
diff --git a/public/images/emoji/google/person_with_ball/4.png b/public/images/emoji/google/person_with_ball/4.png
index 3ea11741d3..2c84919a15 100644
Binary files a/public/images/emoji/google/person_with_ball/4.png and b/public/images/emoji/google/person_with_ball/4.png differ
diff --git a/public/images/emoji/google/person_with_ball/5.png b/public/images/emoji/google/person_with_ball/5.png
index 28b8f86325..2e9df18f9f 100644
Binary files a/public/images/emoji/google/person_with_ball/5.png and b/public/images/emoji/google/person_with_ball/5.png differ
diff --git a/public/images/emoji/google/person_with_ball/6.png b/public/images/emoji/google/person_with_ball/6.png
index 5450f40d54..77fb03716f 100644
Binary files a/public/images/emoji/google/person_with_ball/6.png and b/public/images/emoji/google/person_with_ball/6.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair.png b/public/images/emoji/google/person_with_blond_hair.png
index 69d6b0b5a7..f5d7e0009b 100644
Binary files a/public/images/emoji/google/person_with_blond_hair.png and b/public/images/emoji/google/person_with_blond_hair.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/2.png b/public/images/emoji/google/person_with_blond_hair/2.png
index 71286ddbf4..2845b0f0d3 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/2.png and b/public/images/emoji/google/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/3.png b/public/images/emoji/google/person_with_blond_hair/3.png
index f5ccb5bc26..e9866fd956 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/3.png and b/public/images/emoji/google/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/4.png b/public/images/emoji/google/person_with_blond_hair/4.png
index 2d068f1de9..9a83dc6e5f 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/4.png and b/public/images/emoji/google/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/5.png b/public/images/emoji/google/person_with_blond_hair/5.png
index af6fe7aa98..9960400006 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/5.png and b/public/images/emoji/google/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/6.png b/public/images/emoji/google/person_with_blond_hair/6.png
index 85e4e9885b..c2a4a4256b 100644
Binary files a/public/images/emoji/google/person_with_blond_hair/6.png and b/public/images/emoji/google/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face.png b/public/images/emoji/google/person_with_pouting_face.png
index 3cfb0b6d15..db8208ab0d 100644
Binary files a/public/images/emoji/google/person_with_pouting_face.png and b/public/images/emoji/google/person_with_pouting_face.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/2.png b/public/images/emoji/google/person_with_pouting_face/2.png
index f63af15d1d..554b23915a 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/2.png and b/public/images/emoji/google/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/3.png b/public/images/emoji/google/person_with_pouting_face/3.png
index 02d18d8a15..e23a6a6c5d 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/3.png and b/public/images/emoji/google/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/4.png b/public/images/emoji/google/person_with_pouting_face/4.png
index 9590fed0e8..eaa2ddcbf0 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/4.png and b/public/images/emoji/google/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/5.png b/public/images/emoji/google/person_with_pouting_face/5.png
index 88232fbee9..8f46e8c819 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/5.png and b/public/images/emoji/google/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/6.png b/public/images/emoji/google/person_with_pouting_face/6.png
index 80d274c07a..037d9627b5 100644
Binary files a/public/images/emoji/google/person_with_pouting_face/6.png and b/public/images/emoji/google/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/google/peru.png b/public/images/emoji/google/peru.png
index e468cd4884..84281c7ec8 100644
Binary files a/public/images/emoji/google/peru.png and b/public/images/emoji/google/peru.png differ
diff --git a/public/images/emoji/google/philippines.png b/public/images/emoji/google/philippines.png
index bdb66d8524..117684b404 100644
Binary files a/public/images/emoji/google/philippines.png and b/public/images/emoji/google/philippines.png differ
diff --git a/public/images/emoji/google/phone.png b/public/images/emoji/google/phone.png
index 2445053686..3eca2e7d80 100644
Binary files a/public/images/emoji/google/phone.png and b/public/images/emoji/google/phone.png differ
diff --git a/public/images/emoji/google/pick.png b/public/images/emoji/google/pick.png
index 81bdd23159..372dbef256 100644
Binary files a/public/images/emoji/google/pick.png and b/public/images/emoji/google/pick.png differ
diff --git a/public/images/emoji/google/pie.png b/public/images/emoji/google/pie.png
index 71919170c9..0aa66b4de8 100644
Binary files a/public/images/emoji/google/pie.png and b/public/images/emoji/google/pie.png differ
diff --git a/public/images/emoji/google/pig.png b/public/images/emoji/google/pig.png
index 246085679c..028092eb83 100644
Binary files a/public/images/emoji/google/pig.png and b/public/images/emoji/google/pig.png differ
diff --git a/public/images/emoji/google/pig2.png b/public/images/emoji/google/pig2.png
index 36bc51f9cf..25e4e10a3a 100644
Binary files a/public/images/emoji/google/pig2.png and b/public/images/emoji/google/pig2.png differ
diff --git a/public/images/emoji/google/pig_nose.png b/public/images/emoji/google/pig_nose.png
index 909362877f..6633f59519 100644
Binary files a/public/images/emoji/google/pig_nose.png and b/public/images/emoji/google/pig_nose.png differ
diff --git a/public/images/emoji/google/pill.png b/public/images/emoji/google/pill.png
index 2db3e8c5ea..9d589f8906 100644
Binary files a/public/images/emoji/google/pill.png and b/public/images/emoji/google/pill.png differ
diff --git a/public/images/emoji/google/pineapple.png b/public/images/emoji/google/pineapple.png
index 1bc45c75c9..92a53419e5 100644
Binary files a/public/images/emoji/google/pineapple.png and b/public/images/emoji/google/pineapple.png differ
diff --git a/public/images/emoji/google/ping_pong.png b/public/images/emoji/google/ping_pong.png
index 8390f27bb8..60444a0a3a 100644
Binary files a/public/images/emoji/google/ping_pong.png and b/public/images/emoji/google/ping_pong.png differ
diff --git a/public/images/emoji/google/pisces.png b/public/images/emoji/google/pisces.png
index 11390d483e..c3983ce4d8 100644
Binary files a/public/images/emoji/google/pisces.png and b/public/images/emoji/google/pisces.png differ
diff --git a/public/images/emoji/google/pitcairn_islands.png b/public/images/emoji/google/pitcairn_islands.png
index 36e2e4183f..09a98b8ef6 100644
Binary files a/public/images/emoji/google/pitcairn_islands.png and b/public/images/emoji/google/pitcairn_islands.png differ
diff --git a/public/images/emoji/google/pizza.png b/public/images/emoji/google/pizza.png
index b8073d8d82..72b60d4934 100644
Binary files a/public/images/emoji/google/pizza.png and b/public/images/emoji/google/pizza.png differ
diff --git a/public/images/emoji/google/place_of_worship.png b/public/images/emoji/google/place_of_worship.png
index 0cc3774779..6e4d8a9248 100644
Binary files a/public/images/emoji/google/place_of_worship.png and b/public/images/emoji/google/place_of_worship.png differ
diff --git a/public/images/emoji/google/plate_with_cutlery.png b/public/images/emoji/google/plate_with_cutlery.png
index a990ed2cbe..c0ed1e0ed6 100644
Binary files a/public/images/emoji/google/plate_with_cutlery.png and b/public/images/emoji/google/plate_with_cutlery.png differ
diff --git a/public/images/emoji/google/play_or_pause_button.png b/public/images/emoji/google/play_or_pause_button.png
index 75254d8a0e..962fbe1652 100644
Binary files a/public/images/emoji/google/play_or_pause_button.png and b/public/images/emoji/google/play_or_pause_button.png differ
diff --git a/public/images/emoji/google/play_pause.png b/public/images/emoji/google/play_pause.png
index 75254d8a0e..962fbe1652 100644
Binary files a/public/images/emoji/google/play_pause.png and b/public/images/emoji/google/play_pause.png differ
diff --git a/public/images/emoji/google/point_down.png b/public/images/emoji/google/point_down.png
index 6530e95cff..303aeb3c0c 100644
Binary files a/public/images/emoji/google/point_down.png and b/public/images/emoji/google/point_down.png differ
diff --git a/public/images/emoji/google/point_down/2.png b/public/images/emoji/google/point_down/2.png
index 86a151d38c..0f163a339c 100644
Binary files a/public/images/emoji/google/point_down/2.png and b/public/images/emoji/google/point_down/2.png differ
diff --git a/public/images/emoji/google/point_down/3.png b/public/images/emoji/google/point_down/3.png
index a051834bf1..8566f42d0f 100644
Binary files a/public/images/emoji/google/point_down/3.png and b/public/images/emoji/google/point_down/3.png differ
diff --git a/public/images/emoji/google/point_down/4.png b/public/images/emoji/google/point_down/4.png
index 88a08aeb95..1946563ec8 100644
Binary files a/public/images/emoji/google/point_down/4.png and b/public/images/emoji/google/point_down/4.png differ
diff --git a/public/images/emoji/google/point_down/5.png b/public/images/emoji/google/point_down/5.png
index 78d1d82aa4..d142003d7e 100644
Binary files a/public/images/emoji/google/point_down/5.png and b/public/images/emoji/google/point_down/5.png differ
diff --git a/public/images/emoji/google/point_down/6.png b/public/images/emoji/google/point_down/6.png
index a7e3837f23..7b4ef16361 100644
Binary files a/public/images/emoji/google/point_down/6.png and b/public/images/emoji/google/point_down/6.png differ
diff --git a/public/images/emoji/google/point_left.png b/public/images/emoji/google/point_left.png
index aa813b51d3..a8ff5b2c6a 100644
Binary files a/public/images/emoji/google/point_left.png and b/public/images/emoji/google/point_left.png differ
diff --git a/public/images/emoji/google/point_left/2.png b/public/images/emoji/google/point_left/2.png
index f574ba9558..a0d6683e9c 100644
Binary files a/public/images/emoji/google/point_left/2.png and b/public/images/emoji/google/point_left/2.png differ
diff --git a/public/images/emoji/google/point_left/3.png b/public/images/emoji/google/point_left/3.png
index 157a2286ff..2dc98d0ed9 100644
Binary files a/public/images/emoji/google/point_left/3.png and b/public/images/emoji/google/point_left/3.png differ
diff --git a/public/images/emoji/google/point_left/4.png b/public/images/emoji/google/point_left/4.png
index 3a5b3c24ef..4645880970 100644
Binary files a/public/images/emoji/google/point_left/4.png and b/public/images/emoji/google/point_left/4.png differ
diff --git a/public/images/emoji/google/point_left/5.png b/public/images/emoji/google/point_left/5.png
index fb4b460b5b..2596416722 100644
Binary files a/public/images/emoji/google/point_left/5.png and b/public/images/emoji/google/point_left/5.png differ
diff --git a/public/images/emoji/google/point_left/6.png b/public/images/emoji/google/point_left/6.png
index f8e91dad48..19b9440233 100644
Binary files a/public/images/emoji/google/point_left/6.png and b/public/images/emoji/google/point_left/6.png differ
diff --git a/public/images/emoji/google/point_right.png b/public/images/emoji/google/point_right.png
index ec4187d7ba..118d3b2010 100644
Binary files a/public/images/emoji/google/point_right.png and b/public/images/emoji/google/point_right.png differ
diff --git a/public/images/emoji/google/point_right/2.png b/public/images/emoji/google/point_right/2.png
index 4e682eebbb..d622311c89 100644
Binary files a/public/images/emoji/google/point_right/2.png and b/public/images/emoji/google/point_right/2.png differ
diff --git a/public/images/emoji/google/point_right/3.png b/public/images/emoji/google/point_right/3.png
index ca02a74b53..02c12cd8cf 100644
Binary files a/public/images/emoji/google/point_right/3.png and b/public/images/emoji/google/point_right/3.png differ
diff --git a/public/images/emoji/google/point_right/4.png b/public/images/emoji/google/point_right/4.png
index 8ae8ced01f..755a5295ce 100644
Binary files a/public/images/emoji/google/point_right/4.png and b/public/images/emoji/google/point_right/4.png differ
diff --git a/public/images/emoji/google/point_right/5.png b/public/images/emoji/google/point_right/5.png
index 388e88f4ac..28b5a4c3f1 100644
Binary files a/public/images/emoji/google/point_right/5.png and b/public/images/emoji/google/point_right/5.png differ
diff --git a/public/images/emoji/google/point_right/6.png b/public/images/emoji/google/point_right/6.png
index be0960e5d0..4e7f18d400 100644
Binary files a/public/images/emoji/google/point_right/6.png and b/public/images/emoji/google/point_right/6.png differ
diff --git a/public/images/emoji/google/point_up.png b/public/images/emoji/google/point_up.png
index 7589c68d4f..eb2ecf782d 100644
Binary files a/public/images/emoji/google/point_up.png and b/public/images/emoji/google/point_up.png differ
diff --git a/public/images/emoji/google/point_up/2.png b/public/images/emoji/google/point_up/2.png
index bf48906da6..a77ba82567 100644
Binary files a/public/images/emoji/google/point_up/2.png and b/public/images/emoji/google/point_up/2.png differ
diff --git a/public/images/emoji/google/point_up/3.png b/public/images/emoji/google/point_up/3.png
index 8de6a0c4c9..3bd9cd9069 100644
Binary files a/public/images/emoji/google/point_up/3.png and b/public/images/emoji/google/point_up/3.png differ
diff --git a/public/images/emoji/google/point_up/4.png b/public/images/emoji/google/point_up/4.png
index b7196bafcc..4291ee59cc 100644
Binary files a/public/images/emoji/google/point_up/4.png and b/public/images/emoji/google/point_up/4.png differ
diff --git a/public/images/emoji/google/point_up/5.png b/public/images/emoji/google/point_up/5.png
index a9a3f6fdc0..c49da45031 100644
Binary files a/public/images/emoji/google/point_up/5.png and b/public/images/emoji/google/point_up/5.png differ
diff --git a/public/images/emoji/google/point_up/6.png b/public/images/emoji/google/point_up/6.png
index 8c6f7ba956..a38173ef49 100644
Binary files a/public/images/emoji/google/point_up/6.png and b/public/images/emoji/google/point_up/6.png differ
diff --git a/public/images/emoji/google/point_up_2.png b/public/images/emoji/google/point_up_2.png
index 99b63169d9..d10b6dd3f8 100644
Binary files a/public/images/emoji/google/point_up_2.png and b/public/images/emoji/google/point_up_2.png differ
diff --git a/public/images/emoji/google/point_up_2/2.png b/public/images/emoji/google/point_up_2/2.png
index 7064adcd53..1266504f87 100644
Binary files a/public/images/emoji/google/point_up_2/2.png and b/public/images/emoji/google/point_up_2/2.png differ
diff --git a/public/images/emoji/google/point_up_2/3.png b/public/images/emoji/google/point_up_2/3.png
index e74c10fac4..a62af94ad0 100644
Binary files a/public/images/emoji/google/point_up_2/3.png and b/public/images/emoji/google/point_up_2/3.png differ
diff --git a/public/images/emoji/google/point_up_2/4.png b/public/images/emoji/google/point_up_2/4.png
index 034e80952c..e57c38bf58 100644
Binary files a/public/images/emoji/google/point_up_2/4.png and b/public/images/emoji/google/point_up_2/4.png differ
diff --git a/public/images/emoji/google/point_up_2/5.png b/public/images/emoji/google/point_up_2/5.png
index 3e5fdcecca..d070fec84f 100644
Binary files a/public/images/emoji/google/point_up_2/5.png and b/public/images/emoji/google/point_up_2/5.png differ
diff --git a/public/images/emoji/google/point_up_2/6.png b/public/images/emoji/google/point_up_2/6.png
index 14eec3497e..b0829a6f41 100644
Binary files a/public/images/emoji/google/point_up_2/6.png and b/public/images/emoji/google/point_up_2/6.png differ
diff --git a/public/images/emoji/google/poland.png b/public/images/emoji/google/poland.png
index f8f096e9cf..0299ecfd9b 100644
Binary files a/public/images/emoji/google/poland.png and b/public/images/emoji/google/poland.png differ
diff --git a/public/images/emoji/google/police_car.png b/public/images/emoji/google/police_car.png
index 9dc3c17e9b..2b15c56b32 100644
Binary files a/public/images/emoji/google/police_car.png and b/public/images/emoji/google/police_car.png differ
diff --git a/public/images/emoji/google/policeman.png b/public/images/emoji/google/policeman.png
index c6e424f54a..7cdf83e122 100644
Binary files a/public/images/emoji/google/policeman.png and b/public/images/emoji/google/policeman.png differ
diff --git a/public/images/emoji/google/policeman/2.png b/public/images/emoji/google/policeman/2.png
index 74bc0da8f2..12d6403810 100644
Binary files a/public/images/emoji/google/policeman/2.png and b/public/images/emoji/google/policeman/2.png differ
diff --git a/public/images/emoji/google/policeman/3.png b/public/images/emoji/google/policeman/3.png
index d461370fdb..119290b976 100644
Binary files a/public/images/emoji/google/policeman/3.png and b/public/images/emoji/google/policeman/3.png differ
diff --git a/public/images/emoji/google/policeman/4.png b/public/images/emoji/google/policeman/4.png
index 12d654b4e5..49d3df0339 100644
Binary files a/public/images/emoji/google/policeman/4.png and b/public/images/emoji/google/policeman/4.png differ
diff --git a/public/images/emoji/google/policeman/5.png b/public/images/emoji/google/policeman/5.png
index d555c18f79..7e961289d2 100644
Binary files a/public/images/emoji/google/policeman/5.png and b/public/images/emoji/google/policeman/5.png differ
diff --git a/public/images/emoji/google/policeman/6.png b/public/images/emoji/google/policeman/6.png
index 0542d87a6a..8e59e6654e 100644
Binary files a/public/images/emoji/google/policeman/6.png and b/public/images/emoji/google/policeman/6.png differ
diff --git a/public/images/emoji/google/policewoman.png b/public/images/emoji/google/policewoman.png
index b00f14d2fd..b0834ac8c7 100644
Binary files a/public/images/emoji/google/policewoman.png and b/public/images/emoji/google/policewoman.png differ
diff --git a/public/images/emoji/google/policewoman/2.png b/public/images/emoji/google/policewoman/2.png
index 5e7e99b42e..7aa2a483bf 100644
Binary files a/public/images/emoji/google/policewoman/2.png and b/public/images/emoji/google/policewoman/2.png differ
diff --git a/public/images/emoji/google/policewoman/3.png b/public/images/emoji/google/policewoman/3.png
index cc43594839..9babe96cfc 100644
Binary files a/public/images/emoji/google/policewoman/3.png and b/public/images/emoji/google/policewoman/3.png differ
diff --git a/public/images/emoji/google/policewoman/4.png b/public/images/emoji/google/policewoman/4.png
index b9109d47d6..57ddf86765 100644
Binary files a/public/images/emoji/google/policewoman/4.png and b/public/images/emoji/google/policewoman/4.png differ
diff --git a/public/images/emoji/google/policewoman/5.png b/public/images/emoji/google/policewoman/5.png
index b44c2ea1e0..3baa77253f 100644
Binary files a/public/images/emoji/google/policewoman/5.png and b/public/images/emoji/google/policewoman/5.png differ
diff --git a/public/images/emoji/google/policewoman/6.png b/public/images/emoji/google/policewoman/6.png
index cd94a46c76..e074132c77 100644
Binary files a/public/images/emoji/google/policewoman/6.png and b/public/images/emoji/google/policewoman/6.png differ
diff --git a/public/images/emoji/google/poo.png b/public/images/emoji/google/poo.png
index b1d921d96c..de476df01c 100644
Binary files a/public/images/emoji/google/poo.png and b/public/images/emoji/google/poo.png differ
diff --git a/public/images/emoji/google/poodle.png b/public/images/emoji/google/poodle.png
index c8aa1889e4..34b13b44d5 100644
Binary files a/public/images/emoji/google/poodle.png and b/public/images/emoji/google/poodle.png differ
diff --git a/public/images/emoji/google/poop.png b/public/images/emoji/google/poop.png
index b1d921d96c..de476df01c 100644
Binary files a/public/images/emoji/google/poop.png and b/public/images/emoji/google/poop.png differ
diff --git a/public/images/emoji/google/popcorn.png b/public/images/emoji/google/popcorn.png
index 9041ab3d1f..0fb9b10c89 100644
Binary files a/public/images/emoji/google/popcorn.png and b/public/images/emoji/google/popcorn.png differ
diff --git a/public/images/emoji/google/portugal.png b/public/images/emoji/google/portugal.png
index 70685125ba..c7fb67e041 100644
Binary files a/public/images/emoji/google/portugal.png and b/public/images/emoji/google/portugal.png differ
diff --git a/public/images/emoji/google/post_office.png b/public/images/emoji/google/post_office.png
index 7a2fb07007..c18d81cdb8 100644
Binary files a/public/images/emoji/google/post_office.png and b/public/images/emoji/google/post_office.png differ
diff --git a/public/images/emoji/google/postal_horn.png b/public/images/emoji/google/postal_horn.png
index 43646f03df..a942600f88 100644
Binary files a/public/images/emoji/google/postal_horn.png and b/public/images/emoji/google/postal_horn.png differ
diff --git a/public/images/emoji/google/postbox.png b/public/images/emoji/google/postbox.png
index 67b9059a7c..8b1601ae39 100644
Binary files a/public/images/emoji/google/postbox.png and b/public/images/emoji/google/postbox.png differ
diff --git a/public/images/emoji/google/potable_water.png b/public/images/emoji/google/potable_water.png
index b40de98bdc..9f92c3e6fe 100644
Binary files a/public/images/emoji/google/potable_water.png and b/public/images/emoji/google/potable_water.png differ
diff --git a/public/images/emoji/google/potato.png b/public/images/emoji/google/potato.png
index 065939c382..cb25568ac5 100644
Binary files a/public/images/emoji/google/potato.png and b/public/images/emoji/google/potato.png differ
diff --git a/public/images/emoji/google/pouch.png b/public/images/emoji/google/pouch.png
index 88a91f76f2..87b988753d 100644
Binary files a/public/images/emoji/google/pouch.png and b/public/images/emoji/google/pouch.png differ
diff --git a/public/images/emoji/google/poultry_leg.png b/public/images/emoji/google/poultry_leg.png
index acb0f99d72..4cc37087c5 100644
Binary files a/public/images/emoji/google/poultry_leg.png and b/public/images/emoji/google/poultry_leg.png differ
diff --git a/public/images/emoji/google/pound.png b/public/images/emoji/google/pound.png
index a44b7a1298..67f5f4abba 100644
Binary files a/public/images/emoji/google/pound.png and b/public/images/emoji/google/pound.png differ
diff --git a/public/images/emoji/google/pouting_cat.png b/public/images/emoji/google/pouting_cat.png
index bdfc781f7b..b904b3dc75 100644
Binary files a/public/images/emoji/google/pouting_cat.png and b/public/images/emoji/google/pouting_cat.png differ
diff --git a/public/images/emoji/google/pouting_man.png b/public/images/emoji/google/pouting_man.png
index 07bb3d8bdf..3cee46d882 100644
Binary files a/public/images/emoji/google/pouting_man.png and b/public/images/emoji/google/pouting_man.png differ
diff --git a/public/images/emoji/google/pouting_man/2.png b/public/images/emoji/google/pouting_man/2.png
index 7e8ab5ac36..4669180e95 100644
Binary files a/public/images/emoji/google/pouting_man/2.png and b/public/images/emoji/google/pouting_man/2.png differ
diff --git a/public/images/emoji/google/pouting_man/3.png b/public/images/emoji/google/pouting_man/3.png
index 7d01cfbe5c..ba2c656db8 100644
Binary files a/public/images/emoji/google/pouting_man/3.png and b/public/images/emoji/google/pouting_man/3.png differ
diff --git a/public/images/emoji/google/pouting_man/4.png b/public/images/emoji/google/pouting_man/4.png
index e6ad0ebd97..7e77249097 100644
Binary files a/public/images/emoji/google/pouting_man/4.png and b/public/images/emoji/google/pouting_man/4.png differ
diff --git a/public/images/emoji/google/pouting_man/5.png b/public/images/emoji/google/pouting_man/5.png
index 6a52e8697e..2da543a78a 100644
Binary files a/public/images/emoji/google/pouting_man/5.png and b/public/images/emoji/google/pouting_man/5.png differ
diff --git a/public/images/emoji/google/pouting_man/6.png b/public/images/emoji/google/pouting_man/6.png
index d39407f1a3..e87f4da27d 100644
Binary files a/public/images/emoji/google/pouting_man/6.png and b/public/images/emoji/google/pouting_man/6.png differ
diff --git a/public/images/emoji/google/pouting_woman.png b/public/images/emoji/google/pouting_woman.png
index 3cfb0b6d15..db8208ab0d 100644
Binary files a/public/images/emoji/google/pouting_woman.png and b/public/images/emoji/google/pouting_woman.png differ
diff --git a/public/images/emoji/google/pouting_woman/2.png b/public/images/emoji/google/pouting_woman/2.png
index f63af15d1d..554b23915a 100644
Binary files a/public/images/emoji/google/pouting_woman/2.png and b/public/images/emoji/google/pouting_woman/2.png differ
diff --git a/public/images/emoji/google/pouting_woman/3.png b/public/images/emoji/google/pouting_woman/3.png
index 02d18d8a15..e23a6a6c5d 100644
Binary files a/public/images/emoji/google/pouting_woman/3.png and b/public/images/emoji/google/pouting_woman/3.png differ
diff --git a/public/images/emoji/google/pouting_woman/4.png b/public/images/emoji/google/pouting_woman/4.png
index 9590fed0e8..eaa2ddcbf0 100644
Binary files a/public/images/emoji/google/pouting_woman/4.png and b/public/images/emoji/google/pouting_woman/4.png differ
diff --git a/public/images/emoji/google/pouting_woman/5.png b/public/images/emoji/google/pouting_woman/5.png
index 88232fbee9..8f46e8c819 100644
Binary files a/public/images/emoji/google/pouting_woman/5.png and b/public/images/emoji/google/pouting_woman/5.png differ
diff --git a/public/images/emoji/google/pouting_woman/6.png b/public/images/emoji/google/pouting_woman/6.png
index 80d274c07a..037d9627b5 100644
Binary files a/public/images/emoji/google/pouting_woman/6.png and b/public/images/emoji/google/pouting_woman/6.png differ
diff --git a/public/images/emoji/google/pray.png b/public/images/emoji/google/pray.png
index eb1892ae02..7a42c71cf8 100644
Binary files a/public/images/emoji/google/pray.png and b/public/images/emoji/google/pray.png differ
diff --git a/public/images/emoji/google/pray/2.png b/public/images/emoji/google/pray/2.png
index 9c54413a72..72edc95dbb 100644
Binary files a/public/images/emoji/google/pray/2.png and b/public/images/emoji/google/pray/2.png differ
diff --git a/public/images/emoji/google/pray/3.png b/public/images/emoji/google/pray/3.png
index 6281185ef7..578c30db82 100644
Binary files a/public/images/emoji/google/pray/3.png and b/public/images/emoji/google/pray/3.png differ
diff --git a/public/images/emoji/google/pray/4.png b/public/images/emoji/google/pray/4.png
index 23334af3ad..273735a0d1 100644
Binary files a/public/images/emoji/google/pray/4.png and b/public/images/emoji/google/pray/4.png differ
diff --git a/public/images/emoji/google/pray/5.png b/public/images/emoji/google/pray/5.png
index 7304df459a..6e1d445398 100644
Binary files a/public/images/emoji/google/pray/5.png and b/public/images/emoji/google/pray/5.png differ
diff --git a/public/images/emoji/google/pray/6.png b/public/images/emoji/google/pray/6.png
index 3b67bdd522..e99fe2fc13 100644
Binary files a/public/images/emoji/google/pray/6.png and b/public/images/emoji/google/pray/6.png differ
diff --git a/public/images/emoji/google/prayer_beads.png b/public/images/emoji/google/prayer_beads.png
index e67ffc8c3a..4fa186fdec 100644
Binary files a/public/images/emoji/google/prayer_beads.png and b/public/images/emoji/google/prayer_beads.png differ
diff --git a/public/images/emoji/google/pregnant_woman.png b/public/images/emoji/google/pregnant_woman.png
index c56f668d18..1c88f42f6d 100644
Binary files a/public/images/emoji/google/pregnant_woman.png and b/public/images/emoji/google/pregnant_woman.png differ
diff --git a/public/images/emoji/google/pregnant_woman/2.png b/public/images/emoji/google/pregnant_woman/2.png
index 3c439cfa61..a8061b7e17 100644
Binary files a/public/images/emoji/google/pregnant_woman/2.png and b/public/images/emoji/google/pregnant_woman/2.png differ
diff --git a/public/images/emoji/google/pregnant_woman/3.png b/public/images/emoji/google/pregnant_woman/3.png
index ac810fa305..d04662f520 100644
Binary files a/public/images/emoji/google/pregnant_woman/3.png and b/public/images/emoji/google/pregnant_woman/3.png differ
diff --git a/public/images/emoji/google/pregnant_woman/4.png b/public/images/emoji/google/pregnant_woman/4.png
index 893dc91287..619fc6abf7 100644
Binary files a/public/images/emoji/google/pregnant_woman/4.png and b/public/images/emoji/google/pregnant_woman/4.png differ
diff --git a/public/images/emoji/google/pregnant_woman/5.png b/public/images/emoji/google/pregnant_woman/5.png
index e3b1bb4e54..04c6b5f121 100644
Binary files a/public/images/emoji/google/pregnant_woman/5.png and b/public/images/emoji/google/pregnant_woman/5.png differ
diff --git a/public/images/emoji/google/pregnant_woman/6.png b/public/images/emoji/google/pregnant_woman/6.png
index 5b9b93f1fa..add2c12284 100644
Binary files a/public/images/emoji/google/pregnant_woman/6.png and b/public/images/emoji/google/pregnant_woman/6.png differ
diff --git a/public/images/emoji/google/pretzel.png b/public/images/emoji/google/pretzel.png
index 615e11503a..dd725a6360 100644
Binary files a/public/images/emoji/google/pretzel.png and b/public/images/emoji/google/pretzel.png differ
diff --git a/public/images/emoji/google/previous_track.png b/public/images/emoji/google/previous_track.png
index 559086b3c0..87e948c080 100644
Binary files a/public/images/emoji/google/previous_track.png and b/public/images/emoji/google/previous_track.png differ
diff --git a/public/images/emoji/google/previous_track_button.png b/public/images/emoji/google/previous_track_button.png
index 559086b3c0..87e948c080 100644
Binary files a/public/images/emoji/google/previous_track_button.png and b/public/images/emoji/google/previous_track_button.png differ
diff --git a/public/images/emoji/google/prince.png b/public/images/emoji/google/prince.png
index 9829fa23d6..035304bda1 100644
Binary files a/public/images/emoji/google/prince.png and b/public/images/emoji/google/prince.png differ
diff --git a/public/images/emoji/google/prince/2.png b/public/images/emoji/google/prince/2.png
index cb34d61e3c..f5a4deaa09 100644
Binary files a/public/images/emoji/google/prince/2.png and b/public/images/emoji/google/prince/2.png differ
diff --git a/public/images/emoji/google/prince/3.png b/public/images/emoji/google/prince/3.png
index 362d7c4ec4..4c793c7177 100644
Binary files a/public/images/emoji/google/prince/3.png and b/public/images/emoji/google/prince/3.png differ
diff --git a/public/images/emoji/google/prince/4.png b/public/images/emoji/google/prince/4.png
index 57cb400ea2..decf85c8cb 100644
Binary files a/public/images/emoji/google/prince/4.png and b/public/images/emoji/google/prince/4.png differ
diff --git a/public/images/emoji/google/prince/5.png b/public/images/emoji/google/prince/5.png
index 28598ace62..ad0ce91baa 100644
Binary files a/public/images/emoji/google/prince/5.png and b/public/images/emoji/google/prince/5.png differ
diff --git a/public/images/emoji/google/prince/6.png b/public/images/emoji/google/prince/6.png
index 68fa20f10b..167df9b946 100644
Binary files a/public/images/emoji/google/prince/6.png and b/public/images/emoji/google/prince/6.png differ
diff --git a/public/images/emoji/google/princess.png b/public/images/emoji/google/princess.png
index de506646b4..094e61c4e5 100644
Binary files a/public/images/emoji/google/princess.png and b/public/images/emoji/google/princess.png differ
diff --git a/public/images/emoji/google/princess/2.png b/public/images/emoji/google/princess/2.png
index d576ce4df8..5676db4768 100644
Binary files a/public/images/emoji/google/princess/2.png and b/public/images/emoji/google/princess/2.png differ
diff --git a/public/images/emoji/google/princess/3.png b/public/images/emoji/google/princess/3.png
index 96484ff791..1346fd208d 100644
Binary files a/public/images/emoji/google/princess/3.png and b/public/images/emoji/google/princess/3.png differ
diff --git a/public/images/emoji/google/princess/4.png b/public/images/emoji/google/princess/4.png
index 7429f3ed81..4c8e9681ec 100644
Binary files a/public/images/emoji/google/princess/4.png and b/public/images/emoji/google/princess/4.png differ
diff --git a/public/images/emoji/google/princess/5.png b/public/images/emoji/google/princess/5.png
index a1a476332a..f03e15f69c 100644
Binary files a/public/images/emoji/google/princess/5.png and b/public/images/emoji/google/princess/5.png differ
diff --git a/public/images/emoji/google/princess/6.png b/public/images/emoji/google/princess/6.png
index 5599020832..523d6eac1e 100644
Binary files a/public/images/emoji/google/princess/6.png and b/public/images/emoji/google/princess/6.png differ
diff --git a/public/images/emoji/google/printer.png b/public/images/emoji/google/printer.png
index bc356b7b5c..76bf56bfdf 100644
Binary files a/public/images/emoji/google/printer.png and b/public/images/emoji/google/printer.png differ
diff --git a/public/images/emoji/google/projector.png b/public/images/emoji/google/projector.png
index f957286ba2..a420005a79 100644
Binary files a/public/images/emoji/google/projector.png and b/public/images/emoji/google/projector.png differ
diff --git a/public/images/emoji/google/puerto_rico.png b/public/images/emoji/google/puerto_rico.png
index 8762d9ce24..4787f3af45 100644
Binary files a/public/images/emoji/google/puerto_rico.png and b/public/images/emoji/google/puerto_rico.png differ
diff --git a/public/images/emoji/google/punch.png b/public/images/emoji/google/punch.png
index f05a3f6d14..2ef7ed2091 100644
Binary files a/public/images/emoji/google/punch.png and b/public/images/emoji/google/punch.png differ
diff --git a/public/images/emoji/google/punch/2.png b/public/images/emoji/google/punch/2.png
index bba3d6fe12..a545c376ac 100644
Binary files a/public/images/emoji/google/punch/2.png and b/public/images/emoji/google/punch/2.png differ
diff --git a/public/images/emoji/google/punch/3.png b/public/images/emoji/google/punch/3.png
index 123e445030..03e2a4fc1b 100644
Binary files a/public/images/emoji/google/punch/3.png and b/public/images/emoji/google/punch/3.png differ
diff --git a/public/images/emoji/google/punch/4.png b/public/images/emoji/google/punch/4.png
index 974055c628..bfb48350fc 100644
Binary files a/public/images/emoji/google/punch/4.png and b/public/images/emoji/google/punch/4.png differ
diff --git a/public/images/emoji/google/punch/5.png b/public/images/emoji/google/punch/5.png
index 3f068a0f95..5f57f2ba46 100644
Binary files a/public/images/emoji/google/punch/5.png and b/public/images/emoji/google/punch/5.png differ
diff --git a/public/images/emoji/google/punch/6.png b/public/images/emoji/google/punch/6.png
index 798a95d9fd..66067147f9 100644
Binary files a/public/images/emoji/google/punch/6.png and b/public/images/emoji/google/punch/6.png differ
diff --git a/public/images/emoji/google/purple_heart.png b/public/images/emoji/google/purple_heart.png
index dab19a7cb7..70c7bbd206 100644
Binary files a/public/images/emoji/google/purple_heart.png and b/public/images/emoji/google/purple_heart.png differ
diff --git a/public/images/emoji/google/purse.png b/public/images/emoji/google/purse.png
index 728bd8fd53..fe533f5c17 100644
Binary files a/public/images/emoji/google/purse.png and b/public/images/emoji/google/purse.png differ
diff --git a/public/images/emoji/google/pushpin.png b/public/images/emoji/google/pushpin.png
index cb6e075c9c..0dfa0a3779 100644
Binary files a/public/images/emoji/google/pushpin.png and b/public/images/emoji/google/pushpin.png differ
diff --git a/public/images/emoji/google/put_litter_in_its_place.png b/public/images/emoji/google/put_litter_in_its_place.png
index ec4606998f..a19ae024c8 100644
Binary files a/public/images/emoji/google/put_litter_in_its_place.png and b/public/images/emoji/google/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/google/qatar.png b/public/images/emoji/google/qatar.png
index 8e058678ef..02db227af7 100644
Binary files a/public/images/emoji/google/qatar.png and b/public/images/emoji/google/qatar.png differ
diff --git a/public/images/emoji/google/question.png b/public/images/emoji/google/question.png
index 36d2465b86..691e7345f8 100644
Binary files a/public/images/emoji/google/question.png and b/public/images/emoji/google/question.png differ
diff --git a/public/images/emoji/google/rabbit.png b/public/images/emoji/google/rabbit.png
index 1ec796818c..6597050419 100644
Binary files a/public/images/emoji/google/rabbit.png and b/public/images/emoji/google/rabbit.png differ
diff --git a/public/images/emoji/google/rabbit2.png b/public/images/emoji/google/rabbit2.png
index 06be3a3850..3f5ce5c83a 100644
Binary files a/public/images/emoji/google/rabbit2.png and b/public/images/emoji/google/rabbit2.png differ
diff --git a/public/images/emoji/google/race_car.png b/public/images/emoji/google/race_car.png
index 60577b2803..efee3e6d65 100644
Binary files a/public/images/emoji/google/race_car.png and b/public/images/emoji/google/race_car.png differ
diff --git a/public/images/emoji/google/racehorse.png b/public/images/emoji/google/racehorse.png
index 3ce637440e..4d15d59b81 100644
Binary files a/public/images/emoji/google/racehorse.png and b/public/images/emoji/google/racehorse.png differ
diff --git a/public/images/emoji/google/racing_car.png b/public/images/emoji/google/racing_car.png
index 60577b2803..efee3e6d65 100644
Binary files a/public/images/emoji/google/racing_car.png and b/public/images/emoji/google/racing_car.png differ
diff --git a/public/images/emoji/google/racing_motorcycle.png b/public/images/emoji/google/racing_motorcycle.png
index d153c400ed..f665d143ef 100644
Binary files a/public/images/emoji/google/racing_motorcycle.png and b/public/images/emoji/google/racing_motorcycle.png differ
diff --git a/public/images/emoji/google/radio.png b/public/images/emoji/google/radio.png
index 2b6ebf3c6c..57b9231d1f 100644
Binary files a/public/images/emoji/google/radio.png and b/public/images/emoji/google/radio.png differ
diff --git a/public/images/emoji/google/radio_button.png b/public/images/emoji/google/radio_button.png
index 0175b6c9aa..24b7e14c1b 100644
Binary files a/public/images/emoji/google/radio_button.png and b/public/images/emoji/google/radio_button.png differ
diff --git a/public/images/emoji/google/radioactive.png b/public/images/emoji/google/radioactive.png
index 0f447cc8a7..bbac164719 100644
Binary files a/public/images/emoji/google/radioactive.png and b/public/images/emoji/google/radioactive.png differ
diff --git a/public/images/emoji/google/radioactive_sign.png b/public/images/emoji/google/radioactive_sign.png
index 0f447cc8a7..bbac164719 100644
Binary files a/public/images/emoji/google/radioactive_sign.png and b/public/images/emoji/google/radioactive_sign.png differ
diff --git a/public/images/emoji/google/rage.png b/public/images/emoji/google/rage.png
index c7ae736cad..b7ad83ce85 100644
Binary files a/public/images/emoji/google/rage.png and b/public/images/emoji/google/rage.png differ
diff --git a/public/images/emoji/google/railroad_track.png b/public/images/emoji/google/railroad_track.png
index 6c11df9754..fc0f3211f6 100644
Binary files a/public/images/emoji/google/railroad_track.png and b/public/images/emoji/google/railroad_track.png differ
diff --git a/public/images/emoji/google/railway_car.png b/public/images/emoji/google/railway_car.png
index a84af6e421..47347e49db 100644
Binary files a/public/images/emoji/google/railway_car.png and b/public/images/emoji/google/railway_car.png differ
diff --git a/public/images/emoji/google/railway_track.png b/public/images/emoji/google/railway_track.png
index 6c11df9754..fc0f3211f6 100644
Binary files a/public/images/emoji/google/railway_track.png and b/public/images/emoji/google/railway_track.png differ
diff --git a/public/images/emoji/google/rainbow.png b/public/images/emoji/google/rainbow.png
index 2292152e0d..93cda09148 100644
Binary files a/public/images/emoji/google/rainbow.png and b/public/images/emoji/google/rainbow.png differ
diff --git a/public/images/emoji/google/rainbow_flag.png b/public/images/emoji/google/rainbow_flag.png
index d77a770671..994f82d473 100644
Binary files a/public/images/emoji/google/rainbow_flag.png and b/public/images/emoji/google/rainbow_flag.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand.png b/public/images/emoji/google/raised_back_of_hand.png
index ffda7881dc..694ded58aa 100644
Binary files a/public/images/emoji/google/raised_back_of_hand.png and b/public/images/emoji/google/raised_back_of_hand.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/2.png b/public/images/emoji/google/raised_back_of_hand/2.png
index cf4b3376bb..98f2c0e2ac 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/2.png and b/public/images/emoji/google/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/3.png b/public/images/emoji/google/raised_back_of_hand/3.png
index 4febc58f7d..a0af20b9f8 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/3.png and b/public/images/emoji/google/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/4.png b/public/images/emoji/google/raised_back_of_hand/4.png
index 1de5dbde5a..92c07c8107 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/4.png and b/public/images/emoji/google/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/5.png b/public/images/emoji/google/raised_back_of_hand/5.png
index 68e1158c3e..98f8f30824 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/5.png and b/public/images/emoji/google/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/6.png b/public/images/emoji/google/raised_back_of_hand/6.png
index 505506833f..b3443ccca9 100644
Binary files a/public/images/emoji/google/raised_back_of_hand/6.png and b/public/images/emoji/google/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/google/raised_hand.png b/public/images/emoji/google/raised_hand.png
index b916dc7f87..de95a84981 100644
Binary files a/public/images/emoji/google/raised_hand.png and b/public/images/emoji/google/raised_hand.png differ
diff --git a/public/images/emoji/google/raised_hand/2.png b/public/images/emoji/google/raised_hand/2.png
index e60690c77e..d836026dac 100644
Binary files a/public/images/emoji/google/raised_hand/2.png and b/public/images/emoji/google/raised_hand/2.png differ
diff --git a/public/images/emoji/google/raised_hand/3.png b/public/images/emoji/google/raised_hand/3.png
index 9aabb63f85..be7f2cba1c 100644
Binary files a/public/images/emoji/google/raised_hand/3.png and b/public/images/emoji/google/raised_hand/3.png differ
diff --git a/public/images/emoji/google/raised_hand/4.png b/public/images/emoji/google/raised_hand/4.png
index 86696653b5..e19034a4e0 100644
Binary files a/public/images/emoji/google/raised_hand/4.png and b/public/images/emoji/google/raised_hand/4.png differ
diff --git a/public/images/emoji/google/raised_hand/5.png b/public/images/emoji/google/raised_hand/5.png
index 1e92c70971..d564c273c7 100644
Binary files a/public/images/emoji/google/raised_hand/5.png and b/public/images/emoji/google/raised_hand/5.png differ
diff --git a/public/images/emoji/google/raised_hand/6.png b/public/images/emoji/google/raised_hand/6.png
index 1e260d4461..6d24244b38 100644
Binary files a/public/images/emoji/google/raised_hand/6.png and b/public/images/emoji/google/raised_hand/6.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed.png b/public/images/emoji/google/raised_hand_with_fingers_splayed.png
index f99fef5296..12fee02f17 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png
index 3f6b667ebe..f9b441bae2 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png
index 0a811f93d5..46bb5b97c3 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png
index 21a92e444c..244dbb61a6 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png
index f40f860c16..f2c26a0267 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png
index b87967ff84..2cc07edb58 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png
index e672a711f1..bbedc6b2dc 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png
index 635aa1f775..08e5bca605 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png
index d6c303152c..c1059af3e0 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png
index 645ad295a8..a6cc78518c 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png
index cbb240d2c6..b4d9b458f9 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png
index 0e727c865a..815b2959ec 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/google/raised_hands.png b/public/images/emoji/google/raised_hands.png
index 49cb6a53aa..f9dcc714d3 100644
Binary files a/public/images/emoji/google/raised_hands.png and b/public/images/emoji/google/raised_hands.png differ
diff --git a/public/images/emoji/google/raised_hands/2.png b/public/images/emoji/google/raised_hands/2.png
index d03fdc2ea4..efb3e4fdf3 100644
Binary files a/public/images/emoji/google/raised_hands/2.png and b/public/images/emoji/google/raised_hands/2.png differ
diff --git a/public/images/emoji/google/raised_hands/3.png b/public/images/emoji/google/raised_hands/3.png
index 37e9b1277e..9f0b17f2c2 100644
Binary files a/public/images/emoji/google/raised_hands/3.png and b/public/images/emoji/google/raised_hands/3.png differ
diff --git a/public/images/emoji/google/raised_hands/4.png b/public/images/emoji/google/raised_hands/4.png
index c45d7f3cba..54aabe3fe2 100644
Binary files a/public/images/emoji/google/raised_hands/4.png and b/public/images/emoji/google/raised_hands/4.png differ
diff --git a/public/images/emoji/google/raised_hands/5.png b/public/images/emoji/google/raised_hands/5.png
index 3ce79a95f7..104fb2054f 100644
Binary files a/public/images/emoji/google/raised_hands/5.png and b/public/images/emoji/google/raised_hands/5.png differ
diff --git a/public/images/emoji/google/raised_hands/6.png b/public/images/emoji/google/raised_hands/6.png
index b32c537c1f..8fa4e18837 100644
Binary files a/public/images/emoji/google/raised_hands/6.png and b/public/images/emoji/google/raised_hands/6.png differ
diff --git a/public/images/emoji/google/raising_hand.png b/public/images/emoji/google/raising_hand.png
index 72ea7e6bd7..96a4c2b148 100644
Binary files a/public/images/emoji/google/raising_hand.png and b/public/images/emoji/google/raising_hand.png differ
diff --git a/public/images/emoji/google/raising_hand/2.png b/public/images/emoji/google/raising_hand/2.png
index 110f5edf80..9a8b0b0398 100644
Binary files a/public/images/emoji/google/raising_hand/2.png and b/public/images/emoji/google/raising_hand/2.png differ
diff --git a/public/images/emoji/google/raising_hand/3.png b/public/images/emoji/google/raising_hand/3.png
index 5fc1015a02..28ce85f891 100644
Binary files a/public/images/emoji/google/raising_hand/3.png and b/public/images/emoji/google/raising_hand/3.png differ
diff --git a/public/images/emoji/google/raising_hand/4.png b/public/images/emoji/google/raising_hand/4.png
index 022eb60392..d6e2bfb18e 100644
Binary files a/public/images/emoji/google/raising_hand/4.png and b/public/images/emoji/google/raising_hand/4.png differ
diff --git a/public/images/emoji/google/raising_hand/5.png b/public/images/emoji/google/raising_hand/5.png
index 76bad2a893..d1e7919136 100644
Binary files a/public/images/emoji/google/raising_hand/5.png and b/public/images/emoji/google/raising_hand/5.png differ
diff --git a/public/images/emoji/google/raising_hand/6.png b/public/images/emoji/google/raising_hand/6.png
index fb79988768..d5ccdd78b6 100644
Binary files a/public/images/emoji/google/raising_hand/6.png and b/public/images/emoji/google/raising_hand/6.png differ
diff --git a/public/images/emoji/google/raising_hand_man.png b/public/images/emoji/google/raising_hand_man.png
index 268f7a5236..0d2e1c82e0 100644
Binary files a/public/images/emoji/google/raising_hand_man.png and b/public/images/emoji/google/raising_hand_man.png differ
diff --git a/public/images/emoji/google/raising_hand_man/2.png b/public/images/emoji/google/raising_hand_man/2.png
index 79002d2fec..ff2411b105 100644
Binary files a/public/images/emoji/google/raising_hand_man/2.png and b/public/images/emoji/google/raising_hand_man/2.png differ
diff --git a/public/images/emoji/google/raising_hand_man/3.png b/public/images/emoji/google/raising_hand_man/3.png
index 8983fe4677..f67bfa954b 100644
Binary files a/public/images/emoji/google/raising_hand_man/3.png and b/public/images/emoji/google/raising_hand_man/3.png differ
diff --git a/public/images/emoji/google/raising_hand_man/4.png b/public/images/emoji/google/raising_hand_man/4.png
index 274389fca0..c8e7b7dee6 100644
Binary files a/public/images/emoji/google/raising_hand_man/4.png and b/public/images/emoji/google/raising_hand_man/4.png differ
diff --git a/public/images/emoji/google/raising_hand_man/5.png b/public/images/emoji/google/raising_hand_man/5.png
index ae8b451a19..a3645d58f9 100644
Binary files a/public/images/emoji/google/raising_hand_man/5.png and b/public/images/emoji/google/raising_hand_man/5.png differ
diff --git a/public/images/emoji/google/raising_hand_man/6.png b/public/images/emoji/google/raising_hand_man/6.png
index 7eb18142ed..3c4bad3a0b 100644
Binary files a/public/images/emoji/google/raising_hand_man/6.png and b/public/images/emoji/google/raising_hand_man/6.png differ
diff --git a/public/images/emoji/google/raising_hand_woman.png b/public/images/emoji/google/raising_hand_woman.png
index 72ea7e6bd7..96a4c2b148 100644
Binary files a/public/images/emoji/google/raising_hand_woman.png and b/public/images/emoji/google/raising_hand_woman.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/2.png b/public/images/emoji/google/raising_hand_woman/2.png
index 110f5edf80..9a8b0b0398 100644
Binary files a/public/images/emoji/google/raising_hand_woman/2.png and b/public/images/emoji/google/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/3.png b/public/images/emoji/google/raising_hand_woman/3.png
index 5fc1015a02..28ce85f891 100644
Binary files a/public/images/emoji/google/raising_hand_woman/3.png and b/public/images/emoji/google/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/4.png b/public/images/emoji/google/raising_hand_woman/4.png
index 022eb60392..d6e2bfb18e 100644
Binary files a/public/images/emoji/google/raising_hand_woman/4.png and b/public/images/emoji/google/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/5.png b/public/images/emoji/google/raising_hand_woman/5.png
index 76bad2a893..d1e7919136 100644
Binary files a/public/images/emoji/google/raising_hand_woman/5.png and b/public/images/emoji/google/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/6.png b/public/images/emoji/google/raising_hand_woman/6.png
index fb79988768..d5ccdd78b6 100644
Binary files a/public/images/emoji/google/raising_hand_woman/6.png and b/public/images/emoji/google/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/google/ram.png b/public/images/emoji/google/ram.png
index c79fd6878a..9fb9628a5a 100644
Binary files a/public/images/emoji/google/ram.png and b/public/images/emoji/google/ram.png differ
diff --git a/public/images/emoji/google/ramen.png b/public/images/emoji/google/ramen.png
index 029ccc226c..ae507fd1df 100644
Binary files a/public/images/emoji/google/ramen.png and b/public/images/emoji/google/ramen.png differ
diff --git a/public/images/emoji/google/rat.png b/public/images/emoji/google/rat.png
index 01ab9f5945..0dd92253dc 100644
Binary files a/public/images/emoji/google/rat.png and b/public/images/emoji/google/rat.png differ
diff --git a/public/images/emoji/google/record_button.png b/public/images/emoji/google/record_button.png
index b8c614bb0c..e82b55b21b 100644
Binary files a/public/images/emoji/google/record_button.png and b/public/images/emoji/google/record_button.png differ
diff --git a/public/images/emoji/google/recycle.png b/public/images/emoji/google/recycle.png
index 0d1c9d45a4..6058f1eda6 100644
Binary files a/public/images/emoji/google/recycle.png and b/public/images/emoji/google/recycle.png differ
diff --git a/public/images/emoji/google/red_car.png b/public/images/emoji/google/red_car.png
index f1184f7d47..b57c33d210 100644
Binary files a/public/images/emoji/google/red_car.png and b/public/images/emoji/google/red_car.png differ
diff --git a/public/images/emoji/google/red_circle.png b/public/images/emoji/google/red_circle.png
index 3d750cab49..dc7cdfef39 100644
Binary files a/public/images/emoji/google/red_circle.png and b/public/images/emoji/google/red_circle.png differ
diff --git a/public/images/emoji/google/registered.png b/public/images/emoji/google/registered.png
index ba6ad07721..744b55c968 100644
Binary files a/public/images/emoji/google/registered.png and b/public/images/emoji/google/registered.png differ
diff --git a/public/images/emoji/google/relaxed.png b/public/images/emoji/google/relaxed.png
index d68bd3607f..cb971a027e 100644
Binary files a/public/images/emoji/google/relaxed.png and b/public/images/emoji/google/relaxed.png differ
diff --git a/public/images/emoji/google/relieved.png b/public/images/emoji/google/relieved.png
index bdf352d132..363596dd5c 100644
Binary files a/public/images/emoji/google/relieved.png and b/public/images/emoji/google/relieved.png differ
diff --git a/public/images/emoji/google/reminder_ribbon.png b/public/images/emoji/google/reminder_ribbon.png
index fe8d47927d..6464fd8f7d 100644
Binary files a/public/images/emoji/google/reminder_ribbon.png and b/public/images/emoji/google/reminder_ribbon.png differ
diff --git a/public/images/emoji/google/repeat.png b/public/images/emoji/google/repeat.png
index 650c52935c..a62308dc77 100644
Binary files a/public/images/emoji/google/repeat.png and b/public/images/emoji/google/repeat.png differ
diff --git a/public/images/emoji/google/repeat_one.png b/public/images/emoji/google/repeat_one.png
index 92240cc2c4..714c35cad5 100644
Binary files a/public/images/emoji/google/repeat_one.png and b/public/images/emoji/google/repeat_one.png differ
diff --git a/public/images/emoji/google/rescue_worker_helmet.png b/public/images/emoji/google/rescue_worker_helmet.png
index e1306b90dc..8d3d37d3ea 100644
Binary files a/public/images/emoji/google/rescue_worker_helmet.png and b/public/images/emoji/google/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/google/restroom.png b/public/images/emoji/google/restroom.png
index 7c2b5160a6..1ffe8d0065 100644
Binary files a/public/images/emoji/google/restroom.png and b/public/images/emoji/google/restroom.png differ
diff --git a/public/images/emoji/google/reunion.png b/public/images/emoji/google/reunion.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/reunion.png and b/public/images/emoji/google/reunion.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png
index 8ce128b147..71e8d8b3e9 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png
index 3313e7e2f0..da4e50ac5e 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png
index 916b42be04..785bc19455 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png
index 7ab3507e2c..f55cc136fc 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png
index aeb15696e6..a2ed1b0443 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png
index 8e86466514..cf73dfc640 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/google/revolving_hearts.png b/public/images/emoji/google/revolving_hearts.png
index c4e9aae215..bb76af8353 100644
Binary files a/public/images/emoji/google/revolving_hearts.png and b/public/images/emoji/google/revolving_hearts.png differ
diff --git a/public/images/emoji/google/rewind.png b/public/images/emoji/google/rewind.png
index e88ecfcd92..cd0363422b 100644
Binary files a/public/images/emoji/google/rewind.png and b/public/images/emoji/google/rewind.png differ
diff --git a/public/images/emoji/google/rhinoceros.png b/public/images/emoji/google/rhinoceros.png
index 438c4c6b2e..fbb1a76132 100644
Binary files a/public/images/emoji/google/rhinoceros.png and b/public/images/emoji/google/rhinoceros.png differ
diff --git a/public/images/emoji/google/ribbon.png b/public/images/emoji/google/ribbon.png
index 86fa7f01cd..d67963e857 100644
Binary files a/public/images/emoji/google/ribbon.png and b/public/images/emoji/google/ribbon.png differ
diff --git a/public/images/emoji/google/rice.png b/public/images/emoji/google/rice.png
index 9ad2d64fe3..22fdceeda6 100644
Binary files a/public/images/emoji/google/rice.png and b/public/images/emoji/google/rice.png differ
diff --git a/public/images/emoji/google/rice_ball.png b/public/images/emoji/google/rice_ball.png
index 6ac2060051..5251001691 100644
Binary files a/public/images/emoji/google/rice_ball.png and b/public/images/emoji/google/rice_ball.png differ
diff --git a/public/images/emoji/google/rice_cracker.png b/public/images/emoji/google/rice_cracker.png
index 62da6d7ab5..73a04eaf77 100644
Binary files a/public/images/emoji/google/rice_cracker.png and b/public/images/emoji/google/rice_cracker.png differ
diff --git a/public/images/emoji/google/rice_scene.png b/public/images/emoji/google/rice_scene.png
index 7d05cb3604..623ca5c0db 100644
Binary files a/public/images/emoji/google/rice_scene.png and b/public/images/emoji/google/rice_scene.png differ
diff --git a/public/images/emoji/google/right_anger_bubble.png b/public/images/emoji/google/right_anger_bubble.png
index 27b4462cbb..9ba99a5b35 100644
Binary files a/public/images/emoji/google/right_anger_bubble.png and b/public/images/emoji/google/right_anger_bubble.png differ
diff --git a/public/images/emoji/google/ring.png b/public/images/emoji/google/ring.png
index 5b54751891..e7f4193fe7 100644
Binary files a/public/images/emoji/google/ring.png and b/public/images/emoji/google/ring.png differ
diff --git a/public/images/emoji/google/robot.png b/public/images/emoji/google/robot.png
index d65ed7bb33..efc8bfc340 100644
Binary files a/public/images/emoji/google/robot.png and b/public/images/emoji/google/robot.png differ
diff --git a/public/images/emoji/google/robot_face.png b/public/images/emoji/google/robot_face.png
index d65ed7bb33..efc8bfc340 100644
Binary files a/public/images/emoji/google/robot_face.png and b/public/images/emoji/google/robot_face.png differ
diff --git a/public/images/emoji/google/rocket.png b/public/images/emoji/google/rocket.png
index de37e29dff..25c442966f 100644
Binary files a/public/images/emoji/google/rocket.png and b/public/images/emoji/google/rocket.png differ
diff --git a/public/images/emoji/google/rofl.png b/public/images/emoji/google/rofl.png
index c0e4eee11f..047f61002f 100644
Binary files a/public/images/emoji/google/rofl.png and b/public/images/emoji/google/rofl.png differ
diff --git a/public/images/emoji/google/roll_eyes.png b/public/images/emoji/google/roll_eyes.png
index 8485fcbe1c..55577e34a9 100644
Binary files a/public/images/emoji/google/roll_eyes.png and b/public/images/emoji/google/roll_eyes.png differ
diff --git a/public/images/emoji/google/rolled_up_newspaper.png b/public/images/emoji/google/rolled_up_newspaper.png
index 13fb245471..3cdda353ac 100644
Binary files a/public/images/emoji/google/rolled_up_newspaper.png and b/public/images/emoji/google/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/google/roller_coaster.png b/public/images/emoji/google/roller_coaster.png
index 70e2c112ea..3c40783864 100644
Binary files a/public/images/emoji/google/roller_coaster.png and b/public/images/emoji/google/roller_coaster.png differ
diff --git a/public/images/emoji/google/rolling_eyes.png b/public/images/emoji/google/rolling_eyes.png
index 8485fcbe1c..55577e34a9 100644
Binary files a/public/images/emoji/google/rolling_eyes.png and b/public/images/emoji/google/rolling_eyes.png differ
diff --git a/public/images/emoji/google/romania.png b/public/images/emoji/google/romania.png
index 898174d640..1fe9c40916 100644
Binary files a/public/images/emoji/google/romania.png and b/public/images/emoji/google/romania.png differ
diff --git a/public/images/emoji/google/rooster.png b/public/images/emoji/google/rooster.png
index 1a4a6bf2f6..72917b8397 100644
Binary files a/public/images/emoji/google/rooster.png and b/public/images/emoji/google/rooster.png differ
diff --git a/public/images/emoji/google/rose.png b/public/images/emoji/google/rose.png
index 5dfe4d8a42..aee576a9bf 100644
Binary files a/public/images/emoji/google/rose.png and b/public/images/emoji/google/rose.png differ
diff --git a/public/images/emoji/google/rosette.png b/public/images/emoji/google/rosette.png
index 784fd52270..85f9409308 100644
Binary files a/public/images/emoji/google/rosette.png and b/public/images/emoji/google/rosette.png differ
diff --git a/public/images/emoji/google/rotating_light.png b/public/images/emoji/google/rotating_light.png
index 0abf3669b0..49ffae8ea7 100644
Binary files a/public/images/emoji/google/rotating_light.png and b/public/images/emoji/google/rotating_light.png differ
diff --git a/public/images/emoji/google/round_pushpin.png b/public/images/emoji/google/round_pushpin.png
index d0f5f58a5b..f17c6ab799 100644
Binary files a/public/images/emoji/google/round_pushpin.png and b/public/images/emoji/google/round_pushpin.png differ
diff --git a/public/images/emoji/google/rowboat.png b/public/images/emoji/google/rowboat.png
index 01e3f04148..7e8acc5441 100644
Binary files a/public/images/emoji/google/rowboat.png and b/public/images/emoji/google/rowboat.png differ
diff --git a/public/images/emoji/google/rowboat/2.png b/public/images/emoji/google/rowboat/2.png
index 0845805397..092ad2f733 100644
Binary files a/public/images/emoji/google/rowboat/2.png and b/public/images/emoji/google/rowboat/2.png differ
diff --git a/public/images/emoji/google/rowboat/3.png b/public/images/emoji/google/rowboat/3.png
index 670f5ef309..748a3c624e 100644
Binary files a/public/images/emoji/google/rowboat/3.png and b/public/images/emoji/google/rowboat/3.png differ
diff --git a/public/images/emoji/google/rowboat/4.png b/public/images/emoji/google/rowboat/4.png
index 00d83be28e..8b77d3d477 100644
Binary files a/public/images/emoji/google/rowboat/4.png and b/public/images/emoji/google/rowboat/4.png differ
diff --git a/public/images/emoji/google/rowboat/5.png b/public/images/emoji/google/rowboat/5.png
index c01f2289d4..d9e7e76d2c 100644
Binary files a/public/images/emoji/google/rowboat/5.png and b/public/images/emoji/google/rowboat/5.png differ
diff --git a/public/images/emoji/google/rowboat/6.png b/public/images/emoji/google/rowboat/6.png
index 76b008246d..1c6a43b6c8 100644
Binary files a/public/images/emoji/google/rowboat/6.png and b/public/images/emoji/google/rowboat/6.png differ
diff --git a/public/images/emoji/google/rowing_man.png b/public/images/emoji/google/rowing_man.png
index 01e3f04148..7e8acc5441 100644
Binary files a/public/images/emoji/google/rowing_man.png and b/public/images/emoji/google/rowing_man.png differ
diff --git a/public/images/emoji/google/rowing_man/2.png b/public/images/emoji/google/rowing_man/2.png
index 0845805397..092ad2f733 100644
Binary files a/public/images/emoji/google/rowing_man/2.png and b/public/images/emoji/google/rowing_man/2.png differ
diff --git a/public/images/emoji/google/rowing_man/3.png b/public/images/emoji/google/rowing_man/3.png
index 670f5ef309..748a3c624e 100644
Binary files a/public/images/emoji/google/rowing_man/3.png and b/public/images/emoji/google/rowing_man/3.png differ
diff --git a/public/images/emoji/google/rowing_man/4.png b/public/images/emoji/google/rowing_man/4.png
index 00d83be28e..8b77d3d477 100644
Binary files a/public/images/emoji/google/rowing_man/4.png and b/public/images/emoji/google/rowing_man/4.png differ
diff --git a/public/images/emoji/google/rowing_man/5.png b/public/images/emoji/google/rowing_man/5.png
index c01f2289d4..d9e7e76d2c 100644
Binary files a/public/images/emoji/google/rowing_man/5.png and b/public/images/emoji/google/rowing_man/5.png differ
diff --git a/public/images/emoji/google/rowing_man/6.png b/public/images/emoji/google/rowing_man/6.png
index 76b008246d..1c6a43b6c8 100644
Binary files a/public/images/emoji/google/rowing_man/6.png and b/public/images/emoji/google/rowing_man/6.png differ
diff --git a/public/images/emoji/google/rowing_woman.png b/public/images/emoji/google/rowing_woman.png
index 4fe824a2b9..03fbe7b97c 100644
Binary files a/public/images/emoji/google/rowing_woman.png and b/public/images/emoji/google/rowing_woman.png differ
diff --git a/public/images/emoji/google/rowing_woman/2.png b/public/images/emoji/google/rowing_woman/2.png
index b83bbb6e81..b3f8d9fc5c 100644
Binary files a/public/images/emoji/google/rowing_woman/2.png and b/public/images/emoji/google/rowing_woman/2.png differ
diff --git a/public/images/emoji/google/rowing_woman/3.png b/public/images/emoji/google/rowing_woman/3.png
index 93fef46fea..85ae2a7111 100644
Binary files a/public/images/emoji/google/rowing_woman/3.png and b/public/images/emoji/google/rowing_woman/3.png differ
diff --git a/public/images/emoji/google/rowing_woman/4.png b/public/images/emoji/google/rowing_woman/4.png
index 036d969d88..52e6a2dc6e 100644
Binary files a/public/images/emoji/google/rowing_woman/4.png and b/public/images/emoji/google/rowing_woman/4.png differ
diff --git a/public/images/emoji/google/rowing_woman/5.png b/public/images/emoji/google/rowing_woman/5.png
index 1a0f5d5b6d..a2e00a062f 100644
Binary files a/public/images/emoji/google/rowing_woman/5.png and b/public/images/emoji/google/rowing_woman/5.png differ
diff --git a/public/images/emoji/google/rowing_woman/6.png b/public/images/emoji/google/rowing_woman/6.png
index 17841ebb87..7df3771c1d 100644
Binary files a/public/images/emoji/google/rowing_woman/6.png and b/public/images/emoji/google/rowing_woman/6.png differ
diff --git a/public/images/emoji/google/ru.png b/public/images/emoji/google/ru.png
index a92bbdbb8a..f42d2705cf 100644
Binary files a/public/images/emoji/google/ru.png and b/public/images/emoji/google/ru.png differ
diff --git a/public/images/emoji/google/rugby_football.png b/public/images/emoji/google/rugby_football.png
index b8a0b8f62d..0b417bd28c 100644
Binary files a/public/images/emoji/google/rugby_football.png and b/public/images/emoji/google/rugby_football.png differ
diff --git a/public/images/emoji/google/runner.png b/public/images/emoji/google/runner.png
index 86592f2975..cc56401f9b 100644
Binary files a/public/images/emoji/google/runner.png and b/public/images/emoji/google/runner.png differ
diff --git a/public/images/emoji/google/runner/2.png b/public/images/emoji/google/runner/2.png
index 546cb4791d..71e0149093 100644
Binary files a/public/images/emoji/google/runner/2.png and b/public/images/emoji/google/runner/2.png differ
diff --git a/public/images/emoji/google/runner/3.png b/public/images/emoji/google/runner/3.png
index 635f3203ef..3f9e444eaa 100644
Binary files a/public/images/emoji/google/runner/3.png and b/public/images/emoji/google/runner/3.png differ
diff --git a/public/images/emoji/google/runner/4.png b/public/images/emoji/google/runner/4.png
index 97d2cc1e03..0c609ca247 100644
Binary files a/public/images/emoji/google/runner/4.png and b/public/images/emoji/google/runner/4.png differ
diff --git a/public/images/emoji/google/runner/5.png b/public/images/emoji/google/runner/5.png
index 678a308cc4..1dd8d9fd3e 100644
Binary files a/public/images/emoji/google/runner/5.png and b/public/images/emoji/google/runner/5.png differ
diff --git a/public/images/emoji/google/runner/6.png b/public/images/emoji/google/runner/6.png
index 2f012dee70..849ce0542c 100644
Binary files a/public/images/emoji/google/runner/6.png and b/public/images/emoji/google/runner/6.png differ
diff --git a/public/images/emoji/google/running_man.png b/public/images/emoji/google/running_man.png
index 86592f2975..cc56401f9b 100644
Binary files a/public/images/emoji/google/running_man.png and b/public/images/emoji/google/running_man.png differ
diff --git a/public/images/emoji/google/running_man/2.png b/public/images/emoji/google/running_man/2.png
index 546cb4791d..71e0149093 100644
Binary files a/public/images/emoji/google/running_man/2.png and b/public/images/emoji/google/running_man/2.png differ
diff --git a/public/images/emoji/google/running_man/3.png b/public/images/emoji/google/running_man/3.png
index 635f3203ef..3f9e444eaa 100644
Binary files a/public/images/emoji/google/running_man/3.png and b/public/images/emoji/google/running_man/3.png differ
diff --git a/public/images/emoji/google/running_man/4.png b/public/images/emoji/google/running_man/4.png
index 97d2cc1e03..0c609ca247 100644
Binary files a/public/images/emoji/google/running_man/4.png and b/public/images/emoji/google/running_man/4.png differ
diff --git a/public/images/emoji/google/running_man/5.png b/public/images/emoji/google/running_man/5.png
index 678a308cc4..1dd8d9fd3e 100644
Binary files a/public/images/emoji/google/running_man/5.png and b/public/images/emoji/google/running_man/5.png differ
diff --git a/public/images/emoji/google/running_man/6.png b/public/images/emoji/google/running_man/6.png
index 2f012dee70..849ce0542c 100644
Binary files a/public/images/emoji/google/running_man/6.png and b/public/images/emoji/google/running_man/6.png differ
diff --git a/public/images/emoji/google/running_shirt_with_sash.png b/public/images/emoji/google/running_shirt_with_sash.png
index c1ff4c4d34..4bd73a9354 100644
Binary files a/public/images/emoji/google/running_shirt_with_sash.png and b/public/images/emoji/google/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/google/running_woman.png b/public/images/emoji/google/running_woman.png
index d5908236a3..a8f12eae56 100644
Binary files a/public/images/emoji/google/running_woman.png and b/public/images/emoji/google/running_woman.png differ
diff --git a/public/images/emoji/google/running_woman/2.png b/public/images/emoji/google/running_woman/2.png
index f6b51471f8..983395d179 100644
Binary files a/public/images/emoji/google/running_woman/2.png and b/public/images/emoji/google/running_woman/2.png differ
diff --git a/public/images/emoji/google/running_woman/3.png b/public/images/emoji/google/running_woman/3.png
index b1a8400b20..c7bc28a010 100644
Binary files a/public/images/emoji/google/running_woman/3.png and b/public/images/emoji/google/running_woman/3.png differ
diff --git a/public/images/emoji/google/running_woman/4.png b/public/images/emoji/google/running_woman/4.png
index 9899a688fa..bbbc76306b 100644
Binary files a/public/images/emoji/google/running_woman/4.png and b/public/images/emoji/google/running_woman/4.png differ
diff --git a/public/images/emoji/google/running_woman/5.png b/public/images/emoji/google/running_woman/5.png
index 2c2c34bc60..51bd8fc87b 100644
Binary files a/public/images/emoji/google/running_woman/5.png and b/public/images/emoji/google/running_woman/5.png differ
diff --git a/public/images/emoji/google/running_woman/6.png b/public/images/emoji/google/running_woman/6.png
index 4563361796..b647ec30cd 100644
Binary files a/public/images/emoji/google/running_woman/6.png and b/public/images/emoji/google/running_woman/6.png differ
diff --git a/public/images/emoji/google/rwanda.png b/public/images/emoji/google/rwanda.png
index 4bbe4a9778..85b83fb107 100644
Binary files a/public/images/emoji/google/rwanda.png and b/public/images/emoji/google/rwanda.png differ
diff --git a/public/images/emoji/google/sa.png b/public/images/emoji/google/sa.png
index 88b8b42a16..a6f433f3fb 100644
Binary files a/public/images/emoji/google/sa.png and b/public/images/emoji/google/sa.png differ
diff --git a/public/images/emoji/google/sagittarius.png b/public/images/emoji/google/sagittarius.png
index 5c020b111a..f54041679a 100644
Binary files a/public/images/emoji/google/sagittarius.png and b/public/images/emoji/google/sagittarius.png differ
diff --git a/public/images/emoji/google/sailboat.png b/public/images/emoji/google/sailboat.png
index c10b6a24cc..e80c768d22 100644
Binary files a/public/images/emoji/google/sailboat.png and b/public/images/emoji/google/sailboat.png differ
diff --git a/public/images/emoji/google/sake.png b/public/images/emoji/google/sake.png
index f9975bda7f..525fa28751 100644
Binary files a/public/images/emoji/google/sake.png and b/public/images/emoji/google/sake.png differ
diff --git a/public/images/emoji/google/samoa.png b/public/images/emoji/google/samoa.png
index 6f56f82623..34ebac1110 100644
Binary files a/public/images/emoji/google/samoa.png and b/public/images/emoji/google/samoa.png differ
diff --git a/public/images/emoji/google/san_marino.png b/public/images/emoji/google/san_marino.png
index 18aa756e02..d5f8895dd6 100644
Binary files a/public/images/emoji/google/san_marino.png and b/public/images/emoji/google/san_marino.png differ
diff --git a/public/images/emoji/google/sandal.png b/public/images/emoji/google/sandal.png
index ab091981b8..809f5f3fd4 100644
Binary files a/public/images/emoji/google/sandal.png and b/public/images/emoji/google/sandal.png differ
diff --git a/public/images/emoji/google/sandwich.png b/public/images/emoji/google/sandwich.png
index 37dbc0c81e..e602240b1e 100644
Binary files a/public/images/emoji/google/sandwich.png and b/public/images/emoji/google/sandwich.png differ
diff --git a/public/images/emoji/google/santa.png b/public/images/emoji/google/santa.png
index 38c66269e0..85a8bed419 100644
Binary files a/public/images/emoji/google/santa.png and b/public/images/emoji/google/santa.png differ
diff --git a/public/images/emoji/google/santa/2.png b/public/images/emoji/google/santa/2.png
index cf273d9179..f76865b839 100644
Binary files a/public/images/emoji/google/santa/2.png and b/public/images/emoji/google/santa/2.png differ
diff --git a/public/images/emoji/google/santa/3.png b/public/images/emoji/google/santa/3.png
index 46c7989b34..f1134e0b8d 100644
Binary files a/public/images/emoji/google/santa/3.png and b/public/images/emoji/google/santa/3.png differ
diff --git a/public/images/emoji/google/santa/4.png b/public/images/emoji/google/santa/4.png
index d5f6bfc113..b6fd36e84c 100644
Binary files a/public/images/emoji/google/santa/4.png and b/public/images/emoji/google/santa/4.png differ
diff --git a/public/images/emoji/google/santa/5.png b/public/images/emoji/google/santa/5.png
index 791442b674..5987fdc060 100644
Binary files a/public/images/emoji/google/santa/5.png and b/public/images/emoji/google/santa/5.png differ
diff --git a/public/images/emoji/google/santa/6.png b/public/images/emoji/google/santa/6.png
index 1d98e5de0d..e33ad8a435 100644
Binary files a/public/images/emoji/google/santa/6.png and b/public/images/emoji/google/santa/6.png differ
diff --git a/public/images/emoji/google/sao_tome_principe.png b/public/images/emoji/google/sao_tome_principe.png
index 10a206cd59..6cda2118f9 100644
Binary files a/public/images/emoji/google/sao_tome_principe.png and b/public/images/emoji/google/sao_tome_principe.png differ
diff --git a/public/images/emoji/google/satellite.png b/public/images/emoji/google/satellite.png
index 1a8fea811c..c529409ae3 100644
Binary files a/public/images/emoji/google/satellite.png and b/public/images/emoji/google/satellite.png differ
diff --git a/public/images/emoji/google/satellite_orbital.png b/public/images/emoji/google/satellite_orbital.png
index 6b94efd773..8f60cf4fc4 100644
Binary files a/public/images/emoji/google/satellite_orbital.png and b/public/images/emoji/google/satellite_orbital.png differ
diff --git a/public/images/emoji/google/satisfied.png b/public/images/emoji/google/satisfied.png
index 1b64148f97..2fdeacfbbc 100644
Binary files a/public/images/emoji/google/satisfied.png and b/public/images/emoji/google/satisfied.png differ
diff --git a/public/images/emoji/google/saudi_arabia.png b/public/images/emoji/google/saudi_arabia.png
index 6282420b70..62a83e09cc 100644
Binary files a/public/images/emoji/google/saudi_arabia.png and b/public/images/emoji/google/saudi_arabia.png differ
diff --git a/public/images/emoji/google/sauropod.png b/public/images/emoji/google/sauropod.png
index aa85e189ac..12b0a2f966 100644
Binary files a/public/images/emoji/google/sauropod.png and b/public/images/emoji/google/sauropod.png differ
diff --git a/public/images/emoji/google/saxophone.png b/public/images/emoji/google/saxophone.png
index 663c56cd02..60d7d1917a 100644
Binary files a/public/images/emoji/google/saxophone.png and b/public/images/emoji/google/saxophone.png differ
diff --git a/public/images/emoji/google/scales.png b/public/images/emoji/google/scales.png
index b13e29f36c..179fce7257 100644
Binary files a/public/images/emoji/google/scales.png and b/public/images/emoji/google/scales.png differ
diff --git a/public/images/emoji/google/scarf.png b/public/images/emoji/google/scarf.png
index 597ecba8ec..87f561fc75 100644
Binary files a/public/images/emoji/google/scarf.png and b/public/images/emoji/google/scarf.png differ
diff --git a/public/images/emoji/google/school.png b/public/images/emoji/google/school.png
index 7e9102aafb..0f166fd45d 100644
Binary files a/public/images/emoji/google/school.png and b/public/images/emoji/google/school.png differ
diff --git a/public/images/emoji/google/school_satchel.png b/public/images/emoji/google/school_satchel.png
index 8948df417f..72303930de 100644
Binary files a/public/images/emoji/google/school_satchel.png and b/public/images/emoji/google/school_satchel.png differ
diff --git a/public/images/emoji/google/scissors.png b/public/images/emoji/google/scissors.png
index e7e2187f88..10ace8ca7b 100644
Binary files a/public/images/emoji/google/scissors.png and b/public/images/emoji/google/scissors.png differ
diff --git a/public/images/emoji/google/scorpion.png b/public/images/emoji/google/scorpion.png
index 0dbc1a6287..0535591749 100644
Binary files a/public/images/emoji/google/scorpion.png and b/public/images/emoji/google/scorpion.png differ
diff --git a/public/images/emoji/google/scorpius.png b/public/images/emoji/google/scorpius.png
index cf32395936..af75a5b21b 100644
Binary files a/public/images/emoji/google/scorpius.png and b/public/images/emoji/google/scorpius.png differ
diff --git a/public/images/emoji/google/scream.png b/public/images/emoji/google/scream.png
index 33a272b844..48b3623476 100644
Binary files a/public/images/emoji/google/scream.png and b/public/images/emoji/google/scream.png differ
diff --git a/public/images/emoji/google/scream_cat.png b/public/images/emoji/google/scream_cat.png
index 6e99397d58..a4d252e85d 100644
Binary files a/public/images/emoji/google/scream_cat.png and b/public/images/emoji/google/scream_cat.png differ
diff --git a/public/images/emoji/google/scroll.png b/public/images/emoji/google/scroll.png
index 029314138a..94d259b5c9 100644
Binary files a/public/images/emoji/google/scroll.png and b/public/images/emoji/google/scroll.png differ
diff --git a/public/images/emoji/google/seat.png b/public/images/emoji/google/seat.png
index b8af47c1d7..5884684762 100644
Binary files a/public/images/emoji/google/seat.png and b/public/images/emoji/google/seat.png differ
diff --git a/public/images/emoji/google/secret.png b/public/images/emoji/google/secret.png
index b095eae886..624efa4bc6 100644
Binary files a/public/images/emoji/google/secret.png and b/public/images/emoji/google/secret.png differ
diff --git a/public/images/emoji/google/see_no_evil.png b/public/images/emoji/google/see_no_evil.png
index 2a7a930b26..0e2efd450d 100644
Binary files a/public/images/emoji/google/see_no_evil.png and b/public/images/emoji/google/see_no_evil.png differ
diff --git a/public/images/emoji/google/seedling.png b/public/images/emoji/google/seedling.png
index eb787b4d2a..76962e8252 100644
Binary files a/public/images/emoji/google/seedling.png and b/public/images/emoji/google/seedling.png differ
diff --git a/public/images/emoji/google/selfie.png b/public/images/emoji/google/selfie.png
index 05126770ad..d8a2434235 100644
Binary files a/public/images/emoji/google/selfie.png and b/public/images/emoji/google/selfie.png differ
diff --git a/public/images/emoji/google/selfie/2.png b/public/images/emoji/google/selfie/2.png
index 0145a3946d..2480ca2819 100644
Binary files a/public/images/emoji/google/selfie/2.png and b/public/images/emoji/google/selfie/2.png differ
diff --git a/public/images/emoji/google/selfie/3.png b/public/images/emoji/google/selfie/3.png
index 917474197d..2434d11d79 100644
Binary files a/public/images/emoji/google/selfie/3.png and b/public/images/emoji/google/selfie/3.png differ
diff --git a/public/images/emoji/google/selfie/4.png b/public/images/emoji/google/selfie/4.png
index 17a6d18372..b7efd58061 100644
Binary files a/public/images/emoji/google/selfie/4.png and b/public/images/emoji/google/selfie/4.png differ
diff --git a/public/images/emoji/google/selfie/5.png b/public/images/emoji/google/selfie/5.png
index 6f17c4b78f..30c5dac609 100644
Binary files a/public/images/emoji/google/selfie/5.png and b/public/images/emoji/google/selfie/5.png differ
diff --git a/public/images/emoji/google/selfie/6.png b/public/images/emoji/google/selfie/6.png
index 34b10c5b5e..d6f81418c3 100644
Binary files a/public/images/emoji/google/selfie/6.png and b/public/images/emoji/google/selfie/6.png differ
diff --git a/public/images/emoji/google/senegal.png b/public/images/emoji/google/senegal.png
index 4ab925eace..e6421d59ed 100644
Binary files a/public/images/emoji/google/senegal.png and b/public/images/emoji/google/senegal.png differ
diff --git a/public/images/emoji/google/serbia.png b/public/images/emoji/google/serbia.png
index 4207dfd6f8..c7f08aabf6 100644
Binary files a/public/images/emoji/google/serbia.png and b/public/images/emoji/google/serbia.png differ
diff --git a/public/images/emoji/google/seven.png b/public/images/emoji/google/seven.png
index e9ad208000..dc175f1243 100644
Binary files a/public/images/emoji/google/seven.png and b/public/images/emoji/google/seven.png differ
diff --git a/public/images/emoji/google/seychelles.png b/public/images/emoji/google/seychelles.png
index 9d95603b80..1974c8861b 100644
Binary files a/public/images/emoji/google/seychelles.png and b/public/images/emoji/google/seychelles.png differ
diff --git a/public/images/emoji/google/shallow_pan_of_food.png b/public/images/emoji/google/shallow_pan_of_food.png
index aa16e17fb4..b25a76c85d 100644
Binary files a/public/images/emoji/google/shallow_pan_of_food.png and b/public/images/emoji/google/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/google/shamrock.png b/public/images/emoji/google/shamrock.png
index 5e974646fa..e0fb96fcc4 100644
Binary files a/public/images/emoji/google/shamrock.png and b/public/images/emoji/google/shamrock.png differ
diff --git a/public/images/emoji/google/shark.png b/public/images/emoji/google/shark.png
index a8421e1006..7df57eff4c 100644
Binary files a/public/images/emoji/google/shark.png and b/public/images/emoji/google/shark.png differ
diff --git a/public/images/emoji/google/shaved_ice.png b/public/images/emoji/google/shaved_ice.png
index c2c199eed1..c08647fe44 100644
Binary files a/public/images/emoji/google/shaved_ice.png and b/public/images/emoji/google/shaved_ice.png differ
diff --git a/public/images/emoji/google/sheep.png b/public/images/emoji/google/sheep.png
index 5fd7a2952c..62e783dadd 100644
Binary files a/public/images/emoji/google/sheep.png and b/public/images/emoji/google/sheep.png differ
diff --git a/public/images/emoji/google/shell.png b/public/images/emoji/google/shell.png
index 82a821de44..5c3d10c973 100644
Binary files a/public/images/emoji/google/shell.png and b/public/images/emoji/google/shell.png differ
diff --git a/public/images/emoji/google/shield.png b/public/images/emoji/google/shield.png
index 5b4713e208..050fe14fc5 100644
Binary files a/public/images/emoji/google/shield.png and b/public/images/emoji/google/shield.png differ
diff --git a/public/images/emoji/google/shinto_shrine.png b/public/images/emoji/google/shinto_shrine.png
index 38f3472632..a226f5947e 100644
Binary files a/public/images/emoji/google/shinto_shrine.png and b/public/images/emoji/google/shinto_shrine.png differ
diff --git a/public/images/emoji/google/ship.png b/public/images/emoji/google/ship.png
index 6e6e94527b..82a74d1180 100644
Binary files a/public/images/emoji/google/ship.png and b/public/images/emoji/google/ship.png differ
diff --git a/public/images/emoji/google/shirt.png b/public/images/emoji/google/shirt.png
index ef0745cb18..d93268cc4e 100644
Binary files a/public/images/emoji/google/shirt.png and b/public/images/emoji/google/shirt.png differ
diff --git a/public/images/emoji/google/shit.png b/public/images/emoji/google/shit.png
index b1d921d96c..de476df01c 100644
Binary files a/public/images/emoji/google/shit.png and b/public/images/emoji/google/shit.png differ
diff --git a/public/images/emoji/google/shopping.png b/public/images/emoji/google/shopping.png
index ddc2cb7651..4d0d5bfe2b 100644
Binary files a/public/images/emoji/google/shopping.png and b/public/images/emoji/google/shopping.png differ
diff --git a/public/images/emoji/google/shopping_bags.png b/public/images/emoji/google/shopping_bags.png
index ddc2cb7651..4d0d5bfe2b 100644
Binary files a/public/images/emoji/google/shopping_bags.png and b/public/images/emoji/google/shopping_bags.png differ
diff --git a/public/images/emoji/google/shopping_cart.png b/public/images/emoji/google/shopping_cart.png
index 81e394561b..37fdb5ac23 100644
Binary files a/public/images/emoji/google/shopping_cart.png and b/public/images/emoji/google/shopping_cart.png differ
diff --git a/public/images/emoji/google/shower.png b/public/images/emoji/google/shower.png
index 19a13378a8..5036bfeb13 100644
Binary files a/public/images/emoji/google/shower.png and b/public/images/emoji/google/shower.png differ
diff --git a/public/images/emoji/google/shrimp.png b/public/images/emoji/google/shrimp.png
index 7d78c74866..9f20fcf1d7 100644
Binary files a/public/images/emoji/google/shrimp.png and b/public/images/emoji/google/shrimp.png differ
diff --git a/public/images/emoji/google/shushing_face.png b/public/images/emoji/google/shushing_face.png
new file mode 100644
index 0000000000..80a058d518
Binary files /dev/null and b/public/images/emoji/google/shushing_face.png differ
diff --git a/public/images/emoji/google/sierra_leone.png b/public/images/emoji/google/sierra_leone.png
index 1718e66602..309f4e3387 100644
Binary files a/public/images/emoji/google/sierra_leone.png and b/public/images/emoji/google/sierra_leone.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns.png b/public/images/emoji/google/sign_of_the_horns.png
index eeac747c65..8d868d12d5 100644
Binary files a/public/images/emoji/google/sign_of_the_horns.png and b/public/images/emoji/google/sign_of_the_horns.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/2.png b/public/images/emoji/google/sign_of_the_horns/2.png
index 614947ba81..310f52dfac 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/2.png and b/public/images/emoji/google/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/3.png b/public/images/emoji/google/sign_of_the_horns/3.png
index 2f9891b480..74809c0946 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/3.png and b/public/images/emoji/google/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/4.png b/public/images/emoji/google/sign_of_the_horns/4.png
index 44e8fc124c..11bf6e93c3 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/4.png and b/public/images/emoji/google/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/5.png b/public/images/emoji/google/sign_of_the_horns/5.png
index 7016d1f0f8..767f7543d0 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/5.png and b/public/images/emoji/google/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/6.png b/public/images/emoji/google/sign_of_the_horns/6.png
index 3921690250..f336dca800 100644
Binary files a/public/images/emoji/google/sign_of_the_horns/6.png and b/public/images/emoji/google/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/google/signal_strength.png b/public/images/emoji/google/signal_strength.png
index d0c76c4b5c..80c8853889 100644
Binary files a/public/images/emoji/google/signal_strength.png and b/public/images/emoji/google/signal_strength.png differ
diff --git a/public/images/emoji/google/singapore.png b/public/images/emoji/google/singapore.png
index 170347d34d..184f6b243d 100644
Binary files a/public/images/emoji/google/singapore.png and b/public/images/emoji/google/singapore.png differ
diff --git a/public/images/emoji/google/sint_maarten.png b/public/images/emoji/google/sint_maarten.png
index b43ec36212..a7e338f025 100644
Binary files a/public/images/emoji/google/sint_maarten.png and b/public/images/emoji/google/sint_maarten.png differ
diff --git a/public/images/emoji/google/six.png b/public/images/emoji/google/six.png
index 5972360e7f..a88e7401fb 100644
Binary files a/public/images/emoji/google/six.png and b/public/images/emoji/google/six.png differ
diff --git a/public/images/emoji/google/six_pointed_star.png b/public/images/emoji/google/six_pointed_star.png
index 23d2ecd1c4..83f018d0e4 100644
Binary files a/public/images/emoji/google/six_pointed_star.png and b/public/images/emoji/google/six_pointed_star.png differ
diff --git a/public/images/emoji/google/skeleton.png b/public/images/emoji/google/skeleton.png
index 614ae5c849..569ca61771 100644
Binary files a/public/images/emoji/google/skeleton.png and b/public/images/emoji/google/skeleton.png differ
diff --git a/public/images/emoji/google/ski.png b/public/images/emoji/google/ski.png
index 270878a24f..7791a0ff97 100644
Binary files a/public/images/emoji/google/ski.png and b/public/images/emoji/google/ski.png differ
diff --git a/public/images/emoji/google/skier.png b/public/images/emoji/google/skier.png
index f33dfdfce8..ff1e017863 100644
Binary files a/public/images/emoji/google/skier.png and b/public/images/emoji/google/skier.png differ
diff --git a/public/images/emoji/google/skull.png b/public/images/emoji/google/skull.png
index 614ae5c849..569ca61771 100644
Binary files a/public/images/emoji/google/skull.png and b/public/images/emoji/google/skull.png differ
diff --git a/public/images/emoji/google/skull_and_crossbones.png b/public/images/emoji/google/skull_and_crossbones.png
index 2a3b044107..4a4dccb02f 100644
Binary files a/public/images/emoji/google/skull_and_crossbones.png and b/public/images/emoji/google/skull_and_crossbones.png differ
diff --git a/public/images/emoji/google/skull_crossbones.png b/public/images/emoji/google/skull_crossbones.png
index 2a3b044107..4a4dccb02f 100644
Binary files a/public/images/emoji/google/skull_crossbones.png and b/public/images/emoji/google/skull_crossbones.png differ
diff --git a/public/images/emoji/google/sled.png b/public/images/emoji/google/sled.png
index 872e5c23d6..60a1a502e9 100644
Binary files a/public/images/emoji/google/sled.png and b/public/images/emoji/google/sled.png differ
diff --git a/public/images/emoji/google/sleeping.png b/public/images/emoji/google/sleeping.png
index 2a3f2bd084..2a5ff936b9 100644
Binary files a/public/images/emoji/google/sleeping.png and b/public/images/emoji/google/sleeping.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation.png b/public/images/emoji/google/sleeping_accommodation.png
index 90e49164e5..be40bf9c43 100644
Binary files a/public/images/emoji/google/sleeping_accommodation.png and b/public/images/emoji/google/sleeping_accommodation.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/2.png b/public/images/emoji/google/sleeping_accommodation/2.png
index 39216918ee..2c55362aca 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/2.png and b/public/images/emoji/google/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/3.png b/public/images/emoji/google/sleeping_accommodation/3.png
index bdbecbff6d..dc2951d80b 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/3.png and b/public/images/emoji/google/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/4.png b/public/images/emoji/google/sleeping_accommodation/4.png
index 8ce4902bcd..0e1ee293ea 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/4.png and b/public/images/emoji/google/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/5.png b/public/images/emoji/google/sleeping_accommodation/5.png
index 76b824d5d9..0d409a54a8 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/5.png and b/public/images/emoji/google/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/6.png b/public/images/emoji/google/sleeping_accommodation/6.png
index 05f754a6a6..eb39d438bd 100644
Binary files a/public/images/emoji/google/sleeping_accommodation/6.png and b/public/images/emoji/google/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/google/sleeping_bed.png b/public/images/emoji/google/sleeping_bed.png
index 90e49164e5..be40bf9c43 100644
Binary files a/public/images/emoji/google/sleeping_bed.png and b/public/images/emoji/google/sleeping_bed.png differ
diff --git a/public/images/emoji/google/sleeping_bed/2.png b/public/images/emoji/google/sleeping_bed/2.png
index 39216918ee..2c55362aca 100644
Binary files a/public/images/emoji/google/sleeping_bed/2.png and b/public/images/emoji/google/sleeping_bed/2.png differ
diff --git a/public/images/emoji/google/sleeping_bed/3.png b/public/images/emoji/google/sleeping_bed/3.png
index bdbecbff6d..dc2951d80b 100644
Binary files a/public/images/emoji/google/sleeping_bed/3.png and b/public/images/emoji/google/sleeping_bed/3.png differ
diff --git a/public/images/emoji/google/sleeping_bed/4.png b/public/images/emoji/google/sleeping_bed/4.png
index 8ce4902bcd..0e1ee293ea 100644
Binary files a/public/images/emoji/google/sleeping_bed/4.png and b/public/images/emoji/google/sleeping_bed/4.png differ
diff --git a/public/images/emoji/google/sleeping_bed/5.png b/public/images/emoji/google/sleeping_bed/5.png
index 76b824d5d9..0d409a54a8 100644
Binary files a/public/images/emoji/google/sleeping_bed/5.png and b/public/images/emoji/google/sleeping_bed/5.png differ
diff --git a/public/images/emoji/google/sleeping_bed/6.png b/public/images/emoji/google/sleeping_bed/6.png
index 05f754a6a6..eb39d438bd 100644
Binary files a/public/images/emoji/google/sleeping_bed/6.png and b/public/images/emoji/google/sleeping_bed/6.png differ
diff --git a/public/images/emoji/google/sleepy.png b/public/images/emoji/google/sleepy.png
index 7a53d54234..0c8a806699 100644
Binary files a/public/images/emoji/google/sleepy.png and b/public/images/emoji/google/sleepy.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy.png b/public/images/emoji/google/sleuth_or_spy.png
index 13ef63b0aa..cee46f4861 100644
Binary files a/public/images/emoji/google/sleuth_or_spy.png and b/public/images/emoji/google/sleuth_or_spy.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/2.png b/public/images/emoji/google/sleuth_or_spy/2.png
index 130424ff53..2bc4718252 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/2.png and b/public/images/emoji/google/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/3.png b/public/images/emoji/google/sleuth_or_spy/3.png
index 6fb56a789c..a867a4d30e 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/3.png and b/public/images/emoji/google/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/4.png b/public/images/emoji/google/sleuth_or_spy/4.png
index c021157981..2a1935a30c 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/4.png and b/public/images/emoji/google/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/5.png b/public/images/emoji/google/sleuth_or_spy/5.png
index fcd3411232..f261d8dc3b 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/5.png and b/public/images/emoji/google/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/6.png b/public/images/emoji/google/sleuth_or_spy/6.png
index e4b939c908..ffa90c5392 100644
Binary files a/public/images/emoji/google/sleuth_or_spy/6.png and b/public/images/emoji/google/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/google/slight_frown.png b/public/images/emoji/google/slight_frown.png
index abe8592d67..5cf676c797 100644
Binary files a/public/images/emoji/google/slight_frown.png and b/public/images/emoji/google/slight_frown.png differ
diff --git a/public/images/emoji/google/slight_smile.png b/public/images/emoji/google/slight_smile.png
index dc605beeb3..7689ff0d4f 100644
Binary files a/public/images/emoji/google/slight_smile.png and b/public/images/emoji/google/slight_smile.png differ
diff --git a/public/images/emoji/google/slightly_frowning_face.png b/public/images/emoji/google/slightly_frowning_face.png
index abe8592d67..5cf676c797 100644
Binary files a/public/images/emoji/google/slightly_frowning_face.png and b/public/images/emoji/google/slightly_frowning_face.png differ
diff --git a/public/images/emoji/google/slightly_smiling.png b/public/images/emoji/google/slightly_smiling.png
index dc605beeb3..7689ff0d4f 100644
Binary files a/public/images/emoji/google/slightly_smiling.png and b/public/images/emoji/google/slightly_smiling.png differ
diff --git a/public/images/emoji/google/slightly_smiling_face.png b/public/images/emoji/google/slightly_smiling_face.png
index dc605beeb3..7689ff0d4f 100644
Binary files a/public/images/emoji/google/slightly_smiling_face.png and b/public/images/emoji/google/slightly_smiling_face.png differ
diff --git a/public/images/emoji/google/slot_machine.png b/public/images/emoji/google/slot_machine.png
index 59ce7cde1d..bb8f1a9ab7 100644
Binary files a/public/images/emoji/google/slot_machine.png and b/public/images/emoji/google/slot_machine.png differ
diff --git a/public/images/emoji/google/slovakia.png b/public/images/emoji/google/slovakia.png
index 1fc1c9392c..ee2249e809 100644
Binary files a/public/images/emoji/google/slovakia.png and b/public/images/emoji/google/slovakia.png differ
diff --git a/public/images/emoji/google/slovenia.png b/public/images/emoji/google/slovenia.png
index d21d260ac2..3972876b0a 100644
Binary files a/public/images/emoji/google/slovenia.png and b/public/images/emoji/google/slovenia.png differ
diff --git a/public/images/emoji/google/small_airplane.png b/public/images/emoji/google/small_airplane.png
index 5342466c30..1a44e4a7d1 100644
Binary files a/public/images/emoji/google/small_airplane.png and b/public/images/emoji/google/small_airplane.png differ
diff --git a/public/images/emoji/google/small_blue_diamond.png b/public/images/emoji/google/small_blue_diamond.png
index 4dc56355d0..40e9b333b6 100644
Binary files a/public/images/emoji/google/small_blue_diamond.png and b/public/images/emoji/google/small_blue_diamond.png differ
diff --git a/public/images/emoji/google/small_orange_diamond.png b/public/images/emoji/google/small_orange_diamond.png
index 4c2603b3a9..1e46d414ba 100644
Binary files a/public/images/emoji/google/small_orange_diamond.png and b/public/images/emoji/google/small_orange_diamond.png differ
diff --git a/public/images/emoji/google/small_red_triangle.png b/public/images/emoji/google/small_red_triangle.png
index 0e045262de..e9ed94ddce 100644
Binary files a/public/images/emoji/google/small_red_triangle.png and b/public/images/emoji/google/small_red_triangle.png differ
diff --git a/public/images/emoji/google/small_red_triangle_down.png b/public/images/emoji/google/small_red_triangle_down.png
index 222ca47a56..e1265da028 100644
Binary files a/public/images/emoji/google/small_red_triangle_down.png and b/public/images/emoji/google/small_red_triangle_down.png differ
diff --git a/public/images/emoji/google/smile.png b/public/images/emoji/google/smile.png
index c3bfe595c5..6a936c2137 100644
Binary files a/public/images/emoji/google/smile.png and b/public/images/emoji/google/smile.png differ
diff --git a/public/images/emoji/google/smile_cat.png b/public/images/emoji/google/smile_cat.png
index bfb387136c..5fb633152c 100644
Binary files a/public/images/emoji/google/smile_cat.png and b/public/images/emoji/google/smile_cat.png differ
diff --git a/public/images/emoji/google/smiley.png b/public/images/emoji/google/smiley.png
index 9ebae5eed0..eed981022c 100644
Binary files a/public/images/emoji/google/smiley.png and b/public/images/emoji/google/smiley.png differ
diff --git a/public/images/emoji/google/smiley_cat.png b/public/images/emoji/google/smiley_cat.png
index a50aed5443..ad018ba4a4 100644
Binary files a/public/images/emoji/google/smiley_cat.png and b/public/images/emoji/google/smiley_cat.png differ
diff --git a/public/images/emoji/google/smiling_imp.png b/public/images/emoji/google/smiling_imp.png
index 3790fe743b..f5b64b98d0 100644
Binary files a/public/images/emoji/google/smiling_imp.png and b/public/images/emoji/google/smiling_imp.png differ
diff --git a/public/images/emoji/google/smirk.png b/public/images/emoji/google/smirk.png
index 80900d2126..61c0475431 100644
Binary files a/public/images/emoji/google/smirk.png and b/public/images/emoji/google/smirk.png differ
diff --git a/public/images/emoji/google/smirk_cat.png b/public/images/emoji/google/smirk_cat.png
index 73c3b5e5bb..c3b8c295f4 100644
Binary files a/public/images/emoji/google/smirk_cat.png and b/public/images/emoji/google/smirk_cat.png differ
diff --git a/public/images/emoji/google/smoking.png b/public/images/emoji/google/smoking.png
index 7d424c18d7..d91ab4e697 100644
Binary files a/public/images/emoji/google/smoking.png and b/public/images/emoji/google/smoking.png differ
diff --git a/public/images/emoji/google/snail.png b/public/images/emoji/google/snail.png
index b160cdc2c9..bb4fa4ebe5 100644
Binary files a/public/images/emoji/google/snail.png and b/public/images/emoji/google/snail.png differ
diff --git a/public/images/emoji/google/snake.png b/public/images/emoji/google/snake.png
index 5904faf339..e17372a161 100644
Binary files a/public/images/emoji/google/snake.png and b/public/images/emoji/google/snake.png differ
diff --git a/public/images/emoji/google/sneezing_face.png b/public/images/emoji/google/sneezing_face.png
index 39fc4ecb4d..b14d1a3ec7 100644
Binary files a/public/images/emoji/google/sneezing_face.png and b/public/images/emoji/google/sneezing_face.png differ
diff --git a/public/images/emoji/google/snow_capped_mountain.png b/public/images/emoji/google/snow_capped_mountain.png
index f7ab7c2c74..394c96bb61 100644
Binary files a/public/images/emoji/google/snow_capped_mountain.png and b/public/images/emoji/google/snow_capped_mountain.png differ
diff --git a/public/images/emoji/google/snowboarder.png b/public/images/emoji/google/snowboarder.png
index 3d66a4cc84..31d43ca744 100644
Binary files a/public/images/emoji/google/snowboarder.png and b/public/images/emoji/google/snowboarder.png differ
diff --git a/public/images/emoji/google/snowboarder/2.png b/public/images/emoji/google/snowboarder/2.png
index 6e5f70db4f..5e8784446f 100644
Binary files a/public/images/emoji/google/snowboarder/2.png and b/public/images/emoji/google/snowboarder/2.png differ
diff --git a/public/images/emoji/google/snowboarder/3.png b/public/images/emoji/google/snowboarder/3.png
index a295d3ea8e..396579f0e1 100644
Binary files a/public/images/emoji/google/snowboarder/3.png and b/public/images/emoji/google/snowboarder/3.png differ
diff --git a/public/images/emoji/google/snowboarder/4.png b/public/images/emoji/google/snowboarder/4.png
index d7c1c0f881..584f8bf933 100644
Binary files a/public/images/emoji/google/snowboarder/4.png and b/public/images/emoji/google/snowboarder/4.png differ
diff --git a/public/images/emoji/google/snowboarder/5.png b/public/images/emoji/google/snowboarder/5.png
index 682c1a1c26..3908864ebd 100644
Binary files a/public/images/emoji/google/snowboarder/5.png and b/public/images/emoji/google/snowboarder/5.png differ
diff --git a/public/images/emoji/google/snowboarder/6.png b/public/images/emoji/google/snowboarder/6.png
index 1f676454cd..6879b0e424 100644
Binary files a/public/images/emoji/google/snowboarder/6.png and b/public/images/emoji/google/snowboarder/6.png differ
diff --git a/public/images/emoji/google/snowflake.png b/public/images/emoji/google/snowflake.png
index 3fe9831aca..1b1101c81c 100644
Binary files a/public/images/emoji/google/snowflake.png and b/public/images/emoji/google/snowflake.png differ
diff --git a/public/images/emoji/google/snowman.png b/public/images/emoji/google/snowman.png
index 881f87d60d..b619f10252 100644
Binary files a/public/images/emoji/google/snowman.png and b/public/images/emoji/google/snowman.png differ
diff --git a/public/images/emoji/google/snowman2.png b/public/images/emoji/google/snowman2.png
index 9388e9d4bf..a013b61937 100644
Binary files a/public/images/emoji/google/snowman2.png and b/public/images/emoji/google/snowman2.png differ
diff --git a/public/images/emoji/google/snowman_with_snow.png b/public/images/emoji/google/snowman_with_snow.png
index 9388e9d4bf..a013b61937 100644
Binary files a/public/images/emoji/google/snowman_with_snow.png and b/public/images/emoji/google/snowman_with_snow.png differ
diff --git a/public/images/emoji/google/sob.png b/public/images/emoji/google/sob.png
index 060ac2ddbf..9de97eb13f 100644
Binary files a/public/images/emoji/google/sob.png and b/public/images/emoji/google/sob.png differ
diff --git a/public/images/emoji/google/soccer.png b/public/images/emoji/google/soccer.png
index 0c13f98e34..60f7c6c99a 100644
Binary files a/public/images/emoji/google/soccer.png and b/public/images/emoji/google/soccer.png differ
diff --git a/public/images/emoji/google/socks.png b/public/images/emoji/google/socks.png
index eb275ca49c..6916b59ea5 100644
Binary files a/public/images/emoji/google/socks.png and b/public/images/emoji/google/socks.png differ
diff --git a/public/images/emoji/google/solomon_islands.png b/public/images/emoji/google/solomon_islands.png
index bbdc2f6102..72e3631644 100644
Binary files a/public/images/emoji/google/solomon_islands.png and b/public/images/emoji/google/solomon_islands.png differ
diff --git a/public/images/emoji/google/somalia.png b/public/images/emoji/google/somalia.png
index 0f51db4c94..9e24767dde 100644
Binary files a/public/images/emoji/google/somalia.png and b/public/images/emoji/google/somalia.png differ
diff --git a/public/images/emoji/google/soon.png b/public/images/emoji/google/soon.png
index a04a1d9f71..4c4a7befe3 100644
Binary files a/public/images/emoji/google/soon.png and b/public/images/emoji/google/soon.png differ
diff --git a/public/images/emoji/google/sos.png b/public/images/emoji/google/sos.png
index 62637e71c3..87ec93daa9 100644
Binary files a/public/images/emoji/google/sos.png and b/public/images/emoji/google/sos.png differ
diff --git a/public/images/emoji/google/sound.png b/public/images/emoji/google/sound.png
index dfef71bfd0..fd28f9552c 100644
Binary files a/public/images/emoji/google/sound.png and b/public/images/emoji/google/sound.png differ
diff --git a/public/images/emoji/google/south_africa.png b/public/images/emoji/google/south_africa.png
index 802bd272f7..4651afef50 100644
Binary files a/public/images/emoji/google/south_africa.png and b/public/images/emoji/google/south_africa.png differ
diff --git a/public/images/emoji/google/south_georgia_south_sandwich_islands.png b/public/images/emoji/google/south_georgia_south_sandwich_islands.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/south_georgia_south_sandwich_islands.png and b/public/images/emoji/google/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/google/south_sudan.png b/public/images/emoji/google/south_sudan.png
index f26d9bdc6e..2b5eec6f83 100644
Binary files a/public/images/emoji/google/south_sudan.png and b/public/images/emoji/google/south_sudan.png differ
diff --git a/public/images/emoji/google/space_invader.png b/public/images/emoji/google/space_invader.png
index 5488ca700c..bb7ab9d328 100644
Binary files a/public/images/emoji/google/space_invader.png and b/public/images/emoji/google/space_invader.png differ
diff --git a/public/images/emoji/google/spades.png b/public/images/emoji/google/spades.png
index 8e3ca45c39..c431765c1b 100644
Binary files a/public/images/emoji/google/spades.png and b/public/images/emoji/google/spades.png differ
diff --git a/public/images/emoji/google/spaghetti.png b/public/images/emoji/google/spaghetti.png
index e3e5079fa5..8ac16a61e6 100644
Binary files a/public/images/emoji/google/spaghetti.png and b/public/images/emoji/google/spaghetti.png differ
diff --git a/public/images/emoji/google/sparkle.png b/public/images/emoji/google/sparkle.png
index ca4a4d9d32..1cd76f241c 100644
Binary files a/public/images/emoji/google/sparkle.png and b/public/images/emoji/google/sparkle.png differ
diff --git a/public/images/emoji/google/sparkler.png b/public/images/emoji/google/sparkler.png
index d86bc80ac6..5d6b45741f 100644
Binary files a/public/images/emoji/google/sparkler.png and b/public/images/emoji/google/sparkler.png differ
diff --git a/public/images/emoji/google/sparkles.png b/public/images/emoji/google/sparkles.png
index 0240f1ff54..f24a561af9 100644
Binary files a/public/images/emoji/google/sparkles.png and b/public/images/emoji/google/sparkles.png differ
diff --git a/public/images/emoji/google/sparkling_heart.png b/public/images/emoji/google/sparkling_heart.png
index 202e7b2187..b8fa996c0f 100644
Binary files a/public/images/emoji/google/sparkling_heart.png and b/public/images/emoji/google/sparkling_heart.png differ
diff --git a/public/images/emoji/google/speak_no_evil.png b/public/images/emoji/google/speak_no_evil.png
index 9cbc9b1002..b693b6d5d6 100644
Binary files a/public/images/emoji/google/speak_no_evil.png and b/public/images/emoji/google/speak_no_evil.png differ
diff --git a/public/images/emoji/google/speaker.png b/public/images/emoji/google/speaker.png
index 100295eec9..717ac0b814 100644
Binary files a/public/images/emoji/google/speaker.png and b/public/images/emoji/google/speaker.png differ
diff --git a/public/images/emoji/google/speaking_head.png b/public/images/emoji/google/speaking_head.png
index 62fb598f38..e59ef7c3d6 100644
Binary files a/public/images/emoji/google/speaking_head.png and b/public/images/emoji/google/speaking_head.png differ
diff --git a/public/images/emoji/google/speaking_head_in_silhouette.png b/public/images/emoji/google/speaking_head_in_silhouette.png
index 62fb598f38..e59ef7c3d6 100644
Binary files a/public/images/emoji/google/speaking_head_in_silhouette.png and b/public/images/emoji/google/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/google/speech_balloon.png b/public/images/emoji/google/speech_balloon.png
index 4039574402..aa4c10145a 100644
Binary files a/public/images/emoji/google/speech_balloon.png and b/public/images/emoji/google/speech_balloon.png differ
diff --git a/public/images/emoji/google/speedboat.png b/public/images/emoji/google/speedboat.png
index 4f7a4e3dbe..9141b21d1b 100644
Binary files a/public/images/emoji/google/speedboat.png and b/public/images/emoji/google/speedboat.png differ
diff --git a/public/images/emoji/google/spider.png b/public/images/emoji/google/spider.png
index 18018efcb4..dda421e407 100644
Binary files a/public/images/emoji/google/spider.png and b/public/images/emoji/google/spider.png differ
diff --git a/public/images/emoji/google/spider_web.png b/public/images/emoji/google/spider_web.png
index 97a6010501..ee898cd60e 100644
Binary files a/public/images/emoji/google/spider_web.png and b/public/images/emoji/google/spider_web.png differ
diff --git a/public/images/emoji/google/spiral_calendar.png b/public/images/emoji/google/spiral_calendar.png
index 0997b42f0c..8c19dc8104 100644
Binary files a/public/images/emoji/google/spiral_calendar.png and b/public/images/emoji/google/spiral_calendar.png differ
diff --git a/public/images/emoji/google/spiral_calendar_pad.png b/public/images/emoji/google/spiral_calendar_pad.png
index 0997b42f0c..8c19dc8104 100644
Binary files a/public/images/emoji/google/spiral_calendar_pad.png and b/public/images/emoji/google/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/google/spiral_note_pad.png b/public/images/emoji/google/spiral_note_pad.png
index ff382324e5..72e515dc60 100644
Binary files a/public/images/emoji/google/spiral_note_pad.png and b/public/images/emoji/google/spiral_note_pad.png differ
diff --git a/public/images/emoji/google/spiral_notepad.png b/public/images/emoji/google/spiral_notepad.png
index ff382324e5..72e515dc60 100644
Binary files a/public/images/emoji/google/spiral_notepad.png and b/public/images/emoji/google/spiral_notepad.png differ
diff --git a/public/images/emoji/google/spoon.png b/public/images/emoji/google/spoon.png
index 583fa80861..2cb2c2fb31 100644
Binary files a/public/images/emoji/google/spoon.png and b/public/images/emoji/google/spoon.png differ
diff --git a/public/images/emoji/google/sports_medal.png b/public/images/emoji/google/sports_medal.png
index 3d321d89ed..2ff8d191cb 100644
Binary files a/public/images/emoji/google/sports_medal.png and b/public/images/emoji/google/sports_medal.png differ
diff --git a/public/images/emoji/google/spy.png b/public/images/emoji/google/spy.png
index 13ef63b0aa..cee46f4861 100644
Binary files a/public/images/emoji/google/spy.png and b/public/images/emoji/google/spy.png differ
diff --git a/public/images/emoji/google/spy/2.png b/public/images/emoji/google/spy/2.png
index 130424ff53..2bc4718252 100644
Binary files a/public/images/emoji/google/spy/2.png and b/public/images/emoji/google/spy/2.png differ
diff --git a/public/images/emoji/google/spy/3.png b/public/images/emoji/google/spy/3.png
index 6fb56a789c..a867a4d30e 100644
Binary files a/public/images/emoji/google/spy/3.png and b/public/images/emoji/google/spy/3.png differ
diff --git a/public/images/emoji/google/spy/4.png b/public/images/emoji/google/spy/4.png
index c021157981..2a1935a30c 100644
Binary files a/public/images/emoji/google/spy/4.png and b/public/images/emoji/google/spy/4.png differ
diff --git a/public/images/emoji/google/spy/5.png b/public/images/emoji/google/spy/5.png
index fcd3411232..f261d8dc3b 100644
Binary files a/public/images/emoji/google/spy/5.png and b/public/images/emoji/google/spy/5.png differ
diff --git a/public/images/emoji/google/spy/6.png b/public/images/emoji/google/spy/6.png
index e4b939c908..ffa90c5392 100644
Binary files a/public/images/emoji/google/spy/6.png and b/public/images/emoji/google/spy/6.png differ
diff --git a/public/images/emoji/google/squid.png b/public/images/emoji/google/squid.png
index 2c80acaa68..62b19a17eb 100644
Binary files a/public/images/emoji/google/squid.png and b/public/images/emoji/google/squid.png differ
diff --git a/public/images/emoji/google/sri_lanka.png b/public/images/emoji/google/sri_lanka.png
index fbbb925b80..9ebcd7343f 100644
Binary files a/public/images/emoji/google/sri_lanka.png and b/public/images/emoji/google/sri_lanka.png differ
diff --git a/public/images/emoji/google/st_barthelemy.png b/public/images/emoji/google/st_barthelemy.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/st_barthelemy.png and b/public/images/emoji/google/st_barthelemy.png differ
diff --git a/public/images/emoji/google/st_helena.png b/public/images/emoji/google/st_helena.png
index de4db59398..1826670769 100644
Binary files a/public/images/emoji/google/st_helena.png and b/public/images/emoji/google/st_helena.png differ
diff --git a/public/images/emoji/google/st_kitts_nevis.png b/public/images/emoji/google/st_kitts_nevis.png
index ae2720530e..0fa2a78ac5 100644
Binary files a/public/images/emoji/google/st_kitts_nevis.png and b/public/images/emoji/google/st_kitts_nevis.png differ
diff --git a/public/images/emoji/google/st_lucia.png b/public/images/emoji/google/st_lucia.png
index ba2a134ef0..d1620548fb 100644
Binary files a/public/images/emoji/google/st_lucia.png and b/public/images/emoji/google/st_lucia.png differ
diff --git a/public/images/emoji/google/st_martin.png b/public/images/emoji/google/st_martin.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/st_martin.png and b/public/images/emoji/google/st_martin.png differ
diff --git a/public/images/emoji/google/st_pierre_miquelon.png b/public/images/emoji/google/st_pierre_miquelon.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/st_pierre_miquelon.png and b/public/images/emoji/google/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/google/st_vincent_grenadines.png b/public/images/emoji/google/st_vincent_grenadines.png
index d2a9b7fad7..df27c5e9be 100644
Binary files a/public/images/emoji/google/st_vincent_grenadines.png and b/public/images/emoji/google/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/google/stadium.png b/public/images/emoji/google/stadium.png
index b69d81ebaa..67c816ed4a 100644
Binary files a/public/images/emoji/google/stadium.png and b/public/images/emoji/google/stadium.png differ
diff --git a/public/images/emoji/google/star.png b/public/images/emoji/google/star.png
index 363ff89274..9005baa0f2 100644
Binary files a/public/images/emoji/google/star.png and b/public/images/emoji/google/star.png differ
diff --git a/public/images/emoji/google/star2.png b/public/images/emoji/google/star2.png
index 7253e078cf..926f65170a 100644
Binary files a/public/images/emoji/google/star2.png and b/public/images/emoji/google/star2.png differ
diff --git a/public/images/emoji/google/star_and_crescent.png b/public/images/emoji/google/star_and_crescent.png
index 273c92af0e..978b71111a 100644
Binary files a/public/images/emoji/google/star_and_crescent.png and b/public/images/emoji/google/star_and_crescent.png differ
diff --git a/public/images/emoji/google/star_of_david.png b/public/images/emoji/google/star_of_david.png
index 688528fa84..5b2e88e995 100644
Binary files a/public/images/emoji/google/star_of_david.png and b/public/images/emoji/google/star_of_david.png differ
diff --git a/public/images/emoji/google/star_struck.png b/public/images/emoji/google/star_struck.png
index e7b8b6f9a8..9cc6aebfbb 100644
Binary files a/public/images/emoji/google/star_struck.png and b/public/images/emoji/google/star_struck.png differ
diff --git a/public/images/emoji/google/stars.png b/public/images/emoji/google/stars.png
index 7a7afc7d89..9e996a147b 100644
Binary files a/public/images/emoji/google/stars.png and b/public/images/emoji/google/stars.png differ
diff --git a/public/images/emoji/google/station.png b/public/images/emoji/google/station.png
index 47f4ba93fa..75759512a7 100644
Binary files a/public/images/emoji/google/station.png and b/public/images/emoji/google/station.png differ
diff --git a/public/images/emoji/google/statue_of_liberty.png b/public/images/emoji/google/statue_of_liberty.png
index fd78f0e131..b7322ad3b0 100644
Binary files a/public/images/emoji/google/statue_of_liberty.png and b/public/images/emoji/google/statue_of_liberty.png differ
diff --git a/public/images/emoji/google/steam_locomotive.png b/public/images/emoji/google/steam_locomotive.png
index 8691eafbb6..0367f96b6a 100644
Binary files a/public/images/emoji/google/steam_locomotive.png and b/public/images/emoji/google/steam_locomotive.png differ
diff --git a/public/images/emoji/google/stew.png b/public/images/emoji/google/stew.png
index 84304bfcc6..8dbd3a9c58 100644
Binary files a/public/images/emoji/google/stew.png and b/public/images/emoji/google/stew.png differ
diff --git a/public/images/emoji/google/stop_button.png b/public/images/emoji/google/stop_button.png
index 791b42fa2f..26b01fc233 100644
Binary files a/public/images/emoji/google/stop_button.png and b/public/images/emoji/google/stop_button.png differ
diff --git a/public/images/emoji/google/stop_sign.png b/public/images/emoji/google/stop_sign.png
index c84adb179f..4e310d0abf 100644
Binary files a/public/images/emoji/google/stop_sign.png and b/public/images/emoji/google/stop_sign.png differ
diff --git a/public/images/emoji/google/stopwatch.png b/public/images/emoji/google/stopwatch.png
index c061a24e3e..beca228159 100644
Binary files a/public/images/emoji/google/stopwatch.png and b/public/images/emoji/google/stopwatch.png differ
diff --git a/public/images/emoji/google/straight_ruler.png b/public/images/emoji/google/straight_ruler.png
index 59fbedc93d..5c04bdb434 100644
Binary files a/public/images/emoji/google/straight_ruler.png and b/public/images/emoji/google/straight_ruler.png differ
diff --git a/public/images/emoji/google/strawberry.png b/public/images/emoji/google/strawberry.png
index 4e683c1280..31be9c8730 100644
Binary files a/public/images/emoji/google/strawberry.png and b/public/images/emoji/google/strawberry.png differ
diff --git a/public/images/emoji/google/stuck_out_tongue.png b/public/images/emoji/google/stuck_out_tongue.png
index 2d2367ebcf..c5d4dd1824 100644
Binary files a/public/images/emoji/google/stuck_out_tongue.png and b/public/images/emoji/google/stuck_out_tongue.png differ
diff --git a/public/images/emoji/google/stuck_out_tongue_closed_eyes.png b/public/images/emoji/google/stuck_out_tongue_closed_eyes.png
index 4d6aee5361..262d610b21 100644
Binary files a/public/images/emoji/google/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/google/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/google/stuck_out_tongue_winking_eye.png b/public/images/emoji/google/stuck_out_tongue_winking_eye.png
index 579284e7a2..81693a1e81 100644
Binary files a/public/images/emoji/google/stuck_out_tongue_winking_eye.png and b/public/images/emoji/google/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/google/studio_microphone.png b/public/images/emoji/google/studio_microphone.png
index 9394168839..070e657d8c 100644
Binary files a/public/images/emoji/google/studio_microphone.png and b/public/images/emoji/google/studio_microphone.png differ
diff --git a/public/images/emoji/google/stuffed_flatbread.png b/public/images/emoji/google/stuffed_flatbread.png
index ac839e32ca..e4e0713a28 100644
Binary files a/public/images/emoji/google/stuffed_flatbread.png and b/public/images/emoji/google/stuffed_flatbread.png differ
diff --git a/public/images/emoji/google/sudan.png b/public/images/emoji/google/sudan.png
index aaae2ea590..d159d9b693 100644
Binary files a/public/images/emoji/google/sudan.png and b/public/images/emoji/google/sudan.png differ
diff --git a/public/images/emoji/google/sun_behind_large_cloud.png b/public/images/emoji/google/sun_behind_large_cloud.png
index e3a78dca90..2adf6fc83e 100644
Binary files a/public/images/emoji/google/sun_behind_large_cloud.png and b/public/images/emoji/google/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/google/sun_behind_rain_cloud.png b/public/images/emoji/google/sun_behind_rain_cloud.png
index 4fc26cb31b..1d5cfc81bf 100644
Binary files a/public/images/emoji/google/sun_behind_rain_cloud.png and b/public/images/emoji/google/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/google/sun_behind_small_cloud.png b/public/images/emoji/google/sun_behind_small_cloud.png
index 6686bc8d5a..0e1dfbf0b4 100644
Binary files a/public/images/emoji/google/sun_behind_small_cloud.png and b/public/images/emoji/google/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/google/sun_with_face.png b/public/images/emoji/google/sun_with_face.png
index 4ebe4329c1..e21136c7c4 100644
Binary files a/public/images/emoji/google/sun_with_face.png and b/public/images/emoji/google/sun_with_face.png differ
diff --git a/public/images/emoji/google/sunflower.png b/public/images/emoji/google/sunflower.png
index b844443198..2d2ae55d7f 100644
Binary files a/public/images/emoji/google/sunflower.png and b/public/images/emoji/google/sunflower.png differ
diff --git a/public/images/emoji/google/sunglasses.png b/public/images/emoji/google/sunglasses.png
index 99271ece61..acc11c1414 100644
Binary files a/public/images/emoji/google/sunglasses.png and b/public/images/emoji/google/sunglasses.png differ
diff --git a/public/images/emoji/google/sunny.png b/public/images/emoji/google/sunny.png
index c983cbc070..67141b1fc5 100644
Binary files a/public/images/emoji/google/sunny.png and b/public/images/emoji/google/sunny.png differ
diff --git a/public/images/emoji/google/sunrise.png b/public/images/emoji/google/sunrise.png
index ba83c23126..c11803c6d5 100644
Binary files a/public/images/emoji/google/sunrise.png and b/public/images/emoji/google/sunrise.png differ
diff --git a/public/images/emoji/google/sunrise_over_mountains.png b/public/images/emoji/google/sunrise_over_mountains.png
index 3c27efd19a..59eb7cbe36 100644
Binary files a/public/images/emoji/google/sunrise_over_mountains.png and b/public/images/emoji/google/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/google/surfer.png b/public/images/emoji/google/surfer.png
index 1e2f330d86..c8b5a34eee 100644
Binary files a/public/images/emoji/google/surfer.png and b/public/images/emoji/google/surfer.png differ
diff --git a/public/images/emoji/google/surfer/2.png b/public/images/emoji/google/surfer/2.png
index c77d90b246..e3093c45ad 100644
Binary files a/public/images/emoji/google/surfer/2.png and b/public/images/emoji/google/surfer/2.png differ
diff --git a/public/images/emoji/google/surfer/3.png b/public/images/emoji/google/surfer/3.png
index fa1ed7963b..b770754b05 100644
Binary files a/public/images/emoji/google/surfer/3.png and b/public/images/emoji/google/surfer/3.png differ
diff --git a/public/images/emoji/google/surfer/4.png b/public/images/emoji/google/surfer/4.png
index 1a8f8c59dd..1184feb14f 100644
Binary files a/public/images/emoji/google/surfer/4.png and b/public/images/emoji/google/surfer/4.png differ
diff --git a/public/images/emoji/google/surfer/5.png b/public/images/emoji/google/surfer/5.png
index 600963a330..ccf5993c2b 100644
Binary files a/public/images/emoji/google/surfer/5.png and b/public/images/emoji/google/surfer/5.png differ
diff --git a/public/images/emoji/google/surfer/6.png b/public/images/emoji/google/surfer/6.png
index da93a4d5ba..ab82543c17 100644
Binary files a/public/images/emoji/google/surfer/6.png and b/public/images/emoji/google/surfer/6.png differ
diff --git a/public/images/emoji/google/surfing_man.png b/public/images/emoji/google/surfing_man.png
index 1e2f330d86..c8b5a34eee 100644
Binary files a/public/images/emoji/google/surfing_man.png and b/public/images/emoji/google/surfing_man.png differ
diff --git a/public/images/emoji/google/surfing_man/2.png b/public/images/emoji/google/surfing_man/2.png
index c77d90b246..e3093c45ad 100644
Binary files a/public/images/emoji/google/surfing_man/2.png and b/public/images/emoji/google/surfing_man/2.png differ
diff --git a/public/images/emoji/google/surfing_man/3.png b/public/images/emoji/google/surfing_man/3.png
index fa1ed7963b..b770754b05 100644
Binary files a/public/images/emoji/google/surfing_man/3.png and b/public/images/emoji/google/surfing_man/3.png differ
diff --git a/public/images/emoji/google/surfing_man/4.png b/public/images/emoji/google/surfing_man/4.png
index 1a8f8c59dd..1184feb14f 100644
Binary files a/public/images/emoji/google/surfing_man/4.png and b/public/images/emoji/google/surfing_man/4.png differ
diff --git a/public/images/emoji/google/surfing_man/5.png b/public/images/emoji/google/surfing_man/5.png
index 600963a330..ccf5993c2b 100644
Binary files a/public/images/emoji/google/surfing_man/5.png and b/public/images/emoji/google/surfing_man/5.png differ
diff --git a/public/images/emoji/google/surfing_man/6.png b/public/images/emoji/google/surfing_man/6.png
index da93a4d5ba..ab82543c17 100644
Binary files a/public/images/emoji/google/surfing_man/6.png and b/public/images/emoji/google/surfing_man/6.png differ
diff --git a/public/images/emoji/google/surfing_woman.png b/public/images/emoji/google/surfing_woman.png
index 5833789ebe..d8812f2391 100644
Binary files a/public/images/emoji/google/surfing_woman.png and b/public/images/emoji/google/surfing_woman.png differ
diff --git a/public/images/emoji/google/surfing_woman/2.png b/public/images/emoji/google/surfing_woman/2.png
index c0497f10e8..7d4d31cdd7 100644
Binary files a/public/images/emoji/google/surfing_woman/2.png and b/public/images/emoji/google/surfing_woman/2.png differ
diff --git a/public/images/emoji/google/surfing_woman/3.png b/public/images/emoji/google/surfing_woman/3.png
index 27f3c51783..fdc008cda8 100644
Binary files a/public/images/emoji/google/surfing_woman/3.png and b/public/images/emoji/google/surfing_woman/3.png differ
diff --git a/public/images/emoji/google/surfing_woman/4.png b/public/images/emoji/google/surfing_woman/4.png
index 37937a5085..f29b91fb20 100644
Binary files a/public/images/emoji/google/surfing_woman/4.png and b/public/images/emoji/google/surfing_woman/4.png differ
diff --git a/public/images/emoji/google/surfing_woman/5.png b/public/images/emoji/google/surfing_woman/5.png
index 4185bf21d2..f1f28b3de5 100644
Binary files a/public/images/emoji/google/surfing_woman/5.png and b/public/images/emoji/google/surfing_woman/5.png differ
diff --git a/public/images/emoji/google/surfing_woman/6.png b/public/images/emoji/google/surfing_woman/6.png
index 170fefa657..7117ad81c4 100644
Binary files a/public/images/emoji/google/surfing_woman/6.png and b/public/images/emoji/google/surfing_woman/6.png differ
diff --git a/public/images/emoji/google/suriname.png b/public/images/emoji/google/suriname.png
index 4113fc0a4c..190b80cfaf 100644
Binary files a/public/images/emoji/google/suriname.png and b/public/images/emoji/google/suriname.png differ
diff --git a/public/images/emoji/google/sushi.png b/public/images/emoji/google/sushi.png
index 9bc4d0d8a9..0beae8fa26 100644
Binary files a/public/images/emoji/google/sushi.png and b/public/images/emoji/google/sushi.png differ
diff --git a/public/images/emoji/google/sushing_face.png b/public/images/emoji/google/sushing_face.png
deleted file mode 100644
index aa287807f1..0000000000
Binary files a/public/images/emoji/google/sushing_face.png and /dev/null differ
diff --git a/public/images/emoji/google/suspension_railway.png b/public/images/emoji/google/suspension_railway.png
index 4bb8e576ee..90daf5684b 100644
Binary files a/public/images/emoji/google/suspension_railway.png and b/public/images/emoji/google/suspension_railway.png differ
diff --git a/public/images/emoji/google/svalbard_and_jan_mayen.png b/public/images/emoji/google/svalbard_and_jan_mayen.png
index 5330d9794c..d348a446ad 100644
Binary files a/public/images/emoji/google/svalbard_and_jan_mayen.png and b/public/images/emoji/google/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/google/swaziland.png b/public/images/emoji/google/swaziland.png
index d1d715c296..598a3c5dd7 100644
Binary files a/public/images/emoji/google/swaziland.png and b/public/images/emoji/google/swaziland.png differ
diff --git a/public/images/emoji/google/sweat.png b/public/images/emoji/google/sweat.png
index 71c1442f13..97a87884a8 100644
Binary files a/public/images/emoji/google/sweat.png and b/public/images/emoji/google/sweat.png differ
diff --git a/public/images/emoji/google/sweat_drops.png b/public/images/emoji/google/sweat_drops.png
index 6b3d498af2..b00dcc47cb 100644
Binary files a/public/images/emoji/google/sweat_drops.png and b/public/images/emoji/google/sweat_drops.png differ
diff --git a/public/images/emoji/google/sweat_smile.png b/public/images/emoji/google/sweat_smile.png
index 07b2b315bc..d062356602 100644
Binary files a/public/images/emoji/google/sweat_smile.png and b/public/images/emoji/google/sweat_smile.png differ
diff --git a/public/images/emoji/google/sweden.png b/public/images/emoji/google/sweden.png
index d784af61fc..63a38804ec 100644
Binary files a/public/images/emoji/google/sweden.png and b/public/images/emoji/google/sweden.png differ
diff --git a/public/images/emoji/google/sweet_potato.png b/public/images/emoji/google/sweet_potato.png
index 338ecbc998..c512770352 100644
Binary files a/public/images/emoji/google/sweet_potato.png and b/public/images/emoji/google/sweet_potato.png differ
diff --git a/public/images/emoji/google/swimmer.png b/public/images/emoji/google/swimmer.png
index bc89976280..e244fc6805 100644
Binary files a/public/images/emoji/google/swimmer.png and b/public/images/emoji/google/swimmer.png differ
diff --git a/public/images/emoji/google/swimmer/2.png b/public/images/emoji/google/swimmer/2.png
index f744028af4..1b6e3e63ad 100644
Binary files a/public/images/emoji/google/swimmer/2.png and b/public/images/emoji/google/swimmer/2.png differ
diff --git a/public/images/emoji/google/swimmer/3.png b/public/images/emoji/google/swimmer/3.png
index f2f524c92b..eb39616789 100644
Binary files a/public/images/emoji/google/swimmer/3.png and b/public/images/emoji/google/swimmer/3.png differ
diff --git a/public/images/emoji/google/swimmer/4.png b/public/images/emoji/google/swimmer/4.png
index 72156ef8f9..027eb2681b 100644
Binary files a/public/images/emoji/google/swimmer/4.png and b/public/images/emoji/google/swimmer/4.png differ
diff --git a/public/images/emoji/google/swimmer/5.png b/public/images/emoji/google/swimmer/5.png
index 6f0b853600..0341a0beaf 100644
Binary files a/public/images/emoji/google/swimmer/5.png and b/public/images/emoji/google/swimmer/5.png differ
diff --git a/public/images/emoji/google/swimmer/6.png b/public/images/emoji/google/swimmer/6.png
index 5f6222134e..7e148f0452 100644
Binary files a/public/images/emoji/google/swimmer/6.png and b/public/images/emoji/google/swimmer/6.png differ
diff --git a/public/images/emoji/google/swimming_man.png b/public/images/emoji/google/swimming_man.png
index bc89976280..e244fc6805 100644
Binary files a/public/images/emoji/google/swimming_man.png and b/public/images/emoji/google/swimming_man.png differ
diff --git a/public/images/emoji/google/swimming_man/2.png b/public/images/emoji/google/swimming_man/2.png
index f744028af4..1b6e3e63ad 100644
Binary files a/public/images/emoji/google/swimming_man/2.png and b/public/images/emoji/google/swimming_man/2.png differ
diff --git a/public/images/emoji/google/swimming_man/3.png b/public/images/emoji/google/swimming_man/3.png
index f2f524c92b..eb39616789 100644
Binary files a/public/images/emoji/google/swimming_man/3.png and b/public/images/emoji/google/swimming_man/3.png differ
diff --git a/public/images/emoji/google/swimming_man/4.png b/public/images/emoji/google/swimming_man/4.png
index 72156ef8f9..027eb2681b 100644
Binary files a/public/images/emoji/google/swimming_man/4.png and b/public/images/emoji/google/swimming_man/4.png differ
diff --git a/public/images/emoji/google/swimming_man/5.png b/public/images/emoji/google/swimming_man/5.png
index 6f0b853600..0341a0beaf 100644
Binary files a/public/images/emoji/google/swimming_man/5.png and b/public/images/emoji/google/swimming_man/5.png differ
diff --git a/public/images/emoji/google/swimming_man/6.png b/public/images/emoji/google/swimming_man/6.png
index 5f6222134e..7e148f0452 100644
Binary files a/public/images/emoji/google/swimming_man/6.png and b/public/images/emoji/google/swimming_man/6.png differ
diff --git a/public/images/emoji/google/swimming_woman.png b/public/images/emoji/google/swimming_woman.png
index c96906cbfa..12835c023c 100644
Binary files a/public/images/emoji/google/swimming_woman.png and b/public/images/emoji/google/swimming_woman.png differ
diff --git a/public/images/emoji/google/swimming_woman/2.png b/public/images/emoji/google/swimming_woman/2.png
index e7937a5e94..ef5e874eea 100644
Binary files a/public/images/emoji/google/swimming_woman/2.png and b/public/images/emoji/google/swimming_woman/2.png differ
diff --git a/public/images/emoji/google/swimming_woman/3.png b/public/images/emoji/google/swimming_woman/3.png
index c43eac0982..17dc9cf567 100644
Binary files a/public/images/emoji/google/swimming_woman/3.png and b/public/images/emoji/google/swimming_woman/3.png differ
diff --git a/public/images/emoji/google/swimming_woman/4.png b/public/images/emoji/google/swimming_woman/4.png
index 7a01d16113..a6da6318cd 100644
Binary files a/public/images/emoji/google/swimming_woman/4.png and b/public/images/emoji/google/swimming_woman/4.png differ
diff --git a/public/images/emoji/google/swimming_woman/5.png b/public/images/emoji/google/swimming_woman/5.png
index 32e34241e2..693120bc69 100644
Binary files a/public/images/emoji/google/swimming_woman/5.png and b/public/images/emoji/google/swimming_woman/5.png differ
diff --git a/public/images/emoji/google/swimming_woman/6.png b/public/images/emoji/google/swimming_woman/6.png
index 26346ec272..69fe561dd0 100644
Binary files a/public/images/emoji/google/swimming_woman/6.png and b/public/images/emoji/google/swimming_woman/6.png differ
diff --git a/public/images/emoji/google/switzerland.png b/public/images/emoji/google/switzerland.png
index 1ef2b0ce41..9c404cf21d 100644
Binary files a/public/images/emoji/google/switzerland.png and b/public/images/emoji/google/switzerland.png differ
diff --git a/public/images/emoji/google/symbols.png b/public/images/emoji/google/symbols.png
index 182f0a46e2..9453639f60 100644
Binary files a/public/images/emoji/google/symbols.png and b/public/images/emoji/google/symbols.png differ
diff --git a/public/images/emoji/google/synagogue.png b/public/images/emoji/google/synagogue.png
index a09c710408..f9e15d15af 100644
Binary files a/public/images/emoji/google/synagogue.png and b/public/images/emoji/google/synagogue.png differ
diff --git a/public/images/emoji/google/syria.png b/public/images/emoji/google/syria.png
index 9048b71158..64ca1a6225 100644
Binary files a/public/images/emoji/google/syria.png and b/public/images/emoji/google/syria.png differ
diff --git a/public/images/emoji/google/syringe.png b/public/images/emoji/google/syringe.png
index ae2ef5f265..dbccda32ef 100644
Binary files a/public/images/emoji/google/syringe.png and b/public/images/emoji/google/syringe.png differ
diff --git a/public/images/emoji/google/t_rex.png b/public/images/emoji/google/t_rex.png
index 27102b89de..7c3482e649 100644
Binary files a/public/images/emoji/google/t_rex.png and b/public/images/emoji/google/t_rex.png differ
diff --git a/public/images/emoji/google/table_tennis.png b/public/images/emoji/google/table_tennis.png
index 8390f27bb8..60444a0a3a 100644
Binary files a/public/images/emoji/google/table_tennis.png and b/public/images/emoji/google/table_tennis.png differ
diff --git a/public/images/emoji/google/taco.png b/public/images/emoji/google/taco.png
index dcdee39c82..f62f76fa27 100644
Binary files a/public/images/emoji/google/taco.png and b/public/images/emoji/google/taco.png differ
diff --git a/public/images/emoji/google/tada.png b/public/images/emoji/google/tada.png
index 6737d2d1d7..43e5142120 100644
Binary files a/public/images/emoji/google/tada.png and b/public/images/emoji/google/tada.png differ
diff --git a/public/images/emoji/google/taiwan.png b/public/images/emoji/google/taiwan.png
index b0fdb2c49e..098f9b22ac 100644
Binary files a/public/images/emoji/google/taiwan.png and b/public/images/emoji/google/taiwan.png differ
diff --git a/public/images/emoji/google/tajikistan.png b/public/images/emoji/google/tajikistan.png
index 0cecf7088a..037e6bf599 100644
Binary files a/public/images/emoji/google/tajikistan.png and b/public/images/emoji/google/tajikistan.png differ
diff --git a/public/images/emoji/google/takeout_box.png b/public/images/emoji/google/takeout_box.png
index dab274ddfc..82a48a4faa 100644
Binary files a/public/images/emoji/google/takeout_box.png and b/public/images/emoji/google/takeout_box.png differ
diff --git a/public/images/emoji/google/tanabata_tree.png b/public/images/emoji/google/tanabata_tree.png
index 7e50cf9972..434827a75d 100644
Binary files a/public/images/emoji/google/tanabata_tree.png and b/public/images/emoji/google/tanabata_tree.png differ
diff --git a/public/images/emoji/google/tangerine.png b/public/images/emoji/google/tangerine.png
index ee0912c1e0..049fe86ae0 100644
Binary files a/public/images/emoji/google/tangerine.png and b/public/images/emoji/google/tangerine.png differ
diff --git a/public/images/emoji/google/tanzania.png b/public/images/emoji/google/tanzania.png
index 290a513c36..43eae86742 100644
Binary files a/public/images/emoji/google/tanzania.png and b/public/images/emoji/google/tanzania.png differ
diff --git a/public/images/emoji/google/taurus.png b/public/images/emoji/google/taurus.png
index 53fdc1438a..b2cc9dd032 100644
Binary files a/public/images/emoji/google/taurus.png and b/public/images/emoji/google/taurus.png differ
diff --git a/public/images/emoji/google/taxi.png b/public/images/emoji/google/taxi.png
index 5c02368846..73acc0dea2 100644
Binary files a/public/images/emoji/google/taxi.png and b/public/images/emoji/google/taxi.png differ
diff --git a/public/images/emoji/google/tea.png b/public/images/emoji/google/tea.png
index f3e8ede67b..0c42b544e1 100644
Binary files a/public/images/emoji/google/tea.png and b/public/images/emoji/google/tea.png differ
diff --git a/public/images/emoji/google/telephone.png b/public/images/emoji/google/telephone.png
index 2445053686..3eca2e7d80 100644
Binary files a/public/images/emoji/google/telephone.png and b/public/images/emoji/google/telephone.png differ
diff --git a/public/images/emoji/google/telephone_receiver.png b/public/images/emoji/google/telephone_receiver.png
index 087c5fa29b..1fbf0f5d36 100644
Binary files a/public/images/emoji/google/telephone_receiver.png and b/public/images/emoji/google/telephone_receiver.png differ
diff --git a/public/images/emoji/google/telescope.png b/public/images/emoji/google/telescope.png
index 96f65d87e7..d1b0cfafda 100644
Binary files a/public/images/emoji/google/telescope.png and b/public/images/emoji/google/telescope.png differ
diff --git a/public/images/emoji/google/ten.png b/public/images/emoji/google/ten.png
index 60b3c3787c..26d2af616c 100644
Binary files a/public/images/emoji/google/ten.png and b/public/images/emoji/google/ten.png differ
diff --git a/public/images/emoji/google/tennis.png b/public/images/emoji/google/tennis.png
index 2ca385feb1..d99dbd1fa7 100644
Binary files a/public/images/emoji/google/tennis.png and b/public/images/emoji/google/tennis.png differ
diff --git a/public/images/emoji/google/tent.png b/public/images/emoji/google/tent.png
index 8eb56114f0..ad3fa23f39 100644
Binary files a/public/images/emoji/google/tent.png and b/public/images/emoji/google/tent.png differ
diff --git a/public/images/emoji/google/thailand.png b/public/images/emoji/google/thailand.png
index a3ac84b8fa..acb9054331 100644
Binary files a/public/images/emoji/google/thailand.png and b/public/images/emoji/google/thailand.png differ
diff --git a/public/images/emoji/google/thermometer.png b/public/images/emoji/google/thermometer.png
index 23398cba6c..0b37dbfe0a 100644
Binary files a/public/images/emoji/google/thermometer.png and b/public/images/emoji/google/thermometer.png differ
diff --git a/public/images/emoji/google/thermometer_face.png b/public/images/emoji/google/thermometer_face.png
index 82bdbf6335..296fe80618 100644
Binary files a/public/images/emoji/google/thermometer_face.png and b/public/images/emoji/google/thermometer_face.png differ
diff --git a/public/images/emoji/google/thinking.png b/public/images/emoji/google/thinking.png
index a99dc4d85a..afcbc3d3b1 100644
Binary files a/public/images/emoji/google/thinking.png and b/public/images/emoji/google/thinking.png differ
diff --git a/public/images/emoji/google/thinking_face.png b/public/images/emoji/google/thinking_face.png
index a99dc4d85a..afcbc3d3b1 100644
Binary files a/public/images/emoji/google/thinking_face.png and b/public/images/emoji/google/thinking_face.png differ
diff --git a/public/images/emoji/google/thought_balloon.png b/public/images/emoji/google/thought_balloon.png
index fd55816c8f..3a2ac4e766 100644
Binary files a/public/images/emoji/google/thought_balloon.png and b/public/images/emoji/google/thought_balloon.png differ
diff --git a/public/images/emoji/google/three.png b/public/images/emoji/google/three.png
index 0914fd7811..ec65e3f24c 100644
Binary files a/public/images/emoji/google/three.png and b/public/images/emoji/google/three.png differ
diff --git a/public/images/emoji/google/three_button_mouse.png b/public/images/emoji/google/three_button_mouse.png
index 606ada2ed4..28785439fc 100644
Binary files a/public/images/emoji/google/three_button_mouse.png and b/public/images/emoji/google/three_button_mouse.png differ
diff --git a/public/images/emoji/google/thumbsdown.png b/public/images/emoji/google/thumbsdown.png
index f2e7da55f6..01e3d0ffa1 100644
Binary files a/public/images/emoji/google/thumbsdown.png and b/public/images/emoji/google/thumbsdown.png differ
diff --git a/public/images/emoji/google/thumbsdown/2.png b/public/images/emoji/google/thumbsdown/2.png
index 86d0319a4a..d2bcecf2c3 100644
Binary files a/public/images/emoji/google/thumbsdown/2.png and b/public/images/emoji/google/thumbsdown/2.png differ
diff --git a/public/images/emoji/google/thumbsdown/3.png b/public/images/emoji/google/thumbsdown/3.png
index c50a57e11e..e7665e4baf 100644
Binary files a/public/images/emoji/google/thumbsdown/3.png and b/public/images/emoji/google/thumbsdown/3.png differ
diff --git a/public/images/emoji/google/thumbsdown/4.png b/public/images/emoji/google/thumbsdown/4.png
index 979e09adf8..0ec1f2e3a0 100644
Binary files a/public/images/emoji/google/thumbsdown/4.png and b/public/images/emoji/google/thumbsdown/4.png differ
diff --git a/public/images/emoji/google/thumbsdown/5.png b/public/images/emoji/google/thumbsdown/5.png
index bf4f10d81a..3f3bd72ef4 100644
Binary files a/public/images/emoji/google/thumbsdown/5.png and b/public/images/emoji/google/thumbsdown/5.png differ
diff --git a/public/images/emoji/google/thumbsdown/6.png b/public/images/emoji/google/thumbsdown/6.png
index ecab34a982..6582568567 100644
Binary files a/public/images/emoji/google/thumbsdown/6.png and b/public/images/emoji/google/thumbsdown/6.png differ
diff --git a/public/images/emoji/google/thumbsup.png b/public/images/emoji/google/thumbsup.png
index b03f09eb00..7e440eb6a8 100644
Binary files a/public/images/emoji/google/thumbsup.png and b/public/images/emoji/google/thumbsup.png differ
diff --git a/public/images/emoji/google/thumbsup/2.png b/public/images/emoji/google/thumbsup/2.png
index a3a855f569..d31652eaf5 100644
Binary files a/public/images/emoji/google/thumbsup/2.png and b/public/images/emoji/google/thumbsup/2.png differ
diff --git a/public/images/emoji/google/thumbsup/3.png b/public/images/emoji/google/thumbsup/3.png
index c8e515c99b..5b1760d7a3 100644
Binary files a/public/images/emoji/google/thumbsup/3.png and b/public/images/emoji/google/thumbsup/3.png differ
diff --git a/public/images/emoji/google/thumbsup/4.png b/public/images/emoji/google/thumbsup/4.png
index 4a388dd5fc..2ba4abddc4 100644
Binary files a/public/images/emoji/google/thumbsup/4.png and b/public/images/emoji/google/thumbsup/4.png differ
diff --git a/public/images/emoji/google/thumbsup/5.png b/public/images/emoji/google/thumbsup/5.png
index 5bf6c233fd..b9fdc0019d 100644
Binary files a/public/images/emoji/google/thumbsup/5.png and b/public/images/emoji/google/thumbsup/5.png differ
diff --git a/public/images/emoji/google/thumbsup/6.png b/public/images/emoji/google/thumbsup/6.png
index fed5d03000..d4944089c6 100644
Binary files a/public/images/emoji/google/thumbsup/6.png and b/public/images/emoji/google/thumbsup/6.png differ
diff --git a/public/images/emoji/google/thunder_cloud_and_rain.png b/public/images/emoji/google/thunder_cloud_and_rain.png
index 5cb64e49e4..8cf3322c7d 100644
Binary files a/public/images/emoji/google/thunder_cloud_and_rain.png and b/public/images/emoji/google/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/google/thunder_cloud_rain.png b/public/images/emoji/google/thunder_cloud_rain.png
index 5cb64e49e4..8cf3322c7d 100644
Binary files a/public/images/emoji/google/thunder_cloud_rain.png and b/public/images/emoji/google/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/google/ticket.png b/public/images/emoji/google/ticket.png
index 9523d73fe9..6bd78c8329 100644
Binary files a/public/images/emoji/google/ticket.png and b/public/images/emoji/google/ticket.png differ
diff --git a/public/images/emoji/google/tickets.png b/public/images/emoji/google/tickets.png
index d4a4f20a29..64ccba10db 100644
Binary files a/public/images/emoji/google/tickets.png and b/public/images/emoji/google/tickets.png differ
diff --git a/public/images/emoji/google/tiger.png b/public/images/emoji/google/tiger.png
index bcb497cda7..2c24a0e1cd 100644
Binary files a/public/images/emoji/google/tiger.png and b/public/images/emoji/google/tiger.png differ
diff --git a/public/images/emoji/google/tiger2.png b/public/images/emoji/google/tiger2.png
index 9dc79730d9..1b3d49a0cc 100644
Binary files a/public/images/emoji/google/tiger2.png and b/public/images/emoji/google/tiger2.png differ
diff --git a/public/images/emoji/google/timer.png b/public/images/emoji/google/timer.png
index 970e7bdee4..fde01751ff 100644
Binary files a/public/images/emoji/google/timer.png and b/public/images/emoji/google/timer.png differ
diff --git a/public/images/emoji/google/timer_clock.png b/public/images/emoji/google/timer_clock.png
index 970e7bdee4..fde01751ff 100644
Binary files a/public/images/emoji/google/timer_clock.png and b/public/images/emoji/google/timer_clock.png differ
diff --git a/public/images/emoji/google/timor_leste.png b/public/images/emoji/google/timor_leste.png
index 9f5447a9c5..e88ff74a77 100644
Binary files a/public/images/emoji/google/timor_leste.png and b/public/images/emoji/google/timor_leste.png differ
diff --git a/public/images/emoji/google/tipping_hand_man.png b/public/images/emoji/google/tipping_hand_man.png
index a6eaa68817..1eb3a089aa 100644
Binary files a/public/images/emoji/google/tipping_hand_man.png and b/public/images/emoji/google/tipping_hand_man.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/2.png b/public/images/emoji/google/tipping_hand_man/2.png
index 5252cee381..4fd4272ba5 100644
Binary files a/public/images/emoji/google/tipping_hand_man/2.png and b/public/images/emoji/google/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/3.png b/public/images/emoji/google/tipping_hand_man/3.png
index 52eada652a..5ceec8d5be 100644
Binary files a/public/images/emoji/google/tipping_hand_man/3.png and b/public/images/emoji/google/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/4.png b/public/images/emoji/google/tipping_hand_man/4.png
index 0cfa09e361..636d799183 100644
Binary files a/public/images/emoji/google/tipping_hand_man/4.png and b/public/images/emoji/google/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/5.png b/public/images/emoji/google/tipping_hand_man/5.png
index 78ea008982..539e480f52 100644
Binary files a/public/images/emoji/google/tipping_hand_man/5.png and b/public/images/emoji/google/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/6.png b/public/images/emoji/google/tipping_hand_man/6.png
index 7ee2daef29..0f5d4f5c4e 100644
Binary files a/public/images/emoji/google/tipping_hand_man/6.png and b/public/images/emoji/google/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman.png b/public/images/emoji/google/tipping_hand_woman.png
index f84a2e0281..5a1a1083dd 100644
Binary files a/public/images/emoji/google/tipping_hand_woman.png and b/public/images/emoji/google/tipping_hand_woman.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/2.png b/public/images/emoji/google/tipping_hand_woman/2.png
index 448acc172a..57d49cd71e 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/2.png and b/public/images/emoji/google/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/3.png b/public/images/emoji/google/tipping_hand_woman/3.png
index 23c4c592bc..acd7d01ccd 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/3.png and b/public/images/emoji/google/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/4.png b/public/images/emoji/google/tipping_hand_woman/4.png
index be3b2d1e72..57834f9c19 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/4.png and b/public/images/emoji/google/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/5.png b/public/images/emoji/google/tipping_hand_woman/5.png
index 35c12c4903..aef6e61829 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/5.png and b/public/images/emoji/google/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/6.png b/public/images/emoji/google/tipping_hand_woman/6.png
index 67e0a0ca12..e5e401338a 100644
Binary files a/public/images/emoji/google/tipping_hand_woman/6.png and b/public/images/emoji/google/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/google/tired_face.png b/public/images/emoji/google/tired_face.png
index 0b6f36462d..c89739037b 100644
Binary files a/public/images/emoji/google/tired_face.png and b/public/images/emoji/google/tired_face.png differ
diff --git a/public/images/emoji/google/tm.png b/public/images/emoji/google/tm.png
index eb25108401..6957cfe1f2 100644
Binary files a/public/images/emoji/google/tm.png and b/public/images/emoji/google/tm.png differ
diff --git a/public/images/emoji/google/togo.png b/public/images/emoji/google/togo.png
index 31f107a8f9..9d20ca89fd 100644
Binary files a/public/images/emoji/google/togo.png and b/public/images/emoji/google/togo.png differ
diff --git a/public/images/emoji/google/toilet.png b/public/images/emoji/google/toilet.png
index 08dbd74daa..b13d4f4cb7 100644
Binary files a/public/images/emoji/google/toilet.png and b/public/images/emoji/google/toilet.png differ
diff --git a/public/images/emoji/google/tokelau.png b/public/images/emoji/google/tokelau.png
index 52c3213be5..5e5337f223 100644
Binary files a/public/images/emoji/google/tokelau.png and b/public/images/emoji/google/tokelau.png differ
diff --git a/public/images/emoji/google/tokyo_tower.png b/public/images/emoji/google/tokyo_tower.png
index 6ae9f3923b..0405e76372 100644
Binary files a/public/images/emoji/google/tokyo_tower.png and b/public/images/emoji/google/tokyo_tower.png differ
diff --git a/public/images/emoji/google/tomato.png b/public/images/emoji/google/tomato.png
index 5211b2c2f2..6ed016c0ce 100644
Binary files a/public/images/emoji/google/tomato.png and b/public/images/emoji/google/tomato.png differ
diff --git a/public/images/emoji/google/tonga.png b/public/images/emoji/google/tonga.png
index aabcbefa5c..dd067f20f3 100644
Binary files a/public/images/emoji/google/tonga.png and b/public/images/emoji/google/tonga.png differ
diff --git a/public/images/emoji/google/tongue.png b/public/images/emoji/google/tongue.png
index 2bb68dd3a5..bdca4a075c 100644
Binary files a/public/images/emoji/google/tongue.png and b/public/images/emoji/google/tongue.png differ
diff --git a/public/images/emoji/google/tools.png b/public/images/emoji/google/tools.png
index 174926ff02..f0fe70817f 100644
Binary files a/public/images/emoji/google/tools.png and b/public/images/emoji/google/tools.png differ
diff --git a/public/images/emoji/google/top.png b/public/images/emoji/google/top.png
index a0065f57a3..c348a87084 100644
Binary files a/public/images/emoji/google/top.png and b/public/images/emoji/google/top.png differ
diff --git a/public/images/emoji/google/tophat.png b/public/images/emoji/google/tophat.png
index 516e982d62..8ef667b90f 100644
Binary files a/public/images/emoji/google/tophat.png and b/public/images/emoji/google/tophat.png differ
diff --git a/public/images/emoji/google/tornado.png b/public/images/emoji/google/tornado.png
index 7f488bc983..b2e18065c1 100644
Binary files a/public/images/emoji/google/tornado.png and b/public/images/emoji/google/tornado.png differ
diff --git a/public/images/emoji/google/tr.png b/public/images/emoji/google/tr.png
index 1b52acea75..d1c0e60886 100644
Binary files a/public/images/emoji/google/tr.png and b/public/images/emoji/google/tr.png differ
diff --git a/public/images/emoji/google/track_next.png b/public/images/emoji/google/track_next.png
index 85f7bba60f..1faa13a2d5 100644
Binary files a/public/images/emoji/google/track_next.png and b/public/images/emoji/google/track_next.png differ
diff --git a/public/images/emoji/google/track_previous.png b/public/images/emoji/google/track_previous.png
index 559086b3c0..87e948c080 100644
Binary files a/public/images/emoji/google/track_previous.png and b/public/images/emoji/google/track_previous.png differ
diff --git a/public/images/emoji/google/trackball.png b/public/images/emoji/google/trackball.png
index d0891896ec..82db185aa2 100644
Binary files a/public/images/emoji/google/trackball.png and b/public/images/emoji/google/trackball.png differ
diff --git a/public/images/emoji/google/tractor.png b/public/images/emoji/google/tractor.png
index 0de0ab08a8..9732a429ba 100644
Binary files a/public/images/emoji/google/tractor.png and b/public/images/emoji/google/tractor.png differ
diff --git a/public/images/emoji/google/traffic_light.png b/public/images/emoji/google/traffic_light.png
index 43e9c0da20..c3c6814d71 100644
Binary files a/public/images/emoji/google/traffic_light.png and b/public/images/emoji/google/traffic_light.png differ
diff --git a/public/images/emoji/google/train.png b/public/images/emoji/google/train.png
index 6f34e41484..24b28d4767 100644
Binary files a/public/images/emoji/google/train.png and b/public/images/emoji/google/train.png differ
diff --git a/public/images/emoji/google/train2.png b/public/images/emoji/google/train2.png
index 10105bc8d2..5e514a0745 100644
Binary files a/public/images/emoji/google/train2.png and b/public/images/emoji/google/train2.png differ
diff --git a/public/images/emoji/google/tram.png b/public/images/emoji/google/tram.png
index 0d81f430a8..b85824ca9c 100644
Binary files a/public/images/emoji/google/tram.png and b/public/images/emoji/google/tram.png differ
diff --git a/public/images/emoji/google/triangular_flag_on_post.png b/public/images/emoji/google/triangular_flag_on_post.png
index 495e1ee22a..1357e1e60d 100644
Binary files a/public/images/emoji/google/triangular_flag_on_post.png and b/public/images/emoji/google/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/google/triangular_ruler.png b/public/images/emoji/google/triangular_ruler.png
index 2419f0f5a0..9c3d45e3f4 100644
Binary files a/public/images/emoji/google/triangular_ruler.png and b/public/images/emoji/google/triangular_ruler.png differ
diff --git a/public/images/emoji/google/trident.png b/public/images/emoji/google/trident.png
index 45536a1ac1..068d173f4a 100644
Binary files a/public/images/emoji/google/trident.png and b/public/images/emoji/google/trident.png differ
diff --git a/public/images/emoji/google/trinidad_tobago.png b/public/images/emoji/google/trinidad_tobago.png
index 52bc446d8d..050048d1a3 100644
Binary files a/public/images/emoji/google/trinidad_tobago.png and b/public/images/emoji/google/trinidad_tobago.png differ
diff --git a/public/images/emoji/google/tristan_da_cunha.png b/public/images/emoji/google/tristan_da_cunha.png
index 4dd6ecd04e..49802d9dc6 100644
Binary files a/public/images/emoji/google/tristan_da_cunha.png and b/public/images/emoji/google/tristan_da_cunha.png differ
diff --git a/public/images/emoji/google/triumph.png b/public/images/emoji/google/triumph.png
index eae6985d99..0f05869abe 100644
Binary files a/public/images/emoji/google/triumph.png and b/public/images/emoji/google/triumph.png differ
diff --git a/public/images/emoji/google/trolleybus.png b/public/images/emoji/google/trolleybus.png
index ab8c570e6a..f53242ed7e 100644
Binary files a/public/images/emoji/google/trolleybus.png and b/public/images/emoji/google/trolleybus.png differ
diff --git a/public/images/emoji/google/trophy.png b/public/images/emoji/google/trophy.png
index eb969912a9..efa8d1d2ed 100644
Binary files a/public/images/emoji/google/trophy.png and b/public/images/emoji/google/trophy.png differ
diff --git a/public/images/emoji/google/tropical_drink.png b/public/images/emoji/google/tropical_drink.png
index b4e3078686..6ded42bfee 100644
Binary files a/public/images/emoji/google/tropical_drink.png and b/public/images/emoji/google/tropical_drink.png differ
diff --git a/public/images/emoji/google/tropical_fish.png b/public/images/emoji/google/tropical_fish.png
index ff9c276b1c..03ae21be6a 100644
Binary files a/public/images/emoji/google/tropical_fish.png and b/public/images/emoji/google/tropical_fish.png differ
diff --git a/public/images/emoji/google/truck.png b/public/images/emoji/google/truck.png
index 0fbb5b4f66..88143531a5 100644
Binary files a/public/images/emoji/google/truck.png and b/public/images/emoji/google/truck.png differ
diff --git a/public/images/emoji/google/trumpet.png b/public/images/emoji/google/trumpet.png
index c1e906641f..2d82a5dd9a 100644
Binary files a/public/images/emoji/google/trumpet.png and b/public/images/emoji/google/trumpet.png differ
diff --git a/public/images/emoji/google/tshirt.png b/public/images/emoji/google/tshirt.png
index ef0745cb18..d93268cc4e 100644
Binary files a/public/images/emoji/google/tshirt.png and b/public/images/emoji/google/tshirt.png differ
diff --git a/public/images/emoji/google/tulip.png b/public/images/emoji/google/tulip.png
index e841a28bba..c881369686 100644
Binary files a/public/images/emoji/google/tulip.png and b/public/images/emoji/google/tulip.png differ
diff --git a/public/images/emoji/google/tumbler_glass.png b/public/images/emoji/google/tumbler_glass.png
index 6fc6c89628..565017fe1f 100644
Binary files a/public/images/emoji/google/tumbler_glass.png and b/public/images/emoji/google/tumbler_glass.png differ
diff --git a/public/images/emoji/google/tunisia.png b/public/images/emoji/google/tunisia.png
index 9ba90c6c15..0d947c90e9 100644
Binary files a/public/images/emoji/google/tunisia.png and b/public/images/emoji/google/tunisia.png differ
diff --git a/public/images/emoji/google/turkey.png b/public/images/emoji/google/turkey.png
index c0aae847c9..04781c09f9 100644
Binary files a/public/images/emoji/google/turkey.png and b/public/images/emoji/google/turkey.png differ
diff --git a/public/images/emoji/google/turkmenistan.png b/public/images/emoji/google/turkmenistan.png
index 6c3dfed67a..6e9a7883cb 100644
Binary files a/public/images/emoji/google/turkmenistan.png and b/public/images/emoji/google/turkmenistan.png differ
diff --git a/public/images/emoji/google/turks_caicos_islands.png b/public/images/emoji/google/turks_caicos_islands.png
index e3f57dfe98..7eb5cd1fff 100644
Binary files a/public/images/emoji/google/turks_caicos_islands.png and b/public/images/emoji/google/turks_caicos_islands.png differ
diff --git a/public/images/emoji/google/turtle.png b/public/images/emoji/google/turtle.png
index fce25a40ce..aa422d075d 100644
Binary files a/public/images/emoji/google/turtle.png and b/public/images/emoji/google/turtle.png differ
diff --git a/public/images/emoji/google/tuvalu.png b/public/images/emoji/google/tuvalu.png
index 179aa46066..ad163e6a52 100644
Binary files a/public/images/emoji/google/tuvalu.png and b/public/images/emoji/google/tuvalu.png differ
diff --git a/public/images/emoji/google/tv.png b/public/images/emoji/google/tv.png
index 5cd554ac60..5b28652dfb 100644
Binary files a/public/images/emoji/google/tv.png and b/public/images/emoji/google/tv.png differ
diff --git a/public/images/emoji/google/twisted_rightwards_arrows.png b/public/images/emoji/google/twisted_rightwards_arrows.png
index a187bc9b57..6fa5fe3dd0 100644
Binary files a/public/images/emoji/google/twisted_rightwards_arrows.png and b/public/images/emoji/google/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/google/two.png b/public/images/emoji/google/two.png
index 37c3fa792f..481a50da6c 100644
Binary files a/public/images/emoji/google/two.png and b/public/images/emoji/google/two.png differ
diff --git a/public/images/emoji/google/two_hearts.png b/public/images/emoji/google/two_hearts.png
index be2de5c738..98b87b653d 100644
Binary files a/public/images/emoji/google/two_hearts.png and b/public/images/emoji/google/two_hearts.png differ
diff --git a/public/images/emoji/google/two_men_holding_hands.png b/public/images/emoji/google/two_men_holding_hands.png
index 2c28894a11..ffbd370b8c 100644
Binary files a/public/images/emoji/google/two_men_holding_hands.png and b/public/images/emoji/google/two_men_holding_hands.png differ
diff --git a/public/images/emoji/google/two_women_holding_hands.png b/public/images/emoji/google/two_women_holding_hands.png
index ea96bde544..adde4bc2c1 100644
Binary files a/public/images/emoji/google/two_women_holding_hands.png and b/public/images/emoji/google/two_women_holding_hands.png differ
diff --git a/public/images/emoji/google/u5272.png b/public/images/emoji/google/u5272.png
index c0b6e8b67a..49cec56a31 100644
Binary files a/public/images/emoji/google/u5272.png and b/public/images/emoji/google/u5272.png differ
diff --git a/public/images/emoji/google/u5408.png b/public/images/emoji/google/u5408.png
index f74e250d0f..3bedae2e11 100644
Binary files a/public/images/emoji/google/u5408.png and b/public/images/emoji/google/u5408.png differ
diff --git a/public/images/emoji/google/u55b6.png b/public/images/emoji/google/u55b6.png
index 48b07a4ed5..1760e7153b 100644
Binary files a/public/images/emoji/google/u55b6.png and b/public/images/emoji/google/u55b6.png differ
diff --git a/public/images/emoji/google/u6307.png b/public/images/emoji/google/u6307.png
index 8d5ad589b6..284502f7c3 100644
Binary files a/public/images/emoji/google/u6307.png and b/public/images/emoji/google/u6307.png differ
diff --git a/public/images/emoji/google/u6708.png b/public/images/emoji/google/u6708.png
index 18f9397f5e..77ea2c0a7a 100644
Binary files a/public/images/emoji/google/u6708.png and b/public/images/emoji/google/u6708.png differ
diff --git a/public/images/emoji/google/u6709.png b/public/images/emoji/google/u6709.png
index 29df4c5227..ec40330a6d 100644
Binary files a/public/images/emoji/google/u6709.png and b/public/images/emoji/google/u6709.png differ
diff --git a/public/images/emoji/google/u6e80.png b/public/images/emoji/google/u6e80.png
index 749f759aa6..9bf638e0e0 100644
Binary files a/public/images/emoji/google/u6e80.png and b/public/images/emoji/google/u6e80.png differ
diff --git a/public/images/emoji/google/u7121.png b/public/images/emoji/google/u7121.png
index d34fef0b4d..bc74187293 100644
Binary files a/public/images/emoji/google/u7121.png and b/public/images/emoji/google/u7121.png differ
diff --git a/public/images/emoji/google/u7533.png b/public/images/emoji/google/u7533.png
index 73a7bf1d66..47807c431e 100644
Binary files a/public/images/emoji/google/u7533.png and b/public/images/emoji/google/u7533.png differ
diff --git a/public/images/emoji/google/u7981.png b/public/images/emoji/google/u7981.png
index bc603461a2..cb0a60d06e 100644
Binary files a/public/images/emoji/google/u7981.png and b/public/images/emoji/google/u7981.png differ
diff --git a/public/images/emoji/google/u7a7a.png b/public/images/emoji/google/u7a7a.png
index 12ab0fc256..b28ebcaf6a 100644
Binary files a/public/images/emoji/google/u7a7a.png and b/public/images/emoji/google/u7a7a.png differ
diff --git a/public/images/emoji/google/uganda.png b/public/images/emoji/google/uganda.png
index e897ff257c..9f5dda6aa2 100644
Binary files a/public/images/emoji/google/uganda.png and b/public/images/emoji/google/uganda.png differ
diff --git a/public/images/emoji/google/uk.png b/public/images/emoji/google/uk.png
index 798328a1ee..e7f3da7ea8 100644
Binary files a/public/images/emoji/google/uk.png and b/public/images/emoji/google/uk.png differ
diff --git a/public/images/emoji/google/ukraine.png b/public/images/emoji/google/ukraine.png
index 5603cf126c..a45fa0d5b1 100644
Binary files a/public/images/emoji/google/ukraine.png and b/public/images/emoji/google/ukraine.png differ
diff --git a/public/images/emoji/google/umbrella.png b/public/images/emoji/google/umbrella.png
index 6141543918..acd0e9db07 100644
Binary files a/public/images/emoji/google/umbrella.png and b/public/images/emoji/google/umbrella.png differ
diff --git a/public/images/emoji/google/umbrella2.png b/public/images/emoji/google/umbrella2.png
index 21b025ea51..fb2f8bb58b 100644
Binary files a/public/images/emoji/google/umbrella2.png and b/public/images/emoji/google/umbrella2.png differ
diff --git a/public/images/emoji/google/umbrella_on_ground.png b/public/images/emoji/google/umbrella_on_ground.png
index 2a16b4d32a..c7358ec949 100644
Binary files a/public/images/emoji/google/umbrella_on_ground.png and b/public/images/emoji/google/umbrella_on_ground.png differ
diff --git a/public/images/emoji/google/unamused.png b/public/images/emoji/google/unamused.png
index 864cb33579..6086fa81e5 100644
Binary files a/public/images/emoji/google/unamused.png and b/public/images/emoji/google/unamused.png differ
diff --git a/public/images/emoji/google/underage.png b/public/images/emoji/google/underage.png
index 09e967fcad..bdbc877885 100644
Binary files a/public/images/emoji/google/underage.png and b/public/images/emoji/google/underage.png differ
diff --git a/public/images/emoji/google/unicorn.png b/public/images/emoji/google/unicorn.png
index b32a890bec..63f23b2971 100644
Binary files a/public/images/emoji/google/unicorn.png and b/public/images/emoji/google/unicorn.png differ
diff --git a/public/images/emoji/google/unicorn_face.png b/public/images/emoji/google/unicorn_face.png
index b32a890bec..63f23b2971 100644
Binary files a/public/images/emoji/google/unicorn_face.png and b/public/images/emoji/google/unicorn_face.png differ
diff --git a/public/images/emoji/google/united_arab_emirates.png b/public/images/emoji/google/united_arab_emirates.png
index 0e19ed7007..34cae172b2 100644
Binary files a/public/images/emoji/google/united_arab_emirates.png and b/public/images/emoji/google/united_arab_emirates.png differ
diff --git a/public/images/emoji/google/united_nations.png b/public/images/emoji/google/united_nations.png
index 721551f2b1..2319f40a5d 100644
Binary files a/public/images/emoji/google/united_nations.png and b/public/images/emoji/google/united_nations.png differ
diff --git a/public/images/emoji/google/unlock.png b/public/images/emoji/google/unlock.png
index 3f04497713..e85fdcb0ed 100644
Binary files a/public/images/emoji/google/unlock.png and b/public/images/emoji/google/unlock.png differ
diff --git a/public/images/emoji/google/up.png b/public/images/emoji/google/up.png
index ce2b306ca6..e755f1c17c 100644
Binary files a/public/images/emoji/google/up.png and b/public/images/emoji/google/up.png differ
diff --git a/public/images/emoji/google/upside_down.png b/public/images/emoji/google/upside_down.png
index 17905e1578..9a2cb935c3 100644
Binary files a/public/images/emoji/google/upside_down.png and b/public/images/emoji/google/upside_down.png differ
diff --git a/public/images/emoji/google/upside_down_face.png b/public/images/emoji/google/upside_down_face.png
index 17905e1578..9a2cb935c3 100644
Binary files a/public/images/emoji/google/upside_down_face.png and b/public/images/emoji/google/upside_down_face.png differ
diff --git a/public/images/emoji/google/urn.png b/public/images/emoji/google/urn.png
index 864d903a35..2276468356 100644
Binary files a/public/images/emoji/google/urn.png and b/public/images/emoji/google/urn.png differ
diff --git a/public/images/emoji/google/uruguay.png b/public/images/emoji/google/uruguay.png
index 2e547a48ff..67e76bd9d7 100644
Binary files a/public/images/emoji/google/uruguay.png and b/public/images/emoji/google/uruguay.png differ
diff --git a/public/images/emoji/google/us.png b/public/images/emoji/google/us.png
index fae4271511..44daa43947 100644
Binary files a/public/images/emoji/google/us.png and b/public/images/emoji/google/us.png differ
diff --git a/public/images/emoji/google/us_outlying_islands.png b/public/images/emoji/google/us_outlying_islands.png
index fae4271511..44daa43947 100644
Binary files a/public/images/emoji/google/us_outlying_islands.png and b/public/images/emoji/google/us_outlying_islands.png differ
diff --git a/public/images/emoji/google/us_virgin_islands.png b/public/images/emoji/google/us_virgin_islands.png
index ddfe661673..dc8b621abc 100644
Binary files a/public/images/emoji/google/us_virgin_islands.png and b/public/images/emoji/google/us_virgin_islands.png differ
diff --git a/public/images/emoji/google/uzbekistan.png b/public/images/emoji/google/uzbekistan.png
index f460a0ee46..69a3a188df 100644
Binary files a/public/images/emoji/google/uzbekistan.png and b/public/images/emoji/google/uzbekistan.png differ
diff --git a/public/images/emoji/google/v.png b/public/images/emoji/google/v.png
index b8cbb64306..f27b956aad 100644
Binary files a/public/images/emoji/google/v.png and b/public/images/emoji/google/v.png differ
diff --git a/public/images/emoji/google/v/2.png b/public/images/emoji/google/v/2.png
index 1645b2899b..ac53779b9f 100644
Binary files a/public/images/emoji/google/v/2.png and b/public/images/emoji/google/v/2.png differ
diff --git a/public/images/emoji/google/v/3.png b/public/images/emoji/google/v/3.png
index 15dc6dd3d3..f8ba0bf5ce 100644
Binary files a/public/images/emoji/google/v/3.png and b/public/images/emoji/google/v/3.png differ
diff --git a/public/images/emoji/google/v/4.png b/public/images/emoji/google/v/4.png
index b79939791b..807fa076d5 100644
Binary files a/public/images/emoji/google/v/4.png and b/public/images/emoji/google/v/4.png differ
diff --git a/public/images/emoji/google/v/5.png b/public/images/emoji/google/v/5.png
index a7211c352c..fedf80a7b3 100644
Binary files a/public/images/emoji/google/v/5.png and b/public/images/emoji/google/v/5.png differ
diff --git a/public/images/emoji/google/v/6.png b/public/images/emoji/google/v/6.png
index 9f9b21f325..dc52fdbfca 100644
Binary files a/public/images/emoji/google/v/6.png and b/public/images/emoji/google/v/6.png differ
diff --git a/public/images/emoji/google/vampire.png b/public/images/emoji/google/vampire.png
index 01bd481c60..ddfba45650 100644
Binary files a/public/images/emoji/google/vampire.png and b/public/images/emoji/google/vampire.png differ
diff --git a/public/images/emoji/google/vampire/2.png b/public/images/emoji/google/vampire/2.png
index 548e6e8284..18bcd1cae1 100644
Binary files a/public/images/emoji/google/vampire/2.png and b/public/images/emoji/google/vampire/2.png differ
diff --git a/public/images/emoji/google/vampire/3.png b/public/images/emoji/google/vampire/3.png
index 6498305d06..a2809d10c2 100644
Binary files a/public/images/emoji/google/vampire/3.png and b/public/images/emoji/google/vampire/3.png differ
diff --git a/public/images/emoji/google/vampire/4.png b/public/images/emoji/google/vampire/4.png
index dab2ba096e..320e3877e6 100644
Binary files a/public/images/emoji/google/vampire/4.png and b/public/images/emoji/google/vampire/4.png differ
diff --git a/public/images/emoji/google/vampire/5.png b/public/images/emoji/google/vampire/5.png
index dac38cae74..898e8a066e 100644
Binary files a/public/images/emoji/google/vampire/5.png and b/public/images/emoji/google/vampire/5.png differ
diff --git a/public/images/emoji/google/vampire/6.png b/public/images/emoji/google/vampire/6.png
index 3ad64b3710..792e078db6 100644
Binary files a/public/images/emoji/google/vampire/6.png and b/public/images/emoji/google/vampire/6.png differ
diff --git a/public/images/emoji/google/vanuatu.png b/public/images/emoji/google/vanuatu.png
index 3fc2e85ac8..7ef97a0665 100644
Binary files a/public/images/emoji/google/vanuatu.png and b/public/images/emoji/google/vanuatu.png differ
diff --git a/public/images/emoji/google/vatican_city.png b/public/images/emoji/google/vatican_city.png
index 1fad5c9269..932dc6f9db 100644
Binary files a/public/images/emoji/google/vatican_city.png and b/public/images/emoji/google/vatican_city.png differ
diff --git a/public/images/emoji/google/venezuela.png b/public/images/emoji/google/venezuela.png
index 2e340a521a..b62256b171 100644
Binary files a/public/images/emoji/google/venezuela.png and b/public/images/emoji/google/venezuela.png differ
diff --git a/public/images/emoji/google/vertical_traffic_light.png b/public/images/emoji/google/vertical_traffic_light.png
index 795439a0f2..716a33c3ac 100644
Binary files a/public/images/emoji/google/vertical_traffic_light.png and b/public/images/emoji/google/vertical_traffic_light.png differ
diff --git a/public/images/emoji/google/vhs.png b/public/images/emoji/google/vhs.png
index e3789dc34f..6f90d54b09 100644
Binary files a/public/images/emoji/google/vhs.png and b/public/images/emoji/google/vhs.png differ
diff --git a/public/images/emoji/google/vibration_mode.png b/public/images/emoji/google/vibration_mode.png
index a8f2fe50fe..fe9ec4f2bd 100644
Binary files a/public/images/emoji/google/vibration_mode.png and b/public/images/emoji/google/vibration_mode.png differ
diff --git a/public/images/emoji/google/video_camera.png b/public/images/emoji/google/video_camera.png
index fd426e4ad3..cdafa01e10 100644
Binary files a/public/images/emoji/google/video_camera.png and b/public/images/emoji/google/video_camera.png differ
diff --git a/public/images/emoji/google/video_game.png b/public/images/emoji/google/video_game.png
index 66a883da31..6e25166a2f 100644
Binary files a/public/images/emoji/google/video_game.png and b/public/images/emoji/google/video_game.png differ
diff --git a/public/images/emoji/google/vietnam.png b/public/images/emoji/google/vietnam.png
index 38ccc85e78..2f7e14c2d2 100644
Binary files a/public/images/emoji/google/vietnam.png and b/public/images/emoji/google/vietnam.png differ
diff --git a/public/images/emoji/google/violin.png b/public/images/emoji/google/violin.png
index e2d6924919..1c97e6b86b 100644
Binary files a/public/images/emoji/google/violin.png and b/public/images/emoji/google/violin.png differ
diff --git a/public/images/emoji/google/virgo.png b/public/images/emoji/google/virgo.png
index 45473446ff..686f14ed27 100644
Binary files a/public/images/emoji/google/virgo.png and b/public/images/emoji/google/virgo.png differ
diff --git a/public/images/emoji/google/volcano.png b/public/images/emoji/google/volcano.png
index 0baf654082..2002387c66 100644
Binary files a/public/images/emoji/google/volcano.png and b/public/images/emoji/google/volcano.png differ
diff --git a/public/images/emoji/google/volleyball.png b/public/images/emoji/google/volleyball.png
index 4cb7f03b3c..29570e66d3 100644
Binary files a/public/images/emoji/google/volleyball.png and b/public/images/emoji/google/volleyball.png differ
diff --git a/public/images/emoji/google/vs.png b/public/images/emoji/google/vs.png
index 2fe23e57ce..3a5791a6cb 100644
Binary files a/public/images/emoji/google/vs.png and b/public/images/emoji/google/vs.png differ
diff --git a/public/images/emoji/google/vulcan.png b/public/images/emoji/google/vulcan.png
index e672a711f1..bbedc6b2dc 100644
Binary files a/public/images/emoji/google/vulcan.png and b/public/images/emoji/google/vulcan.png differ
diff --git a/public/images/emoji/google/vulcan/2.png b/public/images/emoji/google/vulcan/2.png
index 635aa1f775..08e5bca605 100644
Binary files a/public/images/emoji/google/vulcan/2.png and b/public/images/emoji/google/vulcan/2.png differ
diff --git a/public/images/emoji/google/vulcan/3.png b/public/images/emoji/google/vulcan/3.png
index d6c303152c..c1059af3e0 100644
Binary files a/public/images/emoji/google/vulcan/3.png and b/public/images/emoji/google/vulcan/3.png differ
diff --git a/public/images/emoji/google/vulcan/4.png b/public/images/emoji/google/vulcan/4.png
index 645ad295a8..a6cc78518c 100644
Binary files a/public/images/emoji/google/vulcan/4.png and b/public/images/emoji/google/vulcan/4.png differ
diff --git a/public/images/emoji/google/vulcan/5.png b/public/images/emoji/google/vulcan/5.png
index cbb240d2c6..b4d9b458f9 100644
Binary files a/public/images/emoji/google/vulcan/5.png and b/public/images/emoji/google/vulcan/5.png differ
diff --git a/public/images/emoji/google/vulcan/6.png b/public/images/emoji/google/vulcan/6.png
index 0e727c865a..815b2959ec 100644
Binary files a/public/images/emoji/google/vulcan/6.png and b/public/images/emoji/google/vulcan/6.png differ
diff --git a/public/images/emoji/google/vulcan_salute.png b/public/images/emoji/google/vulcan_salute.png
index e672a711f1..bbedc6b2dc 100644
Binary files a/public/images/emoji/google/vulcan_salute.png and b/public/images/emoji/google/vulcan_salute.png differ
diff --git a/public/images/emoji/google/vulcan_salute/2.png b/public/images/emoji/google/vulcan_salute/2.png
index 635aa1f775..08e5bca605 100644
Binary files a/public/images/emoji/google/vulcan_salute/2.png and b/public/images/emoji/google/vulcan_salute/2.png differ
diff --git a/public/images/emoji/google/vulcan_salute/3.png b/public/images/emoji/google/vulcan_salute/3.png
index d6c303152c..c1059af3e0 100644
Binary files a/public/images/emoji/google/vulcan_salute/3.png and b/public/images/emoji/google/vulcan_salute/3.png differ
diff --git a/public/images/emoji/google/vulcan_salute/4.png b/public/images/emoji/google/vulcan_salute/4.png
index 645ad295a8..a6cc78518c 100644
Binary files a/public/images/emoji/google/vulcan_salute/4.png and b/public/images/emoji/google/vulcan_salute/4.png differ
diff --git a/public/images/emoji/google/vulcan_salute/5.png b/public/images/emoji/google/vulcan_salute/5.png
index cbb240d2c6..b4d9b458f9 100644
Binary files a/public/images/emoji/google/vulcan_salute/5.png and b/public/images/emoji/google/vulcan_salute/5.png differ
diff --git a/public/images/emoji/google/vulcan_salute/6.png b/public/images/emoji/google/vulcan_salute/6.png
index 0e727c865a..815b2959ec 100644
Binary files a/public/images/emoji/google/vulcan_salute/6.png and b/public/images/emoji/google/vulcan_salute/6.png differ
diff --git a/public/images/emoji/google/walking.png b/public/images/emoji/google/walking.png
index 509a8cdabe..56b2b54379 100644
Binary files a/public/images/emoji/google/walking.png and b/public/images/emoji/google/walking.png differ
diff --git a/public/images/emoji/google/walking/2.png b/public/images/emoji/google/walking/2.png
index e20ab75260..8aaf7b8bb1 100644
Binary files a/public/images/emoji/google/walking/2.png and b/public/images/emoji/google/walking/2.png differ
diff --git a/public/images/emoji/google/walking/3.png b/public/images/emoji/google/walking/3.png
index 766cfec327..8699975013 100644
Binary files a/public/images/emoji/google/walking/3.png and b/public/images/emoji/google/walking/3.png differ
diff --git a/public/images/emoji/google/walking/4.png b/public/images/emoji/google/walking/4.png
index a2a6fe42cf..87a2a6ee09 100644
Binary files a/public/images/emoji/google/walking/4.png and b/public/images/emoji/google/walking/4.png differ
diff --git a/public/images/emoji/google/walking/5.png b/public/images/emoji/google/walking/5.png
index 855ebfa8c7..10a74048e1 100644
Binary files a/public/images/emoji/google/walking/5.png and b/public/images/emoji/google/walking/5.png differ
diff --git a/public/images/emoji/google/walking/6.png b/public/images/emoji/google/walking/6.png
index 80df101bfd..8c0fd45250 100644
Binary files a/public/images/emoji/google/walking/6.png and b/public/images/emoji/google/walking/6.png differ
diff --git a/public/images/emoji/google/walking_man.png b/public/images/emoji/google/walking_man.png
index 509a8cdabe..56b2b54379 100644
Binary files a/public/images/emoji/google/walking_man.png and b/public/images/emoji/google/walking_man.png differ
diff --git a/public/images/emoji/google/walking_man/2.png b/public/images/emoji/google/walking_man/2.png
index e20ab75260..8aaf7b8bb1 100644
Binary files a/public/images/emoji/google/walking_man/2.png and b/public/images/emoji/google/walking_man/2.png differ
diff --git a/public/images/emoji/google/walking_man/3.png b/public/images/emoji/google/walking_man/3.png
index 766cfec327..8699975013 100644
Binary files a/public/images/emoji/google/walking_man/3.png and b/public/images/emoji/google/walking_man/3.png differ
diff --git a/public/images/emoji/google/walking_man/4.png b/public/images/emoji/google/walking_man/4.png
index a2a6fe42cf..87a2a6ee09 100644
Binary files a/public/images/emoji/google/walking_man/4.png and b/public/images/emoji/google/walking_man/4.png differ
diff --git a/public/images/emoji/google/walking_man/5.png b/public/images/emoji/google/walking_man/5.png
index 855ebfa8c7..10a74048e1 100644
Binary files a/public/images/emoji/google/walking_man/5.png and b/public/images/emoji/google/walking_man/5.png differ
diff --git a/public/images/emoji/google/walking_man/6.png b/public/images/emoji/google/walking_man/6.png
index 80df101bfd..8c0fd45250 100644
Binary files a/public/images/emoji/google/walking_man/6.png and b/public/images/emoji/google/walking_man/6.png differ
diff --git a/public/images/emoji/google/walking_woman.png b/public/images/emoji/google/walking_woman.png
index 5f70f0657f..2b87e8537a 100644
Binary files a/public/images/emoji/google/walking_woman.png and b/public/images/emoji/google/walking_woman.png differ
diff --git a/public/images/emoji/google/walking_woman/2.png b/public/images/emoji/google/walking_woman/2.png
index 10c82332c2..8e3a0e8987 100644
Binary files a/public/images/emoji/google/walking_woman/2.png and b/public/images/emoji/google/walking_woman/2.png differ
diff --git a/public/images/emoji/google/walking_woman/3.png b/public/images/emoji/google/walking_woman/3.png
index e99c4be9af..b9a582918a 100644
Binary files a/public/images/emoji/google/walking_woman/3.png and b/public/images/emoji/google/walking_woman/3.png differ
diff --git a/public/images/emoji/google/walking_woman/4.png b/public/images/emoji/google/walking_woman/4.png
index b06773ed46..793ab915a5 100644
Binary files a/public/images/emoji/google/walking_woman/4.png and b/public/images/emoji/google/walking_woman/4.png differ
diff --git a/public/images/emoji/google/walking_woman/5.png b/public/images/emoji/google/walking_woman/5.png
index dadb3e3416..b41933d1b4 100644
Binary files a/public/images/emoji/google/walking_woman/5.png and b/public/images/emoji/google/walking_woman/5.png differ
diff --git a/public/images/emoji/google/walking_woman/6.png b/public/images/emoji/google/walking_woman/6.png
index a2b5f60343..fe3f3a0ca4 100644
Binary files a/public/images/emoji/google/walking_woman/6.png and b/public/images/emoji/google/walking_woman/6.png differ
diff --git a/public/images/emoji/google/wallis_futuna.png b/public/images/emoji/google/wallis_futuna.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/wallis_futuna.png and b/public/images/emoji/google/wallis_futuna.png differ
diff --git a/public/images/emoji/google/waning_crescent_moon.png b/public/images/emoji/google/waning_crescent_moon.png
index 308cad43ea..58c850524b 100644
Binary files a/public/images/emoji/google/waning_crescent_moon.png and b/public/images/emoji/google/waning_crescent_moon.png differ
diff --git a/public/images/emoji/google/waning_gibbous_moon.png b/public/images/emoji/google/waning_gibbous_moon.png
index a3d48ca221..ccf5a37369 100644
Binary files a/public/images/emoji/google/waning_gibbous_moon.png and b/public/images/emoji/google/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/google/warning.png b/public/images/emoji/google/warning.png
index 9e3a4f3afe..f33839b22a 100644
Binary files a/public/images/emoji/google/warning.png and b/public/images/emoji/google/warning.png differ
diff --git a/public/images/emoji/google/wastebasket.png b/public/images/emoji/google/wastebasket.png
index 874a3480e8..a7f3c2c755 100644
Binary files a/public/images/emoji/google/wastebasket.png and b/public/images/emoji/google/wastebasket.png differ
diff --git a/public/images/emoji/google/watch.png b/public/images/emoji/google/watch.png
index d405c22176..23dd719800 100644
Binary files a/public/images/emoji/google/watch.png and b/public/images/emoji/google/watch.png differ
diff --git a/public/images/emoji/google/water_buffalo.png b/public/images/emoji/google/water_buffalo.png
index 1b2f9c7e59..4875eabcf8 100644
Binary files a/public/images/emoji/google/water_buffalo.png and b/public/images/emoji/google/water_buffalo.png differ
diff --git a/public/images/emoji/google/watermelon.png b/public/images/emoji/google/watermelon.png
index db68e49011..d42382a85f 100644
Binary files a/public/images/emoji/google/watermelon.png and b/public/images/emoji/google/watermelon.png differ
diff --git a/public/images/emoji/google/wave.png b/public/images/emoji/google/wave.png
index 90bca6de08..03d613d6e3 100644
Binary files a/public/images/emoji/google/wave.png and b/public/images/emoji/google/wave.png differ
diff --git a/public/images/emoji/google/wave/2.png b/public/images/emoji/google/wave/2.png
index 5c034714b0..afa3ea3147 100644
Binary files a/public/images/emoji/google/wave/2.png and b/public/images/emoji/google/wave/2.png differ
diff --git a/public/images/emoji/google/wave/3.png b/public/images/emoji/google/wave/3.png
index 9a2825e24e..f660986817 100644
Binary files a/public/images/emoji/google/wave/3.png and b/public/images/emoji/google/wave/3.png differ
diff --git a/public/images/emoji/google/wave/4.png b/public/images/emoji/google/wave/4.png
index bfbb943f5b..1620086b5b 100644
Binary files a/public/images/emoji/google/wave/4.png and b/public/images/emoji/google/wave/4.png differ
diff --git a/public/images/emoji/google/wave/5.png b/public/images/emoji/google/wave/5.png
index f4233b8168..7f7915f2a7 100644
Binary files a/public/images/emoji/google/wave/5.png and b/public/images/emoji/google/wave/5.png differ
diff --git a/public/images/emoji/google/wave/6.png b/public/images/emoji/google/wave/6.png
index d403d79c6f..318a34130c 100644
Binary files a/public/images/emoji/google/wave/6.png and b/public/images/emoji/google/wave/6.png differ
diff --git a/public/images/emoji/google/waving_black_flag.png b/public/images/emoji/google/waving_black_flag.png
index a7fce0c581..fd30f1d882 100644
Binary files a/public/images/emoji/google/waving_black_flag.png and b/public/images/emoji/google/waving_black_flag.png differ
diff --git a/public/images/emoji/google/waving_white_flag.png b/public/images/emoji/google/waving_white_flag.png
index 7876a1b95c..07d1f0ac70 100644
Binary files a/public/images/emoji/google/waving_white_flag.png and b/public/images/emoji/google/waving_white_flag.png differ
diff --git a/public/images/emoji/google/wavy_dash.png b/public/images/emoji/google/wavy_dash.png
index a11c57148d..89ce4b9975 100644
Binary files a/public/images/emoji/google/wavy_dash.png and b/public/images/emoji/google/wavy_dash.png differ
diff --git a/public/images/emoji/google/waxing_crescent_moon.png b/public/images/emoji/google/waxing_crescent_moon.png
index eafecdf573..e3c4042085 100644
Binary files a/public/images/emoji/google/waxing_crescent_moon.png and b/public/images/emoji/google/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/google/waxing_gibbous_moon.png b/public/images/emoji/google/waxing_gibbous_moon.png
index 358209cb64..046e3415c8 100644
Binary files a/public/images/emoji/google/waxing_gibbous_moon.png and b/public/images/emoji/google/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/google/wc.png b/public/images/emoji/google/wc.png
index b56cd1743b..4ded4875ad 100644
Binary files a/public/images/emoji/google/wc.png and b/public/images/emoji/google/wc.png differ
diff --git a/public/images/emoji/google/weary.png b/public/images/emoji/google/weary.png
index 16b0783cec..819cd5cc46 100644
Binary files a/public/images/emoji/google/weary.png and b/public/images/emoji/google/weary.png differ
diff --git a/public/images/emoji/google/wedding.png b/public/images/emoji/google/wedding.png
index 750e7e0c4a..1edc1ca2e6 100644
Binary files a/public/images/emoji/google/wedding.png and b/public/images/emoji/google/wedding.png differ
diff --git a/public/images/emoji/google/weight_lifter.png b/public/images/emoji/google/weight_lifter.png
index 47689fc292..d570f812ae 100644
Binary files a/public/images/emoji/google/weight_lifter.png and b/public/images/emoji/google/weight_lifter.png differ
diff --git a/public/images/emoji/google/weight_lifter/2.png b/public/images/emoji/google/weight_lifter/2.png
index 56ac45601a..711814184f 100644
Binary files a/public/images/emoji/google/weight_lifter/2.png and b/public/images/emoji/google/weight_lifter/2.png differ
diff --git a/public/images/emoji/google/weight_lifter/3.png b/public/images/emoji/google/weight_lifter/3.png
index e4f89233ed..87ea4ab0bd 100644
Binary files a/public/images/emoji/google/weight_lifter/3.png and b/public/images/emoji/google/weight_lifter/3.png differ
diff --git a/public/images/emoji/google/weight_lifter/4.png b/public/images/emoji/google/weight_lifter/4.png
index a0a5133cf4..7b424da2ad 100644
Binary files a/public/images/emoji/google/weight_lifter/4.png and b/public/images/emoji/google/weight_lifter/4.png differ
diff --git a/public/images/emoji/google/weight_lifter/5.png b/public/images/emoji/google/weight_lifter/5.png
index a38a3c841a..62304ee8ea 100644
Binary files a/public/images/emoji/google/weight_lifter/5.png and b/public/images/emoji/google/weight_lifter/5.png differ
diff --git a/public/images/emoji/google/weight_lifter/6.png b/public/images/emoji/google/weight_lifter/6.png
index f5b5614463..e1a4357862 100644
Binary files a/public/images/emoji/google/weight_lifter/6.png and b/public/images/emoji/google/weight_lifter/6.png differ
diff --git a/public/images/emoji/google/weight_lifting_man.png b/public/images/emoji/google/weight_lifting_man.png
index 47689fc292..d570f812ae 100644
Binary files a/public/images/emoji/google/weight_lifting_man.png and b/public/images/emoji/google/weight_lifting_man.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/2.png b/public/images/emoji/google/weight_lifting_man/2.png
index 56ac45601a..711814184f 100644
Binary files a/public/images/emoji/google/weight_lifting_man/2.png and b/public/images/emoji/google/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/3.png b/public/images/emoji/google/weight_lifting_man/3.png
index e4f89233ed..87ea4ab0bd 100644
Binary files a/public/images/emoji/google/weight_lifting_man/3.png and b/public/images/emoji/google/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/4.png b/public/images/emoji/google/weight_lifting_man/4.png
index a0a5133cf4..7b424da2ad 100644
Binary files a/public/images/emoji/google/weight_lifting_man/4.png and b/public/images/emoji/google/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/5.png b/public/images/emoji/google/weight_lifting_man/5.png
index a38a3c841a..62304ee8ea 100644
Binary files a/public/images/emoji/google/weight_lifting_man/5.png and b/public/images/emoji/google/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/6.png b/public/images/emoji/google/weight_lifting_man/6.png
index f5b5614463..e1a4357862 100644
Binary files a/public/images/emoji/google/weight_lifting_man/6.png and b/public/images/emoji/google/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/google/weight_lifting_woman.png b/public/images/emoji/google/weight_lifting_woman.png
index 52b046d7d8..d47ac9688c 100644
Binary files a/public/images/emoji/google/weight_lifting_woman.png and b/public/images/emoji/google/weight_lifting_woman.png differ
diff --git a/public/images/emoji/google/western_sahara.png b/public/images/emoji/google/western_sahara.png
index dad0f8ce65..4faf7e252e 100644
Binary files a/public/images/emoji/google/western_sahara.png and b/public/images/emoji/google/western_sahara.png differ
diff --git a/public/images/emoji/google/whale.png b/public/images/emoji/google/whale.png
index 114853b626..698ee64a11 100644
Binary files a/public/images/emoji/google/whale.png and b/public/images/emoji/google/whale.png differ
diff --git a/public/images/emoji/google/whale2.png b/public/images/emoji/google/whale2.png
index 0b96c8556b..93eac3af50 100644
Binary files a/public/images/emoji/google/whale2.png and b/public/images/emoji/google/whale2.png differ
diff --git a/public/images/emoji/google/wheel_of_dharma.png b/public/images/emoji/google/wheel_of_dharma.png
index 71da4ccd16..08c8f26116 100644
Binary files a/public/images/emoji/google/wheel_of_dharma.png and b/public/images/emoji/google/wheel_of_dharma.png differ
diff --git a/public/images/emoji/google/wheelchair.png b/public/images/emoji/google/wheelchair.png
index 96ac605b62..8dcf463590 100644
Binary files a/public/images/emoji/google/wheelchair.png and b/public/images/emoji/google/wheelchair.png differ
diff --git a/public/images/emoji/google/white_check_mark.png b/public/images/emoji/google/white_check_mark.png
index 5c357f7c11..2383fb4046 100644
Binary files a/public/images/emoji/google/white_check_mark.png and b/public/images/emoji/google/white_check_mark.png differ
diff --git a/public/images/emoji/google/white_circle.png b/public/images/emoji/google/white_circle.png
index 6723e92a5f..ac6931ad0f 100644
Binary files a/public/images/emoji/google/white_circle.png and b/public/images/emoji/google/white_circle.png differ
diff --git a/public/images/emoji/google/white_flag.png b/public/images/emoji/google/white_flag.png
index 7876a1b95c..07d1f0ac70 100644
Binary files a/public/images/emoji/google/white_flag.png and b/public/images/emoji/google/white_flag.png differ
diff --git a/public/images/emoji/google/white_flower.png b/public/images/emoji/google/white_flower.png
index dfa80abfe7..578e06c423 100644
Binary files a/public/images/emoji/google/white_flower.png and b/public/images/emoji/google/white_flower.png differ
diff --git a/public/images/emoji/google/white_frowning_face.png b/public/images/emoji/google/white_frowning_face.png
index 7248eaba8a..a8a41ad7c2 100644
Binary files a/public/images/emoji/google/white_frowning_face.png and b/public/images/emoji/google/white_frowning_face.png differ
diff --git a/public/images/emoji/google/white_large_square.png b/public/images/emoji/google/white_large_square.png
index 79debc6d73..78b8fc961a 100644
Binary files a/public/images/emoji/google/white_large_square.png and b/public/images/emoji/google/white_large_square.png differ
diff --git a/public/images/emoji/google/white_medium_small_square.png b/public/images/emoji/google/white_medium_small_square.png
index 9067cd7ef9..56d54d96ab 100644
Binary files a/public/images/emoji/google/white_medium_small_square.png and b/public/images/emoji/google/white_medium_small_square.png differ
diff --git a/public/images/emoji/google/white_medium_square.png b/public/images/emoji/google/white_medium_square.png
index cfdbe99458..9f5e3266fa 100644
Binary files a/public/images/emoji/google/white_medium_square.png and b/public/images/emoji/google/white_medium_square.png differ
diff --git a/public/images/emoji/google/white_small_square.png b/public/images/emoji/google/white_small_square.png
index 5707878560..574c4681f0 100644
Binary files a/public/images/emoji/google/white_small_square.png and b/public/images/emoji/google/white_small_square.png differ
diff --git a/public/images/emoji/google/white_square_button.png b/public/images/emoji/google/white_square_button.png
index 7e68a0c8ba..8450f15814 100644
Binary files a/public/images/emoji/google/white_square_button.png and b/public/images/emoji/google/white_square_button.png differ
diff --git a/public/images/emoji/google/white_sun_behind_cloud.png b/public/images/emoji/google/white_sun_behind_cloud.png
index e3a78dca90..2adf6fc83e 100644
Binary files a/public/images/emoji/google/white_sun_behind_cloud.png and b/public/images/emoji/google/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_behind_cloud_with_rain.png b/public/images/emoji/google/white_sun_behind_cloud_with_rain.png
index 4fc26cb31b..1d5cfc81bf 100644
Binary files a/public/images/emoji/google/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/google/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/google/white_sun_cloud.png b/public/images/emoji/google/white_sun_cloud.png
index e3a78dca90..2adf6fc83e 100644
Binary files a/public/images/emoji/google/white_sun_cloud.png and b/public/images/emoji/google/white_sun_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_rain_cloud.png b/public/images/emoji/google/white_sun_rain_cloud.png
index 4fc26cb31b..1d5cfc81bf 100644
Binary files a/public/images/emoji/google/white_sun_rain_cloud.png and b/public/images/emoji/google/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_small_cloud.png b/public/images/emoji/google/white_sun_small_cloud.png
index ca30e8990b..91998ebb31 100644
Binary files a/public/images/emoji/google/white_sun_small_cloud.png and b/public/images/emoji/google/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_with_small_cloud.png b/public/images/emoji/google/white_sun_with_small_cloud.png
index ca30e8990b..91998ebb31 100644
Binary files a/public/images/emoji/google/white_sun_with_small_cloud.png and b/public/images/emoji/google/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/google/wilted_flower.png b/public/images/emoji/google/wilted_flower.png
index 58be454893..837b38c2e3 100644
Binary files a/public/images/emoji/google/wilted_flower.png and b/public/images/emoji/google/wilted_flower.png differ
diff --git a/public/images/emoji/google/wind_blowing_face.png b/public/images/emoji/google/wind_blowing_face.png
index b7184aa468..9d4564b7d8 100644
Binary files a/public/images/emoji/google/wind_blowing_face.png and b/public/images/emoji/google/wind_blowing_face.png differ
diff --git a/public/images/emoji/google/wind_chime.png b/public/images/emoji/google/wind_chime.png
index ba76dbc1bf..ffe151334a 100644
Binary files a/public/images/emoji/google/wind_chime.png and b/public/images/emoji/google/wind_chime.png differ
diff --git a/public/images/emoji/google/wind_face.png b/public/images/emoji/google/wind_face.png
index b7184aa468..9d4564b7d8 100644
Binary files a/public/images/emoji/google/wind_face.png and b/public/images/emoji/google/wind_face.png differ
diff --git a/public/images/emoji/google/wine_glass.png b/public/images/emoji/google/wine_glass.png
index dc515b3065..4bbae3e731 100644
Binary files a/public/images/emoji/google/wine_glass.png and b/public/images/emoji/google/wine_glass.png differ
diff --git a/public/images/emoji/google/wink.png b/public/images/emoji/google/wink.png
index 4a06288ae6..10bad34b20 100644
Binary files a/public/images/emoji/google/wink.png and b/public/images/emoji/google/wink.png differ
diff --git a/public/images/emoji/google/wolf.png b/public/images/emoji/google/wolf.png
index f6bfb3f47c..65207a1ec6 100644
Binary files a/public/images/emoji/google/wolf.png and b/public/images/emoji/google/wolf.png differ
diff --git a/public/images/emoji/google/woman.png b/public/images/emoji/google/woman.png
index 058ac922a7..3435d4c5a6 100644
Binary files a/public/images/emoji/google/woman.png and b/public/images/emoji/google/woman.png differ
diff --git a/public/images/emoji/google/woman/2.png b/public/images/emoji/google/woman/2.png
index 99a6a7c428..7f2b3959b9 100644
Binary files a/public/images/emoji/google/woman/2.png and b/public/images/emoji/google/woman/2.png differ
diff --git a/public/images/emoji/google/woman/3.png b/public/images/emoji/google/woman/3.png
index 35beb7b046..c36d3c7980 100644
Binary files a/public/images/emoji/google/woman/3.png and b/public/images/emoji/google/woman/3.png differ
diff --git a/public/images/emoji/google/woman/4.png b/public/images/emoji/google/woman/4.png
index 2b783f6a8c..5913bb1e7b 100644
Binary files a/public/images/emoji/google/woman/4.png and b/public/images/emoji/google/woman/4.png differ
diff --git a/public/images/emoji/google/woman/5.png b/public/images/emoji/google/woman/5.png
index 734c78d646..f8be9a29d5 100644
Binary files a/public/images/emoji/google/woman/5.png and b/public/images/emoji/google/woman/5.png differ
diff --git a/public/images/emoji/google/woman/6.png b/public/images/emoji/google/woman/6.png
index c0a3986e5f..af6e1a6ea5 100644
Binary files a/public/images/emoji/google/woman/6.png and b/public/images/emoji/google/woman/6.png differ
diff --git a/public/images/emoji/google/woman_artist.png b/public/images/emoji/google/woman_artist.png
index 8f158f2450..c9f5f02115 100644
Binary files a/public/images/emoji/google/woman_artist.png and b/public/images/emoji/google/woman_artist.png differ
diff --git a/public/images/emoji/google/woman_artist/2.png b/public/images/emoji/google/woman_artist/2.png
index 001ca83b26..d3e38907b9 100644
Binary files a/public/images/emoji/google/woman_artist/2.png and b/public/images/emoji/google/woman_artist/2.png differ
diff --git a/public/images/emoji/google/woman_artist/3.png b/public/images/emoji/google/woman_artist/3.png
index 5f41ea5f82..b54bdfd47e 100644
Binary files a/public/images/emoji/google/woman_artist/3.png and b/public/images/emoji/google/woman_artist/3.png differ
diff --git a/public/images/emoji/google/woman_artist/4.png b/public/images/emoji/google/woman_artist/4.png
index 5b5e3fcd50..a1ade3bce2 100644
Binary files a/public/images/emoji/google/woman_artist/4.png and b/public/images/emoji/google/woman_artist/4.png differ
diff --git a/public/images/emoji/google/woman_artist/5.png b/public/images/emoji/google/woman_artist/5.png
index cefcb97332..fc13f109f6 100644
Binary files a/public/images/emoji/google/woman_artist/5.png and b/public/images/emoji/google/woman_artist/5.png differ
diff --git a/public/images/emoji/google/woman_artist/6.png b/public/images/emoji/google/woman_artist/6.png
index 93ae8562d5..2bcca7c8b9 100644
Binary files a/public/images/emoji/google/woman_artist/6.png and b/public/images/emoji/google/woman_artist/6.png differ
diff --git a/public/images/emoji/google/woman_astronaut.png b/public/images/emoji/google/woman_astronaut.png
index 5505538a5c..1c5f4fc51f 100644
Binary files a/public/images/emoji/google/woman_astronaut.png and b/public/images/emoji/google/woman_astronaut.png differ
diff --git a/public/images/emoji/google/woman_astronaut/2.png b/public/images/emoji/google/woman_astronaut/2.png
index aae23cda09..5b63c9f3b4 100644
Binary files a/public/images/emoji/google/woman_astronaut/2.png and b/public/images/emoji/google/woman_astronaut/2.png differ
diff --git a/public/images/emoji/google/woman_astronaut/3.png b/public/images/emoji/google/woman_astronaut/3.png
index c109ee20f3..7fd9d6be8d 100644
Binary files a/public/images/emoji/google/woman_astronaut/3.png and b/public/images/emoji/google/woman_astronaut/3.png differ
diff --git a/public/images/emoji/google/woman_astronaut/4.png b/public/images/emoji/google/woman_astronaut/4.png
index 5bc3c00083..6cc43f4cd6 100644
Binary files a/public/images/emoji/google/woman_astronaut/4.png and b/public/images/emoji/google/woman_astronaut/4.png differ
diff --git a/public/images/emoji/google/woman_astronaut/5.png b/public/images/emoji/google/woman_astronaut/5.png
index f431f72787..88779d27bd 100644
Binary files a/public/images/emoji/google/woman_astronaut/5.png and b/public/images/emoji/google/woman_astronaut/5.png differ
diff --git a/public/images/emoji/google/woman_astronaut/6.png b/public/images/emoji/google/woman_astronaut/6.png
index 4416880093..36369c3650 100644
Binary files a/public/images/emoji/google/woman_astronaut/6.png and b/public/images/emoji/google/woman_astronaut/6.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling.png b/public/images/emoji/google/woman_cartwheeling.png
index fda8a2d50b..4bb67d8513 100644
Binary files a/public/images/emoji/google/woman_cartwheeling.png and b/public/images/emoji/google/woman_cartwheeling.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/2.png b/public/images/emoji/google/woman_cartwheeling/2.png
index df68948dc8..38176a6d0d 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/2.png and b/public/images/emoji/google/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/3.png b/public/images/emoji/google/woman_cartwheeling/3.png
index 67712e5005..4f6cddbabf 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/3.png and b/public/images/emoji/google/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/4.png b/public/images/emoji/google/woman_cartwheeling/4.png
index 6a56eb6539..638c5678c1 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/4.png and b/public/images/emoji/google/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/5.png b/public/images/emoji/google/woman_cartwheeling/5.png
index ae2760e26b..4d2ac50b7a 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/5.png and b/public/images/emoji/google/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/6.png b/public/images/emoji/google/woman_cartwheeling/6.png
index 92171ba208..9fae2a8d09 100644
Binary files a/public/images/emoji/google/woman_cartwheeling/6.png and b/public/images/emoji/google/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/google/woman_cook.png b/public/images/emoji/google/woman_cook.png
index 293d1bf583..2d3c1889ea 100644
Binary files a/public/images/emoji/google/woman_cook.png and b/public/images/emoji/google/woman_cook.png differ
diff --git a/public/images/emoji/google/woman_cook/2.png b/public/images/emoji/google/woman_cook/2.png
index c05237df59..cbbf29c743 100644
Binary files a/public/images/emoji/google/woman_cook/2.png and b/public/images/emoji/google/woman_cook/2.png differ
diff --git a/public/images/emoji/google/woman_cook/3.png b/public/images/emoji/google/woman_cook/3.png
index 63cdde05b8..dc17fdbbb0 100644
Binary files a/public/images/emoji/google/woman_cook/3.png and b/public/images/emoji/google/woman_cook/3.png differ
diff --git a/public/images/emoji/google/woman_cook/4.png b/public/images/emoji/google/woman_cook/4.png
index e5546526e7..633d9d3bac 100644
Binary files a/public/images/emoji/google/woman_cook/4.png and b/public/images/emoji/google/woman_cook/4.png differ
diff --git a/public/images/emoji/google/woman_cook/5.png b/public/images/emoji/google/woman_cook/5.png
index 07a5ca711b..53b11f2128 100644
Binary files a/public/images/emoji/google/woman_cook/5.png and b/public/images/emoji/google/woman_cook/5.png differ
diff --git a/public/images/emoji/google/woman_cook/6.png b/public/images/emoji/google/woman_cook/6.png
index b08c20bb85..e94157a7ca 100644
Binary files a/public/images/emoji/google/woman_cook/6.png and b/public/images/emoji/google/woman_cook/6.png differ
diff --git a/public/images/emoji/google/woman_facepalming.png b/public/images/emoji/google/woman_facepalming.png
index 545a28a2ab..fd22474456 100644
Binary files a/public/images/emoji/google/woman_facepalming.png and b/public/images/emoji/google/woman_facepalming.png differ
diff --git a/public/images/emoji/google/woman_facepalming/2.png b/public/images/emoji/google/woman_facepalming/2.png
index b4c1b9189f..3a0109e29a 100644
Binary files a/public/images/emoji/google/woman_facepalming/2.png and b/public/images/emoji/google/woman_facepalming/2.png differ
diff --git a/public/images/emoji/google/woman_facepalming/3.png b/public/images/emoji/google/woman_facepalming/3.png
index 34678c776b..09f1a1a7ac 100644
Binary files a/public/images/emoji/google/woman_facepalming/3.png and b/public/images/emoji/google/woman_facepalming/3.png differ
diff --git a/public/images/emoji/google/woman_facepalming/4.png b/public/images/emoji/google/woman_facepalming/4.png
index a951cc15b7..3a0c56a0cc 100644
Binary files a/public/images/emoji/google/woman_facepalming/4.png and b/public/images/emoji/google/woman_facepalming/4.png differ
diff --git a/public/images/emoji/google/woman_facepalming/5.png b/public/images/emoji/google/woman_facepalming/5.png
index 54e377054f..48ed68232f 100644
Binary files a/public/images/emoji/google/woman_facepalming/5.png and b/public/images/emoji/google/woman_facepalming/5.png differ
diff --git a/public/images/emoji/google/woman_facepalming/6.png b/public/images/emoji/google/woman_facepalming/6.png
index 5a432ab436..d1f5e4c347 100644
Binary files a/public/images/emoji/google/woman_facepalming/6.png and b/public/images/emoji/google/woman_facepalming/6.png differ
diff --git a/public/images/emoji/google/woman_factory_worker.png b/public/images/emoji/google/woman_factory_worker.png
index ea445420a5..8e050581c8 100644
Binary files a/public/images/emoji/google/woman_factory_worker.png and b/public/images/emoji/google/woman_factory_worker.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/2.png b/public/images/emoji/google/woman_factory_worker/2.png
index a529dbdf45..c6ba714cdd 100644
Binary files a/public/images/emoji/google/woman_factory_worker/2.png and b/public/images/emoji/google/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/3.png b/public/images/emoji/google/woman_factory_worker/3.png
index 99fa60a936..a784cc3de7 100644
Binary files a/public/images/emoji/google/woman_factory_worker/3.png and b/public/images/emoji/google/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/4.png b/public/images/emoji/google/woman_factory_worker/4.png
index f189a16315..911dd709b4 100644
Binary files a/public/images/emoji/google/woman_factory_worker/4.png and b/public/images/emoji/google/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/5.png b/public/images/emoji/google/woman_factory_worker/5.png
index 1dcc159847..a3cb7c1718 100644
Binary files a/public/images/emoji/google/woman_factory_worker/5.png and b/public/images/emoji/google/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/6.png b/public/images/emoji/google/woman_factory_worker/6.png
index fd6e058e78..1e4349664f 100644
Binary files a/public/images/emoji/google/woman_factory_worker/6.png and b/public/images/emoji/google/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/google/woman_farmer.png b/public/images/emoji/google/woman_farmer.png
index d894f4a079..7a3a131c26 100644
Binary files a/public/images/emoji/google/woman_farmer.png and b/public/images/emoji/google/woman_farmer.png differ
diff --git a/public/images/emoji/google/woman_farmer/2.png b/public/images/emoji/google/woman_farmer/2.png
index 2097b976bb..30449e7a50 100644
Binary files a/public/images/emoji/google/woman_farmer/2.png and b/public/images/emoji/google/woman_farmer/2.png differ
diff --git a/public/images/emoji/google/woman_farmer/3.png b/public/images/emoji/google/woman_farmer/3.png
index f442f76cb9..6dcd2c519b 100644
Binary files a/public/images/emoji/google/woman_farmer/3.png and b/public/images/emoji/google/woman_farmer/3.png differ
diff --git a/public/images/emoji/google/woman_farmer/4.png b/public/images/emoji/google/woman_farmer/4.png
index 0062e66b21..c9768e0ac0 100644
Binary files a/public/images/emoji/google/woman_farmer/4.png and b/public/images/emoji/google/woman_farmer/4.png differ
diff --git a/public/images/emoji/google/woman_farmer/5.png b/public/images/emoji/google/woman_farmer/5.png
index 443fd921de..d1937e6884 100644
Binary files a/public/images/emoji/google/woman_farmer/5.png and b/public/images/emoji/google/woman_farmer/5.png differ
diff --git a/public/images/emoji/google/woman_farmer/6.png b/public/images/emoji/google/woman_farmer/6.png
index 09c1847f81..300706280e 100644
Binary files a/public/images/emoji/google/woman_farmer/6.png and b/public/images/emoji/google/woman_farmer/6.png differ
diff --git a/public/images/emoji/google/woman_firefighter.png b/public/images/emoji/google/woman_firefighter.png
index fcd02ecb2d..b6d109ae50 100644
Binary files a/public/images/emoji/google/woman_firefighter.png and b/public/images/emoji/google/woman_firefighter.png differ
diff --git a/public/images/emoji/google/woman_firefighter/2.png b/public/images/emoji/google/woman_firefighter/2.png
index bd4c141f49..db97e4ffac 100644
Binary files a/public/images/emoji/google/woman_firefighter/2.png and b/public/images/emoji/google/woman_firefighter/2.png differ
diff --git a/public/images/emoji/google/woman_firefighter/3.png b/public/images/emoji/google/woman_firefighter/3.png
index 72fe9dd61d..05da18a1e3 100644
Binary files a/public/images/emoji/google/woman_firefighter/3.png and b/public/images/emoji/google/woman_firefighter/3.png differ
diff --git a/public/images/emoji/google/woman_firefighter/4.png b/public/images/emoji/google/woman_firefighter/4.png
index 68e5aba4ce..a85f02b9dd 100644
Binary files a/public/images/emoji/google/woman_firefighter/4.png and b/public/images/emoji/google/woman_firefighter/4.png differ
diff --git a/public/images/emoji/google/woman_firefighter/5.png b/public/images/emoji/google/woman_firefighter/5.png
index b98ba5dc9a..62fc451281 100644
Binary files a/public/images/emoji/google/woman_firefighter/5.png and b/public/images/emoji/google/woman_firefighter/5.png differ
diff --git a/public/images/emoji/google/woman_firefighter/6.png b/public/images/emoji/google/woman_firefighter/6.png
index e936ad67be..8e815d0c93 100644
Binary files a/public/images/emoji/google/woman_firefighter/6.png and b/public/images/emoji/google/woman_firefighter/6.png differ
diff --git a/public/images/emoji/google/woman_health_worker.png b/public/images/emoji/google/woman_health_worker.png
index 455bd7b24b..810c445fc2 100644
Binary files a/public/images/emoji/google/woman_health_worker.png and b/public/images/emoji/google/woman_health_worker.png differ
diff --git a/public/images/emoji/google/woman_health_worker/2.png b/public/images/emoji/google/woman_health_worker/2.png
index b668529d5d..7c86db8120 100644
Binary files a/public/images/emoji/google/woman_health_worker/2.png and b/public/images/emoji/google/woman_health_worker/2.png differ
diff --git a/public/images/emoji/google/woman_health_worker/3.png b/public/images/emoji/google/woman_health_worker/3.png
index 09b136615b..d6a034db86 100644
Binary files a/public/images/emoji/google/woman_health_worker/3.png and b/public/images/emoji/google/woman_health_worker/3.png differ
diff --git a/public/images/emoji/google/woman_health_worker/4.png b/public/images/emoji/google/woman_health_worker/4.png
index fc8edda1fd..a5cb06d79b 100644
Binary files a/public/images/emoji/google/woman_health_worker/4.png and b/public/images/emoji/google/woman_health_worker/4.png differ
diff --git a/public/images/emoji/google/woman_health_worker/5.png b/public/images/emoji/google/woman_health_worker/5.png
index a007e1d6c3..e0e743323c 100644
Binary files a/public/images/emoji/google/woman_health_worker/5.png and b/public/images/emoji/google/woman_health_worker/5.png differ
diff --git a/public/images/emoji/google/woman_health_worker/6.png b/public/images/emoji/google/woman_health_worker/6.png
index bda7018049..1c0ce71765 100644
Binary files a/public/images/emoji/google/woman_health_worker/6.png and b/public/images/emoji/google/woman_health_worker/6.png differ
diff --git a/public/images/emoji/google/woman_judge.png b/public/images/emoji/google/woman_judge.png
index ae2d4f1060..ebee12d4a9 100644
Binary files a/public/images/emoji/google/woman_judge.png and b/public/images/emoji/google/woman_judge.png differ
diff --git a/public/images/emoji/google/woman_judge/2.png b/public/images/emoji/google/woman_judge/2.png
index 198e959987..135cb8ee4f 100644
Binary files a/public/images/emoji/google/woman_judge/2.png and b/public/images/emoji/google/woman_judge/2.png differ
diff --git a/public/images/emoji/google/woman_judge/3.png b/public/images/emoji/google/woman_judge/3.png
index 65193777b8..745e7efd37 100644
Binary files a/public/images/emoji/google/woman_judge/3.png and b/public/images/emoji/google/woman_judge/3.png differ
diff --git a/public/images/emoji/google/woman_judge/4.png b/public/images/emoji/google/woman_judge/4.png
index 27d70a9580..6fcae23c41 100644
Binary files a/public/images/emoji/google/woman_judge/4.png and b/public/images/emoji/google/woman_judge/4.png differ
diff --git a/public/images/emoji/google/woman_judge/5.png b/public/images/emoji/google/woman_judge/5.png
index 107b1df76a..43ebd2dd5d 100644
Binary files a/public/images/emoji/google/woman_judge/5.png and b/public/images/emoji/google/woman_judge/5.png differ
diff --git a/public/images/emoji/google/woman_judge/6.png b/public/images/emoji/google/woman_judge/6.png
index 10aae699ca..7959a31a1b 100644
Binary files a/public/images/emoji/google/woman_judge/6.png and b/public/images/emoji/google/woman_judge/6.png differ
diff --git a/public/images/emoji/google/woman_juggling.png b/public/images/emoji/google/woman_juggling.png
index 189098d616..b843d5530c 100644
Binary files a/public/images/emoji/google/woman_juggling.png and b/public/images/emoji/google/woman_juggling.png differ
diff --git a/public/images/emoji/google/woman_juggling/2.png b/public/images/emoji/google/woman_juggling/2.png
index e999b0923c..baeb075b40 100644
Binary files a/public/images/emoji/google/woman_juggling/2.png and b/public/images/emoji/google/woman_juggling/2.png differ
diff --git a/public/images/emoji/google/woman_juggling/3.png b/public/images/emoji/google/woman_juggling/3.png
index 6ff879f5e4..31d71f287b 100644
Binary files a/public/images/emoji/google/woman_juggling/3.png and b/public/images/emoji/google/woman_juggling/3.png differ
diff --git a/public/images/emoji/google/woman_juggling/4.png b/public/images/emoji/google/woman_juggling/4.png
index 2827bd824e..11f129b22a 100644
Binary files a/public/images/emoji/google/woman_juggling/4.png and b/public/images/emoji/google/woman_juggling/4.png differ
diff --git a/public/images/emoji/google/woman_juggling/5.png b/public/images/emoji/google/woman_juggling/5.png
index 60e76455f9..1433948143 100644
Binary files a/public/images/emoji/google/woman_juggling/5.png and b/public/images/emoji/google/woman_juggling/5.png differ
diff --git a/public/images/emoji/google/woman_juggling/6.png b/public/images/emoji/google/woman_juggling/6.png
index caa0d3c91d..3285908a25 100644
Binary files a/public/images/emoji/google/woman_juggling/6.png and b/public/images/emoji/google/woman_juggling/6.png differ
diff --git a/public/images/emoji/google/woman_mechanic.png b/public/images/emoji/google/woman_mechanic.png
index 7eeb2ef6bc..70af3085a4 100644
Binary files a/public/images/emoji/google/woman_mechanic.png and b/public/images/emoji/google/woman_mechanic.png differ
diff --git a/public/images/emoji/google/woman_mechanic/2.png b/public/images/emoji/google/woman_mechanic/2.png
index e1ef75546d..d7eec2aaca 100644
Binary files a/public/images/emoji/google/woman_mechanic/2.png and b/public/images/emoji/google/woman_mechanic/2.png differ
diff --git a/public/images/emoji/google/woman_mechanic/3.png b/public/images/emoji/google/woman_mechanic/3.png
index c39f8a474f..3bfe4d6db0 100644
Binary files a/public/images/emoji/google/woman_mechanic/3.png and b/public/images/emoji/google/woman_mechanic/3.png differ
diff --git a/public/images/emoji/google/woman_mechanic/4.png b/public/images/emoji/google/woman_mechanic/4.png
index bac5d42b8d..6618a664e1 100644
Binary files a/public/images/emoji/google/woman_mechanic/4.png and b/public/images/emoji/google/woman_mechanic/4.png differ
diff --git a/public/images/emoji/google/woman_mechanic/5.png b/public/images/emoji/google/woman_mechanic/5.png
index 4fc2caffd8..d248676a60 100644
Binary files a/public/images/emoji/google/woman_mechanic/5.png and b/public/images/emoji/google/woman_mechanic/5.png differ
diff --git a/public/images/emoji/google/woman_mechanic/6.png b/public/images/emoji/google/woman_mechanic/6.png
index a5351ed74c..80fe3befe1 100644
Binary files a/public/images/emoji/google/woman_mechanic/6.png and b/public/images/emoji/google/woman_mechanic/6.png differ
diff --git a/public/images/emoji/google/woman_office_worker.png b/public/images/emoji/google/woman_office_worker.png
index ee71c20cec..7778c68537 100644
Binary files a/public/images/emoji/google/woman_office_worker.png and b/public/images/emoji/google/woman_office_worker.png differ
diff --git a/public/images/emoji/google/woman_office_worker/2.png b/public/images/emoji/google/woman_office_worker/2.png
index 0ca85ae238..36322659e0 100644
Binary files a/public/images/emoji/google/woman_office_worker/2.png and b/public/images/emoji/google/woman_office_worker/2.png differ
diff --git a/public/images/emoji/google/woman_office_worker/3.png b/public/images/emoji/google/woman_office_worker/3.png
index db57388467..a4eaaf7966 100644
Binary files a/public/images/emoji/google/woman_office_worker/3.png and b/public/images/emoji/google/woman_office_worker/3.png differ
diff --git a/public/images/emoji/google/woman_office_worker/4.png b/public/images/emoji/google/woman_office_worker/4.png
index 1991920980..7133b0b5de 100644
Binary files a/public/images/emoji/google/woman_office_worker/4.png and b/public/images/emoji/google/woman_office_worker/4.png differ
diff --git a/public/images/emoji/google/woman_office_worker/5.png b/public/images/emoji/google/woman_office_worker/5.png
index df9bce7b2f..fdcb19fd4a 100644
Binary files a/public/images/emoji/google/woman_office_worker/5.png and b/public/images/emoji/google/woman_office_worker/5.png differ
diff --git a/public/images/emoji/google/woman_office_worker/6.png b/public/images/emoji/google/woman_office_worker/6.png
index 935bcfebc2..36d13687aa 100644
Binary files a/public/images/emoji/google/woman_office_worker/6.png and b/public/images/emoji/google/woman_office_worker/6.png differ
diff --git a/public/images/emoji/google/woman_pilot.png b/public/images/emoji/google/woman_pilot.png
index 20cc870716..5b3ad9ff31 100644
Binary files a/public/images/emoji/google/woman_pilot.png and b/public/images/emoji/google/woman_pilot.png differ
diff --git a/public/images/emoji/google/woman_pilot/2.png b/public/images/emoji/google/woman_pilot/2.png
index 378e61efe1..aa799abf01 100644
Binary files a/public/images/emoji/google/woman_pilot/2.png and b/public/images/emoji/google/woman_pilot/2.png differ
diff --git a/public/images/emoji/google/woman_pilot/3.png b/public/images/emoji/google/woman_pilot/3.png
index e2484c4785..6e7648a9bc 100644
Binary files a/public/images/emoji/google/woman_pilot/3.png and b/public/images/emoji/google/woman_pilot/3.png differ
diff --git a/public/images/emoji/google/woman_pilot/4.png b/public/images/emoji/google/woman_pilot/4.png
index f59c81321f..0fe55e61a2 100644
Binary files a/public/images/emoji/google/woman_pilot/4.png and b/public/images/emoji/google/woman_pilot/4.png differ
diff --git a/public/images/emoji/google/woman_pilot/5.png b/public/images/emoji/google/woman_pilot/5.png
index 7a3b523ab9..2c45e9286d 100644
Binary files a/public/images/emoji/google/woman_pilot/5.png and b/public/images/emoji/google/woman_pilot/5.png differ
diff --git a/public/images/emoji/google/woman_pilot/6.png b/public/images/emoji/google/woman_pilot/6.png
index d0e729e477..ed8420a82b 100644
Binary files a/public/images/emoji/google/woman_pilot/6.png and b/public/images/emoji/google/woman_pilot/6.png differ
diff --git a/public/images/emoji/google/woman_playing_handball.png b/public/images/emoji/google/woman_playing_handball.png
index 00c6237016..f204321526 100644
Binary files a/public/images/emoji/google/woman_playing_handball.png and b/public/images/emoji/google/woman_playing_handball.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/2.png b/public/images/emoji/google/woman_playing_handball/2.png
index 2396626d8e..04259642e6 100644
Binary files a/public/images/emoji/google/woman_playing_handball/2.png and b/public/images/emoji/google/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/3.png b/public/images/emoji/google/woman_playing_handball/3.png
index b49ba0f3bb..0e20761ca1 100644
Binary files a/public/images/emoji/google/woman_playing_handball/3.png and b/public/images/emoji/google/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/4.png b/public/images/emoji/google/woman_playing_handball/4.png
index 70db301bf5..cec20257ce 100644
Binary files a/public/images/emoji/google/woman_playing_handball/4.png and b/public/images/emoji/google/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/5.png b/public/images/emoji/google/woman_playing_handball/5.png
index bc5b60a12a..15dc46e700 100644
Binary files a/public/images/emoji/google/woman_playing_handball/5.png and b/public/images/emoji/google/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/6.png b/public/images/emoji/google/woman_playing_handball/6.png
index 5e7574d860..585f5ba3ca 100644
Binary files a/public/images/emoji/google/woman_playing_handball/6.png and b/public/images/emoji/google/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo.png b/public/images/emoji/google/woman_playing_water_polo.png
index fe24b5346d..e83877e5ee 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo.png and b/public/images/emoji/google/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/2.png b/public/images/emoji/google/woman_playing_water_polo/2.png
index 3f3798dd66..8b33e9553f 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/2.png and b/public/images/emoji/google/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/3.png b/public/images/emoji/google/woman_playing_water_polo/3.png
index e3db492fa5..563950d520 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/3.png and b/public/images/emoji/google/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/4.png b/public/images/emoji/google/woman_playing_water_polo/4.png
index 9a80e701a6..82a829d7a9 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/4.png and b/public/images/emoji/google/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/5.png b/public/images/emoji/google/woman_playing_water_polo/5.png
index 8c706e9fde..9489d15ffb 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/5.png and b/public/images/emoji/google/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/6.png b/public/images/emoji/google/woman_playing_water_polo/6.png
index e4f4e19089..622fb45156 100644
Binary files a/public/images/emoji/google/woman_playing_water_polo/6.png and b/public/images/emoji/google/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/google/woman_scientist.png b/public/images/emoji/google/woman_scientist.png
index 7d873ea4c4..fc03c53a8b 100644
Binary files a/public/images/emoji/google/woman_scientist.png and b/public/images/emoji/google/woman_scientist.png differ
diff --git a/public/images/emoji/google/woman_scientist/2.png b/public/images/emoji/google/woman_scientist/2.png
index c439bdb25f..dc6872e323 100644
Binary files a/public/images/emoji/google/woman_scientist/2.png and b/public/images/emoji/google/woman_scientist/2.png differ
diff --git a/public/images/emoji/google/woman_scientist/3.png b/public/images/emoji/google/woman_scientist/3.png
index 724f5e11bf..0b5c3962bd 100644
Binary files a/public/images/emoji/google/woman_scientist/3.png and b/public/images/emoji/google/woman_scientist/3.png differ
diff --git a/public/images/emoji/google/woman_scientist/4.png b/public/images/emoji/google/woman_scientist/4.png
index b11657a04a..459f4a9cc0 100644
Binary files a/public/images/emoji/google/woman_scientist/4.png and b/public/images/emoji/google/woman_scientist/4.png differ
diff --git a/public/images/emoji/google/woman_scientist/5.png b/public/images/emoji/google/woman_scientist/5.png
index 6233cf55f3..264af8b170 100644
Binary files a/public/images/emoji/google/woman_scientist/5.png and b/public/images/emoji/google/woman_scientist/5.png differ
diff --git a/public/images/emoji/google/woman_scientist/6.png b/public/images/emoji/google/woman_scientist/6.png
index c5010fee97..983ec7f2e1 100644
Binary files a/public/images/emoji/google/woman_scientist/6.png and b/public/images/emoji/google/woman_scientist/6.png differ
diff --git a/public/images/emoji/google/woman_shrugging.png b/public/images/emoji/google/woman_shrugging.png
index 9a455a5457..4de665abd3 100644
Binary files a/public/images/emoji/google/woman_shrugging.png and b/public/images/emoji/google/woman_shrugging.png differ
diff --git a/public/images/emoji/google/woman_shrugging/2.png b/public/images/emoji/google/woman_shrugging/2.png
index 0b85abb35a..7e7a3291d3 100644
Binary files a/public/images/emoji/google/woman_shrugging/2.png and b/public/images/emoji/google/woman_shrugging/2.png differ
diff --git a/public/images/emoji/google/woman_shrugging/3.png b/public/images/emoji/google/woman_shrugging/3.png
index e8bfa2f22d..8022994139 100644
Binary files a/public/images/emoji/google/woman_shrugging/3.png and b/public/images/emoji/google/woman_shrugging/3.png differ
diff --git a/public/images/emoji/google/woman_shrugging/4.png b/public/images/emoji/google/woman_shrugging/4.png
index f74a732db0..1ce1b06fc7 100644
Binary files a/public/images/emoji/google/woman_shrugging/4.png and b/public/images/emoji/google/woman_shrugging/4.png differ
diff --git a/public/images/emoji/google/woman_shrugging/5.png b/public/images/emoji/google/woman_shrugging/5.png
index 00a173acd5..925ba404b3 100644
Binary files a/public/images/emoji/google/woman_shrugging/5.png and b/public/images/emoji/google/woman_shrugging/5.png differ
diff --git a/public/images/emoji/google/woman_shrugging/6.png b/public/images/emoji/google/woman_shrugging/6.png
index 4a03c01d43..1b642633ad 100644
Binary files a/public/images/emoji/google/woman_shrugging/6.png and b/public/images/emoji/google/woman_shrugging/6.png differ
diff --git a/public/images/emoji/google/woman_singer.png b/public/images/emoji/google/woman_singer.png
index 2b3f46e2ea..b6fb24c2c5 100644
Binary files a/public/images/emoji/google/woman_singer.png and b/public/images/emoji/google/woman_singer.png differ
diff --git a/public/images/emoji/google/woman_singer/2.png b/public/images/emoji/google/woman_singer/2.png
index dff5bef3ed..12484935c4 100644
Binary files a/public/images/emoji/google/woman_singer/2.png and b/public/images/emoji/google/woman_singer/2.png differ
diff --git a/public/images/emoji/google/woman_singer/3.png b/public/images/emoji/google/woman_singer/3.png
index d71d68d952..647ee3f250 100644
Binary files a/public/images/emoji/google/woman_singer/3.png and b/public/images/emoji/google/woman_singer/3.png differ
diff --git a/public/images/emoji/google/woman_singer/4.png b/public/images/emoji/google/woman_singer/4.png
index 7b411c99d0..751cb333e8 100644
Binary files a/public/images/emoji/google/woman_singer/4.png and b/public/images/emoji/google/woman_singer/4.png differ
diff --git a/public/images/emoji/google/woman_singer/5.png b/public/images/emoji/google/woman_singer/5.png
index 46cac26e5b..a9ec10212d 100644
Binary files a/public/images/emoji/google/woman_singer/5.png and b/public/images/emoji/google/woman_singer/5.png differ
diff --git a/public/images/emoji/google/woman_singer/6.png b/public/images/emoji/google/woman_singer/6.png
index b4459b9db4..b426ef53f2 100644
Binary files a/public/images/emoji/google/woman_singer/6.png and b/public/images/emoji/google/woman_singer/6.png differ
diff --git a/public/images/emoji/google/woman_student.png b/public/images/emoji/google/woman_student.png
index c6f2c7c8e6..6b80f9e6e1 100644
Binary files a/public/images/emoji/google/woman_student.png and b/public/images/emoji/google/woman_student.png differ
diff --git a/public/images/emoji/google/woman_student/2.png b/public/images/emoji/google/woman_student/2.png
index 01db6368f6..c773e00bea 100644
Binary files a/public/images/emoji/google/woman_student/2.png and b/public/images/emoji/google/woman_student/2.png differ
diff --git a/public/images/emoji/google/woman_student/3.png b/public/images/emoji/google/woman_student/3.png
index 9a6770954f..a58117f73e 100644
Binary files a/public/images/emoji/google/woman_student/3.png and b/public/images/emoji/google/woman_student/3.png differ
diff --git a/public/images/emoji/google/woman_student/4.png b/public/images/emoji/google/woman_student/4.png
index 61ab96dcbe..a80a359192 100644
Binary files a/public/images/emoji/google/woman_student/4.png and b/public/images/emoji/google/woman_student/4.png differ
diff --git a/public/images/emoji/google/woman_student/5.png b/public/images/emoji/google/woman_student/5.png
index 8f227c084f..8604f5b289 100644
Binary files a/public/images/emoji/google/woman_student/5.png and b/public/images/emoji/google/woman_student/5.png differ
diff --git a/public/images/emoji/google/woman_student/6.png b/public/images/emoji/google/woman_student/6.png
index 398e1cf36f..a975993698 100644
Binary files a/public/images/emoji/google/woman_student/6.png and b/public/images/emoji/google/woman_student/6.png differ
diff --git a/public/images/emoji/google/woman_teacher.png b/public/images/emoji/google/woman_teacher.png
index 243e1125d9..7c14455208 100644
Binary files a/public/images/emoji/google/woman_teacher.png and b/public/images/emoji/google/woman_teacher.png differ
diff --git a/public/images/emoji/google/woman_teacher/2.png b/public/images/emoji/google/woman_teacher/2.png
index f7ebad6af9..6cfbee3ac8 100644
Binary files a/public/images/emoji/google/woman_teacher/2.png and b/public/images/emoji/google/woman_teacher/2.png differ
diff --git a/public/images/emoji/google/woman_teacher/3.png b/public/images/emoji/google/woman_teacher/3.png
index b64d09473c..5cfa9f3ad8 100644
Binary files a/public/images/emoji/google/woman_teacher/3.png and b/public/images/emoji/google/woman_teacher/3.png differ
diff --git a/public/images/emoji/google/woman_teacher/4.png b/public/images/emoji/google/woman_teacher/4.png
index 5e214716fd..7ba9749ff8 100644
Binary files a/public/images/emoji/google/woman_teacher/4.png and b/public/images/emoji/google/woman_teacher/4.png differ
diff --git a/public/images/emoji/google/woman_teacher/5.png b/public/images/emoji/google/woman_teacher/5.png
index c3934da485..3d455d8c9d 100644
Binary files a/public/images/emoji/google/woman_teacher/5.png and b/public/images/emoji/google/woman_teacher/5.png differ
diff --git a/public/images/emoji/google/woman_teacher/6.png b/public/images/emoji/google/woman_teacher/6.png
index 14333f1df3..318bb76b68 100644
Binary files a/public/images/emoji/google/woman_teacher/6.png and b/public/images/emoji/google/woman_teacher/6.png differ
diff --git a/public/images/emoji/google/woman_technologist.png b/public/images/emoji/google/woman_technologist.png
index 68344dd63f..aa4d0dbfbd 100644
Binary files a/public/images/emoji/google/woman_technologist.png and b/public/images/emoji/google/woman_technologist.png differ
diff --git a/public/images/emoji/google/woman_technologist/2.png b/public/images/emoji/google/woman_technologist/2.png
index 516715d48f..46ac8cef64 100644
Binary files a/public/images/emoji/google/woman_technologist/2.png and b/public/images/emoji/google/woman_technologist/2.png differ
diff --git a/public/images/emoji/google/woman_technologist/3.png b/public/images/emoji/google/woman_technologist/3.png
index 707fbcd953..ab8c4b6896 100644
Binary files a/public/images/emoji/google/woman_technologist/3.png and b/public/images/emoji/google/woman_technologist/3.png differ
diff --git a/public/images/emoji/google/woman_technologist/4.png b/public/images/emoji/google/woman_technologist/4.png
index 5551b445ab..1e0f2704b1 100644
Binary files a/public/images/emoji/google/woman_technologist/4.png and b/public/images/emoji/google/woman_technologist/4.png differ
diff --git a/public/images/emoji/google/woman_technologist/5.png b/public/images/emoji/google/woman_technologist/5.png
index d6d2929d8d..2e12f3c2c1 100644
Binary files a/public/images/emoji/google/woman_technologist/5.png and b/public/images/emoji/google/woman_technologist/5.png differ
diff --git a/public/images/emoji/google/woman_technologist/6.png b/public/images/emoji/google/woman_technologist/6.png
index f039e596c0..4e9cccfeb6 100644
Binary files a/public/images/emoji/google/woman_technologist/6.png and b/public/images/emoji/google/woman_technologist/6.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf.png b/public/images/emoji/google/woman_with_headscarf.png
index 8768a6131f..a7618a078e 100644
Binary files a/public/images/emoji/google/woman_with_headscarf.png and b/public/images/emoji/google/woman_with_headscarf.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/2.png b/public/images/emoji/google/woman_with_headscarf/2.png
index f4d75cbb46..19b72e6264 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/2.png and b/public/images/emoji/google/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/3.png b/public/images/emoji/google/woman_with_headscarf/3.png
index c6e1efa92c..1c7bb29e78 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/3.png and b/public/images/emoji/google/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/4.png b/public/images/emoji/google/woman_with_headscarf/4.png
index eb6826e4f1..ea7daf690a 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/4.png and b/public/images/emoji/google/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/5.png b/public/images/emoji/google/woman_with_headscarf/5.png
index a3f1e85d5b..30d673c201 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/5.png and b/public/images/emoji/google/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/6.png b/public/images/emoji/google/woman_with_headscarf/6.png
index 99d1f26240..9d88655d9b 100644
Binary files a/public/images/emoji/google/woman_with_headscarf/6.png and b/public/images/emoji/google/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/google/woman_with_turban.png b/public/images/emoji/google/woman_with_turban.png
index 45e6b5af7a..b185935f8a 100644
Binary files a/public/images/emoji/google/woman_with_turban.png and b/public/images/emoji/google/woman_with_turban.png differ
diff --git a/public/images/emoji/google/woman_with_turban/2.png b/public/images/emoji/google/woman_with_turban/2.png
index 083ddb6b4c..1a1469b442 100644
Binary files a/public/images/emoji/google/woman_with_turban/2.png and b/public/images/emoji/google/woman_with_turban/2.png differ
diff --git a/public/images/emoji/google/woman_with_turban/3.png b/public/images/emoji/google/woman_with_turban/3.png
index dc7c168a02..f6e87b7937 100644
Binary files a/public/images/emoji/google/woman_with_turban/3.png and b/public/images/emoji/google/woman_with_turban/3.png differ
diff --git a/public/images/emoji/google/woman_with_turban/4.png b/public/images/emoji/google/woman_with_turban/4.png
index b17ff8bbc5..6d5ee85437 100644
Binary files a/public/images/emoji/google/woman_with_turban/4.png and b/public/images/emoji/google/woman_with_turban/4.png differ
diff --git a/public/images/emoji/google/woman_with_turban/5.png b/public/images/emoji/google/woman_with_turban/5.png
index ff54228865..6b6cc696ce 100644
Binary files a/public/images/emoji/google/woman_with_turban/5.png and b/public/images/emoji/google/woman_with_turban/5.png differ
diff --git a/public/images/emoji/google/woman_with_turban/6.png b/public/images/emoji/google/woman_with_turban/6.png
index 5739b78d28..810cf2a145 100644
Binary files a/public/images/emoji/google/woman_with_turban/6.png and b/public/images/emoji/google/woman_with_turban/6.png differ
diff --git a/public/images/emoji/google/womans_clothes.png b/public/images/emoji/google/womans_clothes.png
index 5585c0d59c..3d25e5f0fb 100644
Binary files a/public/images/emoji/google/womans_clothes.png and b/public/images/emoji/google/womans_clothes.png differ
diff --git a/public/images/emoji/google/womans_hat.png b/public/images/emoji/google/womans_hat.png
index 0785e65492..aeb6810c68 100644
Binary files a/public/images/emoji/google/womans_hat.png and b/public/images/emoji/google/womans_hat.png differ
diff --git a/public/images/emoji/google/women_wrestling.png b/public/images/emoji/google/women_wrestling.png
index 757fa6cf86..e36f803bc1 100644
Binary files a/public/images/emoji/google/women_wrestling.png and b/public/images/emoji/google/women_wrestling.png differ
diff --git a/public/images/emoji/google/womens.png b/public/images/emoji/google/womens.png
index cb8ddb829b..fbed788577 100644
Binary files a/public/images/emoji/google/womens.png and b/public/images/emoji/google/womens.png differ
diff --git a/public/images/emoji/google/world_map.png b/public/images/emoji/google/world_map.png
index dccb5d0512..349e4d46c3 100644
Binary files a/public/images/emoji/google/world_map.png and b/public/images/emoji/google/world_map.png differ
diff --git a/public/images/emoji/google/worried.png b/public/images/emoji/google/worried.png
index d45ecb4af4..d8b79a0027 100644
Binary files a/public/images/emoji/google/worried.png and b/public/images/emoji/google/worried.png differ
diff --git a/public/images/emoji/google/worship_symbol.png b/public/images/emoji/google/worship_symbol.png
index 0cc3774779..6e4d8a9248 100644
Binary files a/public/images/emoji/google/worship_symbol.png and b/public/images/emoji/google/worship_symbol.png differ
diff --git a/public/images/emoji/google/wrench.png b/public/images/emoji/google/wrench.png
index 7babf38ac6..0e29e42350 100644
Binary files a/public/images/emoji/google/wrench.png and b/public/images/emoji/google/wrench.png differ
diff --git a/public/images/emoji/google/writing_hand.png b/public/images/emoji/google/writing_hand.png
index 02c6ba744f..1b2437ce16 100644
Binary files a/public/images/emoji/google/writing_hand.png and b/public/images/emoji/google/writing_hand.png differ
diff --git a/public/images/emoji/google/writing_hand/2.png b/public/images/emoji/google/writing_hand/2.png
index 247f8dafc4..c185354d75 100644
Binary files a/public/images/emoji/google/writing_hand/2.png and b/public/images/emoji/google/writing_hand/2.png differ
diff --git a/public/images/emoji/google/writing_hand/3.png b/public/images/emoji/google/writing_hand/3.png
index be2d6888fd..4fac69eba6 100644
Binary files a/public/images/emoji/google/writing_hand/3.png and b/public/images/emoji/google/writing_hand/3.png differ
diff --git a/public/images/emoji/google/writing_hand/4.png b/public/images/emoji/google/writing_hand/4.png
index e1158445cf..299796f0f5 100644
Binary files a/public/images/emoji/google/writing_hand/4.png and b/public/images/emoji/google/writing_hand/4.png differ
diff --git a/public/images/emoji/google/writing_hand/5.png b/public/images/emoji/google/writing_hand/5.png
index c7aa68796d..d566e7ea23 100644
Binary files a/public/images/emoji/google/writing_hand/5.png and b/public/images/emoji/google/writing_hand/5.png differ
diff --git a/public/images/emoji/google/writing_hand/6.png b/public/images/emoji/google/writing_hand/6.png
index beecc36dd1..bdbdcb1dda 100644
Binary files a/public/images/emoji/google/writing_hand/6.png and b/public/images/emoji/google/writing_hand/6.png differ
diff --git a/public/images/emoji/google/x.png b/public/images/emoji/google/x.png
index 56233b4e59..ad0b48ae1d 100644
Binary files a/public/images/emoji/google/x.png and b/public/images/emoji/google/x.png differ
diff --git a/public/images/emoji/google/yellow_heart.png b/public/images/emoji/google/yellow_heart.png
index 5849f2d9b4..2257f32872 100644
Binary files a/public/images/emoji/google/yellow_heart.png and b/public/images/emoji/google/yellow_heart.png differ
diff --git a/public/images/emoji/google/yemen.png b/public/images/emoji/google/yemen.png
index 494e2072df..625b500446 100644
Binary files a/public/images/emoji/google/yemen.png and b/public/images/emoji/google/yemen.png differ
diff --git a/public/images/emoji/google/yen.png b/public/images/emoji/google/yen.png
index a6c8a80c7e..68278ea169 100644
Binary files a/public/images/emoji/google/yen.png and b/public/images/emoji/google/yen.png differ
diff --git a/public/images/emoji/google/yin_yang.png b/public/images/emoji/google/yin_yang.png
index 629675cfe9..c373421039 100644
Binary files a/public/images/emoji/google/yin_yang.png and b/public/images/emoji/google/yin_yang.png differ
diff --git a/public/images/emoji/google/yum.png b/public/images/emoji/google/yum.png
index c454d73b4c..745c3142d8 100644
Binary files a/public/images/emoji/google/yum.png and b/public/images/emoji/google/yum.png differ
diff --git a/public/images/emoji/google/zambia.png b/public/images/emoji/google/zambia.png
index 4ca566d8d4..7792a4e44a 100644
Binary files a/public/images/emoji/google/zambia.png and b/public/images/emoji/google/zambia.png differ
diff --git a/public/images/emoji/google/zap.png b/public/images/emoji/google/zap.png
index a457b5fc1c..5b3e5105eb 100644
Binary files a/public/images/emoji/google/zap.png and b/public/images/emoji/google/zap.png differ
diff --git a/public/images/emoji/google/zebra.png b/public/images/emoji/google/zebra.png
index c98ffa79f0..b00eceb4ba 100644
Binary files a/public/images/emoji/google/zebra.png and b/public/images/emoji/google/zebra.png differ
diff --git a/public/images/emoji/google/zero.png b/public/images/emoji/google/zero.png
index 28b4250540..532f2f316d 100644
Binary files a/public/images/emoji/google/zero.png and b/public/images/emoji/google/zero.png differ
diff --git a/public/images/emoji/google/zimbabwe.png b/public/images/emoji/google/zimbabwe.png
index 6d337f40e2..5cb7e4bf1a 100644
Binary files a/public/images/emoji/google/zimbabwe.png and b/public/images/emoji/google/zimbabwe.png differ
diff --git a/public/images/emoji/google/zipper_mouth.png b/public/images/emoji/google/zipper_mouth.png
index 1fb69244fe..9743cd48eb 100644
Binary files a/public/images/emoji/google/zipper_mouth.png and b/public/images/emoji/google/zipper_mouth.png differ
diff --git a/public/images/emoji/google/zipper_mouth_face.png b/public/images/emoji/google/zipper_mouth_face.png
index 1fb69244fe..9743cd48eb 100644
Binary files a/public/images/emoji/google/zipper_mouth_face.png and b/public/images/emoji/google/zipper_mouth_face.png differ
diff --git a/public/images/emoji/google/zombie.png b/public/images/emoji/google/zombie.png
index 6d15204660..10ad1aa869 100644
Binary files a/public/images/emoji/google/zombie.png and b/public/images/emoji/google/zombie.png differ
diff --git a/public/images/emoji/google/zzz.png b/public/images/emoji/google/zzz.png
index 35f09724ee..7f0b4a2577 100644
Binary files a/public/images/emoji/google/zzz.png and b/public/images/emoji/google/zzz.png differ
diff --git a/public/images/emoji/apple/sushing_face.png b/public/images/emoji/google_classic/shushing_face.png
similarity index 100%
rename from public/images/emoji/apple/sushing_face.png
rename to public/images/emoji/google_classic/shushing_face.png
diff --git a/public/images/emoji/google_classic/sushing_face.png b/public/images/emoji/google_classic/sushing_face.png
deleted file mode 100644
index e4427cbd15..0000000000
Binary files a/public/images/emoji/google_classic/sushing_face.png and /dev/null differ
diff --git a/public/images/emoji/facebook_messenger/sushing_face.png b/public/images/emoji/twitter/shushing_face.png
similarity index 100%
rename from public/images/emoji/facebook_messenger/sushing_face.png
rename to public/images/emoji/twitter/shushing_face.png
diff --git a/public/images/emoji/twitter/sushing_face.png b/public/images/emoji/twitter/sushing_face.png
deleted file mode 100644
index e4427cbd15..0000000000
Binary files a/public/images/emoji/twitter/sushing_face.png and /dev/null differ
diff --git a/public/images/emoji/win10/adult.png b/public/images/emoji/win10/adult.png
index 53a5eb2ccb..a4d609c91b 100644
Binary files a/public/images/emoji/win10/adult.png and b/public/images/emoji/win10/adult.png differ
diff --git a/public/images/emoji/win10/adult/2.png b/public/images/emoji/win10/adult/2.png
index 8f30fc9e38..e29d30c26b 100644
Binary files a/public/images/emoji/win10/adult/2.png and b/public/images/emoji/win10/adult/2.png differ
diff --git a/public/images/emoji/win10/adult/3.png b/public/images/emoji/win10/adult/3.png
index 36a4e57d1f..4cabf1aeca 100644
Binary files a/public/images/emoji/win10/adult/3.png and b/public/images/emoji/win10/adult/3.png differ
diff --git a/public/images/emoji/win10/adult/4.png b/public/images/emoji/win10/adult/4.png
index 77c57605e9..231f6d9008 100644
Binary files a/public/images/emoji/win10/adult/4.png and b/public/images/emoji/win10/adult/4.png differ
diff --git a/public/images/emoji/win10/adult/5.png b/public/images/emoji/win10/adult/5.png
index 58bcd6a2fc..e520bd28ca 100644
Binary files a/public/images/emoji/win10/adult/5.png and b/public/images/emoji/win10/adult/5.png differ
diff --git a/public/images/emoji/win10/adult/6.png b/public/images/emoji/win10/adult/6.png
index 3bc6b5a57a..ffda3c8b47 100644
Binary files a/public/images/emoji/win10/adult/6.png and b/public/images/emoji/win10/adult/6.png differ
diff --git a/public/images/emoji/win10/aries.png b/public/images/emoji/win10/aries.png
index 0bae150e42..bc1b24306c 100644
Binary files a/public/images/emoji/win10/aries.png and b/public/images/emoji/win10/aries.png differ
diff --git a/public/images/emoji/win10/arrow_double_up.png b/public/images/emoji/win10/arrow_double_up.png
index a47f2cbb72..7107df7a35 100644
Binary files a/public/images/emoji/win10/arrow_double_up.png and b/public/images/emoji/win10/arrow_double_up.png differ
diff --git a/public/images/emoji/win10/arrow_lower_left.png b/public/images/emoji/win10/arrow_lower_left.png
index 478b3eacc5..fdaa04f093 100644
Binary files a/public/images/emoji/win10/arrow_lower_left.png and b/public/images/emoji/win10/arrow_lower_left.png differ
diff --git a/public/images/emoji/win10/arrow_right.png b/public/images/emoji/win10/arrow_right.png
index 5787b784b5..ad8a2e1cfb 100644
Binary files a/public/images/emoji/win10/arrow_right.png and b/public/images/emoji/win10/arrow_right.png differ
diff --git a/public/images/emoji/win10/arrow_up_down.png b/public/images/emoji/win10/arrow_up_down.png
index fd1049d13f..8f28dafbc5 100644
Binary files a/public/images/emoji/win10/arrow_up_down.png and b/public/images/emoji/win10/arrow_up_down.png differ
diff --git a/public/images/emoji/win10/arrow_upper_left.png b/public/images/emoji/win10/arrow_upper_left.png
index bee4694513..4d97fac897 100644
Binary files a/public/images/emoji/win10/arrow_upper_left.png and b/public/images/emoji/win10/arrow_upper_left.png differ
diff --git a/public/images/emoji/win10/asterisk.png b/public/images/emoji/win10/asterisk.png
index f847acf58c..3a16a887bc 100644
Binary files a/public/images/emoji/win10/asterisk.png and b/public/images/emoji/win10/asterisk.png differ
diff --git a/public/images/emoji/win10/baggage_claim.png b/public/images/emoji/win10/baggage_claim.png
index ce5b061197..e3aadd8d6a 100644
Binary files a/public/images/emoji/win10/baggage_claim.png and b/public/images/emoji/win10/baggage_claim.png differ
diff --git a/public/images/emoji/win10/ballot_box_with_check.png b/public/images/emoji/win10/ballot_box_with_check.png
index 5f7d368b56..1ff2d7eed7 100644
Binary files a/public/images/emoji/win10/ballot_box_with_check.png and b/public/images/emoji/win10/ballot_box_with_check.png differ
diff --git a/public/images/emoji/win10/bamboo.png b/public/images/emoji/win10/bamboo.png
index 4062f9bd3d..d074c3a621 100644
Binary files a/public/images/emoji/win10/bamboo.png and b/public/images/emoji/win10/bamboo.png differ
diff --git a/public/images/emoji/win10/bar_chart.png b/public/images/emoji/win10/bar_chart.png
index 203e5a694a..9c1ba7bbaf 100644
Binary files a/public/images/emoji/win10/bar_chart.png and b/public/images/emoji/win10/bar_chart.png differ
diff --git a/public/images/emoji/win10/bearded_person.png b/public/images/emoji/win10/bearded_person.png
index ed22a6cb38..05cc7932f1 100644
Binary files a/public/images/emoji/win10/bearded_person.png and b/public/images/emoji/win10/bearded_person.png differ
diff --git a/public/images/emoji/win10/bearded_person/2.png b/public/images/emoji/win10/bearded_person/2.png
index 4a2fdeb304..ab55eb6f33 100644
Binary files a/public/images/emoji/win10/bearded_person/2.png and b/public/images/emoji/win10/bearded_person/2.png differ
diff --git a/public/images/emoji/win10/bearded_person/3.png b/public/images/emoji/win10/bearded_person/3.png
index b1f6e168d7..a65fd6d7cf 100644
Binary files a/public/images/emoji/win10/bearded_person/3.png and b/public/images/emoji/win10/bearded_person/3.png differ
diff --git a/public/images/emoji/win10/bearded_person/4.png b/public/images/emoji/win10/bearded_person/4.png
index f75b75a74e..56fcb84145 100644
Binary files a/public/images/emoji/win10/bearded_person/4.png and b/public/images/emoji/win10/bearded_person/4.png differ
diff --git a/public/images/emoji/win10/bearded_person/5.png b/public/images/emoji/win10/bearded_person/5.png
index a9665b318a..c86776aafc 100644
Binary files a/public/images/emoji/win10/bearded_person/5.png and b/public/images/emoji/win10/bearded_person/5.png differ
diff --git a/public/images/emoji/win10/bearded_person/6.png b/public/images/emoji/win10/bearded_person/6.png
index a42b3caf88..830c34db3c 100644
Binary files a/public/images/emoji/win10/bearded_person/6.png and b/public/images/emoji/win10/bearded_person/6.png differ
diff --git a/public/images/emoji/win10/beer.png b/public/images/emoji/win10/beer.png
index 364d468648..bf725599d5 100644
Binary files a/public/images/emoji/win10/beer.png and b/public/images/emoji/win10/beer.png differ
diff --git a/public/images/emoji/win10/beers.png b/public/images/emoji/win10/beers.png
index 42d8caaa2e..5df26f2633 100644
Binary files a/public/images/emoji/win10/beers.png and b/public/images/emoji/win10/beers.png differ
diff --git a/public/images/emoji/win10/billed_cap.png b/public/images/emoji/win10/billed_cap.png
index 5cc92e307e..1b52c7bf31 100644
Binary files a/public/images/emoji/win10/billed_cap.png and b/public/images/emoji/win10/billed_cap.png differ
diff --git a/public/images/emoji/win10/bowl_with_spoon.png b/public/images/emoji/win10/bowl_with_spoon.png
index b0d88a73b9..4984bcb0b2 100644
Binary files a/public/images/emoji/win10/bowl_with_spoon.png and b/public/images/emoji/win10/bowl_with_spoon.png differ
diff --git a/public/images/emoji/win10/brain.png b/public/images/emoji/win10/brain.png
index c8e889faec..f84e986c00 100644
Binary files a/public/images/emoji/win10/brain.png and b/public/images/emoji/win10/brain.png differ
diff --git a/public/images/emoji/win10/breast_feeding.png b/public/images/emoji/win10/breast_feeding.png
index 815538138b..944cbcc8a1 100644
Binary files a/public/images/emoji/win10/breast_feeding.png and b/public/images/emoji/win10/breast_feeding.png differ
diff --git a/public/images/emoji/win10/breast_feeding/2.png b/public/images/emoji/win10/breast_feeding/2.png
index fb591aa4fb..aefb2f0b2f 100644
Binary files a/public/images/emoji/win10/breast_feeding/2.png and b/public/images/emoji/win10/breast_feeding/2.png differ
diff --git a/public/images/emoji/win10/breast_feeding/3.png b/public/images/emoji/win10/breast_feeding/3.png
index 5adcffa4b9..2499126d33 100644
Binary files a/public/images/emoji/win10/breast_feeding/3.png and b/public/images/emoji/win10/breast_feeding/3.png differ
diff --git a/public/images/emoji/win10/breast_feeding/4.png b/public/images/emoji/win10/breast_feeding/4.png
index d166f981b2..05402b93d7 100644
Binary files a/public/images/emoji/win10/breast_feeding/4.png and b/public/images/emoji/win10/breast_feeding/4.png differ
diff --git a/public/images/emoji/win10/breast_feeding/5.png b/public/images/emoji/win10/breast_feeding/5.png
index 7c8cb50a78..12f8498fc6 100644
Binary files a/public/images/emoji/win10/breast_feeding/5.png and b/public/images/emoji/win10/breast_feeding/5.png differ
diff --git a/public/images/emoji/win10/breast_feeding/6.png b/public/images/emoji/win10/breast_feeding/6.png
index e113d8cb42..7232ea138f 100644
Binary files a/public/images/emoji/win10/breast_feeding/6.png and b/public/images/emoji/win10/breast_feeding/6.png differ
diff --git a/public/images/emoji/win10/briefcase.png b/public/images/emoji/win10/briefcase.png
index 0a4a8dc13d..334359e8d1 100644
Binary files a/public/images/emoji/win10/briefcase.png and b/public/images/emoji/win10/briefcase.png differ
diff --git a/public/images/emoji/win10/broccoli.png b/public/images/emoji/win10/broccoli.png
index 5e03a6d23b..a27e39b319 100644
Binary files a/public/images/emoji/win10/broccoli.png and b/public/images/emoji/win10/broccoli.png differ
diff --git a/public/images/emoji/win10/bus.png b/public/images/emoji/win10/bus.png
index cacbb692f3..3ea4baafb1 100644
Binary files a/public/images/emoji/win10/bus.png and b/public/images/emoji/win10/bus.png differ
diff --git a/public/images/emoji/win10/calendar.png b/public/images/emoji/win10/calendar.png
index a6ccecc8b6..f5a6268fc2 100644
Binary files a/public/images/emoji/win10/calendar.png and b/public/images/emoji/win10/calendar.png differ
diff --git a/public/images/emoji/win10/calling.png b/public/images/emoji/win10/calling.png
index eabf4882d0..d69a110e08 100644
Binary files a/public/images/emoji/win10/calling.png and b/public/images/emoji/win10/calling.png differ
diff --git a/public/images/emoji/win10/canned_food.png b/public/images/emoji/win10/canned_food.png
index 2e5976e9d2..73d12d81d4 100644
Binary files a/public/images/emoji/win10/canned_food.png and b/public/images/emoji/win10/canned_food.png differ
diff --git a/public/images/emoji/win10/card_index.png b/public/images/emoji/win10/card_index.png
index 779b63ec55..4e0ce4e49b 100644
Binary files a/public/images/emoji/win10/card_index.png and b/public/images/emoji/win10/card_index.png differ
diff --git a/public/images/emoji/win10/carousel_horse.png b/public/images/emoji/win10/carousel_horse.png
index 9b68ee76ab..5c7375c41c 100644
Binary files a/public/images/emoji/win10/carousel_horse.png and b/public/images/emoji/win10/carousel_horse.png differ
diff --git a/public/images/emoji/win10/chart_with_downwards_trend.png b/public/images/emoji/win10/chart_with_downwards_trend.png
index cf1474ce50..270b84bd8c 100644
Binary files a/public/images/emoji/win10/chart_with_downwards_trend.png and b/public/images/emoji/win10/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/win10/child.png b/public/images/emoji/win10/child.png
index 33e50494a3..3b81b1f023 100644
Binary files a/public/images/emoji/win10/child.png and b/public/images/emoji/win10/child.png differ
diff --git a/public/images/emoji/win10/child/2.png b/public/images/emoji/win10/child/2.png
index 7a0e4f1cb7..65182c7a76 100644
Binary files a/public/images/emoji/win10/child/2.png and b/public/images/emoji/win10/child/2.png differ
diff --git a/public/images/emoji/win10/child/3.png b/public/images/emoji/win10/child/3.png
index 81a69110e9..04b0ec721e 100644
Binary files a/public/images/emoji/win10/child/3.png and b/public/images/emoji/win10/child/3.png differ
diff --git a/public/images/emoji/win10/child/4.png b/public/images/emoji/win10/child/4.png
index b5c64c9cc8..5768fbe3d7 100644
Binary files a/public/images/emoji/win10/child/4.png and b/public/images/emoji/win10/child/4.png differ
diff --git a/public/images/emoji/win10/child/5.png b/public/images/emoji/win10/child/5.png
index 0763a8bd94..473c3319b8 100644
Binary files a/public/images/emoji/win10/child/5.png and b/public/images/emoji/win10/child/5.png differ
diff --git a/public/images/emoji/win10/child/6.png b/public/images/emoji/win10/child/6.png
index 3ed705b902..1ba3b2b9e1 100644
Binary files a/public/images/emoji/win10/child/6.png and b/public/images/emoji/win10/child/6.png differ
diff --git a/public/images/emoji/win10/chopsticks.png b/public/images/emoji/win10/chopsticks.png
index 5706420297..c7b19ef0e6 100644
Binary files a/public/images/emoji/win10/chopsticks.png and b/public/images/emoji/win10/chopsticks.png differ
diff --git a/public/images/emoji/win10/cinema.png b/public/images/emoji/win10/cinema.png
index cba90ade5d..84e6c9c204 100644
Binary files a/public/images/emoji/win10/cinema.png and b/public/images/emoji/win10/cinema.png differ
diff --git a/public/images/emoji/win10/cityscape.png b/public/images/emoji/win10/cityscape.png
index 780e8ac22c..12e419373f 100644
Binary files a/public/images/emoji/win10/cityscape.png and b/public/images/emoji/win10/cityscape.png differ
diff --git a/public/images/emoji/win10/classical_building.png b/public/images/emoji/win10/classical_building.png
index dde5669f7e..858c8978ef 100644
Binary files a/public/images/emoji/win10/classical_building.png and b/public/images/emoji/win10/classical_building.png differ
diff --git a/public/images/emoji/win10/clinking_glasses.png b/public/images/emoji/win10/clinking_glasses.png
index 1114b6a3c6..d622e6bb82 100644
Binary files a/public/images/emoji/win10/clinking_glasses.png and b/public/images/emoji/win10/clinking_glasses.png differ
diff --git a/public/images/emoji/win10/clock.png b/public/images/emoji/win10/clock.png
index 8ff5429323..ce1971e0da 100644
Binary files a/public/images/emoji/win10/clock.png and b/public/images/emoji/win10/clock.png differ
diff --git a/public/images/emoji/win10/clock930.png b/public/images/emoji/win10/clock930.png
index 1b78a000e9..fcf3a377ef 100644
Binary files a/public/images/emoji/win10/clock930.png and b/public/images/emoji/win10/clock930.png differ
diff --git a/public/images/emoji/win10/coat.png b/public/images/emoji/win10/coat.png
index c409f9f4c4..9124f4aa37 100644
Binary files a/public/images/emoji/win10/coat.png and b/public/images/emoji/win10/coat.png differ
diff --git a/public/images/emoji/win10/cocktail.png b/public/images/emoji/win10/cocktail.png
index 3137eac5c2..2a3ca6ef8f 100644
Binary files a/public/images/emoji/win10/cocktail.png and b/public/images/emoji/win10/cocktail.png differ
diff --git a/public/images/emoji/win10/coconut.png b/public/images/emoji/win10/coconut.png
index e76b533149..c785c7c3f4 100644
Binary files a/public/images/emoji/win10/coconut.png and b/public/images/emoji/win10/coconut.png differ
diff --git a/public/images/emoji/win10/computer.png b/public/images/emoji/win10/computer.png
index cf7a30e830..95314bf9e1 100644
Binary files a/public/images/emoji/win10/computer.png and b/public/images/emoji/win10/computer.png differ
diff --git a/public/images/emoji/win10/construction.png b/public/images/emoji/win10/construction.png
index 7df66cf77c..5e9c00de61 100644
Binary files a/public/images/emoji/win10/construction.png and b/public/images/emoji/win10/construction.png differ
diff --git a/public/images/emoji/win10/control_knobs.png b/public/images/emoji/win10/control_knobs.png
index f26864d4db..07fe965407 100644
Binary files a/public/images/emoji/win10/control_knobs.png and b/public/images/emoji/win10/control_knobs.png differ
diff --git a/public/images/emoji/win10/crazy_face.png b/public/images/emoji/win10/crazy_face.png
index 0aaa1cf765..0f606e5429 100644
Binary files a/public/images/emoji/win10/crazy_face.png and b/public/images/emoji/win10/crazy_face.png differ
diff --git a/public/images/emoji/win10/cricket.png b/public/images/emoji/win10/cricket.png
index 1714e0d850..1873410694 100644
Binary files a/public/images/emoji/win10/cricket.png and b/public/images/emoji/win10/cricket.png differ
diff --git a/public/images/emoji/win10/cross.png b/public/images/emoji/win10/cross.png
index a94333be74..75afdd6613 100644
Binary files a/public/images/emoji/win10/cross.png and b/public/images/emoji/win10/cross.png differ
diff --git a/public/images/emoji/win10/cup_with_straw.png b/public/images/emoji/win10/cup_with_straw.png
index 4b2f313f9b..f9ef3de859 100644
Binary files a/public/images/emoji/win10/cup_with_straw.png and b/public/images/emoji/win10/cup_with_straw.png differ
diff --git a/public/images/emoji/win10/curling_stone.png b/public/images/emoji/win10/curling_stone.png
index 09027a2fb2..253e352417 100644
Binary files a/public/images/emoji/win10/curling_stone.png and b/public/images/emoji/win10/curling_stone.png differ
diff --git a/public/images/emoji/win10/cut_of_meat.png b/public/images/emoji/win10/cut_of_meat.png
index b66d427e09..7bb042e324 100644
Binary files a/public/images/emoji/win10/cut_of_meat.png and b/public/images/emoji/win10/cut_of_meat.png differ
diff --git a/public/images/emoji/win10/department_store.png b/public/images/emoji/win10/department_store.png
index 61279e47bf..f0e33f2fe4 100644
Binary files a/public/images/emoji/win10/department_store.png and b/public/images/emoji/win10/department_store.png differ
diff --git a/public/images/emoji/win10/dumpling.png b/public/images/emoji/win10/dumpling.png
index 489a779bf6..8ec08b500f 100644
Binary files a/public/images/emoji/win10/dumpling.png and b/public/images/emoji/win10/dumpling.png differ
diff --git a/public/images/emoji/win10/eight.png b/public/images/emoji/win10/eight.png
index 6269d3b91a..20fb21cf8e 100644
Binary files a/public/images/emoji/win10/eight.png and b/public/images/emoji/win10/eight.png differ
diff --git a/public/images/emoji/win10/eight_spoked_asterisk.png b/public/images/emoji/win10/eight_spoked_asterisk.png
index 3eabdcd2ba..cc35580e57 100644
Binary files a/public/images/emoji/win10/eight_spoked_asterisk.png and b/public/images/emoji/win10/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/win10/elf.png b/public/images/emoji/win10/elf.png
index f8b6dd873e..7668068ebf 100644
Binary files a/public/images/emoji/win10/elf.png and b/public/images/emoji/win10/elf.png differ
diff --git a/public/images/emoji/win10/elf/2.png b/public/images/emoji/win10/elf/2.png
index 15984024f2..c69e7492a3 100644
Binary files a/public/images/emoji/win10/elf/2.png and b/public/images/emoji/win10/elf/2.png differ
diff --git a/public/images/emoji/win10/elf/3.png b/public/images/emoji/win10/elf/3.png
index 4689243a17..218607138c 100644
Binary files a/public/images/emoji/win10/elf/3.png and b/public/images/emoji/win10/elf/3.png differ
diff --git a/public/images/emoji/win10/elf/4.png b/public/images/emoji/win10/elf/4.png
index 861cbf808c..fc8c7ce890 100644
Binary files a/public/images/emoji/win10/elf/4.png and b/public/images/emoji/win10/elf/4.png differ
diff --git a/public/images/emoji/win10/elf/5.png b/public/images/emoji/win10/elf/5.png
index 5074876010..a8f93039c9 100644
Binary files a/public/images/emoji/win10/elf/5.png and b/public/images/emoji/win10/elf/5.png differ
diff --git a/public/images/emoji/win10/elf/6.png b/public/images/emoji/win10/elf/6.png
index 505c908b18..2f0de95527 100644
Binary files a/public/images/emoji/win10/elf/6.png and b/public/images/emoji/win10/elf/6.png differ
diff --git a/public/images/emoji/win10/envelope_with_arrow.png b/public/images/emoji/win10/envelope_with_arrow.png
index 7c99d1e2d9..522d0b29fc 100644
Binary files a/public/images/emoji/win10/envelope_with_arrow.png and b/public/images/emoji/win10/envelope_with_arrow.png differ
diff --git a/public/images/emoji/win10/exploding_head.png b/public/images/emoji/win10/exploding_head.png
index 85532dadc7..bb55db580a 100644
Binary files a/public/images/emoji/win10/exploding_head.png and b/public/images/emoji/win10/exploding_head.png differ
diff --git a/public/images/emoji/win10/face_vomiting.png b/public/images/emoji/win10/face_vomiting.png
index cd7c3d1f2b..6f2d6319f6 100644
Binary files a/public/images/emoji/win10/face_vomiting.png and b/public/images/emoji/win10/face_vomiting.png differ
diff --git a/public/images/emoji/win10/face_with_hand_over_mouth.png b/public/images/emoji/win10/face_with_hand_over_mouth.png
index aed8f62e0b..dd6cbd1483 100644
Binary files a/public/images/emoji/win10/face_with_hand_over_mouth.png and b/public/images/emoji/win10/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/win10/face_with_monocle.png b/public/images/emoji/win10/face_with_monocle.png
index c6fbb4481d..3a951a59aa 100644
Binary files a/public/images/emoji/win10/face_with_monocle.png and b/public/images/emoji/win10/face_with_monocle.png differ
diff --git a/public/images/emoji/win10/face_with_raised_eyebrow.png b/public/images/emoji/win10/face_with_raised_eyebrow.png
index 887f70e365..aed4bbacf3 100644
Binary files a/public/images/emoji/win10/face_with_raised_eyebrow.png and b/public/images/emoji/win10/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/win10/face_with_symbols_over_mouth.png b/public/images/emoji/win10/face_with_symbols_over_mouth.png
index 84bb9ec9c5..9dfe5793e2 100644
Binary files a/public/images/emoji/win10/face_with_symbols_over_mouth.png and b/public/images/emoji/win10/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/win10/fairy.png b/public/images/emoji/win10/fairy.png
index 429938294b..ebb60345df 100644
Binary files a/public/images/emoji/win10/fairy.png and b/public/images/emoji/win10/fairy.png differ
diff --git a/public/images/emoji/win10/fairy/2.png b/public/images/emoji/win10/fairy/2.png
index 91e1de4e5d..50542a6b15 100644
Binary files a/public/images/emoji/win10/fairy/2.png and b/public/images/emoji/win10/fairy/2.png differ
diff --git a/public/images/emoji/win10/fairy/3.png b/public/images/emoji/win10/fairy/3.png
index 42821806e9..53bf85fd37 100644
Binary files a/public/images/emoji/win10/fairy/3.png and b/public/images/emoji/win10/fairy/3.png differ
diff --git a/public/images/emoji/win10/fairy/4.png b/public/images/emoji/win10/fairy/4.png
index 9e8d3adb89..6f50f0d97e 100644
Binary files a/public/images/emoji/win10/fairy/4.png and b/public/images/emoji/win10/fairy/4.png differ
diff --git a/public/images/emoji/win10/fairy/5.png b/public/images/emoji/win10/fairy/5.png
index 88d190e392..c99528ad0e 100644
Binary files a/public/images/emoji/win10/fairy/5.png and b/public/images/emoji/win10/fairy/5.png differ
diff --git a/public/images/emoji/win10/fairy/6.png b/public/images/emoji/win10/fairy/6.png
index e6ab8ade74..a3d4c417e4 100644
Binary files a/public/images/emoji/win10/fairy/6.png and b/public/images/emoji/win10/fairy/6.png differ
diff --git a/public/images/emoji/win10/fax.png b/public/images/emoji/win10/fax.png
index be415263f5..4400ab4bdc 100644
Binary files a/public/images/emoji/win10/fax.png and b/public/images/emoji/win10/fax.png differ
diff --git a/public/images/emoji/win10/film_frames.png b/public/images/emoji/win10/film_frames.png
index 09256e78ea..6a965da389 100644
Binary files a/public/images/emoji/win10/film_frames.png and b/public/images/emoji/win10/film_frames.png differ
diff --git a/public/images/emoji/win10/film_strip.png b/public/images/emoji/win10/film_strip.png
index 09256e78ea..6a965da389 100644
Binary files a/public/images/emoji/win10/film_strip.png and b/public/images/emoji/win10/film_strip.png differ
diff --git a/public/images/emoji/win10/five.png b/public/images/emoji/win10/five.png
index 5c85432a26..89931ad9f3 100644
Binary files a/public/images/emoji/win10/five.png and b/public/images/emoji/win10/five.png differ
diff --git a/public/images/emoji/win10/flying_saucer.png b/public/images/emoji/win10/flying_saucer.png
index 7d5c862855..8fe851c691 100644
Binary files a/public/images/emoji/win10/flying_saucer.png and b/public/images/emoji/win10/flying_saucer.png differ
diff --git a/public/images/emoji/win10/fortune_cookie.png b/public/images/emoji/win10/fortune_cookie.png
index 94a8cdca40..6249967843 100644
Binary files a/public/images/emoji/win10/fortune_cookie.png and b/public/images/emoji/win10/fortune_cookie.png differ
diff --git a/public/images/emoji/win10/four.png b/public/images/emoji/win10/four.png
index 3800d04076..059799c7b7 100644
Binary files a/public/images/emoji/win10/four.png and b/public/images/emoji/win10/four.png differ
diff --git a/public/images/emoji/win10/frowning_man/4.png b/public/images/emoji/win10/frowning_man/4.png
index 9701d81ee0..8669d92b36 100644
Binary files a/public/images/emoji/win10/frowning_man/4.png and b/public/images/emoji/win10/frowning_man/4.png differ
diff --git a/public/images/emoji/win10/gear.png b/public/images/emoji/win10/gear.png
index 80abe6d281..5d7faeebdd 100644
Binary files a/public/images/emoji/win10/gear.png and b/public/images/emoji/win10/gear.png differ
diff --git a/public/images/emoji/win10/genie.png b/public/images/emoji/win10/genie.png
index f0eddcc91a..a733888272 100644
Binary files a/public/images/emoji/win10/genie.png and b/public/images/emoji/win10/genie.png differ
diff --git a/public/images/emoji/win10/giraffe.png b/public/images/emoji/win10/giraffe.png
index be0e85d289..3196b64167 100644
Binary files a/public/images/emoji/win10/giraffe.png and b/public/images/emoji/win10/giraffe.png differ
diff --git a/public/images/emoji/win10/gloves.png b/public/images/emoji/win10/gloves.png
index 1a11dd2c56..d82369e38b 100644
Binary files a/public/images/emoji/win10/gloves.png and b/public/images/emoji/win10/gloves.png differ
diff --git a/public/images/emoji/win10/green_book.png b/public/images/emoji/win10/green_book.png
index 91fa146e32..25485d4fe2 100644
Binary files a/public/images/emoji/win10/green_book.png and b/public/images/emoji/win10/green_book.png differ
diff --git a/public/images/emoji/win10/grimacing.png b/public/images/emoji/win10/grimacing.png
index 764458e23c..91a7f0b68c 100644
Binary files a/public/images/emoji/win10/grimacing.png and b/public/images/emoji/win10/grimacing.png differ
diff --git a/public/images/emoji/win10/hamburger.png b/public/images/emoji/win10/hamburger.png
index dec4b47bfb..33980b0371 100644
Binary files a/public/images/emoji/win10/hamburger.png and b/public/images/emoji/win10/hamburger.png differ
diff --git a/public/images/emoji/win10/hash.png b/public/images/emoji/win10/hash.png
index 64f9f55964..27120d00a2 100644
Binary files a/public/images/emoji/win10/hash.png and b/public/images/emoji/win10/hash.png differ
diff --git a/public/images/emoji/win10/heart.png b/public/images/emoji/win10/heart.png
index af5a7990e4..3df2a01dfe 100644
Binary files a/public/images/emoji/win10/heart.png and b/public/images/emoji/win10/heart.png differ
diff --git a/public/images/emoji/win10/heart_decoration.png b/public/images/emoji/win10/heart_decoration.png
index df519fd4d8..8733151747 100644
Binary files a/public/images/emoji/win10/heart_decoration.png and b/public/images/emoji/win10/heart_decoration.png differ
diff --git a/public/images/emoji/win10/heavy_check_mark.png b/public/images/emoji/win10/heavy_check_mark.png
index f17dbc3ab3..5193701fda 100644
Binary files a/public/images/emoji/win10/heavy_check_mark.png and b/public/images/emoji/win10/heavy_check_mark.png differ
diff --git a/public/images/emoji/win10/heavy_division_sign.png b/public/images/emoji/win10/heavy_division_sign.png
index 512afc5269..6a662ff037 100644
Binary files a/public/images/emoji/win10/heavy_division_sign.png and b/public/images/emoji/win10/heavy_division_sign.png differ
diff --git a/public/images/emoji/win10/heavy_multiplication_x.png b/public/images/emoji/win10/heavy_multiplication_x.png
index c0fef19873..3d480f9250 100644
Binary files a/public/images/emoji/win10/heavy_multiplication_x.png and b/public/images/emoji/win10/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/win10/hedgehog.png b/public/images/emoji/win10/hedgehog.png
index 9b978b3540..311d54f00c 100644
Binary files a/public/images/emoji/win10/hedgehog.png and b/public/images/emoji/win10/hedgehog.png differ
diff --git a/public/images/emoji/win10/helmet_with_cross.png b/public/images/emoji/win10/helmet_with_cross.png
index 79e1a5801c..3dc162b5fd 100644
Binary files a/public/images/emoji/win10/helmet_with_cross.png and b/public/images/emoji/win10/helmet_with_cross.png differ
diff --git a/public/images/emoji/win10/helmet_with_white_cross.png b/public/images/emoji/win10/helmet_with_white_cross.png
index 79e1a5801c..3dc162b5fd 100644
Binary files a/public/images/emoji/win10/helmet_with_white_cross.png and b/public/images/emoji/win10/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/win10/hospital.png b/public/images/emoji/win10/hospital.png
index f2fac228ea..9a63ec2bd0 100644
Binary files a/public/images/emoji/win10/hospital.png and b/public/images/emoji/win10/hospital.png differ
diff --git a/public/images/emoji/win10/hotel.png b/public/images/emoji/win10/hotel.png
index 27a95fb942..a06db90dee 100644
Binary files a/public/images/emoji/win10/hotel.png and b/public/images/emoji/win10/hotel.png differ
diff --git a/public/images/emoji/win10/joy.png b/public/images/emoji/win10/joy.png
index 021828c505..1561756b4f 100644
Binary files a/public/images/emoji/win10/joy.png and b/public/images/emoji/win10/joy.png differ
diff --git a/public/images/emoji/win10/keyboard.png b/public/images/emoji/win10/keyboard.png
index 025fe93c86..0d463d4be8 100644
Binary files a/public/images/emoji/win10/keyboard.png and b/public/images/emoji/win10/keyboard.png differ
diff --git a/public/images/emoji/win10/keycap_star.png b/public/images/emoji/win10/keycap_star.png
index f847acf58c..3a16a887bc 100644
Binary files a/public/images/emoji/win10/keycap_star.png and b/public/images/emoji/win10/keycap_star.png differ
diff --git a/public/images/emoji/win10/latin_cross.png b/public/images/emoji/win10/latin_cross.png
index a94333be74..75afdd6613 100644
Binary files a/public/images/emoji/win10/latin_cross.png and b/public/images/emoji/win10/latin_cross.png differ
diff --git a/public/images/emoji/win10/ledger.png b/public/images/emoji/win10/ledger.png
index 75fde13169..1abcbcc34c 100644
Binary files a/public/images/emoji/win10/ledger.png and b/public/images/emoji/win10/ledger.png differ
diff --git a/public/images/emoji/win10/left_luggage.png b/public/images/emoji/win10/left_luggage.png
index eddcb48e86..90567de4d4 100644
Binary files a/public/images/emoji/win10/left_luggage.png and b/public/images/emoji/win10/left_luggage.png differ
diff --git a/public/images/emoji/win10/left_right_arrow.png b/public/images/emoji/win10/left_right_arrow.png
index fcaf7a3550..e55832e794 100644
Binary files a/public/images/emoji/win10/left_right_arrow.png and b/public/images/emoji/win10/left_right_arrow.png differ
diff --git a/public/images/emoji/win10/left_speech_bubble.png b/public/images/emoji/win10/left_speech_bubble.png
index d5abfccee7..e56fe0e74c 100644
Binary files a/public/images/emoji/win10/left_speech_bubble.png and b/public/images/emoji/win10/left_speech_bubble.png differ
diff --git a/public/images/emoji/win10/love_hotel.png b/public/images/emoji/win10/love_hotel.png
index a67551d5c9..426dfcf887 100644
Binary files a/public/images/emoji/win10/love_hotel.png and b/public/images/emoji/win10/love_hotel.png differ
diff --git a/public/images/emoji/win10/love_you_gesture.png b/public/images/emoji/win10/love_you_gesture.png
index 14ef7c72b2..4af2a520d8 100644
Binary files a/public/images/emoji/win10/love_you_gesture.png and b/public/images/emoji/win10/love_you_gesture.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/2.png b/public/images/emoji/win10/love_you_gesture/2.png
index b70217e894..f18c639652 100644
Binary files a/public/images/emoji/win10/love_you_gesture/2.png and b/public/images/emoji/win10/love_you_gesture/2.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/3.png b/public/images/emoji/win10/love_you_gesture/3.png
index aa984ea926..898ce3e056 100644
Binary files a/public/images/emoji/win10/love_you_gesture/3.png and b/public/images/emoji/win10/love_you_gesture/3.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/4.png b/public/images/emoji/win10/love_you_gesture/4.png
index 5decb0e800..65cffe154a 100644
Binary files a/public/images/emoji/win10/love_you_gesture/4.png and b/public/images/emoji/win10/love_you_gesture/4.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/5.png b/public/images/emoji/win10/love_you_gesture/5.png
index e0bb218cc0..af2fedb12e 100644
Binary files a/public/images/emoji/win10/love_you_gesture/5.png and b/public/images/emoji/win10/love_you_gesture/5.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/6.png b/public/images/emoji/win10/love_you_gesture/6.png
index bb51bde8bb..ab1090f5fe 100644
Binary files a/public/images/emoji/win10/love_you_gesture/6.png and b/public/images/emoji/win10/love_you_gesture/6.png differ
diff --git a/public/images/emoji/win10/mage.png b/public/images/emoji/win10/mage.png
index 71c1b13f92..f8f2257036 100644
Binary files a/public/images/emoji/win10/mage.png and b/public/images/emoji/win10/mage.png differ
diff --git a/public/images/emoji/win10/mage/2.png b/public/images/emoji/win10/mage/2.png
index 823f6843fa..52962fc821 100644
Binary files a/public/images/emoji/win10/mage/2.png and b/public/images/emoji/win10/mage/2.png differ
diff --git a/public/images/emoji/win10/mage/3.png b/public/images/emoji/win10/mage/3.png
index c2ff6622a0..bf4d8c34ff 100644
Binary files a/public/images/emoji/win10/mage/3.png and b/public/images/emoji/win10/mage/3.png differ
diff --git a/public/images/emoji/win10/mage/4.png b/public/images/emoji/win10/mage/4.png
index 76d0a52e37..953cacae5f 100644
Binary files a/public/images/emoji/win10/mage/4.png and b/public/images/emoji/win10/mage/4.png differ
diff --git a/public/images/emoji/win10/mage/5.png b/public/images/emoji/win10/mage/5.png
index ddb5de5580..da7f03c24f 100644
Binary files a/public/images/emoji/win10/mage/5.png and b/public/images/emoji/win10/mage/5.png differ
diff --git a/public/images/emoji/win10/mage/6.png b/public/images/emoji/win10/mage/6.png
index 302dd62dfb..612f48ba1c 100644
Binary files a/public/images/emoji/win10/mage/6.png and b/public/images/emoji/win10/mage/6.png differ
diff --git a/public/images/emoji/win10/mahjong.png b/public/images/emoji/win10/mahjong.png
index 8b2a4b1933..6934cfd75e 100644
Binary files a/public/images/emoji/win10/mahjong.png and b/public/images/emoji/win10/mahjong.png differ
diff --git a/public/images/emoji/win10/mailbox.png b/public/images/emoji/win10/mailbox.png
index 6629d118b3..44c159dd8c 100644
Binary files a/public/images/emoji/win10/mailbox.png and b/public/images/emoji/win10/mailbox.png differ
diff --git a/public/images/emoji/win10/man_student/6.png b/public/images/emoji/win10/man_student/6.png
index 95f73fc6bf..1d352ad4e1 100644
Binary files a/public/images/emoji/win10/man_student/6.png and b/public/images/emoji/win10/man_student/6.png differ
diff --git a/public/images/emoji/win10/mantelpiece_clock.png b/public/images/emoji/win10/mantelpiece_clock.png
index 8ff5429323..ce1971e0da 100644
Binary files a/public/images/emoji/win10/mantelpiece_clock.png and b/public/images/emoji/win10/mantelpiece_clock.png differ
diff --git a/public/images/emoji/win10/merperson.png b/public/images/emoji/win10/merperson.png
index ee1b999e0d..a0a9d4e540 100644
Binary files a/public/images/emoji/win10/merperson.png and b/public/images/emoji/win10/merperson.png differ
diff --git a/public/images/emoji/win10/merperson/2.png b/public/images/emoji/win10/merperson/2.png
index b97fbf42e3..39fc48c86b 100644
Binary files a/public/images/emoji/win10/merperson/2.png and b/public/images/emoji/win10/merperson/2.png differ
diff --git a/public/images/emoji/win10/merperson/3.png b/public/images/emoji/win10/merperson/3.png
index 9079f60b81..10b1f472c9 100644
Binary files a/public/images/emoji/win10/merperson/3.png and b/public/images/emoji/win10/merperson/3.png differ
diff --git a/public/images/emoji/win10/merperson/4.png b/public/images/emoji/win10/merperson/4.png
index decc0b5892..501d59a38c 100644
Binary files a/public/images/emoji/win10/merperson/4.png and b/public/images/emoji/win10/merperson/4.png differ
diff --git a/public/images/emoji/win10/merperson/5.png b/public/images/emoji/win10/merperson/5.png
index e3e3e89cb1..df9312ddf2 100644
Binary files a/public/images/emoji/win10/merperson/5.png and b/public/images/emoji/win10/merperson/5.png differ
diff --git a/public/images/emoji/win10/merperson/6.png b/public/images/emoji/win10/merperson/6.png
index 5a5f36684e..5cfda93a9d 100644
Binary files a/public/images/emoji/win10/merperson/6.png and b/public/images/emoji/win10/merperson/6.png differ
diff --git a/public/images/emoji/win10/nerd.png b/public/images/emoji/win10/nerd.png
index 38bf7ae0f2..a50a63e416 100644
Binary files a/public/images/emoji/win10/nerd.png and b/public/images/emoji/win10/nerd.png differ
diff --git a/public/images/emoji/win10/nerd_face.png b/public/images/emoji/win10/nerd_face.png
index 38bf7ae0f2..a50a63e416 100644
Binary files a/public/images/emoji/win10/nerd_face.png and b/public/images/emoji/win10/nerd_face.png differ
diff --git a/public/images/emoji/win10/nine.png b/public/images/emoji/win10/nine.png
index f68cbedc51..b13fee1cf6 100644
Binary files a/public/images/emoji/win10/nine.png and b/public/images/emoji/win10/nine.png differ
diff --git a/public/images/emoji/win10/notebook.png b/public/images/emoji/win10/notebook.png
index 906984de42..3452a259df 100644
Binary files a/public/images/emoji/win10/notebook.png and b/public/images/emoji/win10/notebook.png differ
diff --git a/public/images/emoji/win10/nut_and_bolt.png b/public/images/emoji/win10/nut_and_bolt.png
index e65b44916d..0fce7569af 100644
Binary files a/public/images/emoji/win10/nut_and_bolt.png and b/public/images/emoji/win10/nut_and_bolt.png differ
diff --git a/public/images/emoji/win10/older_adult.png b/public/images/emoji/win10/older_adult.png
index 8796829b87..8aec22e27d 100644
Binary files a/public/images/emoji/win10/older_adult.png and b/public/images/emoji/win10/older_adult.png differ
diff --git a/public/images/emoji/win10/older_adult/2.png b/public/images/emoji/win10/older_adult/2.png
index b36f41960e..cf13c71b31 100644
Binary files a/public/images/emoji/win10/older_adult/2.png and b/public/images/emoji/win10/older_adult/2.png differ
diff --git a/public/images/emoji/win10/older_adult/3.png b/public/images/emoji/win10/older_adult/3.png
index dc1441fea5..7c2119727e 100644
Binary files a/public/images/emoji/win10/older_adult/3.png and b/public/images/emoji/win10/older_adult/3.png differ
diff --git a/public/images/emoji/win10/older_adult/4.png b/public/images/emoji/win10/older_adult/4.png
index abc19e06c7..8bd3a47413 100644
Binary files a/public/images/emoji/win10/older_adult/4.png and b/public/images/emoji/win10/older_adult/4.png differ
diff --git a/public/images/emoji/win10/older_adult/5.png b/public/images/emoji/win10/older_adult/5.png
index c90549f681..631a93e90e 100644
Binary files a/public/images/emoji/win10/older_adult/5.png and b/public/images/emoji/win10/older_adult/5.png differ
diff --git a/public/images/emoji/win10/older_adult/6.png b/public/images/emoji/win10/older_adult/6.png
index 5152c9c1a3..99581e8e15 100644
Binary files a/public/images/emoji/win10/older_adult/6.png and b/public/images/emoji/win10/older_adult/6.png differ
diff --git a/public/images/emoji/win10/one.png b/public/images/emoji/win10/one.png
index 04153a940f..5baddfbee3 100644
Binary files a/public/images/emoji/win10/one.png and b/public/images/emoji/win10/one.png differ
diff --git a/public/images/emoji/win10/ophiuchus.png b/public/images/emoji/win10/ophiuchus.png
index 8e28684ac9..b1b7b0d594 100644
Binary files a/public/images/emoji/win10/ophiuchus.png and b/public/images/emoji/win10/ophiuchus.png differ
diff --git a/public/images/emoji/win10/orange_heart.png b/public/images/emoji/win10/orange_heart.png
index f217c930a7..9fdb0d2706 100644
Binary files a/public/images/emoji/win10/orange_heart.png and b/public/images/emoji/win10/orange_heart.png differ
diff --git a/public/images/emoji/win10/page_facing_up.png b/public/images/emoji/win10/page_facing_up.png
index 6239d67f0d..6c20aafec7 100644
Binary files a/public/images/emoji/win10/page_facing_up.png and b/public/images/emoji/win10/page_facing_up.png differ
diff --git a/public/images/emoji/win10/pager.png b/public/images/emoji/win10/pager.png
index a11383a973..d3a4bc8d89 100644
Binary files a/public/images/emoji/win10/pager.png and b/public/images/emoji/win10/pager.png differ
diff --git a/public/images/emoji/win10/palms_up_together.png b/public/images/emoji/win10/palms_up_together.png
index fb66ba11c4..6c4d662bd9 100644
Binary files a/public/images/emoji/win10/palms_up_together.png and b/public/images/emoji/win10/palms_up_together.png differ
diff --git a/public/images/emoji/win10/palms_up_together/2.png b/public/images/emoji/win10/palms_up_together/2.png
index 6d9b2fc8cc..62d1cc6d44 100644
Binary files a/public/images/emoji/win10/palms_up_together/2.png and b/public/images/emoji/win10/palms_up_together/2.png differ
diff --git a/public/images/emoji/win10/palms_up_together/3.png b/public/images/emoji/win10/palms_up_together/3.png
index c5d52f5c7a..2d559186f1 100644
Binary files a/public/images/emoji/win10/palms_up_together/3.png and b/public/images/emoji/win10/palms_up_together/3.png differ
diff --git a/public/images/emoji/win10/palms_up_together/4.png b/public/images/emoji/win10/palms_up_together/4.png
index 3d4288d10d..ed8cc989ca 100644
Binary files a/public/images/emoji/win10/palms_up_together/4.png and b/public/images/emoji/win10/palms_up_together/4.png differ
diff --git a/public/images/emoji/win10/palms_up_together/5.png b/public/images/emoji/win10/palms_up_together/5.png
index 6ff36c07cb..aef2b0eb35 100644
Binary files a/public/images/emoji/win10/palms_up_together/5.png and b/public/images/emoji/win10/palms_up_together/5.png differ
diff --git a/public/images/emoji/win10/palms_up_together/6.png b/public/images/emoji/win10/palms_up_together/6.png
index c25d42927d..da1e2e24e1 100644
Binary files a/public/images/emoji/win10/palms_up_together/6.png and b/public/images/emoji/win10/palms_up_together/6.png differ
diff --git a/public/images/emoji/win10/person_climbing.png b/public/images/emoji/win10/person_climbing.png
index d8a6229d6b..f58cb7ffc7 100644
Binary files a/public/images/emoji/win10/person_climbing.png and b/public/images/emoji/win10/person_climbing.png differ
diff --git a/public/images/emoji/win10/person_climbing/2.png b/public/images/emoji/win10/person_climbing/2.png
index 71330d66a8..4a5dda7393 100644
Binary files a/public/images/emoji/win10/person_climbing/2.png and b/public/images/emoji/win10/person_climbing/2.png differ
diff --git a/public/images/emoji/win10/person_climbing/3.png b/public/images/emoji/win10/person_climbing/3.png
index a1345ecbd2..c881026d45 100644
Binary files a/public/images/emoji/win10/person_climbing/3.png and b/public/images/emoji/win10/person_climbing/3.png differ
diff --git a/public/images/emoji/win10/person_climbing/4.png b/public/images/emoji/win10/person_climbing/4.png
index 016b920bcd..07d71406d2 100644
Binary files a/public/images/emoji/win10/person_climbing/4.png and b/public/images/emoji/win10/person_climbing/4.png differ
diff --git a/public/images/emoji/win10/person_climbing/5.png b/public/images/emoji/win10/person_climbing/5.png
index 4591eb5290..6f9fce12c0 100644
Binary files a/public/images/emoji/win10/person_climbing/5.png and b/public/images/emoji/win10/person_climbing/5.png differ
diff --git a/public/images/emoji/win10/person_climbing/6.png b/public/images/emoji/win10/person_climbing/6.png
index 19be3236ae..cfd6bae724 100644
Binary files a/public/images/emoji/win10/person_climbing/6.png and b/public/images/emoji/win10/person_climbing/6.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position.png b/public/images/emoji/win10/person_in_lotus_position.png
index e9404fd525..34536d3d8a 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position.png and b/public/images/emoji/win10/person_in_lotus_position.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/2.png b/public/images/emoji/win10/person_in_lotus_position/2.png
index 8817578cf0..f5998abf74 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/2.png and b/public/images/emoji/win10/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/3.png b/public/images/emoji/win10/person_in_lotus_position/3.png
index 0e9bf46e0b..6c1894a45d 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/3.png and b/public/images/emoji/win10/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/4.png b/public/images/emoji/win10/person_in_lotus_position/4.png
index 918e3d435a..f6b1875c75 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/4.png and b/public/images/emoji/win10/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/5.png b/public/images/emoji/win10/person_in_lotus_position/5.png
index 0c01143530..80bd1b4f22 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/5.png and b/public/images/emoji/win10/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/6.png b/public/images/emoji/win10/person_in_lotus_position/6.png
index fed226dac2..34ccf247a4 100644
Binary files a/public/images/emoji/win10/person_in_lotus_position/6.png and b/public/images/emoji/win10/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room.png b/public/images/emoji/win10/person_in_steamy_room.png
index 65a0790d92..74a1bc8463 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room.png and b/public/images/emoji/win10/person_in_steamy_room.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/2.png b/public/images/emoji/win10/person_in_steamy_room/2.png
index 7260df1d15..bbadc1e7cb 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/2.png and b/public/images/emoji/win10/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/3.png b/public/images/emoji/win10/person_in_steamy_room/3.png
index d14580a3db..a40bf87b1e 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/3.png and b/public/images/emoji/win10/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/4.png b/public/images/emoji/win10/person_in_steamy_room/4.png
index 9313ab2116..933f13b97d 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/4.png and b/public/images/emoji/win10/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/5.png b/public/images/emoji/win10/person_in_steamy_room/5.png
index f432b554b3..4cddc2fbf9 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/5.png and b/public/images/emoji/win10/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/6.png b/public/images/emoji/win10/person_in_steamy_room/6.png
index dc7087e028..8fb3a4c62b 100644
Binary files a/public/images/emoji/win10/person_in_steamy_room/6.png and b/public/images/emoji/win10/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/win10/pie.png b/public/images/emoji/win10/pie.png
index 4f5f474d82..3e1298d46e 100644
Binary files a/public/images/emoji/win10/pie.png and b/public/images/emoji/win10/pie.png differ
diff --git a/public/images/emoji/win10/pray.png b/public/images/emoji/win10/pray.png
index fbd3eea81f..7d088517ae 100644
Binary files a/public/images/emoji/win10/pray.png and b/public/images/emoji/win10/pray.png differ
diff --git a/public/images/emoji/win10/pray/2.png b/public/images/emoji/win10/pray/2.png
index 16ef86a4e6..66d91b3f12 100644
Binary files a/public/images/emoji/win10/pray/2.png and b/public/images/emoji/win10/pray/2.png differ
diff --git a/public/images/emoji/win10/pray/3.png b/public/images/emoji/win10/pray/3.png
index 845363fe62..2459302f52 100644
Binary files a/public/images/emoji/win10/pray/3.png and b/public/images/emoji/win10/pray/3.png differ
diff --git a/public/images/emoji/win10/pray/4.png b/public/images/emoji/win10/pray/4.png
index 271cff1b58..da87baf804 100644
Binary files a/public/images/emoji/win10/pray/4.png and b/public/images/emoji/win10/pray/4.png differ
diff --git a/public/images/emoji/win10/pray/5.png b/public/images/emoji/win10/pray/5.png
index a822e6adda..29c6e33cd7 100644
Binary files a/public/images/emoji/win10/pray/5.png and b/public/images/emoji/win10/pray/5.png differ
diff --git a/public/images/emoji/win10/pray/6.png b/public/images/emoji/win10/pray/6.png
index 77bdd57046..eb6c75f9a1 100644
Binary files a/public/images/emoji/win10/pray/6.png and b/public/images/emoji/win10/pray/6.png differ
diff --git a/public/images/emoji/win10/pretzel.png b/public/images/emoji/win10/pretzel.png
index 9116d6ee9a..42534f8d34 100644
Binary files a/public/images/emoji/win10/pretzel.png and b/public/images/emoji/win10/pretzel.png differ
diff --git a/public/images/emoji/win10/raised_hands.png b/public/images/emoji/win10/raised_hands.png
index 17d73ef6ea..edd897af37 100644
Binary files a/public/images/emoji/win10/raised_hands.png and b/public/images/emoji/win10/raised_hands.png differ
diff --git a/public/images/emoji/win10/raised_hands/2.png b/public/images/emoji/win10/raised_hands/2.png
index 5f85dc188c..10b8c66a25 100644
Binary files a/public/images/emoji/win10/raised_hands/2.png and b/public/images/emoji/win10/raised_hands/2.png differ
diff --git a/public/images/emoji/win10/raised_hands/3.png b/public/images/emoji/win10/raised_hands/3.png
index e8bcd0bd6c..9eddd2d59e 100644
Binary files a/public/images/emoji/win10/raised_hands/3.png and b/public/images/emoji/win10/raised_hands/3.png differ
diff --git a/public/images/emoji/win10/raised_hands/4.png b/public/images/emoji/win10/raised_hands/4.png
index faa47587a4..e72a8fec4c 100644
Binary files a/public/images/emoji/win10/raised_hands/4.png and b/public/images/emoji/win10/raised_hands/4.png differ
diff --git a/public/images/emoji/win10/raised_hands/5.png b/public/images/emoji/win10/raised_hands/5.png
index 74d02ec7f8..c708a724b0 100644
Binary files a/public/images/emoji/win10/raised_hands/5.png and b/public/images/emoji/win10/raised_hands/5.png differ
diff --git a/public/images/emoji/win10/raised_hands/6.png b/public/images/emoji/win10/raised_hands/6.png
index 86c5f066fc..12adf5a90d 100644
Binary files a/public/images/emoji/win10/raised_hands/6.png and b/public/images/emoji/win10/raised_hands/6.png differ
diff --git a/public/images/emoji/win10/rescue_worker_helmet.png b/public/images/emoji/win10/rescue_worker_helmet.png
index 79e1a5801c..3dc162b5fd 100644
Binary files a/public/images/emoji/win10/rescue_worker_helmet.png and b/public/images/emoji/win10/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/win10/rofl.png b/public/images/emoji/win10/rofl.png
index 39f60567f6..47cf2e8e38 100644
Binary files a/public/images/emoji/win10/rofl.png and b/public/images/emoji/win10/rofl.png differ
diff --git a/public/images/emoji/win10/sagittarius.png b/public/images/emoji/win10/sagittarius.png
index 4478e79db3..5c9a9df911 100644
Binary files a/public/images/emoji/win10/sagittarius.png and b/public/images/emoji/win10/sagittarius.png differ
diff --git a/public/images/emoji/win10/sandwich.png b/public/images/emoji/win10/sandwich.png
index ba3f9a1cdb..7ebb7c7eae 100644
Binary files a/public/images/emoji/win10/sandwich.png and b/public/images/emoji/win10/sandwich.png differ
diff --git a/public/images/emoji/win10/satellite.png b/public/images/emoji/win10/satellite.png
index ee00094f52..271073f7a9 100644
Binary files a/public/images/emoji/win10/satellite.png and b/public/images/emoji/win10/satellite.png differ
diff --git a/public/images/emoji/win10/sauropod.png b/public/images/emoji/win10/sauropod.png
index 2f4d619997..d3d552b548 100644
Binary files a/public/images/emoji/win10/sauropod.png and b/public/images/emoji/win10/sauropod.png differ
diff --git a/public/images/emoji/win10/scarf.png b/public/images/emoji/win10/scarf.png
index 73653eee2b..238a852a4a 100644
Binary files a/public/images/emoji/win10/scarf.png and b/public/images/emoji/win10/scarf.png differ
diff --git a/public/images/emoji/win10/scroll.png b/public/images/emoji/win10/scroll.png
index 93f0604938..d4e5be14e6 100644
Binary files a/public/images/emoji/win10/scroll.png and b/public/images/emoji/win10/scroll.png differ
diff --git a/public/images/emoji/win10/seven.png b/public/images/emoji/win10/seven.png
index 8e280d07c4..51e45e9214 100644
Binary files a/public/images/emoji/win10/seven.png and b/public/images/emoji/win10/seven.png differ
diff --git a/public/images/emoji/win10/shushing_face.png b/public/images/emoji/win10/shushing_face.png
new file mode 100644
index 0000000000..a9c6516641
Binary files /dev/null and b/public/images/emoji/win10/shushing_face.png differ
diff --git a/public/images/emoji/win10/signal_strength.png b/public/images/emoji/win10/signal_strength.png
index 14b2b379c5..0a549c476c 100644
Binary files a/public/images/emoji/win10/signal_strength.png and b/public/images/emoji/win10/signal_strength.png differ
diff --git a/public/images/emoji/win10/six.png b/public/images/emoji/win10/six.png
index 230e33849b..a8140e5afc 100644
Binary files a/public/images/emoji/win10/six.png and b/public/images/emoji/win10/six.png differ
diff --git a/public/images/emoji/win10/sled.png b/public/images/emoji/win10/sled.png
index 01805b1fe7..89d58851f4 100644
Binary files a/public/images/emoji/win10/sled.png and b/public/images/emoji/win10/sled.png differ
diff --git a/public/images/emoji/win10/sob.png b/public/images/emoji/win10/sob.png
index d109ee0268..135f9df420 100644
Binary files a/public/images/emoji/win10/sob.png and b/public/images/emoji/win10/sob.png differ
diff --git a/public/images/emoji/win10/socks.png b/public/images/emoji/win10/socks.png
index 8f2b9bbe9e..f607f41d70 100644
Binary files a/public/images/emoji/win10/socks.png and b/public/images/emoji/win10/socks.png differ
diff --git a/public/images/emoji/win10/star_and_crescent.png b/public/images/emoji/win10/star_and_crescent.png
index cec4a053a9..579290375e 100644
Binary files a/public/images/emoji/win10/star_and_crescent.png and b/public/images/emoji/win10/star_and_crescent.png differ
diff --git a/public/images/emoji/win10/star_struck.png b/public/images/emoji/win10/star_struck.png
index 7da8183f39..60e2d24679 100644
Binary files a/public/images/emoji/win10/star_struck.png and b/public/images/emoji/win10/star_struck.png differ
diff --git a/public/images/emoji/win10/stew.png b/public/images/emoji/win10/stew.png
index b19f21b661..cd79b344ae 100644
Binary files a/public/images/emoji/win10/stew.png and b/public/images/emoji/win10/stew.png differ
diff --git a/public/images/emoji/win10/stop_sign.png b/public/images/emoji/win10/stop_sign.png
index ca997dac30..780c388ec8 100644
Binary files a/public/images/emoji/win10/stop_sign.png and b/public/images/emoji/win10/stop_sign.png differ
diff --git a/public/images/emoji/win10/sushing_face.png b/public/images/emoji/win10/sushing_face.png
deleted file mode 100644
index e4427cbd15..0000000000
Binary files a/public/images/emoji/win10/sushing_face.png and /dev/null differ
diff --git a/public/images/emoji/win10/t_rex.png b/public/images/emoji/win10/t_rex.png
index d8811a5638..0eec0dcc37 100644
Binary files a/public/images/emoji/win10/t_rex.png and b/public/images/emoji/win10/t_rex.png differ
diff --git a/public/images/emoji/win10/takeout_box.png b/public/images/emoji/win10/takeout_box.png
index 08aa6a4843..4d166e121c 100644
Binary files a/public/images/emoji/win10/takeout_box.png and b/public/images/emoji/win10/takeout_box.png differ
diff --git a/public/images/emoji/win10/taurus.png b/public/images/emoji/win10/taurus.png
index 4061e9565f..778a218f8e 100644
Binary files a/public/images/emoji/win10/taurus.png and b/public/images/emoji/win10/taurus.png differ
diff --git a/public/images/emoji/win10/thermometer.png b/public/images/emoji/win10/thermometer.png
index 0feb41ac90..f66b4ea88e 100644
Binary files a/public/images/emoji/win10/thermometer.png and b/public/images/emoji/win10/thermometer.png differ
diff --git a/public/images/emoji/win10/thought_balloon.png b/public/images/emoji/win10/thought_balloon.png
index c9cc241dae..bae2af4754 100644
Binary files a/public/images/emoji/win10/thought_balloon.png and b/public/images/emoji/win10/thought_balloon.png differ
diff --git a/public/images/emoji/win10/three.png b/public/images/emoji/win10/three.png
index 2b641df50a..f7c1ffa143 100644
Binary files a/public/images/emoji/win10/three.png and b/public/images/emoji/win10/three.png differ
diff --git a/public/images/emoji/win10/ticket.png b/public/images/emoji/win10/ticket.png
index 3e8b808073..83acbc42f5 100644
Binary files a/public/images/emoji/win10/ticket.png and b/public/images/emoji/win10/ticket.png differ
diff --git a/public/images/emoji/win10/toilet.png b/public/images/emoji/win10/toilet.png
index c2d4038427..1e5cb4ffef 100644
Binary files a/public/images/emoji/win10/toilet.png and b/public/images/emoji/win10/toilet.png differ
diff --git a/public/images/emoji/win10/trophy.png b/public/images/emoji/win10/trophy.png
index fa9d3a5605..e899afa083 100644
Binary files a/public/images/emoji/win10/trophy.png and b/public/images/emoji/win10/trophy.png differ
diff --git a/public/images/emoji/win10/tropical_drink.png b/public/images/emoji/win10/tropical_drink.png
index a4d10d2047..080025e11b 100644
Binary files a/public/images/emoji/win10/tropical_drink.png and b/public/images/emoji/win10/tropical_drink.png differ
diff --git a/public/images/emoji/win10/tumbler_glass.png b/public/images/emoji/win10/tumbler_glass.png
index 4cfe2053c2..7413927c50 100644
Binary files a/public/images/emoji/win10/tumbler_glass.png and b/public/images/emoji/win10/tumbler_glass.png differ
diff --git a/public/images/emoji/win10/two.png b/public/images/emoji/win10/two.png
index 6740511b38..d5e9edc4e5 100644
Binary files a/public/images/emoji/win10/two.png and b/public/images/emoji/win10/two.png differ
diff --git a/public/images/emoji/win10/u6307.png b/public/images/emoji/win10/u6307.png
index b7e2e1b4d9..8f5e6fe06b 100644
Binary files a/public/images/emoji/win10/u6307.png and b/public/images/emoji/win10/u6307.png differ
diff --git a/public/images/emoji/win10/u7533.png b/public/images/emoji/win10/u7533.png
index 89891d189d..bbbb8e097a 100644
Binary files a/public/images/emoji/win10/u7533.png and b/public/images/emoji/win10/u7533.png differ
diff --git a/public/images/emoji/win10/upside_down.png b/public/images/emoji/win10/upside_down.png
index 31842efe30..f7880140cd 100644
Binary files a/public/images/emoji/win10/upside_down.png and b/public/images/emoji/win10/upside_down.png differ
diff --git a/public/images/emoji/win10/upside_down_face.png b/public/images/emoji/win10/upside_down_face.png
index 31842efe30..f7880140cd 100644
Binary files a/public/images/emoji/win10/upside_down_face.png and b/public/images/emoji/win10/upside_down_face.png differ
diff --git a/public/images/emoji/win10/vampire.png b/public/images/emoji/win10/vampire.png
index 962288bd17..031ba7db15 100644
Binary files a/public/images/emoji/win10/vampire.png and b/public/images/emoji/win10/vampire.png differ
diff --git a/public/images/emoji/win10/vampire/2.png b/public/images/emoji/win10/vampire/2.png
index 154f2b6e35..41bb9b49d9 100644
Binary files a/public/images/emoji/win10/vampire/2.png and b/public/images/emoji/win10/vampire/2.png differ
diff --git a/public/images/emoji/win10/vampire/3.png b/public/images/emoji/win10/vampire/3.png
index 540b48d887..07cb96f276 100644
Binary files a/public/images/emoji/win10/vampire/3.png and b/public/images/emoji/win10/vampire/3.png differ
diff --git a/public/images/emoji/win10/vampire/4.png b/public/images/emoji/win10/vampire/4.png
index b05d3bad9a..eb487cc983 100644
Binary files a/public/images/emoji/win10/vampire/4.png and b/public/images/emoji/win10/vampire/4.png differ
diff --git a/public/images/emoji/win10/vampire/5.png b/public/images/emoji/win10/vampire/5.png
index 2bd9a7b71b..d2591a3a38 100644
Binary files a/public/images/emoji/win10/vampire/5.png and b/public/images/emoji/win10/vampire/5.png differ
diff --git a/public/images/emoji/win10/vampire/6.png b/public/images/emoji/win10/vampire/6.png
index c88f4ad73b..529feecf96 100644
Binary files a/public/images/emoji/win10/vampire/6.png and b/public/images/emoji/win10/vampire/6.png differ
diff --git a/public/images/emoji/win10/vertical_traffic_light.png b/public/images/emoji/win10/vertical_traffic_light.png
index 77868406f6..33b5eba790 100644
Binary files a/public/images/emoji/win10/vertical_traffic_light.png and b/public/images/emoji/win10/vertical_traffic_light.png differ
diff --git a/public/images/emoji/win10/video_camera.png b/public/images/emoji/win10/video_camera.png
index daf9ec7b96..47d7fc7920 100644
Binary files a/public/images/emoji/win10/video_camera.png and b/public/images/emoji/win10/video_camera.png differ
diff --git a/public/images/emoji/win10/virgo.png b/public/images/emoji/win10/virgo.png
index 8a8067bdfa..b28b9ca192 100644
Binary files a/public/images/emoji/win10/virgo.png and b/public/images/emoji/win10/virgo.png differ
diff --git a/public/images/emoji/win10/wastebasket.png b/public/images/emoji/win10/wastebasket.png
index 6263ba153d..a0ddcddad6 100644
Binary files a/public/images/emoji/win10/wastebasket.png and b/public/images/emoji/win10/wastebasket.png differ
diff --git a/public/images/emoji/win10/watermelon.png b/public/images/emoji/win10/watermelon.png
index 67c2acd531..0311f8c44b 100644
Binary files a/public/images/emoji/win10/watermelon.png and b/public/images/emoji/win10/watermelon.png differ
diff --git a/public/images/emoji/win10/wedding.png b/public/images/emoji/win10/wedding.png
index 4919c5bea7..50b3cb4ad9 100644
Binary files a/public/images/emoji/win10/wedding.png and b/public/images/emoji/win10/wedding.png differ
diff --git a/public/images/emoji/win10/white_check_mark.png b/public/images/emoji/win10/white_check_mark.png
index 4f77f8a267..9c6d33d918 100644
Binary files a/public/images/emoji/win10/white_check_mark.png and b/public/images/emoji/win10/white_check_mark.png differ
diff --git a/public/images/emoji/win10/wine_glass.png b/public/images/emoji/win10/wine_glass.png
index 3a7b55a50f..79a7359693 100644
Binary files a/public/images/emoji/win10/wine_glass.png and b/public/images/emoji/win10/wine_glass.png differ
diff --git a/public/images/emoji/win10/woman_health_worker.png b/public/images/emoji/win10/woman_health_worker.png
index 01b54dbed4..4ac68a892e 100644
Binary files a/public/images/emoji/win10/woman_health_worker.png and b/public/images/emoji/win10/woman_health_worker.png differ
diff --git a/public/images/emoji/win10/woman_mechanic/3.png b/public/images/emoji/win10/woman_mechanic/3.png
index be260498e6..fc86f68f59 100644
Binary files a/public/images/emoji/win10/woman_mechanic/3.png and b/public/images/emoji/win10/woman_mechanic/3.png differ
diff --git a/public/images/emoji/win10/woman_mechanic/6.png b/public/images/emoji/win10/woman_mechanic/6.png
index cc5fac7aa4..e58aa22f27 100644
Binary files a/public/images/emoji/win10/woman_mechanic/6.png and b/public/images/emoji/win10/woman_mechanic/6.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf.png b/public/images/emoji/win10/woman_with_headscarf.png
index 6b3731cac8..4c30bb9305 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf.png and b/public/images/emoji/win10/woman_with_headscarf.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/2.png b/public/images/emoji/win10/woman_with_headscarf/2.png
index 511414ad6c..1fcb32c3a2 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/2.png and b/public/images/emoji/win10/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/3.png b/public/images/emoji/win10/woman_with_headscarf/3.png
index af95435379..fad924d8b4 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/3.png and b/public/images/emoji/win10/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/4.png b/public/images/emoji/win10/woman_with_headscarf/4.png
index 355bdeb636..c1f5345f54 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/4.png and b/public/images/emoji/win10/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/5.png b/public/images/emoji/win10/woman_with_headscarf/5.png
index 8d0ad7202e..078e3c0b10 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/5.png and b/public/images/emoji/win10/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/6.png b/public/images/emoji/win10/woman_with_headscarf/6.png
index 3c49195f87..a629104455 100644
Binary files a/public/images/emoji/win10/woman_with_headscarf/6.png and b/public/images/emoji/win10/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/win10/x.png b/public/images/emoji/win10/x.png
index dc04f3d008..ea0ff9ba47 100644
Binary files a/public/images/emoji/win10/x.png and b/public/images/emoji/win10/x.png differ
diff --git a/public/images/emoji/win10/zebra.png b/public/images/emoji/win10/zebra.png
index 6faa14f55d..2ec3223339 100644
Binary files a/public/images/emoji/win10/zebra.png and b/public/images/emoji/win10/zebra.png differ
diff --git a/public/images/emoji/win10/zero.png b/public/images/emoji/win10/zero.png
index 4b2b38dce0..6a0d6d2e46 100644
Binary files a/public/images/emoji/win10/zero.png and b/public/images/emoji/win10/zero.png differ
diff --git a/public/images/emoji/win10/zombie.png b/public/images/emoji/win10/zombie.png
index 1bf288fcd4..722514c5a1 100644
Binary files a/public/images/emoji/win10/zombie.png and b/public/images/emoji/win10/zombie.png differ
diff --git a/public/javascripts/Chart.min.js b/public/javascripts/Chart.min.js
index 76eafe6ea1..2130e2ab70 100644
--- a/public/javascripts/Chart.min.js
+++ b/public/javascripts/Chart.min.js
@@ -1,14 +1,10 @@
-!function t(e,i,a){function s(n,r){if(!i[n]){if(!e[n]){var l="function"==typeof require&&require;if(!r&&l)return l(n,!0);if(o)return o(n,!0);var h=new Error("Cannot find module '"+n+"'");throw h.code="MODULE_NOT_FOUND",h}var c=i[n]={exports:{}};e[n][0].call(c.exports,function(t){var i=e[n][1][t];return s(i?i:t)},c,c.exports,t,e,i,a)}return i[n].exports}for(var o="function"==typeof require&&require,n=0;n<a.length;n++)s(a[n]);return s}({1:[function(t,e,i){},{}],2:[function(t,e,i){var a=t("color-convert"),s=t("color-string"),o=function(t){if(t instanceof o)return t;if(!(this instanceof o))return new o(t);if(this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},"string"==typeof t){var e=s.getRgba(t);if(e)this.setValues("rgb",e);else if(e=s.getHsla(t))this.setValues("hsl",e);else{if(!(e=s.getHwb(t)))throw new Error('Unable to parse color from string "'+t+'"');this.setValues("hwb",e)}}else if("object"==typeof t){var e=t;if(void 0!==e.r||void 0!==e.red)this.setValues("rgb",e);else if(void 0!==e.l||void 0!==e.lightness)this.setValues("hsl",e);else if(void 0!==e.v||void 0!==e.value)this.setValues("hsv",e);else if(void 0!==e.w||void 0!==e.whiteness)this.setValues("hwb",e);else{if(void 0===e.c&&void 0===e.cyan)throw new Error("Unable to parse color from object "+JSON.stringify(t));this.setValues("cmyk",e)}}};o.prototype={rgb:function(t){return this.setSpace("rgb",arguments)},hsl:function(t){return this.setSpace("hsl",arguments)},hsv:function(t){return this.setSpace("hsv",arguments)},hwb:function(t){return this.setSpace("hwb",arguments)},cmyk:function(t){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){return 1!==this.values.alpha?this.values.hwb.concat([this.values.alpha]):this.values.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values.rgb;return t.concat([this.values.alpha])},hslaArray:function(){var t=this.values.hsl;return t.concat([this.values.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return s.hexString(this.values.rgb)},rgbString:function(){return s.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return s.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return s.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return s.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return s.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return s.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return s.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){return this.values.rgb[0]<<16|this.values.rgb[1]<<8|this.values.rgb[2]},luminosity:function(){for(var t=this.values.rgb,e=[],i=0;i<t.length;i++){var a=t[i]/255;e[i]=.03928>=a?a/12.92:Math.pow((a+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),i=t.luminosity();return e>i?(e+.05)/(i+.05):(i+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb,e=(299*t[0]+587*t[1]+114*t[2])/1e3;return 128>e},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;3>e;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){return this.values.hsl[2]+=this.values.hsl[2]*t,this.setValues("hsl",this.values.hsl),this},darken:function(t){return this.values.hsl[2]-=this.values.hsl[2]*t,this.setValues("hsl",this.values.hsl),this},saturate:function(t){return this.values.hsl[1]+=this.values.hsl[1]*t,this.setValues("hsl",this.values.hsl),this},desaturate:function(t){return this.values.hsl[1]-=this.values.hsl[1]*t,this.setValues("hsl",this.values.hsl),this},whiten:function(t){return this.values.hwb[1]+=this.values.hwb[1]*t,this.setValues("hwb",this.values.hwb),this},blacken:function(t){return this.values.hwb[2]+=this.values.hwb[2]*t,this.setValues("hwb",this.values.hwb),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){return this.setValues("alpha",this.values.alpha-this.values.alpha*t),this},opaquer:function(t){return this.setValues("alpha",this.values.alpha+this.values.alpha*t),this},rotate:function(t){var e=this.values.hsl[0];return e=(e+t)%360,e=0>e?360+e:e,this.values.hsl[0]=e,this.setValues("hsl",this.values.hsl),this},mix:function(t,e){e=1-(null==e?.5:e);for(var i=2*e-1,a=this.alpha()-t.alpha(),s=((i*a==-1?i:(i+a)/(1+i*a))+1)/2,o=1-s,n=this.rgbArray(),r=t.rgbArray(),l=0;l<n.length;l++)n[l]=n[l]*s+r[l]*o;this.setValues("rgb",n);var h=this.alpha()*e+t.alpha()*(1-e);return this.setValues("alpha",h),this},toJSON:function(){return this.rgb()},clone:function(){return new o(this.rgb())}},o.prototype.getValues=function(t){for(var e={},i=0;i<t.length;i++)e[t.charAt(i)]=this.values[t][i];return 1!=this.values.alpha&&(e.a=this.values.alpha),e},o.prototype.setValues=function(t,e){var i={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},s={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},o=1;if("alpha"==t)o=e;else if(e.length)this.values[t]=e.slice(0,t.length),o=e[t.length];else if(void 0!==e[t.charAt(0)]){for(var n=0;n<t.length;n++)this.values[t][n]=e[t.charAt(n)];o=e.a}else if(void 0!==e[i[t][0]]){for(var r=i[t],n=0;n<t.length;n++)this.values[t][n]=e[r[n]];o=e.alpha}if(this.values.alpha=Math.max(0,Math.min(1,void 0!==o?o:this.values.alpha)),"alpha"!=t){for(var n=0;n<t.length;n++){var l=Math.max(0,Math.min(s[t][n],this.values[t][n]));this.values[t][n]=Math.round(l)}for(var h in i){h!=t&&(this.values[h]=a[t][h](this.values[t]));for(var n=0;n<h.length;n++){var l=Math.max(0,Math.min(s[h][n],this.values[h][n]));this.values[h][n]=Math.round(l)}}return!0}},o.prototype.setSpace=function(t,e){var i=e[0];return void 0===i?this.getValues(t):("number"==typeof i&&(i=Array.prototype.slice.call(e)),this.setValues(t,i),this)},o.prototype.setChannel=function(t,e,i){return void 0===i?this.values[t][e]:(this.values[t][e]=i,this.setValues(t,this.values[t]),this)},window.Color=e.exports=o},{"color-convert":4,"color-string":6}],3:[function(t,e,i){function a(t){var e,i,a,s=t[0]/255,o=t[1]/255,n=t[2]/255,r=Math.min(s,o,n),l=Math.max(s,o,n),h=l-r;return l==r?e=0:s==l?e=(o-n)/h:o==l?e=2+(n-s)/h:n==l&&(e=4+(s-o)/h),e=Math.min(60*e,360),0>e&&(e+=360),a=(r+l)/2,i=l==r?0:.5>=a?h/(l+r):h/(2-l-r),[e,100*i,100*a]}function s(t){var e,i,a,s=t[0],o=t[1],n=t[2],r=Math.min(s,o,n),l=Math.max(s,o,n),h=l-r;return i=0==l?0:h/l*1e3/10,l==r?e=0:s==l?e=(o-n)/h:o==l?e=2+(n-s)/h:n==l&&(e=4+(s-o)/h),e=Math.min(60*e,360),0>e&&(e+=360),a=l/255*1e3/10,[e,i,a]}function o(t){var e=t[0],i=t[1],s=t[2],o=a(t)[0],n=1/255*Math.min(e,Math.min(i,s)),s=1-1/255*Math.max(e,Math.max(i,s));return[o,100*n,100*s]}function n(t){var e,i,a,s,o=t[0]/255,n=t[1]/255,r=t[2]/255;return s=Math.min(1-o,1-n,1-r),e=(1-o-s)/(1-s)||0,i=(1-n-s)/(1-s)||0,a=(1-r-s)/(1-s)||0,[100*e,100*i,100*a,100*s]}function l(t){return G[JSON.stringify(t)]}function h(t){var e=t[0]/255,i=t[1]/255,a=t[2]/255;e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92,i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92,a=a>.04045?Math.pow((a+.055)/1.055,2.4):a/12.92;var s=.4124*e+.3576*i+.1805*a,o=.2126*e+.7152*i+.0722*a,n=.0193*e+.1192*i+.9505*a;return[100*s,100*o,100*n]}function c(t){var e,i,a,s=h(t),o=s[0],n=s[1],r=s[2];return o/=95.047,n/=100,r/=108.883,o=o>.008856?Math.pow(o,1/3):7.787*o+16/116,n=n>.008856?Math.pow(n,1/3):7.787*n+16/116,r=r>.008856?Math.pow(r,1/3):7.787*r+16/116,e=116*n-16,i=500*(o-n),a=200*(n-r),[e,i,a]}function d(t){return W(c(t))}function u(t){var e,i,a,s,o,n=t[0]/360,r=t[1]/100,l=t[2]/100;if(0==r)return o=255*l,[o,o,o];i=.5>l?l*(1+r):l+r-l*r,e=2*l-i,s=[0,0,0];for(var h=0;3>h;h++)a=n+1/3*-(h-1),0>a&&a++,a>1&&a--,o=1>6*a?e+6*(i-e)*a:1>2*a?i:2>3*a?e+(i-e)*(2/3-a)*6:e,s[h]=255*o;return s}function f(t){var e,i,a=t[0],s=t[1]/100,o=t[2]/100;return 0===o?[0,0,0]:(o*=2,s*=1>=o?o:2-o,i=(o+s)/2,e=2*s/(o+s),[a,100*e,100*i])}function m(t){return o(u(t))}function p(t){return n(u(t))}function x(t){return l(u(t))}function v(t){var e=t[0]/60,i=t[1]/100,a=t[2]/100,s=Math.floor(e)%6,o=e-Math.floor(e),n=255*a*(1-i),r=255*a*(1-i*o),l=255*a*(1-i*(1-o)),a=255*a;switch(s){case 0:return[a,l,n];case 1:return[r,a,n];case 2:return[n,a,l];case 3:return[n,r,a];case 4:return[l,n,a];case 5:return[a,n,r]}}function y(t){var e,i,a=t[0],s=t[1]/100,o=t[2]/100;return i=(2-s)*o,e=s*o,e/=1>=i?i:2-i,e=e||0,i/=2,[a,100*e,100*i]}function k(t){return o(v(t))}function D(t){return n(v(t))}function S(t){return l(v(t))}function C(t){var e,i,a,s,o=t[0]/360,n=t[1]/100,l=t[2]/100,h=n+l;switch(h>1&&(n/=h,l/=h),e=Math.floor(6*o),i=1-l,a=6*o-e,0!=(1&e)&&(a=1-a),s=n+a*(i-n),e){default:case 6:case 0:r=i,g=s,b=n;break;case 1:r=s,g=i,b=n;break;case 2:r=n,g=i,b=s;break;case 3:r=n,g=s,b=i;break;case 4:r=s,g=n,b=i;break;case 5:r=i,g=n,b=s}return[255*r,255*g,255*b]}function w(t){return a(C(t))}function _(t){return s(C(t))}function A(t){return n(C(t))}function I(t){return l(C(t))}function M(t){var e,i,a,s=t[0]/100,o=t[1]/100,n=t[2]/100,r=t[3]/100;return e=1-Math.min(1,s*(1-r)+r),i=1-Math.min(1,o*(1-r)+r),a=1-Math.min(1,n*(1-r)+r),[255*e,255*i,255*a]}function F(t){return a(M(t))}function P(t){return s(M(t))}function T(t){return o(M(t))}function V(t){return l(M(t))}function R(t){var e,i,a,s=t[0]/100,o=t[1]/100,n=t[2]/100;return e=3.2406*s+-1.5372*o+n*-.4986,i=s*-.9689+1.8758*o+.0415*n,a=.0557*s+o*-.204+1.057*n,e=e>.0031308?1.055*Math.pow(e,1/2.4)-.055:e=12.92*e,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:i=12.92*i,a=a>.0031308?1.055*Math.pow(a,1/2.4)-.055:a=12.92*a,e=Math.min(Math.max(0,e),1),i=Math.min(Math.max(0,i),1),a=Math.min(Math.max(0,a),1),[255*e,255*i,255*a]}function O(t){var e,i,a,s=t[0],o=t[1],n=t[2];return s/=95.047,o/=100,n/=108.883,s=s>.008856?Math.pow(s,1/3):7.787*s+16/116,o=o>.008856?Math.pow(o,1/3):7.787*o+16/116,n=n>.008856?Math.pow(n,1/3):7.787*n+16/116,e=116*o-16,i=500*(s-o),a=200*(o-n),[e,i,a]}function L(t){return W(O(t))}function z(t){var e,i,a,s,o=t[0],n=t[1],r=t[2];return 8>=o?(i=100*o/903.3,s=7.787*(i/100)+16/116):(i=100*Math.pow((o+16)/116,3),s=Math.pow(i/100,1/3)),e=.008856>=e/95.047?e=95.047*(n/500+s-16/116)/7.787:95.047*Math.pow(n/500+s,3),a=.008859>=a/108.883?a=108.883*(s-r/200-16/116)/7.787:108.883*Math.pow(s-r/200,3),[e,i,a]}function W(t){var e,i,a,s=t[0],o=t[1],n=t[2];return e=Math.atan2(n,o),i=360*e/2/Math.PI,0>i&&(i+=360),a=Math.sqrt(o*o+n*n),[s,a,i]}function B(t){return R(z(t))}function N(t){var e,i,a,s=t[0],o=t[1],n=t[2];return a=n/360*2*Math.PI,e=o*Math.cos(a),i=o*Math.sin(a),[s,e,i]}function H(t){return z(N(t))}function E(t){return B(N(t))}function U(t){return X[t]}function j(t){return a(U(t))}function q(t){return s(U(t))}function Y(t){return o(U(t))}function Q(t){return n(U(t))}function J(t){return c(U(t))}function Z(t){return h(U(t))}e.exports={rgb2hsl:a,rgb2hsv:s,rgb2hwb:o,rgb2cmyk:n,rgb2keyword:l,rgb2xyz:h,rgb2lab:c,rgb2lch:d,hsl2rgb:u,hsl2hsv:f,hsl2hwb:m,hsl2cmyk:p,hsl2keyword:x,hsv2rgb:v,hsv2hsl:y,hsv2hwb:k,hsv2cmyk:D,hsv2keyword:S,hwb2rgb:C,hwb2hsl:w,hwb2hsv:_,hwb2cmyk:A,hwb2keyword:I,cmyk2rgb:M,cmyk2hsl:F,cmyk2hsv:P,cmyk2hwb:T,cmyk2keyword:V,keyword2rgb:U,keyword2hsl:j,keyword2hsv:q,keyword2hwb:Y,keyword2cmyk:Q,keyword2lab:J,keyword2xyz:Z,xyz2rgb:R,xyz2lab:O,xyz2lch:L,lab2xyz:z,lab2rgb:B,lab2lch:W,lch2lab:N,lch2xyz:H,lch2rgb:E};var X={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},G={};for(var $ in X)G[JSON.stringify(X[$])]=$},{}],4:[function(t,e,i){var a=t("./conversions"),s=function(){return new h};for(var o in a){s[o+"Raw"]=function(t){return function(e){return"number"==typeof e&&(e=Array.prototype.slice.call(arguments)),a[t](e)}}(o);var n=/(\w+)2(\w+)/.exec(o),r=n[1],l=n[2];s[r]=s[r]||{},s[r][l]=s[o]=function(t){return function(e){"number"==typeof e&&(e=Array.prototype.slice.call(arguments));var i=a[t](e);if("string"==typeof i||void 0===i)return i;for(var s=0;s<i.length;s++)i[s]=Math.round(i[s]);return i}}(o)}var h=function(){this.convs={}};h.prototype.routeSpace=function(t,e){var i=e[0];return void 0===i?this.getValues(t):("number"==typeof i&&(i=Array.prototype.slice.call(e)),this.setValues(t,i))},h.prototype.setValues=function(t,e){return this.space=t,this.convs={},this.convs[t]=e,this},h.prototype.getValues=function(t){var e=this.convs[t];if(!e){var i=this.space,a=this.convs[i];e=s[i][t](a),this.convs[t]=e}return e},["rgb","hsl","hsv","cmyk","keyword"].forEach(function(t){h.prototype[t]=function(e){return this.routeSpace(t,arguments)}}),e.exports=s},{"./conversions":3}],5:[function(t,e,i){e.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}},{}],6:[function(t,e,i){function a(t){if(t){var e=/^#([a-fA-F0-9]{3})$/,i=/^#([a-fA-F0-9]{6})$/,a=/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/,s=/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/,o=/(\w+)/,n=[0,0,0],r=1,l=t.match(e);if(l){l=l[1];for(var h=0;h<n.length;h++)n[h]=parseInt(l[h]+l[h],16)}else if(l=t.match(i)){l=l[1];for(var h=0;h<n.length;h++)n[h]=parseInt(l.slice(2*h,2*h+2),16)}else if(l=t.match(a)){for(var h=0;h<n.length;h++)n[h]=parseInt(l[h+1]);r=parseFloat(l[4])}else if(l=t.match(s)){for(var h=0;h<n.length;h++)n[h]=Math.round(2.55*parseFloat(l[h+1]));r=parseFloat(l[4])}else if(l=t.match(o)){if("transparent"==l[1])return[0,0,0,0];if(n=y[l[1]],!n)return}for(var h=0;h<n.length;h++)n[h]=x(n[h],0,255);return r=r||0==r?x(r,0,1):1,n[3]=r,n}}function s(t){if(t){var e=/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/,i=t.match(e);if(i){var a=parseFloat(i[4]),s=x(parseInt(i[1]),0,360),o=x(parseFloat(i[2]),0,100),n=x(parseFloat(i[3]),0,100),r=x(isNaN(a)?1:a,0,1);return[s,o,n,r]}}}function o(t){if(t){var e=/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/,i=t.match(e);if(i){var a=parseFloat(i[4]),s=x(parseInt(i[1]),0,360),o=x(parseFloat(i[2]),0,100),n=x(parseFloat(i[3]),0,100),r=x(isNaN(a)?1:a,0,1);return[s,o,n,r]}}}function n(t){var e=a(t);return e&&e.slice(0,3)}function r(t){var e=s(t);return e&&e.slice(0,3)}function l(t){var e=a(t);return e?e[3]:(e=s(t))?e[3]:(e=o(t))?e[3]:void 0}function h(t){return"#"+v(t[0])+v(t[1])+v(t[2])}function c(t,e){return 1>e||t[3]&&t[3]<1?d(t,e):"rgb("+t[0]+", "+t[1]+", "+t[2]+")"}function d(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function u(t,e){if(1>e||t[3]&&t[3]<1)return g(t,e);var i=Math.round(t[0]/255*100),a=Math.round(t[1]/255*100),s=Math.round(t[2]/255*100);return"rgb("+i+"%, "+a+"%, "+s+"%)"}function g(t,e){var i=Math.round(t[0]/255*100),a=Math.round(t[1]/255*100),s=Math.round(t[2]/255*100);return"rgba("+i+"%, "+a+"%, "+s+"%, "+(e||t[3]||1)+")"}function f(t,e){return 1>e||t[3]&&t[3]<1?m(t,e):"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"}function m(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"}function b(t){return k[t.slice(0,3)]}function x(t,e,i){return Math.min(Math.max(e,t),i)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var y=t("color-name");e.exports={getRgba:a,getHsla:s,getRgb:n,getHsl:r,getHwb:o,getAlpha:l,hexString:h,rgbString:c,rgbaString:d,percentString:u,percentaString:g,hslString:f,hslaString:m,hwbString:p,keyword:b};var k={};for(var D in y)k[y[D]]=D},{"color-name":5}],7:[function(t,e,i){/*!
+/*!
  * Chart.js
  * http://chartjs.org/
- * Version: 2.0.0
+ * Version: 2.7.1
  *
- * Copyright 2015 Nick Downie
+ * Copyright 2017 Nick Downie
  * Released under the MIT license
- * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md
+ * https://github.com/chartjs/Chart.js/blob/master/LICENSE.md
  */
-var a=t("./core/core.js")();t("./core/core.helpers")(a),t("./core/core.element")(a),t("./core/core.animation")(a),t("./core/core.controller")(a),t("./core/core.datasetController")(a),t("./core/core.layoutService")(a),t("./core/core.legend")(a),t("./core/core.scale")(a),t("./core/core.scaleService")(a),t("./core/core.title")(a),t("./core/core.tooltip")(a),t("./controllers/controller.bar")(a),t("./controllers/controller.bubble")(a),t("./controllers/controller.doughnut")(a),t("./controllers/controller.line")(a),t("./controllers/controller.polarArea")(a),t("./controllers/controller.radar")(a),t("./scales/scale.category")(a),t("./scales/scale.linear")(a),t("./scales/scale.logarithmic")(a),t("./scales/scale.radialLinear")(a),t("./scales/scale.time")(a),t("./elements/element.arc")(a),t("./elements/element.line")(a),t("./elements/element.point")(a),t("./elements/element.rectangle")(a),t("./charts/Chart.Bar")(a),t("./charts/Chart.Bubble")(a),t("./charts/Chart.Doughnut")(a),t("./charts/Chart.Line")(a),t("./charts/Chart.PolarArea")(a),t("./charts/Chart.Radar")(a),t("./charts/Chart.Scatter")(a),window.Chart=e.exports=a},{"./charts/Chart.Bar":8,"./charts/Chart.Bubble":9,"./charts/Chart.Doughnut":10,"./charts/Chart.Line":11,"./charts/Chart.PolarArea":12,"./charts/Chart.Radar":13,"./charts/Chart.Scatter":14,"./controllers/controller.bar":15,"./controllers/controller.bubble":16,"./controllers/controller.doughnut":17,"./controllers/controller.line":18,"./controllers/controller.polarArea":19,"./controllers/controller.radar":20,"./core/core.animation":21,"./core/core.controller":22,"./core/core.datasetController":23,"./core/core.element":24,"./core/core.helpers":25,"./core/core.js":26,"./core/core.layoutService":27,"./core/core.legend":28,"./core/core.scale":29,"./core/core.scaleService":30,"./core/core.title":31,"./core/core.tooltip":32,"./elements/element.arc":33,"./elements/element.line":34,"./elements/element.point":35,"./elements/element.rectangle":36,"./scales/scale.category":37,"./scales/scale.linear":38,"./scales/scale.logarithmic":39,"./scales/scale.radialLinear":40,"./scales/scale.time":41}],8:[function(t,e,i){"use strict";e.exports=function(t){t.Bar=function(e,i){return i.type="bar",new t(e,i)}}},{}],9:[function(t,e,i){"use strict";e.exports=function(t){t.Bubble=function(e,i){return i.type="bubble",new t(e,i)}}},{}],10:[function(t,e,i){"use strict";e.exports=function(t){t.Doughnut=function(e,i){return i.type="doughnut",new t(e,i)}}},{}],11:[function(t,e,i){"use strict";e.exports=function(t){t.Line=function(e,i){return i.type="line",new t(e,i)}}},{}],12:[function(t,e,i){"use strict";e.exports=function(t){t.PolarArea=function(e,i){return i.type="polarArea",new t(e,i)}}},{}],13:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={aspectRatio:1};t.Radar=function(a,s){return s.options=e.configMerge(i,s.options),s.type="radar",new t(a,s)}}},{}],14:[function(t,e,i){"use strict";e.exports=function(t){var e={hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-1"}],yAxes:[{type:"linear",position:"left",id:"y-axis-1"}]},tooltips:{callbacks:{title:function(t,e){return""},label:function(t,e){return"("+t.xLabel+", "+t.yLabel+")"}}}};t.defaults.scatter=e,t.controllers.scatter=t.controllers.line,t.Scatter=function(e,i){return i.type="scatter",new t(e,i)}}},{}],15:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.bar={hover:{mode:"label"},scales:{xAxes:[{type:"category",categoryPercentage:.8,barPercentage:.9,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}},t.controllers.bar=t.DatasetController.extend({initialize:function(e,i){t.DatasetController.prototype.initialize.call(this,e,i),this.getDataset().bar=!0},getBarCount:function(){var t=0;return e.each(this.chart.data.datasets,function(i){e.isDatasetVisible(i)&&i.bar&&++t}),t},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Rectangle({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Rectangle({_chart:this.chart.chart,_datasetIndex:this.index,_index:e}),a=this.getBarCount();this.updateElement(i,e,!0,a),this.getDataset().metaData.splice(e,0,i)},update:function(t){var i=this.getBarCount();e.each(this.getDataset().metaData,function(e,a){this.updateElement(e,a,t,i)},this)},updateElement:function(t,i,a,s){var o,n=this.getScaleForId(this.getDataset().xAxisID),r=this.getScaleForId(this.getDataset().yAxisID);o=r.min<0&&r.max<0?r.getPixelForValue(r.max):r.min>0&&r.max>0?r.getPixelForValue(r.min):r.getPixelForValue(0),e.extend(t,{_chart:this.chart.chart,_xScale:n,_yScale:r,_datasetIndex:this.index,_index:i,_model:{x:this.calculateBarX(i,this.index),y:a?o:this.calculateBarY(i,this.index),label:this.chart.data.labels[i],datasetLabel:this.getDataset().label,base:a?o:this.calculateBarBase(this.index,i),width:this.calculateBarWidth(s),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.rectangle.backgroundColor),borderSkipped:t.custom&&t.custom.borderSkipped?t.custom.borderSkipped:this.chart.options.elements.rectangle.borderSkipped,borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.rectangle.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.rectangle.borderWidth)}}),t.pivot()},calculateBarBase:function(t,i){var a=(this.getScaleForId(this.getDataset().xAxisID),this.getScaleForId(this.getDataset().yAxisID)),s=0;if(a.options.stacked){var o=this.chart.data.datasets[t].data[i];if(0>o)for(var n=0;t>n;n++){var r=this.chart.data.datasets[n];e.isDatasetVisible(r)&&r.yAxisID===a.id&&r.bar&&(s+=r.data[i]<0?r.data[i]:0)}else for(var l=0;t>l;l++){var h=this.chart.data.datasets[l];e.isDatasetVisible(h)&&h.yAxisID===a.id&&h.bar&&(s+=h.data[i]>0?h.data[i]:0)}return a.getPixelForValue(s)}return s=a.getPixelForValue(a.min),a.beginAtZero||a.min<=0&&a.max>=0||a.min>=0&&a.max<=0?s=a.getPixelForValue(0,0):a.min<0&&a.max<0&&(s=a.getPixelForValue(a.max)),s},getRuler:function(){var t=this.getScaleForId(this.getDataset().xAxisID),e=(this.getScaleForId(this.getDataset().yAxisID),this.getBarCount()),i=function(){for(var e=t.getPixelForTick(1)-t.getPixelForTick(0),i=2;i<this.getDataset().data.length;i++)e=Math.min(t.getPixelForTick(i)-t.getPixelForTick(i-1),e);return e}.call(this),a=i*t.options.categoryPercentage,s=(i-i*t.options.categoryPercentage)/2,o=a/e,n=o*t.options.barPercentage,r=o-o*t.options.barPercentage;return{datasetCount:e,tickWidth:i,categoryWidth:a,categorySpacing:s,fullBarWidth:o,barWidth:n,barSpacing:r}},calculateBarWidth:function(){var t=this.getScaleForId(this.getDataset().xAxisID),e=this.getRuler();return t.options.stacked?e.categoryWidth:e.barWidth},getBarIndex:function(t){for(var i=0,a=0;t>a;++a)e.isDatasetVisible(this.chart.data.datasets[a])&&this.chart.data.datasets[a].bar&&++i;return i},calculateBarX:function(t,e){var i=(this.getScaleForId(this.getDataset().yAxisID),this.getScaleForId(this.getDataset().xAxisID)),a=this.getBarIndex(e),s=this.getRuler(),o=i.getPixelForValue(null,t,e,this.chart.isCombo);return o-=this.chart.isCombo?s.tickWidth/2:0,i.options.stacked?o+s.categoryWidth/2+s.categorySpacing:o+s.barWidth/2+s.categorySpacing+s.barWidth*a+s.barSpacing/2+s.barSpacing*a},calculateBarY:function(t,i){var a=(this.getScaleForId(this.getDataset().xAxisID),this.getScaleForId(this.getDataset().yAxisID)),s=this.getDataset().data[t];if(a.options.stacked){for(var o=0,n=0,r=0;i>r;r++){var l=this.chart.data.datasets[r];e.isDatasetVisible(l)&&l.bar&&l.yAxisID===a.id&&(l.data[t]<0?n+=l.data[t]||0:o+=l.data[t]||0)}return 0>s?a.getPixelForValue(n+s):a.getPixelForValue(o+s)}return a.getPixelForValue(s)},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){var a=this.getDataset().data[e];null===a||void 0===a||isNaN(a)||t.transition(i).draw()},this)},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.hoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.hoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.rectangle.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.rectangle.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.rectangle.borderWidth)}})}},{}],16:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.bubble={hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(t,e){return""},label:function(t,e){var i=e.datasets[t.datasetIndex].label||"",a=e.datasets[t.datasetIndex].data[t.index];return i+": ("+a.x+", "+a.y+", "+a.r+")"}}}},t.controllers.bubble=t.DatasetController.extend({addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:e});this.updateElement(i,e,!0),this.getDataset().metaData.splice(e,0,i)},update:function(t){var i,a=this.getDataset().metaData,s=this.getScaleForId(this.getDataset().yAxisID);this.getScaleForId(this.getDataset().xAxisID);i=s.min<0&&s.max<0?s.getPixelForValue(s.max):s.min>0&&s.max>0?s.getPixelForValue(s.min):s.getPixelForValue(0),e.each(a,function(e,i){this.updateElement(e,i,t)},this)},updateElement:function(t,i,a){var s,o=this.getScaleForId(this.getDataset().yAxisID),n=this.getScaleForId(this.getDataset().xAxisID);s=o.min<0&&o.max<0?o.getPixelForValue(o.max):o.min>0&&o.max>0?o.getPixelForValue(o.min):o.getPixelForValue(0),e.extend(t,{_chart:this.chart.chart,_xScale:n,_yScale:o,_datasetIndex:this.index,_index:i,_model:{x:a?n.getPixelForDecimal(.5):n.getPixelForValue(this.getDataset().data[i],i,this.index,this.chart.isCombo),y:a?s:o.getPixelForValue(this.getDataset().data[i],i,this.index),radius:a?0:t.custom&&t.custom.radius?t.custom.radius:this.getRadius(this.getDataset().data[i]),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.point.backgroundColor),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.point.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.point.borderWidth),hitRadius:t.custom&&t.custom.hitRadius?t.custom.hitRadius:e.getValueAtIndexOrDefault(this.getDataset().hitRadius,i,this.chart.options.elements.point.hitRadius)}}),t._model.skip=t.custom&&t.custom.skip?t.custom.skip:isNaN(t._model.x)||isNaN(t._model.y),t.pivot()},getRadius:function(t){return t.r||this.chart.options.elements.point.radius},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){t.transition(i),t.draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.radius=t.custom&&t.custom.hoverRadius?t.custom.hoverRadius:e.getValueAtIndexOrDefault(i.hoverRadius,a,this.chart.options.elements.point.hoverRadius)+this.getRadius(this.getDataset().data[t._index]),t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.hoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.hoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.radius=t.custom&&t.custom.radius?t.custom.radius:this.getRadius(this.getDataset().data[t._index]),t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.point.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.point.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.point.borderWidth)}})}},{}],17:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.doughnut={animation:{animateRotate:!0,animateScale:!1},aspectRatio:1,hover:{mode:"single"},legendCallback:function(t){var e=[];if(e.push('<ul class="'+t.id+'-legend">'),t.data.datasets.length)for(var i=0;i<t.data.datasets[0].data.length;++i)e.push('<li><span style="background-color:'+t.data.datasets[0].backgroundColor[i]+'">'),t.data.labels[i]&&e.push(t.data.labels[i]),e.push("</span></li>");return e.push("</ul>"),e.join("")},legend:{labels:{generateLabels:function(t){return t.labels.length&&t.datasets.length?t.labels.map(function(e,i){return{text:e,fillStyle:t.datasets[0].backgroundColor[i],hidden:isNaN(t.datasets[0].data[i]),index:i}}):[]}},onClick:function(t,i){e.each(this.chart.data.datasets,function(t){t.metaHiddenData=t.metaHiddenData||[];var e=i.index;isNaN(t.data[e])?isNaN(t.metaHiddenData[e])||(t.data[e]=t.metaHiddenData[e]):(t.metaHiddenData[e]=t.data[e],t.data[e]=NaN)}),this.chart.update()}},cutoutPercentage:50,tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+e.datasets[t.datasetIndex].data[t.index]}}}},t.defaults.pie=e.clone(t.defaults.doughnut),e.extend(t.defaults.pie,{cutoutPercentage:0}),t.controllers.doughnut=t.controllers.pie=t.DatasetController.extend({linkScales:function(){},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(i,a){this.getDataset().metaData=this.getDataset().metaData||[];var s=new t.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:i});a&&e.isArray(this.getDataset().backgroundColor)&&this.getDataset().backgroundColor.splice(i,0,a),this.updateElement(s,i,!0),this.getDataset().metaData.splice(i,0,s)},getVisibleDatasetCount:function(){return e.where(this.chart.data.datasets,function(t){return e.isDatasetVisible(t)}).length},getRingIndex:function(t){for(var i=0,a=0;t>a;++a)e.isDatasetVisible(this.chart.data.datasets[a])&&++i;return i},update:function(t){var i=Math.min(this.chart.chartArea.right-this.chart.chartArea.left,this.chart.chartArea.bottom-this.chart.chartArea.top);this.chart.outerRadius=Math.max(i/2-this.chart.options.elements.arc.borderWidth/2,0),this.chart.innerRadius=Math.max(this.chart.options.cutoutPercentage?this.chart.outerRadius/100*this.chart.options.cutoutPercentage:1,0),this.chart.radiusLength=(this.chart.outerRadius-this.chart.innerRadius)/this.getVisibleDatasetCount(),this.getDataset().total=0,e.each(this.getDataset().data,function(t){isNaN(t)||(this.getDataset().total+=Math.abs(t))},this),this.outerRadius=this.chart.outerRadius-this.chart.radiusLength*this.getRingIndex(this.index),this.innerRadius=this.outerRadius-this.chart.radiusLength,e.each(this.getDataset().metaData,function(e,i){this.updateElement(e,i,t)},this)},updateElement:function(t,i,a){var s=(this.chart.chartArea.left+this.chart.chartArea.right)/2,o=(this.chart.chartArea.top+this.chart.chartArea.bottom)/2,n=Math.PI*-.5,r=Math.PI*-.5,l=a&&this.chart.options.animation.animateRotate?0:this.calculateCircumference(this.getDataset().data[i]),h=a&&this.chart.options.animation.animateScale?0:this.innerRadius,c=a&&this.chart.options.animation.animateScale?0:this.outerRadius;e.extend(t,{_chart:this.chart.chart,_datasetIndex:this.index,_index:i,_model:{x:s,y:o,startAngle:n,endAngle:r,circumference:l,outerRadius:c,innerRadius:h,backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),hoverBackgroundColor:t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(this.getDataset().hoverBackgroundColor,i,this.chart.options.elements.arc.hoverBackgroundColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),label:e.getValueAtIndexOrDefault(this.getDataset().label,i,this.chart.data.labels[i])}}),a||(0===i?t._model.startAngle=Math.PI*-.5:t._model.startAngle=this.getDataset().metaData[i-1]._model.endAngle,t._model.endAngle=t._model.startAngle+t._model.circumference),t.pivot()},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){t.transition(i).draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.hoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.hoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth)},calculateCircumference:function(t){return this.getDataset().total>0&&!isNaN(t)?1.999999*Math.PI*(t/this.getDataset().total):0}})}},{}],18:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.line={showLines:!0,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}},t.controllers.line=t.DatasetController.extend({addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],this.getDataset().metaDataset=this.getDataset().metaDataset||new t.elements.Line({_chart:this.chart.chart,_datasetIndex:this.index,_points:this.getDataset().metaData}),e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:e});this.updateElement(i,e,!0),this.getDataset().metaData.splice(e,0,i),this.chart.options.showLines&&0!==this.chart.options.elements.line.tension&&this.updateBezierControlPoints()},update:function(t){var i,a=this.getDataset().metaDataset,s=this.getDataset().metaData,o=this.getScaleForId(this.getDataset().yAxisID);this.getScaleForId(this.getDataset().xAxisID);i=o.min<0&&o.max<0?o.getPixelForValue(o.max):o.min>0&&o.max>0?o.getPixelForValue(o.min):o.getPixelForValue(0),this.chart.options.showLines&&(a._scale=o,a._datasetIndex=this.index,a._children=s,a._model={tension:a.custom&&a.custom.tension?a.custom.tension:e.getValueOrDefault(this.getDataset().tension,this.chart.options.elements.line.tension),backgroundColor:a.custom&&a.custom.backgroundColor?a.custom.backgroundColor:this.getDataset().backgroundColor||this.chart.options.elements.line.backgroundColor,borderWidth:a.custom&&a.custom.borderWidth?a.custom.borderWidth:this.getDataset().borderWidth||this.chart.options.elements.line.borderWidth,borderColor:a.custom&&a.custom.borderColor?a.custom.borderColor:this.getDataset().borderColor||this.chart.options.elements.line.borderColor,borderCapStyle:a.custom&&a.custom.borderCapStyle?a.custom.borderCapStyle:this.getDataset().borderCapStyle||this.chart.options.elements.line.borderCapStyle,borderDash:a.custom&&a.custom.borderDash?a.custom.borderDash:this.getDataset().borderDash||this.chart.options.elements.line.borderDash,borderDashOffset:a.custom&&a.custom.borderDashOffset?a.custom.borderDashOffset:this.getDataset().borderDashOffset||this.chart.options.elements.line.borderDashOffset,borderJoinStyle:a.custom&&a.custom.borderJoinStyle?a.custom.borderJoinStyle:this.getDataset().borderJoinStyle||this.chart.options.elements.line.borderJoinStyle,fill:a.custom&&a.custom.fill?a.custom.fill:void 0!==this.getDataset().fill?this.getDataset().fill:this.chart.options.elements.line.fill,scaleTop:o.top,scaleBottom:o.bottom,scaleZero:i},a.pivot()),e.each(s,function(e,i){this.updateElement(e,i,t)},this),this.chart.options.showLines&&0!==this.chart.options.elements.line.tension&&this.updateBezierControlPoints()},getPointBackgroundColor:function(t,i){var a=this.chart.options.elements.point.backgroundColor,s=this.getDataset();return t.custom&&t.custom.backgroundColor?a=t.custom.backgroundColor:s.pointBackgroundColor?a=e.getValueAtIndexOrDefault(s.pointBackgroundColor,i,a):s.backgroundColor&&(a=s.backgroundColor),a},getPointBorderColor:function(t,i){var a=this.chart.options.elements.point.borderColor,s=this.getDataset();return t.custom&&t.custom.borderColor?a=t.custom.borderColor:s.pointBorderColor?a=e.getValueAtIndexOrDefault(this.getDataset().pointBorderColor,i,a):s.borderColor&&(a=s.borderColor),a},getPointBorderWidth:function(t,i){var a=this.chart.options.elements.point.borderWidth,s=this.getDataset();return t.custom&&void 0!==t.custom.borderWidth?a=t.custom.borderWidth:void 0!==s.pointBorderWidth?a=e.getValueAtIndexOrDefault(s.pointBorderWidth,i,a):void 0!==s.borderWidth&&(a=s.borderWidth),a},updateElement:function(t,i,a){var s,o=this.getScaleForId(this.getDataset().yAxisID),n=this.getScaleForId(this.getDataset().xAxisID);s=o.min<0&&o.max<0?o.getPixelForValue(o.max):o.min>0&&o.max>0?o.getPixelForValue(o.min):o.getPixelForValue(0),t._chart=this.chart.chart,t._xScale=n,t._yScale=o,t._datasetIndex=this.index,t._index=i,t._model={x:n.getPixelForValue(this.getDataset().data[i],i,this.index,this.chart.isCombo),y:a?s:this.calculatePointY(this.getDataset().data[i],i,this.index,this.chart.isCombo),tension:t.custom&&t.custom.tension?t.custom.tension:e.getValueOrDefault(this.getDataset().tension,this.chart.options.elements.line.tension),radius:t.custom&&t.custom.radius?t.custom.radius:e.getValueAtIndexOrDefault(this.getDataset().radius,i,this.chart.options.elements.point.radius),pointStyle:t.custom&&t.custom.pointStyle?t.custom.pointStyle:e.getValueAtIndexOrDefault(this.getDataset().pointStyle,i,this.chart.options.elements.point.pointStyle),backgroundColor:this.getPointBackgroundColor(t,i),borderColor:this.getPointBorderColor(t,i),borderWidth:this.getPointBorderWidth(t,i),hitRadius:t.custom&&t.custom.hitRadius?t.custom.hitRadius:e.getValueAtIndexOrDefault(this.getDataset().hitRadius,i,this.chart.options.elements.point.hitRadius)},t._model.skip=t.custom&&t.custom.skip?t.custom.skip:isNaN(t._model.x)||isNaN(t._model.y)},calculatePointY:function(t,i,a,s){var o=(this.getScaleForId(this.getDataset().xAxisID),this.getScaleForId(this.getDataset().yAxisID));if(o.options.stacked){for(var n=0,r=0,l=0;a>l;l++){var h=this.chart.data.datasets[l];"line"===h.type&&e.isDatasetVisible(h)&&(h.data[i]<0?r+=h.data[i]||0:n+=h.data[i]||0)}return 0>t?o.getPixelForValue(r+t):o.getPixelForValue(n+t)}return o.getPixelForValue(t)},updateBezierControlPoints:function(){e.each(this.getDataset().metaData,function(t,i){var a=e.splineCurve(e.previousItem(this.getDataset().metaData,i)._model,t._model,e.nextItem(this.getDataset().metaData,i)._model,t._model.tension);t._model.controlPointPreviousX=Math.max(Math.min(a.previous.x,this.chart.chartArea.right),this.chart.chartArea.left),t._model.controlPointPreviousY=Math.max(Math.min(a.previous.y,this.chart.chartArea.bottom),this.chart.chartArea.top),t._model.controlPointNextX=Math.max(Math.min(a.next.x,this.chart.chartArea.right),this.chart.chartArea.left),t._model.controlPointNextY=Math.max(Math.min(a.next.y,this.chart.chartArea.bottom),this.chart.chartArea.top),t.pivot()},this)},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t){t.transition(i)}),this.chart.options.showLines&&this.getDataset().metaDataset.transition(i).draw(),e.each(this.getDataset().metaData,function(t){t.draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.radius=t.custom&&t.custom.hoverRadius?t.custom.hoverRadius:e.getValueAtIndexOrDefault(i.pointHoverRadius,a,this.chart.options.elements.point.hoverRadius),t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.pointHoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.pointHoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.pointHoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.radius=t.custom&&t.custom.radius?t.custom.radius:e.getValueAtIndexOrDefault(this.getDataset().radius,i,this.chart.options.elements.point.radius),t._model.backgroundColor=this.getPointBackgroundColor(t,i),t._model.borderColor=this.getPointBorderColor(t,i),t._model.borderWidth=this.getPointBorderWidth(t,i)}})}},{}],19:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.polarArea={scale:{type:"radialLinear",lineArc:!0},animateRotate:!0,animateScale:!0,aspectRatio:1,legendCallback:function(t){var e=[];if(e.push('<ul class="'+t.id+'-legend">'),t.data.datasets.length)for(var i=0;i<t.data.datasets[0].data.length;++i)e.push('<li><span style="background-color:'+t.data.datasets[0].backgroundColor[i]+'">'),t.data.labels[i]&&e.push(t.data.labels[i]),e.push("</span></li>");return e.push("</ul>"),e.join("")},legend:{labels:{generateLabels:function(t){return t.labels.length&&t.datasets.length?t.labels.map(function(e,i){return{text:e,fillStyle:t.datasets[0].backgroundColor[i],hidden:isNaN(t.datasets[0].data[i]),index:i}}):[]}},onClick:function(t,i){e.each(this.chart.data.datasets,function(t){t.metaHiddenData=t.metaHiddenData||[];var e=i.index;isNaN(t.data[e])?isNaN(t.metaHiddenData[e])||(t.data[e]=t.metaHiddenData[e]):(t.metaHiddenData[e]=t.data[e],t.data[e]=NaN)}),this.chart.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}},t.controllers.polarArea=t.DatasetController.extend({linkScales:function(){},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:e});this.updateElement(i,e,!0),this.getDataset().metaData.splice(e,0,i)},getVisibleDatasetCount:function(){return e.where(this.chart.data.datasets,function(t){return e.isDatasetVisible(t)}).length},update:function(t){var i=Math.min(this.chart.chartArea.right-this.chart.chartArea.left,this.chart.chartArea.bottom-this.chart.chartArea.top);this.chart.outerRadius=Math.max((i-this.chart.options.elements.arc.borderWidth/2)/2,0),this.chart.innerRadius=Math.max(this.chart.options.cutoutPercentage?this.chart.outerRadius/100*this.chart.options.cutoutPercentage:1,0),this.chart.radiusLength=(this.chart.outerRadius-this.chart.innerRadius)/this.getVisibleDatasetCount(),this.getDataset().total=0,e.each(this.getDataset().data,function(t){this.getDataset().total+=Math.abs(t)},this),this.outerRadius=this.chart.outerRadius-this.chart.radiusLength*this.index,this.innerRadius=this.outerRadius-this.chart.radiusLength,e.each(this.getDataset().metaData,function(e,i){this.updateElement(e,i,t)},this)},updateElement:function(t,i,a){for(var s=this.calculateCircumference(this.getDataset().data[i]),o=(this.chart.chartArea.left+this.chart.chartArea.right)/2,n=(this.chart.chartArea.top+this.chart.chartArea.bottom)/2,r=0,l=0;i>l;++l)isNaN(this.getDataset().data[l])||++r;var h=-.5*Math.PI+s*r,c=h+s,d={x:o,y:n,innerRadius:0,outerRadius:this.chart.options.animateScale?0:this.chart.scale.getDistanceFromCenterForValue(this.getDataset().data[i]),startAngle:this.chart.options.animateRotate?Math.PI*-.5:h,endAngle:this.chart.options.animateRotate?Math.PI*-.5:c,backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),label:e.getValueAtIndexOrDefault(this.chart.data.labels,i,this.chart.data.labels[i])};e.extend(t,{_chart:this.chart.chart,_datasetIndex:this.index,_index:i,_scale:this.chart.scale,_model:a?d:{x:o,y:n,innerRadius:0,
-outerRadius:this.chart.scale.getDistanceFromCenterForValue(this.getDataset().data[i]),startAngle:h,endAngle:c,backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),label:e.getValueAtIndexOrDefault(this.chart.data.labels,i,this.chart.data.labels[i])}}),t.pivot()},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){t.transition(i).draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.hoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.hoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().backgroundColor,i,this.chart.options.elements.arc.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().borderColor,i,this.chart.options.elements.arc.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().borderWidth,i,this.chart.options.elements.arc.borderWidth)},calculateCircumference:function(t){if(isNaN(t))return 0;var i=e.where(this.getDataset().data,function(t){return isNaN(t)}).length;return 2*Math.PI/(this.getDataset().data.length-i)}})}},{}],20:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.radar={scale:{type:"radialLinear"},elements:{line:{tension:0}}},t.controllers.radar=t.DatasetController.extend({linkScales:function(){},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],this.getDataset().metaDataset=this.getDataset().metaDataset||new t.elements.Line({_chart:this.chart.chart,_datasetIndex:this.index,_points:this.getDataset().metaData,_loop:!0}),e.each(this.getDataset().data,function(e,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:i,_model:{x:0,y:0}})},this)},addElementAndReset:function(e){this.getDataset().metaData=this.getDataset().metaData||[];var i=new t.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:e});this.updateElement(i,e,!0),this.getDataset().metaData.splice(e,0,i),this.updateBezierControlPoints()},update:function(t){var i,a=this.getDataset().metaDataset,s=this.getDataset().metaData,o=this.chart.scale;i=o.min<0&&o.max<0?o.getPointPositionForValue(0,o.max):o.min>0&&o.max>0?o.getPointPositionForValue(0,o.min):o.getPointPositionForValue(0,0),e.extend(this.getDataset().metaDataset,{_datasetIndex:this.index,_children:this.getDataset().metaData,_model:{tension:a.custom&&a.custom.tension?a.custom.tension:e.getValueOrDefault(this.getDataset().tension,this.chart.options.elements.line.tension),backgroundColor:a.custom&&a.custom.backgroundColor?a.custom.backgroundColor:this.getDataset().backgroundColor||this.chart.options.elements.line.backgroundColor,borderWidth:a.custom&&a.custom.borderWidth?a.custom.borderWidth:this.getDataset().borderWidth||this.chart.options.elements.line.borderWidth,borderColor:a.custom&&a.custom.borderColor?a.custom.borderColor:this.getDataset().borderColor||this.chart.options.elements.line.borderColor,fill:a.custom&&a.custom.fill?a.custom.fill:void 0!==this.getDataset().fill?this.getDataset().fill:this.chart.options.elements.line.fill,borderCapStyle:a.custom&&a.custom.borderCapStyle?a.custom.borderCapStyle:this.getDataset().borderCapStyle||this.chart.options.elements.line.borderCapStyle,borderDash:a.custom&&a.custom.borderDash?a.custom.borderDash:this.getDataset().borderDash||this.chart.options.elements.line.borderDash,borderDashOffset:a.custom&&a.custom.borderDashOffset?a.custom.borderDashOffset:this.getDataset().borderDashOffset||this.chart.options.elements.line.borderDashOffset,borderJoinStyle:a.custom&&a.custom.borderJoinStyle?a.custom.borderJoinStyle:this.getDataset().borderJoinStyle||this.chart.options.elements.line.borderJoinStyle,scaleTop:o.top,scaleBottom:o.bottom,scaleZero:i}}),this.getDataset().metaDataset.pivot(),e.each(s,function(e,i){this.updateElement(e,i,t)},this),this.updateBezierControlPoints()},updateElement:function(t,i,a){var s=this.chart.scale.getPointPositionForValue(i,this.getDataset().data[i]);e.extend(t,{_datasetIndex:this.index,_index:i,_scale:this.chart.scale,_model:{x:a?this.chart.scale.xCenter:s.x,y:a?this.chart.scale.yCenter:s.y,tension:t.custom&&t.custom.tension?t.custom.tension:e.getValueOrDefault(this.getDataset().tension,this.chart.options.elements.line.tension),radius:t.custom&&t.custom.radius?t.custom.radius:e.getValueAtIndexOrDefault(this.getDataset().pointRadius,i,this.chart.options.elements.point.radius),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor,i,this.chart.options.elements.point.backgroundColor),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().pointBorderColor,i,this.chart.options.elements.point.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth,i,this.chart.options.elements.point.borderWidth),pointStyle:t.custom&&t.custom.pointStyle?t.custom.pointStyle:e.getValueAtIndexOrDefault(this.getDataset().pointStyle,i,this.chart.options.elements.point.pointStyle),hitRadius:t.custom&&t.custom.hitRadius?t.custom.hitRadius:e.getValueAtIndexOrDefault(this.getDataset().hitRadius,i,this.chart.options.elements.point.hitRadius)}}),t._model.skip=t.custom&&t.custom.skip?t.custom.skip:isNaN(t._model.x)||isNaN(t._model.y)},updateBezierControlPoints:function(){e.each(this.getDataset().metaData,function(t,i){var a=e.splineCurve(e.previousItem(this.getDataset().metaData,i,!0)._model,t._model,e.nextItem(this.getDataset().metaData,i,!0)._model,t._model.tension);t._model.controlPointPreviousX=Math.max(Math.min(a.previous.x,this.chart.chartArea.right),this.chart.chartArea.left),t._model.controlPointPreviousY=Math.max(Math.min(a.previous.y,this.chart.chartArea.bottom),this.chart.chartArea.top),t._model.controlPointNextX=Math.max(Math.min(a.next.x,this.chart.chartArea.right),this.chart.chartArea.left),t._model.controlPointNextY=Math.max(Math.min(a.next.y,this.chart.chartArea.bottom),this.chart.chartArea.top),t.pivot()},this)},draw:function(t){var i=t||1;e.each(this.getDataset().metaData,function(t,e){t.transition(i)}),this.getDataset().metaDataset.transition(i).draw(),e.each(this.getDataset().metaData,function(t){t.draw()})},setHoverStyle:function(t){var i=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.radius=t.custom&&t.custom.hoverRadius?t.custom.hoverRadius:e.getValueAtIndexOrDefault(i.pointHoverRadius,a,this.chart.options.elements.point.hoverRadius),t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:e.getValueAtIndexOrDefault(i.pointHoverBackgroundColor,a,e.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:e.getValueAtIndexOrDefault(i.pointHoverBorderColor,a,e.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:e.getValueAtIndexOrDefault(i.pointHoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var i=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.radius=t.custom&&t.custom.radius?t.custom.radius:e.getValueAtIndexOrDefault(this.getDataset().radius,i,this.chart.options.elements.point.radius),t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:e.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor,i,this.chart.options.elements.point.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:e.getValueAtIndexOrDefault(this.getDataset().pointBorderColor,i,this.chart.options.elements.point.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:e.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth,i,this.chart.options.elements.point.borderWidth)}})}},{}],21:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.animation={duration:1e3,easing:"easeOutQuart",onProgress:e.noop,onComplete:e.noop},t.Animation=t.Element.extend({currentStep:null,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),t.animationService={frameDuration:17,animations:[],dropFrames:0,addAnimation:function(t,i,a,s){s||(t.animating=!0);for(var o=0;o<this.animations.length;++o)if(this.animations[o].chartInstance===t)return void(this.animations[o].animationObject=i);this.animations.push({chartInstance:t,animationObject:i}),1===this.animations.length&&e.requestAnimFrame.call(window,this.digestWrapper)},cancelAnimation:function(t){var i=e.findIndex(this.animations,function(e){return e.chartInstance===t});-1!==i&&(this.animations.splice(i,1),t.animating=!1)},digestWrapper:function(){t.animationService.startDigest.call(t.animationService)},startDigest:function(){var t=Date.now(),i=0;this.dropFrames>1&&(i=Math.floor(this.dropFrames),this.dropFrames=this.dropFrames%1);for(var a=0;a<this.animations.length;)null===this.animations[a].animationObject.currentStep&&(this.animations[a].animationObject.currentStep=0),this.animations[a].animationObject.currentStep+=1+i,this.animations[a].animationObject.currentStep>this.animations[a].animationObject.numSteps&&(this.animations[a].animationObject.currentStep=this.animations[a].animationObject.numSteps),this.animations[a].animationObject.render(this.animations[a].chartInstance,this.animations[a].animationObject),this.animations[a].animationObject.onAnimationProgress&&this.animations[a].animationObject.onAnimationProgress.call&&this.animations[a].animationObject.onAnimationProgress.call(this.animations[a].chartInstance,this.animations[a]),this.animations[a].animationObject.currentStep===this.animations[a].animationObject.numSteps?(this.animations[a].animationObject.onAnimationComplete&&this.animations[a].animationObject.onAnimationComplete.call&&this.animations[a].animationObject.onAnimationComplete.call(this.animations[a].chartInstance,this.animations[a]),this.animations[a].chartInstance.animating=!1,this.animations.splice(a,1)):++a;var s=Date.now(),o=(s-t)/this.frameDuration;this.dropFrames+=o,this.animations.length>0&&e.requestAnimFrame.call(window,this.digestWrapper)}}}},{}],22:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.types={},t.instances={},t.controllers={},t.Controller=function(i){return this.chart=i,this.config=i.config,this.options=this.config.options=e.configMerge(t.defaults.global,t.defaults[this.config.type],this.config.options||{}),this.id=e.uid(),Object.defineProperty(this,"data",{get:function(){return this.config.data}}),t.instances[this.id]=this,this.options.responsive&&this.resize(!0),this.initialize(),this},e.extend(t.Controller.prototype,{initialize:function(){return this.bindEvents(),this.ensureScalesHaveIDs(),this.buildOrUpdateControllers(),this.buildScales(),this.buildSurroundingItems(),this.updateLayout(),this.resetElements(),this.initToolTip(),this.update(),this},clear:function(){return e.clear(this.chart),this},stop:function(){return t.animationService.cancelAnimation(this),this},resize:function(t){var i=this.chart.canvas,a=e.getMaximumWidth(this.chart.canvas),s=this.options.maintainAspectRatio&&isNaN(this.chart.aspectRatio)===!1&&isFinite(this.chart.aspectRatio)&&0!==this.chart.aspectRatio?a/this.chart.aspectRatio:e.getMaximumHeight(this.chart.canvas),o=this.chart.width!==a||this.chart.height!==s;return o?(i.width=this.chart.width=a,i.height=this.chart.height=s,e.retinaScale(this.chart),t||(this.stop(),this.update(this.options.responsiveAnimationDuration)),this):this},ensureScalesHaveIDs:function(){var t="x-axis-",i="y-axis-";this.options.scales&&(this.options.scales.xAxes&&this.options.scales.xAxes.length&&e.each(this.options.scales.xAxes,function(e,i){e.id=e.id||t+i}),this.options.scales.yAxes&&this.options.scales.yAxes.length&&e.each(this.options.scales.yAxes,function(t,e){t.id=t.id||i+e}))},buildScales:function(){if(this.scales={},this.options.scales&&(this.options.scales.xAxes&&this.options.scales.xAxes.length&&e.each(this.options.scales.xAxes,function(i,a){var s=e.getValueOrDefault(i.type,"category"),o=t.scaleService.getScaleConstructor(s);if(o){var n=new o({ctx:this.chart.ctx,options:i,chart:this,id:i.id});this.scales[n.id]=n}},this),this.options.scales.yAxes&&this.options.scales.yAxes.length&&e.each(this.options.scales.yAxes,function(i,a){var s=e.getValueOrDefault(i.type,"linear"),o=t.scaleService.getScaleConstructor(s);if(o){var n=new o({ctx:this.chart.ctx,options:i,chart:this,id:i.id});this.scales[n.id]=n}},this)),this.options.scale){var i=t.scaleService.getScaleConstructor(this.options.scale.type);if(i){var a=new i({ctx:this.chart.ctx,options:this.options.scale,chart:this});this.scale=a,this.scales.radialScale=a}}t.scaleService.addScalesToLayout(this)},buildSurroundingItems:function(){this.options.title&&(this.titleBlock=new t.Title({ctx:this.chart.ctx,options:this.options.title,chart:this}),t.layoutService.addBox(this,this.titleBlock)),this.options.legend&&(this.legend=new t.Legend({ctx:this.chart.ctx,options:this.options.legend,chart:this}),t.layoutService.addBox(this,this.legend))},updateLayout:function(){t.layoutService.update(this,this.chart.width,this.chart.height)},buildOrUpdateControllers:function(){var i=[],a=[];if(e.each(this.data.datasets,function(e,s){e.type||(e.type=this.config.type);var o=e.type;i.push(o),e.controller?e.controller.updateIndex(s):(e.controller=new t.controllers[o](this,s),a.push(e.controller))},this),i.length>1)for(var s=1;s<i.length;s++)if(i[s]!==i[s-1]){this.isCombo=!0;break}return a},resetElements:function(){e.each(this.data.datasets,function(t,e){t.controller.reset()})},update:function(i,a){this.tooltip._data=this.data;var s=this.buildOrUpdateControllers();t.layoutService.update(this,this.chart.width,this.chart.height),e.each(s,function(t){t.reset()}),e.each(this.data.datasets,function(t,e){t.controller.buildOrUpdateElements()}),e.each(this.data.datasets,function(t,e){t.controller.update()}),this.render(i,a)},render:function(i,a){if(this.options.animation&&("undefined"!=typeof i&&0!==i||"undefined"==typeof i&&0!==this.options.animation.duration)){var s=new t.Animation;s.numSteps=(i||this.options.animation.duration)/16.66,s.easing=this.options.animation.easing,s.render=function(t,i){var a=e.easingEffects[i.easing],s=i.currentStep/i.numSteps,o=a(s);t.draw(o,s,i.currentStep)},s.onAnimationProgress=this.options.animation.onProgress,s.onAnimationComplete=this.options.animation.onComplete,t.animationService.addAnimation(this,s,i,a)}else this.draw(),this.options.animation&&this.options.animation.onComplete&&this.options.animation.onComplete.call&&this.options.animation.onComplete.call(this);return this},draw:function(t){var i=t||1;this.clear(),e.each(this.boxes,function(t){t.draw(this.chartArea)},this),this.scale&&this.scale.draw(),this.chart.ctx.save(),this.chart.ctx.beginPath(),this.chart.ctx.rect(this.chartArea.left,this.chartArea.top,this.chartArea.right-this.chartArea.left,this.chartArea.bottom-this.chartArea.top),this.chart.ctx.clip(),e.each(this.data.datasets,function(i,a){e.isDatasetVisible(i)&&i.controller.draw(t)},null,!0),this.chart.ctx.restore(),this.tooltip.transition(i).draw()},getElementAtEvent:function(t){var i=e.getRelativePosition(t,this.chart),a=[];return e.each(this.data.datasets,function(t,s){e.isDatasetVisible(t)&&e.each(t.metaData,function(t,e){return t.inRange(i.x,i.y)?(a.push(t),a):void 0})}),a},getElementsAtEvent:function(t){var i=e.getRelativePosition(t,this.chart),a=[],s=function(){if(this.data.datasets)for(var t=0;t<this.data.datasets.length;t++)if(e.isDatasetVisible(this.data.datasets[t]))for(var a=0;a<this.data.datasets[t].metaData.length;a++)if(this.data.datasets[t].metaData[a].inRange(i.x,i.y))return this.data.datasets[t].metaData[a]}.call(this);return s?(e.each(this.data.datasets,function(t,i){e.isDatasetVisible(t)&&a.push(t.metaData[s._index])}),a):a},getDatasetAtEvent:function(t){var e=this.getElementAtEvent(t);return e.length>0&&(e=this.data.datasets[e[0]._datasetIndex].metaData),e},generateLegend:function(){return this.options.legendCallback(this)},destroy:function(){this.clear(),e.unbindEvents(this,this.events),e.removeResizeListener(this.chart.canvas.parentNode);var i=this.chart.canvas;i.width=this.chart.width,i.height=this.chart.height,void 0!==this.chart.originalDevicePixelRatio&&this.chart.ctx.scale(1/this.chart.originalDevicePixelRatio,1/this.chart.originalDevicePixelRatio),i.style.width=this.chart.originalCanvasStyleWidth,i.style.height=this.chart.originalCanvasStyleHeight,delete t.instances[this.id]},toBase64Image:function(){return this.chart.canvas.toDataURL.apply(this.chart.canvas,arguments)},initToolTip:function(){this.tooltip=new t.Tooltip({_chart:this.chart,_chartInstance:this,_data:this.data,_options:this.options},this)},bindEvents:function(){e.bindEvents(this,this.options.events,function(t){this.eventHandler(t)})},eventHandler:function(t){if(this.lastActive=this.lastActive||[],this.lastTooltipActive=this.lastTooltipActive||[],"mouseout"===t.type)this.active=[],this.tooltipActive=[];else{var i=this,a=function(e){switch(e){case"single":return i.getElementAtEvent(t);case"label":return i.getElementsAtEvent(t);case"dataset":return i.getDatasetAtEvent(t);default:return t}};this.active=a(this.options.hover.mode),this.tooltipActive=a(this.options.tooltips.mode)}this.options.hover.onHover&&this.options.hover.onHover.call(this,this.active),("mouseup"===t.type||"click"===t.type)&&(this.options.onClick&&this.options.onClick.call(this,t,this.active),this.legend&&this.legend.handleEvent&&this.legend.handleEvent(t));if(this.lastActive.length)switch(this.options.hover.mode){case"single":this.data.datasets[this.lastActive[0]._datasetIndex].controller.removeHoverStyle(this.lastActive[0],this.lastActive[0]._datasetIndex,this.lastActive[0]._index);break;case"label":case"dataset":for(var s=0;s<this.lastActive.length;s++)this.lastActive[s]&&this.data.datasets[this.lastActive[s]._datasetIndex].controller.removeHoverStyle(this.lastActive[s],this.lastActive[s]._datasetIndex,this.lastActive[s]._index)}if(this.active.length&&this.options.hover.mode)switch(this.options.hover.mode){case"single":this.data.datasets[this.active[0]._datasetIndex].controller.setHoverStyle(this.active[0]);break;case"label":case"dataset":for(var o=0;o<this.active.length;o++)this.active[o]&&this.data.datasets[this.active[o]._datasetIndex].controller.setHoverStyle(this.active[o])}if((this.options.tooltips.enabled||this.options.tooltips.custom)&&(this.tooltip.initialize(),this.tooltip._active=this.tooltipActive,this.tooltip.update()),this.tooltip.pivot(),!this.animating){var n;e.each(this.active,function(t,e){t!==this.lastActive[e]&&(n=!0)},this),e.each(this.tooltipActive,function(t,e){t!==this.lastTooltipActive[e]&&(n=!0)},this),(this.lastActive.length!==this.active.length||this.lastTooltipActive.length!==this.tooltipActive.length||n)&&(this.stop(),(this.options.tooltips.enabled||this.options.tooltips.custom)&&this.tooltip.update(!0),this.render(this.options.hover.animationDuration,!0))}return this.lastActive=this.active,this.lastTooltipActive=this.tooltipActive,this}})}},{}],23:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.DatasetController=function(t,e){this.initialize.call(this,t,e)},e.extend(t.DatasetController.prototype,{initialize:function(t,e){this.chart=t,this.index=e,this.linkScales(),this.addElements()},updateIndex:function(t){this.index=t},linkScales:function(){this.getDataset().xAxisID||(this.getDataset().xAxisID=this.chart.options.scales.xAxes[0].id),this.getDataset().yAxisID||(this.getDataset().yAxisID=this.chart.options.scales.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getScaleForId:function(t){return this.chart.scales[t]},reset:function(){this.update(!0)},buildOrUpdateElements:function(){var t=this.getDataset().data.length,e=this.getDataset().metaData.length;if(e>t)this.getDataset().metaData.splice(t,e-t);else if(t>e)for(var i=e;t>i;++i)this.addElementAndReset(i)},addElements:e.noop,addElementAndReset:e.noop,draw:e.noop,removeHoverStyle:e.noop,setHoverStyle:e.noop,update:e.noop}),t.DatasetController.extend=e.inherits}},{}],24:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.elements={},t.Element=function(t){e.extend(this,t),this.initialize.apply(this,arguments)},e.extend(t.Element.prototype,{initialize:function(){},pivot:function(){return this._view||(this._view=e.clone(this._model)),this._start=e.clone(this._view),this},transition:function(t){return this._view||(this._view=e.clone(this._model)),1===t?(this._view=this._model,this._start=null,this):(this._start||this.pivot(),e.each(this._model,function(i,a){if("_"!==a[0]&&this._model.hasOwnProperty(a))if(this._view.hasOwnProperty(a))if(i===this._view[a]);else if("string"==typeof i)try{var s=e.color(this._start[a]).mix(e.color(this._model[a]),t);this._view[a]=s.rgbString()}catch(o){this._view[a]=i}else if("number"==typeof i){var n=void 0!==this._start[a]&&isNaN(this._start[a])===!1?this._start[a]:0;this._view[a]=(this._model[a]-n)*t+n}else this._view[a]=i;else"number"!=typeof i||isNaN(this._view[a])?this._view[a]=i:this._view[a]=i*t;else;},this),this)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return e.isNumber(this._model.x)&&e.isNumber(this._model.y)}}),t.Element.extend=e.inherits}},{}],25:[function(t,e,i){"use strict";var a=t("chartjs-color");e.exports=function(t){function e(t,e,i){var a;return"string"==typeof t?(a=parseInt(t,10),-1!=t.indexOf("%")&&(a=a/100*e.parentNode[i])):a=t,a}function i(t,i,a){var s,o=document.defaultView.getComputedStyle(t)[i],n=document.defaultView.getComputedStyle(t.parentNode)[i],r=null!==o&&"none"!==o,l=null!==n&&"none"!==n;return(r||l)&&(s=Math.min(r?e(o,t,a):Number.POSITIVE_INFINITY,l?e(n,t.parentNode,a):Number.POSITIVE_INFINITY)),s}var s=t.helpers={};s.each=function(t,e,i,a){var o,n;if(s.isArray(t))if(n=t.length,a)for(o=n-1;o>=0;o--)e.call(i,t[o],o);else for(o=0;n>o;o++)e.call(i,t[o],o);else if("object"==typeof t){var r=Object.keys(t);for(n=r.length,o=0;n>o;o++)e.call(i,t[r[o]],r[o])}},s.clone=function(t){var e={};return s.each(t,function(i,a){t.hasOwnProperty(a)&&(s.isArray(i)?e[a]=i.slice(0):"object"==typeof i&&null!==i?e[a]=s.clone(i):e[a]=i)}),e},s.extend=function(t){for(var e=arguments.length,i=[],a=1;e>a;a++)i.push(arguments[a]);return s.each(i,function(e){s.each(e,function(i,a){e.hasOwnProperty(a)&&(t[a]=i)})}),t},s.configMerge=function(e){var i=s.clone(e);return s.each(Array.prototype.slice.call(arguments,1),function(e){s.each(e,function(a,o){if(e.hasOwnProperty(o))if("scales"===o)i[o]=s.scaleMerge(i.hasOwnProperty(o)?i[o]:{},a);else if("scale"===o)i[o]=s.configMerge(i.hasOwnProperty(o)?i[o]:{},t.scaleService.getScaleDefaults(a.type),a);else if(i.hasOwnProperty(o)&&s.isArray(i[o])&&s.isArray(a)){var n=i[o];s.each(a,function(t,e){e<n.length?"object"==typeof n[e]&&null!==n[e]&&"object"==typeof t&&null!==t?n[e]=s.configMerge(n[e],t):n[e]=t:n.push(t)})}else i.hasOwnProperty(o)&&"object"==typeof i[o]&&null!==i[o]&&"object"==typeof a?i[o]=s.configMerge(i[o],a):i[o]=a})}),i},s.extendDeep=function(t){function e(t){return s.each(arguments,function(i){i!==t&&s.each(i,function(i,a){t[a]&&t[a].constructor&&t[a].constructor===Object?e(t[a],i):t[a]=i})}),t}return e.apply(this,arguments)},s.scaleMerge=function(e,i){var a=s.clone(e);return s.each(i,function(e,o){i.hasOwnProperty(o)&&("xAxes"===o||"yAxes"===o?a.hasOwnProperty(o)?s.each(e,function(e,i){var n=s.getValueOrDefault(e.type,"xAxes"===o?"category":"linear"),r=t.scaleService.getScaleDefaults(n);i>=a[o].length||!a[o][i].type?a[o].push(s.configMerge(r,e)):e.type&&e.type!==a[o][i].type?a[o][i]=s.configMerge(a[o][i],r,e):a[o][i]=s.configMerge(a[o][i],e)}):(a[o]=[],s.each(e,function(e){var i=s.getValueOrDefault(e.type,"xAxes"===o?"category":"linear");a[o].push(s.configMerge(t.scaleService.getScaleDefaults(i),e))})):a.hasOwnProperty(o)&&"object"==typeof a[o]&&null!==a[o]&&"object"==typeof e?a[o]=s.configMerge(a[o],e):a[o]=e)}),a},s.getValueAtIndexOrDefault=function(t,e,i){return void 0===t||null===t?i:s.isArray(t)?e<t.length?t[e]:i:t},s.getValueOrDefault=function(t,e){return void 0===t?e:t},s.indexOf=function(t,e){if(Array.prototype.indexOf)return t.indexOf(e);for(var i=0;i<t.length;i++)if(t[i]===e)return i;return-1},s.where=function(t,e){var i=[];return s.each(t,function(t){e(t)&&i.push(t)}),i},s.findIndex=function(t,e,i){var a=-1;if(Array.prototype.findIndex)a=t.findIndex(e,i);else for(var s=0;s<t.length;++s)if(i=void 0!==i?i:t,e.call(i,t[s],s,t)){a=s;break}return a},s.findNextWhere=function(t,e,i){(void 0===i||null===i)&&(i=-1);for(var a=i+1;a<t.length;a++){var s=t[a];if(e(s))return s}},s.findPreviousWhere=function(t,e,i){(void 0===i||null===i)&&(i=t.length);for(var a=i-1;a>=0;a--){var s=t[a];if(e(s))return s}},s.inherits=function(t){var e=this,i=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},a=function(){this.constructor=i};return a.prototype=e.prototype,i.prototype=new a,i.extend=s.inherits,t&&s.extend(i.prototype,t),i.__super__=e.prototype,i},s.noop=function(){},s.uid=function(){var t=0;return function(){return"chart-"+t++}}(),s.warn=function(t){console&&"function"==typeof console.warn&&console.warn(t)},s.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},s.almostEquals=function(t,e,i){return Math.abs(t-e)<i},s.max=function(t){return t.reduce(function(t,e){return isNaN(e)?t:Math.max(t,e)},Number.NEGATIVE_INFINITY)},s.min=function(t){return t.reduce(function(t,e){return isNaN(e)?t:Math.min(t,e)},Number.POSITIVE_INFINITY)},s.sign=function(t){return Math.sign?Math.sign(t):(t=+t,0===t||isNaN(t)?t:t>0?1:-1)},s.log10=function(t){return Math.log10?Math.log10(t):Math.log(t)/Math.LN10},s.toRadians=function(t){return t*(Math.PI/180)},s.toDegrees=function(t){return t*(180/Math.PI)},s.getAngleFromPoint=function(t,e){var i=e.x-t.x,a=e.y-t.y,s=Math.sqrt(i*i+a*a),o=Math.atan2(a,i);return o<-.5*Math.PI&&(o+=2*Math.PI),{angle:o,distance:s}},s.aliasPixel=function(t){return t%2===0?0:.5},s.splineCurve=function(t,e,i,a){var s=t.skip?e:t,o=e,n=i.skip?e:i,r=Math.sqrt(Math.pow(o.x-s.x,2)+Math.pow(o.y-s.y,2)),l=Math.sqrt(Math.pow(n.x-o.x,2)+Math.pow(n.y-o.y,2)),h=r/(r+l),c=l/(r+l);h=isNaN(h)?0:h,c=isNaN(c)?0:c;var d=a*h,u=a*c;return{previous:{x:o.x-d*(n.x-s.x),y:o.y-d*(n.y-s.y)},next:{x:o.x+u*(n.x-s.x),y:o.y+u*(n.y-s.y)}}},s.nextItem=function(t,e,i){return i?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},s.previousItem=function(t,e,i){return i?0>=e?t[t.length-1]:t[e-1]:0>=e?t[0]:t[e-1]},s.niceNum=function(t,e){var i,a=Math.floor(s.log10(t)),o=t/Math.pow(10,a);return i=e?1.5>o?1:3>o?2:7>o?5:10:1>=o?1:2>=o?2:5>=o?5:10,i*Math.pow(10,a)};var o=s.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-0.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-0.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-0.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-0.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,i=0,a=1;return 0===t?0:1===(t/=1)?1:(i||(i=.3),a<Math.abs(1)?(a=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/a),-(a*Math.pow(2,10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)))},easeOutElastic:function(t){var e=1.70158,i=0,a=1;return 0===t?0:1===(t/=1)?1:(i||(i=.3),a<Math.abs(1)?(a=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/a),a*Math.pow(2,-10*t)*Math.sin((1*t-e)*(2*Math.PI)/i)+1)},easeInOutElastic:function(t){var e=1.70158,i=0,a=1;return 0===t?0:2===(t/=.5)?1:(i||(i=1*(.3*1.5)),a<Math.abs(1)?(a=1,e=i/4):e=i/(2*Math.PI)*Math.asin(1/a),1>t?-.5*(a*Math.pow(2,10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)):a*Math.pow(2,-10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)*.5+1)},easeInBack:function(t){var e=1.70158;return 1*(t/=1)*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return 1*((t=t/1-1)*t*((e+1)*t+e)+1)},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?.5*(t*t*(((e*=1.525)+1)*t-e)):.5*((t-=2)*t*(((e*=1.525)+1)*t+e)+2)},easeInBounce:function(t){return 1-o.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?1*(7.5625*t*t):2/2.75>t?1*(7.5625*(t-=1.5/2.75)*t+.75):2.5/2.75>t?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return.5>t?.5*o.easeInBounce(2*t):.5*o.easeOutBounce(2*t-1)+.5}};s.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),s.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),s.getRelativePosition=function(t,e){var i,a,o=t.originalEvent||t,n=t.currentTarget||t.srcElement,r=n.getBoundingClientRect();o.touches&&o.touches.length>0?(i=o.touches[0].clientX,a=o.touches[0].clientY):(i=o.clientX,a=o.clientY);var l=parseFloat(s.getStyle(n,"padding-left")),h=parseFloat(s.getStyle(n,"padding-top")),c=parseFloat(s.getStyle(n,"padding-right")),d=parseFloat(s.getStyle(n,"padding-bottom")),u=r.right-r.left-l-c,g=r.bottom-r.top-h-d;return i=Math.round((i-r.left-l)/u*n.width/e.currentDevicePixelRatio),a=Math.round((a-r.top-h)/g*n.height/e.currentDevicePixelRatio),{x:i,y:a}},s.addEvent=function(t,e,i){t.addEventListener?t.addEventListener(e,i):t.attachEvent?t.attachEvent("on"+e,i):t["on"+e]=i;
-},s.removeEvent=function(t,e,i){t.removeEventListener?t.removeEventListener(e,i,!1):t.detachEvent?t.detachEvent("on"+e,i):t["on"+e]=s.noop},s.bindEvents=function(t,e,i){t.events||(t.events={}),s.each(e,function(e){t.events[e]=function(){i.apply(t,arguments)},s.addEvent(t.chart.canvas,e,t.events[e])})},s.unbindEvents=function(t,e){s.each(e,function(e,i){s.removeEvent(t.chart.canvas,i,e)})},s.getConstraintWidth=function(t){return i(t,"max-width","clientWidth")},s.getConstraintHeight=function(t){return i(t,"max-height","clientHeight")},s.getMaximumWidth=function(t){var e=t.parentNode,i=parseInt(s.getStyle(e,"padding-left"))+parseInt(s.getStyle(e,"padding-right")),a=e.clientWidth-i,o=s.getConstraintWidth(t);return void 0!==o&&(a=Math.min(a,o)),a},s.getMaximumHeight=function(t){var e=t.parentNode,i=parseInt(s.getStyle(e,"padding-top"))+parseInt(s.getStyle(e,"padding-bottom")),a=e.clientHeight-i,o=s.getConstraintHeight(t);return void 0!==o&&(a=Math.min(a,o)),a},s.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},s.retinaScale=function(t){var e=t.ctx,i=t.canvas.width,a=t.canvas.height,s=t.currentDevicePixelRatio=window.devicePixelRatio||1;1!==s&&(e.canvas.height=a*s,e.canvas.width=i*s,e.scale(s,s),t.originalDevicePixelRatio=t.originalDevicePixelRatio||s),e.canvas.style.width=i+"px",e.canvas.style.height=a+"px"},s.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},s.fontString=function(t,e,i){return e+" "+t+"px "+i},s.longestText=function(t,e,i,a){a=a||{},a.data=a.data||{},a.garbageCollect=a.garbageCollect||[],a.font!==e&&(a.data={},a.garbageCollect=[],a.font=e),t.font=e;var o=0;s.each(i,function(e){if(void 0!==e&&null!==e){var i=a.data[e];i||(i=a.data[e]=t.measureText(e).width,a.garbageCollect.push(e)),i>o&&(o=i)}});var n=a.garbageCollect.length/2;if(n>i.length){for(var r=0;n>r;r++)delete a.data[a.garbageCollect[r]];a.garbageCollect.splice(0,n)}return o},s.drawRoundedRectangle=function(t,e,i,a,s,o){t.beginPath(),t.moveTo(e+o,i),t.lineTo(e+a-o,i),t.quadraticCurveTo(e+a,i,e+a,i+o),t.lineTo(e+a,i+s-o),t.quadraticCurveTo(e+a,i+s,e+a-o,i+s),t.lineTo(e+o,i+s),t.quadraticCurveTo(e,i+s,e,i+s-o),t.lineTo(e,i+o),t.quadraticCurveTo(e,i,e+o,i),t.closePath()},s.color=function(e){return a?a(e instanceof CanvasGradient?t.defaults.global.defaultColor:e):(console.log("Color.js not found!"),e)},s.addResizeListener=function(t,e){var i=document.createElement("iframe"),a="chartjs-hidden-iframe";i.classlist?i.classlist.add(a):i.setAttribute("class",a),i.style.width="100%",i.style.display="block",i.style.border=0,i.style.height=0,i.style.margin=0,i.style.position="absolute",i.style.left=0,i.style.right=0,i.style.top=0,i.style.bottom=0,t.insertBefore(i,t.firstChild),(i.contentWindow||i).onresize=function(){e&&e()}},s.removeResizeListener=function(t){var e=t.querySelector(".chartjs-hidden-iframe");e&&e.parentNode.removeChild(e)},s.isArray=function(t){return Array.isArray?Array.isArray(t):"[object Array]"===Object.prototype.toString.call(t)},s.pushAllIfDefined=function(t,e){"undefined"!=typeof t&&(s.isArray(t)?e.push.apply(e,t):e.push(t))},s.isDatasetVisible=function(t){return!t.hidden},s.callCallback=function(t,e,i){t&&"function"==typeof t.call&&t.apply(i,e)}}},{"chartjs-color":2}],26:[function(t,e,i){"use strict";e.exports=function(){var t=function(e,i){this.config=i,e.length&&e[0].getContext&&(e=e[0]),e.getContext&&(e=e.getContext("2d")),this.ctx=e,this.canvas=e.canvas,this.width=e.canvas.width||parseInt(t.helpers.getStyle(e.canvas,"width"))||t.helpers.getMaximumWidth(e.canvas),this.height=e.canvas.height||parseInt(t.helpers.getStyle(e.canvas,"height"))||t.helpers.getMaximumHeight(e.canvas),this.aspectRatio=this.width/this.height,(isNaN(this.aspectRatio)||isFinite(this.aspectRatio)===!1)&&(this.aspectRatio=void 0!==i.aspectRatio?i.aspectRatio:2),this.originalCanvasStyleWidth=e.canvas.style.width,this.originalCanvasStyleHeight=e.canvas.style.height,t.helpers.retinaScale(this),i&&(this.controller=new t.Controller(this));var a=this;return t.helpers.addResizeListener(e.canvas.parentNode,function(){a.controller&&a.controller.config.options.responsive&&a.controller.resize()}),this.controller?this.controller:this};return t.defaults={global:{responsive:!0,responsiveAnimationDuration:0,maintainAspectRatio:!0,events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"single",animationDuration:400},onClick:null,defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",showLines:!0,elements:{},legendCallback:function(t){var e=[];e.push('<ul class="'+t.id+'-legend">');for(var i=0;i<t.data.datasets.length;i++)e.push('<li><span style="background-color:'+t.data.datasets[i].backgroundColor+'"></span>'),t.data.datasets[i].label&&e.push(t.data.datasets[i].label),e.push("</li>");return e.push("</ul>"),e.join("")}}},t}},{}],27:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.layoutService={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),t.boxes.push(e)},removeBox:function(t,e){t.boxes&&t.boxes.splice(t.boxes.indexOf(e),1)},update:function(t,i,a){function s(t){var e,i=t.isHorizontal();i?(e=t.update(t.options.fullWidth?m:k,y),D-=e.height):(e=t.update(v,x),k-=e.width),S.push({horizontal:i,minSize:e,box:t})}function o(t){var i=e.findNextWhere(S,function(e){return e.box===t});if(i)if(t.isHorizontal()){var a={left:C,right:w,top:0,bottom:0};t.update(t.options.fullWidth?m:k,p/2,a)}else t.update(i.minSize.width,D)}function n(t){var i=e.findNextWhere(S,function(e){return e.box===t}),a={left:0,right:0,top:_,bottom:A};i&&t.update(i.minSize.width,D,a)}function r(t){t.isHorizontal()?(t.left=t.options.fullWidth?l:C,t.right=t.options.fullWidth?i-l:C+k,t.top=P,t.bottom=P+t.height,P=t.bottom):(t.left=F,t.right=F+t.width,t.top=_,t.bottom=_+D,F=t.right)}if(t){var l=0,h=0,c=e.where(t.boxes,function(t){return"left"===t.options.position}),d=e.where(t.boxes,function(t){return"right"===t.options.position}),u=e.where(t.boxes,function(t){return"top"===t.options.position}),g=e.where(t.boxes,function(t){return"bottom"===t.options.position}),f=e.where(t.boxes,function(t){return"chartArea"===t.options.position});u.sort(function(t,e){return(e.options.fullWidth?1:0)-(t.options.fullWidth?1:0)}),g.sort(function(t,e){return(t.options.fullWidth?1:0)-(e.options.fullWidth?1:0)});var m=i-2*l,p=a-2*h,b=m/2,x=p/2,v=(i-b)/(c.length+d.length),y=(a-x)/(u.length+g.length),k=m,D=p,S=[];e.each(c.concat(d,u,g),s);var C=l,w=l,_=h,A=h;e.each(c.concat(d),o),e.each(c,function(t){C+=t.width}),e.each(d,function(t){w+=t.width}),e.each(u.concat(g),o),e.each(u,function(t){_+=t.height}),e.each(g,function(t){A+=t.height}),e.each(c.concat(d),n),C=l,w=l,_=h,A=h,e.each(c,function(t){C+=t.width}),e.each(d,function(t){w+=t.width}),e.each(u,function(t){_+=t.height}),e.each(g,function(t){A+=t.height});var I=a-_-A,M=i-C-w;(M!==k||I!==D)&&(e.each(c,function(t){t.height=I}),e.each(d,function(t){t.height=I}),e.each(u,function(t){t.width=M}),e.each(g,function(t){t.width=M}),D=I,k=M);var F=l,P=h;e.each(c.concat(u),r),F+=k,P+=D,e.each(d,r),e.each(g,r),t.chartArea={left:C,top:_,right:C+k,bottom:_+D},e.each(f,function(e){e.left=t.chartArea.left,e.top=t.chartArea.top,e.right=t.chartArea.right,e.bottom=t.chartArea.bottom,e.update(k,D)})}}}}},{}],28:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.legend={display:!0,position:"top",fullWidth:!0,reverse:!1,onClick:function(t,e){var i=this.chart.data.datasets[e.datasetIndex];i.hidden=!i.hidden,this.chart.update()},labels:{boxWidth:40,padding:10,generateLabels:function(t){return e.isArray(t.datasets)?t.datasets.map(function(t,e){return{text:t.label,fillStyle:t.backgroundColor,hidden:t.hidden,lineCap:t.borderCapStyle,lineDash:t.borderDash,lineDashOffset:t.borderDashOffset,lineJoin:t.borderJoinStyle,lineWidth:t.borderWidth,strokeStyle:t.borderColor,datasetIndex:e}},this):[]}}},t.Legend=t.Element.extend({initialize:function(t){e.extend(this,t),this.legendHitBoxes=[],this.doughnutMode=!1},beforeUpdate:e.noop,update:function(t,e,i){return this.beforeUpdate(),this.maxWidth=t,this.maxHeight=e,this.margins=i,this.beforeSetDimensions(),this.setDimensions(),this.afterSetDimensions(),this.beforeBuildLabels(),this.buildLabels(),this.afterBuildLabels(),this.beforeFit(),this.fit(),this.afterFit(),this.afterUpdate(),this.minSize},afterUpdate:e.noop,beforeSetDimensions:e.noop,setDimensions:function(){this.isHorizontal()?(this.width=this.maxWidth,this.left=0,this.right=this.width):(this.height=this.maxHeight,this.top=0,this.bottom=this.height),this.paddingLeft=0,this.paddingTop=0,this.paddingRight=0,this.paddingBottom=0,this.minSize={width:0,height:0}},afterSetDimensions:e.noop,beforeBuildLabels:e.noop,buildLabels:function(){this.legendItems=this.options.labels.generateLabels.call(this,this.chart.data),this.options.reverse&&this.legendItems.reverse()},afterBuildLabels:e.noop,beforeFit:e.noop,fit:function(){var i=this.ctx,a=e.getValueOrDefault(this.options.labels.fontSize,t.defaults.global.defaultFontSize),s=e.getValueOrDefault(this.options.labels.fontStyle,t.defaults.global.defaultFontStyle),o=e.getValueOrDefault(this.options.labels.fontFamily,t.defaults.global.defaultFontFamily),n=e.fontString(a,s,o);if(this.legendHitBoxes=[],this.isHorizontal()?this.minSize.width=this.maxWidth:this.minSize.width=this.options.display?10:0,this.isHorizontal()?this.minSize.height=this.options.display?10:0:this.minSize.height=this.maxHeight,this.options.display&&this.isHorizontal()){this.lineWidths=[0];var r=this.legendItems.length?a+this.options.labels.padding:0;i.textAlign="left",i.textBaseline="top",i.font=n,e.each(this.legendItems,function(t,e){var s=this.options.labels.boxWidth+a/2+i.measureText(t.text).width;this.lineWidths[this.lineWidths.length-1]+s+this.options.labels.padding>=this.width&&(r+=a+this.options.labels.padding,this.lineWidths[this.lineWidths.length]=this.left),this.legendHitBoxes[e]={left:0,top:0,width:s,height:a},this.lineWidths[this.lineWidths.length-1]+=s+this.options.labels.padding},this),this.minSize.height+=r}this.width=this.minSize.width,this.height=this.minSize.height},afterFit:e.noop,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){if(this.options.display){var i=this.ctx,a={x:this.left+(this.width-this.lineWidths[0])/2,y:this.top+this.options.labels.padding,line:0},s=e.getValueOrDefault(this.options.labels.fontColor,t.defaults.global.defaultFontColor),o=e.getValueOrDefault(this.options.labels.fontSize,t.defaults.global.defaultFontSize),n=e.getValueOrDefault(this.options.labels.fontStyle,t.defaults.global.defaultFontStyle),r=e.getValueOrDefault(this.options.labels.fontFamily,t.defaults.global.defaultFontFamily),l=e.fontString(o,n,r);this.isHorizontal()&&(i.textAlign="left",i.textBaseline="top",i.lineWidth=.5,i.strokeStyle=s,i.fillStyle=s,i.font=l,e.each(this.legendItems,function(e,s){var n=i.measureText(e.text).width,r=this.options.labels.boxWidth+o/2+n;a.x+r>=this.width&&(a.y+=o+this.options.labels.padding,a.line++,a.x=this.left+(this.width-this.lineWidths[a.line])/2),i.save();var l=function(t,e){return void 0!==t?t:e};i.fillStyle=l(e.fillStyle,t.defaults.global.defaultColor),i.lineCap=l(e.lineCap,t.defaults.global.elements.line.borderCapStyle),i.lineDashOffset=l(e.lineDashOffset,t.defaults.global.elements.line.borderDashOffset),i.lineJoin=l(e.lineJoin,t.defaults.global.elements.line.borderJoinStyle),i.lineWidth=l(e.lineWidth,t.defaults.global.elements.line.borderWidth),i.strokeStyle=l(e.strokeStyle,t.defaults.global.defaultColor),i.setLineDash&&i.setLineDash(l(e.lineDash,t.defaults.global.elements.line.borderDash)),i.strokeRect(a.x,a.y,this.options.labels.boxWidth,o),i.fillRect(a.x,a.y,this.options.labels.boxWidth,o),i.restore(),this.legendHitBoxes[s].left=a.x,this.legendHitBoxes[s].top=a.y,i.fillText(e.text,this.options.labels.boxWidth+o/2+a.x,a.y),e.hidden&&(i.beginPath(),i.lineWidth=2,i.moveTo(this.options.labels.boxWidth+o/2+a.x,a.y+o/2),i.lineTo(this.options.labels.boxWidth+o/2+a.x+n,a.y+o/2),i.stroke()),a.x+=r+this.options.labels.padding},this))}},handleEvent:function(t){var i=e.getRelativePosition(t,this.chart.chart);if(i.x>=this.left&&i.x<=this.right&&i.y>=this.top&&i.y<=this.bottom)for(var a=0;a<this.legendHitBoxes.length;++a){var s=this.legendHitBoxes[a];if(i.x>=s.left&&i.x<=s.left+s.width&&i.y>=s.top&&i.y<=s.top+s.height){this.options.onClick&&this.options.onClick.call(this,t,this.legendItems[a]);break}}}})}},{}],29:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.scale={display:!0,gridLines:{display:!0,color:"rgba(0, 0, 0, 0.1)",lineWidth:1,drawOnChartArea:!0,drawTicks:!0,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",offsetGridLines:!1},scaleLabel:{labelString:"",display:!1},ticks:{beginAtZero:!1,maxRotation:90,mirror:!1,padding:10,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:20,callback:function(t){return""+t}}},t.Scale=t.Element.extend({beforeUpdate:function(){e.callCallback(this.options.beforeUpdate,[this])},update:function(t,i,a){return this.beforeUpdate(),this.maxWidth=t,this.maxHeight=i,this.margins=e.extend({left:0,right:0,top:0,bottom:0},a),this.beforeSetDimensions(),this.setDimensions(),this.afterSetDimensions(),this.beforeDataLimits(),this.determineDataLimits(),this.afterDataLimits(),this.beforeBuildTicks(),this.buildTicks(),this.afterBuildTicks(),this.beforeTickToLabelConversion(),this.convertTicksToLabels(),this.afterTickToLabelConversion(),this.beforeCalculateTickRotation(),this.calculateTickRotation(),this.afterCalculateTickRotation(),this.beforeFit(),this.fit(),this.afterFit(),this.afterUpdate(),this.minSize},afterUpdate:function(){e.callCallback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){e.callCallback(this.options.beforeSetDimensions,[this])},setDimensions:function(){this.isHorizontal()?(this.width=this.maxWidth,this.left=0,this.right=this.width):(this.height=this.maxHeight,this.top=0,this.bottom=this.height),this.paddingLeft=0,this.paddingTop=0,this.paddingRight=0,this.paddingBottom=0},afterSetDimensions:function(){e.callCallback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){e.callCallback(this.options.beforeDataLimits,[this])},determineDataLimits:e.noop,afterDataLimits:function(){e.callCallback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){e.callCallback(this.options.beforeBuildTicks,[this])},buildTicks:e.noop,afterBuildTicks:function(){e.callCallback(this.options.afterBuildTicks,[this])},beforeTickToLabelConversion:function(){e.callCallback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){this.ticks=this.ticks.map(function(t,e,i){return this.options.ticks.userCallback?this.options.ticks.userCallback(t,e,i):this.options.ticks.callback(t,e,i)},this)},afterTickToLabelConversion:function(){e.callCallback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){e.callCallback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var i=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),a=e.getValueOrDefault(this.options.ticks.fontStyle,t.defaults.global.defaultFontStyle),s=e.getValueOrDefault(this.options.ticks.fontFamily,t.defaults.global.defaultFontFamily),o=e.fontString(i,a,s);this.ctx.font=o;var n,r=this.ctx.measureText(this.ticks[0]).width,l=this.ctx.measureText(this.ticks[this.ticks.length-1]).width;if(this.labelRotation=0,this.paddingRight=0,this.paddingLeft=0,this.options.display&&this.isHorizontal()){this.paddingRight=l/2+3,this.paddingLeft=r/2+3,this.longestTextCache||(this.longestTextCache={});for(var h,c,d=e.longestText(this.ctx,o,this.ticks,this.longestTextCache),u=d,g=this.getPixelForTick(1)-this.getPixelForTick(0)-6;u>g&&this.labelRotation<this.options.ticks.maxRotation;){if(h=Math.cos(e.toRadians(this.labelRotation)),c=Math.sin(e.toRadians(this.labelRotation)),n=h*r,n+i/2>this.yLabelWidth&&(this.paddingLeft=n+i/2),this.paddingRight=i/2,c*d>this.maxHeight){this.labelRotation--;break}this.labelRotation++,u=h*d}}this.margins&&(this.paddingLeft=Math.max(this.paddingLeft-this.margins.left,0),this.paddingRight=Math.max(this.paddingRight-this.margins.right,0))},afterCalculateTickRotation:function(){e.callCallback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){e.callCallback(this.options.beforeFit,[this])},fit:function(){this.minSize={width:0,height:0};var i=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),a=e.getValueOrDefault(this.options.ticks.fontStyle,t.defaults.global.defaultFontStyle),s=e.getValueOrDefault(this.options.ticks.fontFamily,t.defaults.global.defaultFontFamily),o=e.fontString(i,a,s),n=e.getValueOrDefault(this.options.scaleLabel.fontSize,t.defaults.global.defaultFontSize),r=e.getValueOrDefault(this.options.scaleLabel.fontStyle,t.defaults.global.defaultFontStyle),l=e.getValueOrDefault(this.options.scaleLabel.fontFamily,t.defaults.global.defaultFontFamily);e.fontString(n,r,l);if(this.isHorizontal()?this.minSize.width=this.isFullWidth()?this.maxWidth-this.margins.left-this.margins.right:this.maxWidth:this.minSize.width=this.options.gridLines.display&&this.options.display?10:0,this.isHorizontal()?this.minSize.height=this.options.gridLines.display&&this.options.display?10:0:this.minSize.height=this.maxHeight,this.options.scaleLabel.display&&(this.isHorizontal()?this.minSize.height+=1.5*n:this.minSize.width+=1.5*n),this.options.ticks.display&&this.options.display){this.longestTextCache||(this.longestTextCache={});var h=e.longestText(this.ctx,o,this.ticks,this.longestTextCache);if(this.isHorizontal()){this.longestLabelWidth=h;var c=Math.sin(e.toRadians(this.labelRotation))*this.longestLabelWidth+1.5*i;this.minSize.height=Math.min(this.maxHeight,this.minSize.height+c),this.ctx.font=o;var d=this.ctx.measureText(this.ticks[0]).width,u=this.ctx.measureText(this.ticks[this.ticks.length-1]).width,g=Math.cos(e.toRadians(this.labelRotation)),f=Math.sin(e.toRadians(this.labelRotation));this.paddingLeft=0!==this.labelRotation?g*d+3:d/2+3,this.paddingRight=0!==this.labelRotation?f*(i/2)+3:u/2+3}else{var m=this.maxWidth-this.minSize.width;this.options.ticks.mirror||(h+=this.options.ticks.padding),m>h?this.minSize.width+=h:this.minSize.width=this.maxWidth,this.paddingTop=i/2,this.paddingBottom=i/2}}this.margins&&(this.paddingLeft=Math.max(this.paddingLeft-this.margins.left,0),this.paddingTop=Math.max(this.paddingTop-this.margins.top,0),this.paddingRight=Math.max(this.paddingRight-this.margins.right,0),this.paddingBottom=Math.max(this.paddingBottom-this.margins.bottom,0)),this.width=this.minSize.width,this.height=this.minSize.height},afterFit:function(){e.callCallback(this.options.afterFit,[this])},isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},isFullWidth:function(){return this.options.fullWidth},getRightValue:function i(t){return null===t||"undefined"==typeof t?NaN:"number"==typeof t&&isNaN(t)?NaN:"object"==typeof t?t instanceof Date?t:i(this.isHorizontal()?t.x:t.y):t},getLabelForIndex:e.noop,getPixelForValue:e.noop,getPixelForTick:function(t,e){if(this.isHorizontal()){var i=this.width-(this.paddingLeft+this.paddingRight),a=i/Math.max(this.ticks.length-(this.options.gridLines.offsetGridLines?0:1),1),s=a*t+this.paddingLeft;e&&(s+=a/2);var o=this.left+Math.round(s);return o+=this.isFullWidth()?this.margins.left:0}var n=this.height-(this.paddingTop+this.paddingBottom);return this.top+t*(n/(this.ticks.length-1))},getPixelForDecimal:function(t){if(this.isHorizontal()){var e=this.width-(this.paddingLeft+this.paddingRight),i=e*t+this.paddingLeft,a=this.left+Math.round(i);return a+=this.isFullWidth()?this.margins.left:0}return this.top+t*this.height},draw:function(i){if(this.options.display){var a,s,o,n,r,l=0!==this.labelRotation,h=this.options.ticks.autoSkip;this.options.ticks.maxTicksLimit&&(r=this.options.ticks.maxTicksLimit);var c=e.getValueOrDefault(this.options.ticks.fontColor,t.defaults.global.defaultFontColor),d=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),u=e.getValueOrDefault(this.options.ticks.fontStyle,t.defaults.global.defaultFontStyle),g=e.getValueOrDefault(this.options.ticks.fontFamily,t.defaults.global.defaultFontFamily),f=e.fontString(d,u,g),m=e.getValueOrDefault(this.options.scaleLabel.fontColor,t.defaults.global.defaultFontColor),p=e.getValueOrDefault(this.options.scaleLabel.fontSize,t.defaults.global.defaultFontSize),b=e.getValueOrDefault(this.options.scaleLabel.fontStyle,t.defaults.global.defaultFontStyle),x=e.getValueOrDefault(this.options.scaleLabel.fontFamily,t.defaults.global.defaultFontFamily),v=e.fontString(p,b,x),y=Math.cos(e.toRadians(this.labelRotation)),k=(Math.sin(e.toRadians(this.labelRotation)),this.longestLabelWidth*y);if(this.ctx.fillStyle=c,this.isHorizontal()){a=!0;var D="bottom"===this.options.position?this.top:this.bottom-10,S="bottom"===this.options.position?this.top+10:this.bottom;if(s=!1,(k/2+this.options.ticks.autoSkipPadding)*this.ticks.length>this.width-(this.paddingLeft+this.paddingRight)&&(s=1+Math.floor((k/2+this.options.ticks.autoSkipPadding)*this.ticks.length/(this.width-(this.paddingLeft+this.paddingRight)))),r&&this.ticks.length>r)for(;!s||this.ticks.length/(s||1)>r;)s||(s=1),s+=1;h||(s=!1),e.each(this.ticks,function(t,o){var n=this.ticks.length===o+1,r=s>1&&o%s>0||o%s===0&&o+s>this.ticks.length;if((!r||n)&&void 0!==t&&null!==t){var h=this.getPixelForTick(o),c=this.getPixelForTick(o,this.options.gridLines.offsetGridLines);this.options.gridLines.display&&(o===("undefined"!=typeof this.zeroLineIndex?this.zeroLineIndex:0)?(this.ctx.lineWidth=this.options.gridLines.zeroLineWidth,this.ctx.strokeStyle=this.options.gridLines.zeroLineColor,a=!0):a&&(this.ctx.lineWidth=this.options.gridLines.lineWidth,this.ctx.strokeStyle=this.options.gridLines.color,a=!1),h+=e.aliasPixel(this.ctx.lineWidth),this.ctx.beginPath(),this.options.gridLines.drawTicks&&(this.ctx.moveTo(h,D),this.ctx.lineTo(h,S)),this.options.gridLines.drawOnChartArea&&(this.ctx.moveTo(h,i.top),this.ctx.lineTo(h,i.bottom)),this.ctx.stroke()),this.options.ticks.display&&(this.ctx.save(),this.ctx.translate(c,l?this.top+12:"top"===this.options.position?this.bottom-10:this.top+10),this.ctx.rotate(-1*e.toRadians(this.labelRotation)),this.ctx.font=f,this.ctx.textAlign=l?"right":"center",this.ctx.textBaseline=l?"middle":"top"===this.options.position?"bottom":"top",this.ctx.fillText(t,0,0),this.ctx.restore())}},this),this.options.scaleLabel.display&&(this.ctx.textAlign="center",this.ctx.textBaseline="middle",this.ctx.fillStyle=m,this.ctx.font=v,o=this.left+(this.right-this.left)/2,n="bottom"===this.options.position?this.bottom-p/2:this.top+p/2,this.ctx.fillText(this.options.scaleLabel.labelString,o,n))}else{a=!0;var C="right"===this.options.position?this.left:this.right-5,w="right"===this.options.position?this.left+5:this.right;if(e.each(this.ticks,function(t,s){if(void 0!==t&&null!==t){var o=this.getPixelForTick(s);if(this.options.gridLines.display&&(s===("undefined"!=typeof this.zeroLineIndex?this.zeroLineIndex:0)?(this.ctx.lineWidth=this.options.gridLines.zeroLineWidth,this.ctx.strokeStyle=this.options.gridLines.zeroLineColor,a=!0):a&&(this.ctx.lineWidth=this.options.gridLines.lineWidth,this.ctx.strokeStyle=this.options.gridLines.color,a=!1),o+=e.aliasPixel(this.ctx.lineWidth),this.ctx.beginPath(),this.options.gridLines.drawTicks&&(this.ctx.moveTo(C,o),this.ctx.lineTo(w,o)),this.options.gridLines.drawOnChartArea&&(this.ctx.moveTo(i.left,o),this.ctx.lineTo(i.right,o)),this.ctx.stroke()),this.options.ticks.display){var n,r=this.getPixelForTick(s,this.options.gridLines.offsetGridLines);this.ctx.save(),"left"===this.options.position?this.options.ticks.mirror?(n=this.right+this.options.ticks.padding,this.ctx.textAlign="left"):(n=this.right-this.options.ticks.padding,this.ctx.textAlign="right"):this.options.ticks.mirror?(n=this.left-this.options.ticks.padding,this.ctx.textAlign="right"):(n=this.left+this.options.ticks.padding,this.ctx.textAlign="left"),this.ctx.translate(n,r),this.ctx.rotate(-1*e.toRadians(this.labelRotation)),this.ctx.font=f,this.ctx.textBaseline="middle",this.ctx.fillText(t,0,0),this.ctx.restore()}}},this),this.options.scaleLabel.display){o="left"===this.options.position?this.left+p/2:this.right-p/2,n=this.top+(this.bottom-this.top)/2;var _="left"===this.options.position?-.5*Math.PI:.5*Math.PI;this.ctx.save(),this.ctx.translate(o,n),this.ctx.rotate(_),this.ctx.textAlign="center",this.ctx.fillStyle=m,this.ctx.font=v,this.ctx.textBaseline="middle",this.ctx.fillText(this.options.scaleLabel.labelString,0,0),this.ctx.restore()}}this.ctx.lineWidth=this.options.gridLines.lineWidth,this.ctx.strokeStyle=this.options.gridLines.color;var A=this.left,I=this.right,M=this.top,F=this.bottom;this.isHorizontal()?(M=F="top"===this.options.position?this.bottom:this.top,M+=e.aliasPixel(this.ctx.lineWidth),F+=e.aliasPixel(this.ctx.lineWidth)):(A=I="left"===this.options.position?this.right:this.left,A+=e.aliasPixel(this.ctx.lineWidth),I+=e.aliasPixel(this.ctx.lineWidth)),this.ctx.beginPath(),this.ctx.moveTo(A,M),this.ctx.lineTo(I,F),this.ctx.stroke()}}})}},{}],30:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.scaleService={constructors:{},defaults:{},registerScaleType:function(t,i,a){this.constructors[t]=i,this.defaults[t]=e.clone(a)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(i){return this.defaults.hasOwnProperty(i)?e.scaleMerge(t.defaults.scale,this.defaults[i]):{}},addScalesToLayout:function(i){e.each(i.scales,function(e){t.layoutService.addBox(i,e)})}}}},{}],31:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.title={display:!1,position:"top",fullWidth:!0,fontStyle:"bold",padding:10,text:""},t.Title=t.Element.extend({initialize:function(i){e.extend(this,i),this.options=e.configMerge(t.defaults.global.title,i.options),this.legendHitBoxes=[]},beforeUpdate:e.noop,update:function(t,e,i){return this.beforeUpdate(),this.maxWidth=t,this.maxHeight=e,this.margins=i,this.beforeSetDimensions(),this.setDimensions(),this.afterSetDimensions(),this.beforeBuildLabels(),this.buildLabels(),this.afterBuildLabels(),this.beforeFit(),this.fit(),this.afterFit(),this.afterUpdate(),this.minSize},afterUpdate:e.noop,beforeSetDimensions:e.noop,setDimensions:function(){this.isHorizontal()?(this.width=this.maxWidth,this.left=0,this.right=this.width):(this.height=this.maxHeight,this.top=0,this.bottom=this.height),this.paddingLeft=0,this.paddingTop=0,this.paddingRight=0,this.paddingBottom=0,this.minSize={width:0,height:0}},afterSetDimensions:e.noop,beforeBuildLabels:e.noop,buildLabels:e.noop,afterBuildLabels:e.noop,beforeFit:e.noop,fit:function(){var i=(this.ctx,e.getValueOrDefault(this.options.fontSize,t.defaults.global.defaultFontSize)),a=e.getValueOrDefault(this.options.fontStyle,t.defaults.global.defaultFontStyle),s=e.getValueOrDefault(this.options.fontFamily,t.defaults.global.defaultFontFamily);e.fontString(i,a,s);this.isHorizontal()?this.minSize.width=this.maxWidth:this.minSize.width=0,this.isHorizontal()?this.minSize.height=0:this.minSize.height=this.maxHeight,this.isHorizontal()?this.options.display&&(this.minSize.height+=i+2*this.options.padding):this.options.display&&(this.minSize.width+=i+2*this.options.padding),this.width=this.minSize.width,this.height=this.minSize.height},afterFit:e.noop,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){if(this.options.display){var i,a,s=this.ctx,o=e.getValueOrDefault(this.options.fontColor,t.defaults.global.defaultFontColor),n=e.getValueOrDefault(this.options.fontSize,t.defaults.global.defaultFontSize),r=e.getValueOrDefault(this.options.fontStyle,t.defaults.global.defaultFontStyle),l=e.getValueOrDefault(this.options.fontFamily,t.defaults.global.defaultFontFamily),h=e.fontString(n,r,l);if(s.fillStyle=o,s.font=h,this.isHorizontal())s.textAlign="center",s.textBaseline="middle",i=this.left+(this.right-this.left)/2,a=this.top+(this.bottom-this.top)/2,s.fillText(this.options.text,i,a);else{i="left"===this.options.position?this.left+n/2:this.right-n/2,a=this.top+(this.bottom-this.top)/2;var c="left"===this.options.position?-.5*Math.PI:.5*Math.PI;s.save(),s.translate(i,a),s.rotate(c),s.textAlign="center",s.textBaseline="middle",s.fillText(this.options.text,0,0),s.restore()}}}})}},{}],32:[function(t,e,i){"use strict";e.exports=function(t){function e(t,e){return e&&(i.isArray(e)?t=t.concat(e):t.push(e)),t}var i=t.helpers;t.defaults.global.tooltips={enabled:!0,custom:null,mode:"single",backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleColor:"#fff",titleAlign:"left",bodySpacing:2,bodyColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,yAlign:"center",xAlign:"center",caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",callbacks:{beforeTitle:i.noop,title:function(t,e){var i="";return t.length>0&&(t[0].xLabel?i=t[0].xLabel:e.labels.length>0&&t[0].index<e.labels.length&&(i=e.labels[t[0].index])),i},afterTitle:i.noop,beforeBody:i.noop,beforeLabel:i.noop,label:function(t,e){var i=e.datasets[t.datasetIndex].label||"";return i+": "+t.yLabel},afterLabel:i.noop,afterBody:i.noop,beforeFooter:i.noop,footer:i.noop,afterFooter:i.noop}},t.Tooltip=t.Element.extend({initialize:function(){var e=this._options;i.extend(this,{_model:{xPadding:e.tooltips.xPadding,yPadding:e.tooltips.yPadding,xAlign:e.tooltips.yAlign,yAlign:e.tooltips.xAlign,bodyColor:e.tooltips.bodyColor,_bodyFontFamily:i.getValueOrDefault(e.tooltips.bodyFontFamily,t.defaults.global.defaultFontFamily),_bodyFontStyle:i.getValueOrDefault(e.tooltips.bodyFontStyle,t.defaults.global.defaultFontStyle),_bodyAlign:e.tooltips.bodyAlign,bodyFontSize:i.getValueOrDefault(e.tooltips.bodyFontSize,t.defaults.global.defaultFontSize),bodySpacing:e.tooltips.bodySpacing,titleColor:e.tooltips.titleColor,_titleFontFamily:i.getValueOrDefault(e.tooltips.titleFontFamily,t.defaults.global.defaultFontFamily),_titleFontStyle:i.getValueOrDefault(e.tooltips.titleFontStyle,t.defaults.global.defaultFontStyle),titleFontSize:i.getValueOrDefault(e.tooltips.titleFontSize,t.defaults.global.defaultFontSize),_titleAlign:e.tooltips.titleAlign,titleSpacing:e.tooltips.titleSpacing,titleMarginBottom:e.tooltips.titleMarginBottom,footerColor:e.tooltips.footerColor,_footerFontFamily:i.getValueOrDefault(e.tooltips.footerFontFamily,t.defaults.global.defaultFontFamily),_footerFontStyle:i.getValueOrDefault(e.tooltips.footerFontStyle,t.defaults.global.defaultFontStyle),footerFontSize:i.getValueOrDefault(e.tooltips.footerFontSize,t.defaults.global.defaultFontSize),_footerAlign:e.tooltips.footerAlign,footerSpacing:e.tooltips.footerSpacing,footerMarginTop:e.tooltips.footerMarginTop,caretSize:e.tooltips.caretSize,cornerRadius:e.tooltips.cornerRadius,backgroundColor:e.tooltips.backgroundColor,opacity:0,legendColorBackground:e.tooltips.multiKeyBackground}})},getTitle:function(){var t=this._options.tooltips.callbacks.beforeTitle.apply(this,arguments),i=this._options.tooltips.callbacks.title.apply(this,arguments),a=this._options.tooltips.callbacks.afterTitle.apply(this,arguments),s=[];return s=e(s,t),s=e(s,i),s=e(s,a)},getBeforeBody:function(){var t=this._options.tooltips.callbacks.beforeBody.apply(this,arguments);return i.isArray(t)?t:void 0!==t?[t]:[]},getBody:function(t,e){var a=[];return i.each(t,function(t){i.pushAllIfDefined(this._options.tooltips.callbacks.beforeLabel.call(this,t,e),a),i.pushAllIfDefined(this._options.tooltips.callbacks.label.call(this,t,e),a),i.pushAllIfDefined(this._options.tooltips.callbacks.afterLabel.call(this,t,e),a);
-},this),a},getAfterBody:function(){var t=this._options.tooltips.callbacks.afterBody.apply(this,arguments);return i.isArray(t)?t:void 0!==t?[t]:[]},getFooter:function(){var t=this._options.tooltips.callbacks.beforeFooter.apply(this,arguments),i=this._options.tooltips.callbacks.footer.apply(this,arguments),a=this._options.tooltips.callbacks.afterFooter.apply(this,arguments),s=[];return s=e(s,t),s=e(s,i),s=e(s,a)},getAveragePosition:function(t){if(!t.length)return!1;var e=[],a=[];i.each(t,function(t){if(t){var i=t.tooltipPosition();e.push(i.x),a.push(i.y)}});for(var s=0,o=0,n=0;n<e.length;n++)s+=e[n],o+=a[n];return{x:Math.round(s/e.length),y:Math.round(o/e.length)}},update:function(t){if(this._active.length){this._model.opacity=1;var e,a=this._active[0],s=[],o=[];if("single"===this._options.tooltips.mode){var n=a._yScale||a._scale;o.push({xLabel:a._xScale?a._xScale.getLabelForIndex(a._index,a._datasetIndex):"",yLabel:n?n.getLabelForIndex(a._index,a._datasetIndex):"",index:a._index,datasetIndex:a._datasetIndex}),e=this.getAveragePosition(this._active)}else i.each(this._data.datasets,function(t,e){if(i.isDatasetVisible(t)){var s=t.metaData[a._index];if(s){var n=a._yScale||a._scale;o.push({xLabel:s._xScale?s._xScale.getLabelForIndex(s._index,s._datasetIndex):"",yLabel:n?n.getLabelForIndex(s._index,s._datasetIndex):"",index:a._index,datasetIndex:e})}}},null,a._yScale.options.stacked),i.each(this._active,function(t){t&&s.push({borderColor:t._view.borderColor,backgroundColor:t._view.backgroundColor})},null,a._yScale.options.stacked),e=this.getAveragePosition(this._active),e.y=this._active[0]._yScale.getPixelForDecimal(.5);i.extend(this._model,{title:this.getTitle(o,this._data),beforeBody:this.getBeforeBody(o,this._data),body:this.getBody(o,this._data),afterBody:this.getAfterBody(o,this._data),footer:this.getFooter(o,this._data)}),i.extend(this._model,{x:Math.round(e.x),y:Math.round(e.y),caretPadding:i.getValueOrDefault(e.padding,2),labelColors:s});var r=this.getTooltipSize(this._model);this.determineAlignment(r),i.extend(this._model,this.getBackgroundPoint(this._model,r))}else this._model.opacity=0;return t&&this._options.tooltips.custom&&this._options.tooltips.custom.call(this,this._model),this},getTooltipSize:function(t){var e=this._chart.ctx,a={height:2*t.yPadding,width:0},s=t.body.length+t.beforeBody.length+t.afterBody.length;return a.height+=t.title.length*t.titleFontSize,a.height+=(t.title.length-1)*t.titleSpacing,a.height+=t.title.length?t.titleMarginBottom:0,a.height+=s*t.bodyFontSize,a.height+=s?(s-1)*t.bodySpacing:0,a.height+=t.footer.length?t.footerMarginTop:0,a.height+=t.footer.length*t.footerFontSize,a.height+=t.footer.length?(t.footer.length-1)*t.footerSpacing:0,e.font=i.fontString(t.titleFontSize,t._titleFontStyle,t._titleFontFamily),i.each(t.title,function(t){a.width=Math.max(a.width,e.measureText(t).width)}),e.font=i.fontString(t.bodyFontSize,t._bodyFontStyle,t._bodyFontFamily),i.each(t.beforeBody.concat(t.afterBody),function(t){a.width=Math.max(a.width,e.measureText(t).width)}),i.each(t.body,function(i){a.width=Math.max(a.width,e.measureText(i).width+("single"!==this._options.tooltips.mode?t.bodyFontSize+2:0))},this),e.font=i.fontString(t.footerFontSize,t._footerFontStyle,t._footerFontFamily),i.each(t.footer,function(t){a.width=Math.max(a.width,e.measureText(t).width)}),a.width+=2*t.xPadding,a},determineAlignment:function(t){this._model.y<t.height?this._model.yAlign="top":this._model.y>this._chart.height-t.height&&(this._model.yAlign="bottom");var e,i,a,s,o,n=this,r=(this._chartInstance.chartArea.left+this._chartInstance.chartArea.right)/2,l=(this._chartInstance.chartArea.top+this._chartInstance.chartArea.bottom)/2;"center"===this._model.yAlign?(e=function(t){return r>=t},i=function(t){return t>r}):(e=function(e){return e<=t.width/2},i=function(e){return e>=n._chart.width-t.width/2}),a=function(e){return e+t.width>n._chart.width},s=function(e){return e-t.width<0},o=function(t){return l>=t?"top":"bottom"},e(this._model.x)?(this._model.xAlign="left",a(this._model.x)&&(this._model.xAlign="center",this._model.yAlign=o(this._model.y))):i(this._model.x)&&(this._model.xAlign="right",s(this._model.x)&&(this._model.xAlign="center",this._model.yAlign=o(this._model.y)))},getBackgroundPoint:function(t,e){var i={x:t.x,y:t.y};return"right"===t.xAlign?i.x-=e.width:"center"===t.xAlign&&(i.x-=e.width/2),"top"===t.yAlign?i.y+=t.caretPadding+t.caretSize:"bottom"===t.yAlign?i.y-=e.height+t.caretPadding+t.caretSize:i.y-=e.height/2,"center"===t.yAlign?"left"===t.xAlign?i.x+=t.caretPadding+t.caretSize:"right"===t.xAlign&&(i.x-=t.caretPadding+t.caretSize):"left"===t.xAlign?i.x-=t.cornerRadius+t.caretPadding:"right"===t.xAlign&&(i.x+=t.cornerRadius+t.caretPadding),i},drawCaret:function(t,e,a,s){var o,n,r,l,h,c,d=this._view,u=this._chart.ctx;"center"===d.yAlign?("left"===d.xAlign?(o=t.x,n=o-d.caretSize,r=o):(o=t.x+e.width,n=o+d.caretSize,r=o),h=t.y+e.height/2,l=h-d.caretSize,c=h+d.caretSize):("left"===d.xAlign?(o=t.x+d.cornerRadius,n=o+d.caretSize,r=n+d.caretSize):"right"===d.xAlign?(o=t.x+e.width-d.cornerRadius,n=o-d.caretSize,r=n-d.caretSize):(n=t.x+e.width/2,o=n-d.caretSize,r=n+d.caretSize),"top"===d.yAlign?(l=t.y,h=l-d.caretSize,c=l):(l=t.y+e.height,h=l+d.caretSize,c=l));var g=i.color(d.backgroundColor);u.fillStyle=g.alpha(a*g.alpha()).rgbString(),u.beginPath(),u.moveTo(o,l),u.lineTo(n,h),u.lineTo(r,c),u.closePath(),u.fill()},drawTitle:function(t,e,a,s){if(e.title.length){a.textAlign=e._titleAlign,a.textBaseline="top";var o=i.color(e.titleColor);a.fillStyle=o.alpha(s*o.alpha()).rgbString(),a.font=i.fontString(e.titleFontSize,e._titleFontStyle,e._titleFontFamily),i.each(e.title,function(i,s){a.fillText(i,t.x,t.y),t.y+=e.titleFontSize+e.titleSpacing,s+1===e.title.length&&(t.y+=e.titleMarginBottom-e.titleSpacing)})}},drawBody:function(t,e,a,s){a.textAlign=e._bodyAlign,a.textBaseline="top";var o=i.color(e.bodyColor);a.fillStyle=o.alpha(s*o.alpha()).rgbString(),a.font=i.fontString(e.bodyFontSize,e._bodyFontStyle,e._bodyFontFamily),i.each(e.beforeBody,function(i){a.fillText(i,t.x,t.y),t.y+=e.bodyFontSize+e.bodySpacing}),i.each(e.body,function(o,n){"single"!==this._options.tooltips.mode&&(a.fillStyle=i.color(e.legendColorBackground).alpha(s).rgbaString(),a.fillRect(t.x,t.y,e.bodyFontSize,e.bodyFontSize),a.strokeStyle=i.color(e.labelColors[n].borderColor).alpha(s).rgbaString(),a.strokeRect(t.x,t.y,e.bodyFontSize,e.bodyFontSize),a.fillStyle=i.color(e.labelColors[n].backgroundColor).alpha(s).rgbaString(),a.fillRect(t.x+1,t.y+1,e.bodyFontSize-2,e.bodyFontSize-2),a.fillStyle=i.color(e.bodyColor).alpha(s).rgbaString()),a.fillText(o,t.x+("single"!==this._options.tooltips.mode?e.bodyFontSize+2:0),t.y),t.y+=e.bodyFontSize+e.bodySpacing},this),i.each(e.afterBody,function(i){a.fillText(i,t.x,t.y),t.y+=e.bodyFontSize}),t.y-=e.bodySpacing},drawFooter:function(t,e,a,s){if(e.footer.length){t.y+=e.footerMarginTop,a.textAlign=e._footerAlign,a.textBaseline="top";var o=i.color(e.footerColor);a.fillStyle=o.alpha(s*o.alpha()).rgbString(),a.font=i.fontString(e.footerFontSize,e._footerFontStyle,e._footerFontFamily),i.each(e.footer,function(i){a.fillText(i,t.x,t.y),t.y+=e.footerFontSize+e.footerSpacing})}},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var a=e.caretPadding,s=this.getTooltipSize(e),o={x:e.x,y:e.y},n=Math.abs(e.opacity<.001)?0:e.opacity;if(this._options.tooltips.enabled){var r=i.color(e.backgroundColor);t.fillStyle=r.alpha(n*r.alpha()).rgbString(),i.drawRoundedRectangle(t,o.x,o.y,s.width,s.height,e.cornerRadius),t.fill(),this.drawCaret(o,s,n,a),o.x+=e.xPadding,o.y+=e.yPadding,this.drawTitle(o,e,t,n),this.drawBody(o,e,t,n),this.drawFooter(o,e,t,n)}}}})}},{}],33:[function(t,e,i){"use strict";e.exports=function(t,e){var i=t.helpers;t.defaults.global.elements.arc={backgroundColor:t.defaults.global.defaultColor,borderColor:"#fff",borderWidth:2},t.elements.Arc=t.Element.extend({inLabelRange:function(t){var e=this._view;return e?Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2):!1},inRange:function(t,e){var a=this._view;if(a){var s=i.getAngleFromPoint(a,{x:t,y:e}),o=a.startAngle<-.5*Math.PI?a.startAngle+2*Math.PI:a.startAngle>1.5*Math.PI?a.startAngle-2*Math.PI:a.startAngle,n=a.endAngle<-.5*Math.PI?a.endAngle+2*Math.PI:a.endAngle>1.5*Math.PI?a.endAngle-2*Math.PI:a.endAngle,r=s.angle>=o&&s.angle<=n,l=s.distance>=a.innerRadius&&s.distance<=a.outerRadius;return r&&l}return!1},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,i=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*i,y:t.y+Math.sin(e)*i}},draw:function(){var t=this._chart.ctx,e=this._view;t.beginPath(),t.arc(e.x,e.y,e.outerRadius,e.startAngle,e.endAngle),t.arc(e.x,e.y,e.innerRadius,e.endAngle,e.startAngle,!0),t.closePath(),t.strokeStyle=e.borderColor,t.lineWidth=e.borderWidth,t.fillStyle=e.backgroundColor,t.fill(),t.lineJoin="bevel",e.borderWidth&&t.stroke()}})}},{}],34:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.elements.line={tension:.4,backgroundColor:t.defaults.global.defaultColor,borderWidth:3,borderColor:t.defaults.global.defaultColor,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",fill:!0},t.elements.Line=t.Element.extend({lineToNextPoint:function(t,e,i,a,s){var o=this._chart.ctx;e._view.skip?a.call(this,t,e,i):t._view.skip?s.call(this,t,e,i):0===e._view.tension?o.lineTo(e._view.x,e._view.y):o.bezierCurveTo(t._view.controlPointNextX,t._view.controlPointNextY,e._view.controlPointPreviousX,e._view.controlPointPreviousY,e._view.x,e._view.y)},draw:function(){function i(t){n._view.skip||r._view.skip?t&&o.lineTo(a._view.scaleZero.x,a._view.scaleZero.y):o.bezierCurveTo(r._view.controlPointNextX,r._view.controlPointNextY,n._view.controlPointPreviousX,n._view.controlPointPreviousY,n._view.x,n._view.y)}var a=this,s=this._view,o=this._chart.ctx,n=this._children[0],r=this._children[this._children.length-1];o.save(),this._children.length>0&&s.fill&&(o.beginPath(),e.each(this._children,function(t,i){var a=e.previousItem(this._children,i),n=e.nextItem(this._children,i);0===i?(this._loop?o.moveTo(s.scaleZero.x,s.scaleZero.y):o.moveTo(t._view.x,s.scaleZero),t._view.skip?this._loop||o.moveTo(n._view.x,this._view.scaleZero):o.lineTo(t._view.x,t._view.y)):this.lineToNextPoint(a,t,n,function(t,e,i){this._loop?o.lineTo(this._view.scaleZero.x,this._view.scaleZero.y):(o.lineTo(t._view.x,this._view.scaleZero),o.moveTo(i._view.x,this._view.scaleZero))},function(t,e){o.lineTo(e._view.x,e._view.y)})},this),this._loop?i(!0):(o.lineTo(this._children[this._children.length-1]._view.x,s.scaleZero),o.lineTo(this._children[0]._view.x,s.scaleZero)),o.fillStyle=s.backgroundColor||t.defaults.global.defaultColor,o.closePath(),o.fill()),o.lineCap=s.borderCapStyle||t.defaults.global.elements.line.borderCapStyle,o.setLineDash&&o.setLineDash(s.borderDash||t.defaults.global.elements.line.borderDash),o.lineDashOffset=s.borderDashOffset||t.defaults.global.elements.line.borderDashOffset,o.lineJoin=s.borderJoinStyle||t.defaults.global.elements.line.borderJoinStyle,o.lineWidth=s.borderWidth||t.defaults.global.elements.line.borderWidth,o.strokeStyle=s.borderColor||t.defaults.global.defaultColor,o.beginPath(),e.each(this._children,function(t,i){var a=e.previousItem(this._children,i),s=e.nextItem(this._children,i);0===i?o.moveTo(t._view.x,t._view.y):this.lineToNextPoint(a,t,s,function(t,e,i){o.moveTo(i._view.x,i._view.y)},function(t,e){o.moveTo(e._view.x,e._view.y)})},this),this._loop&&this._children.length>0&&i(),o.stroke(),o.restore()}})}},{}],35:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers;t.defaults.global.elements.point={radius:3,pointStyle:"circle",backgroundColor:t.defaults.global.defaultColor,borderWidth:1,borderColor:t.defaults.global.defaultColor,hitRadius:1,hoverRadius:4,hoverBorderWidth:1},t.elements.Point=t.Element.extend({inRange:function(t,e){var i=this._view;if(i){var a=i.hitRadius+i.radius;return Math.pow(t-i.x,2)+Math.pow(e-i.y,2)<Math.pow(a,2)}return!1},inLabelRange:function(t){var e=this._view;return e?Math.pow(t-e.x,2)<Math.pow(e.radius+e.hitRadius,2):!1},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(){var i=this._view,a=this._chart.ctx;if(!i.skip){if("object"==typeof i.pointStyle&&("[object HTMLImageElement]"===i.pointStyle.toString()||"[object HTMLCanvasElement]"===i.pointStyle.toString()))return void a.drawImage(i.pointStyle,i.x-i.pointStyle.width/2,i.y-i.pointStyle.height/2);if(!isNaN(i.radius)&&i.radius>0){a.strokeStyle=i.borderColor||t.defaults.global.defaultColor,a.lineWidth=e.getValueOrDefault(i.borderWidth,t.defaults.global.elements.point.borderWidth),a.fillStyle=i.backgroundColor||t.defaults.global.defaultColor;var s,o,n=i.radius;switch(i.pointStyle){default:a.beginPath(),a.arc(i.x,i.y,n,0,2*Math.PI),a.closePath(),a.fill();break;case"triangle":a.beginPath();var r=3*n/Math.sqrt(3),l=r*Math.sqrt(3)/2;a.moveTo(i.x-r/2,i.y+l/3),a.lineTo(i.x+r/2,i.y+l/3),a.lineTo(i.x,i.y-2*l/3),a.closePath(),a.fill();break;case"rect":a.fillRect(i.x-1/Math.SQRT2*n,i.y-1/Math.SQRT2*n,2/Math.SQRT2*n,2/Math.SQRT2*n),a.strokeRect(i.x-1/Math.SQRT2*n,i.y-1/Math.SQRT2*n,2/Math.SQRT2*n,2/Math.SQRT2*n);break;case"rectRot":a.translate(i.x,i.y),a.rotate(Math.PI/4),a.fillRect(-1/Math.SQRT2*n,-1/Math.SQRT2*n,2/Math.SQRT2*n,2/Math.SQRT2*n),a.strokeRect(-1/Math.SQRT2*n,-1/Math.SQRT2*n,2/Math.SQRT2*n,2/Math.SQRT2*n),a.setTransform(1,0,0,1,0,0);break;case"cross":a.beginPath(),a.moveTo(i.x,i.y+n),a.lineTo(i.x,i.y-n),a.moveTo(i.x-n,i.y),a.lineTo(i.x+n,i.y),a.closePath();break;case"crossRot":a.beginPath(),s=Math.cos(Math.PI/4)*n,o=Math.sin(Math.PI/4)*n,a.moveTo(i.x-s,i.y-o),a.lineTo(i.x+s,i.y+o),a.moveTo(i.x-s,i.y+o),a.lineTo(i.x+s,i.y-o),a.closePath();break;case"star":a.beginPath(),a.moveTo(i.x,i.y+n),a.lineTo(i.x,i.y-n),a.moveTo(i.x-n,i.y),a.lineTo(i.x+n,i.y),s=Math.cos(Math.PI/4)*n,o=Math.sin(Math.PI/4)*n,a.moveTo(i.x-s,i.y-o),a.lineTo(i.x+s,i.y+o),a.moveTo(i.x-s,i.y+o),a.lineTo(i.x+s,i.y-o),a.closePath();break;case"line":a.beginPath(),a.moveTo(i.x-n,i.y),a.lineTo(i.x+n,i.y),a.closePath();break;case"dash":a.beginPath(),a.moveTo(i.x,i.y),a.lineTo(i.x+n,i.y),a.closePath()}a.stroke()}}}})}},{}],36:[function(t,e,i){"use strict";e.exports=function(t){t.helpers;t.defaults.global.elements.rectangle={backgroundColor:t.defaults.global.defaultColor,borderWidth:0,borderColor:t.defaults.global.defaultColor,borderSkipped:"bottom"},t.elements.Rectangle=t.Element.extend({draw:function(){function t(t){return l[(c+t)%4]}var e=this._chart.ctx,i=this._view,a=i.width/2,s=i.x-a,o=i.x+a,n=i.base-(i.base-i.y),r=i.borderWidth/2;i.borderWidth&&(s+=r,o-=r,n+=r),e.beginPath(),e.fillStyle=i.backgroundColor,e.strokeStyle=i.borderColor,e.lineWidth=i.borderWidth;var l=[[s,i.base],[s,n],[o,n],[o,i.base]],h=["bottom","left","top","right"],c=h.indexOf(i.borderSkipped,0);-1===c&&(c=0),e.moveTo.apply(e,t(0));for(var d=1;4>d;d++)e.lineTo.apply(e,t(d));e.fill(),i.borderWidth&&e.stroke()},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){var i=this._view,a=!1;return i&&(a=i.y<i.base?t>=i.x-i.width/2&&t<=i.x+i.width/2&&e>=i.y&&e<=i.base:t>=i.x-i.width/2&&t<=i.x+i.width/2&&e>=i.base&&e<=i.y),a},inLabelRange:function(t){var e=this._view;return e?t>=e.x-e.width/2&&t<=e.x+e.width/2:!1},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}})}},{}],37:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={position:"bottom"},a=t.Scale.extend({buildTicks:function(t){this.startIndex=0,this.endIndex=this.chart.data.labels.length;var i;void 0!==this.options.ticks.min&&(i=e.indexOf(this.chart.data.labels,this.options.ticks.min),this.startIndex=-1!==i?i:this.startIndex),void 0!==this.options.ticks.max&&(i=e.indexOf(this.chart.data.labels,this.options.ticks.max),this.endIndex=-1!==i?i:this.endIndex),this.ticks=0===this.startIndex&&this.endIndex===this.chart.data.labels.length?this.chart.data.labels:this.chart.data.labels.slice(this.startIndex,this.endIndex+1)},getLabelForIndex:function(t,e){return this.ticks[t]},getPixelForValue:function(t,e,i,a){var s=Math.max(this.ticks.length-(this.options.gridLines.offsetGridLines?0:1),1);if(this.isHorizontal()){var o=this.width-(this.paddingLeft+this.paddingRight),n=o/s,r=n*(e-this.startIndex)+this.paddingLeft;return this.options.gridLines.offsetGridLines&&a&&(r+=n/2),this.left+Math.round(r)}var l=this.height-(this.paddingTop+this.paddingBottom),h=l/s,c=h*(e-this.startIndex)+this.paddingTop;return this.options.gridLines.offsetGridLines&&a&&(c+=h/2),this.top+Math.round(c)},getPixelForTick:function(t,e){return this.getPixelForValue(this.ticks[t],t+this.startIndex,null,e)}});t.scaleService.registerScaleType("category",a,i)}},{}],38:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={position:"left",ticks:{callback:function(t,i,a){var s=a[1]-a[0];Math.abs(s)>1&&t!==Math.floor(t)&&(s=t-Math.floor(t));var o=e.log10(Math.abs(s)),n="";if(0!==t){var r=-1*Math.floor(o);r=Math.max(Math.min(r,20),0),n=t.toFixed(r)}else n="0";return n}}},a=t.Scale.extend({determineDataLimits:function(){if(this.min=null,this.max=null,this.options.stacked){var t={},i=!1,a=!1;e.each(this.chart.data.datasets,function(s){void 0===t[s.type]&&(t[s.type]={positiveValues:[],negativeValues:[]});var o=t[s.type].positiveValues,n=t[s.type].negativeValues;e.isDatasetVisible(s)&&(this.isHorizontal()?s.xAxisID===this.id:s.yAxisID===this.id)&&e.each(s.data,function(t,e){var s=+this.getRightValue(t);isNaN(s)||(o[e]=o[e]||0,n[e]=n[e]||0,this.options.relativePoints?o[e]=100:0>s?(a=!0,n[e]+=s):(i=!0,o[e]+=s))},this)},this),e.each(t,function(t){var i=t.positiveValues.concat(t.negativeValues),a=e.min(i),s=e.max(i);this.min=null===this.min?a:Math.min(this.min,a),this.max=null===this.max?s:Math.max(this.max,s)},this)}else e.each(this.chart.data.datasets,function(t){e.isDatasetVisible(t)&&(this.isHorizontal()?t.xAxisID===this.id:t.yAxisID===this.id)&&e.each(t.data,function(t,e){var i=+this.getRightValue(t);isNaN(i)||(null===this.min?this.min=i:i<this.min&&(this.min=i),null===this.max?this.max=i:i>this.max&&(this.max=i))},this)},this);if(this.options.ticks.beginAtZero){var s=e.sign(this.min),o=e.sign(this.max);0>s&&0>o?this.max=0:s>0&&o>0&&(this.min=0)}void 0!==this.options.ticks.min?this.min=this.options.ticks.min:void 0!==this.options.ticks.suggestedMin&&(this.min=Math.min(this.min,this.options.ticks.suggestedMin)),void 0!==this.options.ticks.max?this.max=this.options.ticks.max:void 0!==this.options.ticks.suggestedMax&&(this.max=Math.max(this.max,this.options.ticks.suggestedMax)),this.min===this.max&&(this.min--,this.max++)},buildTicks:function(){this.ticks=[];var i;if(this.isHorizontal())i=Math.min(this.options.ticks.maxTicksLimit?this.options.ticks.maxTicksLimit:11,Math.ceil(this.width/50));else{var a=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize);i=Math.min(this.options.ticks.maxTicksLimit?this.options.ticks.maxTicksLimit:11,Math.ceil(this.height/(2*a)))}i=Math.max(2,i);var s,o=this.options.ticks.fixedStepSize&&this.options.ticks.fixedStepSize>0||this.options.ticks.stepSize&&this.options.ticks.stepSize>0;if(o)s=e.getValueOrDefault(this.options.ticks.fixedStepSize,this.options.ticks.stepSize);else{var n=e.niceNum(this.max-this.min,!1);s=e.niceNum(n/(i-1),!0)}var r=Math.floor(this.min/s)*s,l=Math.ceil(this.max/s)*s,h=(l-r)/s;h=e.almostEquals(h,Math.round(h),s/1e3)?Math.round(h):Math.ceil(h),this.ticks.push(void 0!==this.options.ticks.min?this.options.ticks.min:r);for(var c=1;h>c;++c)this.ticks.push(r+c*s);this.ticks.push(void 0!==this.options.ticks.max?this.options.ticks.max:l),("left"===this.options.position||"right"===this.options.position)&&this.ticks.reverse(),this.max=e.max(this.ticks),this.min=e.min(this.ticks),this.options.ticks.reverse?(this.ticks.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},convertTicksToLabels:function(){this.ticksAsNumbers=this.ticks.slice(),this.zeroLineIndex=this.ticks.indexOf(0),t.Scale.prototype.convertTicksToLabels.call(this)},getPixelForValue:function(t,e,i,a){var s,o=+this.getRightValue(t),n=this.end-this.start;if(this.isHorizontal()){var r=this.width-(this.paddingLeft+this.paddingRight);return s=this.left+r/n*(o-this.start),Math.round(s+this.paddingLeft)}var l=this.height-(this.paddingTop+this.paddingBottom);return s=this.bottom-this.paddingBottom-l/n*(o-this.start),Math.round(s)},getPixelForTick:function(t,e){return this.getPixelForValue(this.ticksAsNumbers[t],null,null,e)}});t.scaleService.registerScaleType("linear",a,i)}},{}],39:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={position:"left",ticks:{callback:function(e,i,a){var s=e/Math.pow(10,Math.floor(t.helpers.log10(e)));return 1===s||2===s||5===s||0===i||i===a.length-1?e.toExponential():""}}},a=t.Scale.extend({determineDataLimits:function(){if(this.min=null,this.max=null,this.options.stacked){var t={};e.each(this.chart.data.datasets,function(i){e.isDatasetVisible(i)&&(this.isHorizontal()?i.xAxisID===this.id:i.yAxisID===this.id)&&(void 0===t[i.type]&&(t[i.type]=[]),e.each(i.data,function(e,a){var s=t[i.type],o=+this.getRightValue(e);isNaN(o)||(s[a]=s[a]||0,this.options.relativePoints?s[a]=100:s[a]+=o)},this))},this),e.each(t,function(t){var i=e.min(t),a=e.max(t);this.min=null===this.min?i:Math.min(this.min,i),this.max=null===this.max?a:Math.max(this.max,a)},this)}else e.each(this.chart.data.datasets,function(t){e.isDatasetVisible(t)&&(this.isHorizontal()?t.xAxisID===this.id:t.yAxisID===this.id)&&e.each(t.data,function(t,e){var i=+this.getRightValue(t);isNaN(i)||(null===this.min?this.min=i:i<this.min&&(this.min=i),null===this.max?this.max=i:i>this.max&&(this.max=i))},this)},this);this.min=void 0!==this.options.ticks.min?this.options.ticks.min:this.min,this.max=void 0!==this.options.ticks.max?this.options.ticks.max:this.max,this.min===this.max&&(0!==this.min&&null!==this.min?(this.min=Math.pow(10,Math.floor(e.log10(this.min))-1),this.max=Math.pow(10,Math.floor(e.log10(this.max))+1)):(this.min=1,this.max=10))},buildTicks:function(){this.ticks=[];for(var t=void 0!==this.options.ticks.min?this.options.ticks.min:Math.pow(10,Math.floor(e.log10(this.min)));t<this.max;){this.ticks.push(t);var i=Math.floor(e.log10(t)),a=Math.floor(t/Math.pow(10,i))+1;10===a&&(a=1,++i),t=a*Math.pow(10,i)}var s=void 0!==this.options.ticks.max?this.options.ticks.max:t;this.ticks.push(s),("left"===this.options.position||"right"===this.options.position)&&this.ticks.reverse(),this.max=e.max(this.ticks),this.min=e.min(this.ticks),this.options.ticks.reverse?(this.ticks.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max)},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),t.Scale.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t,e){return this.getPixelForValue(this.tickValues[t],null,null,e)},getPixelForValue:function(t,i,a,s){var o,n=+this.getRightValue(t),r=e.log10(this.end)-e.log10(this.start);if(this.isHorizontal())if(0===n)o=this.left+this.paddingLeft;else{var l=this.width-(this.paddingLeft+this.paddingRight);o=this.left+l/r*(e.log10(n)-e.log10(this.start)),o+=this.paddingLeft}else if(0===n)o=this.top+this.paddingTop;else{var h=this.height-(this.paddingTop+this.paddingBottom);o=this.bottom-this.paddingBottom-h/r*(e.log10(n)-e.log10(this.start))}return o}});t.scaleService.registerScaleType("logarithmic",a,i)}},{}],40:[function(t,e,i){"use strict";e.exports=function(t){var e=t.helpers,i={display:!0,animate:!0,lineArc:!1,position:"chartArea",angleLines:{display:!0,color:"rgba(0, 0, 0, 0.1)",lineWidth:1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2},pointLabels:{fontSize:10,callback:function(t){return t}}},a=t.Scale.extend({getValueCount:function(){return this.chart.data.labels.length},setDimensions:function(){this.width=this.maxWidth,this.height=this.maxHeight,this.xCenter=Math.round(this.width/2),this.yCenter=Math.round(this.height/2);var i=e.min([this.height,this.width]),a=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize);this.drawingArea=this.options.display?i/2-(a/2+this.options.ticks.backdropPaddingY):i/2},determineDataLimits:function(){if(this.min=null,this.max=null,e.each(this.chart.data.datasets,function(t){e.isDatasetVisible(t)&&e.each(t.data,function(t,e){var i=+this.getRightValue(t);isNaN(i)||(null===this.min?this.min=i:i<this.min&&(this.min=i),null===this.max?this.max=i:i>this.max&&(this.max=i))},this)},this),this.options.ticks.beginAtZero){var t=e.sign(this.min),i=e.sign(this.max);0>t&&0>i?this.max=0:t>0&&i>0&&(this.min=0)}void 0!==this.options.ticks.min?this.min=this.options.ticks.min:void 0!==this.options.ticks.suggestedMin&&(this.min=Math.min(this.min,this.options.ticks.suggestedMin)),void 0!==this.options.ticks.max?this.max=this.options.ticks.max:void 0!==this.options.ticks.suggestedMax&&(this.max=Math.max(this.max,this.options.ticks.suggestedMax)),this.min===this.max&&(this.min--,this.max++)},buildTicks:function(){this.ticks=[];var i=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),a=Math.min(this.options.ticks.maxTicksLimit?this.options.ticks.maxTicksLimit:11,Math.ceil(this.drawingArea/(1.5*i)));a=Math.max(2,a);var s=e.niceNum(this.max-this.min,!1),o=e.niceNum(s/(a-1),!0),n=Math.floor(this.min/o)*o,r=Math.ceil(this.max/o)*o,l=Math.ceil((r-n)/o);this.ticks.push(void 0!==this.options.ticks.min?this.options.ticks.min:n);for(var h=1;l>h;++h)this.ticks.push(n+h*o);this.ticks.push(void 0!==this.options.ticks.max?this.options.ticks.max:r),this.max=e.max(this.ticks),this.min=e.min(this.ticks),this.options.ticks.reverse?(this.ticks.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),this.zeroLineIndex=this.ticks.indexOf(0)},convertTicksToLabels:function(){t.Scale.prototype.convertTicksToLabels.call(this),this.pointLabels=this.chart.data.labels.map(this.options.pointLabels.callback,this)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var i,a,s,o,n,r,l,h,c,d,u,g,f=e.getValueOrDefault(this.options.pointLabels.fontSize,t.defaults.global.defaultFontSize),m=e.getValueOrDefault(this.options.pointLabels.fontStyle,t.defaults.global.defaultFontStyle),p=e.getValueOrDefault(this.options.pointLabels.fontFamily,t.defaults.global.defaultFontFamily),b=e.fontString(f,m,p),x=e.min([this.height/2-f-5,this.width/2]),v=this.width,y=0;for(this.ctx.font=b,a=0;a<this.getValueCount();a++)i=this.getPointPosition(a,x),s=this.ctx.measureText(this.pointLabels[a]?this.pointLabels[a]:"").width+5,0===a||a===this.getValueCount()/2?(o=s/2,i.x+o>v&&(v=i.x+o,n=a),i.x-o<y&&(y=i.x-o,l=a)):a<this.getValueCount()/2?i.x+s>v&&(v=i.x+s,n=a):a>this.getValueCount()/2&&i.x-s<y&&(y=i.x-s,l=a);c=y,d=Math.ceil(v-this.width),r=this.getIndexAngle(n),h=this.getIndexAngle(l),u=d/Math.sin(r+Math.PI/2),g=c/Math.sin(h+Math.PI/2),u=e.isNumber(u)?u:0,g=e.isNumber(g)?g:0,this.drawingArea=Math.round(x-(g+u)/2),this.setCenterPoint(g,u)},setCenterPoint:function(t,e){var i=this.width-e-this.drawingArea,a=t+this.drawingArea;this.xCenter=Math.round((a+i)/2+this.left),this.yCenter=Math.round(this.height/2+this.top)},getIndexAngle:function(t){var e=2*Math.PI/this.getValueCount();return t*e-Math.PI/2},getDistanceFromCenterForValue:function(t){if(null===t)return 0;var e=this.drawingArea/(this.max-this.min);return this.options.reverse?(this.max-t)*e:(t-this.min)*e},getPointPosition:function(t,e){var i=this.getIndexAngle(t);return{x:Math.round(Math.cos(i)*e)+this.xCenter,y:Math.round(Math.sin(i)*e)+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},draw:function(){if(this.options.display){var i=this.ctx;if(e.each(this.ticks,function(a,s){if(s>0||this.options.reverse){var o=this.getDistanceFromCenterForValue(this.ticks[s]),n=this.yCenter-o;if(this.options.gridLines.display)if(i.strokeStyle=this.options.gridLines.color,i.lineWidth=this.options.gridLines.lineWidth,this.options.lineArc)i.beginPath(),i.arc(this.xCenter,this.yCenter,o,0,2*Math.PI),i.closePath(),i.stroke();else{i.beginPath();for(var r=0;r<this.getValueCount();r++){var l=this.getPointPosition(r,this.getDistanceFromCenterForValue(this.ticks[s]));0===r?i.moveTo(l.x,l.y):i.lineTo(l.x,l.y)}i.closePath(),i.stroke()}if(this.options.ticks.display){var h=e.getValueOrDefault(this.options.ticks.fontColor,t.defaults.global.defaultFontColor),c=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),d=e.getValueOrDefault(this.options.ticks.fontStyle,t.defaults.global.defaultFontStyle),u=e.getValueOrDefault(this.options.ticks.fontFamily,t.defaults.global.defaultFontFamily),g=e.fontString(c,d,u);if(i.font=g,this.options.ticks.showLabelBackdrop){var f=i.measureText(a).width;i.fillStyle=this.options.ticks.backdropColor,i.fillRect(this.xCenter-f/2-this.options.ticks.backdropPaddingX,n-c/2-this.options.ticks.backdropPaddingY,f+2*this.options.ticks.backdropPaddingX,c+2*this.options.ticks.backdropPaddingY)}i.textAlign="center",i.textBaseline="middle",i.fillStyle=h,i.fillText(a,this.xCenter,n)}}},this),!this.options.lineArc){i.lineWidth=this.options.angleLines.lineWidth,i.strokeStyle=this.options.angleLines.color;for(var a=this.getValueCount()-1;a>=0;a--){if(this.options.angleLines.display){var s=this.getPointPosition(a,this.getDistanceFromCenterForValue(this.options.reverse?this.min:this.max));i.beginPath(),i.moveTo(this.xCenter,this.yCenter),i.lineTo(s.x,s.y),i.stroke(),i.closePath()}var o=this.getPointPosition(a,this.getDistanceFromCenterForValue(this.options.reverse?this.min:this.max)+5),n=e.getValueOrDefault(this.options.pointLabels.fontColor,t.defaults.global.defaultFontColor),r=e.getValueOrDefault(this.options.pointLabels.fontSize,t.defaults.global.defaultFontSize),l=e.getValueOrDefault(this.options.pointLabels.fontStyle,t.defaults.global.defaultFontStyle),h=e.getValueOrDefault(this.options.pointLabels.fontFamily,t.defaults.global.defaultFontFamily),c=e.fontString(r,l,h);i.font=c,i.fillStyle=n;var d=this.pointLabels.length,u=this.pointLabels.length/2,g=u/2,f=g>a||a>d-g,m=a===g||a===d-g;0===a?i.textAlign="center":a===u?i.textAlign="center":u>a?i.textAlign="left":i.textAlign="right",m?i.textBaseline="middle":f?i.textBaseline="bottom":i.textBaseline="top",i.fillText(this.pointLabels[a]?this.pointLabels[a]:"",o.x,o.y)}}}}});t.scaleService.registerScaleType("radialLinear",a,i)}},{}],41:[function(t,e,i){"use strict";var a=t("moment");a="function"==typeof a?a:window.moment,e.exports=function(t){var e=t.helpers,i={units:[{name:"millisecond",steps:[1,2,5,10,20,50,100,250,500]},{name:"second",steps:[1,2,5,10,30]},{name:"minute",steps:[1,2,5,10,30]},{name:"hour",steps:[1,2,3,6,12]},{name:"day",steps:[1,2,5]},{name:"week",maxStep:4},{name:"month",maxStep:3},{name:"quarter",maxStep:4},{name:"year",maxStep:!1}]},s={position:"bottom",time:{parser:!1,format:!1,unit:!1,round:!1,displayFormat:!1,displayFormats:{millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm:ss a",hour:"MMM D, hA",day:"ll",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"}},ticks:{autoSkip:!1}},o=t.Scale.extend({initialize:function(){if(!a)throw new Error("Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at https://momentjs.com");t.Scale.prototype.initialize.call(this)},getLabelMoment:function(t,e){return this.labelMoments[t][e]},determineDataLimits:function(){this.labelMoments=[];var t=[];this.chart.data.labels&&this.chart.data.labels.length>0?(e.each(this.chart.data.labels,function(e,i){var a=this.parseTime(e);this.options.time.round&&a.startOf(this.options.time.round),
-t.push(a)},this),this.firstTick=a.min.call(this,t),this.lastTick=a.max.call(this,t)):(this.firstTick=null,this.lastTick=null),e.each(this.chart.data.datasets,function(i,s){var o=[];"object"==typeof i.data[0]?e.each(i.data,function(t,e){var i=this.parseTime(this.getRightValue(t));this.options.time.round&&i.startOf(this.options.time.round),o.push(i),this.firstTick=null!==this.firstTick?a.min(this.firstTick,i):i,this.lastTick=null!==this.lastTick?a.max(this.lastTick,i):i},this):o=t,this.labelMoments.push(o)},this),this.options.time.min&&(this.firstTick=this.parseTime(this.options.time.min)),this.options.time.max&&(this.lastTick=this.parseTime(this.options.time.max)),this.firstTick=(this.firstTick||a()).clone(),this.lastTick=(this.lastTick||a()).clone()},buildTicks:function(a){if(this.ticks=[],this.unitScale=1,this.scaleSizeInUnits=0,this.options.time.unit)this.tickUnit=this.options.time.unit||"day",this.displayFormat=this.options.time.displayFormats[this.tickUnit],this.scaleSizeInUnits=this.lastTick.diff(this.firstTick,this.tickUnit,!0),this.unitScale=e.getValueOrDefault(this.options.time.unitStepSize,1);else{var s=e.getValueOrDefault(this.options.ticks.fontSize,t.defaults.global.defaultFontSize),o=this.isHorizontal()?this.width-(this.paddingLeft+this.paddingRight):this.height-(this.paddingTop+this.paddingBottom),n=this.tickFormatFunction(this.firstTick,0,[]),r=n.length*s,l=Math.cos(e.toRadians(this.options.ticks.maxRotation)),h=Math.sin(e.toRadians(this.options.ticks.maxRotation));r=r*l+s*h;var c=o/(r+10);this.tickUnit="millisecond",this.scaleSizeInUnits=this.lastTick.diff(this.firstTick,this.tickUnit,!0),this.displayFormat=this.options.time.displayFormats[this.tickUnit];for(var d=0,u=i.units[d];d<i.units.length;){if(this.unitScale=1,e.isArray(u.steps)&&Math.ceil(this.scaleSizeInUnits/c)<e.max(u.steps)){for(var g=0;g<u.steps.length;++g)if(u.steps[g]>Math.ceil(this.scaleSizeInUnits/c)){this.unitScale=e.getValueOrDefault(this.options.time.unitStepSize,u.steps[g]);break}break}if(u.maxStep===!1||Math.ceil(this.scaleSizeInUnits/c)<u.maxStep){this.unitScale=e.getValueOrDefault(this.options.time.unitStepSize,Math.ceil(this.scaleSizeInUnits/c));break}++d,u=i.units[d],this.tickUnit=u.name,this.scaleSizeInUnits=this.lastTick.diff(this.firstTick,this.tickUnit,!0),this.displayFormat=this.options.time.displayFormats[u.name]}}var f;this.options.time.min?f=this.firstTick.clone().startOf(this.tickUnit):(this.firstTick.startOf(this.tickUnit),f=this.firstTick),this.options.time.max||this.lastTick.endOf(this.tickUnit),this.smallestLabelSeparation=this.width,e.each(this.chart.data.datasets,function(t,e){for(var i=1;i<this.labelMoments[e].length;i++)this.smallestLabelSeparation=Math.min(this.smallestLabelSeparation,this.labelMoments[e][i].diff(this.labelMoments[e][i-1],this.tickUnit,!0))},this),this.options.time.displayFormat&&(this.displayFormat=this.options.time.displayFormat),this.ticks.push(this.firstTick.clone());for(var m=1;m<this.scaleSizeInUnits;++m){var p=f.clone().add(m,this.tickUnit);if(this.options.time.max&&p.diff(this.lastTick,this.tickUnit,!0)>=0)break;m%this.unitScale===0&&this.ticks.push(p)}(0!==this.ticks[this.ticks.length-1].diff(this.lastTick,this.tickUnit)||0===this.scaleSizeInUnits)&&(this.options.time.max?(this.ticks.push(this.lastTick.clone()),this.scaleSizeInUnits=this.lastTick.diff(this.ticks[0],this.tickUnit,!0)):(this.scaleSizeInUnits=Math.ceil(this.scaleSizeInUnits/this.unitScale)*this.unitScale,this.ticks.push(this.firstTick.clone().add(this.scaleSizeInUnits,this.tickUnit)),this.lastTick=this.ticks[this.ticks.length-1].clone()))},getLabelForIndex:function(t,e){var i=this.chart.data.labels&&t<this.chart.data.labels.length?this.chart.data.labels[t]:"";return"object"==typeof this.chart.data.datasets[e].data[0]&&(i=this.getRightValue(this.chart.data.datasets[e].data[t])),this.options.time.tooltipFormat&&(i=this.parseTime(i).format(this.options.time.tooltipFormat)),i},tickFormatFunction:function(t,e,i){var a=t.format(this.displayFormat);return this.options.ticks.userCallback?this.options.ticks.userCallback(a,e,i):a},convertTicksToLabels:function(){this.ticks=this.ticks.map(this.tickFormatFunction,this)},getPixelForValue:function(t,e,i,a){var s=this.getLabelMoment(i,e);if(s){var o=s.diff(this.firstTick,this.tickUnit,!0),n=o/this.scaleSizeInUnits;if(this.isHorizontal()){var r=this.width-(this.paddingLeft+this.paddingRight),l=(r/Math.max(this.ticks.length-1,1),r*n+this.paddingLeft);return this.left+Math.round(l)}var h=this.height-(this.paddingTop+this.paddingBottom),c=(h/Math.max(this.ticks.length-1,1),h*n+this.paddingTop);return this.top+Math.round(c)}},parseTime:function(t){return"string"==typeof this.options.time.parser?a(t,this.options.time.parser):"function"==typeof this.options.time.parser?this.options.time.parser(t):"function"==typeof t.getMonth||"number"==typeof t?a(t):t.isValid&&t.isValid()?t:"string"!=typeof this.options.time.format&&this.options.time.format.call?(console.warn("options.time.format is deprecated and replaced by options.time.parser. See http://nnnick.github.io/Chart.js/docs-v2/#scales-time-scale"),this.options.time.format(t)):a(t,this.options.time.format)}});t.scaleService.registerScaleType("time",o,s)}},{moment:1}]},{},[7]);
\ No newline at end of file
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).Chart=t()}}(function(){return function t(e,n,i){function a(r,l){if(!n[r]){if(!e[r]){var s="function"==typeof require&&require;if(!l&&s)return s(r,!0);if(o)return o(r,!0);var u=new Error("Cannot find module '"+r+"'");throw u.code="MODULE_NOT_FOUND",u}var d=n[r]={exports:{}};e[r][0].call(d.exports,function(t){var n=e[r][1][t];return a(n||t)},d,d.exports,t,e,n,i)}return n[r].exports}for(var o="function"==typeof require&&require,r=0;r<i.length;r++)a(i[r]);return a}({1:[function(t,e,n){},{}],2:[function(t,e,n){function i(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3})$/i);if(i){i=i[1];for(a=0;a<e.length;a++)e[a]=parseInt(i[a]+i[a],16)}else if(i=t.match(/^#([a-fA-F0-9]{6})$/i)){i=i[1];for(a=0;a<e.length;a++)e[a]=parseInt(i.slice(2*a,2*a+2),16)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(a=0;a<e.length;a++)e[a]=parseInt(i[a+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(a=0;a<e.length;a++)e[a]=Math.round(2.55*parseFloat(i[a+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=c[i[1]]))return}for(var a=0;a<e.length;a++)e[a]=u(e[a],0,255);return n=n||0==n?u(n,0,1):1,e[3]=n,e}}function a(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[u(parseInt(e[1]),0,360),u(parseFloat(e[2]),0,100),u(parseFloat(e[3]),0,100),u(isNaN(n)?1:n,0,1)]}}}function o(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[u(parseInt(e[1]),0,360),u(parseFloat(e[2]),0,100),u(parseFloat(e[3]),0,100),u(isNaN(n)?1:n,0,1)]}}}function r(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function l(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function s(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function u(t,e,n){return Math.min(Math.max(e,t),n)}function d(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var c=t(6);e.exports={getRgba:i,getHsla:a,getRgb:function(t){var e=i(t);return e&&e.slice(0,3)},getHsl:function(t){var e=a(t);return e&&e.slice(0,3)},getHwb:o,getAlpha:function(t){var e=i(t);return e?e[3]:(e=a(t))?e[3]:(e=o(t))?e[3]:void 0},hexString:function(t){return"#"+d(t[0])+d(t[1])+d(t[2])},rgbString:function(t,e){return e<1||t[3]&&t[3]<1?r(t,e):"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:r,percentString:function(t,e){return e<1||t[3]&&t[3]<1?l(t,e):"rgb("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%)"},percentaString:l,hslString:function(t,e){return e<1||t[3]&&t[3]<1?s(t,e):"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:s,hwbString:function(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return h[t.slice(0,3)]}};var h={};for(var f in c)h[c[f]]=f},{6:6}],3:[function(t,e,n){var i=t(5),a=t(2),o=function(t){if(t instanceof o)return t;if(!(this instanceof o))return new o(t);this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1};var e;"string"==typeof t?(e=a.getRgba(t))?this.setValues("rgb",e):(e=a.getHsla(t))?this.setValues("hsl",e):(e=a.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e))};o.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return a.hexString(this.values.rgb)},rgbString:function(){return a.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return a.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return a.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return a.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return a.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return a.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return a.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=this,i=t,a=void 0===e?.5:e,o=2*a-1,r=n.alpha()-i.alpha(),l=((o*r==-1?o:(o+r)/(1+o*r))+1)/2,s=1-l;return this.rgb(l*n.red()+s*i.red(),l*n.green()+s*i.green(),l*n.blue()+s*i.blue()).alpha(n.alpha()*a+i.alpha()*(1-a))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new o,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},o.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},o.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},o.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},o.prototype.setValues=function(t,e){var n,a=this.values,o=this.spaces,r=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[o[t][0]]){var s=o[t];for(n=0;n<t.length;n++)a[t][n]=e[s[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;var u;for(n=0;n<t.length;n++)u=Math.max(0,Math.min(r[t][n],a[t][n])),a[t][n]=Math.round(u);for(var d in o)d!==t&&(a[d]=i[t][d](a[t]));return!0},o.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},o.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=o),e.exports=o},{2:2,5:5}],4:[function(t,e,n){function i(t){var e,n,i,a=t[0]/255,o=t[1]/255,r=t[2]/255,l=Math.min(a,o,r),s=Math.max(a,o,r),u=s-l;return s==l?e=0:a==s?e=(o-r)/u:o==s?e=2+(r-a)/u:r==s&&(e=4+(a-o)/u),(e=Math.min(60*e,360))<0&&(e+=360),i=(l+s)/2,n=s==l?0:i<=.5?u/(s+l):u/(2-s-l),[e,100*n,100*i]}function a(t){var e,n,i,a=t[0],o=t[1],r=t[2],l=Math.min(a,o,r),s=Math.max(a,o,r),u=s-l;return n=0==s?0:u/s*1e3/10,s==l?e=0:a==s?e=(o-r)/u:o==s?e=2+(r-a)/u:r==s&&(e=4+(a-o)/u),(e=Math.min(60*e,360))<0&&(e+=360),i=s/255*1e3/10,[e,n,i]}function o(t){var e=t[0],n=t[1],a=t[2];return[i(t)[0],100*(1/255*Math.min(e,Math.min(n,a))),100*(a=1-1/255*Math.max(e,Math.max(n,a)))]}function l(t){var e,n,i,a,o=t[0]/255,r=t[1]/255,l=t[2]/255;return a=Math.min(1-o,1-r,1-l),e=(1-o-a)/(1-a)||0,n=(1-r-a)/(1-a)||0,i=(1-l-a)/(1-a)||0,[100*e,100*n,100*i,100*a]}function s(t){return C[JSON.stringify(t)]}function u(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]}function d(t){var e,n,i,a=u(t),o=a[0],r=a[1],l=a[2];return o/=95.047,r/=100,l/=108.883,o=o>.008856?Math.pow(o,1/3):7.787*o+16/116,r=r>.008856?Math.pow(r,1/3):7.787*r+16/116,l=l>.008856?Math.pow(l,1/3):7.787*l+16/116,e=116*r-16,n=500*(o-r),i=200*(r-l),[e,n,i]}function c(t){var e,n,i,a,o,r=t[0]/360,l=t[1]/100,s=t[2]/100;if(0==l)return o=255*s,[o,o,o];e=2*s-(n=s<.5?s*(1+l):s+l-s*l),a=[0,0,0];for(var u=0;u<3;u++)(i=r+1/3*-(u-1))<0&&i++,i>1&&i--,o=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*o;return a}function h(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,o=e-Math.floor(e),r=255*i*(1-n),l=255*i*(1-n*o),s=255*i*(1-n*(1-o)),i=255*i;switch(a){case 0:return[i,s,r];case 1:return[l,i,r];case 2:return[r,i,s];case 3:return[r,l,i];case 4:return[s,r,i];case 5:return[i,r,l]}}function f(t){var e,n,i,a,o=t[0]/360,l=t[1]/100,s=t[2]/100,u=l+s;switch(u>1&&(l/=u,s/=u),e=Math.floor(6*o),n=1-s,i=6*o-e,0!=(1&e)&&(i=1-i),a=l+i*(n-l),e){default:case 6:case 0:r=n,g=a,b=l;break;case 1:r=a,g=n,b=l;break;case 2:r=l,g=n,b=a;break;case 3:r=l,g=a,b=n;break;case 4:r=a,g=l,b=n;break;case 5:r=n,g=l,b=a}return[255*r,255*g,255*b]}function p(t){var e,n,i,a=t[0]/100,o=t[1]/100,r=t[2]/100,l=t[3]/100;return e=1-Math.min(1,a*(1-l)+l),n=1-Math.min(1,o*(1-l)+l),i=1-Math.min(1,r*(1-l)+l),[255*e,255*n,255*i]}function v(t){var e,n,i,a=t[0]/100,o=t[1]/100,r=t[2]/100;return e=3.2406*a+-1.5372*o+-.4986*r,n=-.9689*a+1.8758*o+.0415*r,i=.0557*a+-.204*o+1.057*r,e=e>.0031308?1.055*Math.pow(e,1/2.4)-.055:e*=12.92,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:n*=12.92,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:i*=12.92,e=Math.min(Math.max(0,e),1),n=Math.min(Math.max(0,n),1),i=Math.min(Math.max(0,i),1),[255*e,255*n,255*i]}function m(t){var e,n,i,a=t[0],o=t[1],r=t[2];return a/=95.047,o/=100,r/=108.883,a=a>.008856?Math.pow(a,1/3):7.787*a+16/116,o=o>.008856?Math.pow(o,1/3):7.787*o+16/116,r=r>.008856?Math.pow(r,1/3):7.787*r+16/116,e=116*o-16,n=500*(a-o),i=200*(o-r),[e,n,i]}function x(t){var e,n,i,a,o=t[0],r=t[1],l=t[2];return o<=8?a=(n=100*o/903.3)/100*7.787+16/116:(n=100*Math.pow((o+16)/116,3),a=Math.pow(n/100,1/3)),e=e/95.047<=.008856?e=95.047*(r/500+a-16/116)/7.787:95.047*Math.pow(r/500+a,3),i=i/108.883<=.008859?i=108.883*(a-l/200-16/116)/7.787:108.883*Math.pow(a-l/200,3),[e,n,i]}function y(t){var e,n,i,a=t[0],o=t[1],r=t[2];return e=Math.atan2(r,o),(n=360*e/2/Math.PI)<0&&(n+=360),i=Math.sqrt(o*o+r*r),[a,i,n]}function k(t){return v(x(t))}function w(t){var e,n,i,a=t[0],o=t[1];return i=t[2]/360*2*Math.PI,e=o*Math.cos(i),n=o*Math.sin(i),[a,e,n]}function M(t){return S[t]}e.exports={rgb2hsl:i,rgb2hsv:a,rgb2hwb:o,rgb2cmyk:l,rgb2keyword:s,rgb2xyz:u,rgb2lab:d,rgb2lch:function(t){return y(d(t))},hsl2rgb:c,hsl2hsv:function(t){var e,n,i=t[0],a=t[1]/100,o=t[2]/100;return 0===o?[0,0,0]:(o*=2,a*=o<=1?o:2-o,n=(o+a)/2,e=2*a/(o+a),[i,100*e,100*n])},hsl2hwb:function(t){return o(c(t))},hsl2cmyk:function(t){return l(c(t))},hsl2keyword:function(t){return s(c(t))},hsv2rgb:h,hsv2hsl:function(t){var e,n,i=t[0],a=t[1]/100,o=t[2]/100;return n=(2-a)*o,e=a*o,e/=n<=1?n:2-n,e=e||0,n/=2,[i,100*e,100*n]},hsv2hwb:function(t){return o(h(t))},hsv2cmyk:function(t){return l(h(t))},hsv2keyword:function(t){return s(h(t))},hwb2rgb:f,hwb2hsl:function(t){return i(f(t))},hwb2hsv:function(t){return a(f(t))},hwb2cmyk:function(t){return l(f(t))},hwb2keyword:function(t){return s(f(t))},cmyk2rgb:p,cmyk2hsl:function(t){return i(p(t))},cmyk2hsv:function(t){return a(p(t))},cmyk2hwb:function(t){return o(p(t))},cmyk2keyword:function(t){return s(p(t))},keyword2rgb:M,keyword2hsl:function(t){return i(M(t))},keyword2hsv:function(t){return a(M(t))},keyword2hwb:function(t){return o(M(t))},keyword2cmyk:function(t){return l(M(t))},keyword2lab:function(t){return d(M(t))},keyword2xyz:function(t){return u(M(t))},xyz2rgb:v,xyz2lab:m,xyz2lch:function(t){return y(m(t))},lab2xyz:x,lab2rgb:k,lab2lch:y,lch2lab:w,lch2xyz:function(t){return x(w(t))},lch2rgb:function(t){return k(w(t))}};var S={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},C={};for(var _ in S)C[JSON.stringify(S[_])]=_},{}],5:[function(t,e,n){var i=t(4),a=function(){return new u};for(var o in i){a[o+"Raw"]=function(t){return function(e){return"number"==typeof e&&(e=Array.prototype.slice.call(arguments)),i[t](e)}}(o);var r=/(\w+)2(\w+)/.exec(o),l=r[1],s=r[2];(a[l]=a[l]||{})[s]=a[o]=function(t){return function(e){"number"==typeof e&&(e=Array.prototype.slice.call(arguments));var n=i[t](e);if("string"==typeof n||void 0===n)return n;for(var a=0;a<n.length;a++)n[a]=Math.round(n[a]);return n}}(o)}var u=function(){this.convs={}};u.prototype.routeSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n))},u.prototype.setValues=function(t,e){return this.space=t,this.convs={},this.convs[t]=e,this},u.prototype.getValues=function(t){var e=this.convs[t];if(!e){var n=this.space,i=this.convs[n];e=a[n][t](i),this.convs[t]=e}return e},["rgb","hsl","hsv","cmyk","keyword"].forEach(function(t){u.prototype[t]=function(e){return this.routeSpace(t,arguments)}}),e.exports=a},{4:4}],6:[function(t,e,n){"use strict";e.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}},{}],7:[function(t,e,n){var i=t(29)();i.helpers=t(45),t(27)(i),i.defaults=t(25),i.Element=t(26),i.elements=t(40),i.Interaction=t(28),i.platform=t(48),t(31)(i),t(22)(i),t(23)(i),t(24)(i),t(30)(i),t(33)(i),t(32)(i),t(35)(i),t(54)(i),t(52)(i),t(53)(i),t(55)(i),t(56)(i),t(57)(i),t(15)(i),t(16)(i),t(17)(i),t(18)(i),t(19)(i),t(20)(i),t(21)(i),t(8)(i),t(9)(i),t(10)(i),t(11)(i),t(12)(i),t(13)(i),t(14)(i);var a=[];a.push(t(49)(i),t(50)(i),t(51)(i)),i.plugins.register(a),i.platform.initialize(),e.exports=i,"undefined"!=typeof window&&(window.Chart=i),i.canvasHelpers=i.helpers.canvas},{10:10,11:11,12:12,13:13,14:14,15:15,16:16,17:17,18:18,19:19,20:20,21:21,22:22,23:23,24:24,25:25,26:26,27:27,28:28,29:29,30:30,31:31,32:32,33:33,35:35,40:40,45:45,48:48,49:49,50:50,51:51,52:52,53:53,54:54,55:55,56:56,57:57,8:8,9:9}],8:[function(t,e,n){"use strict";e.exports=function(t){t.Bar=function(e,n){return n.type="bar",new t(e,n)}}},{}],9:[function(t,e,n){"use strict";e.exports=function(t){t.Bubble=function(e,n){return n.type="bubble",new t(e,n)}}},{}],10:[function(t,e,n){"use strict";e.exports=function(t){t.Doughnut=function(e,n){return n.type="doughnut",new t(e,n)}}},{}],11:[function(t,e,n){"use strict";e.exports=function(t){t.Line=function(e,n){return n.type="line",new t(e,n)}}},{}],12:[function(t,e,n){"use strict";e.exports=function(t){t.PolarArea=function(e,n){return n.type="polarArea",new t(e,n)}}},{}],13:[function(t,e,n){"use strict";e.exports=function(t){t.Radar=function(e,n){return n.type="radar",new t(e,n)}}},{}],14:[function(t,e,n){"use strict";e.exports=function(t){t.Scatter=function(e,n){return n.type="scatter",new t(e,n)}}},{}],15:[function(t,e,n){"use strict";var i=t(25),a=t(40),o=t(45);i._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",categoryPercentage:.8,barPercentage:.9,offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),i._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{position:"left",type:"category",categoryPercentage:.8,barPercentage:.9,offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{callbacks:{title:function(t,e){var n="";return t.length>0&&(t[0].yLabel?n=t[0].yLabel:e.labels.length>0&&t[0].index<e.labels.length&&(n=e.labels[t[0].index])),n},label:function(t,e){return(e.datasets[t.datasetIndex].label||"")+": "+t.xLabel}},mode:"index",axis:"y"}}),e.exports=function(t){t.controllers.bar=t.DatasetController.extend({dataElementType:a.Rectangle,initialize:function(){var e,n=this;t.DatasetController.prototype.initialize.apply(n,arguments),(e=n.getMeta()).stack=n.getDataset().stack,e.bar=!0},update:function(t){var e,n,i=this,a=i.getMeta().data;for(i._ruler=i.getRuler(),e=0,n=a.length;e<n;++e)i.updateElement(a[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getMeta(),l=i.getDataset(),s=t.custom||{},u=a.options.elements.rectangle;t._xScale=i.getScaleForId(r.xAxisID),t._yScale=i.getScaleForId(r.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={datasetLabel:l.label,label:a.data.labels[e],borderSkipped:s.borderSkipped?s.borderSkipped:u.borderSkipped,backgroundColor:s.backgroundColor?s.backgroundColor:o.valueAtIndexOrDefault(l.backgroundColor,e,u.backgroundColor),borderColor:s.borderColor?s.borderColor:o.valueAtIndexOrDefault(l.borderColor,e,u.borderColor),borderWidth:s.borderWidth?s.borderWidth:o.valueAtIndexOrDefault(l.borderWidth,e,u.borderWidth)},i.updateElementGeometry(t,e,n),t.pivot()},updateElementGeometry:function(t,e,n){var i=this,a=t._model,o=i.getValueScale(),r=o.getBasePixel(),l=o.isHorizontal(),s=i._ruler||i.getRuler(),u=i.calculateBarValuePixels(i.index,e),d=i.calculateBarIndexPixels(i.index,e,s);a.horizontal=l,a.base=n?r:u.base,a.x=l?n?r:u.head:d.center,a.y=l?d.center:n?r:u.head,a.height=l?d.size:void 0,a.width=l?void 0:d.size},getValueScaleId:function(){return this.getMeta().yAxisID},getIndexScaleId:function(){return this.getMeta().xAxisID},getValueScale:function(){return this.getScaleForId(this.getValueScaleId())},getIndexScale:function(){return this.getScaleForId(this.getIndexScaleId())},getStackCount:function(t){var e,n,i=this,a=i.chart,o=i.getIndexScale().options.stacked,r=void 0===t?a.data.datasets.length:t+1,l=[];for(e=0;e<r;++e)(n=a.getDatasetMeta(e)).bar&&a.isDatasetVisible(e)&&(!1===o||!0===o&&-1===l.indexOf(n.stack)||void 0===o&&(void 0===n.stack||-1===l.indexOf(n.stack)))&&l.push(n.stack);return l.length},getStackIndex:function(t){return this.getStackCount(t)-1},getRuler:function(){var t,e,n=this,i=n.getIndexScale(),a=n.getStackCount(),o=n.index,r=[],l=i.isHorizontal(),s=l?i.left:i.top,u=s+(l?i.width:i.height);for(t=0,e=n.getMeta().data.length;t<e;++t)r.push(i.getPixelForValue(null,t,o));return{pixels:r,start:s,end:u,stackCount:a,scale:i}},calculateBarValuePixels:function(t,e){var n,i,a,o,r,l,s=this,u=s.chart,d=s.getMeta(),c=s.getValueScale(),h=u.data.datasets,f=c.getRightValue(h[t].data[e]),g=c.options.stacked,p=d.stack,v=0;if(g||void 0===g&&void 0!==p)for(n=0;n<t;++n)(i=u.getDatasetMeta(n)).bar&&i.stack===p&&i.controller.getValueScaleId()===c.id&&u.isDatasetVisible(n)&&(a=c.getRightValue(h[n].data[e]),(f<0&&a<0||f>=0&&a>0)&&(v+=a));return o=c.getPixelForValue(v),r=c.getPixelForValue(v+f),l=(r-o)/2,{size:l,base:o,head:r,center:r+l/2}},calculateBarIndexPixels:function(t,e,n){var i,a,r,l,s,u,d=this,c=n.scale.options,h=d.getStackIndex(t),f=n.pixels,g=f[e],p=f.length,v=n.start,m=n.end;return 1===p?(i=g>v?g-v:m-g,a=g<m?m-g:g-v):(e>0&&(i=(g-f[e-1])/2,e===p-1&&(a=i)),e<p-1&&(a=(f[e+1]-g)/2,0===e&&(i=a))),r=i*c.categoryPercentage,l=a*c.categoryPercentage,s=(r+l)/n.stackCount,u=s*c.barPercentage,u=Math.min(o.valueOrDefault(c.barThickness,u),o.valueOrDefault(c.maxBarThickness,1/0)),g-=r,g+=s*h,g+=(s-u)/2,{size:u,base:g,head:g+u,center:g+u/2}},draw:function(){var t=this,e=t.chart,n=t.getValueScale(),i=t.getMeta().data,a=t.getDataset(),r=i.length,l=0;for(o.canvas.clipArea(e.ctx,e.chartArea);l<r;++l)isNaN(n.getRightValue(a.data[l]))||i[l].draw();o.canvas.unclipArea(e.ctx)},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model;a.backgroundColor=i.hoverBackgroundColor?i.hoverBackgroundColor:o.valueAtIndexOrDefault(e.hoverBackgroundColor,n,o.getHoverColor(a.backgroundColor)),a.borderColor=i.hoverBorderColor?i.hoverBorderColor:o.valueAtIndexOrDefault(e.hoverBorderColor,n,o.getHoverColor(a.borderColor)),a.borderWidth=i.hoverBorderWidth?i.hoverBorderWidth:o.valueAtIndexOrDefault(e.hoverBorderWidth,n,a.borderWidth)},removeHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=this.chart.options.elements.rectangle;a.backgroundColor=i.backgroundColor?i.backgroundColor:o.valueAtIndexOrDefault(e.backgroundColor,n,r.backgroundColor),a.borderColor=i.borderColor?i.borderColor:o.valueAtIndexOrDefault(e.borderColor,n,r.borderColor),a.borderWidth=i.borderWidth?i.borderWidth:o.valueAtIndexOrDefault(e.borderWidth,n,r.borderWidth)}}),t.controllers.horizontalBar=t.controllers.bar.extend({getValueScaleId:function(){return this.getMeta().xAxisID},getIndexScaleId:function(){return this.getMeta().yAxisID}})}},{25:25,40:40,45:45}],16:[function(t,e,n){"use strict";var i=t(25),a=t(40),o=t(45);i._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}}),e.exports=function(t){t.controllers.bubble=t.DatasetController.extend({dataElementType:a.Point,update:function(t){var e=this,n=e.getMeta().data;o.each(n,function(n,i){e.updateElement(n,i,t)})},updateElement:function(t,e,n){var i=this,a=i.getMeta(),o=t.custom||{},r=i.getScaleForId(a.xAxisID),l=i.getScaleForId(a.yAxisID),s=i._resolveElementOptions(t,e),u=i.getDataset().data[e],d=i.index,c=n?r.getPixelForDecimal(.5):r.getPixelForValue("object"==typeof u?u:NaN,e,d),h=n?l.getBasePixel():l.getPixelForValue(u,e,d);t._xScale=r,t._yScale=l,t._options=s,t._datasetIndex=d,t._index=e,t._model={backgroundColor:s.backgroundColor,borderColor:s.borderColor,borderWidth:s.borderWidth,hitRadius:s.hitRadius,pointStyle:s.pointStyle,radius:n?0:s.radius,skip:o.skip||isNaN(c)||isNaN(h),x:c,y:h},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options;e.backgroundColor=o.valueOrDefault(n.hoverBackgroundColor,o.getHoverColor(n.backgroundColor)),e.borderColor=o.valueOrDefault(n.hoverBorderColor,o.getHoverColor(n.borderColor)),e.borderWidth=o.valueOrDefault(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},removeHoverStyle:function(t){var e=t._model,n=t._options;e.backgroundColor=n.backgroundColor,e.borderColor=n.borderColor,e.borderWidth=n.borderWidth,e.radius=n.radius},_resolveElementOptions:function(t,e){var n,i,a,r=this,l=r.chart,s=l.data.datasets[r.index],u=t.custom||{},d=l.options.elements.point,c=o.options.resolve,h=s.data[e],f={},g={chart:l,dataIndex:e,dataset:s,datasetIndex:r.index},p=["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle"];for(n=0,i=p.length;n<i;++n)f[a=p[n]]=c([u[a],s[a],d[a]],g,e);return f.radius=c([u.radius,h?h.r:void 0,s.radius,d.radius],g,e),f}})}},{25:25,40:40,45:45}],17:[function(t,e,n){"use strict";var i=t(25),a=t(40),o=t(45);i._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e=[];e.push('<ul class="'+t.id+'-legend">');var n=t.data,i=n.datasets,a=n.labels;if(i.length)for(var o=0;o<i[0].data.length;++o)e.push('<li><span style="background-color:'+i[0].backgroundColor[o]+'"></span>'),a[o]&&e.push(a[o]),e.push("</li>");return e.push("</ul>"),e.join("")},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map(function(n,i){var a=t.getDatasetMeta(0),r=e.datasets[0],l=a.data[i],s=l&&l.custom||{},u=o.valueAtIndexOrDefault,d=t.options.elements.arc;return{text:n,fillStyle:s.backgroundColor?s.backgroundColor:u(r.backgroundColor,i,d.backgroundColor),strokeStyle:s.borderColor?s.borderColor:u(r.borderColor,i,d.borderColor),lineWidth:s.borderWidth?s.borderWidth:u(r.borderWidth,i,d.borderWidth),hidden:isNaN(r.data[i])||a.data[i].hidden,index:i}}):[]}},onClick:function(t,e){var n,i,a,o=e.index,r=this.chart;for(n=0,i=(r.data.datasets||[]).length;n<i;++n)(a=r.getDatasetMeta(n)).data[o]&&(a.data[o].hidden=!a.data[o].hidden);r.update()}},cutoutPercentage:50,rotation:-.5*Math.PI,circumference:2*Math.PI,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return o.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}}),i._set("pie",o.clone(i.doughnut)),i._set("pie",{cutoutPercentage:0}),e.exports=function(t){t.controllers.doughnut=t.controllers.pie=t.DatasetController.extend({dataElementType:a.Arc,linkScales:o.noop,getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e=this,n=e.chart,i=n.chartArea,a=n.options,r=a.elements.arc,l=i.right-i.left-r.borderWidth,s=i.bottom-i.top-r.borderWidth,u=Math.min(l,s),d={x:0,y:0},c=e.getMeta(),h=a.cutoutPercentage,f=a.circumference;if(f<2*Math.PI){var g=a.rotation%(2*Math.PI),p=(g+=2*Math.PI*(g>=Math.PI?-1:g<-Math.PI?1:0))+f,v={x:Math.cos(g),y:Math.sin(g)},m={x:Math.cos(p),y:Math.sin(p)},b=g<=0&&p>=0||g<=2*Math.PI&&2*Math.PI<=p,x=g<=.5*Math.PI&&.5*Math.PI<=p||g<=2.5*Math.PI&&2.5*Math.PI<=p,y=g<=-Math.PI&&-Math.PI<=p||g<=Math.PI&&Math.PI<=p,k=g<=.5*-Math.PI&&.5*-Math.PI<=p||g<=1.5*Math.PI&&1.5*Math.PI<=p,w=h/100,M={x:y?-1:Math.min(v.x*(v.x<0?1:w),m.x*(m.x<0?1:w)),y:k?-1:Math.min(v.y*(v.y<0?1:w),m.y*(m.y<0?1:w))},S={x:b?1:Math.max(v.x*(v.x>0?1:w),m.x*(m.x>0?1:w)),y:x?1:Math.max(v.y*(v.y>0?1:w),m.y*(m.y>0?1:w))},C={width:.5*(S.x-M.x),height:.5*(S.y-M.y)};u=Math.min(l/C.width,s/C.height),d={x:-.5*(S.x+M.x),y:-.5*(S.y+M.y)}}n.borderWidth=e.getMaxBorderWidth(c.data),n.outerRadius=Math.max((u-n.borderWidth)/2,0),n.innerRadius=Math.max(h?n.outerRadius/100*h:0,0),n.radiusLength=(n.outerRadius-n.innerRadius)/n.getVisibleDatasetCount(),n.offsetX=d.x*n.outerRadius,n.offsetY=d.y*n.outerRadius,c.total=e.calculateTotal(),e.outerRadius=n.outerRadius-n.radiusLength*e.getRingIndex(e.index),e.innerRadius=Math.max(e.outerRadius-n.radiusLength,0),o.each(c.data,function(n,i){e.updateElement(n,i,t)})},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,l=a.options,s=l.animation,u=(r.left+r.right)/2,d=(r.top+r.bottom)/2,c=l.rotation,h=l.rotation,f=i.getDataset(),g=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(f.data[e])*(l.circumference/(2*Math.PI)),p=n&&s.animateScale?0:i.innerRadius,v=n&&s.animateScale?0:i.outerRadius,m=o.valueAtIndexOrDefault;o.extend(t,{_datasetIndex:i.index,_index:e,_model:{x:u+a.offsetX,y:d+a.offsetY,startAngle:c,endAngle:h,circumference:g,outerRadius:v,innerRadius:p,label:m(f.label,e,a.data.labels[e])}});var b=t._model;this.removeHoverStyle(t),n&&s.animateRotate||(b.startAngle=0===e?l.rotation:i.getMeta().data[e-1]._model.endAngle,b.endAngle=b.startAngle+b.circumference),t.pivot()},removeHoverStyle:function(e){t.DatasetController.prototype.removeHoverStyle.call(this,e,this.chart.options.elements.arc)},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return o.each(n.data,function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))}),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?2*Math.PI*(t/e):0},getMaxBorderWidth:function(t){for(var e,n,i=0,a=this.index,o=t.length,r=0;r<o;r++)e=t[r]._model?t[r]._model.borderWidth:0,i=(n=t[r]._chart?t[r]._chart.config.data.datasets[a].hoverBorderWidth:0)>(i=e>i?e:i)?n:i;return i}})}},{25:25,40:40,45:45}],18:[function(t,e,n){"use strict";var i=t(25),a=t(40),o=t(45);i._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}}),e.exports=function(t){function e(t,e){return o.valueOrDefault(t.showLine,e.showLines)}t.controllers.line=t.DatasetController.extend({datasetElementType:a.Line,dataElementType:a.Point,update:function(t){var n,i,a,r=this,l=r.getMeta(),s=l.dataset,u=l.data||[],d=r.chart.options,c=d.elements.line,h=r.getScaleForId(l.yAxisID),f=r.getDataset(),g=e(f,d);for(g&&(a=s.custom||{},void 0!==f.tension&&void 0===f.lineTension&&(f.lineTension=f.tension),s._scale=h,s._datasetIndex=r.index,s._children=u,s._model={spanGaps:f.spanGaps?f.spanGaps:d.spanGaps,tension:a.tension?a.tension:o.valueOrDefault(f.lineTension,c.tension),backgroundColor:a.backgroundColor?a.backgroundColor:f.backgroundColor||c.backgroundColor,borderWidth:a.borderWidth?a.borderWidth:f.borderWidth||c.borderWidth,borderColor:a.borderColor?a.borderColor:f.borderColor||c.borderColor,borderCapStyle:a.borderCapStyle?a.borderCapStyle:f.borderCapStyle||c.borderCapStyle,borderDash:a.borderDash?a.borderDash:f.borderDash||c.borderDash,borderDashOffset:a.borderDashOffset?a.borderDashOffset:f.borderDashOffset||c.borderDashOffset,borderJoinStyle:a.borderJoinStyle?a.borderJoinStyle:f.borderJoinStyle||c.borderJoinStyle,fill:a.fill?a.fill:void 0!==f.fill?f.fill:c.fill,steppedLine:a.steppedLine?a.steppedLine:o.valueOrDefault(f.steppedLine,c.stepped),cubicInterpolationMode:a.cubicInterpolationMode?a.cubicInterpolationMode:o.valueOrDefault(f.cubicInterpolationMode,c.cubicInterpolationMode)},s.pivot()),n=0,i=u.length;n<i;++n)r.updateElement(u[n],n,t);for(g&&0!==s._model.tension&&r.updateBezierControlPoints(),n=0,i=u.length;n<i;++n)u[n].pivot()},getPointBackgroundColor:function(t,e){var n=this.chart.options.elements.point.backgroundColor,i=this.getDataset(),a=t.custom||{};return a.backgroundColor?n=a.backgroundColor:i.pointBackgroundColor?n=o.valueAtIndexOrDefault(i.pointBackgroundColor,e,n):i.backgroundColor&&(n=i.backgroundColor),n},getPointBorderColor:function(t,e){var n=this.chart.options.elements.point.borderColor,i=this.getDataset(),a=t.custom||{};return a.borderColor?n=a.borderColor:i.pointBorderColor?n=o.valueAtIndexOrDefault(i.pointBorderColor,e,n):i.borderColor&&(n=i.borderColor),n},getPointBorderWidth:function(t,e){var n=this.chart.options.elements.point.borderWidth,i=this.getDataset(),a=t.custom||{};return isNaN(a.borderWidth)?!isNaN(i.pointBorderWidth)||o.isArray(i.pointBorderWidth)?n=o.valueAtIndexOrDefault(i.pointBorderWidth,e,n):isNaN(i.borderWidth)||(n=i.borderWidth):n=a.borderWidth,n},updateElement:function(t,e,n){var i,a,r=this,l=r.getMeta(),s=t.custom||{},u=r.getDataset(),d=r.index,c=u.data[e],h=r.getScaleForId(l.yAxisID),f=r.getScaleForId(l.xAxisID),g=r.chart.options.elements.point;void 0!==u.radius&&void 0===u.pointRadius&&(u.pointRadius=u.radius),void 0!==u.hitRadius&&void 0===u.pointHitRadius&&(u.pointHitRadius=u.hitRadius),i=f.getPixelForValue("object"==typeof c?c:NaN,e,d),a=n?h.getBasePixel():r.calculatePointY(c,e,d),t._xScale=f,t._yScale=h,t._datasetIndex=d,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:s.radius||o.valueAtIndexOrDefault(u.pointRadius,e,g.radius),pointStyle:s.pointStyle||o.valueAtIndexOrDefault(u.pointStyle,e,g.pointStyle),backgroundColor:r.getPointBackgroundColor(t,e),borderColor:r.getPointBorderColor(t,e),borderWidth:r.getPointBorderWidth(t,e),tension:l.dataset._model?l.dataset._model.tension:0,steppedLine:!!l.dataset._model&&l.dataset._model.steppedLine,hitRadius:s.hitRadius||o.valueAtIndexOrDefault(u.pointHitRadius,e,g.hitRadius)}},calculatePointY:function(t,e,n){var i,a,o,r=this,l=r.chart,s=r.getMeta(),u=r.getScaleForId(s.yAxisID),d=0,c=0;if(u.options.stacked){for(i=0;i<n;i++)if(a=l.data.datasets[i],"line"===(o=l.getDatasetMeta(i)).type&&o.yAxisID===u.id&&l.isDatasetVisible(i)){var h=Number(u.getRightValue(a.data[e]));h<0?c+=h||0:d+=h||0}var f=Number(u.getRightValue(t));return f<0?u.getPixelForValue(c+f):u.getPixelForValue(d+f)}return u.getPixelForValue(t)},updateBezierControlPoints:function(){function t(t,e,n){return Math.max(Math.min(t,n),e)}var e,n,i,a,r=this,l=r.getMeta(),s=r.chart.chartArea,u=l.data||[];if(l.dataset._model.spanGaps&&(u=u.filter(function(t){return!t._model.skip})),"monotone"===l.dataset._model.cubicInterpolationMode)o.splineCurveMonotone(u);else for(e=0,n=u.length;e<n;++e)i=u[e]._model,a=o.splineCurve(o.previousItem(u,e)._model,i,o.nextItem(u,e)._model,l.dataset._model.tension),i.controlPointPreviousX=a.previous.x,i.controlPointPreviousY=a.previous.y,i.controlPointNextX=a.next.x,i.controlPointNextY=a.next.y;if(r.chart.options.elements.line.capBezierPoints)for(e=0,n=u.length;e<n;++e)(i=u[e]._model).controlPointPreviousX=t(i.controlPointPreviousX,s.left,s.right),i.controlPointPreviousY=t(i.controlPointPreviousY,s.top,s.bottom),i.controlPointNextX=t(i.controlPointNextX,s.left,s.right),i.controlPointNextY=t(i.controlPointNextY,s.top,s.bottom)},draw:function(){var t=this,n=t.chart,i=t.getMeta(),a=i.data||[],r=n.chartArea,l=a.length,s=0;for(o.canvas.clipArea(n.ctx,r),e(t.getDataset(),n.options)&&i.dataset.draw(),o.canvas.unclipArea(n.ctx);s<l;++s)a[s].draw(r)},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model;a.radius=i.hoverRadius||o.valueAtIndexOrDefault(e.pointHoverRadius,n,this.chart.options.elements.point.hoverRadius),a.backgroundColor=i.hoverBackgroundColor||o.valueAtIndexOrDefault(e.pointHoverBackgroundColor,n,o.getHoverColor(a.backgroundColor)),a.borderColor=i.hoverBorderColor||o.valueAtIndexOrDefault(e.pointHoverBorderColor,n,o.getHoverColor(a.borderColor)),a.borderWidth=i.hoverBorderWidth||o.valueAtIndexOrDefault(e.pointHoverBorderWidth,n,a.borderWidth)},removeHoverStyle:function(t){var e=this,n=e.chart.data.datasets[t._datasetIndex],i=t._index,a=t.custom||{},r=t._model;void 0!==n.radius&&void 0===n.pointRadius&&(n.pointRadius=n.radius),r.radius=a.radius||o.valueAtIndexOrDefault(n.pointRadius,i,e.chart.options.elements.point.radius),r.backgroundColor=e.getPointBackgroundColor(t,i),r.borderColor=e.getPointBorderColor(t,i),r.borderWidth=e.getPointBorderWidth(t,i)}})}},{25:25,40:40,45:45}],19:[function(t,e,n){"use strict";var i=t(25),a=t(40),o=t(45);i._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e=[];e.push('<ul class="'+t.id+'-legend">');var n=t.data,i=n.datasets,a=n.labels;if(i.length)for(var o=0;o<i[0].data.length;++o)e.push('<li><span style="background-color:'+i[0].backgroundColor[o]+'"></span>'),a[o]&&e.push(a[o]),e.push("</li>");return e.push("</ul>"),e.join("")},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map(function(n,i){var a=t.getDatasetMeta(0),r=e.datasets[0],l=a.data[i].custom||{},s=o.valueAtIndexOrDefault,u=t.options.elements.arc;return{text:n,fillStyle:l.backgroundColor?l.backgroundColor:s(r.backgroundColor,i,u.backgroundColor),strokeStyle:l.borderColor?l.borderColor:s(r.borderColor,i,u.borderColor),lineWidth:l.borderWidth?l.borderWidth:s(r.borderWidth,i,u.borderWidth),hidden:isNaN(r.data[i])||a.data[i].hidden,index:i}}):[]}},onClick:function(t,e){var n,i,a,o=e.index,r=this.chart;for(n=0,i=(r.data.datasets||[]).length;n<i;++n)(a=r.getDatasetMeta(n)).data[o].hidden=!a.data[o].hidden;r.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}}),e.exports=function(t){t.controllers.polarArea=t.DatasetController.extend({dataElementType:a.Arc,linkScales:o.noop,update:function(t){var e=this,n=e.chart,i=n.chartArea,a=e.getMeta(),r=n.options,l=r.elements.arc,s=Math.min(i.right-i.left,i.bottom-i.top);n.outerRadius=Math.max((s-l.borderWidth/2)/2,0),n.innerRadius=Math.max(r.cutoutPercentage?n.outerRadius/100*r.cutoutPercentage:1,0),n.radiusLength=(n.outerRadius-n.innerRadius)/n.getVisibleDatasetCount(),e.outerRadius=n.outerRadius-n.radiusLength*e.index,e.innerRadius=e.outerRadius-n.radiusLength,a.count=e.countVisibleElements(),o.each(a.data,function(n,i){e.updateElement(n,i,t)})},updateElement:function(t,e,n){for(var i=this,a=i.chart,r=i.getDataset(),l=a.options,s=l.animation,u=a.scale,d=a.data.labels,c=i.calculateCircumference(r.data[e]),h=u.xCenter,f=u.yCenter,g=0,p=i.getMeta(),v=0;v<e;++v)isNaN(r.data[v])||p.data[v].hidden||++g;var m=l.startAngle,b=t.hidden?0:u.getDistanceFromCenterForValue(r.data[e]),x=m+c*g,y=x+(t.hidden?0:c),k=s.animateScale?0:u.getDistanceFromCenterForValue(r.data[e]);o.extend(t,{_datasetIndex:i.index,_index:e,_scale:u,_model:{x:h,y:f,innerRadius:0,outerRadius:n?k:b,startAngle:n&&s.animateRotate?m:x,endAngle:n&&s.animateRotate?m:y,label:o.valueAtIndexOrDefault(d,e,d[e])}}),i.removeHoverStyle(t),t.pivot()},removeHoverStyle:function(e){t.DatasetController.prototype.removeHoverStyle.call(this,e,this.chart.options.elements.arc)},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return o.each(e.data,function(e,i){isNaN(t.data[i])||e.hidden||n++}),n},calculateCircumference:function(t){var e=this.getMeta().count;return e>0&&!isNaN(t)?2*Math.PI/e:0}})}},{25:25,40:40,45:45}],20:[function(t,e,n){"use strict";var i=t(25),a=t(40),o=t(45);i._set("radar",{scale:{type:"radialLinear"},elements:{line:{tension:0}}}),e.exports=function(t){t.controllers.radar=t.DatasetController.extend({datasetElementType:a.Line,dataElementType:a.Point,linkScales:o.noop,update:function(t){var e=this,n=e.getMeta(),i=n.dataset,a=n.data,r=i.custom||{},l=e.getDataset(),s=e.chart.options.elements.line,u=e.chart.scale;void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),o.extend(n.dataset,{_datasetIndex:e.index,_scale:u,_children:a,_loop:!0,_model:{tension:r.tension?r.tension:o.valueOrDefault(l.lineTension,s.tension),backgroundColor:r.backgroundColor?r.backgroundColor:l.backgroundColor||s.backgroundColor,borderWidth:r.borderWidth?r.borderWidth:l.borderWidth||s.borderWidth,borderColor:r.borderColor?r.borderColor:l.borderColor||s.borderColor,fill:r.fill?r.fill:void 0!==l.fill?l.fill:s.fill,borderCapStyle:r.borderCapStyle?r.borderCapStyle:l.borderCapStyle||s.borderCapStyle,borderDash:r.borderDash?r.borderDash:l.borderDash||s.borderDash,borderDashOffset:r.borderDashOffset?r.borderDashOffset:l.borderDashOffset||s.borderDashOffset,borderJoinStyle:r.borderJoinStyle?r.borderJoinStyle:l.borderJoinStyle||s.borderJoinStyle}}),n.dataset.pivot(),o.each(a,function(n,i){e.updateElement(n,i,t)},e),e.updateBezierControlPoints()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),l=i.chart.scale,s=i.chart.options.elements.point,u=l.getPointPositionForValue(e,r.data[e]);void 0!==r.radius&&void 0===r.pointRadius&&(r.pointRadius=r.radius),void 0!==r.hitRadius&&void 0===r.pointHitRadius&&(r.pointHitRadius=r.hitRadius),o.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{x:n?l.xCenter:u.x,y:n?l.yCenter:u.y,tension:a.tension?a.tension:o.valueOrDefault(r.lineTension,i.chart.options.elements.line.tension),radius:a.radius?a.radius:o.valueAtIndexOrDefault(r.pointRadius,e,s.radius),backgroundColor:a.backgroundColor?a.backgroundColor:o.valueAtIndexOrDefault(r.pointBackgroundColor,e,s.backgroundColor),borderColor:a.borderColor?a.borderColor:o.valueAtIndexOrDefault(r.pointBorderColor,e,s.borderColor),borderWidth:a.borderWidth?a.borderWidth:o.valueAtIndexOrDefault(r.pointBorderWidth,e,s.borderWidth),pointStyle:a.pointStyle?a.pointStyle:o.valueAtIndexOrDefault(r.pointStyle,e,s.pointStyle),hitRadius:a.hitRadius?a.hitRadius:o.valueAtIndexOrDefault(r.pointHitRadius,e,s.hitRadius)}}),t._model.skip=a.skip?a.skip:isNaN(t._model.x)||isNaN(t._model.y)},updateBezierControlPoints:function(){var t=this.chart.chartArea,e=this.getMeta();o.each(e.data,function(n,i){var a=n._model,r=o.splineCurve(o.previousItem(e.data,i,!0)._model,a,o.nextItem(e.data,i,!0)._model,a.tension);a.controlPointPreviousX=Math.max(Math.min(r.previous.x,t.right),t.left),a.controlPointPreviousY=Math.max(Math.min(r.previous.y,t.bottom),t.top),a.controlPointNextX=Math.max(Math.min(r.next.x,t.right),t.left),a.controlPointNextY=Math.max(Math.min(r.next.y,t.bottom),t.top),n.pivot()})},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t.custom||{},i=t._index,a=t._model;a.radius=n.hoverRadius?n.hoverRadius:o.valueAtIndexOrDefault(e.pointHoverRadius,i,this.chart.options.elements.point.hoverRadius),a.backgroundColor=n.hoverBackgroundColor?n.hoverBackgroundColor:o.valueAtIndexOrDefault(e.pointHoverBackgroundColor,i,o.getHoverColor(a.backgroundColor)),a.borderColor=n.hoverBorderColor?n.hoverBorderColor:o.valueAtIndexOrDefault(e.pointHoverBorderColor,i,o.getHoverColor(a.borderColor)),a.borderWidth=n.hoverBorderWidth?n.hoverBorderWidth:o.valueAtIndexOrDefault(e.pointHoverBorderWidth,i,a.borderWidth)},removeHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t.custom||{},i=t._index,a=t._model,r=this.chart.options.elements.point;a.radius=n.radius?n.radius:o.valueAtIndexOrDefault(e.pointRadius,i,r.radius),a.backgroundColor=n.backgroundColor?n.backgroundColor:o.valueAtIndexOrDefault(e.pointBackgroundColor,i,r.backgroundColor),a.borderColor=n.borderColor?n.borderColor:o.valueAtIndexOrDefault(e.pointBorderColor,i,r.borderColor),a.borderWidth=n.borderWidth?n.borderWidth:o.valueAtIndexOrDefault(e.pointBorderWidth,i,r.borderWidth)}})}},{25:25,40:40,45:45}],21:[function(t,e,n){"use strict";t(25)._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},showLines:!1,tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),e.exports=function(t){t.controllers.scatter=t.controllers.line}},{25:25}],22:[function(t,e,n){"use strict";var i=t(25),a=t(26),o=t(45);i._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:o.noop,onComplete:o.noop}}),e.exports=function(t){t.Animation=a.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),t.animationService={frameDuration:17,animations:[],dropFrames:0,request:null,addAnimation:function(t,e,n,i){var a,o,r=this.animations;for(e.chart=t,i||(t.animating=!0),a=0,o=r.length;a<o;++a)if(r[a].chart===t)return void(r[a]=e);r.push(e),1===r.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=o.findIndex(this.animations,function(e){return e.chart===t});-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=o.requestAnimFrame.call(window,function(){t.request=null,t.startDigest()}))},startDigest:function(){var t=this,e=Date.now(),n=0;t.dropFrames>1&&(n=Math.floor(t.dropFrames),t.dropFrames=t.dropFrames%1),t.advance(1+n);var i=Date.now();t.dropFrames+=(i-e)/t.frameDuration,t.animations.length>0&&t.requestAnimationFrame()},advance:function(t){for(var e,n,i=this.animations,a=0;a<i.length;)n=(e=i[a]).chart,e.currentStep=(e.currentStep||0)+t,e.currentStep=Math.min(e.currentStep,e.numSteps),o.callback(e.render,[n,e],n),o.callback(e.onAnimationProgress,[e],n),e.currentStep>=e.numSteps?(o.callback(e.onAnimationComplete,[e],n),n.animating=!1,i.splice(a,1)):++a}},Object.defineProperty(t.Animation.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(t.Animation.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}})}},{25:25,26:26,45:45}],23:[function(t,e,n){"use strict";var i=t(25),a=t(45),o=t(28),r=t(48);e.exports=function(t){function e(t){var e=(t=t||{}).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=a.configMerge(i.global,i[t.type],t.options||{}),t}function n(t){var e=t.options;e.scale?t.scale.options=e.scale:e.scales&&e.scales.xAxes.concat(e.scales.yAxes).forEach(function(e){t.scales[e.id].options=e}),t.tooltip._options=e.tooltips}function l(t){return"top"===t||"bottom"===t}var s=t.plugins;t.types={},t.instances={},t.controllers={},a.extend(t.prototype,{construct:function(n,i){var o=this;i=e(i);var l=r.acquireContext(n,i),s=l&&l.canvas,u=s&&s.height,d=s&&s.width;o.id=a.uid(),o.ctx=l,o.canvas=s,o.config=i,o.width=d,o.height=u,o.aspectRatio=u?d/u:null,o.options=i.options,o._bufferedRender=!1,o.chart=o,o.controller=o,t.instances[o.id]=o,Object.defineProperty(o,"data",{get:function(){return o.config.data},set:function(t){o.config.data=t}}),l&&s?(o.initialize(),o.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return s.notify(t,"beforeInit"),a.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.ensureScalesHaveIDs(),t.buildScales(),t.initToolTip(),s.notify(t,"afterInit"),t},clear:function(){return a.canvas.clear(this),this},stop:function(){return t.animationService.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,o=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(a.getMaximumWidth(i))),l=Math.max(0,Math.floor(o?r/o:a.getMaximumHeight(i)));if((e.width!==r||e.height!==l)&&(i.width=e.width=r,i.height=e.height=l,i.style.width=r+"px",i.style.height=l+"px",a.retinaScale(e,n.devicePixelRatio),!t)){var u={width:r,height:l};s.notify(e,"resize",[u]),e.options.onResize&&e.options.onResize(e,u),e.stop(),e.update(e.options.responsiveAnimationDuration)}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;a.each(e.xAxes,function(t,e){t.id=t.id||"x-axis-"+e}),a.each(e.yAxes,function(t,e){t.id=t.id||"y-axis-"+e}),n&&(n.id=n.id||"scale")},buildScales:function(){var e=this,n=e.options,i=e.scales={},o=[];n.scales&&(o=o.concat((n.scales.xAxes||[]).map(function(t){return{options:t,dtype:"category",dposition:"bottom"}}),(n.scales.yAxes||[]).map(function(t){return{options:t,dtype:"linear",dposition:"left"}}))),n.scale&&o.push({options:n.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),a.each(o,function(n){var o=n.options,r=a.valueOrDefault(o.type,n.dtype),s=t.scaleService.getScaleConstructor(r);if(s){l(o.position)!==l(n.dposition)&&(o.position=n.dposition);var u=new s({id:o.id,options:o,ctx:e.ctx,chart:e});i[u.id]=u,u.mergeTicksOptions(),n.isDefault&&(e.scale=u)}}),t.scaleService.addScalesToLayout(this)},buildOrUpdateControllers:function(){var e=this,n=[],i=[];return a.each(e.data.datasets,function(a,o){var r=e.getDatasetMeta(o),l=a.type||e.config.type;if(r.type&&r.type!==l&&(e.destroyDatasetMeta(o),r=e.getDatasetMeta(o)),r.type=l,n.push(r.type),r.controller)r.controller.updateIndex(o);else{var s=t.controllers[r.type];if(void 0===s)throw new Error('"'+r.type+'" is not a chart type.');r.controller=new s(e,o),i.push(r.controller)}},e),i},resetElements:function(){var t=this;a.each(t.data.datasets,function(e,n){t.getDatasetMeta(n).controller.reset()},t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),n(e),!1!==s.notify(e,"beforeUpdate")){e.tooltip._data=e.data;var i=e.buildOrUpdateControllers();a.each(e.data.datasets,function(t,n){e.getDatasetMeta(n).controller.buildOrUpdateElements()},e),e.updateLayout(),a.each(i,function(t){t.reset()}),e.updateDatasets(),e.tooltip.initialize(),e.lastActive=[],s.notify(e,"afterUpdate"),e._bufferedRender?e._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:e.render(t)}},updateLayout:function(){var e=this;!1!==s.notify(e,"beforeLayout")&&(t.layoutService.update(this,this.width,this.height),s.notify(e,"afterScaleUpdate"),s.notify(e,"afterLayout"))},updateDatasets:function(){var t=this;if(!1!==s.notify(t,"beforeDatasetsUpdate")){for(var e=0,n=t.data.datasets.length;e<n;++e)t.updateDataset(e);s.notify(t,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this,n=e.getDatasetMeta(t),i={meta:n,index:t};!1!==s.notify(e,"beforeDatasetUpdate",[i])&&(n.controller.update(),s.notify(e,"afterDatasetUpdate",[i]))},render:function(e){var n=this;e&&"object"==typeof e||(e={duration:e,lazy:arguments[1]});var i=e.duration,o=e.lazy;if(!1!==s.notify(n,"beforeRender")){var r=n.options.animation,l=function(t){s.notify(n,"afterRender"),a.callback(r&&r.onComplete,[t],n)};if(r&&(void 0!==i&&0!==i||void 0===i&&0!==r.duration)){var u=new t.Animation({numSteps:(i||r.duration)/16.66,easing:e.easing||r.easing,render:function(t,e){var n=a.easing.effects[e.easing],i=e.currentStep,o=i/e.numSteps;t.draw(n(o),o,i)},onAnimationProgress:r.onProgress,onAnimationComplete:l});t.animationService.addAnimation(n,u,i,o)}else n.draw(),l(new t.Animation({numSteps:0,chart:n}));return n}},draw:function(t){var e=this;e.clear(),a.isNullOrUndef(t)&&(t=1),e.transition(t),!1!==s.notify(e,"beforeDraw",[t])&&(a.each(e.boxes,function(t){t.draw(e.chartArea)},e),e.scale&&e.scale.draw(),e.drawDatasets(t),e._drawTooltip(t),s.notify(e,"afterDraw",[t]))},transition:function(t){for(var e=this,n=0,i=(e.data.datasets||[]).length;n<i;++n)e.isDatasetVisible(n)&&e.getDatasetMeta(n).controller.transition(t);e.tooltip.transition(t)},drawDatasets:function(t){var e=this;if(!1!==s.notify(e,"beforeDatasetsDraw",[t])){for(var n=(e.data.datasets||[]).length-1;n>=0;--n)e.isDatasetVisible(n)&&e.drawDataset(n,t);s.notify(e,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n=this,i=n.getDatasetMeta(t),a={meta:i,index:t,easingValue:e};!1!==s.notify(n,"beforeDatasetDraw",[a])&&(i.controller.draw(e),s.notify(n,"afterDatasetDraw",[a]))},_drawTooltip:function(t){var e=this,n=e.tooltip,i={tooltip:n,easingValue:t};!1!==s.notify(e,"beforeTooltipDraw",[i])&&(n.draw(),s.notify(e,"afterTooltipDraw",[i]))},getElementAtEvent:function(t){return o.modes.single(this,t)},getElementsAtEvent:function(t){return o.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return o.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=o.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return o.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this,n=e.data.datasets[t];n._meta||(n._meta={});var i=n._meta[e.id];return i||(i=n._meta[e.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null}),i},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var e,n,i=this,o=i.canvas;for(i.stop(),e=0,n=i.data.datasets.length;e<n;++e)i.destroyDatasetMeta(e);o&&(i.unbindEvents(),a.canvas.clear(i),r.releaseContext(i.ctx),i.canvas=null,i.ctx=null),s.notify(i,"destroy"),delete t.instances[i.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var e=this;e.tooltip=new t.Tooltip({_chart:e,_chartInstance:e,_data:e.data,_options:e.options.tooltips},e)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};a.each(t.options.events,function(i){r.addEventListener(t,i,n),e[i]=n}),t.options.responsive&&(n=function(){t.resize()},r.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,a.each(e,function(e,n){r.removeEventListener(t,n,e)}))},updateHoverStyle:function(t,e,n){var i,a,o,r=n?"setHoverStyle":"removeHoverStyle";for(a=0,o=t.length;a<o;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[r](i)},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==s.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);i|=n&&n.handleEvent(t),s.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render(e.options.hover.animationDuration,!0)),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e=this,n=e.options||{},i=n.hover,o=!1;return e.lastActive=e.lastActive||[],"mouseout"===t.type?e.active=[]:e.active=e.getElementsAtEventForMode(t,i.mode,i),a.callback(n.onHover||n.hover.onHover,[t.native,e.active],e),"mouseup"!==t.type&&"click"!==t.type||n.onClick&&n.onClick.call(e,t.native,e.active),e.lastActive.length&&e.updateHoverStyle(e.lastActive,i.mode,!1),e.active.length&&i.mode&&e.updateHoverStyle(e.active,i.mode,!0),o=!a.arrayEquals(e.active,e.lastActive),e.lastActive=e.active,o}}),t.Controller=t}},{25:25,28:28,45:45,48:48}],24:[function(t,e,n){"use strict";var i=t(45);e.exports=function(t){function e(t,e){t._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),a.forEach(function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),a=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),o=a.apply(this,e);return i.each(t._chartjs.listeners,function(t){"function"==typeof t[n]&&t[n].apply(t,e)}),o}})}))}function n(t,e){var n=t._chartjs;if(n){var i=n.listeners,o=i.indexOf(e);-1!==o&&i.splice(o,1),i.length>0||(a.forEach(function(e){delete t[e]}),delete t._chartjs)}}var a=["push","pop","shift","splice","unshift"];t.DatasetController=function(t,e){this.initialize(t,e)},i.extend(t.DatasetController.prototype,{datasetElementType:null,dataElementType:null,initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements()},updateIndex:function(t){this.index=t},linkScales:function(){var t=this,e=t.getMeta(),n=t.getDataset();null===e.xAxisID&&(e.xAxisID=n.xAxisID||t.chart.options.scales.xAxes[0].id),null===e.yAxisID&&(e.yAxisID=n.yAxisID||t.chart.options.scales.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},reset:function(){this.update(!0)},destroy:function(){this._data&&n(this._data,this)},createMetaDataset:function(){var t=this,e=t.datasetElementType;return e&&new e({_chart:t.chart,_datasetIndex:t.index})},createMetaData:function(t){var e=this,n=e.dataElementType;return n&&new n({_chart:e.chart,_datasetIndex:e.index,_index:t})},addElements:function(){var t,e,n=this,i=n.getMeta(),a=n.getDataset().data||[],o=i.data;for(t=0,e=a.length;t<e;++t)o[t]=o[t]||n.createMetaData(t);i.dataset=i.dataset||n.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t=this,i=t.getDataset(),a=i.data||(i.data=[]);t._data!==a&&(t._data&&n(t._data,t),e(a,t),t._data=a),t.resyncElements()},update:i.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},removeHoverStyle:function(t,e){var n=this.chart.data.datasets[t._datasetIndex],a=t._index,o=t.custom||{},r=i.valueAtIndexOrDefault,l=t._model;l.backgroundColor=o.backgroundColor?o.backgroundColor:r(n.backgroundColor,a,e.backgroundColor),l.borderColor=o.borderColor?o.borderColor:r(n.borderColor,a,e.borderColor),l.borderWidth=o.borderWidth?o.borderWidth:r(n.borderWidth,a,e.borderWidth)},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,a=t.custom||{},o=i.valueAtIndexOrDefault,r=i.getHoverColor,l=t._model;l.backgroundColor=a.hoverBackgroundColor?a.hoverBackgroundColor:o(e.hoverBackgroundColor,n,r(l.backgroundColor)),l.borderColor=a.hoverBorderColor?a.hoverBorderColor:o(e.hoverBorderColor,n,r(l.borderColor)),l.borderWidth=a.hoverBorderWidth?a.hoverBorderWidth:o(e.hoverBorderWidth,n,l.borderWidth)},resyncElements:function(){var t=this,e=t.getMeta(),n=t.getDataset().data,i=e.data.length,a=n.length;a<i?e.data.splice(a,i-a):a>i&&t.insertElements(i,a-i)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){this.insertElements(this.getDataset().data.length-1,arguments.length)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),t.DatasetController.extend=i.inherits}},{45:45}],25:[function(t,e,n){"use strict";var i=t(45);e.exports={_set:function(t,e){return i.merge(this[t]||(this[t]={}),e)}}},{45:45}],26:[function(t,e,n){"use strict";function i(t,e,n,i){var o,r,l,s,u,d,c,h,f,g=Object.keys(n);for(o=0,r=g.length;o<r;++o)if(l=g[o],d=n[l],e.hasOwnProperty(l)||(e[l]=d),(s=e[l])!==d&&"_"!==l[0]){if(t.hasOwnProperty(l)||(t[l]=s),u=t[l],(c=typeof d)===typeof u)if("string"===c){if((h=a(u)).valid&&(f=a(d)).valid){e[l]=f.mix(h,i).rgbString();continue}}else if("number"===c&&isFinite(u)&&isFinite(d)){e[l]=u+(d-u)*i;continue}e[l]=d}}var a=t(3),o=t(45),r=function(t){o.extend(this,t),this.initialize.apply(this,arguments)};o.extend(r.prototype,{initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=o.clone(t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,a=e._start,o=e._view;return n&&1!==t?(o||(o=e._view={}),a||(a=e._start={}),i(a,o,n,t),e):(e._view=n,e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return o.isNumber(this._model.x)&&o.isNumber(this._model.y)}}),r.extend=o.inherits,e.exports=r},{3:3,45:45}],27:[function(t,e,n){"use strict";var i=t(3),a=t(25),o=t(45);e.exports=function(t){function e(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function n(t){return void 0!==t&&null!==t&&"none"!==t}function r(t,i,a){var o=document.defaultView,r=t.parentNode,l=o.getComputedStyle(t)[i],s=o.getComputedStyle(r)[i],u=n(l),d=n(s),c=Number.POSITIVE_INFINITY;return u||d?Math.min(u?e(l,t,a):c,d?e(s,r,a):c):"none"}o.configMerge=function(){return o.merge(o.clone(arguments[0]),[].slice.call(arguments,1),{merger:function(e,n,i,a){var r=n[e]||{},l=i[e];"scales"===e?n[e]=o.scaleMerge(r,l):"scale"===e?n[e]=o.merge(r,[t.scaleService.getScaleDefaults(l.type),l]):o._merger(e,n,i,a)}})},o.scaleMerge=function(){return o.merge(o.clone(arguments[0]),[].slice.call(arguments,1),{merger:function(e,n,i,a){if("xAxes"===e||"yAxes"===e){var r,l,s,u=i[e].length;for(n[e]||(n[e]=[]),r=0;r<u;++r)s=i[e][r],l=o.valueOrDefault(s.type,"xAxes"===e?"category":"linear"),r>=n[e].length&&n[e].push({}),!n[e][r].type||s.type&&s.type!==n[e][r].type?o.merge(n[e][r],[t.scaleService.getScaleDefaults(l),s]):o.merge(n[e][r],s)}else o._merger(e,n,i,a)}})},o.where=function(t,e){if(o.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return o.each(t,function(t){e(t)&&n.push(t)}),n},o.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},o.findNextWhere=function(t,e,n){o.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},o.findPreviousWhere=function(t,e,n){o.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},o.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},o.almostEquals=function(t,e,n){return Math.abs(t-e)<n},o.almostWhole=function(t,e){var n=Math.round(t);return n-e<t&&n+e>t},o.max=function(t){return t.reduce(function(t,e){return isNaN(e)?t:Math.max(t,e)},Number.NEGATIVE_INFINITY)},o.min=function(t){return t.reduce(function(t,e){return isNaN(e)?t:Math.min(t,e)},Number.POSITIVE_INFINITY)},o.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0==(t=+t)||isNaN(t)?t:t>0?1:-1},o.log10=Math.log10?function(t){return Math.log10(t)}:function(t){return Math.log(t)/Math.LN10},o.toRadians=function(t){return t*(Math.PI/180)},o.toDegrees=function(t){return t*(180/Math.PI)},o.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),o=Math.atan2(i,n);return o<-.5*Math.PI&&(o+=2*Math.PI),{angle:o,distance:a}},o.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},o.aliasPixel=function(t){return t%2==0?0:.5},o.splineCurve=function(t,e,n,i){var a=t.skip?e:t,o=e,r=n.skip?e:n,l=Math.sqrt(Math.pow(o.x-a.x,2)+Math.pow(o.y-a.y,2)),s=Math.sqrt(Math.pow(r.x-o.x,2)+Math.pow(r.y-o.y,2)),u=l/(l+s),d=s/(l+s),c=i*(u=isNaN(u)?0:u),h=i*(d=isNaN(d)?0:d);return{previous:{x:o.x-c*(r.x-a.x),y:o.y-c*(r.y-a.y)},next:{x:o.x+h*(r.x-a.x),y:o.y+h*(r.y-a.y)}}},o.EPSILON=Number.EPSILON||1e-14,o.splineCurveMonotone=function(t){var e,n,i,a,r=(t||[]).map(function(t){return{model:t._model,deltaK:0,mK:0}}),l=r.length;for(e=0;e<l;++e)if(!(i=r[e]).model.skip){if(n=e>0?r[e-1]:null,(a=e<l-1?r[e+1]:null)&&!a.model.skip){var s=a.model.x-i.model.x;i.deltaK=0!==s?(a.model.y-i.model.y)/s:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}var u,d,c,h;for(e=0;e<l-1;++e)i=r[e],a=r[e+1],i.model.skip||a.model.skip||(o.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(u=i.mK/i.deltaK,d=a.mK/i.deltaK,(h=Math.pow(u,2)+Math.pow(d,2))<=9||(c=3/Math.sqrt(h),i.mK=u*c*i.deltaK,a.mK=d*c*i.deltaK)));var f;for(e=0;e<l;++e)(i=r[e]).model.skip||(n=e>0?r[e-1]:null,a=e<l-1?r[e+1]:null,n&&!n.model.skip&&(f=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-f,i.model.controlPointPreviousY=i.model.y-f*i.mK),a&&!a.model.skip&&(f=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+f,i.model.controlPointNextY=i.model.y+f*i.mK))},o.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},o.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},o.niceNum=function(t,e){var n=Math.floor(o.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},o.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},o.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.currentTarget||t.srcElement,l=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var u=parseFloat(o.getStyle(r,"padding-left")),d=parseFloat(o.getStyle(r,"padding-top")),c=parseFloat(o.getStyle(r,"padding-right")),h=parseFloat(o.getStyle(r,"padding-bottom")),f=l.right-l.left-u-c,g=l.bottom-l.top-d-h;return n=Math.round((n-l.left-u)/f*r.width/e.currentDevicePixelRatio),i=Math.round((i-l.top-d)/g*r.height/e.currentDevicePixelRatio),{x:n,y:i}},o.getConstraintWidth=function(t){return r(t,"max-width","clientWidth")},o.getConstraintHeight=function(t){return r(t,"max-height","clientHeight")},o.getMaximumWidth=function(t){var e=t.parentNode;if(!e)return t.clientWidth;var n=parseInt(o.getStyle(e,"padding-left"),10),i=parseInt(o.getStyle(e,"padding-right"),10),a=e.clientWidth-n-i,r=o.getConstraintWidth(t);return isNaN(r)?a:Math.min(a,r)},o.getMaximumHeight=function(t){var e=t.parentNode;if(!e)return t.clientHeight;var n=parseInt(o.getStyle(e,"padding-top"),10),i=parseInt(o.getStyle(e,"padding-bottom"),10),a=e.clientHeight-n-i,r=o.getConstraintHeight(t);return isNaN(r)?a:Math.min(a,r)},o.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},o.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,o=t.width;i.height=a*n,i.width=o*n,t.ctx.scale(n,n),i.style.height=a+"px",i.style.width=o+"px"}},o.fontString=function(t,e,n){return e+" "+t+"px "+n},o.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var l=0;o.each(n,function(e){void 0!==e&&null!==e&&!0!==o.isArray(e)?l=o.measureText(t,a,r,l,e):o.isArray(e)&&o.each(e,function(e){void 0===e||null===e||o.isArray(e)||(l=o.measureText(t,a,r,l,e))})});var s=r.length/2;if(s>n.length){for(var u=0;u<s;u++)delete a[r[u]];r.splice(0,s)}return l},o.measureText=function(t,e,n,i,a){var o=e[a];return o||(o=e[a]=t.measureText(a).width,n.push(a)),o>i&&(i=o),i},o.numberOfLabelLines=function(t){var e=1;return o.each(t,function(t){o.isArray(t)&&t.length>e&&(e=t.length)}),e},o.color=i?function(t){return t instanceof CanvasGradient&&(t=a.global.defaultColor),i(t)}:function(t){return console.error("Color.js not found!"),t},o.getHoverColor=function(t){return t instanceof CanvasPattern?t:o.color(t).saturate(.5).darken(.1).rgbString()}}},{25:25,3:3,45:45}],28:[function(t,e,n){"use strict";function i(t,e){return t.native?{x:t.x,y:t.y}:u.getRelativePosition(t,e)}function a(t,e){var n,i,a,o,r;for(i=0,o=t.data.datasets.length;i<o;++i)if(t.isDatasetVisible(i))for(a=0,r=(n=t.getDatasetMeta(i)).data.length;a<r;++a){var l=n.data[a];l._view.skip||e(l)}}function o(t,e){var n=[];return a(t,function(t){t.inRange(e.x,e.y)&&n.push(t)}),n}function r(t,e,n,i){var o=Number.POSITIVE_INFINITY,r=[];return a(t,function(t){if(!n||t.inRange(e.x,e.y)){var a=t.getCenterPoint(),l=i(e,a);l<o?(r=[t],o=l):l===o&&r.push(t)}}),r}function l(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,o=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(o,2))}}function s(t,e,n){var a=i(e,t);n.axis=n.axis||"x";var s=l(n.axis),u=n.intersect?o(t,a):r(t,a,!1,s),d=[];return u.length?(t.data.datasets.forEach(function(e,n){if(t.isDatasetVisible(n)){var i=t.getDatasetMeta(n).data[u[0]._index];i&&!i._view.skip&&d.push(i)}}),d):[]}var u=t(45);e.exports={modes:{single:function(t,e){var n=i(e,t),o=[];return a(t,function(t){if(t.inRange(n.x,n.y))return o.push(t),o}),o.slice(0,1)},label:s,index:s,dataset:function(t,e,n){var a=i(e,t);n.axis=n.axis||"xy";var s=l(n.axis),u=n.intersect?o(t,a):r(t,a,!1,s);return u.length>0&&(u=t.getDatasetMeta(u[0]._datasetIndex).data),u},"x-axis":function(t,e){return s(t,e,{intersect:!1})},point:function(t,e){return o(t,i(e,t))},nearest:function(t,e,n){var a=i(e,t);n.axis=n.axis||"xy";var o=l(n.axis),s=r(t,a,n.intersect,o);return s.length>1&&s.sort(function(t,e){var n=t.getArea()-e.getArea();return 0===n&&(n=t._datasetIndex-e._datasetIndex),n}),s.slice(0,1)},x:function(t,e,n){var o=i(e,t),r=[],l=!1;return a(t,function(t){t.inXRange(o.x)&&r.push(t),t.inRange(o.x,o.y)&&(l=!0)}),n.intersect&&!l&&(r=[]),r},y:function(t,e,n){var o=i(e,t),r=[],l=!1;return a(t,function(t){t.inYRange(o.y)&&r.push(t),t.inRange(o.x,o.y)&&(l=!0)}),n.intersect&&!l&&(r=[]),r}}}},{45:45}],29:[function(t,e,n){"use strict";t(25)._set("global",{responsive:!0,responsiveAnimationDuration:0,maintainAspectRatio:!0,events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",showLines:!0,elements:{},layout:{padding:{top:0,right:0,bottom:0,left:0}}}),e.exports=function(){var t=function(t,e){return this.construct(t,e),this};return t.Chart=t,t}},{25:25}],30:[function(t,e,n){"use strict";var i=t(45);e.exports=function(t){function e(t,e){return i.where(t,function(t){return t.position===e})}function n(t,e){t.forEach(function(t,e){return t._tmpIndex_=e,t}),t.sort(function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i._tmpIndex_-a._tmpIndex_:i.weight-a.weight}),t.forEach(function(t){delete t._tmpIndex_})}t.layoutService={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],o=a.length,r=0;r<o;++r)i=a[r],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,a,o){function r(t){var e=i.findNextWhere(_,function(e){return e.box===t});if(e)if(t.isHorizontal()){var n={left:Math.max(T,D),right:Math.max(F,I),top:0,bottom:0};t.update(t.fullWidth?x:S,y/2,n)}else t.update(e.minSize.width,C)}function l(t){t.isHorizontal()?(t.left=t.fullWidth?d:T,t.right=t.fullWidth?a-c:T+S,t.top=V,t.bottom=V+t.height,V=t.bottom):(t.left=N,t.right=N+t.width,t.top=O,t.bottom=O+C,N=t.right)}if(t){var s=t.options.layout||{},u=i.options.toPadding(s.padding),d=u.left,c=u.right,h=u.top,f=u.bottom,g=e(t.boxes,"left"),p=e(t.boxes,"right"),v=e(t.boxes,"top"),m=e(t.boxes,"bottom"),b=e(t.boxes,"chartArea");n(g,!0),n(p,!1),n(v,!0),n(m,!1);var x=a-d-c,y=o-h-f,k=y/2,w=(a-x/2)/(g.length+p.length),M=(o-k)/(v.length+m.length),S=x,C=y,_=[];i.each(g.concat(p,v,m),function(t){var e,n=t.isHorizontal();n?(e=t.update(t.fullWidth?x:S,M),C-=e.height):(e=t.update(w,k),S-=e.width),_.push({horizontal:n,minSize:e,box:t})});var D=0,I=0,P=0,A=0;i.each(v.concat(m),function(t){if(t.getPadding){var e=t.getPadding();D=Math.max(D,e.left),I=Math.max(I,e.right)}}),i.each(g.concat(p),function(t){if(t.getPadding){var e=t.getPadding();P=Math.max(P,e.top),A=Math.max(A,e.bottom)}});var T=d,F=c,O=h,R=f;i.each(g.concat(p),r),i.each(g,function(t){T+=t.width}),i.each(p,function(t){F+=t.width}),i.each(v.concat(m),r),i.each(v,function(t){O+=t.height}),i.each(m,function(t){R+=t.height}),i.each(g.concat(p),function(t){var e=i.findNextWhere(_,function(e){return e.box===t}),n={left:0,right:0,top:O,bottom:R};e&&t.update(e.minSize.width,C,n)}),T=d,F=c,O=h,R=f,i.each(g,function(t){T+=t.width}),i.each(p,function(t){F+=t.width}),i.each(v,function(t){O+=t.height}),i.each(m,function(t){R+=t.height});var L=Math.max(D-T,0);T+=L,F+=Math.max(I-F,0);var z=Math.max(P-O,0);O+=z,R+=Math.max(A-R,0);var B=o-O-R,W=a-T-F;W===S&&B===C||(i.each(g,function(t){t.height=B}),i.each(p,function(t){t.height=B}),i.each(v,function(t){t.fullWidth||(t.width=W)}),i.each(m,function(t){t.fullWidth||(t.width=W)}),C=B,S=W);var N=d+L,V=h+z;i.each(g.concat(v),l),N+=S,V+=C,i.each(p,l),i.each(m,l),t.chartArea={left:T,top:O,right:T+S,bottom:O+C},i.each(b,function(e){e.left=t.chartArea.left,e.top=t.chartArea.top,e.right=t.chartArea.right,e.bottom=t.chartArea.bottom,e.update(S,C)})}}}}},{45:45}],31:[function(t,e,n){"use strict";var i=t(25),a=t(26),o=t(45);i._set("global",{plugins:{}}),e.exports=function(t){t.plugins={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach(function(t){-1===e.indexOf(t)&&e.push(t)}),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach(function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)}),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,o,r,l,s=this.descriptors(t),u=s.length;for(i=0;i<u;++i)if(a=s[i],o=a.plugin,"function"==typeof(l=o[e])&&((r=[t].concat(n||[])).push(a.options),!1===l.apply(o,r)))return!1;return!0},descriptors:function(t){var e=t._plugins||(t._plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],a=[],r=t&&t.config||{},l=r.options&&r.options.plugins||{};return this._plugins.concat(r.plugins||[]).forEach(function(t){if(-1===n.indexOf(t)){var e=t.id,r=l[e];!1!==r&&(!0===r&&(r=o.clone(i.global.plugins[e])),n.push(t),a.push({plugin:t,options:r||{}}))}}),e.descriptors=a,e.id=this._cacheId,a}},t.pluginService=t.plugins,t.PluginBase=a.extend({})}},{25:25,26:26,45:45}],32:[function(t,e,n){"use strict";function i(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(t[e].label);return i}function a(t,e,n){var i=t.getPixelForTick(e);return n&&(i-=0===e?(t.getPixelForTick(1)-i)/2:(i-t.getPixelForTick(e-1))/2),i}var o=t(25),r=t(26),l=t(45),s=t(34);o._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0, 0, 0, 0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",lineHeight:1.2,padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:s.formatters.values,minor:{},major:{}}}),e.exports=function(t){function e(t,e,n){return l.isArray(e)?l.longestText(t,n,e):t.measureText(e).width}function n(t){var e=l.valueOrDefault,n=o.global,i=e(t.fontSize,n.defaultFontSize),a=e(t.fontStyle,n.defaultFontStyle),r=e(t.fontFamily,n.defaultFontFamily);return{size:i,style:a,family:r,font:l.fontString(i,a,r)}}function s(t){return l.options.toLineHeight(l.valueOrDefault(t.lineHeight,1.2),l.valueOrDefault(t.fontSize,o.global.defaultFontSize))}t.Scale=r.extend({getPadding:function(){var t=this;return{left:t.paddingLeft||0,top:t.paddingTop||0,right:t.paddingRight||0,bottom:t.paddingBottom||0}},getTicks:function(){return this._ticks},mergeTicksOptions:function(){var t=this.options.ticks;!1===t.minor&&(t.minor={display:!1}),!1===t.major&&(t.major={display:!1});for(var e in t)"major"!==e&&"minor"!==e&&(void 0===t.minor[e]&&(t.minor[e]=t[e]),void 0===t.major[e]&&(t.major[e]=t[e]))},beforeUpdate:function(){l.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,o,r,s,u,d=this;for(d.beforeUpdate(),d.maxWidth=t,d.maxHeight=e,d.margins=l.extend({left:0,right:0,top:0,bottom:0},n),d.longestTextCache=d.longestTextCache||{},d.beforeSetDimensions(),d.setDimensions(),d.afterSetDimensions(),d.beforeDataLimits(),d.determineDataLimits(),d.afterDataLimits(),d.beforeBuildTicks(),s=d.buildTicks()||[],d.afterBuildTicks(),d.beforeTickToLabelConversion(),o=d.convertTicksToLabels(s)||d.ticks,d.afterTickToLabelConversion(),d.ticks=o,i=0,a=o.length;i<a;++i)r=o[i],(u=s[i])?u.label=r:s.push(u={label:r,major:!1});return d._ticks=s,d.beforeCalculateTickRotation(),d.calculateTickRotation(),d.afterCalculateTickRotation(),d.beforeFit(),d.fit(),d.afterFit(),d.afterUpdate(),d.minSize},afterUpdate:function(){l.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){l.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){l.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){l.callback(this.options.beforeDataLimits,[this])},determineDataLimits:l.noop,afterDataLimits:function(){l.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){l.callback(this.options.beforeBuildTicks,[this])},buildTicks:l.noop,afterBuildTicks:function(){l.callback(this.options.afterBuildTicks,[this])},beforeTickToLabelConversion:function(){l.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this,e=t.options.ticks;t.ticks=t.ticks.map(e.userCallback||e.callback,this)},afterTickToLabelConversion:function(){l.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){l.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t=this,e=t.ctx,a=t.options.ticks,o=i(t._ticks),r=n(a);e.font=r.font;var s=a.minRotation||0;if(o.length&&t.options.display&&t.isHorizontal())for(var u,d=l.longestText(e,r.font,o,t.longestTextCache),c=d,h=t.getPixelForTick(1)-t.getPixelForTick(0)-6;c>h&&s<a.maxRotation;){var f=l.toRadians(s);if(u=Math.cos(f),Math.sin(f)*d>t.maxHeight){s--;break}s++,c=u*d}t.labelRotation=s},afterCalculateTickRotation:function(){l.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){l.callback(this.options.beforeFit,[this])},fit:function(){var t=this,a=t.minSize={width:0,height:0},o=i(t._ticks),r=t.options,u=r.ticks,d=r.scaleLabel,c=r.gridLines,h=r.display,f=t.isHorizontal(),g=n(u),p=r.gridLines.tickMarkLength;if(a.width=f?t.isFullWidth()?t.maxWidth-t.margins.left-t.margins.right:t.maxWidth:h&&c.drawTicks?p:0,a.height=f?h&&c.drawTicks?p:0:t.maxHeight,d.display&&h){var v=s(d)+l.options.toPadding(d.padding).height;f?a.height+=v:a.width+=v}if(u.display&&h){var m=l.longestText(t.ctx,g.font,o,t.longestTextCache),b=l.numberOfLabelLines(o),x=.5*g.size,y=t.options.ticks.padding;if(f){t.longestLabelWidth=m;var k=l.toRadians(t.labelRotation),w=Math.cos(k),M=Math.sin(k)*m+g.size*b+x*(b-1)+x;a.height=Math.min(t.maxHeight,a.height+M+y),t.ctx.font=g.font;var S=e(t.ctx,o[0],g.font),C=e(t.ctx,o[o.length-1],g.font);0!==t.labelRotation?(t.paddingLeft="bottom"===r.position?w*S+3:w*x+3,t.paddingRight="bottom"===r.position?w*x+3:w*C+3):(t.paddingLeft=S/2+3,t.paddingRight=C/2+3)}else u.mirror?m=0:m+=y+x,a.width=Math.min(t.maxWidth,a.width+m),t.paddingTop=g.size/2,t.paddingBottom=g.size/2}t.handleMargins(),t.width=a.width,t.height=a.height},handleMargins:function(){var t=this;t.margins&&(t.paddingLeft=Math.max(t.paddingLeft-t.margins.left,0),t.paddingTop=Math.max(t.paddingTop-t.margins.top,0),t.paddingRight=Math.max(t.paddingRight-t.margins.right,0),t.paddingBottom=Math.max(t.paddingBottom-t.margins.bottom,0))},afterFit:function(){l.callback(this.options.afterFit,[this])},isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(l.isNullOrUndef(t))return NaN;if("number"==typeof t&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},getLabelForIndex:l.noop,getPixelForValue:l.noop,getValueForPixel:l.noop,getPixelForTick:function(t){var e=this,n=e.options.offset;if(e.isHorizontal()){var i=(e.width-(e.paddingLeft+e.paddingRight))/Math.max(e._ticks.length-(n?0:1),1),a=i*t+e.paddingLeft;n&&(a+=i/2);var o=e.left+Math.round(a);return o+=e.isFullWidth()?e.margins.left:0}var r=e.height-(e.paddingTop+e.paddingBottom);return e.top+t*(r/(e._ticks.length-1))},getPixelForDecimal:function(t){var e=this;if(e.isHorizontal()){var n=(e.width-(e.paddingLeft+e.paddingRight))*t+e.paddingLeft,i=e.left+Math.round(n);return i+=e.isFullWidth()?e.margins.left:0}return e.top+t*e.height},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this,e=t.min,n=t.max;return t.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0},_autoSkip:function(t){var e,n,i,a,o=this,r=o.isHorizontal(),s=o.options.ticks.minor,u=t.length,d=l.toRadians(o.labelRotation),c=Math.cos(d),h=o.longestLabelWidth*c,f=[];for(s.maxTicksLimit&&(a=s.maxTicksLimit),r&&(e=!1,(h+s.autoSkipPadding)*u>o.width-(o.paddingLeft+o.paddingRight)&&(e=1+Math.floor((h+s.autoSkipPadding)*u/(o.width-(o.paddingLeft+o.paddingRight)))),a&&u>a&&(e=Math.max(e,Math.floor(u/a)))),n=0;n<u;n++)i=t[n],(e>1&&n%e>0||n%e==0&&n+e>=u)&&n!==u-1&&delete i.label,f.push(i);return f},draw:function(t){var e=this,i=e.options;if(i.display){var r=e.ctx,u=o.global,d=i.ticks.minor,c=i.ticks.major||d,h=i.gridLines,f=i.scaleLabel,g=0!==e.labelRotation,p=e.isHorizontal(),v=d.autoSkip?e._autoSkip(e.getTicks()):e.getTicks(),m=l.valueOrDefault(d.fontColor,u.defaultFontColor),b=n(d),x=l.valueOrDefault(c.fontColor,u.defaultFontColor),y=n(c),k=h.drawTicks?h.tickMarkLength:0,w=l.valueOrDefault(f.fontColor,u.defaultFontColor),M=n(f),S=l.options.toPadding(f.padding),C=l.toRadians(e.labelRotation),_=[],D="right"===i.position?e.left:e.right-k,I="right"===i.position?e.left+k:e.right,P="bottom"===i.position?e.top:e.bottom-k,A="bottom"===i.position?e.top+k:e.bottom;if(l.each(v,function(n,o){if(!l.isNullOrUndef(n.label)){var r,s,c,f,m=n.label;o===e.zeroLineIndex&&i.offset===h.offsetGridLines?(r=h.zeroLineWidth,s=h.zeroLineColor,c=h.zeroLineBorderDash,f=h.zeroLineBorderDashOffset):(r=l.valueAtIndexOrDefault(h.lineWidth,o),s=l.valueAtIndexOrDefault(h.color,o),c=l.valueOrDefault(h.borderDash,u.borderDash),f=l.valueOrDefault(h.borderDashOffset,u.borderDashOffset));var b,x,y,w,M,S,T,F,O,R,L="middle",z="middle",B=d.padding;if(p){var W=k+B;"bottom"===i.position?(z=g?"middle":"top",L=g?"right":"center",R=e.top+W):(z=g?"middle":"bottom",L=g?"left":"center",R=e.bottom-W);var N=a(e,o,h.offsetGridLines&&v.length>1);N<e.left&&(s="rgba(0,0,0,0)"),N+=l.aliasPixel(r),O=e.getPixelForTick(o)+d.labelOffset,b=y=M=T=N,x=P,w=A,S=t.top,F=t.bottom}else{var V,E="left"===i.position;d.mirror?(L=E?"left":"right",V=B):(L=E?"right":"left",V=k+B),O=E?e.right-V:e.left+V;var H=a(e,o,h.offsetGridLines&&v.length>1);H<e.top&&(s="rgba(0,0,0,0)"),H+=l.aliasPixel(r),R=e.getPixelForTick(o)+d.labelOffset,b=D,y=I,M=t.left,T=t.right,x=w=S=F=H}_.push({tx1:b,ty1:x,tx2:y,ty2:w,x1:M,y1:S,x2:T,y2:F,labelX:O,labelY:R,glWidth:r,glColor:s,glBorderDash:c,glBorderDashOffset:f,rotation:-1*C,label:m,major:n.major,textBaseline:z,textAlign:L})}}),l.each(_,function(t){if(h.display&&(r.save(),r.lineWidth=t.glWidth,r.strokeStyle=t.glColor,r.setLineDash&&(r.setLineDash(t.glBorderDash),r.lineDashOffset=t.glBorderDashOffset),r.beginPath(),h.drawTicks&&(r.moveTo(t.tx1,t.ty1),r.lineTo(t.tx2,t.ty2)),h.drawOnChartArea&&(r.moveTo(t.x1,t.y1),r.lineTo(t.x2,t.y2)),r.stroke(),r.restore()),d.display){r.save(),r.translate(t.labelX,t.labelY),r.rotate(t.rotation),r.font=t.major?y.font:b.font,r.fillStyle=t.major?x:m,r.textBaseline=t.textBaseline,r.textAlign=t.textAlign;var e=t.label;if(l.isArray(e))for(var n=0,i=0;n<e.length;++n)r.fillText(""+e[n],0,i),i+=1.5*b.size;else r.fillText(e,0,0);r.restore()}}),f.display){var T,F,O=0,R=s(f)/2;if(p)T=e.left+(e.right-e.left)/2,F="bottom"===i.position?e.bottom-R-S.bottom:e.top+R+S.top;else{var L="left"===i.position;T=L?e.left+R+S.top:e.right-R-S.top,F=e.top+(e.bottom-e.top)/2,O=L?-.5*Math.PI:.5*Math.PI}r.save(),r.translate(T,F),r.rotate(O),r.textAlign="center",r.textBaseline="middle",r.fillStyle=w,r.font=M.font,r.fillText(f.labelString,0,0),r.restore()}if(h.drawBorder){r.lineWidth=l.valueAtIndexOrDefault(h.lineWidth,0),r.strokeStyle=l.valueAtIndexOrDefault(h.color,0);var z=e.left,B=e.right,W=e.top,N=e.bottom,V=l.aliasPixel(r.lineWidth);p?(W=N="top"===i.position?e.bottom:e.top,W+=V,N+=V):(z=B="left"===i.position?e.right:e.left,z+=V,B+=V),r.beginPath(),r.moveTo(z,W),r.lineTo(B,N),r.stroke()}}}})}},{25:25,26:26,34:34,45:45}],33:[function(t,e,n){"use strict";var i=t(25),a=t(45);e.exports=function(t){t.scaleService={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=a.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?a.merge({},[i.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){var n=this;n.defaults.hasOwnProperty(t)&&(n.defaults[t]=a.extend(n.defaults[t],e))},addScalesToLayout:function(e){a.each(e.scales,function(n){n.fullWidth=n.options.fullWidth,n.position=n.options.position,n.weight=n.options.weight,t.layoutService.addBox(e,n)})}}}},{25:25,45:45}],34:[function(t,e,n){"use strict";var i=t(45);e.exports={generators:{linear:function(t,e){var n,a=[];if(t.stepSize&&t.stepSize>0)n=t.stepSize;else{var o=i.niceNum(e.max-e.min,!1);n=i.niceNum(o/(t.maxTicks-1),!0)}var r=Math.floor(e.min/n)*n,l=Math.ceil(e.max/n)*n;t.min&&t.max&&t.stepSize&&i.almostWhole((t.max-t.min)/t.stepSize,n/1e3)&&(r=t.min,l=t.max);var s=(l-r)/n;s=i.almostEquals(s,Math.round(s),n/1e3)?Math.round(s):Math.ceil(s),a.push(void 0!==t.min?t.min:r);for(var u=1;u<s;++u)a.push(r+u*n);return a.push(void 0!==t.max?t.max:l),a},logarithmic:function(t,e){var n,a,o=[],r=i.valueOrDefault,l=r(t.min,Math.pow(10,Math.floor(i.log10(e.min)))),s=Math.floor(i.log10(e.max)),u=Math.ceil(e.max/Math.pow(10,s));0===l?(n=Math.floor(i.log10(e.minNotZero)),a=Math.floor(e.minNotZero/Math.pow(10,n)),o.push(l),l=a*Math.pow(10,n)):(n=Math.floor(i.log10(l)),a=Math.floor(l/Math.pow(10,n)));do{o.push(l),10===++a&&(a=1,++n),l=a*Math.pow(10,n)}while(n<s||n===s&&a<u);var d=r(t.max,l);return o.push(d),o}},formatters:{values:function(t){return i.isArray(t)?t:""+t},linear:function(t,e,n){var a=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(a)>1&&t!==Math.floor(t)&&(a=t-Math.floor(t));var o=i.log10(Math.abs(a)),r="";if(0!==t){var l=-1*Math.floor(o);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var a=t/Math.pow(10,Math.floor(i.log10(t)));return 0===t?"0":1===a||2===a||5===a||0===e||e===n.length-1?t.toExponential():""}}}},{45:45}],35:[function(t,e,n){"use strict";var i=t(25),a=t(26),o=t(45);i._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:o.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var o=t[0];o.xLabel?n=o.xLabel:a>0&&o.index<a&&(n=i[o.index])}return n},afterTitle:o.noop,beforeBody:o.noop,beforeLabel:o.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),n+=t.yLabel},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:o.noop,afterBody:o.noop,beforeFooter:o.noop,footer:o.noop,afterFooter:o.noop}}}),e.exports=function(t){function e(t,e){var n=o.color(t);return n.alpha(e*n.alpha()).rgbaString()}function n(t,e){return e&&(o.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function r(t){var e=t._xScale,n=t._yScale||t._scale,i=t._index,a=t._datasetIndex;return{xLabel:e?e.getLabelForIndex(i,a):"",yLabel:n?n.getLabelForIndex(i,a):"",index:i,datasetIndex:a,x:t._model.x,y:t._model.y}}function l(t){var e=i.global,n=o.valueOrDefault;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,bodyFontColor:t.bodyFontColor,_bodyFontFamily:n(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:n(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:n(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:n(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:n(t.titleFontStyle,e.defaultFontStyle),titleFontSize:n(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:n(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:n(t.footerFontStyle,e.defaultFontStyle),footerFontSize:n(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function s(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,l=r.reduce(function(t,e){return t+e.before.length+e.lines.length+e.after.length},0);l+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,u=e.footer.length,d=e.titleFontSize,c=e.bodyFontSize,h=e.footerFontSize;i+=s*d,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=l*c,i+=l?(l-1)*e.bodySpacing:0,i+=u?e.footerMarginTop:0,i+=u*h,i+=u?(u-1)*e.footerSpacing:0;var f=0,g=function(t){a=Math.max(a,n.measureText(t).width+f)};return n.font=o.fontString(d,e._titleFontStyle,e._titleFontFamily),o.each(e.title,g),n.font=o.fontString(c,e._bodyFontStyle,e._bodyFontFamily),o.each(e.beforeBody.concat(e.afterBody),g),f=e.displayColors?c+2:0,o.each(r,function(t){o.each(t.before,g),o.each(t.lines,g),o.each(t.after,g)}),f=0,n.font=o.fontString(h,e._footerFontStyle,e._footerFontFamily),o.each(e.footer,g),a+=2*e.xPadding,{width:a,height:i}}function u(t,e){var n=t._model,i=t._chart,a=t._chart.chartArea,o="center",r="center";n.y<e.height?r="top":n.y>i.height-e.height&&(r="bottom");var l,s,u,d,c,h=(a.left+a.right)/2,f=(a.top+a.bottom)/2;"center"===r?(l=function(t){return t<=h},s=function(t){return t>h}):(l=function(t){return t<=e.width/2},s=function(t){return t>=i.width-e.width/2}),u=function(t){return t+e.width>i.width},d=function(t){return t-e.width<0},c=function(t){return t<=f?"top":"bottom"},l(n.x)?(o="left",u(n.x)&&(o="center",r=c(n.y))):s(n.x)&&(o="right",d(n.x)&&(o="center",r=c(n.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:o,yAlign:g.yAlign?g.yAlign:r}}function d(t,e,n){var i=t.x,a=t.y,o=t.caretSize,r=t.caretPadding,l=t.cornerRadius,s=n.xAlign,u=n.yAlign,d=o+r,c=l+r;return"right"===s?i-=e.width:"center"===s&&(i-=e.width/2),"top"===u?a+=d:a-="bottom"===u?e.height+d:e.height/2,"center"===u?"left"===s?i+=d:"right"===s&&(i-=d):"left"===s?i-=c:"right"===s&&(i+=c),{x:i,y:a}}t.Tooltip=a.extend({initialize:function(){this._model=l(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options.callbacks,i=e.beforeTitle.apply(t,arguments),a=e.title.apply(t,arguments),o=e.afterTitle.apply(t,arguments),r=[];return r=n(r,i),r=n(r,a),r=n(r,o)},getBeforeBody:function(){var t=this._options.callbacks.beforeBody.apply(this,arguments);return o.isArray(t)?t:void 0!==t?[t]:[]},getBody:function(t,e){var i=this,a=i._options.callbacks,r=[];return o.each(t,function(t){var o={before:[],lines:[],after:[]};n(o.before,a.beforeLabel.call(i,t,e)),n(o.lines,a.label.call(i,t,e)),n(o.after,a.afterLabel.call(i,t,e)),r.push(o)}),r},getAfterBody:function(){var t=this._options.callbacks.afterBody.apply(this,arguments);return o.isArray(t)?t:void 0!==t?[t]:[]},getFooter:function(){var t=this,e=t._options.callbacks,i=e.beforeFooter.apply(t,arguments),a=e.footer.apply(t,arguments),o=e.afterFooter.apply(t,arguments),r=[];return r=n(r,i),r=n(r,a),r=n(r,o)},update:function(e){var n,i,a=this,c=a._options,h=a._model,f=a._model=l(c),g=a._active,p=a._data,v={xAlign:h.xAlign,yAlign:h.yAlign},m={x:h.x,y:h.y},b={width:h.width,height:h.height},x={x:h.caretX,y:h.caretY};if(g.length){f.opacity=1;var y=[],k=[];x=t.Tooltip.positioners[c.position].call(a,g,a._eventPosition);var w=[];for(n=0,i=g.length;n<i;++n)w.push(r(g[n]));c.filter&&(w=w.filter(function(t){return c.filter(t,p)})),c.itemSort&&(w=w.sort(function(t,e){return c.itemSort(t,e,p)})),o.each(w,function(t){y.push(c.callbacks.labelColor.call(a,t,a._chart)),k.push(c.callbacks.labelTextColor.call(a,t,a._chart))}),f.title=a.getTitle(w,p),f.beforeBody=a.getBeforeBody(w,p),f.body=a.getBody(w,p),f.afterBody=a.getAfterBody(w,p),f.footer=a.getFooter(w,p),f.x=Math.round(x.x),f.y=Math.round(x.y),f.caretPadding=c.caretPadding,f.labelColors=y,f.labelTextColors=k,f.dataPoints=w,m=d(f,b=s(this,f),v=u(this,b))}else f.opacity=0;return f.xAlign=v.xAlign,f.yAlign=v.yAlign,f.x=m.x,f.y=m.y,f.width=b.width,f.height=b.height,f.caretX=x.x,f.caretY=x.y,a._model=f,e&&c.custom&&c.custom.call(a,f),a},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,o,r,l,s,u=n.caretSize,d=n.cornerRadius,c=n.xAlign,h=n.yAlign,f=t.x,g=t.y,p=e.width,v=e.height;if("center"===h)l=g+v/2,"left"===c?(a=(i=f)-u,o=i,r=l+u,s=l-u):(a=(i=f+p)+u,o=i,r=l-u,s=l+u);else if("left"===c?(i=(a=f+d+u)-u,o=a+u):"right"===c?(i=(a=f+p-d-u)-u,o=a+u):(i=(a=f+p/2)-u,o=a+u),"top"===h)l=(r=g)-u,s=r;else{l=(r=g+v)+u,s=r;var m=o;o=i,i=m}return{x1:i,x2:a,x3:o,y1:r,y2:l,y3:s}},drawTitle:function(t,n,i,a){var r=n.title;if(r.length){i.textAlign=n._titleAlign,i.textBaseline="top";var l=n.titleFontSize,s=n.titleSpacing;i.fillStyle=e(n.titleFontColor,a),i.font=o.fontString(l,n._titleFontStyle,n._titleFontFamily);var u,d;for(u=0,d=r.length;u<d;++u)i.fillText(r[u],t.x,t.y),t.y+=l+s,u+1===r.length&&(t.y+=n.titleMarginBottom-s)}},drawBody:function(t,n,i,a){var r=n.bodyFontSize,l=n.bodySpacing,s=n.body;i.textAlign=n._bodyAlign,i.textBaseline="top",i.font=o.fontString(r,n._bodyFontStyle,n._bodyFontFamily);var u=0,d=function(e){i.fillText(e,t.x+u,t.y),t.y+=r+l};i.fillStyle=e(n.bodyFontColor,a),o.each(n.beforeBody,d);var c=n.displayColors;u=c?r+2:0,o.each(s,function(l,s){var u=e(n.labelTextColors[s],a);i.fillStyle=u,o.each(l.before,d),o.each(l.lines,function(o){c&&(i.fillStyle=e(n.legendColorBackground,a),i.fillRect(t.x,t.y,r,r),i.lineWidth=1,i.strokeStyle=e(n.labelColors[s].borderColor,a),i.strokeRect(t.x,t.y,r,r),i.fillStyle=e(n.labelColors[s].backgroundColor,a),i.fillRect(t.x+1,t.y+1,r-2,r-2),i.fillStyle=u),d(o)}),o.each(l.after,d)}),u=0,o.each(n.afterBody,d),t.y-=l},drawFooter:function(t,n,i,a){var r=n.footer;r.length&&(t.y+=n.footerMarginTop,i.textAlign=n._footerAlign,i.textBaseline="top",i.fillStyle=e(n.footerFontColor,a),i.font=o.fontString(n.footerFontSize,n._footerFontStyle,n._footerFontFamily),o.each(r,function(e){i.fillText(e,t.x,t.y),t.y+=n.footerFontSize+n.footerSpacing}))},drawBackground:function(t,n,i,a,o){i.fillStyle=e(n.backgroundColor,o),i.strokeStyle=e(n.borderColor,o),i.lineWidth=n.borderWidth;var r=n.xAlign,l=n.yAlign,s=t.x,u=t.y,d=a.width,c=a.height,h=n.cornerRadius;i.beginPath(),i.moveTo(s+h,u),"top"===l&&this.drawCaret(t,a),i.lineTo(s+d-h,u),i.quadraticCurveTo(s+d,u,s+d,u+h),"center"===l&&"right"===r&&this.drawCaret(t,a),i.lineTo(s+d,u+c-h),i.quadraticCurveTo(s+d,u+c,s+d-h,u+c),"bottom"===l&&this.drawCaret(t,a),i.lineTo(s+h,u+c),i.quadraticCurveTo(s,u+c,s,u+c-h),"center"===l&&"left"===r&&this.drawCaret(t,a),i.lineTo(s,u+h),i.quadraticCurveTo(s,u,s+h,u),i.closePath(),i.fill(),n.borderWidth>0&&i.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,o=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&o&&(this.drawBackground(i,e,t,n,a),i.x+=e.xPadding,i.y+=e.yPadding,this.drawTitle(i,e,t,a),this.drawBody(i,e,t,a),this.drawFooter(i,e,t,a))}},handleEvent:function(t){var e=this,n=e._options,i=!1;if(e._lastActive=e._lastActive||[],"mouseout"===t.type?e._active=[]:e._active=e._chart.getElementsAtEventForMode(t,n.mode,n),!(i=!o.arrayEquals(e._active,e._lastActive)))return!1;if(e._lastActive=e._active,n.enabled||n.custom){e._eventPosition={x:t.x,y:t.y};var a=e._model;e.update(!0),e.pivot(),i|=a.x!==e._model.x||a.y!==e._model.y}return i}}),t.Tooltip.positioners={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,o=0;for(e=0,n=t.length;e<n;++e){var r=t[e];if(r&&r.hasValue()){var l=r.tooltipPosition();i+=l.x,a+=l.y,++o}}return{x:Math.round(i/o),y:Math.round(a/o)}},nearest:function(t,e){var n,i,a,r=e.x,l=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var u=t[n];if(u&&u.hasValue()){var d=u.getCenterPoint(),c=o.distanceBetweenPoints(e,d);c<s&&(s=c,a=u)}}if(a){var h=a.tooltipPosition();r=h.x,l=h.y}return{x:r,y:l}}}}},{25:25,26:26,45:45}],36:[function(t,e,n){"use strict";var i=t(25),a=t(26),o=t(45);i._set("global",{elements:{arc:{backgroundColor:i.global.defaultColor,borderColor:"#fff",borderWidth:2}}}),e.exports=a.extend({inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=o.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,l=n.startAngle,s=n.endAngle;s<l;)s+=2*Math.PI;for(;a>s;)a-=2*Math.PI;for(;a<l;)a+=2*Math.PI;var u=a>=l&&a<=s,d=r>=n.innerRadius&&r<=n.outerRadius;return u&&d}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t=this._chart.ctx,e=this._view,n=e.startAngle,i=e.endAngle;t.beginPath(),t.arc(e.x,e.y,e.outerRadius,n,i),t.arc(e.x,e.y,e.innerRadius,i,n,!0),t.closePath(),t.strokeStyle=e.borderColor,t.lineWidth=e.borderWidth,t.fillStyle=e.backgroundColor,t.fill(),t.lineJoin="bevel",e.borderWidth&&t.stroke()}})},{25:25,26:26,45:45}],37:[function(t,e,n){"use strict";var i=t(25),a=t(26),o=t(45),r=i.global;i._set("global",{elements:{line:{tension:.4,backgroundColor:r.defaultColor,borderWidth:3,borderColor:r.defaultColor,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}}),e.exports=a.extend({draw:function(){var t,e,n,i,a=this,l=a._view,s=a._chart.ctx,u=l.spanGaps,d=a._children.slice(),c=r.elements.line,h=-1;for(a._loop&&d.length&&d.push(d[0]),s.save(),s.lineCap=l.borderCapStyle||c.borderCapStyle,s.setLineDash&&s.setLineDash(l.borderDash||c.borderDash),s.lineDashOffset=l.borderDashOffset||c.borderDashOffset,s.lineJoin=l.borderJoinStyle||c.borderJoinStyle,s.lineWidth=l.borderWidth||c.borderWidth,s.strokeStyle=l.borderColor||r.defaultColor,s.beginPath(),h=-1,t=0;t<d.length;++t)e=d[t],n=o.previousItem(d,t),i=e._view,0===t?i.skip||(s.moveTo(i.x,i.y),h=t):(n=-1===h?n:d[h],i.skip||(h!==t-1&&!u||-1===h?s.moveTo(i.x,i.y):o.canvas.lineTo(s,n._view,e._view),h=t));s.stroke(),s.restore()}})},{25:25,26:26,45:45}],38:[function(t,e,n){"use strict";function i(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hitRadius,2)}var a=t(25),o=t(26),r=t(45),l=a.global.defaultColor;a._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:l,borderColor:l,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}}),e.exports=o.extend({inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:i,inXRange:i,inYRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.y,2)<Math.pow(e.radius+e.hitRadius,2)},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._model,i=this._chart.ctx,o=e.pointStyle,s=e.radius,u=e.x,d=e.y,c=r.color,h=0;e.skip||(i.strokeStyle=e.borderColor||l,i.lineWidth=r.valueOrDefault(e.borderWidth,a.global.elements.point.borderWidth),i.fillStyle=e.backgroundColor||l,void 0!==t&&(n.x<t.left||1.01*t.right<n.x||n.y<t.top||1.01*t.bottom<n.y)&&(n.x<t.left?h=(u-n.x)/(t.left-n.x):1.01*t.right<n.x?h=(n.x-u)/(n.x-t.right):n.y<t.top?h=(d-n.y)/(t.top-n.y):1.01*t.bottom<n.y&&(h=(n.y-d)/(n.y-t.bottom)),h=Math.round(100*h)/100,i.strokeStyle=c(i.strokeStyle).alpha(h).rgbString(),i.fillStyle=c(i.fillStyle).alpha(h).rgbString()),r.canvas.drawPoint(i,o,s,u,d))}})},{25:25,26:26,45:45}],39:[function(t,e,n){"use strict";function i(t){return void 0!==t._view.width}function a(t){var e,n,a,o,r=t._view;if(i(t)){var l=r.width/2;e=r.x-l,n=r.x+l,a=Math.min(r.y,r.base),o=Math.max(r.y,r.base)}else{var s=r.height/2;e=Math.min(r.x,r.base),n=Math.max(r.x,r.base),a=r.y-s,o=r.y+s}return{left:e,top:a,right:n,bottom:o}}var o=t(25),r=t(26);o._set("global",{elements:{rectangle:{backgroundColor:o.global.defaultColor,borderColor:o.global.defaultColor,borderSkipped:"bottom",borderWidth:0}}}),e.exports=r.extend({draw:function(){function t(t){return m[(b+t)%4]}var e,n,i,a,o,r,l,s=this._chart.ctx,u=this._view,d=u.borderWidth;if(u.horizontal?(e=u.base,n=u.x,i=u.y-u.height/2,a=u.y+u.height/2,o=n>e?1:-1,r=1,l=u.borderSkipped||"left"):(e=u.x-u.width/2,n=u.x+u.width/2,i=u.y,o=1,r=(a=u.base)>i?1:-1,l=u.borderSkipped||"bottom"),d){var c=Math.min(Math.abs(e-n),Math.abs(i-a)),h=(d=d>c?c:d)/2,f=e+("left"!==l?h*o:0),g=n+("right"!==l?-h*o:0),p=i+("top"!==l?h*r:0),v=a+("bottom"!==l?-h*r:0);f!==g&&(i=p,a=v),p!==v&&(e=f,n=g)}s.beginPath(),s.fillStyle=u.backgroundColor,s.strokeStyle=u.borderColor,s.lineWidth=d;var m=[[e,a],[e,i],[n,i],[n,a]],b=["bottom","left","top","right"].indexOf(l,0);-1===b&&(b=0);var x=t(0);s.moveTo(x[0],x[1]);for(var y=1;y<4;y++)x=t(y),s.lineTo(x[0],x[1]);s.fill(),d&&s.stroke()},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){var n=!1;if(this._view){var i=a(this);n=t>=i.left&&t<=i.right&&e>=i.top&&e<=i.bottom}return n},inLabelRange:function(t,e){var n=this;if(!n._view)return!1;var o=a(n);return i(n)?t>=o.left&&t<=o.right:e>=o.top&&e<=o.bottom},inXRange:function(t){var e=a(this);return t>=e.left&&t<=e.right},inYRange:function(t){var e=a(this);return t>=e.top&&t<=e.bottom},getCenterPoint:function(){var t,e,n=this._view;return i(this)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return t.width*Math.abs(t.y-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}})},{25:25,26:26}],40:[function(t,e,n){"use strict";e.exports={},e.exports.Arc=t(36),e.exports.Line=t(37),e.exports.Point=t(38),e.exports.Rectangle=t(39)},{36:36,37:37,38:38,39:39}],41:[function(t,e,n){"use strict";var i=t(42),n=e.exports={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,o){if(o){var r=Math.min(o,i/2),l=Math.min(o,a/2);t.moveTo(e+r,n),t.lineTo(e+i-r,n),t.quadraticCurveTo(e+i,n,e+i,n+l),t.lineTo(e+i,n+a-l),t.quadraticCurveTo(e+i,n+a,e+i-r,n+a),t.lineTo(e+r,n+a),t.quadraticCurveTo(e,n+a,e,n+a-l),t.lineTo(e,n+l),t.quadraticCurveTo(e,n,e+r,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a){var o,r,l,s,u,d;if(!e||"object"!=typeof e||"[object HTMLImageElement]"!==(o=e.toString())&&"[object HTMLCanvasElement]"!==o){if(!(isNaN(n)||n<=0)){switch(e){default:t.beginPath(),t.arc(i,a,n,0,2*Math.PI),t.closePath(),t.fill();break;case"triangle":t.beginPath(),u=(r=3*n/Math.sqrt(3))*Math.sqrt(3)/2,t.moveTo(i-r/2,a+u/3),t.lineTo(i+r/2,a+u/3),t.lineTo(i,a-2*u/3),t.closePath(),t.fill();break;case"rect":d=1/Math.SQRT2*n,t.beginPath(),t.fillRect(i-d,a-d,2*d,2*d),t.strokeRect(i-d,a-d,2*d,2*d);break;case"rectRounded":var c=n/Math.SQRT2,h=i-c,f=a-c,g=Math.SQRT2*n;t.beginPath(),this.roundedRect(t,h,f,g,g,n/2),t.closePath(),t.fill();break;case"rectRot":d=1/Math.SQRT2*n,t.beginPath(),t.moveTo(i-d,a),t.lineTo(i,a+d),t.lineTo(i+d,a),t.lineTo(i,a-d),t.closePath(),t.fill();break;case"cross":t.beginPath(),t.moveTo(i,a+n),t.lineTo(i,a-n),t.moveTo(i-n,a),t.lineTo(i+n,a),t.closePath();break;case"crossRot":t.beginPath(),l=Math.cos(Math.PI/4)*n,s=Math.sin(Math.PI/4)*n,t.moveTo(i-l,a-s),t.lineTo(i+l,a+s),t.moveTo(i-l,a+s),t.lineTo(i+l,a-s),t.closePath();break;case"star":t.beginPath(),t.moveTo(i,a+n),t.lineTo(i,a-n),t.moveTo(i-n,a),t.lineTo(i+n,a),l=Math.cos(Math.PI/4)*n,s=Math.sin(Math.PI/4)*n,t.moveTo(i-l,a-s),t.lineTo(i+l,a+s),t.moveTo(i-l,a+s),t.lineTo(i+l,a-s),t.closePath();break;case"line":t.beginPath(),t.moveTo(i-n,a),t.lineTo(i+n,a),t.closePath();break;case"dash":t.beginPath(),t.moveTo(i,a),t.lineTo(i+n,a),t.closePath()}t.stroke()}}else t.drawImage(e,i-e.width/2,a-e.height/2,e.width,e.height)},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){if(n.steppedLine)return"after"===n.steppedLine&&!i||"after"!==n.steppedLine&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y),void t.lineTo(n.x,n.y);n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}};i.clear=n.clear,i.drawRoundedRectangle=function(t){t.beginPath(),n.roundedRect.apply(n,arguments),t.closePath()}},{42:42}],42:[function(t,e,n){"use strict";var i={noop:function(){},uid:function(){var t=0;return function(){return t++}}(),isNullOrUndef:function(t){return null===t||void 0===t},isArray:Array.isArray?Array.isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return i.valueOrDefault(i.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,a){var o,r,l;if(i.isArray(t))if(r=t.length,a)for(o=r-1;o>=0;o--)e.call(n,t[o],o);else for(o=0;o<r;o++)e.call(n,t[o],o);else if(i.isObject(t))for(r=(l=Object.keys(t)).length,o=0;o<r;o++)e.call(n,t[l[o]],l[o])},arrayEquals:function(t,e){var n,a,o,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,a=t.length;n<a;++n)if(o=t[n],r=e[n],o instanceof Array&&r instanceof Array){if(!i.arrayEquals(o,r))return!1}else if(o!==r)return!1;return!0},clone:function(t){if(i.isArray(t))return t.map(i.clone);if(i.isObject(t)){for(var e={},n=Object.keys(t),a=n.length,o=0;o<a;++o)e[n[o]]=i.clone(t[n[o]]);return e}return t},_merger:function(t,e,n,a){var o=e[t],r=n[t];i.isObject(o)&&i.isObject(r)?i.merge(o,r,a):e[t]=i.clone(r)},_mergerIf:function(t,e,n){var a=e[t],o=n[t];i.isObject(a)&&i.isObject(o)?i.mergeIf(a,o):e.hasOwnProperty(t)||(e[t]=i.clone(o))},merge:function(t,e,n){var a,o,r,l,s,u=i.isArray(e)?e:[e],d=u.length;if(!i.isObject(t))return t;for(a=(n=n||{}).merger||i._merger,o=0;o<d;++o)if(e=u[o],i.isObject(e))for(s=0,l=(r=Object.keys(e)).length;s<l;++s)a(r[s],t,e,n);return t},mergeIf:function(t,e){return i.merge(t,e,{merger:i._mergerIf})},extend:function(t){for(var e=1,n=arguments.length;e<n;++e)i.each(arguments[e],function(e,n){t[n]=e});return t},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},a=function(){this.constructor=n};return a.prototype=e.prototype,n.prototype=new a,n.extend=i.inherits,t&&i.extend(n.prototype,t),n.__super__=e.prototype,n}};e.exports=i,i.callCallback=i.callback,i.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},i.getValueOrDefault=i.valueOrDefault,i.getValueAtIndexOrDefault=i.valueAtIndexOrDefault},{}],43:[function(t,e,n){"use strict";var i=t(42),a={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-a.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*a.easeInBounce(2*t):.5*a.easeOutBounce(2*t-1)+.5}};e.exports={effects:a},i.easingEffects=a},{42:42}],44:[function(t,e,n){"use strict";var i=t(42);e.exports={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,a,o;return i.isObject(t)?(e=+t.top||0,n=+t.right||0,a=+t.bottom||0,o=+t.left||0):e=n=a=o=+t||0,{top:e,right:n,bottom:a,left:o,height:e+a,width:o+n}},resolve:function(t,e,n){var a,o,r;for(a=0,o=t.length;a<o;++a)if(void 0!==(r=t[a])&&(void 0!==e&&"function"==typeof r&&(r=r(e)),void 0!==n&&i.isArray(r)&&(r=r[n]),void 0!==r))return r}}},{42:42}],45:[function(t,e,n){"use strict";e.exports=t(42),e.exports.easing=t(43),e.exports.canvas=t(41),e.exports.options=t(44)},{41:41,42:42,43:43,44:44}],46:[function(t,e,n){e.exports={acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}}},{}],47:[function(t,e,n){"use strict";function i(t,e){var n=v.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}function a(t,e){var n=t.style,a=t.getAttribute("height"),o=t.getAttribute("width");if(t[m]={initial:{height:a,width:o,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===o||""===o){var r=i(t,"width");void 0!==r&&(t.width=r)}if(null===a||""===a)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var l=i(t,"height");void 0!==r&&(t.height=l)}return t}function o(t,e,n){t.addEventListener(e,n,M)}function r(t,e,n){t.removeEventListener(e,n,M)}function l(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function s(t,e){var n=w[t.type]||t.type,i=v.getRelativePosition(t,e);return l(n,e,i.x,i.y,t)}function u(t,e){var n=!1,i=[];return function(){i=Array.prototype.slice.call(arguments),e=e||this,n||(n=!0,v.requestAnimFrame.call(window,function(){n=!1,t.apply(e,i)}))}}function d(t){var e=document.createElement("div"),n=b+"size-monitor",i="position:absolute;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1;";e.style.cssText=i,e.className=n,e.innerHTML='<div class="'+n+'-expand" style="'+i+'"><div style="position:absolute;width:1000000px;height:1000000px;left:0;top:0"></div></div><div class="'+n+'-shrink" style="'+i+'"><div style="position:absolute;width:200%;height:200%;left:0; top:0"></div></div>';var a=e.childNodes[0],r=e.childNodes[1];e._reset=function(){a.scrollLeft=1e6,a.scrollTop=1e6,r.scrollLeft=1e6,r.scrollTop=1e6};var l=function(){e._reset(),t()};return o(a,"scroll",l.bind(a,"expand")),o(r,"scroll",l.bind(r,"shrink")),e}function c(t,e){var n=t[m]||(t[m]={}),i=n.renderProxy=function(t){t.animationName===y&&e()};v.each(k,function(e){o(t,e,i)}),n.reflow=!!t.offsetParent,t.classList.add(x)}function h(t){var e=t[m]||{},n=e.renderProxy;n&&(v.each(k,function(e){r(t,e,n)}),delete e.renderProxy),t.classList.remove(x)}function f(t,e,n){var i=t[m]||(t[m]={}),a=i.resizer=d(u(function(){if(i.resizer)return e(l("resize",n))}));c(t,function(){if(i.resizer){var e=t.parentNode;e&&e!==a.parentNode&&e.insertBefore(a,e.firstChild),a._reset()}})}function g(t){var e=t[m]||{},n=e.resizer;delete e.resizer,h(t),n&&n.parentNode&&n.parentNode.removeChild(n)}function p(t,e){var n=t._style||document.createElement("style");t._style||(t._style=n,e="/* Chart.js */\n"+e,n.setAttribute("type","text/css"),document.getElementsByTagName("head")[0].appendChild(n)),n.appendChild(document.createTextNode(e))}var v=t(45),m="$chartjs",b="chartjs-",x=b+"render-monitor",y=b+"render-animation",k=["animationstart","webkitAnimationStart"],w={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"},M=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};e.exports={_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,initialize:function(){var t="from{opacity:0.99}to{opacity:1}";p(this,"@-webkit-keyframes "+y+"{"+t+"}@keyframes "+y+"{"+t+"}."+x+"{-webkit-animation:"+y+" 0.001s;animation:"+y+" 0.001s;}")},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(a(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[m]){var n=e[m].initial;["height","width"].forEach(function(t){var i=n[t];v.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)}),v.each(n.style||{},function(t,n){e.style[n]=t}),e.width=e.width,delete e[m]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[m]||(n[m]={});o(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(s(e,t))})}else f(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[m]||{}).proxies||{})[t.id+"_"+e];a&&r(i,e,a)}else g(i)}},v.addEvent=o,v.removeEvent=r},{45:45}],48:[function(t,e,n){"use strict";var i=t(45),a=t(46),o=t(47),r=o._enabled?o:a;e.exports=i.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},r)},{45:45,46:46,47:47}],49:[function(t,e,n){"use strict";var i=t(25),a=t(40),o=t(45);i._set("global",{plugins:{filler:{propagate:!0}}}),e.exports=function(){function t(t,e,n){var i,a=t._model||{},o=a.fill;if(void 0===o&&(o=!!a.backgroundColor),!1===o||null===o)return!1;if(!0===o)return"origin";if(i=parseFloat(o,10),isFinite(i)&&Math.floor(i)===i)return"-"!==o[0]&&"+"!==o[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(o){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return o;default:return!1}}function e(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,o=null;if(isFinite(a))return null;if("start"===a?o=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?o=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?o=n.scaleZero:i.getBasePosition?o=i.getBasePosition():i.getBasePixel&&(o=i.getBasePixel()),void 0!==o&&null!==o){if(void 0!==o.x&&void 0!==o.y)return o;if("number"==typeof o&&isFinite(o))return e=i.isHorizontal(),{x:e?o:null,y:e?null:o}}return null}function n(t,e,n){var i,a=t[e].fill,o=[e];if(!n)return a;for(;!1!==a&&-1===o.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;o.push(a),a=i.fill}return!1}function r(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),d[n](t))}function l(t){return t&&!t.skip}function s(t,e,n,i,a){var r;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)o.canvas.lineTo(t,e[r-1],e[r]);for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)o.canvas.lineTo(t,n[r],n[r-1],!0)}}function u(t,e,n,i,a,o){var r,u,d,c,h,f,g,p=e.length,v=i.spanGaps,m=[],b=[],x=0,y=0;for(t.beginPath(),r=0,u=p+!!o;r<u;++r)h=n(c=e[d=r%p]._view,d,i),f=l(c),g=l(h),f&&g?(x=m.push(c),y=b.push(h)):x&&y&&(v?(f&&m.push(c),g&&b.push(h)):(s(t,m,b,x,y),x=y=0,m=[],b=[]));s(t,m,b,x,y),t.closePath(),t.fillStyle=a,t.fill()}var d={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],o=a.length||0;return o?function(t,e){return e<o&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};return{id:"filler",afterDatasetsUpdate:function(i,o){var l,s,u,d,c=(i.data.datasets||[]).length,h=o.propagate,f=[];for(s=0;s<c;++s)d=null,(u=(l=i.getDatasetMeta(s)).dataset)&&u._model&&u instanceof a.Line&&(d={visible:i.isDatasetVisible(s),fill:t(u,s,c),chart:i,el:u}),l.$filler=d,f.push(d);for(s=0;s<c;++s)(d=f[s])&&(d.fill=n(f,s,h),d.boundary=e(d),d.mapper=r(d))},beforeDatasetDraw:function(t,e){var n=e.meta.$filler;if(n){var a=t.ctx,r=n.el,l=r._view,s=r._children||[],d=n.mapper,c=l.backgroundColor||i.global.defaultColor;d&&c&&s.length&&(o.canvas.clipArea(a,t.chartArea),u(a,s,d,l,c,r._loop),o.canvas.unclipArea(a))}}}}},{25:25,40:40,45:45}],50:[function(t,e,n){"use strict";var i=t(25),a=t(26),o=t(45);i._set("global",{legend:{display:!0,position:"top",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data;return o.isArray(e.datasets)?e.datasets.map(function(e,n){return{text:e.label,fillStyle:o.isArray(e.backgroundColor)?e.backgroundColor[0]:e.backgroundColor,hidden:!t.isDatasetVisible(n),lineCap:e.borderCapStyle,lineDash:e.borderDash,lineDashOffset:e.borderDashOffset,lineJoin:e.borderJoinStyle,lineWidth:e.borderWidth,strokeStyle:e.borderColor,pointStyle:e.pointStyle,datasetIndex:n}},this):[]}}},legendCallback:function(t){var e=[];e.push('<ul class="'+t.id+'-legend">');for(var n=0;n<t.data.datasets.length;n++)e.push('<li><span style="background-color:'+t.data.datasets[n].backgroundColor+'"></span>'),t.data.datasets[n].label&&e.push(t.data.datasets[n].label),e.push("</li>");return e.push("</ul>"),e.join("")}}),e.exports=function(t){function e(t,e){return t.usePointStyle?e*Math.SQRT2:t.boxWidth}function n(e,n){var i=new t.Legend({ctx:e.ctx,options:n,chart:e});r.configure(e,i,n),r.addBox(e,i),e.legend=i}var r=t.layoutService,l=o.noop;return t.Legend=a.extend({initialize:function(t){o.extend(this,t),this.legendHitBoxes=[],this.doughnutMode=!1},beforeUpdate:l,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:l,beforeSetDimensions:l,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:l,beforeBuildLabels:l,buildLabels:function(){var t=this,e=t.options.labels||{},n=o.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter(function(n){return e.filter(n,t.chart.data)})),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:l,beforeFit:l,fit:function(){var t=this,n=t.options,a=n.labels,r=n.display,l=t.ctx,s=i.global,u=o.valueOrDefault,d=u(a.fontSize,s.defaultFontSize),c=u(a.fontStyle,s.defaultFontStyle),h=u(a.fontFamily,s.defaultFontFamily),f=o.fontString(d,c,h),g=t.legendHitBoxes=[],p=t.minSize,v=t.isHorizontal();if(v?(p.width=t.maxWidth,p.height=r?10:0):(p.width=r?10:0,p.height=t.maxHeight),r)if(l.font=f,v){var m=t.lineWidths=[0],b=t.legendItems.length?d+a.padding:0;l.textAlign="left",l.textBaseline="top",o.each(t.legendItems,function(n,i){var o=e(a,d)+d/2+l.measureText(n.text).width;m[m.length-1]+o+a.padding>=t.width&&(b+=d+a.padding,m[m.length]=t.left),g[i]={left:0,top:0,width:o,height:d},m[m.length-1]+=o+a.padding}),p.height+=b}else{var x=a.padding,y=t.columnWidths=[],k=a.padding,w=0,M=0,S=d+x;o.each(t.legendItems,function(t,n){var i=e(a,d)+d/2+l.measureText(t.text).width;M+S>p.height&&(k+=w+a.padding,y.push(w),w=0,M=0),w=Math.max(w,i),M+=S,g[n]={left:0,top:0,width:i,height:d}}),k+=w,y.push(w),p.width+=k}t.width=p.width,t.height=p.height},afterFit:l,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,n=t.options,a=n.labels,r=i.global,l=r.elements.line,s=t.width,u=t.lineWidths;if(n.display){var d,c=t.ctx,h=o.valueOrDefault,f=h(a.fontColor,r.defaultFontColor),g=h(a.fontSize,r.defaultFontSize),p=h(a.fontStyle,r.defaultFontStyle),v=h(a.fontFamily,r.defaultFontFamily),m=o.fontString(g,p,v);c.textAlign="left",c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=m;var b=e(a,g),x=t.legendHitBoxes,y=function(t,e,i){if(!(isNaN(b)||b<=0)){c.save(),c.fillStyle=h(i.fillStyle,r.defaultColor),c.lineCap=h(i.lineCap,l.borderCapStyle),c.lineDashOffset=h(i.lineDashOffset,l.borderDashOffset),c.lineJoin=h(i.lineJoin,l.borderJoinStyle),c.lineWidth=h(i.lineWidth,l.borderWidth),c.strokeStyle=h(i.strokeStyle,r.defaultColor);var a=0===h(i.lineWidth,l.borderWidth);if(c.setLineDash&&c.setLineDash(h(i.lineDash,l.borderDash)),n.labels&&n.labels.usePointStyle){var s=g*Math.SQRT2/2,u=s/Math.SQRT2,d=t+u,f=e+u;o.canvas.drawPoint(c,i.pointStyle,s,d,f)}else a||c.strokeRect(t,e,b,g),c.fillRect(t,e,b,g);c.restore()}},k=function(t,e,n,i){var a=g/2,o=b+a+t,r=e+a;c.fillText(n.text,o,r),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(o,r),c.lineTo(o+i,r),c.stroke())},w=t.isHorizontal();d=w?{x:t.left+(s-u[0])/2,y:t.top+a.padding,line:0}:{x:t.left+a.padding,y:t.top+a.padding,line:0};var M=g+a.padding;o.each(t.legendItems,function(e,n){var i=c.measureText(e.text).width,o=b+g/2+i,r=d.x,l=d.y;w?r+o>=s&&(l=d.y+=M,d.line++,r=d.x=t.left+(s-u[d.line])/2):l+M>t.bottom&&(r=d.x=r+t.columnWidths[d.line]+a.padding,l=d.y=t.top+a.padding,d.line++),y(r,l,e),x[n].left=r,x[n].top=l,k(r,l,e,i),w?d.x+=o+a.padding:d.y+=M})}},handleEvent:function(t){var e=this,n=e.options,i="mouseup"===t.type?"click":t.type,a=!1;if("mousemove"===i){if(!n.onHover)return}else{if("click"!==i)return;if(!n.onClick)return}var o=t.x,r=t.y;if(o>=e.left&&o<=e.right&&r>=e.top&&r<=e.bottom)for(var l=e.legendHitBoxes,s=0;s<l.length;++s){var u=l[s];if(o>=u.left&&o<=u.left+u.width&&r>=u.top&&r<=u.top+u.height){if("click"===i){n.onClick.call(e,t.native,e.legendItems[s]),a=!0;break}if("mousemove"===i){n.onHover.call(e,t.native,e.legendItems[s]),a=!0;break}}}return a}}),{id:"legend",beforeInit:function(t){var e=t.options.legend;e&&n(t,e)},beforeUpdate:function(t){var e=t.options.legend,a=t.legend;e?(o.mergeIf(e,i.global.legend),a?(r.configure(t,a,e),a.options=e):n(t,e)):a&&(r.removeBox(t,a),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}}}},{25:25,26:26,45:45}],51:[function(t,e,n){"use strict";var i=t(25),a=t(26),o=t(45);i._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,lineHeight:1.2,padding:10,position:"top",text:"",weight:2e3}}),e.exports=function(t){function e(e,i){var a=new t.Title({ctx:e.ctx,options:i,chart:e});n.configure(e,a,i),n.addBox(e,a),e.titleBlock=a}var n=t.layoutService,r=o.noop;return t.Title=a.extend({initialize:function(t){var e=this;o.extend(e,t),e.legendHitBoxes=[]},beforeUpdate:r,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:r,beforeSetDimensions:r,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:r,beforeBuildLabels:r,buildLabels:r,afterBuildLabels:r,beforeFit:r,fit:function(){var t=this,e=o.valueOrDefault,n=t.options,a=n.display,r=e(n.fontSize,i.global.defaultFontSize),l=t.minSize,s=o.isArray(n.text)?n.text.length:1,u=o.options.toLineHeight(n.lineHeight,r),d=a?s*u+2*n.padding:0;t.isHorizontal()?(l.width=t.maxWidth,l.height=d):(l.width=d,l.height=t.maxHeight),t.width=l.width,t.height=l.height},afterFit:r,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=o.valueOrDefault,a=t.options,r=i.global;if(a.display){var l,s,u,d=n(a.fontSize,r.defaultFontSize),c=n(a.fontStyle,r.defaultFontStyle),h=n(a.fontFamily,r.defaultFontFamily),f=o.fontString(d,c,h),g=o.options.toLineHeight(a.lineHeight,d),p=g/2+a.padding,v=0,m=t.top,b=t.left,x=t.bottom,y=t.right;e.fillStyle=n(a.fontColor,r.defaultFontColor),e.font=f,t.isHorizontal()?(s=b+(y-b)/2,u=m+p,l=y-b):(s="left"===a.position?b+p:y-p,u=m+(x-m)/2,l=x-m,v=Math.PI*("left"===a.position?-.5:.5)),e.save(),e.translate(s,u),e.rotate(v),e.textAlign="center",e.textBaseline="middle";var k=a.text;if(o.isArray(k))for(var w=0,M=0;M<k.length;++M)e.fillText(k[M],0,w,l),w+=g;else e.fillText(k,0,0,l);e.restore()}}}),{id:"title",beforeInit:function(t){var n=t.options.title;n&&e(t,n)},beforeUpdate:function(a){var r=a.options.title,l=a.titleBlock;r?(o.mergeIf(r,i.global.title),l?(n.configure(a,l,r),l.options=r):e(a,r)):l&&(t.layoutService.removeBox(a,l),delete a.titleBlock)}}}},{25:25,26:26,45:45}],52:[function(t,e,n){"use strict";e.exports=function(t){var e=t.Scale.extend({getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels},determineDataLimits:function(){var t=this,e=t.getLabels();t.minIndex=0,t.maxIndex=e.length-1;var n;void 0!==t.options.ticks.min&&(n=e.indexOf(t.options.ticks.min),t.minIndex=-1!==n?n:t.minIndex),void 0!==t.options.ticks.max&&(n=e.indexOf(t.options.ticks.max),t.maxIndex=-1!==n?n:t.maxIndex),t.min=e[t.minIndex],t.max=e[t.maxIndex]},buildTicks:function(){var t=this,e=t.getLabels();t.ticks=0===t.minIndex&&t.maxIndex===e.length-1?e:e.slice(t.minIndex,t.maxIndex+1)},getLabelForIndex:function(t,e){var n=this,i=n.chart.data,a=n.isHorizontal();return i.yLabels&&!a?n.getRightValue(i.datasets[e].data[t]):n.ticks[t-n.minIndex]},getPixelForValue:function(t,e){var n,i=this,a=i.options.offset,o=Math.max(i.maxIndex+1-i.minIndex-(a?0:1),1);if(void 0!==t&&null!==t&&(n=i.isHorizontal()?t.x:t.y),void 0!==n||void 0!==t&&isNaN(e)){var r=i.getLabels();t=n||t;var l=r.indexOf(t);e=-1!==l?l:e}if(i.isHorizontal()){var s=i.width/o,u=s*(e-i.minIndex);return a&&(u+=s/2),i.left+Math.round(u)}var d=i.height/o,c=d*(e-i.minIndex);return a&&(c+=d/2),i.top+Math.round(c)},getPixelForTick:function(t){return this.getPixelForValue(this.ticks[t],t+this.minIndex,null)},getValueForPixel:function(t){var e=this,n=e.options.offset,i=Math.max(e._ticks.length-(n?0:1),1),a=e.isHorizontal(),o=(a?e.width:e.height)/i;return t-=a?e.left:e.top,n&&(t-=o/2),(t<=0?0:Math.round(t/o))+e.minIndex},getBasePixel:function(){return this.bottom}});t.scaleService.registerScaleType("category",e,{position:"bottom"})}},{}],53:[function(t,e,n){"use strict";var i=t(25),a=t(45),o=t(34);e.exports=function(t){var e={position:"left",ticks:{callback:o.formatters.linear}},n=t.LinearScaleBase.extend({determineDataLimits:function(){function t(t){return r?t.xAxisID===e.id:t.yAxisID===e.id}var e=this,n=e.options,i=e.chart,o=i.data.datasets,r=e.isHorizontal();e.min=null,e.max=null;var l=n.stacked;if(void 0===l&&a.each(o,function(e,n){if(!l){var a=i.getDatasetMeta(n);i.isDatasetVisible(n)&&t(a)&&void 0!==a.stack&&(l=!0)}}),n.stacked||l){var s={};a.each(o,function(o,r){var l=i.getDatasetMeta(r),u=[l.type,void 0===n.stacked&&void 0===l.stack?r:"",l.stack].join(".");void 0===s[u]&&(s[u]={positiveValues:[],negativeValues:[]});var d=s[u].positiveValues,c=s[u].negativeValues;i.isDatasetVisible(r)&&t(l)&&a.each(o.data,function(t,i){var a=+e.getRightValue(t);isNaN(a)||l.data[i].hidden||(d[i]=d[i]||0,c[i]=c[i]||0,n.relativePoints?d[i]=100:a<0?c[i]+=a:d[i]+=a)})}),a.each(s,function(t){var n=t.positiveValues.concat(t.negativeValues),i=a.min(n),o=a.max(n);e.min=null===e.min?i:Math.min(e.min,i),e.max=null===e.max?o:Math.max(e.max,o)})}else a.each(o,function(n,o){var r=i.getDatasetMeta(o);i.isDatasetVisible(o)&&t(r)&&a.each(n.data,function(t,n){var i=+e.getRightValue(t);isNaN(i)||r.data[n].hidden||(null===e.min?e.min=i:i<e.min&&(e.min=i),null===e.max?e.max=i:i>e.max&&(e.max=i))})});e.min=isFinite(e.min)&&!isNaN(e.min)?e.min:0,e.max=isFinite(e.max)&&!isNaN(e.max)?e.max:1,this.handleTickRangeOptions()},getTickLimit:function(){var t,e=this,n=e.options.ticks;if(e.isHorizontal())t=Math.min(n.maxTicksLimit?n.maxTicksLimit:11,Math.ceil(e.width/50));else{var o=a.valueOrDefault(n.fontSize,i.global.defaultFontSize);t=Math.min(n.maxTicksLimit?n.maxTicksLimit:11,Math.ceil(e.height/(2*o)))}return t},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){var e,n=this,i=n.start,a=+n.getRightValue(t),o=n.end-i;return n.isHorizontal()?(e=n.left+n.width/o*(a-i),Math.round(e)):(e=n.bottom-n.height/o*(a-i),Math.round(e))},getValueForPixel:function(t){var e=this,n=e.isHorizontal(),i=n?e.width:e.height,a=(n?t-e.left:e.bottom-t)/i;return e.start+(e.end-e.start)*a},getPixelForTick:function(t){return this.getPixelForValue(this.ticksAsNumbers[t])}});t.scaleService.registerScaleType("linear",n,e)}},{25:25,34:34,45:45}],54:[function(t,e,n){"use strict";var i=t(45),a=t(34);e.exports=function(t){var e=i.noop;t.LinearScaleBase=t.Scale.extend({getRightValue:function(e){return"string"==typeof e?+e:t.Scale.prototype.getRightValue.call(this,e)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=i.sign(t.min),a=i.sign(t.max);n<0&&a<0?t.max=0:n>0&&a>0&&(t.min=0)}var o=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),o!==r&&t.min>=t.max&&(o?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:e,handleDirectionalChanges:e,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),o={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,stepSize:i.valueOrDefault(e.fixedStepSize,e.stepSize)},r=t.ticks=a.generators.linear(o,t);t.handleDirectionalChanges(),t.max=i.max(r),t.min=i.min(r),e.reverse?(r.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var e=this;e.ticksAsNumbers=e.ticks.slice(),e.zeroLineIndex=e.ticks.indexOf(0),t.Scale.prototype.convertTicksToLabels.call(e)}})}},{34:34,45:45}],55:[function(t,e,n){"use strict";var i=t(45),a=t(34);e.exports=function(t){var e={position:"left",ticks:{callback:a.formatters.logarithmic}},n=t.Scale.extend({determineDataLimits:function(){function t(t){return s?t.xAxisID===e.id:t.yAxisID===e.id}var e=this,n=e.options,a=n.ticks,o=e.chart,r=o.data.datasets,l=i.valueOrDefault,s=e.isHorizontal();e.min=null,e.max=null,e.minNotZero=null;var u=n.stacked;if(void 0===u&&i.each(r,function(e,n){if(!u){var i=o.getDatasetMeta(n);o.isDatasetVisible(n)&&t(i)&&void 0!==i.stack&&(u=!0)}}),n.stacked||u){var d={};i.each(r,function(a,r){var l=o.getDatasetMeta(r),s=[l.type,void 0===n.stacked&&void 0===l.stack?r:"",l.stack].join(".");o.isDatasetVisible(r)&&t(l)&&(void 0===d[s]&&(d[s]=[]),i.each(a.data,function(t,i){var a=d[s],o=+e.getRightValue(t);isNaN(o)||l.data[i].hidden||(a[i]=a[i]||0,n.relativePoints?a[i]=100:a[i]+=o)}))}),i.each(d,function(t){var n=i.min(t),a=i.max(t);e.min=null===e.min?n:Math.min(e.min,n),e.max=null===e.max?a:Math.max(e.max,a)})}else i.each(r,function(n,a){var r=o.getDatasetMeta(a);o.isDatasetVisible(a)&&t(r)&&i.each(n.data,function(t,n){var i=+e.getRightValue(t);isNaN(i)||r.data[n].hidden||(null===e.min?e.min=i:i<e.min&&(e.min=i),null===e.max?e.max=i:i>e.max&&(e.max=i),0!==i&&(null===e.minNotZero||i<e.minNotZero)&&(e.minNotZero=i))})});e.min=l(a.min,e.min),e.max=l(a.max,e.max),e.min===e.max&&(0!==e.min&&null!==e.min?(e.min=Math.pow(10,Math.floor(i.log10(e.min))-1),e.max=Math.pow(10,Math.floor(i.log10(e.max))+1)):(e.min=1,e.max=10))},buildTicks:function(){var t=this,e=t.options.ticks,n={min:e.min,max:e.max},o=t.ticks=a.generators.logarithmic(n,t);t.isHorizontal()||o.reverse(),t.max=i.max(o),t.min=i.min(o),e.reverse?(o.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),t.Scale.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){return this.getPixelForValue(this.tickValues[t])},getPixelForValue:function(t){var e,n,a,o=this,r=o.start,l=+o.getRightValue(t),s=o.options.ticks;return o.isHorizontal()?(a=i.log10(o.end)-i.log10(r),0===l?n=o.left:(e=o.width,n=o.left+e/a*(i.log10(l)-i.log10(r)))):(e=o.height,0!==r||s.reverse?0===o.end&&s.reverse?(a=i.log10(o.start)-i.log10(o.minNotZero),n=l===o.end?o.top:l===o.minNotZero?o.top+.02*e:o.top+.02*e+.98*e/a*(i.log10(l)-i.log10(o.minNotZero))):0===l?n=s.reverse?o.top:o.bottom:(a=i.log10(o.end)-i.log10(r),e=o.height,n=o.bottom-e/a*(i.log10(l)-i.log10(r))):(a=i.log10(o.end)-i.log10(o.minNotZero),n=l===r?o.bottom:l===o.minNotZero?o.bottom-.02*e:o.bottom-.02*e-.98*e/a*(i.log10(l)-i.log10(o.minNotZero)))),n},getValueForPixel:function(t){var e,n,a=this,o=i.log10(a.end)-i.log10(a.start);return a.isHorizontal()?(n=a.width,e=a.start*Math.pow(10,(t-a.left)*o/n)):(n=a.height,e=Math.pow(10,(a.bottom-t)*o/n)/a.start),e}});t.scaleService.registerScaleType("logarithmic",n,e)}},{34:34,45:45}],56:[function(t,e,n){"use strict";var i=t(25),a=t(45),o=t(34);e.exports=function(t){function e(t){var e=t.options;return e.angleLines.display||e.pointLabels.display?t.chart.data.labels.length:0}function n(t){var e=t.options.pointLabels,n=a.valueOrDefault(e.fontSize,v.defaultFontSize),i=a.valueOrDefault(e.fontStyle,v.defaultFontStyle),o=a.valueOrDefault(e.fontFamily,v.defaultFontFamily);return{size:n,style:i,family:o,font:a.fontString(n,i,o)}}function r(t,e,n){return a.isArray(n)?{w:a.longestText(t,t.font,n),h:n.length*e+1.5*(n.length-1)*e}:{w:t.measureText(n).width,h:e}}function l(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n-5,end:e}:{start:e,end:e+n+5}}function s(t){var i,o,s,u=n(t),d=Math.min(t.height/2,t.width/2),c={r:t.width,l:0,t:t.height,b:0},h={};t.ctx.font=u.font,t._pointLabelSizes=[];var f=e(t);for(i=0;i<f;i++){s=t.getPointPosition(i,d),o=r(t.ctx,u.size,t.pointLabels[i]||""),t._pointLabelSizes[i]=o;var g=t.getIndexAngle(i),p=a.toDegrees(g)%360,v=l(p,s.x,o.w,0,180),m=l(p,s.y,o.h,90,270);v.start<c.l&&(c.l=v.start,h.l=g),v.end>c.r&&(c.r=v.end,h.r=g),m.start<c.t&&(c.t=m.start,h.t=g),m.end>c.b&&(c.b=m.end,h.b=g)}t.setReductions(d,c,h)}function u(t){var e=Math.min(t.height/2,t.width/2);t.drawingArea=Math.round(e),t.setCenterPoint(0,0,0,0)}function d(t){return 0===t||180===t?"center":t<180?"left":"right"}function c(t,e,n,i){if(a.isArray(e))for(var o=n.y,r=1.5*i,l=0;l<e.length;++l)t.fillText(e[l],n.x,o),o+=r;else t.fillText(e,n.x,n.y)}function h(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function f(t){var i=t.ctx,o=a.valueOrDefault,r=t.options,l=r.angleLines,s=r.pointLabels;i.lineWidth=l.lineWidth,i.strokeStyle=l.color;var u=t.getDistanceFromCenterForValue(r.ticks.reverse?t.min:t.max),f=n(t);i.textBaseline="top";for(var g=e(t)-1;g>=0;g--){if(l.display){var p=t.getPointPosition(g,u);i.beginPath(),i.moveTo(t.xCenter,t.yCenter),i.lineTo(p.x,p.y),i.stroke(),i.closePath()}if(s.display){var m=t.getPointPosition(g,u+5),b=o(s.fontColor,v.defaultFontColor);i.font=f.font,i.fillStyle=b;var x=t.getIndexAngle(g),y=a.toDegrees(x);i.textAlign=d(y),h(y,t._pointLabelSizes[g],m),c(i,t.pointLabels[g]||"",m,f.size)}}}function g(t,n,i,o){var r=t.ctx;if(r.strokeStyle=a.valueAtIndexOrDefault(n.color,o-1),r.lineWidth=a.valueAtIndexOrDefault(n.lineWidth,o-1),t.options.gridLines.circular)r.beginPath(),r.arc(t.xCenter,t.yCenter,i,0,2*Math.PI),r.closePath(),r.stroke();else{var l=e(t);if(0===l)return;r.beginPath();var s=t.getPointPosition(0,i);r.moveTo(s.x,s.y);for(var u=1;u<l;u++)s=t.getPointPosition(u,i),r.lineTo(s.x,s.y);r.closePath(),r.stroke()}}function p(t){return a.isNumber(t)?t:0}var v=i.global,m={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0, 0, 0, 0.1)",lineWidth:1},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:o.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}},b=t.LinearScaleBase.extend({setDimensions:function(){var t=this,e=t.options,n=e.ticks;t.width=t.maxWidth,t.height=t.maxHeight,t.xCenter=Math.round(t.width/2),t.yCenter=Math.round(t.height/2);var i=a.min([t.height,t.width]),o=a.valueOrDefault(n.fontSize,v.defaultFontSize);t.drawingArea=e.display?i/2-(o/2+n.backdropPaddingY):i/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;a.each(e.data.datasets,function(o,r){if(e.isDatasetVisible(r)){var l=e.getDatasetMeta(r);a.each(o.data,function(e,a){var o=+t.getRightValue(e);isNaN(o)||l.data[a].hidden||(n=Math.min(o,n),i=Math.max(o,i))})}}),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},getTickLimit:function(){var t=this.options.ticks,e=a.valueOrDefault(t.fontSize,v.defaultFontSize);return Math.min(t.maxTicksLimit?t.maxTicksLimit:11,Math.ceil(this.drawingArea/(1.5*e)))},convertTicksToLabels:function(){var e=this;t.LinearScaleBase.prototype.convertTicksToLabels.call(e),e.pointLabels=e.chart.data.labels.map(e.options.pointLabels.callback,e)},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){this.options.pointLabels.display?s(this):u(this)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),o=Math.max(e.r-i.width,0)/Math.sin(n.r),r=-e.t/Math.cos(n.t),l=-Math.max(e.b-i.height,0)/Math.cos(n.b);a=p(a),o=p(o),r=p(r),l=p(l),i.drawingArea=Math.min(Math.round(t-(a+o)/2),Math.round(t-(r+l)/2)),i.setCenterPoint(a,o,r,l)},setCenterPoint:function(t,e,n,i){var a=this,o=a.width-e-a.drawingArea,r=t+a.drawingArea,l=n+a.drawingArea,s=a.height-i-a.drawingArea;a.xCenter=Math.round((r+o)/2+a.left),a.yCenter=Math.round((l+s)/2+a.top)},getIndexAngle:function(t){return t*(2*Math.PI/e(this))+(this.chart.options&&this.chart.options.startAngle?this.chart.options.startAngle:0)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(null===t)return 0;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this,i=n.getIndexAngle(t)-Math.PI/2;return{x:Math.round(Math.cos(i)*e)+n.xCenter,y:Math.round(Math.sin(i)*e)+n.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(){var t=this,e=t.min,n=t.max;return t.getPointPositionForValue(0,t.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},draw:function(){var t=this,e=t.options,n=e.gridLines,i=e.ticks,o=a.valueOrDefault;if(e.display){var r=t.ctx,l=this.getIndexAngle(0),s=o(i.fontSize,v.defaultFontSize),u=o(i.fontStyle,v.defaultFontStyle),d=o(i.fontFamily,v.defaultFontFamily),c=a.fontString(s,u,d);a.each(t.ticks,function(e,a){if(a>0||i.reverse){var u=t.getDistanceFromCenterForValue(t.ticksAsNumbers[a]);if(n.display&&0!==a&&g(t,n,u,a),i.display){var d=o(i.fontColor,v.defaultFontColor);if(r.font=c,r.save(),r.translate(t.xCenter,t.yCenter),r.rotate(l),i.showLabelBackdrop){var h=r.measureText(e).width;r.fillStyle=i.backdropColor,r.fillRect(-h/2-i.backdropPaddingX,-u-s/2-i.backdropPaddingY,h+2*i.backdropPaddingX,s+2*i.backdropPaddingY)}r.textAlign="center",r.textBaseline="middle",r.fillStyle=d,r.fillText(e,0,-u),r.restore()}}}),(e.angleLines.display||e.pointLabels.display)&&f(t)}}});t.scaleService.registerScaleType("radialLinear",b,m)}},{25:25,34:34,45:45}],57:[function(t,e,n){"use strict";function i(t,e){return t-e}function a(t){var e,n,i,a={},o=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,o.push(i));return o}function o(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,o,r,l,s,u=[],d=[e];for(a=0,o=t.length;a<o;++a)(l=t[a])>e&&l<n&&d.push(l);for(d.push(n),a=0,o=d.length;a<o;++a)s=d[a+1],r=d[a-1],l=d[a],void 0!==r&&void 0!==s&&Math.round((s+r)/2)===l||u.push({time:l,pos:a/(o-1)});return u}function r(t,e,n){for(var i,a,o,r=0,l=t.length-1;r>=0&&r<=l;){if(i=r+l>>1,a=t[i-1]||null,o=t[i],!a)return{lo:null,hi:o};if(o[e]<n)r=i+1;else{if(!(a[e]>n))return{lo:a,hi:o};l=i-1}}return{lo:o,hi:null}}function l(t,e,n,i){var a=r(t,e,n),o=a.lo?a.hi?a.lo:t[t.length-2]:t[0],l=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=l[e]-o[e],u=s?(n-o[e])/s:0,d=(l[i]-o[i])*u;return o[i]+d}function s(t,e){var n=e.parser,i=e.parser||e.format;return"function"==typeof n?n(t):"string"==typeof t&&"string"==typeof i?m(t,i):(t instanceof m||(t=m(t)),t.isValid()?t:"function"==typeof i?i(t):t)}function u(t,e){if(x.isNullOrUndef(t))return null;var n=e.options.time,i=s(e.getRightValue(t),n);return i.isValid()?(n.round&&i.startOf(n.round),i.valueOf()):null}function d(t,e,n,i){var a,o,r,l=e-t,s=w[n],u=s.size,d=s.steps;if(!d)return Math.ceil(l/((i||1)*u));for(a=0,o=d.length;a<o&&(r=d[a],!(Math.ceil(l/(u*r))<=i));++a);return r}function c(t,e,n,i){var a,o,r,l=M.length;for(a=M.indexOf(t);a<l-1;++a)if(o=w[M[a]],r=o.steps?o.steps[o.steps.length-1]:k,o.common&&Math.ceil((n-e)/(r*o.size))<=i)return M[a];return M[l-1]}function h(t,e,n,i){var a,o,r=m.duration(m(i).diff(m(n)));for(a=M.length-1;a>=M.indexOf(e);a--)if(o=M[a],w[o].common&&r.as(o)>=t.length)return o;return M[e?M.indexOf(e):0]}function f(t){for(var e=M.indexOf(t)+1,n=M.length;e<n;++e)if(w[M[e]].common)return M[e]}function g(t,e,n,i){var a,o=i.time,r=o.unit||c(o.minUnit,t,e,n),l=f(r),s=x.valueOrDefault(o.stepSize,o.unitStepSize),u="week"===r&&o.isoWeekday,h=i.ticks.major.enabled,g=w[r],p=m(t),v=m(e),b=[];for(s||(s=d(t,e,r,n)),u&&(p=p.isoWeekday(u),v=v.isoWeekday(u)),p=p.startOf(u?"day":r),(v=v.startOf(u?"day":r))<e&&v.add(1,r),a=m(p),h&&l&&!u&&!o.round&&(a.startOf(l),a.add(~~((p-a)/(g.size*s))*s,r));a<v;a.add(s,r))b.push(+a);return b.push(+a),b}function p(t,e,n,i,a){var o,r,s=0,u=0;return a.offset&&e.length&&(a.time.min||(o=e.length>1?e[1]:i,r=e[0],s=(l(t,"time",o,"pos")-l(t,"time",r,"pos"))/2),a.time.max||(o=e[e.length-1],r=e.length>1?e[e.length-2]:n,u=(l(t,"time",o,"pos")-l(t,"time",r,"pos"))/2)),{left:s,right:u}}function v(t,e){var n,i,a,o,r=[];for(n=0,i=t.length;n<i;++n)a=t[n],o=!!e&&a===+m(a).startOf(e),r.push({value:a,major:o});return r}var m=t(1);m="function"==typeof m?m:window.moment;var b=t(25),x=t(45),y=Number.MIN_SAFE_INTEGER||-9007199254740991,k=Number.MAX_SAFE_INTEGER||9007199254740991,w={millisecond:{common:!0,size:1,steps:[1,2,5,10,20,50,100,250,500]},second:{common:!0,size:1e3,steps:[1,2,5,10,30]},minute:{common:!0,size:6e4,steps:[1,2,5,10,30]},hour:{common:!0,size:36e5,steps:[1,2,3,6,12]},day:{common:!0,size:864e5,steps:[1,2,5]},week:{common:!1,size:6048e5,steps:[1,2,3,4]},month:{common:!0,size:2628e6,steps:[1,2,3]},quarter:{common:!1,size:7884e6,steps:[1,2,3,4]},year:{common:!0,size:3154e7}},M=Object.keys(w);e.exports=function(t){var e=t.Scale.extend({initialize:function(){if(!m)throw new Error("Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at https://momentjs.com");this.mergeTicksOptions(),t.Scale.prototype.initialize.call(this)},update:function(){var e=this,n=e.options;return n.time&&n.time.format&&console.warn("options.time.format is deprecated and replaced by options.time.parser."),t.Scale.prototype.update.apply(e,arguments)},getRightValue:function(e){return e&&void 0!==e.t&&(e=e.t),t.Scale.prototype.getRightValue.call(this,e)},determineDataLimits:function(){var t,e,n,o,r,l,s=this,d=s.chart,c=s.options.time,h=k,f=y,g=[],p=[],v=[];for(t=0,n=d.data.labels.length;t<n;++t)v.push(u(d.data.labels[t],s));for(t=0,n=(d.data.datasets||[]).length;t<n;++t)if(d.isDatasetVisible(t))if(r=d.data.datasets[t].data,x.isObject(r[0]))for(p[t]=[],e=0,o=r.length;e<o;++e)l=u(r[e],s),g.push(l),p[t][e]=l;else g.push.apply(g,v),p[t]=v.slice(0);else p[t]=[];v.length&&(v=a(v).sort(i),h=Math.min(h,v[0]),f=Math.max(f,v[v.length-1])),g.length&&(g=a(g).sort(i),h=Math.min(h,g[0]),f=Math.max(f,g[g.length-1])),h=u(c.min,s)||h,f=u(c.max,s)||f,h=h===k?+m().startOf("day"):h,f=f===y?+m().endOf("day")+1:f,s.min=Math.min(h,f),s.max=Math.max(h+1,f),s._horizontal=s.isHorizontal(),s._table=[],s._timestamps={data:g,datasets:p,labels:v}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,l=i.options,s=l.time,d=[],c=[];switch(l.ticks.source){case"data":d=i._timestamps.data;break;case"labels":d=i._timestamps.labels;break;case"auto":default:d=g(a,r,i.getLabelCapacity(a),l)}for("ticks"===l.bounds&&d.length&&(a=d[0],r=d[d.length-1]),a=u(s.min,i)||a,r=u(s.max,i)||r,t=0,e=d.length;t<e;++t)(n=d[t])>=a&&n<=r&&c.push(n);return i.min=a,i.max=r,i._unit=s.unit||h(c,s.minUnit,i.min,i.max),i._majorUnit=f(i._unit),i._table=o(i._timestamps.data,a,r,l.distribution),i._offsets=p(i._table,c,a,r,l),v(c,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n.chart.data,a=n.options.time,o=i.labels&&t<i.labels.length?i.labels[t]:"",r=i.datasets[e].data[t];return x.isObject(r)&&(o=n.getRightValue(r)),a.tooltipFormat&&(o=s(o,a).format(a.tooltipFormat)),o},tickFormatFunction:function(t,e,n,i){var a=this,o=a.options,r=t.valueOf(),l=o.time.displayFormats,s=l[a._unit],u=a._majorUnit,d=l[u],c=t.clone().startOf(u).valueOf(),h=o.ticks.major,f=h.enabled&&u&&d&&r===c,g=t.format(i||(f?d:s)),p=f?h:o.ticks.minor,v=x.valueOrDefault(p.callback,p.userCallback);return v?v(g,e,n):g},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(m(t[e].value),e,t));return i},getPixelForOffset:function(t){var e=this,n=e._horizontal?e.width:e.height,i=e._horizontal?e.left:e.top,a=l(e._table,"time",t,"pos");return i+n*(e._offsets.left+a)/(e._offsets.left+1+e._offsets.right)},getPixelForValue:function(t,e,n){var i=this,a=null;if(void 0!==e&&void 0!==n&&(a=i._timestamps.datasets[n][e]),null===a&&(a=u(t,i)),null!==a)return i.getPixelForOffset(a)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this,n=e._horizontal?e.width:e.height,i=e._horizontal?e.left:e.top,a=(n?(t-i)/n:0)*(e._offsets.left+1+e._offsets.left)-e._offsets.right,o=l(e._table,"pos",a,"time");return m(o)},getLabelWidth:function(t){var e=this,n=e.options.ticks,i=e.ctx.measureText(t).width,a=x.toRadians(n.maxRotation),o=Math.cos(a),r=Math.sin(a);return i*o+x.valueOrDefault(n.fontSize,b.global.defaultFontSize)*r},getLabelCapacity:function(t){var e=this,n=e.options.time.displayFormats.millisecond,i=e.tickFormatFunction(m(t),0,[],n),a=e.getLabelWidth(i),o=e.isHorizontal()?e.width:e.height;return Math.floor(o/a)}});t.scaleService.registerScaleType("time",e,{position:"bottom",distribution:"linear",bounds:"data",time:{parser:!1,format:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}})}},{1:1,25:25,45:45}]},{},[7])(7)});
\ No newline at end of file
diff --git a/public/javascripts/spectrum.css b/public/javascripts/spectrum.css
index a8ad9e4f82..03ffeda90c 100644
--- a/public/javascripts/spectrum.css
+++ b/public/javascripts/spectrum.css
@@ -113,7 +113,7 @@ License: MIT
 .sp-clear-enabled .sp-clear {
     display: block;
     position:absolute;
-    top:0px;
+    top:0;
     right:0;
     bottom:0;
     left:84%;
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 66f61df4e0..0413e56f41 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -122,13 +122,13 @@ class BulkImport::Base
 
   def fix_primary_keys
     puts "Updating primary key sequences..."
-    @raw_connection.exec("SELECT setval('#{Group.sequence_name}', #{@last_group_id})")
-    @raw_connection.exec("SELECT setval('#{User.sequence_name}', #{@last_user_id})")
-    @raw_connection.exec("SELECT setval('#{UserEmail.sequence_name}', #{@last_user_email_id})")
-    @raw_connection.exec("SELECT setval('#{Category.sequence_name}', #{@last_category_id})")
-    @raw_connection.exec("SELECT setval('#{Topic.sequence_name}', #{@last_topic_id})")
-    @raw_connection.exec("SELECT setval('#{Post.sequence_name}', #{@last_post_id})")
-    @raw_connection.exec("SELECT setval('#{PostAction.sequence_name}', #{@last_post_action_id})")
+    @raw_connection.exec("SELECT setval('#{Group.sequence_name}', #{@last_group_id})") if @last_group_id > 0
+    @raw_connection.exec("SELECT setval('#{User.sequence_name}', #{@last_user_id})") if @last_user_id > 0
+    @raw_connection.exec("SELECT setval('#{UserEmail.sequence_name}', #{@last_user_email_id})") if @last_user_email_id > 0
+    @raw_connection.exec("SELECT setval('#{Category.sequence_name}', #{@last_category_id})") if @last_category_id > 0
+    @raw_connection.exec("SELECT setval('#{Topic.sequence_name}', #{@last_topic_id})") if @last_topic_id > 0
+    @raw_connection.exec("SELECT setval('#{Post.sequence_name}', #{@last_post_id})") if @last_post_id > 0
+    @raw_connection.exec("SELECT setval('#{PostAction.sequence_name}', #{@last_post_action_id})") if @last_post_action_id > 0
   end
 
   def group_id_from_imported_id(id); @groups[id.to_s]; end
diff --git a/script/demon_test/child b/script/demon_test/child
new file mode 100755
index 0000000000..909d58f84b
--- /dev/null
+++ b/script/demon_test/child
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+$parent_pid = ARGV[0].to_i
+
+puts "Hello from #{Process.pid} my parent is #{$parent_pid}"
+
+Thread.new do
+
+  def alive?(pid)
+    Process.kill(0, pid)
+    true
+  rescue
+    false
+  end
+
+  while true
+    begin
+      unless alive?($parent_pid)
+        STDERR.puts "Parent was terminated!"
+        Process.kill "TERM", Process.pid
+        sleep 10
+        Process.kill "KILL", Process.pid
+      end
+    rescue => e
+      STDERR.puts "URGENT monitoring thread had an exception #{e}"
+    end
+    sleep 1
+  end
+end
+
+sleep
diff --git a/script/demon_test/parent.rb b/script/demon_test/parent.rb
new file mode 100644
index 0000000000..beb2658302
--- /dev/null
+++ b/script/demon_test/parent.rb
@@ -0,0 +1,25 @@
+require File.expand_path("../../../config/environment", __FILE__)
+
+puts "Parent is now loaded"
+
+class ForkExecDemon < Demon::Base
+  def self.prefix
+    "fork-exec-child"
+  end
+
+  def run
+    if @pid = fork
+      write_pid_file
+      return
+    end
+
+    exec "./child #{parent_pid}"
+  end
+end
+
+ForkExecDemon.start(1, verbose: true)
+
+while true
+  ForkExecDemon.ensure_running
+  sleep 0.1
+end
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 4d177156b4..7f683818f7 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -31,6 +31,7 @@ class ImportScripts::Base
     @site_settings_during_import = {}
     @old_site_settings = {}
     @start_times = { import: Time.now }
+    @skip_updates = false
   end
 
   def preload_i18n
@@ -46,14 +47,16 @@ class ImportScripts::Base
 
     puts ""
 
-    update_bumped_at
-    update_last_posted_at
-    update_last_seen_at
-    update_user_stats
-    update_feature_topic_users
-    update_category_featured_topics
-    update_topic_count_replies
-    reset_topic_counters
+    unless @skip_updates
+      update_bumped_at
+      update_last_posted_at
+      update_last_seen_at
+      update_user_stats
+      update_feature_topic_users
+      update_category_featured_topics
+      update_topic_count_replies
+      reset_topic_counters
+    end
 
     elapsed = Time.now - @start_times[:import]
     puts '', '', 'Done (%02dh %02dmin %02dsec)' % [elapsed / 3600, elapsed / 60 % 60, elapsed % 60]
diff --git a/script/import_scripts/ipboard.rb b/script/import_scripts/ipboard.rb
new file mode 100644
index 0000000000..18708898bf
--- /dev/null
+++ b/script/import_scripts/ipboard.rb
@@ -0,0 +1,1017 @@
+# coding: utf-8
+require "mysql2"
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+require 'htmlentities'
+begin
+  require 'reverse_markdown' # https://github.com/jqr/php-serialize
+rescue LoadError
+  puts
+  puts 'reverse_markdown not found.'
+  puts 'Add to Gemfile, like this: '
+  puts
+  puts "echo gem \\'reverse_markdown\\' >> Gemfile"
+  puts "bundle install"
+  exit
+end
+
+# Before running this script, paste these lines into your shell,
+# then use arrow keys to edit the values
+=begin
+export DB_HOST="localhost"
+export DB_NAME="ipboard"
+export DB_PW="ipboard"
+export DB_USER="ipboard"
+export TABLE_PREFIX="ipb_"
+export IMPORT_AFTER="1970-01-01"
+export UPLOADS="http://example.com/uploads"
+export URL="http://example.com/"
+export AVATARS_DIR="/imports/avatars/"
+export USERDIR="user"
+=end
+
+class ImportScripts::IpboardSQL < ImportScripts::Base
+
+  DB_HOST ||= ENV['DB_HOST'] || "localhost"
+  DB_NAME ||= ENV['DB_NAME'] || "ipboard"
+  DB_PW ||= ENV['DB_PW'] || "ipboard"
+  DB_USER ||= ENV['DB_USER'] || "ipboard"
+  TABLE_PREFIX ||= ENV['TABLE_PREFIX'] || "ipb_"
+  IMPORT_AFTER ||= ENV['IMPORT_AFTER'] || "1970-01-01"
+  UPLOADS ||= ENV['UPLOADS'] || "http://UPLOADS+LOCATION+IS+NOT+SET/uploads"
+  USERDIR ||= ENV['USERDIR'] || "user"
+  URL ||= ENV['URL'] || "https://forum.example.com"
+  AVATARS_DIR ||= ENV['AVATARS_DIR'] || '/home/pfaffman/data/example.com/avatars/'
+  BATCH_SIZE = 1000
+  ID_FIRST = true
+  QUIET = true
+  DEBUG = false
+  GALLERY_CAT_ID = 1234567
+  GALLERY_CAT_NAME = 'galeria'
+  EMO_DIR ||= ENV['EMO_DIR'] || "default"
+  OLD_FORMAT = false
+  if OLD_FORMAT
+    MEMBERS_TABLE = "#{TABLE_PREFIX}core_members"
+    FORUMS_TABLE =  "#{TABLE_PREFIX}forums_forums"
+    POSTS_TABLE = "#{TABLE_PREFIX}forums_posts"
+    TOPICS_TABLE = "#{TABLE_PREFIX}forums_topics"
+  else
+    MEMBERS_TABLE = "#{TABLE_PREFIX}members"
+    FORUMS_TABLE = "#{TABLE_PREFIX}forums"
+    POSTS_TABLE = "#{TABLE_PREFIX}posts"
+    TOPICS_TABLE = "#{TABLE_PREFIX}topics"
+    GROUPS_TABLE = "#{TABLE_PREFIX}groups"
+    PROFILE_TABLE = "#{TABLE_PREFIX}profile_portal"
+    ATTACHMENT_TABLE = "#{TABLE_PREFIX}attachments"
+  end
+
+  # TODO: replace ipb_ with TABLE_PREFIX
+
+  #################
+  # Site settings #
+  #################
+  # don't send any emails
+  SiteSetting.disable_emails = true
+  # don't send digests (so you can enable email without users noticing)
+  SiteSetting.disable_digest_emails = true
+  # keep site and users private
+  SiteSetting.login_required = true
+  SiteSetting.hide_user_profiles_from_public = true
+  # if site is made available, don't let it get indexed
+  SiteSetting.allow_index_in_robots_txt = false
+  # don't notify users when images in their posts get downloaded
+  SiteSetting.disable_edit_notifications = true
+  #  SiteSetting.force_hostname='forum.dev1dev.com'
+  SiteSetting.title = "IPB Import"
+
+  if ID_FIRST
+    # TODO figure this out
+    puts "WARNING: permalink_normalizations not set!!!"
+    sleep 1
+  #raw = "[ORIGINAL POST](#{URL}/topic/#{id}-#{slug})\n\n" + raw
+  #SiteSetting.permalink_normalizations='/topic/(.*t)\?.*/\1'
+  else
+    # remove stuff after a "?" and work for urls that end in .html
+    SiteSetting.permalink_normalizations = '/(.*t)[?.].*/\1'
+    #raw = "[ORIGINAL POST](#{URL}/#{slug}-#{id}t)\n\n" + raw
+  end
+
+  def initialize
+    if IMPORT_AFTER > "1970-01-01"
+      print_warning("Importing data after #{IMPORT_AFTER}")
+    end
+
+    super
+    @htmlentities = HTMLEntities.new
+    begin
+      @client = Mysql2::Client.new(
+        host: DB_HOST,
+        username: DB_USER,
+        password: DB_PW,
+        database: DB_NAME
+      )
+    rescue Exception => e
+      puts '=' * 50
+      puts e.message
+      puts <<EOM
+Cannot log in to database.
+
+Hostname: #{DB_HOST}
+Username: #{DB_USER}
+Password: #{DB_PW}
+database: #{DB_NAME}
+
+You should set these variables:
+
+export DB_HOST="localhost"
+export DB_NAME="ipboard"
+export DB_PW="ipboard"
+export DB_USER="ipboard"
+export TABLE_PREFIX="ipb_"
+export IMPORT_AFTER="1970-01-01"
+export URL="http://example.com"
+export UPLOADS=
+export USERDIR="user"
+
+Exiting.
+EOM
+      exit
+    end
+  end
+
+  def execute
+    import_users
+    import_categories
+    import_topics
+    import_posts
+    import_private_messages
+
+    # not supported import_image_categories
+    # NOT SUPPORTED import_gallery_topics
+    update_tl0
+    create_permalinks
+
+  end
+
+  def import_users
+    puts '', "creating users"
+
+    total_count = mysql_query("SELECT count(*) count FROM #{MEMBERS_TABLE}
+         WHERE last_activity > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'));").first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      #notes: no location, url,
+      results = mysql_query("
+             SELECT member_id id,
+                name username,
+                member_group_id usergroup,
+                email,
+                pp_thumb_photo avatar_url,
+#                pp_main_photo avatar_url,
+#                avatar_location avatar_url,
+# TODO consider joining ibf_profile_portal.avatar_location and avatar_type
+                FROM_UNIXTIME(joined) created_at,
+                FROM_UNIXTIME(last_activity) last_seen_at,
+                ip_address registration_ip_address,
+                member_banned banned,
+                bday_year, bday_month, bday_day,
+                g_title member_type,
+                last_visit last_seen_at
+     	        FROM #{MEMBERS_TABLE}, #{PROFILE_TABLE}, #{GROUPS_TABLE}
+       	        WHERE last_activity > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+                AND member_id=pp_member_id
+                AND member_group_id = g_id
+                order by member_id ASC
+                LIMIT #{BATCH_SIZE}
+                OFFSET #{offset};")
+
+      break if results.size < 1
+
+      next if all_records_exist? :users, results.map { |u| u['id'].to_i }
+
+      create_users(results, total: total_count, offset: offset) do |user|
+        next if user['email'].blank?
+        next if user['username'].blank?
+        next if @lookup.user_id_from_imported_user_id(user['id'])
+
+        birthday = Date.parse("#{user['bday_year']}-#{user['bday_month']}-#{user['bday_day']}") rescue nil
+        # TODO: what about timezones?
+        next if user['id'] == 0
+        { id: user['id'],
+          email: user['email'],
+          username: user['username'],
+          avatar_url: user['avatar_url'],
+          title: user['member_type'],
+          created_at: user['created_at'] == nil ? 0 : Time.zone.at(user['created_at']),
+          # bio_raw: user['bio_raw'],
+          registration_ip_address: user['registration_ip_address'],
+          # birthday: birthday,
+          last_seen_at: user['last_seen_at'] == nil ? 0 : Time.zone.at(user['last_seen_at']),
+          admin: /^Admin/.match(user['member_type']) ? true : false,
+          moderator: /^MOD/.match(user['member_type']) ? true : false,
+          post_create_action: proc do |newuser|
+            if user['avatar_url'] && user['avatar_url'].length > 0
+              photo_path = AVATARS_DIR + user['avatar_url']
+              if File.exists?(photo_path)
+                begin
+                  upload = create_upload(newuser.id, photo_path, File.basename(photo_path))
+                  if upload && upload.persisted?
+                    newuser.import_mode = false
+                    newuser.create_user_avatar
+                    newuser.import_mode = true
+                    newuser.user_avatar.update(custom_upload_id: upload.id)
+                    newuser.update(uploaded_avatar_id: upload.id)
+                  else
+                    puts "Error: Upload did not persist for #{photo_path}!"
+                  end
+                rescue SystemCallError => err
+                  puts "Could not import avatar #{photo_path}: #{err.message}"
+                end
+              else
+                puts "avatar file not found at #{photo_path}"
+              end
+            end
+            if user['banned'] != 0
+              suspend_user(newuser)
+            end
+          end
+        }
+      end
+    end
+  end
+
+  def suspend_user(user)
+    user.suspended_at = Time.now
+    user.suspended_till = 200.years.from_now
+    ban_reason = 'Account deactivated by administrator'
+
+    user_option = user.user_option
+    user_option.email_digests = false
+    user_option.email_private_messages = false
+    user_option.email_direct = false
+    user_option.email_always = false
+    user_option.save!
+
+    if user.save
+      StaffActionLogger.new(Discourse.system_user).log_user_suspend(user, ban_reason)
+    else
+      puts "Failed to suspend user #{user.username}. #{user.errors.try(:full_messages).try(:inspect)}"
+    end
+  end
+
+  def file_full_path(relpath)
+    File.join JSON_FILES_DIR, relpath.split("?").first
+  end
+
+  def import_image_categories
+    puts "", "importing image categories..."
+
+    categories = mysql_query("
+                  SELECT category_id id,
+                         category_name_seo name,
+	                 category_parent_id as parent_id
+                  FROM #{TABLE_PREFIX}gallery_categories
+                  ORDER BY id ASC
+                            ").to_a
+
+    category_names = mysql_query("
+                  SELECT DISTINCT word_key, word_default title
+                  FROM #{TABLE_PREFIX}core_sys_lang_words where word_app='gallery'
+                  AND word_key REGEXP 'gallery_category_[0-9]+$'
+                  ORDER BY word_key ASC
+                            ").to_a
+
+    cat_map = {}
+    puts "Creating gallery_cat_map"
+    category_names.each do |name|
+      title = name['title']
+      word_key = name['word_key']
+      puts "Processing #{word_key}: #{title}"
+      id = word_key.gsub('gallery_category_', '')
+      next if cat_map[id]
+      cat_map[id] = cat_map.has_value?(title) ? title + " " + id : title
+      puts "#{id} => #{cat_map[id]}"
+    end
+
+    params = { id: GALLERY_CAT_ID,
+               name: GALLERY_CAT_NAME }
+    create_category(params, params[:id])
+
+    create_categories(categories) do |category|
+      id = (category['id']).to_s
+      name = CGI.unescapeHTML(cat_map[id])
+      {
+        id: id + 'gal',
+        name: name,
+        parent_category_id: @lookup.category_id_from_imported_category_id(GALLERY_CAT_ID),
+        color: random_category_color
+      }
+    end
+  end
+
+  def import_categories
+    puts "", "importing categories..."
+
+    categories = mysql_query("
+                  SELECT id,
+                         name name,
+	                 parent_id as parent_id
+                  FROM #{FORUMS_TABLE}
+                  ORDER BY parent_id ASC
+                            ").to_a
+
+    top_level_categories = categories.select { |c| c["parent.id"] == -1 }
+
+    create_categories(top_level_categories) do |category|
+      id = category['id'].to_s
+      name = category['name']
+      {
+        id: id,
+        name: name,
+      }
+    end
+
+    children_categories = categories.select { |c| c["parent.id"] != -1 }
+    create_categories(children_categories) do |category|
+      id = category['id'].to_s
+      name = category['name']
+      {
+        id: id,
+        name: name,
+        parent_category_id: @lookup.category_id_from_imported_category_id(category['parent_id']),
+        color: random_category_color
+      }
+    end
+  end
+
+  def import_topics
+    puts "", "importing topics..."
+
+    total_count = mysql_query("SELECT count(*) count FROM #{POSTS_TABLE}
+       	        WHERE post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+                AND new_topic=1;")
+      .first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      discussions = mysql_query(<<-SQL
+            SELECT #{TOPICS_TABLE}.tid tid,
+               #{TOPICS_TABLE}.forum_id category,
+               #{POSTS_TABLE}.pid pid,
+               #{TOPICS_TABLE}.title title,
+               #{TOPICS_TABLE}.pinned pinned,
+               #{POSTS_TABLE}.post raw,
+               #{TOPICS_TABLE}.title_seo as slug,
+               FROM_UNIXTIME(#{POSTS_TABLE}.post_date) created_at,
+               #{POSTS_TABLE}.author_id user_id
+            FROM #{POSTS_TABLE}, #{TOPICS_TABLE}
+            WHERE #{POSTS_TABLE}.topic_id = #{TOPICS_TABLE}.tid
+            AND #{POSTS_TABLE}.new_topic = 1
+            AND #{POSTS_TABLE}.post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+            ORDER BY #{POSTS_TABLE}.post_date ASC
+            LIMIT #{BATCH_SIZE}
+            OFFSET #{offset}
+            SQL
+                               )
+
+      break if discussions.size < 1
+      next if all_records_exist? :posts, discussions.map { |t| "discussion#" + t['tid'].to_s }
+
+      create_posts(discussions, total: total_count, offset: offset) do |discussion|
+        slug = discussion['slug']
+        id = discussion['tid']
+        raw = clean_up(discussion['raw'])
+        {
+          id: "discussion#" + discussion['tid'].to_s,
+          user_id: user_id_from_imported_user_id(discussion['user_id']) || Discourse::SYSTEM_USER_ID,
+          title: CGI.unescapeHTML(discussion['title']),
+          category: category_id_from_imported_category_id(discussion['category'].to_s),
+          raw: raw,
+          pinned_at: discussion['pinned'].to_i == 1 ? Time.zone.at(discussion['created_at']) : nil,
+          created_at: Time.zone.at(discussion['created_at']),
+        }
+      end
+    end
+  end
+
+  def array_from_members_string(invited_members = 'a:3:{i:0;i:22629;i:1;i:21837;i:2;i:22234;}')
+    out = []
+    count_regex = /a:(\d)+:/
+    count = count_regex.match(invited_members)[1]
+    rest = invited_members.sub(count_regex, "")
+    i_regex = /i:\d+;i:(\d+);/
+    while m = i_regex.match(rest)
+      i = m[1]
+      rest.sub!(i_regex, "")
+      puts "i: #{i}, #{rest}"
+      out += [ i.to_i ]
+    end
+    out
+  end
+
+  def import_private_messages
+    puts "", "importing private messages..."
+
+    topic_count = mysql_query("SELECT COUNT(msg_id) count FROM #{TABLE_PREFIX}message_posts").first["count"]
+
+    last_private_message_topic_id = -1
+
+    batches(BATCH_SIZE) do |offset|
+      private_messages = mysql_query(<<-SQL
+          SELECT msg_id pmtextid,
+                 msg_topic_id topic_id,
+                 msg_author_id fromuserid,
+                 mt_title title,
+                 msg_post message,
+                 mt_invited_members touserarray,
+                 mt_to_member_id to_user_id,
+                 msg_is_first_post first_post,
+                 msg_date dateline
+            FROM #{TABLE_PREFIX}message_topics, #{TABLE_PREFIX}message_posts
+           WHERE msg_topic_id = mt_id
+             AND msg_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+        ORDER BY msg_topic_id, msg_id
+           LIMIT #{BATCH_SIZE}
+          OFFSET #{offset}
+      SQL
+                                    )
+
+      puts "Processing #{private_messages.count} messages"
+      break if private_messages.count < 1
+      puts "Processing . . . "
+      private_messages = private_messages.reject { |pm| @lookup.post_already_imported?("pm-#{pm['pmtextid']}") }
+
+      title_username_of_pm_first_post = {}
+
+      create_posts(private_messages, total: topic_count, offset: offset) do |m|
+        skip = false
+        mapped = {}
+
+        mapped[:id] = "pm-#{m['pmtextid']}"
+        mapped[:user_id] = user_id_from_imported_user_id(m['fromuserid']) || Discourse::SYSTEM_USER_ID
+        mapped[:raw] = clean_up(m['message']) rescue nil
+        mapped[:created_at] = Time.zone.at(m['dateline'])
+        title = @htmlentities.decode(m['title']).strip[0...255]
+        topic_id = nil
+
+        next if mapped[:raw].blank?
+
+        # users who are part of this private message.
+        target_usernames = []
+        target_userids = []
+        begin
+          to_user_array = [ m['to_user_id'] ] + array_from_members_string(m['touserarray'])
+        rescue
+          puts "#{m['pmtextid']} -- #{m['touserarray']}"
+          skip = true
+        end
+
+        begin
+          to_user_array.each do |to_user|
+            user_id = user_id_from_imported_user_id(to_user)
+            username = User.find_by(id: user_id).try(:username)
+            target_userids << user_id || Discourse::SYSTEM_USER_ID
+            target_usernames << username if username
+            if user_id
+              puts "Found user: #{to_user} -- #{user_id} -- #{username}"
+            else
+              puts "Can't find user: #{to_user}"
+            end
+          end
+        rescue
+          puts "skipping pm-#{m['pmtextid']} `to_user_array` is broken -- #{to_user_array.inspect}"
+          skip = true
+        end
+
+        participants = target_userids
+        participants << mapped[:user_id]
+        begin
+          participants.sort!
+        rescue
+          puts "one of the participant's id is nil -- #{participants.inspect}"
+        end
+
+        if last_private_message_topic_id != m['topic_id']
+          last_private_message_topic_id = m['topic_id']
+          puts "New message: #{m['topic_id']}: #{title} from #{m['fromuserid']} (#{mapped[:user_id]})" unless QUIET
+          # topic post message
+          topic_id = m['topic_id']
+          mapped[:title] = title
+          mapped[:archetype] = Archetype.private_message
+          mapped[:target_usernames] = target_usernames.join(',')
+          if mapped[:target_usernames].size < 1 # pm with yourself?
+            # skip = true
+            mapped[:target_usernames] = "system"
+            puts "pm-#{m['pmtextid']} has no target (#{m['touserarray']})"
+          end
+        else # reply
+          topic_id = topic_lookup_from_imported_post_id("pm-#{topic_id}")
+          if !topic_id
+            skip = true
+          end
+          mapped[:topic_id] = topic_id
+          puts "Reply message #{topic_id}: #{m['topic_id']}: from #{m['fromuserid']} (#{mapped[:user_id]})"  unless QUIET
+        end
+        #        puts "#{target_usernames} -- #{mapped[:target_usernames]}"
+        #        puts "Adding #{mapped}"
+        skip ? nil : mapped
+        #        puts "#{'-'*50}> added"
+      end
+    end
+  end
+
+  def import_gallery_topics
+    # pfaffman: I'm not clear whether this is an IPBoard thing or from some other system
+    puts "", "importing gallery albums..."
+
+    gallery_count = 0
+    total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}gallery_images
+                ;")
+      .first['count']
+
+    # NOTE: for imports with huge numbers of galleries, this needs to use limits
+
+    batches(BATCH_SIZE) do |offset|
+      # galleries = mysql_query(<<-SQL
+
+      #       SELECT #{TABLE_PREFIX}gallery_albums.album_id tid,
+      #           #{TABLE_PREFIX}gallery_albums.album_category_id category,
+      #           #{TABLE_PREFIX}gallery_albums.album_owner_id user_id,
+      #           #{TABLE_PREFIX}gallery_albums.album_name title,
+      #           #{TABLE_PREFIX}gallery_albums.album_description raw,
+      #           #{TABLE_PREFIX}gallery_albums.album_type,
+      #            FROM_UNIXTIME(#{TABLE_PREFIX}gallery_albums.album_last_img_date) created_at
+      #       FROM #{TABLE_PREFIX}gallery_albums
+      #       ORDER BY #{TABLE_PREFIX}gallery_albums.album_id ASC
+
+      #       SQL
+      #                        )
+
+      images = mysql_query(<<-SQL
+
+            SELECT #{TABLE_PREFIX}gallery_albums.album_id tid,
+                #{TABLE_PREFIX}gallery_albums.album_category_id category,
+                #{TABLE_PREFIX}gallery_albums.album_owner_id user_id,
+                #{TABLE_PREFIX}gallery_albums.album_name title,
+                #{TABLE_PREFIX}gallery_albums.album_description raw,
+                #{TABLE_PREFIX}gallery_albums.album_type,
+                #{TABLE_PREFIX}gallery_images.image_caption caption,
+                #{TABLE_PREFIX}gallery_images.image_description description,
+                #{TABLE_PREFIX}gallery_images.image_masked_file_name masked,
+                #{TABLE_PREFIX}gallery_images.image_id image_id,
+                #{TABLE_PREFIX}gallery_images.image_medium_file_name medium,
+                #{TABLE_PREFIX}gallery_images.image_original_file_name orig,
+                 FROM_UNIXTIME(#{TABLE_PREFIX}gallery_albums.album_last_img_date) created_at,
+                #{TABLE_PREFIX}gallery_images.image_file_name filename
+                FROM #{TABLE_PREFIX}gallery_albums, #{TABLE_PREFIX}gallery_images
+                WHERE  #{TABLE_PREFIX}gallery_images.image_album_id=#{TABLE_PREFIX}gallery_albums.album_id
+            ORDER BY #{TABLE_PREFIX}gallery_albums.album_id, image_date DESC
+            LIMIT #{BATCH_SIZE}
+            OFFSET #{offset};
+
+            SQL
+
+                          )
+
+      break if images.size < 1
+      next if all_records_exist? :posts, images.map { |t| "gallery#" + t['tid'].to_s + t['image_id'].to_s }
+
+      last_id = images.first['tid']
+      raw = "Gallery ID: #{last_id}\n" + clean_up(images.first['raw'])
+      raw += "#{clean_up(images.first['description'])}\n"
+      last_gallery = images.first.dup
+      create_posts(images, total: total_count, offset: offset) do |gallery|
+        id = gallery['tid'].to_i
+        #puts "ID: #{id}, last_id: #{last_id}, image: #{gallery['image_id']}"
+        if id == last_id
+          raw += "### #{gallery['caption']}\n"
+          raw += "#{UPLOADS}/#{gallery['orig']}\n"
+          last_gallery = gallery.dup
+          next
+        else
+          insert_raw = raw.dup
+          last_id = gallery['tid']
+          if DEBUG
+            raw = "Gallery ID: #{last_id}\n" + clean_up(gallery['raw'])
+            raw += "Cat: #{last_gallery['category'].to_s} - #{category_id_from_imported_category_id(last_gallery['category'].to_s + 'gal')}"
+          end
+          raw += "#{clean_up(images.first['description'])}\n"
+          raw += "### #{gallery['caption']}\n"
+          if DEBUG
+            raw += "User #{gallery['user_id']}, image_id: #{gallery['image_id']}\n"
+          end
+          raw += "#{UPLOADS}/#{gallery['orig']}\n"
+          gallery_count += 1
+          puts "#{gallery_count}--Cat: #{last_gallery['category'].to_s} ==> #{category_id_from_imported_category_id(last_gallery['category'].to_s + 'gal')}" unless QUIET
+          {
+            id: "gallery#" + last_gallery['tid'].to_s + last_gallery['image_id'].to_s,
+            user_id: user_id_from_imported_user_id(last_gallery['user_id']) || Discourse::SYSTEM_USER_ID,
+            title: CGI.unescapeHTML(last_gallery['title']),
+            category: category_id_from_imported_category_id(last_gallery['category'].to_s + 'gal'),
+            raw: insert_raw,
+          }
+        end
+      end
+    end
+  end
+
+  # TODO: use this to figure out to pin posts
+  def map_first_post(row, mapped)
+    mapped[:category] = @lookup.category_id_from_imported_category_id(row[:forum_id])
+    mapped[:title] = CGI.unescapeHTML(row[:topic_title]).strip[0...255]
+    mapped[:pinned_at] = mapped[:created_at] unless row[:topic_type] == Constants::POST_NORMAL
+    mapped[:pinned_globally] = row[:topic_type] == Constants::POST_GLOBAL
+    mapped[:post_create_action] = proc do |post|
+      @permalink_importer.create_for_topic(post.topic, row[:topic_id])
+    end
+
+    mapped
+  end
+
+  def import_comments
+    puts "", "importing gallery comments..."
+
+    total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}gallery_comments;")
+      .first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      comments = mysql_query(<<-SQL
+
+            SELECT #{TABLE_PREFIX}gallery_comments.tid tid,
+               #{TABLE_PREFIX}gallery_topics.forum_id category,
+               #{TABLE_PREFIX}gallery_posts.pid pid,
+               #{TABLE_PREFIX}gallery_topics.title title,
+               #{TABLE_PREFIX}gallery_posts.post raw,
+               FROM_UNIXTIME(#{TABLE_PREFIX}gallery_posts.post_date) created_at,
+               #{TABLE_PREFIX}gallery_posts.author_id user_id
+            FROM #{TABLE_PREFIX}gallery_posts, #{TABLE_PREFIX}gallery_topics
+            WHERE #{TABLE_PREFIX}gallery_posts.topic_id = #{TABLE_PREFIX}gallery_topics.tid
+            AND #{TABLE_PREFIX}gallery_posts.new_topic = 0
+            AND #{TABLE_PREFIX}gallery_posts.post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+            ORDER BY #{TABLE_PREFIX}gallery_posts.post_date ASC
+            LIMIT #{BATCH_SIZE}
+            OFFSET #{offset}
+
+            SQL
+                            )
+
+      break if comments.size < 1
+      next if all_records_exist? :posts, comments.map { |comment| "comment#" + comment['pid'].to_s }
+
+      create_posts(comments, total: total_count, offset: offset) do |comment|
+        next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['tid'].to_s)
+        next if comment['raw'].blank?
+        {
+          id: "comment#" + comment['pid'].to_s,
+          user_id: user_id_from_imported_user_id(comment['user_id']) || Discourse::SYSTEM_USER_ID,
+          topic_id: t[:topic_id],
+          raw: clean_up(comment['raw']),
+          created_at: Time.zone.at(comment['created_at'])
+        }
+      end
+    end
+  end
+
+  def import_posts
+    puts "", "importing posts..."
+
+    total_count = mysql_query("SELECT count(*) count FROM #{POSTS_TABLE}
+       	        WHERE post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+                AND new_topic=0;")
+      .first['count']
+
+    batches(BATCH_SIZE) do |offset|
+      comments = mysql_query(<<-SQL
+            SELECT #{TOPICS_TABLE}.tid tid,
+               #{TOPICS_TABLE}.forum_id category,
+               #{POSTS_TABLE}.pid pid,
+               #{TOPICS_TABLE}.title title,
+               #{POSTS_TABLE}.post raw,
+               FROM_UNIXTIME(#{POSTS_TABLE}.post_date) created_at,
+               #{POSTS_TABLE}.author_id user_id
+            FROM #{POSTS_TABLE}, #{TOPICS_TABLE}
+            WHERE #{POSTS_TABLE}.topic_id = #{TOPICS_TABLE}.tid
+            AND #{POSTS_TABLE}.new_topic = 0
+            AND #{POSTS_TABLE}.post_date > UNIX_TIMESTAMP(STR_TO_DATE('#{IMPORT_AFTER}', '%Y-%m-%d'))
+            ORDER BY #{POSTS_TABLE}.post_date ASC
+            LIMIT #{BATCH_SIZE}
+            OFFSET #{offset}
+            SQL
+                            )
+
+      break if comments.size < 1
+      next if all_records_exist? :posts, comments.map { |comment| "comment#" + comment['pid'].to_s }
+
+      create_posts(comments, total: total_count, offset: offset) do |comment|
+        next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['tid'].to_s)
+        next if comment['raw'].blank?
+        {
+          id: "comment#" + comment['pid'].to_s,
+          user_id: user_id_from_imported_user_id(comment['user_id']) || Discourse::SYSTEM_USER_ID,
+          topic_id: t[:topic_id],
+          raw: clean_up(comment['raw']),
+          created_at: Time.zone.at(comment['created_at'])
+        }
+      end
+    end
+  end
+
+  def nokogiri_fix_blockquotes(raw)
+    # this makes proper quotes with user/topic/post references.
+    # I'm not clear if it is for just some bizarre imported data, or it might ever be useful
+    # It should be integrated into the Nokogiri section of clean_up, though.
+    @doc = Nokogiri::XML("<html>" + raw + "</html>")
+
+    # handle <blockquote>s with links to original post
+    @doc.css('blockquote[class=ipsQuote]').each do |b|
+      # puts "\n#{'#'*50}\n#{b}\n\nCONTENT: #{b['data-ipsquote-contentid']}"
+      # b.options = Nokogiri::XML::ParseOptions::STRICT
+      imported_post_id = b['data-ipsquote-contentcommentid'].to_s
+      content_type = b['data-ipsquote-contenttype'].to_s
+      content_class = b['data-ipsquote-contentclass'].to_s
+      content_id = b['data-ipsquote-contentid'].to_s || b['data-cid'].to_s
+      topic_lookup = topic_lookup_from_imported_post_id("comment#" + imported_post_id)
+      post_lookup = topic_lookup_from_imported_post_id("discussion#" + content_id)
+      post = topic_lookup ? topic_lookup[:post_number] : nil
+      topic = topic_lookup ? topic_lookup[:topic_id] : nil
+      post ||= post_lookup ? post_lookup[:post_number] : nil
+      topic ||= post_lookup ? post_lookup[:topic_id] : nil
+
+      # TODO: consider: <blockquote class="ipsStyle_spoiler" data-ipsspoiler="">
+      # consider: <pre class="ipsCode prettyprint">
+      # TODO make sure it's the imported username
+      # TODO: do _s still get \-escaped?
+      ips_username = b['data-ipsquote-username'] || b['data-author']
+      username = ips_username
+      new_text = ""
+      if DEBUG
+        # new_text += "post: #{imported_post_id} --> #{post_lookup} --> |#{post}|<br>\n"
+        # new_text += "topic: #{content_id} --> #{topic_lookup} --> |#{topic}|<br>\n"
+        # new_text += "user: #{ips_username} --> |#{username}|<br>\n"
+        # new_text += "class: #{content_class}<br>\n"
+        # new_text += "type: #{content_type}<br>\n"
+        if content_class.length > 0 && content_class != "forums_Topic"
+          new_text += "UNEXPECTED CONTENT CLASS! #{content_class}<br>\n"
+        end
+        if content_type.length > 0 && content_type != "forums"
+          new_text += "UNEXPECTED CONTENT TYPE! #{content_type}<br>\n"
+        end
+        # puts "#{'-'*20} and NOWWWWW!!!! \n #{new_text}"
+      end
+      if post && topic && username
+        quote = "\n[quote=\"#{username}, post:#{post}, topic: #{topic}\"]\n\n"
+      else
+        if username && username.length > 1
+          quote = "\n[quote=\"#{username}\"]\n\n"
+        else
+          quote = "\n[quote]\n"
+        end
+        # new_doc = Nokogiri::XML("<div>#{new_text}</div>")
+      end
+      puts "QUOTE: #{quote}"
+      sleep 1
+      b.content = quote + b.content + "\n[/quote]\n"
+      b.name = 'div'
+    end
+
+    raw = @doc.to_html
+  end
+
+  def clean_up(raw)
+    return "" if raw.blank?
+
+    raw.gsub!(/<#EMO_DIR#>/, EMO_DIR)
+    # TODO what about uploads?
+    # raw.gsub!(/<fileStore.core_Attachment>/,UPLOADS)
+    raw.gsub!(/<br>/, "\n\n")
+    raw.gsub!(/<br \/>/, "\n\n")
+    raw.gsub!(/<p>&nbsp;<\/p>/, "\n\n")
+    raw.gsub!(/\[hr\]/, "\n***\n")
+    raw.gsub!(/&#39;/, "'")
+    raw.gsub!(/\[url="(.+?)"\]http.+?\[\/url\]/, "\\1\n")
+    raw.gsub!(/\[media\](.+?)\[\/media\]/, "\n\\1\n\n")
+    raw.gsub!(/\[\/quote\]/, "\n[/quote]\n")
+    raw.gsub!(/date=\'(.+?)\'/, '')
+    raw.gsub!(/timestamp=\'(.+?)\' /, '')
+
+    quote_regex = /\[quote name=\'(.+?)\'\s+post=\'(\d+?)\'\s*\]/
+    while quote = quote_regex.match(raw)
+      # get IPB post number and find Discourse post and topic number
+      puts "----------------------------------------\nName: #{quote[1]}, post: #{quote[2]}" unless QUIET
+      imported_post_id = quote[2].to_s
+      topic_lookup = topic_lookup_from_imported_post_id("comment#" + imported_post_id)
+      post_lookup = topic_lookup_from_imported_post_id("discussion#" + imported_post_id)
+      puts "topic_lookup: #{topic_lookup}, post: #{post_lookup}" unless QUIET
+      post_num = topic_lookup ? topic_lookup[:post_number] : nil
+      topic_num = topic_lookup ? topic_lookup[:topic_id] : nil
+      post_num ||= post_lookup ? post_lookup[:post_number] : nil
+      topic_num ||= post_lookup ? post_lookup[:topic_id] : nil
+
+      # Fix or leave bogus username?
+      username = find_user_by_import_id(quote[1]) || quote[1]
+      puts "username: #{username}, post_id: #{post_num}, topic_id: #{topic_num}" unless QUIET
+      puts "Before fixing a quote: #{raw}\n**************************************** " unless QUIET
+      post_string = post_num ? ", post:#{post_num}" : ""
+      topic_string = topic_num ? ", topic:#{topic_num}" : ""
+      raw.gsub!(quote_regex, "\n[quote=\"#{username}#{post_string}#{topic_string}\"]\n\n")
+      puts "AFTER!!!!!!!!!!!!1: #{raw}" unless QUIET
+      sleep 1
+      raw
+    end
+
+    attach_regex = /\[attachment=(\d+?):.+\]/
+    while attach = attach_regex.match(raw)
+      attach_id = attach[1]
+      attachments =
+        mysql_query("SELECT attach_location as loc,
+                            attach_file as filename
+                     FROM #{ATTACHMENT_TABLE}
+                     WHERE attach_id=#{attach_id}")
+      if attachments.count < 1
+        puts "Attachment #{attach_id} not found."
+        attach_string = "Attachment #{attach_id} not found."
+      else
+        attach_string = "#{attach_id}\n\n![#{attachments.first['filename']}](#{UPLOADS}/#{attachments.first['loc']})\n"
+      end
+      raw.gsub!(attach_regex, attach_string)
+    end
+
+    raw
+  end
+
+  def random_category_color
+    colors = SiteSetting.category_colors.split('|')
+    colors[rand(colors.count)]
+  end
+
+  def old_clean_up(raw)
+    # This was for a forum that appeared to have lots of customization's.
+    # IT did a good job of handling quotes and whatnot, but I don't know
+    # what version if IPBoard it was for.
+    return "" if raw.blank?
+
+    raw.gsub!(/<___base_url___>/, URL)
+    raw.gsub!(/<fileStore.core_Emoticons>/, UPLOADS)
+    raw.gsub!(/<fileStore.core_Attachment>/, UPLOADS)
+    raw.gsub!(/<br>/, "\n")
+
+    @doc = Nokogiri::XML("<html>" + raw + "</html>")
+
+    # handle <blockquote>s with links to original post
+    @doc.css('blockquote[class=ipsQuote]').each do |b|
+      imported_post_id = b['data-ipsquote-contentcommentid'].to_s
+      content_type = b['data-ipsquote-contenttype'].to_s
+      content_class = b['data-ipsquote-contentclass'].to_s
+      content_id = b['data-ipsquote-contentid'].to_s || b['data-cid'].to_s
+      topic_lookup = topic_lookup_from_imported_post_id("comment#" + imported_post_id)
+      post_lookup = topic_lookup_from_imported_post_id("discussion#" + content_id)
+      post = topic_lookup ? topic_lookup[:post_number] : nil
+      topic = topic_lookup ? topic_lookup[:topic_id] : nil
+      post ||= post_lookup ? post_lookup[:post_number] : nil
+      topic ||= post_lookup ? post_lookup[:topic_id] : nil
+
+      # TODO: consider: <blockquote class="ipsStyle_spoiler" data-ipsspoiler="">
+      # consider: <pre class="ipsCode prettyprint">
+      ips_username = b['data-ipsquote-username'] || b['data-author']
+      username = ips_username
+      new_text = ""
+      if DEBUG
+        if content_class.length > 0 && content_class != "forums_Topic"
+          new_text += "UNEXPECTED CONTENT CLASS! #{content_class}<br>\n"
+        end
+        if content_type.length > 0 && content_type != "forums"
+          new_text += "UNEXPECTED CONTENT TYPE! #{content_type}<br>\n"
+        end
+      end
+      if post && topic && username
+        quote = "[quote=\"#{username}, post:#{post}, topic: #{topic}\"]\n\n"
+      else
+        if username && username.length > 1
+          quote = "[quote=\"#{username}\"]\n\n"
+        else
+          quote = "[quote]\n"
+        end
+      end
+      b.content = quote + b.content + "\n[/quote]\n"
+      b.name = 'div'
+    end
+
+    @doc.css('object param embed').each do |embed|
+      embed.replace("\n#{embed['src']}\n")
+    end
+
+    # handle <iframe data-embedcontent>s with links to original post
+    # no examples in recent import
+    @doc.css('iframe[data-embedcontent]').each do |d|
+      d.to_s.match(/\-([0-9]+)t/)
+      imported_post_id = $1
+      if imported_post_id
+        puts "Searching for #{imported_post_id}" unless QUIET
+        topic_lookup = topic_lookup_from_imported_post_id("discussion#" + imported_post_id)
+        topic = topic_lookup ? topic_lookup[:topic_id] : nil
+        if topic
+          url = URL + "/t/#{topic}"
+          d.to_s.match(/comment=([0-9]+)&/)
+          content_id = $1 || "-1"
+          if content_id
+            post_lookup = topic_lookup_from_imported_post_id("comment#" + content_id)
+            post = topic_lookup ? topic_lookup[:post_number] : 1
+            url += "/#{post}"
+          end
+          d.content = url
+        end
+      end
+      d.name = 'div'
+    end
+
+    @doc.css('div[class=ipsQuote_citation]').each do |d|
+      d.remove
+    end
+
+    raw = @doc.to_html
+
+    # let ReverseMarkdown handle the rest
+    raw = ReverseMarkdown.convert raw
+
+    # remove tabs at start of line to avoid everything being a <pre>
+    raw = raw.gsub(/^\t+/, "")
+
+    # un \-escape _s in usernames in [quote]s
+    raw.gsub!(/^\[quote=.+?_.*$/) do |match|
+      match = match.gsub('\_', '_')
+      match
+    end
+    raw
+  end
+
+  def staff_guardian
+    @_staff_guardian ||= Guardian.new(Discourse.system_user)
+  end
+
+  def mysql_query(sql)
+    @client.query(sql)
+    # @client.query(sql, cache_rows: false) #segfault: cache_rows: false causes segmentation fault
+  end
+
+  def create_permalinks
+    puts '', 'Creating redirects...', ''
+
+    # TODO: permalink normalizations: /(.*t)\?.*/\1
+
+    puts '', 'Users...', ''
+    User.find_each do |u|
+      ucf = u.custom_fields
+      if ucf && ucf["import_id"] && ucf["import_username"]
+        username = URI.escape(ucf["import_username"])
+        Permalink.create(url: "#{USERDIR}/#{ucf['import_id']}-#{username}", external_url: "/users/#{u.username}") rescue nil
+        print '.'
+      end
+    end
+
+    puts '', 'Posts...', ''
+    Post.find_each do |post|
+      pcf = post.custom_fields
+      if pcf && pcf["import_id"]
+        if post.post_number == 1
+          topic = post.topic
+          id = pcf["import_id"].split('#').last
+          slug = topic.slug
+          if ID_FIRST
+            Permalink.create(url: "topic/#{id}-#{slug}", topic_id: topic.id) rescue nil
+            unless QUIET
+              print_warning("#{URL}topic/#{id}-#{slug} --> http://localhost:3000/topic/#{id}-#{slug}")
+            end
+          else
+            Permalink.create(url: "#{slug}-#{id}t", topic_id: topic.id) rescue nil
+            unless QUIET
+              print_warning("#{URL}/#{slug}-#{id}t --> http://localhost:3000/t/#{topic.id}")
+            end
+          end
+        else # don't think we can do posts
+          # Permalink.create( url: "#{BASE}/forum_entry-id-#{id}.html", post_id: post.id ) rescue nil
+          # unless QUIET
+          #   print_warning("forum_entry-id-#{id}.html --> http://localhost:3000/t/#{topic.id}/#{post.id}")
+          # end
+        end
+        print '.'
+      end
+    end
+
+    puts '', 'Categories...', ''
+    Category.find_each do |cat|
+      ccf = cat.custom_fields
+      next unless id = ccf["import_id"]
+      slug = cat['slug']
+      unless QUIET
+        print_warning("/forum/#{URL}-#{slug}-#{id} --> /c/#{slug}")
+      end
+      Permalink.create(url: "/forum/#{id}-#{slug}", category_id: cat.id) rescue nil
+      print '.'
+    end
+  end
+
+  def print_warning(message)
+    $stderr.puts "#{message}"
+  end
+
+end
+
+ImportScripts::IpboardSQL.new.perform
diff --git a/script/import_scripts/mbox/importer.rb b/script/import_scripts/mbox/importer.rb
index dbdd7c1651..3886f33bb6 100644
--- a/script/import_scripts/mbox/importer.rb
+++ b/script/import_scripts/mbox/importer.rb
@@ -24,9 +24,14 @@ module ImportScripts::Mbox
 
     def execute
       index_messages
-      import_categories
-      import_users
-      import_posts
+
+      if @settings.index_only
+        @skip_updates = true
+      else
+        import_categories
+        import_users
+        import_posts
+      end
     end
 
     def index_messages
@@ -64,7 +69,7 @@ module ImportScripts::Mbox
             email: row['email'],
             name: row['name'],
             trust_level: @settings.trust_level,
-            staged: true,
+            staged: @settings.staged,
             active: false,
             created_at: to_time(row['date_of_first_message'])
           }
diff --git a/script/import_scripts/mbox/settings.yml b/script/import_scripts/mbox/settings.yml
index a8db4453fd..a4b449a3d6 100644
--- a/script/import_scripts/mbox/settings.yml
+++ b/script/import_scripts/mbox/settings.yml
@@ -1,10 +1,18 @@
-# PostgreSQL mailing lists
-#data_dir: /shared/import/data
-#split_regex: "^From .*@postgresql.org.*"
-
-# ruby-talk mailing list
 data_dir: /shared/import/data
-split_regex: ""
+
+# mbox files
+split_regex: "^From .+"
+#split_regex: "^From .+@example.com.+"
+
+# individual emails
+#split_regex: ""
+
+# Listserv files
+#split_regex: "^========================================================================="
 
 default_trust_level: 1
 prefer_html: false
+staged: true
+index_only: false
+
+group_messages_by_subject: false
diff --git a/script/import_scripts/mbox/support/database.rb b/script/import_scripts/mbox/support/database.rb
index 2a20960c25..085dd2f913 100644
--- a/script/import_scripts/mbox/support/database.rb
+++ b/script/import_scripts/mbox/support/database.rb
@@ -2,7 +2,7 @@ require 'sqlite3'
 
 module ImportScripts::Mbox
   class Database
-    SCHEMA_VERSION = 1
+    SCHEMA_VERSION = 2
 
     def initialize(directory, batch_size)
       @db = SQLite3::Database.new("#{directory}/index.db", results_as_hash: true)
@@ -17,6 +17,15 @@ module ImportScripts::Mbox
       create_table_for_users
     end
 
+    def transaction
+      @db.transaction
+      yield self
+      @db.commit
+
+    rescue
+      @db.rollback
+    end
+
     def insert_category(category)
       @db.execute(<<-SQL, category)
         INSERT OR REPLACE INTO category (name, description)
@@ -35,10 +44,10 @@ module ImportScripts::Mbox
       @db.execute(<<-SQL, email)
         INSERT OR REPLACE INTO email (msg_id, from_email, from_name, subject,
           email_date, raw_message, body, elided, format, attachment_count, charset,
-          category, filename, first_line_number, last_line_number)
+          category, filename, first_line_number, last_line_number, index_duration)
         VALUES (:msg_id, :from_email, :from_name, :subject,
           :email_date, :raw_message, :body, :elided, :format, :attachment_count, :charset,
-          :category, :filename, :first_line_number, :last_line_number)
+          :category, :filename, :first_line_number, :last_line_number, :index_duration)
       SQL
     end
 
@@ -69,7 +78,21 @@ module ImportScripts::Mbox
       SQL
     end
 
-    def sort_emails
+    def update_in_reply_to_by_email_subject
+      @db.execute <<-SQL
+        UPDATE email
+        SET in_reply_to = NULLIF((
+          SELECT e.msg_id
+          FROM email e
+            JOIN email_order o ON (e.msg_id = o.msg_id)
+          WHERE e.subject = email.subject
+          ORDER BY o.ROWID
+          LIMIT 1
+        ), msg_id)
+      SQL
+    end
+
+    def sort_emails_by_date_and_reply_level
       @db.execute 'DELETE FROM email_order'
 
       @db.execute <<-SQL
@@ -90,6 +113,17 @@ module ImportScripts::Mbox
       SQL
     end
 
+    def sort_emails_by_subject
+      @db.execute 'DELETE FROM email_order'
+
+      @db.execute <<-SQL
+        INSERT INTO email_order (msg_id)
+        SELECT msg_id
+        FROM email
+        ORDER BY subject, filename, ROWID
+      SQL
+    end
+
     def fill_users_from_emails
       @db.execute 'DELETE FROM user'
 
@@ -164,10 +198,17 @@ module ImportScripts::Mbox
 
     def configure_database
       @db.execute 'PRAGMA journal_mode = OFF'
+      @db.execute 'PRAGMA locking_mode = EXCLUSIVE'
     end
 
     def upgrade_schema_version
-      # current_version = query("PRAGMA user_version").last[0]
+      current_version = @db.get_first_value("PRAGMA user_version")
+
+      case current_version
+      when 1
+        @db.execute "ALTER TABLE email ADD COLUMN index_duration REAL"
+      end
+
       @db.execute "PRAGMA user_version = #{SCHEMA_VERSION}"
     end
 
@@ -211,11 +252,13 @@ module ImportScripts::Mbox
           filename TEXT NOT NULL,
           first_line_number INTEGER,
           last_line_number INTEGER,
+          index_duration REAL,
           FOREIGN KEY(category) REFERENCES category(name)
         )
       SQL
 
       @db.execute 'CREATE INDEX IF NOT EXISTS email_by_from ON email (from_email)'
+      @db.execute 'CREATE INDEX IF NOT EXISTS email_by_subject ON email (subject)'
       @db.execute 'CREATE INDEX IF NOT EXISTS email_by_in_reply_to ON email (in_reply_to)'
       @db.execute 'CREATE INDEX IF NOT EXISTS email_by_date ON email (email_date)'
 
diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index 251975f07d..d3980cd725 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -8,12 +8,12 @@ module ImportScripts::Mbox
     # @param settings [ImportScripts::Mbox::Settings]
     def initialize(database, settings)
       @database = database
-      @root_directory = settings.data_dir
+      @settings = settings
       @split_regex = settings.split_regex
     end
 
     def execute
-      directories = Dir.glob(File.join(@root_directory, '*'))
+      directories = Dir.glob(File.join(@settings.data_dir, '*'))
       directories.select! { |f| File.directory?(f) }
       directories.sort!
 
@@ -24,14 +24,21 @@ module ImportScripts::Mbox
       end
 
       puts '', 'indexing replies and users'
-      @database.update_in_reply_to_of_emails
-      @database.sort_emails
+      if @settings.group_messages_by_subject
+        @database.sort_emails_by_subject
+        @database.update_in_reply_to_by_email_subject
+      else
+        @database.update_in_reply_to_of_emails
+        @database.sort_emails_by_date_and_reply_level
+      end
+
       @database.fill_users_from_emails
     end
 
     private
 
     METADATA_FILENAME = 'metadata.yml'.freeze
+    IGNORED_FILE_EXTENSIONS = ['.dbindex', '.dbnames', '.digest', '.subjects']
 
     def index_category(directory)
       metadata_file = File.join(directory, METADATA_FILENAME)
@@ -54,7 +61,7 @@ module ImportScripts::Mbox
     end
 
     def index_emails(directory, category_name)
-      all_messages(directory, category_name) do |receiver, filename, first_line_number, last_line_number|
+      all_messages(directory, category_name) do |receiver, filename, opts|
         msg_id = receiver.message_id
         parsed_email = receiver.mail
         from_email, from_display_name = receiver.parse_from_field(parsed_email)
@@ -75,19 +82,23 @@ module ImportScripts::Mbox
           charset: parsed_email.charset&.downcase,
           category: category_name,
           filename: File.basename(filename),
-          first_line_number: first_line_number,
-          last_line_number: last_line_number
+          first_line_number: opts[:first_line_number],
+          last_line_number: opts[:last_line_number],
+          index_duration: (monotonic_time - opts[:start_time]).round(4)
         }
 
-        @database.insert_email(email)
-        @database.insert_replies(msg_id, reply_message_ids) unless reply_message_ids.empty?
+        @database.transaction do |db|
+          db.insert_email(email)
+          db.insert_replies(msg_id, reply_message_ids) unless reply_message_ids.empty?
+        end
       end
     end
 
     def imported_file_checksums(category_name)
       rows = @database.fetch_imported_files(category_name)
       rows.each_with_object({}) do |row, hash|
-        hash[row['filename']] = row['checksum']
+        filename = File.basename(row['filename'])
+        hash[filename] = row['checksum']
       end
     end
 
@@ -102,12 +113,18 @@ module ImportScripts::Mbox
 
         if @split_regex.present?
           each_mail(filename) do |raw_message, first_line_number, last_line_number|
+            opts = {
+              first_line_number: first_line_number,
+              last_line_number: last_line_number,
+              start_time: monotonic_time
+            }
             receiver = read_mail_from_string(raw_message)
-            yield receiver, filename, first_line_number, last_line_number if receiver.present?
+            yield receiver, filename, opts if receiver.present?
           end
         else
+          opts = { start_time: monotonic_time }
           receiver = read_mail_from_file(filename)
-          yield receiver, filename if receiver.present?
+          yield receiver, filename, opts if receiver.present?
         end
 
         mark_as_fully_indexed(category_name, filename)
@@ -117,7 +134,7 @@ module ImportScripts::Mbox
     def mark_as_fully_indexed(category_name, filename)
       imported_file = {
         category: category_name,
-        filename: filename,
+        filename: File.basename(filename),
         checksum: calc_checksum(filename)
       }
 
@@ -132,10 +149,12 @@ module ImportScripts::Mbox
       each_line(filename) do |line|
         line = line.scrub
 
-        if line =~ @split_regex && last_line_number.positive?
-          yield raw_message, first_line_number, last_line_number
-          raw_message = ''
-          first_line_number = last_line_number + 1
+        if line =~ @split_regex
+          if last_line_number > 0
+            yield raw_message, first_line_number, last_line_number
+            raw_message = ''
+            first_line_number = last_line_number + 1
+          end
         else
           raw_message << line
         end
@@ -163,7 +182,7 @@ module ImportScripts::Mbox
     end
 
     def read_mail_from_string(raw_message)
-      Email::Receiver.new(raw_message, convert_plaintext: true) unless raw_message.blank?
+      Email::Receiver.new(raw_message, convert_plaintext: true, skip_trimming: false) unless raw_message.blank?
     end
 
     def extract_reply_message_ids(mail)
@@ -209,26 +228,26 @@ module ImportScripts::Mbox
       end
     end
 
-    def ignored_file?(filename, checksums)
-      File.directory?(filename) || hidden_file?(filename) ||
-        metadata_file?(filename) || fully_indexed?(filename, checksums)
+    def ignored_file?(path, checksums)
+      filename = File.basename(path)
+
+      filename.start_with?('.') ||
+        filename == METADATA_FILENAME ||
+        IGNORED_FILE_EXTENSIONS.include?(File.extname(filename)) ||
+        fully_indexed?(path, filename, checksums)
     end
 
-    def hidden_file?(filename)
-      File.basename(filename).start_with?('.')
-    end
-
-    def metadata_file?(filename)
-      File.basename(filename) == METADATA_FILENAME
-    end
-
-    def fully_indexed?(filename, checksums)
+    def fully_indexed?(path, filename, checksums)
       checksum = checksums[filename]
-      checksum.present? && calc_checksum(filename) == checksum
+      checksum.present? && calc_checksum(path) == checksum
     end
 
     def calc_checksum(filename)
       Digest::SHA256.file(filename).hexdigest
     end
+
+    def monotonic_time
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
   end
 end
diff --git a/script/import_scripts/mbox/support/settings.rb b/script/import_scripts/mbox/support/settings.rb
index 8ec5456a23..703ec2220a 100644
--- a/script/import_scripts/mbox/support/settings.rb
+++ b/script/import_scripts/mbox/support/settings.rb
@@ -12,6 +12,9 @@ module ImportScripts::Mbox
     attr_reader :batch_size
     attr_reader :trust_level
     attr_reader :prefer_html
+    attr_reader :staged
+    attr_reader :index_only
+    attr_reader :group_messages_by_subject
 
     def initialize(yaml)
       @data_dir = yaml['data_dir']
@@ -19,6 +22,9 @@ module ImportScripts::Mbox
       @batch_size = 1000 # no need to make this actually configurable at the moment
       @trust_level = yaml['default_trust_level']
       @prefer_html = yaml['prefer_html']
+      @staged = yaml['staged']
+      @index_only = yaml['index_only']
+      @group_messages_by_subject = yaml['group_messages_by_subject']
     end
   end
 end
diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb
index a54e0540a0..c82720a6b9 100644
--- a/script/import_scripts/phpbb3/database/database_3_0.rb
+++ b/script/import_scripts/phpbb3/database/database_3_0.rb
@@ -30,9 +30,10 @@ module ImportScripts::PhpBB3
 
     def count_anonymous_users
       count(<<-SQL)
-        SELECT COUNT(DISTINCT post_username) AS count
-        FROM #{@table_prefix}posts
-        WHERE post_username <> ''
+        SELECT COUNT(DISTINCT p.post_username) AS count
+        FROM #{@table_prefix}posts p
+          JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
+        WHERE p.post_username <> '' AND u.user_type = #{Constants::USER_TYPE_IGNORE}
       SQL
     end
 
@@ -40,11 +41,12 @@ module ImportScripts::PhpBB3
       last_username = escape(last_username)
 
       query(<<-SQL, :post_username)
-        SELECT post_username, MIN(post_time) AS first_post_time
-        FROM #{@table_prefix}posts
-        WHERE post_username > '#{last_username}'
-        GROUP BY post_username
-        ORDER BY post_username
+        SELECT p.post_username, MIN(p.post_time) AS first_post_time
+        FROM #{@table_prefix}posts p
+          JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
+        WHERE p.post_username > '#{last_username}' AND u.user_type = #{Constants::USER_TYPE_IGNORE}
+        GROUP BY p.post_username
+        ORDER BY p.post_username
         LIMIT #{@batch_size}
       SQL
     end
@@ -73,11 +75,13 @@ module ImportScripts::PhpBB3
     def fetch_posts(last_post_id)
       query(<<-SQL, :post_id)
         SELECT p.post_id, p.topic_id, t.forum_id, t.topic_title, t.topic_first_post_id, p.poster_id,
-          p.post_text, p.post_time, p.post_username, t.topic_status, t.topic_type, t.poll_title,
+          p.post_text, p.post_time, t.topic_status, t.topic_type, t.poll_title,
           CASE WHEN t.poll_length > 0 THEN t.poll_start + t.poll_length ELSE NULL END AS poll_end,
-          t.poll_max_options, p.post_attachment
+          t.poll_max_options, p.post_attachment,
+          CASE WHEN u.user_type = #{Constants::USER_TYPE_IGNORE} THEN p.post_username ELSE NULL END post_username
         FROM #{@table_prefix}posts p
           JOIN #{@table_prefix}topics t ON (p.topic_id = t.topic_id)
+          JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
         WHERE p.post_id > #{last_post_id}
         ORDER BY p.post_id
         LIMIT #{@batch_size}
diff --git a/script/import_scripts/phpbb3/settings.yml b/script/import_scripts/phpbb3/settings.yml
index 4fd15fc9d0..08b50e283a 100644
--- a/script/import_scripts/phpbb3/settings.yml
+++ b/script/import_scripts/phpbb3/settings.yml
@@ -11,8 +11,8 @@ database:
   batch_size: 1000 # Don't change this unless you know what you're doing. The default (1000) should work just fine.
 
 import:
-  # Enable this option if you want to have a better conversion of BBCodes to Markdown.
-  # WARNING: This can slow down your import.
+  # WARNING: Do not activate this option unless you know what you are doing.
+  # It will probably break the BBCode to Markdown conversion and slows down your import.
   use_bbcode_to_md: false
 
   # This is the path to the root directory of your current phpBB installation (or a copy of it).
diff --git a/script/import_scripts/phpbb3/support/text_processor.rb b/script/import_scripts/phpbb3/support/text_processor.rb
index d89a6cc99f..fa6e623d32 100644
--- a/script/import_scripts/phpbb3/support/text_processor.rb
+++ b/script/import_scripts/phpbb3/support/text_processor.rb
@@ -27,6 +27,7 @@ module ImportScripts::PhpBB3
       process_links(text)
       process_lists(text)
       process_code(text)
+      fix_markdown(text)
       text
     end
 
@@ -114,11 +115,13 @@ module ImportScripts::PhpBB3
       # convert list tags to ul and list=1 tags to ol
       # list=a is not supported, so handle it like list=1
       # list=9 and list=x have the same result as list=1 and list=a
-      text.gsub!(/\[list\](.*?)\[\/list:u\]/mi, '[ul]\1[/ul]')
-      text.gsub!(/\[list=.*?\](.*?)\[\/list:o\]/mi, '[ol]\1[/ol]')
+      text.gsub!(/\[list\](.*?)\[\/list:u\]/mi) do
+        $1.gsub(/\[\*\](.*?)\[\/\*:m\]\n*/mi) { "* #{$1}\n" }
+      end
 
-      # convert *-tags to li-tags so bbcode-to-md can do its magic on phpBB's lists:
-      text.gsub!(/\[\*\](.*?)\[\/\*:m\]/mi, '[li]\1[/li]')
+      text.gsub!(/\[list=.*?\](.*?)\[\/list:o\]/mi) do
+        $1.gsub(/\[\*\](.*?)\[\/\*:m\]\n*/mi) { "1. #{$1}\n" }
+      end
     end
 
     # This replaces existing [attachment] BBCodes with the corresponding HTML tags for Discourse.
@@ -149,9 +152,14 @@ module ImportScripts::PhpBB3
 
     def process_code(text)
       text.gsub!(/<span class="syntax.*?>(.*?)<\/span>/) { "#{$1}" }
-      text.gsub!(/\[code(=[a-z]*)?\](.*?)\[\/code\]/i) { "[code]#{@he.decode($2)}[/code]" }
+      text.gsub!(/\[code(=[a-z]*)?\](.*?)\[\/code\]/i) { "[code]\n#{@he.decode($2)}\n[/code]" }
       text.gsub!(/<br \/>/, "\n")
       text
     end
+
+    def fix_markdown(text)
+      text.gsub!(/(\n*\[\/?quote.*?\]\n*)/mi) { |q| "\n#{q.strip}\n" }
+      text
+    end
   end
 end
diff --git a/script/import_scripts/vanilla_mysql.rb b/script/import_scripts/vanilla_mysql.rb
index e59a581ba1..10882fb4ff 100644
--- a/script/import_scripts/vanilla_mysql.rb
+++ b/script/import_scripts/vanilla_mysql.rb
@@ -59,8 +59,8 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
       results = mysql_query(
         "SELECT UserID, Name, Title, Location, About, Email,
                 DateInserted, DateLastActive, InsertIPAddress, Admin
-         WHERE id > #{@last_user_id}
          FROM #{TABLE_PREFIX}User
+         WHERE UserID > #{@last_user_id}
          ORDER BY UserID ASC
          LIMIT #{BATCH_SIZE};")
 
@@ -204,8 +204,8 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
       discussions = mysql_query(
         "SELECT DiscussionID, CategoryID, Name, Body,
                 DateInserted, InsertUserID
-         WHERE DiscussionID > #{@last_topic_id}
          FROM #{TABLE_PREFIX}Discussion
+         WHERE DiscussionID > #{@last_topic_id}
          ORDER BY DiscussionID ASC
          LIMIT #{BATCH_SIZE};")
 
@@ -241,8 +241,8 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
       comments = mysql_query(
         "SELECT CommentID, DiscussionID, Body,
                 DateInserted, InsertUserID
-         WHERE CommentID > #{@last_post_id}
          FROM #{TABLE_PREFIX}Comment
+         WHERE CommentID > #{@last_post_id}
          ORDER BY CommentID ASC
          LIMIT #{BATCH_SIZE};")
 
diff --git a/script/plugin-translations.rb b/script/plugin-translations.rb
index bdc85b1f09..c01e804a8c 100644
--- a/script/plugin-translations.rb
+++ b/script/plugin-translations.rb
@@ -17,12 +17,13 @@ class PluginTxUpdater
     'discourse-assign',
     'discourse-cakeday',
     'discourse-canned-replies',
+    'discourse-characters-required',
     'discourse-chat-integration',
     'discourse-data-explorer',
     'discourse-math',
     'discourse-oauth2-basic',
     'discourse-patreon',
-    # 'discourse-saved-searches', # TODO
+    'discourse-saved-searches',
     'discourse-solved',
     'discourse-staff-notes',
     'discourse-voting'
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index b86d60fff1..288a120643 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -88,6 +88,19 @@ describe Auth::DefaultCurrentUserProvider do
       expect(provider("/?api_key=hello&api_username=#{user.username.downcase}").current_user.id).to eq(user.id)
     end
 
+    it "finds a user for a correct system api key with external id" do
+      user = Fabricate(:user)
+      ApiKey.create!(key: "hello", created_by_id: -1)
+      SingleSignOnRecord.create(user_id: user.id, external_id: "abc", last_payload: '')
+      expect(provider("/?api_key=hello&api_user_external_id=abc").current_user.id).to eq(user.id)
+    end
+
+    it "finds a user for a correct system api key with id" do
+      user = Fabricate(:user)
+      ApiKey.create!(key: "hello", created_by_id: -1)
+      expect(provider("/?api_key=hello&api_user_id=#{user.id}").current_user.id).to eq(user.id)
+    end
+
     context "rate limiting" do
       before do
         RateLimiter.enable
diff --git a/spec/components/auth/github_authenticator_spec.rb b/spec/components/auth/github_authenticator_spec.rb
index 1d83fefbc8..a80ee85556 100644
--- a/spec/components/auth/github_authenticator_spec.rb
+++ b/spec/components/auth/github_authenticator_spec.rb
@@ -17,7 +17,6 @@ def auth_token_for(user)
     },
     info: {
       email: user.email,
-      email_verified: true,
       nickname: user.username,
       name: user.name,
       image: "https://avatars3.githubusercontent.com/u/#{user.username}",
@@ -43,7 +42,6 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: user.email,
-          email_verified: true,
           nickname: user.username,
           name: user.name,
         },
@@ -70,7 +68,6 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: user.email,
-          email_verified: false,
           nickname: user.username,
           name: user.name,
         },
@@ -97,7 +94,6 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: "person@example.com",
-          email_verified: true,
           nickname: "person",
           name: "Person Lastname",
         },
@@ -110,7 +106,7 @@ describe Auth::GithubAuthenticator do
       expect(result.username).to eq(hash[:info][:nickname])
       expect(result.name).to eq(hash[:info][:name])
       expect(result.email).to eq(hash[:info][:email])
-      expect(result.email_valid).to eq(hash[:info][:email_verified])
+      expect(result.email_valid).to eq(hash[:info][:email].present?)
     end
 
     it 'will skip blacklisted domains for non existing users' do
@@ -128,7 +124,6 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: "not_allowed@blacklist.com",
-          email_verified: true,
           nickname: "person",
           name: "Person Lastname",
         },
@@ -154,7 +149,7 @@ describe Auth::GithubAuthenticator do
             verified: true,
           }, {
             email: "not_allowed@blacklist.com",
-            primary: true,
+            primary: false,
             verified: true,
           }, {
             email: "allowed@whitelist.com",
@@ -164,7 +159,6 @@ describe Auth::GithubAuthenticator do
         },
         info: {
           email: "person@example.com",
-          email_verified: true,
           nickname: "person",
           name: "Person Lastname",
         },
diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb
index fc5b04d0d2..3425162702 100644
--- a/spec/components/composer_messages_finder_spec.rb
+++ b/spec/components/composer_messages_finder_spec.rb
@@ -442,7 +442,9 @@ describe ComposerMessagesFinder do
 
         it "notifies if last post is old" do
           topic = Fabricate(:topic, last_posted_at: 181.days.ago)
-          expect(described_class.new(user, composer_action: 'reply', topic_id: topic.id).check_reviving_old_topic).not_to be_blank
+          message = described_class.new(user, composer_action: 'reply', topic_id: topic.id).check_reviving_old_topic
+          expect(message).not_to be_blank
+          expect(message[:body]).to match(/6 months ago/)
         end
       end
 
diff --git a/spec/components/crawler_detection_spec.rb b/spec/components/crawler_detection_spec.rb
index 6443d84a52..86b5345042 100644
--- a/spec/components/crawler_detection_spec.rb
+++ b/spec/components/crawler_detection_spec.rb
@@ -6,9 +6,9 @@ describe CrawlerDetection do
 
     it "can be amended via site settings" do
       SiteSetting.crawler_user_agents = 'Mooble|Kaboodle+*'
-      expect(CrawlerDetection.crawler?("Mozilla/5.0 (compatible; Kaboodle+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
-      expect(CrawlerDetection.crawler?("Mozilla/5.0 (compatible; Mooble+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
-      expect(CrawlerDetection.crawler?("Mozilla/5.0 (compatible; Gooble+*/2.1; +http://www.google.com/bot.html)")).to eq(false)
+      expect(CrawlerDetection.crawler?("Mozilla/5.0 Safari (compatible; Kaboodle+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
+      expect(CrawlerDetection.crawler?("Mozilla/5.0 Safari (compatible; Mooble+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
+      expect(CrawlerDetection.crawler?("Mozilla/5.0 Safari (compatible; Gooble+*/2.1; +http://www.google.com/bot.html)")).to eq(false)
     end
 
     it "returns true for crawler user agents" do
@@ -37,6 +37,12 @@ describe CrawlerDetection do
       expect(described_class.crawler?("Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25")).to eq(false)
       expect(described_class.crawler?("Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0")).to eq(false)
       expect(described_class.crawler?("Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr; LG-L160L Build/IML74K) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30")).to eq(false)
+
+      expect(described_class.crawler?("DiscourseAPI Ruby Gem 0.19.0")).to eq(true)
+      expect(described_class.crawler?("Pingdom.com_bot_version_1.4_(http://www.pingdom.com/)")).to eq(true)
+      expect(described_class.crawler?("LogicMonitor SiteMonitor/1.0")).to eq(true)
+      expect(described_class.crawler?("Java/1.8.0_151")).to eq(true)
+      expect(described_class.crawler?("Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)")).to eq(true)
     end
 
   end
diff --git a/spec/components/discourse_diff_spec.rb b/spec/components/discourse_diff_spec.rb
index b089124e57..b797920b2f 100644
--- a/spec/components/discourse_diff_spec.rb
+++ b/spec/components/discourse_diff_spec.rb
@@ -60,42 +60,42 @@ describe DiscourseDiff do
   describe "side_by_side_html" do
 
     it "returns two empty divs when no content is diffed" do
-      expect(DiscourseDiff.new("", "").side_by_side_html).to eq("<div class=\"span8\"></div><div class=\"span8 offset1\"></div>")
+      expect(DiscourseDiff.new("", "").side_by_side_html).to eq("<div class=\"revision-content\"></div><div class=\"revision-content\"></div>")
     end
 
     it "returns the diffed content on both sides when there is no difference" do
       before = after = "<p>this is a paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p>this is a paragraph</p></div><div class=\"span8 offset1\"><p>this is a paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is a paragraph</p></div><div class=\"revision-content\"><p>this is a paragraph</p></div>")
     end
 
     it "adds <ins> tags around added text on the right div" do
       before = "<p>this is a paragraph</p>"
       after = "<p>this is a great paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p>this is a paragraph</p></div><div class=\"span8 offset1\"><p>this is a <ins>great </ins>paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is a paragraph</p></div><div class=\"revision-content\"><p>this is a <ins>great </ins>paragraph</p></div>")
     end
 
     it "adds <del> tags around removed text on the left div" do
       before = "<p>this is a great paragraph</p>"
       after = "<p>this is a paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p>this is a <del>great </del>paragraph</p></div><div class=\"span8 offset1\"><p>this is a paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is a <del>great </del>paragraph</p></div><div class=\"revision-content\"><p>this is a paragraph</p></div>")
     end
 
     it "adds .diff-ins class when a paragraph is added" do
       before = "<p>this is the first paragraph</p>"
       after = "<p>this is the first paragraph</p><p>this is the second paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p>this is the first paragraph</p></div><div class=\"span8 offset1\"><p>this is the first paragraph</p><p class=\"diff-ins\">this is the second paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p>this is the first paragraph</p></div><div class=\"revision-content\"><p>this is the first paragraph</p><p class=\"diff-ins\">this is the second paragraph</p></div>")
     end
 
     it "adds .diff-del class when a paragraph is removed" do
       before = "<p>this is the first paragraph</p><p>this is the second paragraph</p>"
       after = "<p>this is the second paragraph</p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p class=\"diff-del\">this is the first paragraph</p><p>this is the second paragraph</p></div><div class=\"span8 offset1\"><p>this is the second paragraph</p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p class=\"diff-del\">this is the first paragraph</p><p>this is the second paragraph</p></div><div class=\"revision-content\"><p>this is the second paragraph</p></div>")
     end
 
     it "does not break diff on character references" do
       before = "<p>'</p>"
       after = "<p></p>"
-      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"span8\"><p><del>&#39;</del></p></div><div class=\"span8 offset1\"><p></p></div>")
+      expect(DiscourseDiff.new(before, after).side_by_side_html).to eq("<div class=\"revision-content\"><p><del>&#39;</del></p></div><div class=\"revision-content\"><p></p></div>")
     end
 
   end
diff --git a/spec/components/discourse_i18n_spec.rb b/spec/components/discourse_i18n_spec.rb
index 0074b2e464..72dfc368ce 100644
--- a/spec/components/discourse_i18n_spec.rb
+++ b/spec/components/discourse_i18n_spec.rb
@@ -11,7 +11,7 @@ describe I18n::Backend::DiscourseI18n do
     backend.store_translations(:en, foo: 'Foo in :en', bar: 'Bar in :en', wat: "Hello %{count}")
     backend.store_translations(:en, items: { one: 'one item', other: "%{count} items" })
     backend.store_translations(:de, bar: 'Bar in :de')
-    backend.store_translations(:'de-AT', baz: 'Baz in :de-AT')
+    backend.store_translations(:ru, baz: 'Baz in :ru')
   end
 
   after do
@@ -41,9 +41,23 @@ describe I18n::Backend::DiscourseI18n do
     expect(results['items.other']).to eq('%{count} items')
   end
 
-  it 'uses fallback locales for searching' do
-    expect(backend.search(:de, 'bar')).to eq('bar' => 'Bar in :de')
-    expect(backend.search(:de, 'foo')).to eq('foo' => 'Foo in :en')
+  describe 'fallbacks' do
+    it 'uses fallback locales for searching' do
+      expect(backend.search(:de, 'bar')).to eq('bar' => 'Bar in :de')
+      expect(backend.search(:de, 'foo')).to eq('foo' => 'Foo in :en')
+    end
+
+    it 'uses fallback locales for translating' do
+      expect(backend.translate(:de, 'bar')).to eq('Bar in :de')
+      expect(backend.translate(:de, 'foo')).to eq('Foo in :en')
+    end
+
+    it 'uses default_locale as fallback when key exists' do
+      SiteSetting.default_locale = 'ru'
+      expect(backend.translate(:de, 'bar')).to eq('Bar in :de')
+      expect(backend.translate(:de, 'baz')).to eq('Baz in :ru')
+      expect(backend.translate(:de, 'foo')).to eq('Foo in :en')
+    end
   end
 
   describe '#exists?' do
@@ -58,23 +72,23 @@ describe I18n::Backend::DiscourseI18n do
     it 'returns true when an existing key and an existing locale is given' do
       expect(backend.exists?(:en, :foo)).to eq(true)
       expect(backend.exists?(:de, :bar)).to eq(true)
-      expect(backend.exists?(:'de-AT', :baz)).to eq(true)
+      expect(backend.exists?(:ru, :baz)).to eq(true)
     end
 
     it 'returns false when a non-existing key and an existing locale is given' do
       expect(backend.exists?(:en, :bogus)).to eq(false)
       expect(backend.exists?(:de, :bogus)).to eq(false)
-      expect(backend.exists?(:'de-AT', :bogus)).to eq(false)
+      expect(backend.exists?(:ru, :bogus)).to eq(false)
     end
 
     it 'returns true when a key is given which is missing from the given locale and exists in a fallback locale' do
       expect(backend.exists?(:de, :foo)).to eq(true)
-      expect(backend.exists?(:'de-AT', :foo)).to eq(true)
+      expect(backend.exists?(:ru, :foo)).to eq(true)
     end
 
     it 'returns true when a key is given which is missing from the given locale and all its fallback locales' do
       expect(backend.exists?(:de, :baz)).to eq(false)
-      expect(backend.exists?(:'de-AT', :bogus)).to eq(false)
+      expect(backend.exists?(:ru, :bogus)).to eq(false)
     end
   end
 
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index d9da0a0435..3c5017aec3 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -674,7 +674,7 @@ describe Email::Receiver do
     end
   end
 
-  context "no staged users on error" do
+  context "staged users" do
     before do
       SiteSetting.enable_staged_users = true
     end
@@ -711,7 +711,7 @@ describe Email::Receiver do
       include_examples "no staged users", :unsubscribe_new_user, Email::Receiver::UnsubscribeNotAllowed
     end
 
-    context "when email address is not on whitelist" do
+    context "when From email address is not on whitelist" do
       before do
         SiteSetting.email_domains_whitelist = "example.com|bar.com"
       end
@@ -719,7 +719,7 @@ describe Email::Receiver do
       include_examples "no staged users", :blacklist_whitelist_email, Email::Receiver::EmailNotAllowed
     end
 
-    context "when email address is on blacklist" do
+    context "when From email address is on blacklist" do
       before do
         SiteSetting.email_domains_blacklist = "email.com|mail.com"
       end
@@ -727,6 +727,30 @@ describe Email::Receiver do
       include_examples "no staged users", :blacklist_whitelist_email, Email::Receiver::EmailNotAllowed
     end
 
+    context "blacklist and whitelist for To and Cc" do
+      before do
+        Fabricate(:group, incoming_email: "some_group@bar.com")
+      end
+
+      it "does not create staged users for email addresses not on whitelist" do
+        SiteSetting.email_domains_whitelist = "mail.com|example.com"
+        process(:blacklist_whitelist_email)
+
+        expect(User.find_by_email("alice@foo.com")).to be_nil
+        expect(User.find_by_email("bob@foo.com")).to be_nil
+        expect(User.find_by_email("carol@example.com")).to be_present
+      end
+
+      it "does not create staged users for email addresses on blacklist" do
+        SiteSetting.email_domains_blacklist = "email.com|foo.com"
+        process(:blacklist_whitelist_email)
+
+        expect(User.find_by_email("alice@foo.com")).to be_nil
+        expect(User.find_by_email("bob@foo.com")).to be_nil
+        expect(User.find_by_email("carol@example.com")).to be_present
+      end
+    end
+
     context "when destinations aren't matching any of the incoming emails" do
       include_examples "no staged users", :bad_destinations, Email::Receiver::BadDestinationAddress
     end
@@ -798,16 +822,17 @@ describe Email::Receiver do
     end
   end
 
-  context "mailinglist mirror" do
+  context "mailing list mirror" do
+    let!(:category) { Fabricate(:mailinglist_mirror_category) }
+
     before do
       SiteSetting.block_auto_generated_emails = true
       SiteSetting.find_related_post_with_key = true
-
-      Fabricate(:mailinglist_mirror_category)
     end
 
     it "should allow creating topic even when email is autogenerated" do
       expect { process(:mailinglist) }.to change { Topic.count }
+      expect(IncomingEmail.last.is_auto_generated).to eq(false)
     end
 
     it "should allow replying without reply key" do
@@ -816,5 +841,36 @@ describe Email::Receiver do
 
       expect { process(:mailinglist_reply) }.to change { topic.posts.count }
     end
+
+    it "should skip validations for staged users" do
+      Fabricate(:user, email: "alice@foo.com", staged: true)
+      expect { process(:mailinglist_short_message) }.to change { Topic.count }
+    end
+
+    it "should skip validations for regular users" do
+      Fabricate(:user, email: "alice@foo.com")
+      expect { process(:mailinglist_short_message) }.to change { Topic.count }
+    end
+
+    context "read-only category" do
+      before do
+        category.set_permissions(everyone: :readonly)
+        category.save
+
+        Fabricate(:user, email: "alice@foo.com")
+        Fabricate(:user, email: "bob@bar.com")
+      end
+
+      it "should allow creating topic within read-only category" do
+        expect { process(:mailinglist) }.to change { Topic.count }
+      end
+
+      it "should allow replying within read-only category" do
+        process(:mailinglist)
+        topic = Topic.last
+
+        expect { process(:mailinglist_reply) }.to change { topic.posts.count }
+      end
+    end
   end
 end
diff --git a/spec/components/excerpt_parser_spec.rb b/spec/components/excerpt_parser_spec.rb
new file mode 100644
index 0000000000..45e6468cbb
--- /dev/null
+++ b/spec/components/excerpt_parser_spec.rb
@@ -0,0 +1,20 @@
+require "rails_helper"
+require "excerpt_parser"
+
+describe ExcerptParser do
+
+  it "handles nested <details> blocks" do
+    html = <<~HTML
+      <details>
+        <summary>FOO</summary>
+        <details>
+          <summary>BAR</summary>
+          <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ultrices, ex bibendum vestibulum vestibulum, mi velit pulvinar risus, sed consequat eros libero in eros. Fusce luctus mattis mauris, vitae semper lorem sodales quis. Donec pellentesque lacus ac ante aliquam, tincidunt iaculis risus interdum. In ullamcorper cursus massa ut lacinia. Donec quis diam finibus, rutrum odio eu, maximus leo. Nulla facilisi. Nullam suscipit quam et bibendum sagittis. Praesent sollicitudin neque at luctus ornare. Maecenas tristique dapibus risus, ac dictum ipsum gravida aliquam. Phasellus vehicula eu arcu sed imperdiet. Vestibulum ornare eros a nisi faucibus vehicula. Quisque congue placerat nulla, nec finibus nulla ultrices vitae. Quisque ac mi sem. Curabitur eu porttitor justo. Etiam dignissim in orci iaculis congue. Donec tempus cursus orci, a placerat elit varius nec.</p>
+        </details>
+      </details>
+    HTML
+
+    expect(ExcerptParser.get_excerpt(html, 200, strip_links: true)).to eq(%{<details class='disabled'><summary>FOO</summary></details>})
+  end
+
+end
diff --git a/spec/components/fallback_locale_list_spec.rb b/spec/components/fallback_locale_list_spec.rb
new file mode 100644
index 0000000000..2786ff1cd6
--- /dev/null
+++ b/spec/components/fallback_locale_list_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+require 'i18n/backend/fallback_locale_list'
+
+describe I18n::Backend::FallbackLocaleList do
+  let(:list) { I18n::Backend::FallbackLocaleList.new }
+
+  it "works when default_locale is English" do
+    SiteSetting.default_locale = :en
+
+    expect(list[:ru]).to eq([:ru, :en])
+    expect(list[:en]).to eq([:en])
+  end
+
+  it "works when default_locale is not English" do
+    SiteSetting.default_locale = :de
+
+    expect(list[:ru]).to eq([:ru, :de, :en])
+    expect(list[:de]).to eq([:de, :en])
+    expect(list[:en]).to eq([:en, :de])
+  end
+
+  context "when plugin registered fallback locale" do
+    before do
+      DiscoursePluginRegistry.register_locale("es_MX", fallbackLocale: "es")
+      DiscoursePluginRegistry.register_locale("de_AT", fallbackLocale: "de")
+    end
+
+    after do
+      DiscoursePluginRegistry.reset!
+    end
+
+    it "works when default_locale is English" do
+      SiteSetting.default_locale = :en
+
+      expect(list[:de_AT]).to eq([:de_AT, :de, :en])
+      expect(list[:de]).to eq([:de, :en])
+      expect(list[:en]).to eq([:en])
+    end
+
+    it "works when default_locale is not English" do
+      SiteSetting.default_locale = :de
+
+      expect(list[:es_MX]).to eq([:es_MX, :es, :de, :en])
+      expect(list[:es]).to eq([:es, :de, :en])
+      expect(list[:en]).to eq([:en, :de])
+    end
+  end
+end
diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index 93b6f061d2..38cd37e2bf 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -207,6 +207,32 @@ describe FinalDestination do
     end
   end
 
+  describe '.get' do
+
+    it "can correctly stream with a redirect" do
+
+      FinalDestination.clear_https_cache!("wikipedia.com")
+
+      stub_request(:get, "http://wikipedia.com/").
+        to_return(status: 302, body: "" , headers: { "location" => "https://wikipedia.com/" })
+
+      # webmock does not do chunks
+      stub_request(:get, "https://wikipedia.com/").
+        to_return(status: 200, body: "<html><head>" , headers: {})
+
+      result = nil
+      chunk = nil
+
+      result = FinalDestination.new("http://wikipedia.com", opts).get do |resp, c|
+        chunk = c
+        throw :done
+      end
+
+      expect(result).to eq("https://wikipedia.com/")
+      expect(chunk).to eq("<html><head>")
+    end
+  end
+
   describe '.validate_uri' do
     context "host lookups" do
       it "works for various hosts" do
diff --git a/spec/components/flag_query_spec.rb b/spec/components/flag_query_spec.rb
index 7e39c61fef..592045e641 100644
--- a/spec/components/flag_query_spec.rb
+++ b/spec/components/flag_query_spec.rb
@@ -59,6 +59,12 @@ describe FlagQuery do
       posts = FlagQuery.flagged_posts_report(admin, topic_id: -1)
       expect(posts[0]).to be_blank
 
+      # Try by user
+      posts = FlagQuery.flagged_posts_report(admin, user_id: post.user_id)
+      expect(posts).to be_present
+      posts = FlagQuery.flagged_posts_report(admin, user_id: -1000)
+      expect(posts[0]).to be_blank
+
       # chuck post in category a mod can not see and make sure its missing
       category = Fabricate(:category)
       category.set_permissions(admins: :full)
diff --git a/spec/components/freedom_patches/translate_accelerator_spec.rb b/spec/components/freedom_patches/translate_accelerator_spec.rb
index 883edd6f1c..941b68e52a 100644
--- a/spec/components/freedom_patches/translate_accelerator_spec.rb
+++ b/spec/components/freedom_patches/translate_accelerator_spec.rb
@@ -1,6 +1,9 @@
 require "rails_helper"
 
 describe "translate accelerator" do
+  after do
+    I18n.reload!
+  end
 
   it "overrides for both string and symbol keys" do
     key = "user.email.not_allowed"
@@ -32,4 +35,39 @@ describe "translate accelerator" do
     end
   end
 
+  context "plugins" do
+    before do
+      DiscoursePluginRegistry.register_locale(
+        "foo",
+        name: "Foo",
+        nativeName: "Foo Bar",
+        plural: {
+          keys: [:one, :few, :other],
+          rule: lambda do |n|
+            return :one if n == 1
+            return :few if n < 10
+            :other
+          end
+        }
+      )
+
+      LocaleSiteSetting.reset!
+      I18n.reload!
+    end
+
+    after do
+      DiscoursePluginRegistry.reset!
+      LocaleSiteSetting.reset!
+    end
+
+    it "loads plural rules from plugins" do
+      I18n.backend.store_translations(:foo, items: { one: 'one item', few: 'some items', other: "%{count} items" })
+      I18n.locale = :foo
+
+      expect(I18n.t('i18n.plural.keys')).to eq([:one, :few, :other])
+      expect(I18n.t('items', count: 1)).to eq('one item')
+      expect(I18n.t('items', count: 3)).to eq('some items')
+      expect(I18n.t('items', count: 20)).to eq('20 items')
+    end
+  end
 end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index df904c0aa4..09d4dc042d 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper';
 
 require 'guardian'
 require_dependency 'post_destroyer'
+require_dependency 'post_locker'
 
 describe Guardian do
 
@@ -857,6 +858,25 @@ describe Guardian do
         end
       end
 
+      context "system message" do
+        let(:private_message) {
+          Fabricate(
+            :topic,
+            archetype: Archetype.private_message,
+            subtype: 'system_message',
+            category_id: nil
+          )
+        }
+
+        before { user.save! }
+        it "allows the user to reply to system messages" do
+          expect(Guardian.new(user).can_create_post?(private_message)).to eq(true)
+          SiteSetting.enable_system_message_replies = false
+          expect(Guardian.new(user).can_create_post?(private_message)).to eq(false)
+        end
+
+      end
+
       context "private message" do
         let(:private_message) { Fabricate(:topic, archetype: Archetype.private_message, category_id: nil) }
 
@@ -1072,6 +1092,11 @@ describe Guardian do
         expect(Guardian.new(post.user).can_edit?(post)).to be_truthy
       end
 
+      it 'returns false if you try to edit a locked post' do
+        post.locked_by_id = moderator.id
+        expect(Guardian.new(post.user).can_edit?(post)).to be_falsey
+      end
+
       it "returns false if the post is hidden due to flagging and it's too soon" do
         post.hidden = true
         post.hidden_at = Time.now
@@ -1145,6 +1170,11 @@ describe Guardian do
         expect(Guardian.new(moderator).can_edit?(post)).to be_truthy
       end
 
+      it 'returns true as a moderator, even if locked' do
+        post.locked_by_id = admin.id
+        expect(Guardian.new(moderator).can_edit?(post)).to be_truthy
+      end
+
       it 'returns true as an admin' do
         expect(Guardian.new(admin).can_edit?(post)).to be_truthy
       end
diff --git a/spec/components/hijack_spec.rb b/spec/components/hijack_spec.rb
index 3a9522ab9b..0a8b44eeee 100644
--- a/spec/components/hijack_spec.rb
+++ b/spec/components/hijack_spec.rb
@@ -114,6 +114,16 @@ describe Hijack do
     expect(headers).to eq(expected)
   end
 
+  it "handles transfers headers" do
+    tester.response.headers["Hello-World"] = "sam"
+    tester.hijack_test do
+      expires_in 1.year
+      render body: "hello world", status: 402
+    end
+
+    expect(tester.io.string).to include("Hello-World: sam")
+  end
+
   it "handles expires_in" do
     tester.hijack_test do
       expires_in 1.year
@@ -141,36 +151,43 @@ describe Hijack do
   end
 
   it "renders a redirect correctly" do
+    Process.stubs(:clock_gettime).returns(1.0)
     tester.hijack_test do
+      Process.stubs(:clock_gettime).returns(2.0)
       redirect_to 'http://awesome.com'
     end
 
-    result = "HTTP/1.1 302 Found\r\nLocation: http://awesome.com\r\nContent-Type: text/html\r\nContent-Length: 84\r\nConnection: close\r\n\r\n<html><body>You are being <a href=\"http://awesome.com\">redirected</a>.</body></html>"
+    result = "HTTP/1.1 302 Found\r\nLocation: http://awesome.com\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: 84\r\nConnection: close\r\nX-Runtime: 1.000000\r\n\r\n<html><body>You are being <a href=\"http://awesome.com\">redirected</a>.</body></html>"
     expect(tester.io.string).to eq(result)
   end
 
   it "renders stuff correctly if is empty" do
+    Process.stubs(:clock_gettime).returns(1.0)
     tester.hijack_test do
+      Process.stubs(:clock_gettime).returns(2.0)
       render body: nil
     end
 
-    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Length: 0\r\nConnection: close\r\nX-Runtime: 1.000000\r\n\r\n"
     expect(tester.io.string).to eq(result)
   end
 
   it "renders stuff correctly if it works" do
+    Process.stubs(:clock_gettime).returns(1.0)
     tester.hijack_test do
+      Process.stubs(:clock_gettime).returns(2.0)
       render plain: "hello world"
     end
 
-    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 11\r\nConnection: close\r\n\r\nhello world"
+    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Length: 11\r\nConnection: close\r\nX-Runtime: 1.000000\r\n\r\nhello world"
     expect(tester.io.string).to eq(result)
   end
 
   it "returns 500 by default" do
+    Process.stubs(:clock_gettime).returns(1.0)
     tester.hijack_test
 
-    expected = "HTTP/1.1 500 Internal Server Error\r\nContent-Type: text/html\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    expected = "HTTP/1.1 500 Internal Server Error\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: 0\r\nConnection: close\r\nX-Runtime: 0.000000\r\n\r\n"
     expect(tester.io.string).to eq(expected)
   end
 
diff --git a/spec/components/inline_oneboxer_spec.rb b/spec/components/inline_oneboxer_spec.rb
index 491f322a0c..33db691bf0 100644
--- a/spec/components/inline_oneboxer_spec.rb
+++ b/spec/components/inline_oneboxer_spec.rb
@@ -87,6 +87,25 @@ describe InlineOneboxer do
       expect(onebox[:title]).to eq("a blog")
     end
 
+    it "will not return a onebox if it does not meet minimal length" do
+      SiteSetting.enable_inline_onebox_on_all_domains = true
+
+      # Final destination does a HEAD and a GET
+      stub_request(:head, "https://eviltrout.com/some-path").to_return(status: 200)
+
+      stub_request(:get, "https://eviltrout.com/some-path").
+        to_return(status: 200, body: "<html><head><title>a</title></head></html>", headers: {})
+
+      onebox = InlineOneboxer.lookup(
+        "https://eviltrout.com/some-path",
+        skip_cache: true
+      )
+
+      expect(onebox).to be_present
+      expect(onebox[:url]).to eq("https://eviltrout.com/some-path")
+      expect(onebox[:title]).to eq(nil)
+    end
+
     it "will lookup whitelisted domains" do
       SiteSetting.inline_onebox_domains_whitelist = "eviltrout.com"
       RetrieveTitle.stubs(:crawl).returns("Evil Trout's Blog")
diff --git a/spec/components/js_locale_helper_spec.rb b/spec/components/js_locale_helper_spec.rb
index 120b6b029b..430a372504 100644
--- a/spec/components/js_locale_helper_spec.rb
+++ b/spec/components/js_locale_helper_spec.rb
@@ -34,12 +34,17 @@ describe JsLocaleHelper do
   end
 
   context "message format" do
+    def message_format_filename(locale)
+      Rails.root + "lib/javascripts/locale/#{locale}.js"
+    end
 
     def setup_message_format(format)
+      filename = message_format_filename('en')
+      compiled = JsLocaleHelper.compile_message_format(filename, 'en', format)
+
       @ctx = MiniRacer::Context.new
       @ctx.eval('MessageFormat = {locale: {}};')
-      @ctx.load(Rails.root + 'lib/javascripts/locale/en.js')
-      compiled = JsLocaleHelper.compile_message_format('en', format)
+      @ctx.load(filename)
       @ctx.eval("var test = #{compiled}")
     end
 
@@ -110,7 +115,7 @@ describe JsLocaleHelper do
     end
 
     it 'load pluralizations rules before precompile' do
-      message = JsLocaleHelper.compile_message_format('ru', 'format')
+      message = JsLocaleHelper.compile_message_format(message_format_filename('ru'), 'ru', 'format')
       expect(message).not_to match 'Plural Function not found'
     end
   end
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index 94d76b94c1..e56c708a22 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -6,6 +6,7 @@ describe Middleware::RequestTracker do
   def env(opts = {})
     {
       "HTTP_HOST" => "http://test.com",
+      "HTTP_USER_AGENT" => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36",
       "REQUEST_URI" => "/path?bla=1",
       "REQUEST_METHOD" => "GET",
       "rack.input" => ""
@@ -104,7 +105,7 @@ describe Middleware::RequestTracker do
     end
 
     it "does nothing by default" do
-      global_setting :max_requests_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
 
       status, _ = middleware.call(env)
       status, _ = middleware.call(env)
@@ -112,9 +113,48 @@ describe Middleware::RequestTracker do
       expect(status).to eq(200)
     end
 
+    it "blocks private IPs if not skipped" do
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'warn+block'
+      global_setting :max_reqs_rate_limit_on_private, true
+
+      env1 = env("REMOTE_ADDR" => "127.0.0.2")
+
+      status, _ = middleware.call(env1)
+      status, _ = middleware.call(env1)
+
+      expect(Rails.logger.warnings).to eq(1)
+      expect(status).to eq(429)
+    end
+
+    it "does nothing for private IPs if skipped" do
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'warn+block'
+      global_setting :max_reqs_rate_limit_on_private, false
+
+      env1 = env("REMOTE_ADDR" => "127.0.3.1")
+
+      status, _ = middleware.call(env1)
+      status, _ = middleware.call(env1)
+
+      expect(Rails.logger.warnings).to eq(0)
+      expect(status).to eq(200)
+    end
+
+    it "does warn if rate limiter is enabled via warn+block" do
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'warn+block'
+
+      status, _ = middleware.call(env)
+      status, _ = middleware.call(env)
+
+      expect(Rails.logger.warnings).to eq(1)
+      expect(status).to eq(429)
+    end
+
     it "does warn if rate limiter is enabled" do
-      global_setting :max_requests_per_ip_per_10_seconds, 1
-      global_setting :max_requests_per_ip_mode, 'warn'
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'warn'
 
       status, _ = middleware.call(env)
       status, _ = middleware.call(env)
@@ -124,8 +164,8 @@ describe Middleware::RequestTracker do
     end
 
     it "does block if rate limiter is enabled" do
-      global_setting :max_requests_per_ip_per_10_seconds, 1
-      global_setting :max_requests_per_ip_mode, 'block'
+      global_setting :max_reqs_per_ip_per_10_seconds, 1
+      global_setting :max_reqs_per_ip_mode, 'block'
 
       env1 = env("REMOTE_ADDR" => "1.1.1.1")
       env2 = env("REMOTE_ADDR" => "1.1.1.2")
diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
index 911ef40b31..efc60b9750 100644
--- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb
+++ b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
@@ -77,6 +77,23 @@ describe Onebox::Engine::DiscourseLocalOnebox do
     end
   end
 
+  context "for a link to a user profile" do
+    let(:user)   { Fabricate(:user) }
+
+    it "returns a link if user isn't found" do
+      url = "#{Discourse.base_url}/u/none"
+      expect(Onebox.preview(url).to_s).to eq(build_link(url))
+    end
+
+    it "returns some onebox goodness if user exists" do
+      html = Onebox.preview("#{Discourse.base_url}/u/#{user.username}").to_s
+      expect(html).to include(user.username)
+      expect(html).to include(user.name)
+      expect(html).to include(user.created_at.strftime("%B %-d, %Y"))
+      expect(html).to include('<aside class="onebox">')
+    end
+  end
+
   context "for a link to an internal audio or video file" do
 
     let(:sha) { Digest::SHA1.hexdigest("discourse") }
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 7c1f37f6a5..82e9cb3a2b 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -10,8 +10,8 @@ describe Plugin::Instance do
   context "find_all" do
     it "can find plugins correctly" do
       plugins = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")
-      expect(plugins.count).to eq(1)
-      plugin = plugins[0]
+      expect(plugins.count).to eq(2)
+      plugin = plugins[1]
 
       expect(plugin.name).to eq("plugin-name")
       expect(plugin.path).to eq("#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb")
@@ -268,4 +268,108 @@ describe Plugin::Instance do
       expect(called).to eq(1)
     end
   end
+
+  context "locales" do
+    let(:plugin_path) { "#{Rails.root}/spec/fixtures/plugins/custom_locales" }
+    let!(:plugin) { Plugin::Instance.new(nil, "#{plugin_path}/plugin.rb") }
+    let(:plural) do
+      {
+        keys: [:one, :few, :other],
+        rule: lambda do |n|
+          return :one if n == 1
+          return :few if n < 10
+          :other
+        end
+      }
+    end
+
+    def register_locale(locale, opts)
+      plugin.register_locale(locale, opts)
+      plugin.activate!
+
+      DiscoursePluginRegistry.locales[locale]
+    end
+
+    it "enables the registered locales only on activate" do
+      plugin.register_locale("foo", name: "Foo", nativeName: "Foo Bar", plural: plural)
+      plugin.register_locale("es_MX", name: "Spanish (Mexico)", nativeName: "Español (México)", fallbackLocale: "es")
+      expect(DiscoursePluginRegistry.locales.count).to eq(0)
+
+      plugin.activate!
+      expect(DiscoursePluginRegistry.locales.count).to eq(2)
+    end
+
+    it "allows finding the locale by string and symbol" do
+      register_locale("foo", name: "Foo", nativeName: "Foo Bar", plural: plural)
+
+      expect(DiscoursePluginRegistry.locales).to have_key(:foo)
+      expect(DiscoursePluginRegistry.locales).to have_key('foo')
+    end
+
+    it "correctly registers a new locale" do
+      locale = register_locale("foo", name: "Foo", nativeName: "Foo Bar", plural: plural)
+
+      expect(DiscoursePluginRegistry.locales.count).to eq(1)
+      expect(DiscoursePluginRegistry.locales).to have_key(:foo)
+
+      expect(locale[:fallbackLocale]).to be_nil
+      expect(locale[:message_format]).to eq(["foo", "#{plugin_path}/lib/javascripts/locale/message_format/foo.js"])
+      expect(locale[:moment_js]).to eq(["foo", "#{plugin_path}/lib/javascripts/locale/moment_js/foo.js"])
+      expect(locale[:plural]).to eq(plural.with_indifferent_access)
+
+      expect(Rails.configuration.assets.precompile).to include("locales/foo.js")
+    end
+
+    it "correctly registers a new locale using a fallback locale" do
+      locale = register_locale("es_MX", name: "Spanish (Mexico)", nativeName: "Español (México)", fallbackLocale: "es")
+
+      expect(DiscoursePluginRegistry.locales.count).to eq(1)
+      expect(DiscoursePluginRegistry.locales).to have_key(:es_MX)
+
+      expect(locale[:fallbackLocale]).to eq("es")
+      expect(locale[:message_format]).to eq(["es", "#{Rails.root}/lib/javascripts/locale/es.js"])
+      expect(locale[:moment_js]).to eq(["es", "#{Rails.root}/lib/javascripts/moment_locale/es.js"])
+      expect(locale[:plural]).to be_nil
+
+      expect(Rails.configuration.assets.precompile).to include("locales/es_MX.js")
+    end
+
+    it "correctly registers a new locale when some files exist in core" do
+      locale = register_locale("tlh", name: "Klingon", nativeName: "tlhIngan Hol", plural: plural)
+
+      expect(DiscoursePluginRegistry.locales.count).to eq(1)
+      expect(DiscoursePluginRegistry.locales).to have_key(:tlh)
+
+      expect(locale[:fallbackLocale]).to be_nil
+      expect(locale[:message_format]).to eq(["tlh", "#{plugin_path}/lib/javascripts/locale/message_format/tlh.js"])
+      expect(locale[:moment_js]).to eq(["tlh", "#{Rails.root}/lib/javascripts/moment_locale/tlh.js"])
+      expect(locale[:plural]).to eq(plural.with_indifferent_access)
+
+      expect(Rails.configuration.assets.precompile).to include("locales/tlh.js")
+    end
+
+    it "does not register a new locale when the fallback locale does not exist" do
+      register_locale("bar", name: "Bar", nativeName: "Bar", fallbackLocale: "foo")
+      expect(DiscoursePluginRegistry.locales.count).to eq(0)
+    end
+
+    [
+      "config/locales/client.foo.yml",
+      "config/locales/server.foo.yml",
+      "lib/javascripts/locale/message_format/foo.js",
+      "lib/javascripts/locale/moment_js/foo.js",
+      "assets/locales/foo.js.erb"
+    ].each do |path|
+      it "does not register a new locale when #{path} is missing" do
+        path = "#{plugin_path}/#{path}"
+        File.stubs('exist?').returns(false)
+        File.stubs('exist?').with(regexp_matches(/#{Regexp.quote(plugin_path)}.*/)).returns(true)
+        File.stubs('exist?').with(path).returns(false)
+
+        register_locale("foo", name: "Foo", nativeName: "Foo Bar", plural: plural)
+        expect(DiscoursePluginRegistry.locales.count).to eq(0)
+      end
+    end
+  end
+
 end
diff --git a/spec/components/post_locker_spec.rb b/spec/components/post_locker_spec.rb
new file mode 100644
index 0000000000..dd1e0291a0
--- /dev/null
+++ b/spec/components/post_locker_spec.rb
@@ -0,0 +1,49 @@
+require 'rails_helper'
+require_dependency 'post_locker'
+
+describe PostLocker do
+  let(:moderator) { Fabricate(:moderator) }
+  let(:post) { Fabricate(:post) }
+
+  it "doesn't allow regular users to lock posts" do
+    expect {
+      PostLocker.new(post, post.user).lock
+    }.to raise_error(Discourse::InvalidAccess)
+
+    expect(post).not_to be_locked
+    expect(post.locked_by_id).to be_blank
+  end
+
+  it "doesn't allow regular users to unlock posts" do
+    PostLocker.new(post, moderator).lock
+
+    expect {
+      PostLocker.new(post, post.user).lock
+    }.to raise_error(Discourse::InvalidAccess)
+
+    expect(post).to be_locked
+    expect(post.locked_by_id).to eq(moderator.id)
+  end
+
+  it "allows staff to lock and unlock posts" do
+    expect(post).not_to be_locked
+    expect(post.locked_by_id).to be_blank
+
+    PostLocker.new(post, moderator).lock
+    expect(post).to be_locked
+    expect(post.locked_by_id).to eq(moderator.id)
+    expect(UserHistory.where(
+      acting_user_id: moderator.id,
+      action: UserHistory.actions[:post_locked]
+    ).exists?).to eq(true)
+
+    PostLocker.new(post, moderator).unlock
+    expect(post).not_to be_locked
+    expect(post.locked_by_id).to be_blank
+    expect(UserHistory.where(
+      acting_user_id: moderator.id,
+      action: UserHistory.actions[:post_unlocked]
+    ).exists?).to eq(true)
+  end
+
+end
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 7f0f950add..84b64825b0 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -391,6 +391,84 @@ describe PostRevisor do
       end
     end
 
+    context "staff_edit_locks_post" do
+
+      context "disabled" do
+        before do
+          SiteSetting.staff_edit_locks_post = false
+        end
+
+        it "does not lock the post when revised" do
+          result = subject.revise!(
+            Fabricate(:moderator),
+            raw: "lets totally update the body"
+          )
+          expect(result).to eq(true)
+          post.reload
+          expect(post).not_to be_locked
+        end
+      end
+
+      context "enabled" do
+        let(:moderator) { Fabricate(:moderator) }
+
+        before do
+          SiteSetting.staff_edit_locks_post = true
+        end
+
+        it "locks the post when revised by staff" do
+          result = subject.revise!(
+            moderator,
+            raw: "lets totally update the body"
+          )
+          expect(result).to eq(true)
+          post.reload
+          expect(post).to be_locked
+        end
+
+        it "doesn't lock the post when revised by a regular user" do
+          result = subject.revise!(
+            Fabricate(:user),
+            raw: "lets totally update the body"
+          )
+          expect(result).to eq(true)
+          post.reload
+          expect(post).not_to be_locked
+        end
+
+        it "doesn't lock a staff member's post" do
+          staff_post = Fabricate(:post, user: moderator)
+          revisor = PostRevisor.new(staff_post)
+
+          result = revisor.revise!(
+            moderator,
+            raw: "lets totally update the body"
+          )
+          expect(result).to eq(true)
+          staff_post.reload
+          expect(staff_post).not_to be_locked
+        end
+      end
+    end
+
+    context "alerts" do
+
+      let(:mentioned_user) { Fabricate(:user) }
+
+      it "generates a notification for a mention" do
+        expect {
+          subject.revise!(Fabricate(:user), raw: "Random user is mentioning @#{mentioned_user.username_lower}")
+        }.to change { Notification.where(notification_type: Notification.types[:mentioned]).count }
+      end
+
+      it "never generates a notification for a mention when the System user revise a post" do
+        expect {
+          subject.revise!(Discourse.system_user, raw: "System user is mentioning @#{mentioned_user.username_lower}")
+        }.not_to change { Notification.where(notification_type: Notification.types[:mentioned]).count }
+      end
+
+    end
+
     context "tagging" do
       context "tagging disabled" do
         before do
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index d02683bee8..6e0ee7e045 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -746,6 +746,20 @@ describe PrettyText do
       expect(PrettyText.cook("💣")).not_to match(/\:bomb\:/)
     end
 
+    it "doesn't replace emoji if emoji is disabled" do
+      SiteSetting.enable_emoji = false
+      expect(PrettyText.cook(":bomb:")).to eq("<p>:bomb:</p>")
+    end
+
+    it "doesn't replace shortcuts if disabled" do
+      SiteSetting.enable_emoji_shortcuts = false
+      expect(PrettyText.cook(":)")).to eq("<p>:)</p>")
+    end
+
+    it "does replace shortcuts if enabled" do
+      expect(PrettyText.cook(":)")).to match("smile")
+    end
+
     it "replaces skin toned emoji" do
       expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=5\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
       expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_singer.png?v=5\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")
@@ -797,6 +811,17 @@ describe PrettyText do
     expect(cooked).to eq(n expected)
   end
 
+  it 'allows only tel URL scheme to start with a plus character' do
+    SiteSetting.allowed_href_schemes = "tel|steam"
+    cooked = cook("[Tel URL Scheme](tel://+452530579785)")
+    expected = '<p><a href="tel://+452530579785" rel="nofollow noopener">Tel URL Scheme</a></p>'
+    expect(cooked).to eq(n expected)
+
+    cooked2 = cook("[Steam URL Scheme](steam://+store/452530)")
+    expected2 = '<p><a>Steam URL Scheme</a></p>'
+    expect(cooked2).to eq(n expected2)
+  end
+
   it "produces hashtag links" do
     category = Fabricate(:category, name: 'testing')
     category2 = Fabricate(:category, name: 'known')
diff --git a/spec/components/retrieve_title_spec.rb b/spec/components/retrieve_title_spec.rb
index 09edb28eae..3a7af745fc 100644
--- a/spec/components/retrieve_title_spec.rb
+++ b/spec/components/retrieve_title_spec.rb
@@ -54,7 +54,18 @@ describe RetrieveTitle do
       )
       expect(title).to eq("Video Title")
     end
+  end
 
+  context "crawl" do
+    it "can properly extract a title from a url" do
+      stub_request(:get, "https://brelksdjflaskfj.com/amazing")
+        .to_return(status: 200, body: "<html><title>very amazing</title>")
+
+      # we still resolve the IP address for every host
+      IPSocket.stubs(:getaddress).returns('100.2.3.4')
+
+      expect(RetrieveTitle.crawl("https://brelksdjflaskfj.com/amazing")).to eq("very amazing")
+    end
   end
 
 end
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 16cdae30a2..3f2228a990 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -915,6 +915,12 @@ describe Search do
       results = s.execute
       expect(results.search_log_id).to be_present
     end
+
+    it "does not log search if search_type is not present" do
+      s = Search.new('foo bar', ip_address: '127.0.0.1')
+      results = s.execute
+      expect(results.search_log_id).not_to be_present
+    end
   end
 
   context 'pagination' do
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index be119f5309..4ca84492b3 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -695,6 +695,10 @@ describe TopicQuery do
       expect(TopicQuery.new(user).list_suggested_for(pm_to_user).topics.map(&:id)).to(
         eq([new_pm.id, unread_pm.id, related_by_user_pm.id])
       )
+
+      SiteSetting.enable_private_messages = false
+      expect(TopicQuery.new(user).list_suggested_for(pm_to_group)).to be_blank
+      expect(TopicQuery.new(user).list_suggested_for(pm_to_user)).to be_blank
     end
   end
 
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index 3e8897ae53..29ee51328e 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -4,13 +4,13 @@ require 'topic_view'
 describe TopicView do
 
   let(:topic) { create_topic }
-  let(:coding_horror) { Fabricate(:coding_horror) }
+  let(:evil_trout) { Fabricate(:evil_trout) }
   let(:first_poster) { topic.user }
 
-  let(:topic_view) { TopicView.new(topic.id, coding_horror) }
+  let(:topic_view) { TopicView.new(topic.id, evil_trout) }
 
   it "raises a not found error if the topic doesn't exist" do
-    expect { TopicView.new(1231232, coding_horror) }.to raise_error(Discourse::NotFound)
+    expect { TopicView.new(1231232, evil_trout) }.to raise_error(Discourse::NotFound)
   end
 
   # see also spec/controllers/topics_controller_spec.rb TopicsController::show::permission errors
@@ -28,23 +28,23 @@ describe TopicView do
 
   context "chunk_size" do
     it "returns `chunk_size` by default" do
-      expect(TopicView.new(topic.id, coding_horror).chunk_size).to eq(TopicView.chunk_size)
+      expect(TopicView.new(topic.id, evil_trout).chunk_size).to eq(TopicView.chunk_size)
     end
 
     it "returns `slow_chunk_size` when slow_platform is true" do
-      tv = TopicView.new(topic.id, coding_horror, slow_platform: true)
+      tv = TopicView.new(topic.id, evil_trout, slow_platform: true)
       expect(tv.chunk_size).to eq(TopicView.slow_chunk_size)
     end
 
     it "returns `print_chunk_size` when print param is true" do
-      tv = TopicView.new(topic.id, coding_horror, print: true)
+      tv = TopicView.new(topic.id, evil_trout, print: true)
       expect(tv.chunk_size).to eq(TopicView.print_chunk_size)
     end
   end
 
   context "with a few sample posts" do
     let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1) }
-    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5) }
+    let!(:p2) { Fabricate(:post, topic: topic, user: evil_trout, percent_rank: 0.5) }
     let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0) }
 
     let(:moderator) { Fabricate(:moderator) }
@@ -52,7 +52,7 @@ describe TopicView do
 
     it "it can find the best responses" do
 
-      best2 = TopicView.new(topic.id, coding_horror, best: 2)
+      best2 = TopicView.new(topic.id, evil_trout, best: 2)
       expect(best2.posts.count).to eq(2)
       expect(best2.posts[0].id).to eq(p2.id)
       expect(best2.posts[1].id).to eq(p3.id)
@@ -67,7 +67,7 @@ describe TopicView do
       expect(best.posts.pluck(:id)).to match_array([p2.id, p3.id])
 
       # should get no results for trust level too low
-      best = TopicView.new(topic.id, nil, best: 99, min_trust_level: coding_horror.trust_level + 1)
+      best = TopicView.new(topic.id, nil, best: 99, min_trust_level: evil_trout.trust_level + 1)
       expect(best.posts.count).to eq(0)
 
       # should filter out the posts with a score that is too low
@@ -81,11 +81,11 @@ describe TopicView do
       # should punch through posts if the score is high enough
       p2.update_column(:score, 100)
 
-      best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 100, min_trust_level: coding_horror.trust_level + 1)
+      best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 100, min_trust_level: evil_trout.trust_level + 1)
       expect(best.posts.count).to eq(1)
 
       # 0 means ignore
-      best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 0, min_trust_level: coding_horror.trust_level + 1)
+      best = TopicView.new(topic.id, nil, best: 99, bypass_trust_level_score: 0, min_trust_level: evil_trout.trust_level + 1)
       expect(best.posts.count).to eq(0)
 
       # If we restrict to posts a moderator liked, return none
@@ -109,6 +109,37 @@ describe TopicView do
       expect { TopicView.new(topic.id, nil) }.to raise_error(Discourse::NotLoggedIn)
     end
 
+    context 'log_check_personal_message is enabled' do
+      let(:group) { Fabricate(:group) }
+      let(:private_message) { Fabricate(:private_message_topic, allowed_groups: [group]) }
+
+      before do
+        SiteSetting.log_personal_messages_views = true
+        evil_trout.admin = true
+      end
+
+      it "logs view if Admin views personal message for other user/group" do
+        allowed_user = private_message.topic_allowed_users.first.user
+        TopicView.new(private_message.id, allowed_user)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+
+        TopicView.new(private_message.id, evil_trout)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(1)
+      end
+
+      it "does not log personal message view for group he belongs to" do
+        group.users << evil_trout
+        TopicView.new(private_message.id, evil_trout)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+      end
+
+      it "does not log personal message view for his own personal message" do
+        private_message.allowed_users << evil_trout
+        TopicView.new(private_message.id, evil_trout)
+        expect(UserHistory.where(action: UserHistory.actions[:check_personal_message]).count).to eq(0)
+      end
+    end
+
     it "provides an absolute url" do
       expect(topic_view.absolute_url).to be_present
     end
@@ -161,11 +192,11 @@ describe TopicView do
 
     context '.post_counts_by_user' do
       it 'returns the two posters with their appropriate counts' do
-        Fabricate(:post, topic: topic, user: coding_horror, post_type: Post.types[:whisper])
+        Fabricate(:post, topic: topic, user: evil_trout, post_type: Post.types[:whisper])
 
-        expect(topic_view.post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [coding_horror.id, 2]])
+        expect(topic_view.post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [evil_trout.id, 2]])
 
-        expect(TopicView.new(topic.id, first_poster).post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [coding_horror.id, 1]])
+        expect(TopicView.new(topic.id, first_poster).post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [evil_trout.id, 1]])
       end
 
       it "doesn't return counts for posts with authors who have been deleted" do
@@ -178,7 +209,7 @@ describe TopicView do
 
     context '.participants' do
       it 'returns the two participants hashed by id' do
-        expect(topic_view.participants.to_a).to match_array([[first_poster.id, first_poster], [coding_horror.id, coding_horror]])
+        expect(topic_view.participants.to_a).to match_array([[first_poster.id, first_poster], [evil_trout.id, evil_trout]])
       end
     end
 
@@ -188,7 +219,7 @@ describe TopicView do
       end
 
       it 'returns the like' do
-        PostAction.act(coding_horror, p1, PostActionType.types[:like])
+        PostAction.act(evil_trout, p1, PostActionType.types[:like])
         expect(topic_view.all_post_actions[p1.id][PostActionType.types[:like]]).to be_present
       end
     end
@@ -200,14 +231,14 @@ describe TopicView do
 
       it 'returns the active flags' do
         PostAction.act(moderator, p1, PostActionType.types[:off_topic])
-        PostAction.act(coding_horror, p1, PostActionType.types[:off_topic])
+        PostAction.act(evil_trout, p1, PostActionType.types[:off_topic])
 
         expect(topic_view.all_active_flags[p1.id][PostActionType.types[:off_topic]].count).to eq(2)
       end
 
       it 'returns only the active flags' do
         PostAction.act(moderator, p1, PostActionType.types[:off_topic])
-        PostAction.act(coding_horror, p1, PostActionType.types[:off_topic])
+        PostAction.act(evil_trout, p1, PostActionType.types[:off_topic])
 
         PostAction.defer_flags!(p1, moderator)
 
@@ -223,12 +254,12 @@ describe TopicView do
         # random user has nothing
         expect(topic_view.read?(1)).to eq(false)
 
-        coding_horror.created_at = 2.days.ago
+        evil_trout.created_at = 2.days.ago
 
         # a real user that just read it should have it marked
-        PostTiming.process_timings(coding_horror, topic.id, 1, [[1, 1000]])
-        expect(TopicView.new(topic.id, coding_horror).read?(1)).to eq(true)
-        expect(TopicView.new(topic.id, coding_horror).topic_user).to be_present
+        PostTiming.process_timings(evil_trout, topic.id, 1, [[1, 1000]])
+        expect(TopicView.new(topic.id, evil_trout).read?(1)).to eq(true)
+        expect(TopicView.new(topic.id, evil_trout).topic_user).to be_present
       end
     end
 
@@ -262,11 +293,11 @@ describe TopicView do
 
   context 'whispers' do
     it "handles their visibility properly" do
-      p1 = Fabricate(:post, topic: topic, user: coding_horror)
-      p2 = Fabricate(:post, topic: topic, user: coding_horror, post_type: Post.types[:whisper])
-      p3 = Fabricate(:post, topic: topic, user: coding_horror)
+      p1 = Fabricate(:post, topic: topic, user: evil_trout)
+      p2 = Fabricate(:post, topic: topic, user: evil_trout, post_type: Post.types[:whisper])
+      p3 = Fabricate(:post, topic: topic, user: evil_trout)
 
-      ch_posts = TopicView.new(topic.id, coding_horror).posts
+      ch_posts = TopicView.new(topic.id, evil_trout).posts
       expect(ch_posts.map(&:id)).to eq([p1.id, p2.id, p3.id])
 
       anon_posts = TopicView.new(topic.id).posts
@@ -280,12 +311,12 @@ describe TopicView do
   context '.posts' do
 
     # Create the posts in a different order than the sort_order
-    let!(:p5) { Fabricate(:post, topic: topic, user: coding_horror) }
-    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror) }
+    let!(:p5) { Fabricate(:post, topic: topic, user: evil_trout) }
+    let!(:p2) { Fabricate(:post, topic: topic, user: evil_trout) }
     let!(:p6) { Fabricate(:post, topic: topic, user: Fabricate(:user), deleted_at: Time.now) }
-    let!(:p4) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now) }
+    let!(:p4) { Fabricate(:post, topic: topic, user: evil_trout, deleted_at: Time.now) }
     let!(:p1) { Fabricate(:post, topic: topic, user: first_poster) }
-    let!(:p7) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now) }
+    let!(:p7) { Fabricate(:post, topic: topic, user: evil_trout, deleted_at: Time.now) }
     let!(:p3) { Fabricate(:post, topic: topic, user: first_poster) }
 
     before do
@@ -305,11 +336,11 @@ describe TopicView do
         # does not contain contains_gaps with default filtering
         expect(topic_view.contains_gaps?).to eq(false)
         # contains contains_gaps when filtered by username" do
-        expect(TopicView.new(topic.id, coding_horror, username_filters: ['eviltrout']).contains_gaps?).to eq(true)
+        expect(TopicView.new(topic.id, evil_trout, username_filters: ['eviltrout']).contains_gaps?).to eq(true)
         # contains contains_gaps when filtered by summary
-        expect(TopicView.new(topic.id, coding_horror, filter: 'summary').contains_gaps?).to eq(true)
+        expect(TopicView.new(topic.id, evil_trout, filter: 'summary').contains_gaps?).to eq(true)
         # contains contains_gaps when filtered by best
-        expect(TopicView.new(topic.id, coding_horror, best: 5).contains_gaps?).to eq(true)
+        expect(TopicView.new(topic.id, evil_trout, best: 5).contains_gaps?).to eq(true)
       end
     end
 
@@ -324,10 +355,10 @@ describe TopicView do
       topic.save!
 
       expect {
-        TopicView.new(topic.id, coding_horror).posts.count
+        TopicView.new(topic.id, evil_trout).posts.count
       }.to raise_error(Discourse::InvalidAccess)
 
-      expect(TopicView.new(t2.id, coding_horror, post_ids: [p1.id, p2.id]).posts.count).to eq(0)
+      expect(TopicView.new(t2.id, evil_trout, post_ids: [p1.id, p2.id]).posts.count).to eq(0)
 
     end
 
@@ -345,7 +376,7 @@ describe TopicView do
     describe "filter_posts_near" do
 
       def topic_view_near(post, show_deleted = false)
-        TopicView.new(topic.id, coding_horror, post_number: post.post_number, show_deleted: show_deleted)
+        TopicView.new(topic.id, evil_trout, post_number: post.post_number, show_deleted: show_deleted)
       end
 
       it "snaps to the lower boundary" do
@@ -370,7 +401,7 @@ describe TopicView do
       end
 
       it "gaps deleted posts to an admin" do
-        coding_horror.admin = true
+        evil_trout.admin = true
         near_view = topic_view_near(p3)
         expect(near_view.desired_post).to eq(p3)
         expect(near_view.posts).to eq([p2, p3, p5])
@@ -379,7 +410,7 @@ describe TopicView do
       end
 
       it "returns deleted posts to an admin with show_deleted" do
-        coding_horror.admin = true
+        evil_trout.admin = true
         near_view = topic_view_near(p3, true)
         expect(near_view.desired_post).to eq(p3)
         expect(near_view.posts).to eq([p2, p3, p4])
@@ -387,7 +418,7 @@ describe TopicView do
       end
 
       it "gaps deleted posts by nuked users to an admin" do
-        coding_horror.admin = true
+        evil_trout.admin = true
         near_view = topic_view_near(p5)
         expect(near_view.desired_post).to eq(p5)
         # note: both p4 and p6 get skipped
@@ -397,7 +428,7 @@ describe TopicView do
       end
 
       it "returns deleted posts by nuked users to an admin with show_deleted" do
-        coding_horror.admin = true
+        evil_trout.admin = true
         near_view = topic_view_near(p5, true)
         expect(near_view.desired_post).to eq(p5)
         expect(near_view.posts).to eq([p4, p5, p6])
@@ -414,7 +445,7 @@ describe TopicView do
         end
 
         it 'gaps deleted posts to admins' do
-          coding_horror.admin = true
+          evil_trout.admin = true
           near_view = topic_view_near(p5)
           expect(near_view.posts).to eq([p1, p2, p3, p5])
           expect(near_view.gaps.before).to eq(p5.id => [p4.id])
@@ -422,7 +453,7 @@ describe TopicView do
         end
 
         it 'returns deleted posts to admins' do
-          coding_horror.admin = true
+          evil_trout.admin = true
           near_view = topic_view_near(p5, true)
           expect(near_view.posts).to eq([p1, p2, p3, p4, p5, p6, p7])
           expect(near_view.contains_gaps?).to eq(false)
@@ -435,7 +466,7 @@ describe TopicView do
     let(:tag1) { Fabricate(:tag) }
     let(:tag2) { Fabricate(:tag, topic_count: 2) }
 
-    subject { TopicView.new(topic.id, coding_horror).page_title }
+    subject { TopicView.new(topic.id, evil_trout).page_title }
 
     context "uncategorized topic" do
       context "topic_page_title_includes_category is false" do
diff --git a/spec/components/validators/regex_presence_validator_spec.rb b/spec/components/validators/regex_presence_validator_spec.rb
new file mode 100644
index 0000000000..819269e155
--- /dev/null
+++ b/spec/components/validators/regex_presence_validator_spec.rb
@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe RegexPresenceValidator do
+  subject { described_class.new(regex: 'latest', regex_error: 'site_settings.errors.must_include_latest') }
+
+  describe "#valid_value?" do
+    describe "when value is present" do
+      it "without regex match" do
+        expect(subject.valid_value?("categories|new")).to eq(false)
+
+        expect(subject.error_message).to eq(I18n.t(
+          "site_settings.errors.must_include_latest"
+        ))
+      end
+
+      it "with regex match" do
+        expect(subject.valid_value?("latest|categories")).to eq(true)
+      end
+    end
+
+    describe "when value is empty" do
+      it "should not be valid" do
+        expect(subject.valid_value?("")).to eq(false)
+
+        expect(subject.error_message).to eq(I18n.t(
+          "site_settings.errors.must_include_latest"
+        ))
+      end
+    end
+  end
+end
diff --git a/spec/controllers/admin/admin_controller_spec.rb b/spec/controllers/admin/admin_controller_spec.rb
index 54db42f3f9..f26b081a9d 100644
--- a/spec/controllers/admin/admin_controller_spec.rb
+++ b/spec/controllers/admin/admin_controller_spec.rb
@@ -5,13 +5,12 @@ describe Admin::AdminController do
   context 'index' do
 
     it 'needs you to be logged in' do
-      expect do
-        get :index, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      get :index, format: :json
+      expect(response.status).to eq(403)
     end
 
     it "raises an error if you aren't an admin" do
-      user = log_in
+      _user = log_in
       get :index, format: :json
       expect(response).to be_forbidden
     end
diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb
index f0cca3fa94..d46780f739 100644
--- a/spec/controllers/categories_controller_spec.rb
+++ b/spec/controllers/categories_controller_spec.rb
@@ -4,7 +4,8 @@ describe CategoriesController do
   describe "create" do
 
     it "requires the user to be logged in" do
-      expect { post :create, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      post :create, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe "logged in" do
@@ -90,8 +91,8 @@ describe CategoriesController do
   describe "destroy" do
 
     it "requires the user to be logged in" do
-      expect { delete :destroy, params: { id: "category" }, format: :json }
-        .to raise_error(Discourse::NotLoggedIn)
+      delete :destroy, params: { id: "category" }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe "logged in" do
@@ -158,7 +159,8 @@ describe CategoriesController do
   describe "update" do
 
     it "requires the user to be logged in" do
-      expect { put :update, params: { id: 'category' }, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      put :update, params: { id: 'category' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe "logged in" do
@@ -302,9 +304,8 @@ describe CategoriesController do
 
   describe 'update_slug' do
     it 'requires the user to be logged in' do
-      expect do
-        put :update_slug, params: { category_id: 'category' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :update_slug, params: { category_id: 'category' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'logged in' do
diff --git a/spec/controllers/category_hashtags_controller_spec.rb b/spec/controllers/category_hashtags_controller_spec.rb
index 56d9b50565..f177811df2 100644
--- a/spec/controllers/category_hashtags_controller_spec.rb
+++ b/spec/controllers/category_hashtags_controller_spec.rb
@@ -44,9 +44,8 @@ describe CategoryHashtagsController do
 
     describe "not logged in" do
       it 'raises an exception' do
-        expect do
-          get :check, params: { category_slugs: [] }, format: :json
-        end.to raise_error(Discourse::NotLoggedIn)
+        get :check, params: { category_slugs: [] }, format: :json
+        expect(response.status).to eq(403)
       end
     end
   end
diff --git a/spec/controllers/composer_messages_controller_spec.rb b/spec/controllers/composer_messages_controller_spec.rb
index 5f22deda8e..c2333fa33f 100644
--- a/spec/controllers/composer_messages_controller_spec.rb
+++ b/spec/controllers/composer_messages_controller_spec.rb
@@ -5,7 +5,8 @@ describe ComposerMessagesController do
   context '.index' do
 
     it 'requires you to be logged in' do
-      expect { get :index, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      get :index, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'when logged in' do
diff --git a/spec/controllers/draft_controller_spec.rb b/spec/controllers/draft_controller_spec.rb
index fd8912caa7..d7e63615f2 100644
--- a/spec/controllers/draft_controller_spec.rb
+++ b/spec/controllers/draft_controller_spec.rb
@@ -3,7 +3,8 @@ require 'rails_helper'
 describe DraftController do
 
   it 'requires you to be logged in' do
-    expect { post :update }.to raise_error(Discourse::NotLoggedIn)
+    post :update
+    expect(response.status).to eq(403)
   end
 
   it 'saves a draft on update' do
diff --git a/spec/controllers/email_controller_spec.rb b/spec/controllers/email_controller_spec.rb
index 4a1a03994f..8f112c8334 100644
--- a/spec/controllers/email_controller_spec.rb
+++ b/spec/controllers/email_controller_spec.rb
@@ -5,7 +5,8 @@ describe EmailController do
   context '.preferences_redirect' do
 
     it 'requires you to be logged in' do
-      expect { get :preferences_redirect, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      get :preferences_redirect, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'when logged in' do
diff --git a/spec/controllers/extra_locales_controller_spec.rb b/spec/controllers/extra_locales_controller_spec.rb
index 8ec2784ead..c3aa308d51 100644
--- a/spec/controllers/extra_locales_controller_spec.rb
+++ b/spec/controllers/extra_locales_controller_spec.rb
@@ -4,6 +4,16 @@ describe ExtraLocalesController do
 
   context 'show' do
 
+    it "caches for 24 hours if version is provided and it matches current hash" do
+      get :show, params: { bundle: 'admin', v: ExtraLocalesController.bundle_js_hash('admin') }
+      expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable")
+    end
+
+    it "does not cache at all if version is invalid" do
+      get :show, params: { bundle: 'admin', v: 'a' * 32 }
+      expect(response.headers["Cache-Control"]).not_to eq("max-age=86400, public, immutable")
+    end
+
     it "needs a valid bundle" do
       get :show, params: { bundle: 'made-up-bundle' }
       expect(response).to_not be_success
diff --git a/spec/controllers/finish_installation_controller_spec.rb b/spec/controllers/finish_installation_controller_spec.rb
index ea222c9bc2..e239a9af30 100644
--- a/spec/controllers/finish_installation_controller_spec.rb
+++ b/spec/controllers/finish_installation_controller_spec.rb
@@ -50,13 +50,12 @@ describe FinishInstallationController do
       end
 
       it "raises an error when the email is not in the allowed list" do
-        expect do
-          post :register, params: {
-            email: 'notrobin@example.com',
-            username: 'eviltrout',
-            password: 'disismypasswordokay'
-          }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        post :register, params: {
+          email: 'notrobin@example.com',
+          username: 'eviltrout',
+          password: 'disismypasswordokay'
+        }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it "doesn't redirect when fields are wrong" do
diff --git a/spec/controllers/inline_onebox_controller_spec.rb b/spec/controllers/inline_onebox_controller_spec.rb
index 72ee3762e8..e68387fa55 100644
--- a/spec/controllers/inline_onebox_controller_spec.rb
+++ b/spec/controllers/inline_onebox_controller_spec.rb
@@ -3,9 +3,8 @@ require 'rails_helper'
 describe InlineOneboxController do
 
   it "requires the user to be logged in" do
-    expect do
-      get :show, params: { urls: [] }, format: :json
-    end.to raise_error(Discourse::NotLoggedIn)
+    get :show, params: { urls: [] }, format: :json
+    expect(response.status).to eq(403)
   end
 
   context "logged in" do
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index 28266d4531..777a677740 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -32,11 +32,10 @@ describe InvitesController do
   context '.destroy' do
 
     it 'requires you to be logged in' do
-      expect do
-        delete :destroy,
-          params: { email: 'jake@adventuretime.ooo' },
-          format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      delete :destroy,
+        params: { email: 'jake@adventuretime.ooo' },
+        format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -49,15 +48,13 @@ describe InvitesController do
       end
 
       it "raises an error when the email cannot be found" do
-        expect do
-          delete :destroy, params: { email: 'finn@adventuretime.ooo' }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        delete :destroy, params: { email: 'finn@adventuretime.ooo' }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it 'raises an error when the invite is not yours' do
-        expect do
-          delete :destroy, params: { email: another_invite.email }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        delete :destroy, params: { email: another_invite.email }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it "destroys the invite" do
@@ -71,9 +68,8 @@ describe InvitesController do
 
   context '#create' do
     it 'requires you to be logged in' do
-      expect do
-        post :create, params: { email: 'jake@adventuretime.ooo' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      post :create, params: { email: 'jake@adventuretime.ooo' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -136,11 +132,10 @@ describe InvitesController do
 
   context '.create_invite_link' do
     it 'requires you to be logged in' do
-      expect {
-        post :create_invite_link, params: {
-          email: 'jake@adventuretime.ooo'
-        }, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
+      post :create_invite_link, params: {
+        email: 'jake@adventuretime.ooo'
+      }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -363,9 +358,8 @@ describe InvitesController do
   context '.resend_invite' do
 
     it 'requires you to be logged in' do
-      expect {
-        delete :resend_invite, params: { email: 'first_name@example.com' }, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
+      delete :resend_invite, params: { email: 'first_name@example.com' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -378,15 +372,13 @@ describe InvitesController do
       end
 
       it "raises an error when the email cannot be found" do
-        expect do
-          post :resend_invite, params: { email: 'first_name@example.com' }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        post :resend_invite, params: { email: 'first_name@example.com' }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it 'raises an error when the invite is not yours' do
-        expect do
-          post :resend_invite, params: { email: another_invite.email }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        post :resend_invite, params: { email: another_invite.email }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it "resends the invite" do
@@ -400,9 +392,8 @@ describe InvitesController do
 
   context '.upload_csv' do
     it 'requires you to be logged in' do
-      expect {
-        post :upload_csv, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
+      post :upload_csv, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb
index 412833aa17..e47ceac19d 100644
--- a/spec/controllers/list_controller_spec.rb
+++ b/spec/controllers/list_controller_spec.rb
@@ -297,7 +297,8 @@ describe ListController do
 
   context 'read' do
     it 'raises an error when not logged in' do
-      expect { get :read }.to raise_error(Discourse::NotLoggedIn)
+      get :read
+      expect(response.status).to eq(404)
     end
 
     context 'when logged in' do
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index b5d4b1acbc..677e4868f9 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -17,7 +17,7 @@ describe NotificationsController do
       end
 
       it 'should mark notifications as viewed' do
-        notification = Fabricate(:notification, user: user)
+        _notification = Fabricate(:notification, user: user)
         expect(user.reload.unread_notifications).to eq(1)
         expect(user.reload.total_unread_notifications).to eq(1)
         get :index, params: { recent: true }, format: :json
@@ -26,7 +26,7 @@ describe NotificationsController do
       end
 
       it 'should not mark notifications as viewed if silent param is present' do
-        notification = Fabricate(:notification, user: user)
+        _notification = Fabricate(:notification, user: user)
         expect(user.reload.unread_notifications).to eq(1)
         expect(user.reload.total_unread_notifications).to eq(1)
         get :index, params: { recent: true, silent: true }
@@ -63,7 +63,7 @@ describe NotificationsController do
     end
 
     it "updates the `read` status" do
-      notification = Fabricate(:notification, user: user)
+      _notification = Fabricate(:notification, user: user)
       expect(user.reload.unread_notifications).to eq(1)
       expect(user.reload.total_unread_notifications).to eq(1)
       put :mark_read, format: :json
@@ -75,9 +75,8 @@ describe NotificationsController do
 
   context 'when not logged in' do
     it 'should raise an error' do
-      expect do
-        get :index, params: { recent: true }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      get :index, params: { recent: true }, format: :json
+      expect(response.status).to eq(403)
     end
   end
 
diff --git a/spec/controllers/onebox_controller_spec.rb b/spec/controllers/onebox_controller_spec.rb
index 8995a78710..374f6a4a2a 100644
--- a/spec/controllers/onebox_controller_spec.rb
+++ b/spec/controllers/onebox_controller_spec.rb
@@ -5,9 +5,8 @@ describe OneboxController do
   let(:url) { "http://google.com" }
 
   it "requires the user to be logged in" do
-    expect do
-      get :show, params: { url: url }, format: :json
-    end.to raise_error(Discourse::NotLoggedIn)
+    get :show, params: { url: url }, format: :json
+    expect(response.status).to eq(403)
   end
 
   describe "logged in" do
diff --git a/spec/controllers/post_actions_controller_spec.rb b/spec/controllers/post_actions_controller_spec.rb
index 5a68642ace..0994fc601d 100644
--- a/spec/controllers/post_actions_controller_spec.rb
+++ b/spec/controllers/post_actions_controller_spec.rb
@@ -3,11 +3,6 @@ require 'rails_helper'
 describe PostActionsController do
 
   describe 'create' do
-    it 'requires you to be logged in' do
-      expect do
-        post :create, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
 
     context 'logged in as user' do
       let(:user) { Fabricate(:user) }
@@ -32,12 +27,6 @@ describe PostActionsController do
 
     let(:post) { Fabricate(:post, user: Fabricate(:coding_horror)) }
 
-    it 'requires you to be logged in' do
-      expect do
-        delete :destroy, params: { id: post.id }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-
     context 'logged in' do
       let!(:user) { log_in }
 
@@ -89,9 +78,8 @@ describe PostActionsController do
 
     context "not logged in" do
       it "should not allow them to clear flags" do
-        expect do
-          post :defer_flags, format: :json
-        end.to raise_error(Discourse::NotLoggedIn)
+        post :defer_flags, format: :json
+        expect(response.status).to eq(403)
       end
     end
 
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index 1981d15bf6..073dbe58a4 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -47,11 +47,10 @@ end
 
 shared_examples 'action requires login' do |method, action, params|
   it 'raises an exception when not logged in' do
-    expect do
-      options = { format: :json }
-      options.merge!(params: params) if params
-      self.public_send(method, action, options)
-    end.to raise_error(Discourse::NotLoggedIn)
+    options = { format: :json }
+    options.merge!(params: params) if params
+    self.public_send(method, action, options)
+    expect(response.status).to eq(403)
   end
 end
 
@@ -268,9 +267,8 @@ describe PostsController do
       end
 
       it "raises invalid parameters with missing ids" do
-        expect do
-          delete :destroy_many, params: { post_ids: [12345] }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        delete :destroy_many, params: { post_ids: [12345] }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it "raises an error when the user doesn't have permission to delete the posts" do
@@ -855,11 +853,10 @@ describe PostsController do
     let(:post_revision) { Fabricate(:post_revision, post: post) }
 
     it "throws an exception when revision is < 2" do
-      expect {
-        get :revisions, params: {
-          post_id: post_revision.post_id, revision: 1
-        }, format: :json
-      }.to raise_error(Discourse::InvalidParameters)
+      get :revisions, params: {
+        post_id: post_revision.post_id, revision: 1
+      }, format: :json
+      expect(response.status).to eq(400)
     end
 
     context "when edit history is not visible to the public" do
@@ -984,10 +981,9 @@ describe PostsController do
     describe "when logged in as staff" do
       let(:logged_in_as) { log_in(:moderator) }
 
-      it "throws an exception when revision is < 2" do
-        expect {
-          put :revert, params:  { post_id: post.id, revision: 1 }, format: :json
-        }.to raise_error(Discourse::InvalidParameters)
+      it "fails when revision is < 2" do
+        put :revert, params:  { post_id: post.id, revision: 1 }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it "fails when post_revision record is not found" do
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index d6cec92d0b..f90a11e801 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -125,19 +125,17 @@ describe SearchController do
 
   context "search context" do
     it "raises an error with an invalid context type" do
-      expect do
-        get :query, params: {
-          term: 'test', search_context: { type: 'security', id: 'hole' }
-        }, format: :json
-      end.to raise_error(Discourse::InvalidParameters)
+      get :query, params: {
+        term: 'test', search_context: { type: 'security', id: 'hole' }
+      }, format: :json
+      expect(response.status).to eq(400)
     end
 
     it "raises an error with a missing id" do
-      expect do
-        get :query,
-          params: { term: 'test', search_context: { type: 'user' } },
-          format: :json
-      end.to raise_error(Discourse::InvalidParameters)
+      get :query,
+        params: { term: 'test', search_context: { type: 'user' } },
+        format: :json
+      expect(response.status).to eq(400)
     end
 
     context "with a user" do
@@ -148,7 +146,6 @@ describe SearchController do
         get :query, params: {
           term: 'test', search_context: { type: 'user', id: user.username }
         }, format: :json
-
         expect(response).not_to be_success
       end
 
@@ -164,6 +161,10 @@ describe SearchController do
   end
 
   context "#click" do
+    before do
+      SearchLog.clear_debounce_cache!
+    end
+
     it "doesn't work wthout the necessary parameters" do
       expect do
         post :click, format: :json
diff --git a/spec/controllers/steps_controller_spec.rb b/spec/controllers/steps_controller_spec.rb
index 50a31a28d2..ec1f7fd608 100644
--- a/spec/controllers/steps_controller_spec.rb
+++ b/spec/controllers/steps_controller_spec.rb
@@ -7,11 +7,10 @@ describe StepsController do
   end
 
   it 'needs you to be logged in' do
-    expect do
-      put :update, params: {
-        id: 'made-up-id', fields: { forum_title: "updated title" }
-      }, format: :json
-    end.to raise_error(Discourse::NotLoggedIn)
+    put :update, params: {
+      id: 'made-up-id', fields: { forum_title: "updated title" }
+    }, format: :json
+    expect(response.status).to eq(403)
   end
 
   it "raises an error if you aren't an admin" do
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index f24e0811ed..01637a4b09 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -9,12 +9,8 @@ def topics_controller_show_gen_perm_tests(expected, ctx)
 
     method = <<~TEXT
     it 'returns #{status} for #{sym}' do
-      begin
-        get :show, params: { #{params} }
-        expect(response.status).to eq(#{status})
-      rescue Discourse::NotLoggedIn
-        expect(302).to eq(#{status})
-      end
+      get :show, params: { #{params} }
+      expect(response.status).to eq(#{status})
     end
     TEXT
 
@@ -65,21 +61,20 @@ describe TopicsController do
 
   context 'move_posts' do
     it 'needs you to be logged in' do
-      expect do
-        post :move_posts, params: {
-          topic_id: 111,
-          title: 'blah',
-          post_ids: [1, 2, 3]
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      post :move_posts, params: {
+        topic_id: 111,
+        title: 'blah',
+        post_ids: [1, 2, 3]
+      }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'moving to a new topic' do
       let(:user) { log_in(:moderator) }
-      let(:p1) { Fabricate(:post, user: user) }
+      let(:p1) { Fabricate(:post, user: user, post_number: 1) }
       let(:topic) { p1.topic }
 
-      it "raises an error without postIds" do
+      it "raises an error without post_ids" do
         expect do
           post :move_posts, params: {
             topic_id: topic.id, title: 'blah'
@@ -97,6 +92,19 @@ describe TopicsController do
         expect(response).to be_forbidden
       end
 
+      it "raises an error when the OP is not a regular post" do
+        p2 = Fabricate(:post, topic: topic, post_number: 2, post_type: Post.types[:whisper])
+        p3 = Fabricate(:post, topic: topic, post_number: 3)
+
+        post :move_posts, params: {
+          topic_id: topic.id, title: 'blah', post_ids: [p2.id, p3.id]
+        }, format: :json
+
+        result = ::JSON.parse(response.body)
+
+        expect(result['errors']).to_not be_empty
+      end
+
       context 'success' do
         let(:user) { log_in(:admin) }
         let(:p2) { Fabricate(:post, user: user, topic: topic) }
@@ -147,7 +155,7 @@ describe TopicsController do
       end
 
       context 'failure' do
-        let(:p2) { Fabricate(:post, user: user) }
+        let(:p2) { Fabricate(:post, topic: topic, user: user) }
 
         before do
           Topic.any_instance.expects(:move_posts).with(user, [p2.id], title: 'blah').returns(nil)
@@ -244,11 +252,10 @@ describe TopicsController do
 
   context "merge_topic" do
     it 'needs you to be logged in' do
-      expect do
-        post :merge_topic, params: {
-          topic_id: 111, destination_topic_id: 345
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      post :merge_topic, params: {
+        topic_id: 111, destination_topic_id: 345
+      }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'moving to a new topic' do
@@ -299,13 +306,12 @@ describe TopicsController do
 
   context 'change_post_owners' do
     it 'needs you to be logged in' do
-      expect do
-        post :change_post_owners, params: {
-          topic_id: 111,
-          username: 'user_a',
-          post_ids: [1, 2, 3]
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      post :change_post_owners, params: {
+        topic_id: 111,
+        username: 'user_a',
+        post_ids: [1, 2, 3]
+      }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'forbidden to moderators' do
@@ -402,9 +408,8 @@ describe TopicsController do
     let(:params) { { topic_id: 1, timestamp: Time.zone.now } }
 
     it 'needs you to be logged in' do
-      expect do
-        put :change_timestamps, params: params, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :change_timestamps, params: params, format: :json
+      expect(response.status).to eq(403)
     end
 
     [:moderator, :trust_level_4].each do |user|
@@ -446,9 +451,8 @@ describe TopicsController do
 
   context 'clear_pin' do
     it 'needs you to be logged in' do
-      expect do
-        put :clear_pin, params: { topic_id: 1 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :clear_pin, params: { topic_id: 1 }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'when logged in' do
@@ -479,11 +483,10 @@ describe TopicsController do
 
   context 'status' do
     it 'needs you to be logged in' do
-      expect do
-        put :status, params: {
-          topic_id: 1, status: 'visible', enabled: true
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :status, params: {
+        topic_id: 1, status: 'visible', enabled: true
+      }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'when logged in' do
@@ -519,11 +522,10 @@ describe TopicsController do
       end
 
       it 'raises an error with a status not in the whitelist' do
-        expect do
-          put :status, params: {
-            topic_id: @topic.id, status: 'title', enabled: 'true'
-          }, format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        put :status, params: {
+          topic_id: @topic.id, status: 'title', enabled: 'true'
+        }, format: :json
+        expect(response.status).to eq(400)
       end
 
       it 'should update the status of the topic correctly' do
@@ -551,9 +553,8 @@ describe TopicsController do
   context 'delete_timings' do
 
     it 'needs you to be logged in' do
-      expect do
-        delete :destroy_timings, params: { topic_id: 1 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      delete :destroy_timings, params: { topic_id: 1 }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'when logged in' do
@@ -575,23 +576,20 @@ describe TopicsController do
   describe 'mute/unmute' do
 
     it 'needs you to be logged in' do
-      expect do
-        put :mute, params: { topic_id: 99 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :mute, params: { topic_id: 99 }, format: :json
+      expect(response.status).to eq(403)
     end
 
     it 'needs you to be logged in' do
-      expect do
-        put :unmute, params: { topic_id: 99 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :unmute, params: { topic_id: 99 }, format: :json
+      expect(response.status).to eq(403)
     end
   end
 
   describe 'recover' do
     it "won't allow us to recover a topic when we're not logged in" do
-      expect do
-        put :recover, params: { topic_id: 1 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :recover, params: { topic_id: 1 }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'when logged in' do
@@ -622,9 +620,8 @@ describe TopicsController do
 
   describe 'delete' do
     it "won't allow us to delete a topic when we're not logged in" do
-      expect do
-        delete :destroy, params: { id: 1 }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      delete :destroy, params: { id: 1 }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'when logged in' do
@@ -822,10 +819,10 @@ describe TopicsController do
         expected = {
           normal_topic: 200,
           secure_topic: 403,
-          private_topic: 302,
+          private_topic: 404,
           deleted_topic: 410,
           deleted_secure_topic: 403,
-          deleted_private_topic: 302,
+          deleted_private_topic: 404,
           nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
@@ -1094,9 +1091,8 @@ describe TopicsController do
 
   describe 'update' do
     it "won't allow us to update a topic when we're not logged in" do
-      expect do
-        put :update, params: { topic_id: 1, slug: 'xyz' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :update, params: { topic_id: 1, slug: 'xyz' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'when logged in' do
@@ -1286,11 +1282,10 @@ describe TopicsController do
     end
 
     it "won't allow us to invite toa topic when we're not logged in" do
-      expect do
-        post :invite, params: {
-          topic_id: 1, email: 'jake@adventuretime.ooo'
-        }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      post :invite, params: {
+        topic_id: 1, email: 'jake@adventuretime.ooo'
+      }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'when logged in as group manager' do
@@ -1422,9 +1417,8 @@ describe TopicsController do
 
   describe "bulk" do
     it 'needs you to be logged in' do
-      expect do
-        put :bulk, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :bulk, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe "when logged in" do
@@ -1500,9 +1494,8 @@ describe TopicsController do
 
   describe 'reset_new' do
     it 'needs you to be logged in' do
-      expect do
-        put :reset_new, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :reset_new, format: :json
+      expect(response.status).to eq(403)
     end
 
     let(:user) { log_in(:user) }
@@ -1587,9 +1580,8 @@ describe TopicsController do
 
   context "convert_topic" do
     it 'needs you to be logged in' do
-      expect do
-        put :convert_topic, params: { id: 111, type: "private" }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :convert_topic, params: { id: 111, type: "private" }, format: :json
+      expect(response.status).to eq(403)
     end
 
     describe 'converting public topic to private message' do
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 988b7f2dc4..2a91a61196 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -5,7 +5,8 @@ describe UploadsController do
   context '.create' do
 
     it 'requires you to be logged in' do
-      expect { post :create, format: :json }.to raise_error(Discourse::NotLoggedIn)
+      post :create, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'logged in' do
diff --git a/spec/controllers/user_api_keys_controller_spec.rb b/spec/controllers/user_api_keys_controller_spec.rb
index 64a43182a1..5e430cc5c0 100644
--- a/spec/controllers/user_api_keys_controller_spec.rb
+++ b/spec/controllers/user_api_keys_controller_spec.rb
@@ -55,9 +55,8 @@ describe UserApiKeysController do
   context 'create' do
 
     it "does not allow anon" do
-      expect {
-        post :create, params: args, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
+      post :create, params: args, format: :json
+      expect(response.status).to eq(403)
     end
 
     it "refuses to redirect to disallowed place" do
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index e5715baf88..f9b802a02d 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -126,22 +126,7 @@ describe UsersController do
           topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count")
           expect(topic_post_count[topic.id.to_s]).to eq(2)
         end
-
       end
-
-    end
-
-  end
-
-  describe '.user_preferences_redirect' do
-    it 'requires the user to be logged in' do
-      expect { get :user_preferences_redirect }.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    it "redirects to their profile when logged in" do
-      user = log_in
-      get :user_preferences_redirect
-      expect(response).to redirect_to("/u/#{user.username_lower}/preferences")
     end
   end
 
@@ -303,11 +288,9 @@ describe UsersController do
     context 'invalid token' do
       render_views
 
-      before do
-        get :password_reset, params: { token: "evil_trout!" }
-      end
-
       it 'disallows login' do
+        get :password_reset, params: { token: "evil_trout!" }
+
         expect(response).to be_success
 
         expect(CGI.unescapeHTML(response.body))
@@ -319,6 +302,16 @@ describe UsersController do
 
         expect(session[:current_user_id]).to be_blank
       end
+
+      it "responds with proper error message" do
+        put :password_reset, params: {
+          token: "evil_trout!", password: "awesomeSecretPassword"
+        }, format: :json
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body)["message"]).to eq(I18n.t('password_reset.no_token'))
+        expect(session[:current_user_id]).to be_blank
+      end
     end
 
     context 'valid token' do
@@ -1040,9 +1033,8 @@ describe UsersController do
 
   context '#username' do
     it 'raises an error when not logged in' do
-      expect do
-        put :username, params: { username: 'somename' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :username, params: { username: 'somename' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -1421,9 +1413,8 @@ describe UsersController do
   describe '#update' do
     context 'with guest' do
       it 'raises an error' do
-        expect do
-          put :update, params: { username: 'guest' }, format: :json
-        end.to raise_error(Discourse::NotLoggedIn)
+        put :update, params: { username: 'guest' }, format: :json
+        expect(response.status).to eq(403)
       end
     end
 
@@ -1640,14 +1631,14 @@ describe UsersController do
         user_badge_id: user_badge.id, username: user.username
       }, format: :json
 
-      expect(user.reload.title).not_to eq(badge.name)
+      expect(user.reload.title).not_to eq(badge.display_name)
       badge.update_attributes allow_title: true
 
       put :badge_title, params: {
         user_badge_id: user_badge.id, username: user.username
       }, format: :json
 
-      expect(user.reload.title).to eq(badge.name)
+      expect(user.reload.title).to eq(badge.display_name)
       expect(user.user_profile.badge_granted_title).to eq(true)
 
       user.title = "testing"
@@ -1658,6 +1649,30 @@ describe UsersController do
     end
   end
 
+  describe "badge_title with overrided name" do
+    let(:user) { Fabricate(:user) }
+    let(:badge) { Fabricate(:badge, name: 'Demogorgon', allow_title: true) }
+    let(:user_badge) { BadgeGranter.grant(badge, user) }
+
+    before do
+      TranslationOverride.upsert!('en', 'badges.demogorgon.name', 'Boss')
+    end
+
+    after do
+      TranslationOverride.revert!('en', ['badges.demogorgon.name'])
+    end
+
+    it "uses the badge display name as user title" do
+      log_in_user user
+
+      put :badge_title, params: {
+        user_badge_id: user_badge.id, username: user.username
+      }, format: :json
+
+      expect(user.reload.title).to eq(badge.display_name)
+    end
+  end
+
   describe 'send_activation_email' do
     context 'for an existing user' do
       let(:user) { Fabricate(:user, active: false) }
@@ -1795,11 +1810,10 @@ describe UsersController do
   describe '.pick_avatar' do
 
     it 'raises an error when not logged in' do
-      expect {
-        put :pick_avatar, params: {
-          username: 'asdf', avatar_id: 1, type: "custom"
-        }, format: :json
-      }.to raise_error(Discourse::NotLoggedIn)
+      put :pick_avatar, params: {
+        username: 'asdf', avatar_id: 1, type: "custom"
+      }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -1870,11 +1884,10 @@ describe UsersController do
   describe '.destroy_user_image' do
 
     it 'raises an error when not logged in' do
-      expect do
-        delete :destroy_user_image,
-          params: { type: 'profile_background', username: 'asdf' },
-          format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      delete :destroy_user_image,
+        params: { type: 'profile_background', username: 'asdf' },
+        format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -1898,11 +1911,10 @@ describe UsersController do
       end
 
       it "only allows certain `types`" do
-        expect do
-          delete :destroy_user_image,
-            params: { username: user.username, type: 'wat' },
-            format: :json
-        end.to raise_error(Discourse::InvalidParameters)
+        delete :destroy_user_image,
+          params: { username: user.username, type: 'wat' },
+          format: :json
+        expect(response.status).to eq(400)
       end
 
       it 'can clear the profile background' do
@@ -1919,9 +1931,8 @@ describe UsersController do
 
   describe '.destroy' do
     it 'raises an error when not logged in' do
-      expect do
-        delete :destroy, params: { username: 'nobody' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      delete :destroy, params: { username: 'nobody' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -1980,9 +1991,8 @@ describe UsersController do
   describe '.check_emails' do
 
     it 'raises an error when not logged in' do
-      expect do
-        put :check_emails, params: { username: 'zogstrip' }, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      put :check_emails, params: { username: 'zogstrip' }, format: :json
+      expect(response.status).to eq(403)
     end
 
     context 'while logged in' do
@@ -2134,9 +2144,8 @@ describe UsersController do
 
     context 'anon' do
       it "raises an error on anon for topic_tracking_state" do
-        expect {
-          get :topic_tracking_state, params: { username: user.username }, format: :json
-        }.to raise_error(Discourse::NotLoggedIn)
+        get :topic_tracking_state, params: { username: user.username }, format: :json
+        expect(response.status).to eq(403)
       end
     end
 
diff --git a/spec/controllers/wizard_controller_spec.rb b/spec/controllers/wizard_controller_spec.rb
index a6d38fee2c..c1476d1258 100644
--- a/spec/controllers/wizard_controller_spec.rb
+++ b/spec/controllers/wizard_controller_spec.rb
@@ -10,9 +10,8 @@ describe WizardController do
     end
 
     it 'needs you to be logged in' do
-      expect do
-        get :index, format: :json
-      end.to raise_error(Discourse::NotLoggedIn)
+      get :index, format: :json
+      expect(response.status).to eq(403)
     end
 
     it "raises an error if you aren't an admin" do
diff --git a/spec/fixtures/csv/discourse.csv b/spec/fixtures/csv/discourse.csv
index 3a71578994..b12e45a3cd 100644
--- a/spec/fixtures/csv/discourse.csv
+++ b/spec/fixtures/csv/discourse.csv
@@ -1 +1,5 @@
-jeff@gmail.com,discourse;ubuntu,100
sam@yahoo.com,ubuntu,
robin@outlook.com,discourse,200
neil@aol.com,random,
regis@live.com,,8888
\ No newline at end of file
+jeff@gmail.com,discourse;ubuntu,100
+sam@yahoo.com,ubuntu,
+robin@outlook.com,discourse,200
+neil@aol.com,random,
+regis@live.com,,8888
diff --git a/spec/fixtures/emails/blacklist_whitelist_email.eml b/spec/fixtures/emails/blacklist_whitelist_email.eml
index f6b38bfcce..f9b0adf790 100644
--- a/spec/fixtures/emails/blacklist_whitelist_email.eml
+++ b/spec/fixtures/emails/blacklist_whitelist_email.eml
@@ -1,5 +1,7 @@
 Return-Path: <foo@mail.com>
 From: Foo <foo@mail.com>
+To: some_group@bar.com, alice@foo.com
+Cc: bob@FOO.com, carol@example.com
 Date: Fri, 15 Jan 2016 00:12:43 +0100
 Message-ID: <51@foo.bar.mail>
 Mime-Version: 1.0
diff --git a/spec/fixtures/emails/mailinglist_short_message.eml b/spec/fixtures/emails/mailinglist_short_message.eml
new file mode 100644
index 0000000000..b14209fce9
--- /dev/null
+++ b/spec/fixtures/emails/mailinglist_short_message.eml
@@ -0,0 +1,12 @@
+From: alice@foo.com
+To: list@example.com
+Subject: test
+Date: Mon, 16 Oct 2017 09:18:32 +0100
+Message-ID: <bddaa334ef93b5f3c7c3a42599330844@foo.com>
+Precedence: list
+List-Id: Example List <list@example.com>
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain; charset="us-ascii"
+Sender: list-bounces@example.com
+
+Hello world!
diff --git a/spec/fixtures/plugins/custom_locales/assets/locales/es_MX.js.erb b/spec/fixtures/plugins/custom_locales/assets/locales/es_MX.js.erb
new file mode 100644
index 0000000000..d07d575a09
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/assets/locales/es_MX.js.erb
@@ -0,0 +1,2 @@
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:es_MX) %>
diff --git a/spec/fixtures/plugins/custom_locales/assets/locales/foo.js.erb b/spec/fixtures/plugins/custom_locales/assets/locales/foo.js.erb
new file mode 100644
index 0000000000..601dadb777
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/assets/locales/foo.js.erb
@@ -0,0 +1,2 @@
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:foo) %>
diff --git a/spec/fixtures/plugins/custom_locales/assets/locales/tlh.js.erb b/spec/fixtures/plugins/custom_locales/assets/locales/tlh.js.erb
new file mode 100644
index 0000000000..2e3284dc99
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/assets/locales/tlh.js.erb
@@ -0,0 +1,2 @@
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:tlh) %>
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/client.es_MX.yml b/spec/fixtures/plugins/custom_locales/config/locales/client.es_MX.yml
new file mode 100644
index 0000000000..c9cb23e960
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/client.es_MX.yml
@@ -0,0 +1 @@
+es_MX:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/client.foo.yml b/spec/fixtures/plugins/custom_locales/config/locales/client.foo.yml
new file mode 100644
index 0000000000..0152a79652
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/client.foo.yml
@@ -0,0 +1 @@
+foo:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/client.tlh.yml b/spec/fixtures/plugins/custom_locales/config/locales/client.tlh.yml
new file mode 100644
index 0000000000..884714fb71
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/client.tlh.yml
@@ -0,0 +1 @@
+tlh:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/server.es_MX.yml b/spec/fixtures/plugins/custom_locales/config/locales/server.es_MX.yml
new file mode 100644
index 0000000000..c9cb23e960
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/server.es_MX.yml
@@ -0,0 +1 @@
+es_MX:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/server.foo.yml b/spec/fixtures/plugins/custom_locales/config/locales/server.foo.yml
new file mode 100644
index 0000000000..0152a79652
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/server.foo.yml
@@ -0,0 +1 @@
+foo:
diff --git a/spec/fixtures/plugins/custom_locales/config/locales/server.tlh.yml b/spec/fixtures/plugins/custom_locales/config/locales/server.tlh.yml
new file mode 100644
index 0000000000..884714fb71
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/config/locales/server.tlh.yml
@@ -0,0 +1 @@
+tlh:
diff --git a/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/foo.js b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/foo.js
new file mode 100644
index 0000000000..79b527258a
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/foo.js
@@ -0,0 +1 @@
+// this file should contain plural rules
diff --git a/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/tlh.js b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/tlh.js
new file mode 100644
index 0000000000..79b527258a
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/message_format/tlh.js
@@ -0,0 +1 @@
+// this file should contain plural rules
diff --git a/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/moment_js/foo.js b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/moment_js/foo.js
new file mode 100644
index 0000000000..971b3b1a1c
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/lib/javascripts/locale/moment_js/foo.js
@@ -0,0 +1 @@
+// this file should contain the locale configuration for moment.js
diff --git a/spec/fixtures/plugins/custom_locales/plugin.rb b/spec/fixtures/plugins/custom_locales/plugin.rb
new file mode 100644
index 0000000000..700c68cb5f
--- /dev/null
+++ b/spec/fixtures/plugins/custom_locales/plugin.rb
@@ -0,0 +1,4 @@
+# name: custom-locales
+# about: Fixtures for plugin that adds new locales
+# version: 1.0
+# authors: Gerhard Schlager
diff --git a/spec/import_export/category_exporter_spec.rb b/spec/import_export/category_exporter_spec.rb
index 785f520c85..4ed57242be 100644
--- a/spec/import_export/category_exporter_spec.rb
+++ b/spec/import_export/category_exporter_spec.rb
@@ -6,6 +6,8 @@ describe ImportExport::CategoryExporter do
   let(:category) { Fabricate(:category) }
   let(:group) { Fabricate(:group) }
   let(:user) { Fabricate(:user) }
+  let(:user2) { Fabricate(:user) }
+  let(:user3) { Fabricate(:user) }
 
   before do
     STDOUT.stubs(:write)
@@ -38,13 +40,17 @@ describe ImportExport::CategoryExporter do
 
     it 'export the category with topics and users' do
       topic1 = Fabricate(:topic, category: category, user_id: -1)
+      Fabricate(:post, topic: topic1, user: User.find(-1), post_number: 1)
       topic2 = Fabricate(:topic, category: category, user: user)
+      Fabricate(:post, topic: topic2, user: user, post_number: 1)
+      reply1 = Fabricate(:post, topic: topic2, user: user2, post_number: 2)
+      reply2 = Fabricate(:post, topic: topic2, user: user3, post_number: 3)
       data = ImportExport::CategoryExporter.new([category.id]).perform.export_data
 
       expect(data[:categories].count).to eq(1)
       expect(data[:groups].count).to eq(0)
       expect(data[:topics].count).to eq(2)
-      expect(data[:users].count).to eq(1)
+      expect(data[:users].map { |u| u[:id] }).to match_array([user.id, user2.id, user3.id])
     end
   end
 
diff --git a/spec/import_export/topic_exporter_spec.rb b/spec/import_export/topic_exporter_spec.rb
index db767e4da5..03edeff046 100644
--- a/spec/import_export/topic_exporter_spec.rb
+++ b/spec/import_export/topic_exporter_spec.rb
@@ -9,6 +9,7 @@ describe ImportExport::TopicExporter do
 
   let(:user) { Fabricate(:user) }
   let(:topic) { Fabricate(:topic, user: user) }
+  let!(:post) { Fabricate(:post, topic: topic, user: user) }
 
   context '.perform' do
     it 'export a single topic' do
@@ -22,12 +23,13 @@ describe ImportExport::TopicExporter do
 
     it 'export multiple topics' do
       topic2 = Fabricate(:topic, user: user)
+      post2 = Fabricate(:post, user: user, topic: topic2)
       data = ImportExport::TopicExporter.new([topic.id, topic2.id]).perform.export_data
 
       expect(data[:categories].blank?).to eq(true)
       expect(data[:groups].blank?).to eq(true)
       expect(data[:topics].count).to eq(2)
-      expect(data[:users].count).to eq(1)
+      expect(data[:users].map { |u| u[:id] }).to match_array([user.id])
     end
   end
 
diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb
index e3211fa55b..b51439c1e8 100644
--- a/spec/integration/rate_limiting_spec.rb
+++ b/spec/integration/rate_limiting_spec.rb
@@ -13,25 +13,25 @@ describe 'admin rate limit' do
   end
 
   it 'can cleanly limit requests' do
+    #request.set_header("action_dispatch.show_exceptions", true)
 
     admin = Fabricate(:admin)
     api_key = Fabricate(:api_key, key: SecureRandom.hex, user: admin)
 
     global_setting :max_admin_api_reqs_per_key_per_minute, 1
 
-    get '/admin/users.json', params: {
+    get '/admin/api/keys.json', params: {
       api_key: api_key.key,
       api_username: admin.username
     }
 
     expect(response.status).to eq(200)
 
-    get '/admin/users.json', params: {
+    get '/admin/api/keys.json', params: {
       api_key: api_key.key,
       api_username: admin.username
     }
 
     expect(response.status).to eq(429)
-
   end
 end
diff --git a/spec/jobs/bulk_invite_spec.rb b/spec/jobs/bulk_invite_spec.rb
index 0739a41574..573f27639c 100644
--- a/spec/jobs/bulk_invite_spec.rb
+++ b/spec/jobs/bulk_invite_spec.rb
@@ -12,12 +12,13 @@ describe Jobs::BulkInvite do
     context '.read_csv_file' do
       let(:user) { Fabricate(:user) }
       let(:bulk_invite) { Jobs::BulkInvite.new }
-      let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/discourse.csv") }
+      let(:csv_file) { "#{Rails.root}/spec/fixtures/csv/discourse.csv" }
 
       it 'reads csv file' do
         bulk_invite.current_user = user
         bulk_invite.read_csv_file(csv_file)
         expect(Invite.where(email: "robin@outlook.com").exists?).to eq(true)
+        expect(Invite.where(email: "jeff@gmail.com").exists?).to eq(true) # handles BOM
       end
     end
 
diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
index fd77fbf7d5..7882bfdbf4 100644
--- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
+++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
@@ -162,11 +162,11 @@ describe Jobs::GrantNewUserOfTheMonthBadges do
       PostAction.act(um, p, PostActionType.types[:like])
       PostAction.act(ua, p, PostActionType.types[:like])
       PostAction.act(Discourse.system_user, p, PostActionType.types[:like])
-      expect(granter.scores[user.id]).to eq(4.425)
+      expect(granter.scores[user.id]).to eq(1.55)
 
       # It goes down the more they post
       Fabricate(:post, user: user)
-      expect(granter.scores[user.id]).to eq(2.95)
+      expect(granter.scores[user.id]).to eq(1.35625)
     end
 
     it "is limited to two accounts" do
diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb
index d04142bef5..f65de862fd 100644
--- a/spec/models/admin_dashboard_data_spec.rb
+++ b/spec/models/admin_dashboard_data_spec.rb
@@ -15,6 +15,9 @@ describe AdminDashboardData do
 
       AdminDashboardData.fetch_problems
       expect(called).to eq(true)
+
+      AdminDashboardData.fetch_problems(check_force_https: true)
+      expect(called).to eq(true)
     end
 
     it 'calls the passed method' do
@@ -281,6 +284,32 @@ describe AdminDashboardData do
     end
   end
 
+  describe 'force_https_check' do
+    subject { described_class.new(check_force_https: true).force_https_check }
+
+    it 'returns nil if force_https site setting enabled' do
+      SiteSetting.force_https = true
+      expect(subject).to be_nil
+    end
+
+    it 'returns nil if force_https site setting not enabled' do
+      SiteSetting.force_https = false
+      expect(subject).to eq(I18n.t('dashboard.force_https_warning'))
+    end
+  end
+
+  describe 'ignore force_https_check' do
+    subject { described_class.new(check_force_https: false).force_https_check }
+
+    it 'returns nil' do
+      SiteSetting.force_https = true
+      expect(subject).to be_nil
+
+      SiteSetting.force_https = false
+      expect(subject).to be_nil
+    end
+  end
+
   describe 'stats cache' do
     include_examples 'stats cachable'
   end
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index f6f8b0c0d7..cbac526cb7 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -61,4 +61,23 @@ describe Badge do
     expect(b.grant_count).to eq(1)
   end
 
+  describe '#manually_grantable?' do
+    let(:badge) { Fabricate(:badge, name: 'Test Badge') }
+    subject { badge.manually_grantable? }
+
+    context 'when system badge' do
+      before { badge.system = true }
+      it { is_expected.to be false }
+    end
+
+    context 'when has query' do
+      before { badge.query = 'SELECT id FROM users' }
+      it { is_expected.to be false }
+    end
+
+    context 'when neither system nor has query' do
+      before { badge.update_columns(system: false, query: nil) }
+      it { is_expected.to be true }
+    end
+  end
 end
diff --git a/spec/models/incoming_links_report_spec.rb b/spec/models/incoming_links_report_spec.rb
index 2ce2398fc7..e1582565f6 100644
--- a/spec/models/incoming_links_report_spec.rb
+++ b/spec/models/incoming_links_report_spec.rb
@@ -52,8 +52,8 @@ describe IncomingLinksReport do
 
       r = IncomingLinksReport.find('top_referred_topics').as_json
       expect(r[:data]).to eq [
-        { topic_id: p1.topic.id, topic_title: p1.topic.title, topic_slug: p1.topic.slug, num_clicks: 7 },
-        { topic_id: p2.topic.id, topic_title: p2.topic.title, topic_slug: p2.topic.slug, num_clicks: 2 + 3 },
+        { topic_id: p1.topic.id, topic_title: p1.topic.title, topic_url: p1.topic.relative_url, num_clicks: 7 },
+        { topic_id: p2.topic.id, topic_title: p2.topic.title, topic_url: p2.topic.relative_url, num_clicks: 2 + 3 },
       ]
     end
   end
@@ -163,8 +163,8 @@ describe IncomingLinksReport do
       IncomingLinksReport.stubs(:link_count_per_topic).returns(topic1.id => 8, topic2.id => 3)
       Topic.stubs(:select).returns(Topic); Topic.stubs(:where).returns(Topic) # bypass some activerecord methods
       Topic.stubs(:all).returns([topic1, topic2])
-      expect(top_referred_topics[:data][0]).to eq(topic_id: topic1.id, topic_title: topic1.title, topic_slug: topic1.slug, num_clicks: 8)
-      expect(top_referred_topics[:data][1]).to eq(topic_id: topic2.id, topic_title: topic2.title, topic_slug: topic2.slug, num_clicks: 3)
+      expect(top_referred_topics[:data][0]).to eq(topic_id: topic1.id, topic_title: topic1.title, topic_url: topic1.relative_url, num_clicks: 8)
+      expect(top_referred_topics[:data][1]).to eq(topic_id: topic2.id, topic_title: topic2.title, topic_url: topic2.relative_url, num_clicks: 3)
     end
   end
 
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index 49b800daa2..f71f9de29b 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -30,6 +30,18 @@ describe InviteRedeemer do
       expect(error).to be_present
       expect(error.record.errors[:password]).to be_present
     end
+
+    it "should unstage user" do
+      staged_user = Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name')
+      user = InviteRedeemer.create_user_from_invite(Fabricate(:invite, email: 'staged@account.com'), 'walter', 'Walter White')
+
+      expect(user.id).to eq(staged_user.id)
+      expect(user.username).to eq('walter')
+      expect(user.name).to eq('Walter White')
+      expect(user.active).to eq(false)
+      expect(user.email).to eq('staged@account.com')
+      expect(user.approved).to eq(true)
+    end
   end
 
   describe "#redeem" do
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 552a953194..c72ef714ed 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -178,6 +178,16 @@ describe Invite do
 
   end
 
+  context 'a staged user' do
+    it 'creates an invite for a staged user' do
+      Fabricate(:staged, email: 'staged@account.com')
+      invite = Invite.invite_by_email('staged@account.com', Fabricate(:coding_horror))
+
+      expect(invite).to be_valid
+      expect(invite.email).to eq('staged@account.com')
+    end
+  end
+
   context '.redeem' do
 
     let(:invite) { Fabricate(:invite) }
diff --git a/spec/models/locale_site_setting_spec.rb b/spec/models/locale_site_setting_spec.rb
index ef81765dc0..06406385eb 100644
--- a/spec/models/locale_site_setting_spec.rb
+++ b/spec/models/locale_site_setting_spec.rb
@@ -1,6 +1,15 @@
 require 'rails_helper'
 
 describe LocaleSiteSetting do
+  def core_locales
+    pattern = File.join(Rails.root, 'config', 'locales', 'client.*.yml')
+    Dir.glob(pattern).map { |x| x.split('.')[-2] }
+  end
+
+  def native_locale_name(locale)
+    value = LocaleSiteSetting.values.find { |v| v[:value] == locale }
+    value[:name]
+  end
 
   describe 'valid_value?' do
     it 'returns true for a locale that we have translations for' do
@@ -14,8 +23,69 @@ describe LocaleSiteSetting do
 
   describe 'values' do
     it 'returns all the locales that we have translations for' do
-      expect(LocaleSiteSetting.values.map { |x| x[:value] }).to include(*Dir.glob(File.join(Rails.root, 'config', 'locales', 'client.*.yml')).map { |x| x.split('.')[-2] })
+      expect(LocaleSiteSetting.values.map { |x| x[:value] }).to include(*core_locales)
+    end
+
+    it 'returns native names' do
+      expect(native_locale_name('de')).to eq('Deutsch')
+      expect(native_locale_name('zh_CN')).to eq('中文')
+      expect(native_locale_name('zh_TW')).to eq('中文 (TW)')
     end
   end
 
+  context 'with locales from plugin' do
+    before do
+      DiscoursePluginRegistry.register_locale("foo", name: "Foo", nativeName: "Native Foo")
+      DiscoursePluginRegistry.register_locale("bar", name: "Bar", nativeName: "Native Bar")
+      DiscoursePluginRegistry.register_locale("de", name: "Renamed German", nativeName: "Native renamed German")
+      DiscoursePluginRegistry.register_locale("de_AT", name: "German (Austria)", nativeName: "Österreichisch", fallbackLocale: "de")
+      DiscoursePluginRegistry.register_locale("tlh")
+
+      # Plugins normally register a locale before LocaleSiteSetting is initialized.
+      # That's not happening in tests, so we need to call reset!
+      LocaleSiteSetting.reset!
+    end
+
+    after do
+      DiscoursePluginRegistry.reset!
+    end
+
+    describe 'valid_value?' do
+      it 'returns true for locales from core' do
+        expect(LocaleSiteSetting.valid_value?('en')).to eq(true)
+        expect(LocaleSiteSetting.valid_value?('de')).to eq(true)
+      end
+
+      it 'returns true for locales added by plugins' do
+        expect(LocaleSiteSetting.valid_value?('foo')).to eq(true)
+        expect(LocaleSiteSetting.valid_value?('bar')).to eq(true)
+      end
+    end
+
+    describe 'values' do
+      it 'returns native names added by plugin' do
+        expect(native_locale_name('foo')).to eq('Native Foo')
+        expect(native_locale_name('bar')).to eq('Native Bar')
+      end
+
+      it 'does not allow plugins to override native names that exist in core' do
+        expect(native_locale_name('de')).to eq('Deutsch')
+      end
+
+      it 'returns the language code when no nativeName is set' do
+        expect(native_locale_name('tlh')).to eq('tlh')
+      end
+    end
+
+    describe 'fallback_locale' do
+      it 'returns the fallback locale registered by plugin' do
+        expect(LocaleSiteSetting.fallback_locale('de_AT')).to eq(:de)
+        expect(LocaleSiteSetting.fallback_locale(:de_AT)).to eq(:de)
+      end
+
+      it 'returns nothing when no fallback locale was registered' do
+        expect(LocaleSiteSetting.fallback_locale('foo')).to be_nil
+      end
+    end
+  end
 end
diff --git a/spec/models/search_log_spec.rb b/spec/models/search_log_spec.rb
index 478fc8d033..5f3a66fb05 100644
--- a/spec/models/search_log_spec.rb
+++ b/spec/models/search_log_spec.rb
@@ -2,6 +2,10 @@ require 'rails_helper'
 
 RSpec.describe SearchLog, type: :model do
 
+  before do
+    SearchLog.clear_debounce_cache!
+  end
+
   describe ".log" do
 
     context "invalid arguments" do
@@ -122,6 +126,7 @@ RSpec.describe SearchLog, type: :model do
         expect(action).to eq(:created)
 
         freeze_time(10.minutes.from_now)
+        $redis.del(SearchLog.redis_key(ip_address: '192.168.0.1', user_id: user.id))
 
         action, _ = SearchLog.log(
           term: 'hello',
@@ -172,6 +177,7 @@ RSpec.describe SearchLog, type: :model do
 
       SearchLog.where(term: 'ruby', ip_address: '127.0.0.2').update_all(search_result_id: 24)
       term_click_through_details = SearchLog.term_details("ruby", :all, :click_through_only)
+      expect(term_click_through_details[:period]).to eq("all")
       expect(term_click_through_details[:data][0][:y]).to eq(1)
     end
   end
diff --git a/spec/models/tag_group_spec.rb b/spec/models/tag_group_spec.rb
new file mode 100644
index 0000000000..8dc4d45373
--- /dev/null
+++ b/spec/models/tag_group_spec.rb
@@ -0,0 +1,41 @@
+require 'rails_helper'
+
+describe TagGroup do
+  describe '#allowed' do
+    let(:user1) { Fabricate(:user) }
+    let(:user2) { Fabricate(:user) }
+    let(:admin) { Fabricate(:admin) }
+    let(:moderator) { Fabricate(:moderator) }
+
+    let(:group) { Fabricate(:group) }
+
+    let!(:public_tag_group) { Fabricate(:tag_group, name: 'Public', tag_names: ['public1']) }
+    let!(:private_tag_group) { Fabricate(:tag_group, name: 'Private', tag_names: ['privatetag1']) }
+    let!(:staff_tag_group) { Fabricate(:tag_group, name: 'Staff Talk', tag_names: ['stafftag1']) }
+    let!(:unrestricted_tag_group) { Fabricate(:tag_group, name: 'Unrestricted', tag_names: ['use-anywhere']) }
+
+    let!(:public_category) { Fabricate(:category, name: 'Public Category') }
+    let!(:private_category) { Fabricate(:private_category, group: group) }
+    let(:staff_category) { Fabricate(:category, name: 'Secret') }
+
+    before do
+      group.add(user2)
+      group.save!
+      staff_category.set_permissions(admins: :full)
+      staff_category.save!
+      private_category.set_permissions(staff: :full, group => :full)
+      private_category.save!
+      public_category.allowed_tag_groups = [public_tag_group.name]
+      private_category.allowed_tag_groups = [private_tag_group.name]
+      staff_category.allowed_tag_groups = [staff_tag_group.name]
+    end
+
+    it "returns correct groups based on category permissions" do
+      expect(TagGroup.allowed(Guardian.new(admin)).pluck(:name)).to match_array(TagGroup.pluck(:name))
+      expect(TagGroup.allowed(Guardian.new(moderator)).pluck(:name)).to match_array(TagGroup.pluck(:name))
+      expect(TagGroup.allowed(Guardian.new(user2)).pluck(:name)).to match_array([public_tag_group.name, unrestricted_tag_group.name, private_tag_group.name])
+      expect(TagGroup.allowed(Guardian.new(user1)).pluck(:name)).to match_array([public_tag_group.name, unrestricted_tag_group.name])
+      expect(TagGroup.allowed(Guardian.new(nil)).pluck(:name)).to match_array([public_tag_group.name, unrestricted_tag_group.name])
+    end
+  end
+end
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 3438c615fe..447e8ff667 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -60,6 +60,20 @@ describe TopicEmbed do
 
   end
 
+  context '.topic_id_for_embed' do
+    it "returns correct topic id irrespective of url protocol" do
+      topic_embed = Fabricate(:topic_embed, embed_url: "http://example.com/post/248")
+
+      expect(TopicEmbed.topic_id_for_embed('http://exAMPle.com/post/248')).to eq(topic_embed.topic_id)
+      expect(TopicEmbed.topic_id_for_embed('https://example.com/post/248/')).to eq(topic_embed.topic_id)
+
+      expect(TopicEmbed.topic_id_for_embed('http://example.com/post/248/2')).to eq(nil)
+      expect(TopicEmbed.topic_id_for_embed('http://examples.com/post/248')).to eq(nil)
+      expect(TopicEmbed.topic_id_for_embed('http://example.com/post/24')).to eq(nil)
+      expect(TopicEmbed.topic_id_for_embed('http://example.com/post')).to eq(nil)
+    end
+  end
+
   describe '.find_remote' do
 
     context ".title_scrub" do
diff --git a/spec/models/topic_list_spec.rb b/spec/models/topic_list_spec.rb
index dcb6b5aab7..dde096ae0a 100644
--- a/spec/models/topic_list_spec.rb
+++ b/spec/models/topic_list_spec.rb
@@ -46,12 +46,12 @@ describe TopicList do
     end
   end
 
-  describe '#tags' do
+  describe '#top_tags' do
     it 'should return the right tags' do
       tag = Fabricate(:tag, topics: [topic])
       other_tag = Fabricate(:tag, topics: [topic], name: "use-anywhere")
       output = [tag.name, other_tag.name]
-      expect(topic_list.tags.sort).to eq(output.sort)
+      expect(topic_list.top_tags.sort).to eq(output.sort)
     end
 
     describe 'when there are tags restricted to a category' do
@@ -63,18 +63,18 @@ describe TopicList do
       let(:topic_list) { TopicList.new('latest', topic.user, [topic], category: category.id, category_id: category.id) }
 
       it 'should only return tags allowed in the category' do
-        expect(topic_list.tags).to eq([tag.name])
+        expect(topic_list.top_tags).to eq([tag.name])
       end
 
       it "with no category, should return all tags" do
-        expect(TopicList.new('latest', other_topic.user, [other_topic]).tags.sort).to eq([tag.name, other_tag.name].sort)
+        expect(TopicList.new('latest', other_topic.user, [other_topic]).top_tags.sort).to eq([tag.name, other_tag.name].sort)
       end
 
       it "with another category with no tags, should return no tags" do
         other_category = Fabricate(:category)
         topic3 = Fabricate(:topic, category: other_category)
         list = TopicList.new('latest', topic3.user, [topic3], category: other_category.id, category_id: other_category.id)
-        expect(list.tags).to be_empty
+        expect(list.top_tags).to be_empty
       end
     end
   end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 7134b10134..14a42e3406 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -2101,6 +2101,7 @@ describe Topic do
       "https://meta.discourse.org",
       "https://meta.discourse.org/",
       "https://meta.discourse.org/?filter=test",
+      "https://meta.discourse.org/t/中國/1",
     ].each do |featured_link|
       it "should extract the root domain from #{featured_link} correctly" do
         topic.featured_link = featured_link
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index b8803fda54..e7d9fdde7a 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -111,6 +111,22 @@ describe Upload do
 
         expect(Upload.get_from_url(URI.join(s3_cdn_url, path).to_s)).to eq(upload)
       end
+
+      it "should return the right upload when using one CDN for both s3 and assets" do
+        begin
+          original_asset_host = Rails.configuration.action_controller.asset_host
+          cdn_url = 'http://my.cdn.com'
+          Rails.configuration.action_controller.asset_host = cdn_url
+          SiteSetting.s3_cdn_url = cdn_url
+          upload
+
+          expect(Upload.get_from_url(
+            URI.join(cdn_url, path).to_s
+          )).to eq(upload)
+        ensure
+          Rails.configuration.action_controller.asset_host = original_asset_host
+        end
+      end
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d057e042c3..164d121848 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -37,6 +37,18 @@ describe User do
           expect(user.errors.messages).to include(:primary_email)
         end
       end
+
+      describe 'when primary_email is being reassigned to another user' do
+        it "should not be valid" do
+          user2 = Fabricate.build(:user, email: nil)
+          user.save!
+          user2.primary_email = user.primary_email
+
+          expect(user2).to_not be_valid
+          expect(user2.errors.messages).to include(:primary_email)
+          expect(user2.primary_email.errors.messages).to include(:user_id)
+        end
+      end
     end
   end
 
@@ -1466,7 +1478,7 @@ describe User do
 
     describe 'when user is an old user' do
       it 'should return the right value' do
-        user.update_attributes!(created_at: 1.year.ago)
+        user.update_attributes!(first_seen_at: 1.year.ago)
 
         expect(user.read_first_notification?).to eq(true)
       end
@@ -1568,4 +1580,43 @@ describe User do
     end
   end
 
+  describe "#unstage" do
+    let!(:staged_user) { Fabricate(:staged, email: 'staged@account.com', active: true, username: 'staged1', name: 'Stage Name') }
+    let(:params) { { email: 'staged@account.com', active: true, username: 'unstaged1', name: 'Foo Bar' } }
+
+    it "correctyl unstages a user" do
+      user = User.unstage(params)
+
+      expect(user.id).to eq(staged_user.id)
+      expect(user.username).to eq('unstaged1')
+      expect(user.name).to eq('Foo Bar')
+      expect(user.active).to eq(false)
+      expect(user.email).to eq('staged@account.com')
+    end
+
+    it "returns nil when the user cannot be unstaged" do
+      Fabricate(:coding_horror)
+      expect(User.unstage(email: 'jeff@somewhere.com')).to be_nil
+      expect(User.unstage(email: 'no@account.com')).to be_nil
+    end
+
+    it "removes all previous notifications during unstaging" do
+      Fabricate(:notification, user: user)
+      Fabricate(:private_message_notification, user: user)
+      user.reload
+
+      expect(user.total_unread_notifications).to eq(2)
+      user = User.unstage(params)
+      expect(user.total_unread_notifications).to eq(0)
+    end
+
+    it "triggers an event" do
+      unstaged_user = nil
+      event = DiscourseEvent.track_events { unstaged_user = User.unstage(params) }.first
+
+      expect(event[:event_name]).to eq(:user_unstaged)
+      expect(event[:params].first).to eq(unstaged_user)
+    end
+  end
+
 end
diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb
index ccb9638d7a..43e73819a1 100644
--- a/spec/models/user_stat_spec.rb
+++ b/spec/models/user_stat_spec.rb
@@ -77,22 +77,26 @@ describe UserStat do
     let(:stat) { user.user_stat }
 
     it 'makes no changes if nothing is cached' do
-      stat.expects(:last_seen_cached).returns(nil)
+      $redis.del(UserStat.last_seen_key(user.id))
       stat.update_time_read!
       stat.reload
       expect(stat.time_read).to eq(0)
     end
 
     it 'makes a change if time read is below threshold' do
-      stat.expects(:last_seen_cached).returns(Time.now - 10)
+      freeze_time
+      UserStat.cache_last_seen(user.id, (Time.now - 10).to_f)
       stat.update_time_read!
       stat.reload
       expect(stat.time_read).to eq(10)
     end
 
     it 'makes no change if time read is above threshold' do
+      freeze_time
+
       t = Time.now - 1 - UserStat::MAX_TIME_READ_DIFF
-      stat.expects(:last_seen_cached).returns(t)
+      UserStat.cache_last_seen(user.id, t.to_f)
+
       stat.update_time_read!
       stat.reload
       expect(stat.time_read).to eq(0)
diff --git a/spec/models/watched_word_spec.rb b/spec/models/watched_word_spec.rb
index 7bc52d47e5..f4cc34bc10 100644
--- a/spec/models/watched_word_spec.rb
+++ b/spec/models/watched_word_spec.rb
@@ -11,8 +11,8 @@ describe WatchedWord do
     expect(described_class.count).to eq(1)
   end
 
-  it "downcases words" do
-    expect(described_class.create(word: "ShooT").word).to eq('shoot')
+  it "doesn't downcase words" do
+    expect(described_class.create(word: "ShooT").word).to eq('ShooT')
   end
 
   it "strips leading and trailing spaces" do
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index dbb53ca837..73f4470c8f 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -188,7 +188,7 @@ describe WebHook do
     end
 
     it 'should enqueue the right hooks for user events' do
-      user_web_hook = Fabricate(:user_web_hook, active: true)
+      _user_web_hook = Fabricate(:user_web_hook, active: true)
 
       Sidekiq::Testing.fake! do
         user
diff --git a/spec/multisite/distributed_cache_spec.rb b/spec/multisite/distributed_cache_spec.rb
index 6267e18194..f7f83918a8 100644
--- a/spec/multisite/distributed_cache_spec.rb
+++ b/spec/multisite/distributed_cache_spec.rb
@@ -5,18 +5,10 @@ RSpec.describe 'Multisite SiteSettings' do
 
   before do
     conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
-    conn.load_settings!
-    conn.remove_class_variable(:@@current_db)
   end
 
   after do
     conn.clear_settings!
-
-    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
-      conn.remove_class_variable(class_variable)
-    end
-
-    conn.set_current_db
   end
 
   def cache(name, namespace: true)
diff --git a/spec/multisite/jobs.rb b/spec/multisite/jobs_spec.rb
similarity index 69%
rename from spec/multisite/jobs.rb
rename to spec/multisite/jobs_spec.rb
index d9a88b0294..076f6cea54 100644
--- a/spec/multisite/jobs.rb
+++ b/spec/multisite/jobs_spec.rb
@@ -5,18 +5,11 @@ RSpec.describe "Running Sidekiq Jobs in Multisite" do
 
   before do
     conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
-    conn.load_settings!
-    conn.remove_class_variable(:@@current_db)
+    SiteSetting.defaults.refresh_site_locale!
   end
 
   after do
     conn.clear_settings!
-
-    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
-      conn.remove_class_variable(class_variable)
-    end
-
-    conn.set_current_db
   end
 
   it 'should revert back to the default connection' do
diff --git a/spec/multisite/site_settings_spec.rb b/spec/multisite/site_settings_spec.rb
index 09a5b90bb5..55afb5ef9a 100644
--- a/spec/multisite/site_settings_spec.rb
+++ b/spec/multisite/site_settings_spec.rb
@@ -7,8 +7,6 @@ RSpec.describe 'Multisite SiteSettings' do
     @original_provider = SiteSetting.provider
     SiteSetting.provider = SiteSettings::DbProvider.new(SiteSetting)
     conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
-    conn.load_settings!
-    conn.remove_class_variable(:@@current_db)
   end
 
   after do
@@ -17,12 +15,6 @@ RSpec.describe 'Multisite SiteSettings' do
     end
 
     conn.clear_settings!
-
-    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
-      conn.remove_class_variable(class_variable)
-    end
-
-    conn.set_current_db
     SiteSetting.provider = @original_provider
   end
 
diff --git a/spec/requests/admin/admin_controller_spec.rb b/spec/requests/admin/admin_controller_spec.rb
index 2d55f8747a..031bb7dd06 100644
--- a/spec/requests/admin/admin_controller_spec.rb
+++ b/spec/requests/admin/admin_controller_spec.rb
@@ -2,8 +2,7 @@ require 'rails_helper'
 
 RSpec.describe Admin::AdminController do
   it "should return the right response if user isn't a staff" do
-    expect do
-      get "/admin", params: { api_key: 'asdiasiduga' }
-    end.to raise_error(ActionController::RoutingError)
+    get "/admin", params: { api_key: 'asdiasiduga' }
+    expect(response.status).to eq(404)
   end
 end
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 719056f64b..7504cb31c3 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -25,8 +25,8 @@ RSpec.describe Admin::BackupsController do
     end
 
     it 'should not allow rollback via a GET request' do
-      expect { get "/admin/backups/rollback.json" }
-        .to raise_error(ActionController::RoutingError)
+      get "/admin/backups/rollback.json"
+      expect(response.status).to eq(404)
     end
   end
 
@@ -40,8 +40,8 @@ RSpec.describe Admin::BackupsController do
     end
 
     it 'should not allow cancel via a GET request' do
-      expect { get "/admin/backups/cancel.json" }
-        .to raise_error(ActionController::RoutingError)
+      get "/admin/backups/cancel.json"
+      expect(response.status).to eq(404)
     end
   end
 
diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rb
index 071ff0fd48..9babb31b38 100644
--- a/spec/requests/admin/email_templates_controller_spec.rb
+++ b/spec/requests/admin/email_templates_controller_spec.rb
@@ -19,16 +19,14 @@ RSpec.describe Admin::EmailTemplatesController do
 
   context "#index" do
     it "raises an error if you aren't logged in" do
-      expect do
-        get '/admin/customize/email_templates.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/customize/email_templates.json'
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        get '/admin/customize/email_templates.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/customize/email_templates.json'
+      expect(response.status).to eq(404)
     end
 
     it "should work if you are an admin" do
@@ -44,20 +42,18 @@ RSpec.describe Admin::EmailTemplatesController do
 
   context "#update" do
     it "raises an error if you aren't logged in" do
-      expect do
-        put '/admin/customize/email_templates/some_id', params: {
-          email_template: { subject: 'Subject', body: 'Body' }
-        }, headers: headers
-      end.to raise_error(ActionController::RoutingError)
+      put '/admin/customize/email_templates/some_id', params: {
+        email_template: { subject: 'Subject', body: 'Body' }
+      }, headers: headers
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        put '/admin/customize/email_templates/some_id', params: {
-          email_template: { subject: 'Subject', body: 'Body' }
-        }, headers: headers
-      end.to raise_error(ActionController::RoutingError)
+      put '/admin/customize/email_templates/some_id', params: {
+        email_template: { subject: 'Subject', body: 'Body' }
+      }, headers: headers
+      expect(response.status).to eq(404)
     end
 
     context "when logged in as admin" do
@@ -224,16 +220,14 @@ RSpec.describe Admin::EmailTemplatesController do
 
   context "#revert" do
     it "raises an error if you aren't logged in" do
-      expect do
-        delete '/admin/customize/email_templates/some_id', headers: headers
-      end.to raise_error(ActionController::RoutingError)
+      delete '/admin/customize/email_templates/some_id', headers: headers
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        delete '/admin/customize/email_templates/some_id', headers: headers
-      end.to raise_error(ActionController::RoutingError)
+      delete '/admin/customize/email_templates/some_id', headers: headers
+      expect(response.status).to eq(404)
     end
 
     context "when logged in as admin" do
diff --git a/spec/requests/admin/search_logs_spec.rb b/spec/requests/admin/search_logs_spec.rb
index c4f852b480..c6e058a8c8 100644
--- a/spec/requests/admin/search_logs_spec.rb
+++ b/spec/requests/admin/search_logs_spec.rb
@@ -5,21 +5,20 @@ RSpec.describe Admin::SearchLogsController do
   let(:user) { Fabricate(:user) }
 
   before do
+    SearchLog.clear_debounce_cache!
     SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1')
   end
 
   context "#index" do
     it "raises an error if you aren't logged in" do
-      expect do
-        get '/admin/logs/search_logs.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/logs/search_logs.json'
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        get '/admin/logs/search_logs.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/logs/search_logs.json'
+      expect(response.status).to eq(404)
     end
 
     it "should work if you are an admin" do
@@ -35,16 +34,14 @@ RSpec.describe Admin::SearchLogsController do
 
   context "#term" do
     it "raises an error if you aren't logged in" do
-      expect do
-        get '/admin/logs/search_logs/term/ruby.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/logs/search_logs/term/ruby.json'
+      expect(response.status).to eq(404)
     end
 
     it "raises an error if you aren't an admin" do
       sign_in(user)
-      expect do
-        get '/admin/logs/search_logs/term/ruby.json'
-      end.to raise_error(ActionController::RoutingError)
+      get '/admin/logs/search_logs/term/ruby.json'
+      expect(response.status).to eq(404)
     end
 
     it "should work if you are an admin" do
@@ -55,6 +52,7 @@ RSpec.describe Admin::SearchLogsController do
 
       json = ::JSON.parse(response.body)
       expect(json['term']['type']).to eq('search_log_term')
+      expect(json['term']['search_result']).to be_present
     end
   end
 end
diff --git a/spec/requests/composer_controller_spec.rb b/spec/requests/composer_controller_spec.rb
index 2a8923c37b..a5bcb668ef 100644
--- a/spec/requests/composer_controller_spec.rb
+++ b/spec/requests/composer_controller_spec.rb
@@ -6,11 +6,10 @@ RSpec.describe ComposerController do
   describe '#parse_html' do
 
     it "should not be able access without sign in" do
-      expect {
-        post "/composer/parse_html.json", params: {
-          html: "<strong>hello</strong>"
-        }
-      }.to raise_error(Discourse::NotLoggedIn)
+      post "/composer/parse_html.json", params: {
+        html: "<strong>hello</strong>"
+      }
+      expect(response.status).to eq(403)
     end
 
     it "should convert html tags to markdown text" do
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 4d6b6f93f1..a3626fc496 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -4,9 +4,8 @@ describe DirectoryItemsController do
   let!(:user) { Fabricate(:user) }
 
   it "requires a `period` param" do
-    expect do
-      get '/directory_items.json'
-    end.to raise_error(ActionController::ParameterMissing)
+    get '/directory_items.json'
+    expect(response.status).to eq(400)
   end
 
   it "requires a proper `period` param" do
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
index cd05901915..c6d7119481 100644
--- a/spec/requests/email_controller_spec.rb
+++ b/spec/requests/email_controller_spec.rb
@@ -5,7 +5,6 @@ RSpec.describe EmailController do
     describe 'when email is invalid' do
       it 'should return the right response' do
         get '/email/unsubscribed', params: { email: 'somerandomstring' }
-
         expect(response.status).to eq(404)
       end
     end
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index d6ae02f829..8b098b621f 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -4,6 +4,7 @@ describe EmbedController do
 
   let(:host) { "eviltrout.com" }
   let(:embed_url) { "http://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" }
+  let(:embed_url_secure) { "https://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" }
   let(:discourse_username) { "eviltrout" }
 
   it "is 404 without an embed_url" do
@@ -95,7 +96,7 @@ describe EmbedController do
       it "displays the right view" do
         topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
 
-        get '/embed/comments', params: { embed_url: embed_url }, headers: headers
+        get '/embed/comments', params: { embed_url: embed_url_secure }, headers: headers
 
         expect(response.body).to match(I18n.t('embed.start_discussion'))
       end
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 1d7c14abeb..6aff127509 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -245,11 +245,11 @@ describe GroupsController do
             public_exit: true
           )
 
-          expect { put "/groups/#{group.id}/members.json", params: { usernames: "bob" } }
-            .to raise_error(Discourse::NotLoggedIn)
+          put "/groups/#{group.id}/members.json", params: { usernames: "bob" }
+          expect(response.status).to eq(403)
 
-          expect { delete "/groups/#{group.id}/members.json", params: { username: "bob" } }
-            .to raise_error(Discourse::NotLoggedIn)
+          delete "/groups/#{group.id}/members.json", params: { username: "bob" }
+          expect(response.status).to eq(403)
         end
       end
     end
@@ -499,9 +499,8 @@ describe GroupsController do
   describe "group histories" do
     context 'when user is not signed in' do
       it 'should raise the right error' do
-        expect do
-          get "/groups/#{group.name}/logs.json"
-        end.to raise_error(Discourse::NotLoggedIn)
+        get "/groups/#{group.name}/logs.json"
+        expect(response.status).to eq(403)
       end
     end
 
@@ -587,17 +586,15 @@ describe GroupsController do
     let(:new_user) { Fabricate(:user) }
 
     it 'requires the user to log in' do
-      expect do
-        post "/groups/#{group.name}/request_membership.json"
-      end.to raise_error(Discourse::NotLoggedIn)
+      post "/groups/#{group.name}/request_membership.json"
+      expect(response.status).to eq(403)
     end
 
     it 'requires a reason' do
       sign_in(user)
 
-      expect do
-        post "/groups/#{group.name}/request_membership.json"
-      end.to raise_error(ActionController::ParameterMissing)
+      post "/groups/#{group.name}/request_membership.json"
+      expect(response.status).to eq(400)
     end
 
     it 'should create the right PM' do
@@ -649,9 +646,8 @@ describe GroupsController do
 
     context 'as an anon user' do
       it "returns the right response" do
-        expect do
-          get '/groups/search.json'
-        end.to raise_error(Discourse::NotLoggedIn)
+        get '/groups/search.json'
+        expect(response.status).to eq(403)
       end
     end
 
diff --git a/spec/requests/post_actions_controller_spec.rb b/spec/requests/post_actions_controller_spec.rb
index 5ad8455334..cb20f94f3a 100644
--- a/spec/requests/post_actions_controller_spec.rb
+++ b/spec/requests/post_actions_controller_spec.rb
@@ -1,7 +1,22 @@
 require 'rails_helper'
 
 RSpec.describe PostActionsController do
+  describe '#destroy' do
+    let(:post) { Fabricate(:post, user: Fabricate(:coding_horror)) }
+
+    it 'requires you to be logged in' do
+      delete '/post_action.json', params: { id: post.id }
+      expect(response.status).to eq(404)
+    end
+  end
+
   describe '#create' do
+
+    it 'requires you to be logged in' do
+      post '/post_actions.json'
+      expect(response.status).to eq(403)
+    end
+
     describe 'as a moderator' do
       let(:user) { Fabricate(:moderator) }
       let(:post_1) { Fabricate(:post, user: Fabricate(:coding_horror)) }
@@ -11,11 +26,10 @@ RSpec.describe PostActionsController do
       end
 
       it 'raises an error when the id is missing' do
-        expect do
-          post "/post_actions.json", params: {
-            post_action_type_id: PostActionType.types[:like]
-          }
-        end.to raise_error(ActionController::ParameterMissing)
+        post "/post_actions.json", params: {
+          post_action_type_id: PostActionType.types[:like]
+        }
+        expect(response.status).to eq(400)
       end
 
       it 'fails when the id is invalid' do
@@ -27,9 +41,8 @@ RSpec.describe PostActionsController do
       end
 
       it 'raises an error when the post_action_type_id index is missing' do
-        expect do
-          post "/post_actions.json", params: { id: post_1.id }
-        end.to raise_error(ActionController::ParameterMissing)
+        post "/post_actions.json", params: { id: post_1.id }
+        expect(response.status).to eq(400)
       end
 
       it "fails when the user doesn't have permission to see the post" do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 62256403bf..6d290d0e1a 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -199,4 +199,23 @@ RSpec.describe PostsController do
       end
     end
   end
+
+  describe "#locked" do
+    before do
+      sign_in(Fabricate(:moderator))
+    end
+
+    it 'can lock and unlock the post' do
+      put "/posts/#{public_post.id}/locked.json", params: { locked: "true" }
+      expect(response).to be_success
+      public_post.reload
+      expect(public_post).to be_locked
+
+      put "/posts/#{public_post.id}/locked.json", params: { locked: "false" }
+      expect(response).to be_success
+      public_post.reload
+      expect(public_post).not_to be_locked
+    end
+  end
+
 end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 155fee81d9..72f00371cf 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -44,12 +44,11 @@ RSpec.describe TopicsController do
   describe '#timer' do
     context 'when a user is not logged in' do
       it 'should return the right response' do
-        expect do
-          post "/t/#{topic.id}/timer.json", params: {
-            time: '24',
-            status_type: TopicTimer.types[1]
-          }
-        end.to raise_error(Discourse::NotLoggedIn)
+        post "/t/#{topic.id}/timer.json", params: {
+          time: '24',
+          status_type: TopicTimer.types[1]
+        }
+        expect(response.status).to eq(403)
       end
     end
 
@@ -75,8 +74,6 @@ RSpec.describe TopicsController do
       end
 
       it 'should be able to create a topic status update' do
-        time = 24
-
         post "/t/#{topic.id}/timer.json", params: {
           time: 24,
           status_type: TopicTimer.types[1]
@@ -148,12 +145,12 @@ RSpec.describe TopicsController do
 
       describe 'invalid status type' do
         it 'should raise the right error' do
-          expect do
-            post "/t/#{topic.id}/timer.json", params: {
-              time: 10,
-              status_type: 'something'
-            }
-          end.to raise_error(Discourse::InvalidParameters)
+          post "/t/#{topic.id}/timer.json", params: {
+            time: 10,
+            status_type: 'something'
+          }
+          expect(response.status).to eq(400)
+          expect(response.body).to include('status_type')
         end
       end
     end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 9495effe71..d3351e59e1 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -327,4 +327,17 @@ RSpec.describe UsersController do
       end
     end
   end
+
+  describe '.user_preferences_redirect' do
+    it 'requires the user to be logged in' do
+      get '/user_preferences'
+      expect(response.status).to eq(404)
+    end
+
+    it "redirects to their profile when logged in" do
+      sign_in(user)
+      get '/user_preferences'
+      expect(response).to redirect_to("/u/#{user.username_lower}/preferences")
+    end
+  end
 end
diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
index a0572cb726..04912f8f20 100644
--- a/spec/requests/users_email_controller_spec.rb
+++ b/spec/requests/users_email_controller_spec.rb
@@ -67,9 +67,8 @@ describe UsersEmailController do
     let(:new_email) { 'bubblegum@adventuretime.ooo' }
 
     it "requires you to be logged in" do
-      expect do
-        put "/u/asdf/preferences/email.json"
-      end.to raise_error(Discourse::NotLoggedIn)
+      put "/u/asdf/preferences/email.json"
+      expect(response.status).to eq(403)
     end
 
     context 'when logged in' do
@@ -80,9 +79,8 @@ describe UsersEmailController do
       end
 
       it 'raises an error without an email parameter' do
-        expect do
-          put "/u/#{user.username}/preferences/email.json"
-        end.to raise_error(ActionController::ParameterMissing)
+        put "/u/#{user.username}/preferences/email.json"
+        expect(response.status).to eq(400)
       end
 
       it "raises an error if you can't edit the user's email" do
diff --git a/spec/serializers/suggested_topic_serializer_spec.rb b/spec/serializers/suggested_topic_serializer_spec.rb
new file mode 100644
index 0000000000..b9fcdb6d52
--- /dev/null
+++ b/spec/serializers/suggested_topic_serializer_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+describe SuggestedTopicSerializer do
+  let(:user) { Fabricate(:user) }
+
+  describe '#featured_link and #featured_link_root_domain' do
+    let(:featured_link) { 'http://meta.discourse.org' }
+    let(:topic) { Fabricate(:topic, featured_link: featured_link, category: Fabricate(:category, topic_featured_link_allowed: true)) }
+    subject(:json) { described_class.new(topic, scope: Guardian.new(user), root: false).as_json }
+
+    context 'when topic featured link is disable' do
+      before do
+        SiteSetting.topic_featured_link_enabled = true
+        topic
+        SiteSetting.topic_featured_link_enabled = false
+      end
+
+      it 'should not return featured link attrs' do
+        expect(json[:featured_link]).to eq(nil)
+        expect(json[:featured_link_root_domain]).to eq(nil)
+      end
+    end
+
+    context 'when topic featured link is enabled' do
+      before do
+        SiteSetting.topic_featured_link_enabled = true
+      end
+
+      it 'should return featured link attrs' do
+        expect(json[:featured_link]).to eq(featured_link)
+        expect(json[:featured_link_root_domain]).to eq('discourse.org')
+      end
+    end
+  end
+end
diff --git a/spec/serializers/web_hook_post_serializer_spec.rb b/spec/serializers/web_hook_post_serializer_spec.rb
index 2f1f487060..6190f8e27e 100644
--- a/spec/serializers/web_hook_post_serializer_spec.rb
+++ b/spec/serializers/web_hook_post_serializer_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe WebHookPostSerializer do
 
   it 'should only include the required keys' do
     count = serializer.as_json.keys.count
-    difference = count - 40
+    difference = count - 41
 
     expect(difference).to eq(0), lambda {
       message = ""
diff --git a/spec/serializers/web_hook_user_serializer_spec.rb b/spec/serializers/web_hook_user_serializer_spec.rb
index ad854ca13e..3734587bb3 100644
--- a/spec/serializers/web_hook_user_serializer_spec.rb
+++ b/spec/serializers/web_hook_user_serializer_spec.rb
@@ -1,14 +1,21 @@
 require 'rails_helper'
 
 RSpec.describe WebHookUserSerializer do
-  let(:user) { Fabricate(:user) }
+  let(:user) do
+    user = Fabricate(:user)
+    SingleSignOnRecord.create!(user_id: user.id, external_id: '12345', last_payload: '')
+    user
+  end
+
   let(:admin) { Fabricate(:admin) }
 
-  subject { described_class.new(user, scope: Guardian.new(admin), root: false) }
-
-  it "should include the user's email" do
-    payload = subject.as_json
+  let :serializer do
+    WebHookUserSerializer.new(user, scope: Guardian.new(admin), root: false)
+  end
 
+  it "should include relevant user info" do
+    payload = serializer.as_json
     expect(payload[:email]).to eq(user.email)
+    expect(payload[:external_id]).to eq('12345')
   end
 end
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index b8159b28fd..7d8535fe3c 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -434,4 +434,22 @@ describe StaffActionLogger do
       expect(user_history.previous_value).to eq('t')
     end
   end
+
+  describe 'log_check_personal_message' do
+    let(:personal_message) { Fabricate(:private_message_topic) }
+
+    subject(:log_check_personal_message) { described_class.new(admin).log_check_personal_message(personal_message) }
+
+    it 'raises an error when topic is nil' do
+      expect { logger.log_check_personal_message(nil) }.to raise_error(Discourse::InvalidParameters)
+    end
+
+    it 'raises an error when topic is not a Topic' do
+      expect { logger.log_check_personal_message(1) }.to raise_error(Discourse::InvalidParameters)
+    end
+
+    it 'creates a new UserHistory record' do
+      expect { log_check_personal_message }.to change { UserHistory.count }.by(1)
+    end
+  end
 end
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
index 334446502c..52264cf41a 100644
--- a/spec/services/word_watcher_spec.rb
+++ b/spec/services/word_watcher_spec.rb
@@ -76,6 +76,21 @@ describe WordWatcher do
           m = WordWatcher.new("trooooooooot").word_matches_for_action?(:require_approval)
           expect(m[1]).to eq("trooooooooot")
         end
+
+        it "support uppercase" do
+          Fabricate(
+            :watched_word,
+            word: /a\S+ce/,
+            action: WatchedWord.actions[:require_approval]
+          )
+
+          m = WordWatcher.new('Amazing place').word_matches_for_action?(:require_approval)
+          expect(m).to be_nil
+          m = WordWatcher.new('Amazing applesauce').word_matches_for_action?(:require_approval)
+          expect(m[1]).to eq('applesauce')
+          m = WordWatcher.new('Amazing AppleSauce').word_matches_for_action?(:require_approval)
+          expect(m[1]).to eq('AppleSauce')
+        end
       end
 
     end
diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js.es6 b/test/javascripts/acceptance/admin-search-log-term-test.js.es6
index dd6b1e6269..9d3fbd6b43 100644
--- a/test/javascripts/acceptance/admin-search-log-term-test.js.es6
+++ b/test/javascripts/acceptance/admin-search-log-term-test.js.es6
@@ -5,6 +5,7 @@ QUnit.test("show search log term details", assert => {
   visit("/admin/logs/search_logs/term/ruby");
   andThen(() => {
     assert.ok($('div.search-logs-filter').length, "has the search type filter");
-    assert.ok(exists('iframe.chartjs-hidden-iframe'), "has graph iframe");
+    assert.ok(exists('canvas.chartjs-render-monitor'), "has graph canvas");
+    assert.ok(exists('div.header-search-results'), "has header search results");
   });
 });
diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js.es6
index ca7a745a94..d048154d11 100644
--- a/test/javascripts/acceptance/tags-test.js.es6
+++ b/test/javascripts/acceptance/tags-test.js.es6
@@ -8,4 +8,57 @@ QUnit.test("list the tags", assert => {
     assert.ok($('body.tags-page').length, "has the body class");
     assert.ok(exists('.tag-eviltrout'), "shows the evil trout tag");
   });
-});
\ No newline at end of file
+});
+
+acceptance("Tags listed by group", {
+  loggedIn: true,
+  settings: {
+    tags_listed_by_group: true
+  }
+});
+
+
+QUnit.test("list the tags in groups", assert => {
+  server.get('/tags', () => { // eslint-disable-line no-undef
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      {
+        "tags":[{id: 'planned', text: 'planned', count: 7}],
+        "extras": { "tag_groups": [
+          {id: 2, name: "Ford Cars", tags: [
+            {id: 'escort', text: 'escort', count: 1},
+            {id: 'focus', text: 'focus', count: 3}
+          ]},
+          {id: 1, name: "Honda Cars", tags: [
+            {id: 'civic', text: 'civic', count: 4},
+            {id: 'accord', text: 'accord', count: 2}
+          ]},
+          {id: 1, name: "Makes", tags: [
+            {id: 'ford', text: 'ford', count: 5},
+            {id: 'honda', text: 'honda', count: 6}
+          ]}
+        ]}
+      }
+    ];
+  });
+
+  visit('/tags');
+  andThen(() => {
+    assert.equal($('.tag-list').length, 4, "shows separate lists for the 3 groups and the ungrouped tags");
+    assert.ok(
+      _.isEqual(
+        _.map($('.tag-list h3'), i => { return $(i).text(); } ),
+        ['Ford Cars', 'Honda Cars', 'Makes', 'Other Tags']
+      ),
+      'shown in given order and with tags that are not in a group'
+    );
+    assert.ok(
+      _.isEqual(
+        _.map($('.tag-list:first .discourse-tag'), i => { return $(i).text(); }),
+        ['focus', 'escort']
+      ),
+      'shows the tags in default sort (by count)'
+    );
+  });
+});
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
index 112ef64d04..763644eadd 100644
--- a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
@@ -9,11 +9,17 @@ moduleFor('controller:admin-user-badges', {
 });
 
 QUnit.test("grantableBadges", function(assert) {
-  const badgeFirst = Badge.create({id: 3, name: "A Badge", enabled: true});
-  const badgeMiddle = Badge.create({id: 1, name: "My Badge", enabled: true});
-  const badgeLast = Badge.create({id: 2, name: "Zoo Badge", enabled: true});
-  const badgeDisabled = Badge.create({id: 4, name: "Disabled Badge", enabled: false});
-  const controller = this.subject({ model: [], badges: [badgeLast, badgeFirst, badgeMiddle, badgeDisabled] });
+  const badgeFirst = Badge.create({ id: 3, name: "A Badge", enabled: true, manually_grantable: true });
+  const badgeMiddle = Badge.create({ id: 1, name: "My Badge", enabled: true, manually_grantable: true });
+  const badgeLast = Badge.create({ id: 2, name: "Zoo Badge", enabled: true, manually_grantable: true });
+  const badgeDisabled = Badge.create({ id: 4, name: "Disabled Badge", enabled: false, manually_grantable: true });
+  const badgeAutomatic = Badge.create({ id: 5, name: "Automatic Badge", enabled: true, manually_grantable: false });
+
+  const controller = this.subject({
+    model: [],
+    badges: [badgeLast, badgeFirst, badgeMiddle, badgeDisabled, badgeAutomatic]
+  });
+
   const sortedNames = [badgeFirst.name, badgeMiddle.name, badgeLast.name];
   const badgeNames = controller.get('grantableBadges').map(function(badge) {
     return badge.name;
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index cf3dfdfcd1..faf4f30b3b 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -248,6 +248,9 @@ testCase('link modal (simple link) with selected text', function(assert, textare
   textarea.selectionEnd = 12;
 
   click('button.link');
+  andThen(() => {
+    assert.equal(this.$('input.link-text')[0].value, 'hello world.');
+  });
   fillIn('.insert-link input.link-url', 'http://eviltrout.com');
   click('.insert-link button.btn-primary');
   andThen(() => {
diff --git a/test/javascripts/components/multi-select-test.js.es6 b/test/javascripts/components/multi-select-test.js.es6
index 1bb5f940be..454a45dac6 100644
--- a/test/javascripts/components/multi-select-test.js.es6
+++ b/test/javascripts/components/multi-select-test.js.es6
@@ -145,3 +145,17 @@ componentTest('interactions', {
     });
   }
 });
+
+componentTest('with limitMatches', {
+  template: '{{multi-select content=content limitMatches=2}}',
+
+  beforeEach() {
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').el().find(".select-kit-row").length, 2));
+  }
+});
diff --git a/test/javascripts/components/single-select-test.js.es6 b/test/javascripts/components/single-select-test.js.es6
index f79b2b5182..2e39a6dd40 100644
--- a/test/javascripts/components/single-select-test.js.es6
+++ b/test/javascripts/components/single-select-test.js.es6
@@ -103,7 +103,7 @@ componentTest('custom search icon', {
 
     andThen(() => {
       assert.ok(
-        this.get('subject').filter().icon().hasClass("fa-shower"),
+        this.get('subject').filter().icon().hasClass("d-icon-shower"),
         "it has a the correct icon"
       );
     });
@@ -469,58 +469,6 @@ componentTest('with collection header', {
   }
 });
 
-componentTest('with onToggle', {
-  template: '{{single-select onToggle=onToggle}}',
-
-  beforeEach() {
-    this.set("onToggle", () => $(".select-kit").append("<span class='onToggleTest'></span>"));
-  },
-
-  test(assert) {
-    andThen(() => assert.notOk(exists(".onToggleTest")));
-
-    this.get('subject').expand();
-
-    andThen(() => assert.ok(exists(".onToggleTest")));
-  }
-});
-
-componentTest('with onExpand', {
-  template: '{{single-select onExpand=onExpand}}',
-
-  beforeEach() {
-    this.set("onExpand", () => $(".select-kit").append("<span class='onExpandTest'></span>"));
-  },
-
-  test(assert) {
-    andThen(() => assert.notOk(exists(".onExpandTest")));
-
-    this.get('subject').expand();
-
-    andThen(() => assert.ok(exists(".onExpandTest")));
-  }
-});
-
-componentTest('with onCollapse', {
-  template: '{{single-select onCollapse=onCollapse}}',
-
-  beforeEach() {
-    this.set("onCollapse", () => $(".select-kit").append("<span class='onCollapseTest'></span>"));
-  },
-
-  test(assert) {
-    andThen(() => assert.notOk(exists(".onCollapseTest")));
-
-    this.get('subject').expand();
-
-    andThen(() => assert.notOk(exists(".onCollapseTest")));
-
-    this.get('subject').collapse();
-
-    andThen(() => assert.ok(exists(".onCollapseTest")));
-  }
-});
-
 componentTest('with title', {
   template: '{{single-select title=(i18n "test.title")}}',
 
@@ -532,3 +480,41 @@ componentTest('with title', {
     andThen(() => assert.equal(this.get('subject').header().title(), 'My title') );
   }
 });
+
+componentTest('support modifying header computed content through plugin api', {
+  template: '{{single-select content=content}}',
+
+  beforeEach() {
+    withPluginApi('0.8.15', api => {
+      api.modifySelectKit("select-kit")
+        .modifyHeaderComputedContent((context, computedContent) => {
+          computedContent.title = "Not so evil";
+          return computedContent;
+        });
+    });
+
+    this.set("content", [{ id: "1", name: "robin"}]);
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().title(), "Not so evil");
+    });
+
+    andThen(() => clearCallbacks());
+  }
+});
+
+componentTest('with limitMatches', {
+  template: '{{single-select content=content limitMatches=2}}',
+
+  beforeEach() {
+    this.set('content', ['sam', 'jeff', 'neil']);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').el().find(".select-kit-row").length, 2));
+  }
+});
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index 804d819a90..aa66bebe94 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -164,8 +164,12 @@ QUnit.test("canDeleteSelected", function(assert) {
 
 QUnit.test("Can split/merge topic", function(assert) {
   const postStream = {
-    posts: [{ id: 1 }, { id: 2 }],
-    stream: [1, 2]
+    posts: [
+      { id: 1, post_number: 1, post_type: 1 },
+      { id: 2, post_number: 2, post_type: 4 },
+      { id: 3, post_number: 3, post_type: 1 }
+    ],
+    stream: [1, 2, 3]
   };
 
   const model = Topic.create({ postStream, details: { can_move_posts: false } });
@@ -185,8 +189,14 @@ QUnit.test("Can split/merge topic", function(assert) {
   assert.ok(controller.get("canSplitTopic"), "can split topic");
   assert.ok(controller.get("canMergeTopic"), "can merge topic");
 
+  selectedPostIds.removeObject(1);
   selectedPostIds.pushObject(2);
 
+  assert.not(controller.get("canSplitTopic"), "can't split topic when 1st post is not a regular post");
+  assert.ok(controller.get("canMergeTopic"), "can merge topic when 1st post is not a regular post");
+
+  selectedPostIds.pushObject(3);
+
   assert.not(controller.get("canSplitTopic"), "can't split topic when all posts are selected");
   assert.ok(controller.get("canMergeTopic"), "can merge topic when all posts are selected");
 });
diff --git a/test/javascripts/fixtures/notification_fixtures.js.es6 b/test/javascripts/fixtures/notification_fixtures.js.es6
index 22493d34ee..a1b092c503 100644
--- a/test/javascripts/fixtures/notification_fixtures.js.es6
+++ b/test/javascripts/fixtures/notification_fixtures.js.es6
@@ -1,2 +1,2 @@
 /*jshint maxlen:10000000 */
-export default {"/notifications": {notifications: [ { id: 123, notification_type: 2, read: true, post_number: 2, topic_id: 1234, slug: "a-slug", data: { topic_title: "some title", display_username: "velesin" } } ]  }};
+export default {"/notifications": {notifications: [ { id: 123, notification_type: 2, read: false, post_number: 2, topic_id: 1234, slug: "a-slug", data: { topic_title: "some title", display_username: "velesin" } } ]  }};
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
index be2debd6a8..17f5c578c7 100644
--- a/test/javascripts/helpers/select-kit-helper.js
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -87,7 +87,7 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
         var type = options.type || 'keydown';
         var event = jQuery.Event(type);
         event.keyCode = keyCode;
-        if (options && options.metaKey === true) { event.metaKey = true; }
+        if (options && options.metaKey) { event.metaKey = true; }
         find(eventSelector).trigger(event);
       });
     }
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js.es6
index 6dc1ba2c51..17322d4619 100644
--- a/test/javascripts/lib/category-badge-test.js.es6
+++ b/test/javascripts/lib/category-badge-test.js.es6
@@ -26,7 +26,7 @@ QUnit.test("Regular categoryBadge", assert => {
   const label = tag.children[1];
   assert.equal(label.attributes.title, 'cool description', 'it has the correct title');
 
-  assert.equal(label.children[0].data, 'hello', 'it has the category name');
+  assert.equal(label.children[0].children[0].data, 'hello', 'it has the category name');
 });
 
 QUnit.test("undefined color", assert => {
diff --git a/test/javascripts/lib/i18n-test.js.es6 b/test/javascripts/lib/i18n-test.js.es6
index 314c4cc693..e653a8d0ca 100644
--- a/test/javascripts/lib/i18n-test.js.es6
+++ b/test/javascripts/lib/i18n-test.js.es6
@@ -1,17 +1,30 @@
 QUnit.module("lib:i18n", {
   _locale: I18n.locale,
+  _fallbackLocale: I18n.fallbackLocale,
   _translations: I18n.translations,
 
   beforeEach() {
     I18n.locale = "fr";
 
     I18n.translations = {
+      "fr_FOO": {
+        "js": {
+          "topic": {
+            "reply": {
+              "title": "Foo"
+            }
+          },
+        }
+      },
       "fr": {
         "js": {
           "hello": "Bonjour",
           "topic": {
             "reply": {
-              "title": "Répondre",
+              "title": "Répondre"
+            },
+            "share": {
+              "title": "Partager"
             }
           },
           "character_count": {
@@ -56,6 +69,7 @@ QUnit.module("lib:i18n", {
 
   afterEach() {
     I18n.locale = this._locale;
+    I18n.fallbackLocale = this._fallbackLocale;
     I18n.translations = this._translations;
   }
 });
@@ -92,4 +106,13 @@ QUnit.test("pluralizations", assert => {
   assert.equal(I18n.t("word_count", { count: 3 }), "3 words");
   assert.equal(I18n.t("word_count", { count: 10 }), "10 words");
   assert.equal(I18n.t("word_count", { count: 100 }), "100 words");
-});
\ No newline at end of file
+});
+
+QUnit.test("fallback", assert => {
+  I18n.locale = "fr_FOO";
+  I18n.fallbackLocale = "fr";
+
+  assert.equal(I18n.t("topic.reply.title"), "Foo", "uses locale translations when they exist");
+  assert.equal(I18n.t("topic.share.title"), "Partager", "falls back to fallbackLocale translations when they exist");
+  assert.equal(I18n.t("topic.reply.help"), "begin composing a reply to this topic", "falls back to English translations");
+});
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6
index 65803e8b18..df81da1cfc 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -8,13 +8,14 @@ QUnit.module("lib:pretty-text");
 const rawOpts = {
   siteSettings: {
     enable_emoji: true,
+    enable_emoji_shortcuts: true,
     enable_mentions: true,
     emoji_set: 'emoji_one',
     highlighted_languages: 'json|ruby|javascript',
     default_code_lang: 'auto',
     censored_pattern: '\\d{3}-\\d{4}|tech\\w*'
   },
-  censoredWords: 'shucks|whiz|whizzer|a**le',
+  censoredWords: 'shucks|whiz|whizzer|a**le|badword*',
   getURL: url => url
 };
 
@@ -604,6 +605,31 @@ QUnit.test("censoring", assert => {
   assert.cooked("I have a pen, I have an a**le",
          "<p>I have a pen, I have an ■■■■■</p>",
          "it escapes regexp chars");
+  assert.cooked("No badword or apple here plz.",
+    "<p>No ■■■■■■■ or ■■■■■ here plz.</p>",
+    "it handles * as wildcard");
+
+  assert.cookedOptions(
+    "Pleased to meet you, but pleeeease call me later, xyz123",
+    { siteSettings: {
+        watched_words_regular_expressions: true,
+        censored_pattern: null
+      },
+      censoredWords: 'xyz*|plee+ase'
+    },
+    "<p>Pleased to meet you, but ■■■■ call me later, ■■■■123</p>",
+    "supports words as regular expressions");
+
+  assert.cookedOptions(
+    "Meet downtown in your town at the townhouse on Main St.",
+    { siteSettings: {
+        watched_words_regular_expressions: true,
+        censored_pattern: null
+      },
+      censoredWords: '\\btown\\b'
+    },
+    "<p>Meet downtown in your ■■■■ at the townhouse on Main St.</p>",
+    "supports words as regular expressions");
 });
 
 QUnit.test("code blocks/spans hoisting", assert => {
diff --git a/test/javascripts/lib/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js.es6
index 3c2f04566b..12e136ec26 100644
--- a/test/javascripts/lib/to-markdown-test.js.es6
+++ b/test/javascripts/lib/to-markdown-test.js.es6
@@ -119,7 +119,7 @@ QUnit.test("converts table tags", assert => {
   assert.equal(toMarkdown(html), markdown);
 });
 
-QUnit.test("returns empty string if table format not supported", assert => {
+QUnit.test("replace pipes with spaces if table format not supported", assert => {
   let html = `<table>
     <thead> <tr><th>Headi<br><br>ng 1</th><th>Head 2</th></tr> </thead>
       <tbody>
@@ -127,7 +127,8 @@ QUnit.test("returns empty string if table format not supported", assert => {
         <tr><td><a href="http://example.com"><img src="http://dolor.com/image.png" /></a></td> <td><i>sit amet</i></td></tr></tbody>
 </table>
   `;
-  assert.equal(toMarkdown(html), "");
+  let markdown = `Headi\n\nng 1 Head 2\nLorem ipsum\n[![](http://dolor.com/image.png)](http://example.com) *sit amet*`;
+  assert.equal(toMarkdown(html), markdown);
 
   html = `<table>
     <thead> <tr><th>Heading 1</th></tr> </thead>
@@ -136,10 +137,12 @@ QUnit.test("returns empty string if table format not supported", assert => {
         <tr><td><i>sit amet</i></td></tr></tbody>
 </table>
   `;
-  assert.equal(toMarkdown(html), "");
+  markdown = `Heading 1\nLorem\n*sit amet*`;
+  assert.equal(toMarkdown(html), markdown);
 
-  html = `<table><tr><td>Lorem</td><td><i>sit amet</i></td></tr></table>`;
-  assert.equal(toMarkdown(html), "");
+  html = `<table><tr><td>Lorem</td><td><strong>sit amet</strong></td></tr></table>`;
+  markdown = `Lorem **sit amet**`;
+  assert.equal(toMarkdown(html), markdown);
 });
 
 QUnit.test("converts img tag", assert => {
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6
index 00e00f4c19..9b5f4e4265 100644
--- a/test/javascripts/lib/utilities-test.js.es6
+++ b/test/javascripts/lib/utilities-test.js.es6
@@ -14,7 +14,8 @@ import {
   validateUploadedFiles,
   getUploadMarkdown,
   caretRowCol,
-  setCaretPosition
+  setCaretPosition,
+  fillMissingDates
 } from 'discourse/lib/utilities';
 import * as Utilities from 'discourse/lib/utilities';
 
@@ -122,6 +123,7 @@ var testUploadMarkdown = function(filename) {
 
 QUnit.test("getUploadMarkdown", assert => {
   assert.equal(testUploadMarkdown("lolcat.gif"),'![lolcat|100x200](/uploads/123/abcdef.ext)');
+  assert.equal(testUploadMarkdown("[foo|bar].png"),'![%5Bfoo%7Cbar%5D|100x200](/uploads/123/abcdef.ext)');
   assert.ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n');
 });
 
@@ -253,3 +255,12 @@ QUnit.test("caretRowCol", assert => {
 
   document.body.removeChild(textarea);
 });
+
+QUnit.test("fillMissingDates", assert => {
+  const startDate = "2017-11-12"; // YYYY-MM-DD
+  const endDate = "2017-12-12"; // YYYY-MM-DD
+  const data = '[{"x":"2017-11-12","y":3},{"x":"2017-11-27","y":2},{"x":"2017-12-06","y":9},{"x":"2017-12-11","y":2}]';
+
+  assert.equal(fillMissingDates(JSON.parse(data), startDate, endDate).length, 31,
+        "it returns a JSON array with 31 dates");
+});
diff --git a/test/javascripts/mixins/grant-badge-controller-test.js.es6 b/test/javascripts/mixins/grant-badge-controller-test.js.es6
new file mode 100644
index 0000000000..d1e34cd133
--- /dev/null
+++ b/test/javascripts/mixins/grant-badge-controller-test.js.es6
@@ -0,0 +1,38 @@
+import GrantBadgeControllerMixin from 'discourse/mixins/grant-badge-controller';
+import Badge from 'discourse/models/badge';
+
+QUnit.module('mixin:grant-badge-controller', {
+  before: function() {
+    this.GrantBadgeController = Ember.Controller.extend(GrantBadgeControllerMixin);
+
+    this.badgeFirst = Badge.create({ id: 3, name: 'A Badge', enabled: true, manually_grantable: true });
+    this.badgeMiddle = Badge.create({ id: 1, name: 'My Badge', enabled: true, manually_grantable: true });
+    this.badgeLast = Badge.create({ id: 2, name: 'Zoo Badge', enabled: true, manually_grantable: true });
+    this.badgeDisabled = Badge.create({ id: 4, name: 'Disabled Badge', enabled: false, manually_grantable: true });
+    this.badgeAutomatic = Badge.create({ id: 5, name: 'Automatic Badge', enabled: true, manually_grantable: false });
+  },
+
+  beforeEach: function() {
+    this.subject = this.GrantBadgeController.create({
+      userBadges: [],
+      allBadges: [this.badgeLast, this.badgeFirst, this.badgeMiddle, this.badgeDisabled, this.badgeAutomatic],
+    });
+  }
+});
+
+QUnit.test('grantableBadges', function(assert) {
+  const sortedNames = [this.badgeFirst.name, this.badgeMiddle.name, this.badgeLast.name];
+  const badgeNames = this.subject.get('grantableBadges').map(badge => badge.name);
+
+  assert.not(badgeNames.includes(this.badgeDisabled), 'excludes disabled badges');
+  assert.not(badgeNames.includes(this.badgeAutomatic), 'excludes automatic badges');
+  assert.deepEqual(badgeNames, sortedNames, 'sorts badges by name');
+});
+
+QUnit.test('selectedBadgeGrantable', function(assert) {
+  this.subject.set('selectedBadgeId', this.badgeDisabled.id);
+  assert.not(this.subject.get('selectedBadgeGrantable'));
+
+  this.subject.set('selectedBadgeId', this.badgeFirst.id);
+  assert.ok(this.subject.get('selectedBadgeGrantable'));
+});
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6
index 96bd889f50..70615b7805 100644
--- a/test/javascripts/widgets/home-logo-test.js.es6
+++ b/test/javascripts/widgets/home-logo-test.js.es6
@@ -51,7 +51,7 @@ widgetTest('no logo', {
   },
 
   test(assert) {
-    assert.ok(this.$('h2#site-text-logo.text-logo').length === 1);
+    assert.ok(this.$('h1#site-text-logo.text-logo').length === 1);
     assert.equal(this.$('#site-text-logo').text(), title);
   }
 });
diff --git a/test/smoke_test.js b/test/smoke_test.js
index 282a3e9c25..f166bca408 100644
--- a/test/smoke_test.js
+++ b/test/smoke_test.js
@@ -55,9 +55,8 @@ const path = require('path');
 
   if (process.env.AUTH_USER && process.env.AUTH_PASSWORD) {
     await exec("basic authentication", () => {
-      return page.authenticate({
-        username: process.env.AUTH_USER,
-        password: process.env.AUTH_PASSWORD
+      return page.setExtraHTTPHeaders({
+        'Authorization': `Basic ${new Buffer(`${process.env.AUTH_USER}:${process.env.AUTH_PASSWORD}`).toString('base64')}`
       });
     });
   }
diff --git a/vendor/assets/javascripts/caret_position.js b/vendor/assets/javascripts/caret_position.js
index e3f94b3597..8a7b2e0616 100644
--- a/vendor/assets/javascripts/caret_position.js
+++ b/vendor/assets/javascripts/caret_position.js
@@ -54,6 +54,7 @@ $.fn.caretPosition = function(options) {
     return styles.getPropertyValue(prop);
   };
 
+  const isRTL = $('html').hasClass('rtl');
   clone.css({
     border: "1px solid black",
     padding: important("padding"),
@@ -62,7 +63,8 @@ $.fn.caretPosition = function(options) {
     "overflow-y": "auto",
     "word-wrap": "break-word",
     position: "absolute",
-    left: "-7000px"
+    left: isRTL ? "auto" : "-7000px",
+    right: isRTL ? "-7000px" : "auto"
   });
 
   p.css({