diff --git a/DiscordChatExporter/Resources/ExportService/DarkTheme.css b/DiscordChatExporter/Resources/ExportService/DarkTheme.css
index 9ca9d5b5..47937e5a 100644
--- a/DiscordChatExporter/Resources/ExportService/DarkTheme.css
+++ b/DiscordChatExporter/Resources/ExportService/DarkTheme.css
@@ -116,4 +116,10 @@ div.msg-attachment {
 img.msg-attachment {
     max-height: 500px;
     max-width: 50%;
+}
+
+img.emoji {
+    height: 24px;
+    width: 24px;
+    vertical-align: -.4em;
 }
\ No newline at end of file
diff --git a/DiscordChatExporter/Resources/ExportService/LightTheme.css b/DiscordChatExporter/Resources/ExportService/LightTheme.css
index 83b139ad..3e585126 100644
--- a/DiscordChatExporter/Resources/ExportService/LightTheme.css
+++ b/DiscordChatExporter/Resources/ExportService/LightTheme.css
@@ -114,4 +114,10 @@ div.msg-attachment {
 img.msg-attachment {
     max-height: 500px;
     max-width: 50%;
+}
+
+img.emoji {
+    height: 24px;
+    width: 24px;
+    vertical-align: -.4em;
 }
\ No newline at end of file
diff --git a/DiscordChatExporter/Services/ExportService.cs b/DiscordChatExporter/Services/ExportService.cs
index 34359b6c..9ace7c5e 100644
--- a/DiscordChatExporter/Services/ExportService.cs
+++ b/DiscordChatExporter/Services/ExportService.cs
@@ -248,6 +248,10 @@ namespace DiscordChatExporter.Services
             // New lines
             content = content.Replace("\n", "<br />");
 
+            // Custom emojis (<:name:id>)
+            content = Regex.Replace(content, "&lt;:.*?:(\\d+)&gt;",
+                "<img class=\"emoji\" src=\"https://cdn.discordapp.com/emojis/$1.png\" />");
+
             return content;
         }
     }