diff --git a/app/javascript/gabsocial/components/emoji/unicode_to_unified_name.js b/app/javascript/gabsocial/components/emoji/unicode_to_unified_name.js
index 808ac197..95921957 100644
--- a/app/javascript/gabsocial/components/emoji/unicode_to_unified_name.js
+++ b/app/javascript/gabsocial/components/emoji/unicode_to_unified_name.js
@@ -6,6 +6,7 @@ function padLeft(str, num) {
 }
 
 exports.unicodeToUnifiedName = (str) => {
+  if (!str) return '';
   let output = '';
   for (let i = 0; i < str.length; i += 2) {
     if (i > 0) {
diff --git a/app/javascript/styles/global.css b/app/javascript/styles/global.css
index 2ec4a404..5025c2e1 100644
--- a/app/javascript/styles/global.css
+++ b/app/javascript/styles/global.css
@@ -1,5 +1,4 @@
 :root {
-  --color_highlight: #CCF3DF;
   --color_brand-dark: #378e61;
   --color_brand-light: #63DA9D;
   --color_brand-light-opaque: rgb(54, 233, 145, .125);
@@ -95,14 +94,6 @@
   --navigation_brand: var(--color_brand) !important;
 }
 
-::selection {
-  background: var(--color_highlight);
-}
-
-::-moz-selection {
-  background: var(--color_highlight);
-}
-
 html,
 body {
   height: 100%;
@@ -678,7 +669,7 @@ body {
 .mb5 { margin-bottom: 5px; }
 .mbNeg5PX { margin-bottom: -5px; }
 
-.mt15 { margin-top: 10px; }
+.mt15 { margin-top: 15px; }
 .mt10 { margin-top: 10px; }
 .mt5 { margin-top: 5px; }
 .mt2 { margin-top: 2px; }
diff --git a/config/webpack/production.js b/config/webpack/production.js
index 460be1d3..009f772d 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -81,8 +81,7 @@ module.exports = merge(sharedConfig, {
         ],
       },
       externals: [
-        '/emoji/1f602.svg', // used for emoji picker dropdown
-        '/emoji/sheet_10.png', // used in emoji-mart
+        '/emoji/sheet.png', // used in emoji-mart
       ],
       excludes: [
         '**/*.gz',