diff --git a/src/components/app/EditPanel.vue b/src/components/app/EditPanel.vue
index 35fa4b1..97f42d7 100644
--- a/src/components/app/EditPanel.vue
+++ b/src/components/app/EditPanel.vue
@@ -78,3 +78,14 @@ export default {
   
 }
 </style>
+
+
+<style>
+.edit-panel img.emoji {
+  object-fit: contain;
+  height: 2em;
+  width: 2em;
+  margin: 1px;
+  vertical-align: -9px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/app/EmojiPanels/emojiPanel.vue b/src/components/app/EmojiPanels/emojiPanel.vue
index da8f1eb..e90e391 100644
--- a/src/components/app/EmojiPanels/emojiPanel.vue
+++ b/src/components/app/EmojiPanels/emojiPanel.vue
@@ -482,7 +482,6 @@ export default {
   margin: 4px;
   padding: 2px;
   border-radius: 5px;
-  height: 30px;
   min-width: 30px;
 }
 .emoji-item:hover {
@@ -572,9 +571,12 @@ export default {
 </style>
 <style>
 img.panel.emoji {
-  margin-left: 3px;
-  margin-top: 3px;
+
   margin: auto;
-  width: auto;
+  padding: 2px;
+  object-fit: contain;
+  height: 2em;
+  width: 2em;
+
 }
 </style>
diff --git a/src/components/app/EmojiPanels/emojiSuggestions.vue b/src/components/app/EmojiPanels/emojiSuggestions.vue
index 072495c..9f974c5 100644
--- a/src/components/app/EmojiPanels/emojiSuggestions.vue
+++ b/src/components/app/EmojiPanels/emojiSuggestions.vue
@@ -14,7 +14,7 @@
         />
         <span v-else>
           <img
-            class="custom-emoji"
+            class="emoji"
             :src="customEmojiPath + emoji.emojiID"
           >
         </span>
@@ -136,3 +136,12 @@ export default {
   }
 }
 </style>
+
+<style>
+.emoji-suggetions-list img.emoji {
+  object-fit: contain;
+  height: 2em;
+  width: 2em;
+  margin: 1px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue
index 1644f51..fa9b875 100644
--- a/src/components/app/MessageTemplate.vue
+++ b/src/components/app/MessageTemplate.vue
@@ -522,9 +522,11 @@ pre {
   overflow-wrap: anywhere;
 }
 
-img.emoji {
-  height: 1.7em;
-  width: auto;
-  margin: 0 0.05em 0 0.1em;
+.content-message img.emoji {
+  object-fit: contain;
+  height: 2em;
+  width: 2em;
+  margin: 1px;
+  vertical-align: -9px;
 }
 </style>