diff --git a/changelog.d/modals-mobile.change b/changelog.d/modals-mobile.change
deleted file mode 100644
index e6a768c57..000000000
--- a/changelog.d/modals-mobile.change
+++ /dev/null
@@ -1 +0,0 @@
-modal layout for mobile has new layout to make it easy to use
diff --git a/changelog.d/modals.fix b/changelog.d/modals.fix
deleted file mode 100644
index 68278bfc0..000000000
--- a/changelog.d/modals.fix
+++ /dev/null
@@ -1 +0,0 @@
-fixed modals buttons overflow
diff --git a/src/App.js b/src/App.js
index 3142d0629..befcece80 100644
--- a/src/App.js
+++ b/src/App.js
@@ -47,9 +47,6 @@ export default {
   watch: {
     themeApplied (value) {
       this.removeSplash()
-    },
-    layoutType (value) {
-      document.getElementById('modal').classList = ['-' + this.layoutType]
     }
   },
   created () {
@@ -57,7 +54,6 @@ export default {
     const val = this.$store.getters.mergedConfig.interfaceLanguage
     this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
     window.addEventListener('resize', this.updateMobileState)
-    document.getElementById('modal').classList = ['-' + this.layoutType]
   },
   mounted () {
     if (this.$store.state.interface.themeApplied) {
diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue
index baae36204..93b8ac0fa 100644
--- a/src/components/dialog_modal/dialog_modal.vue
+++ b/src/components/dialog_modal/dialog_modal.vue
@@ -69,41 +69,12 @@
     margin: 0;
     padding: 0.5em;
     border-top: 1px solid var(--border);
-    display: grid;
-    grid-gap: 0.5em;
-    grid-auto-columns: minmax(max-content, 1fr);
-    height: auto;
+    display: flex;
+    justify-content: flex-end;
 
     button {
       width: auto;
-      padding-left: 2em;
-      padding-right: 2em;
-    }
-  }
-}
-
-#modal.-mobile {
-  .dialog-modal.panel {
-    top: auto;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    max-width: none;
-    transform: none;
-    width: 100vw;
-    margin: auto;
-    z-index: 2001;
-
-    .dialog-modal-footer {
-      flex-direction: column;
-      justify-content: flex-end;
-      grid-auto-columns: initial;
-      grid-auto-rows: 1fr;
-
-      button {
-        grid-column: 1;
-        height: 2em;
-      }
+      margin-left: 0.5rem;
     }
   }
 }
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 8f6f1a0d0..9f415f79c 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -140,8 +140,8 @@ const EmojiPicker = {
     },
     updateEmojiSize () {
       const css = window.getComputedStyle(this.$refs.popover.$el)
-      const fontSize = css.getPropertyValue('font-size') || '14px'
-      const emojiSize = css.getPropertyValue('--emojiSize') || '2.2rem'
+      const fontSize = css.getPropertyValue('font-size')
+      const emojiSize = css.getPropertyValue('--emojiSize')
 
       const fontSizeUnit = fontSize.replace(/[0-9,.]+/, '')
       const fontSizeValue = Number(fontSize.replace(/[^0-9,.]+/, ''))
@@ -155,6 +155,8 @@ const EmojiPicker = {
       } else {
         fontSizeMultiplier = fontSizeValue / 14
       }
+      console.log('Multiplier', fontSizeMultiplier)
+      console.log('Result', fontSizeMultiplier * 14)
 
       let emojiSizeReal
       if (emojiSizeUnit.endsWith('em')) {