diff --git a/changelog.d/emoji-copying-post.add b/changelog.d/emoji-copying-post.add
deleted file mode 100644
index f25ce9792..000000000
--- a/changelog.d/emoji-copying-post.add
+++ /dev/null
@@ -1 +0,0 @@
-Allow copying an emoji from a remote post into a local pack
diff --git a/changelog.d/emoji-copying.add b/changelog.d/emoji-copying.add
deleted file mode 100644
index 875e04401..000000000
--- a/changelog.d/emoji-copying.add
+++ /dev/null
@@ -1 +0,0 @@
-Allow copying one emoji from a remote pack into a local pack
diff --git a/changelog.d/emoji-popover.add b/changelog.d/emoji-popover.add
deleted file mode 100644
index f55ad10a3..000000000
--- a/changelog.d/emoji-popover.add
+++ /dev/null
@@ -1 +0,0 @@
-When an emoji is clicked in a post, show a popover with its name and a bigger image. Admins can also copy it to a local pack
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index 00521260f..72660cca0 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -19,7 +19,6 @@
       :title="'@'+(user && user.screen_name_ui)"
       :html="htmlTitle"
       :emoji="user.emoji || []"
-      :is-local="user.is_local"
     />
   </div>
 </template>
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 51b5d4620..c9b557970 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -70,7 +70,6 @@
                 :title="'@'+notification.from_profile.screen_name_ui"
                 :html="notification.from_profile.name_html"
                 :emoji="notification.from_profile.emoji"
-                :is-local="notification.from_profile.is_local"
               />
             </bdi>
             <!-- eslint-enable vue/no-v-html -->
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index cdad60f74..9466603cd 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -2,7 +2,7 @@ import { unescape, flattenDeep } from 'lodash'
 import { getTagName, processTextForEmoji, getAttrs } from 'src/services/html_converter/utility.service.js'
 import { convertHtmlToTree } from 'src/services/html_converter/html_tree_converter.service.js'
 import { convertHtmlToLines } from 'src/services/html_converter/html_line_converter.service.js'
-import StillImageEmojiPopover from 'src/components/still-image/still-image-emoji-popover.vue'
+import StillImage from 'src/components/still-image/still-image.vue'
 import MentionsLine from 'src/components/mentions_line/mentions_line.vue'
 import { MENTIONS_LIMIT } from 'src/components/mentions_line/mentions_line.js'
 import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue'
@@ -86,12 +86,6 @@ export default {
       required: false,
       type: Boolean,
       default: false
-    },
-    // Assume is local to be true if unspecified, so the button isn't show where it probably should not be
-    isLocal: {
-      required: false,
-      type: Boolean,
-      default: true
     }
   },
   // NEVER EVER TOUCH DATA INSIDE RENDER
@@ -168,14 +162,11 @@ export default {
             item,
             this.emoji,
             ({ shortcode, url }) => {
-              return <StillImageEmojiPopover
+              return <StillImage
                 class="emoji img"
                 src={url}
                 title={`:${shortcode}:`}
                 alt={`:${shortcode}:`}
-
-                shortcode={shortcode}
-                isLocal={this.isLocal}
               />
             }
           )]
diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.js b/src/components/settings_modal/admin_tabs/emoji_tab.js
index d8f769e0b..a315756e8 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.js
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.js
@@ -145,9 +145,9 @@ const EmojiTab = {
       })
     },
 
-    updatePackFiles (newFiles, packName) {
-      this.knownPacks[packName].files = newFiles
-      this.sortPackFiles(packName)
+    updatePackFiles (newFiles) {
+      this.pack.files = newFiles
+      this.sortPackFiles(this.packName)
     },
 
     loadPacksPaginated (listFunction) {
diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.vue b/src/components/settings_modal/admin_tabs/emoji_tab.vue
index 9095192fe..333ff8b0e 100644
--- a/src/components/settings_modal/admin_tabs/emoji_tab.vue
+++ b/src/components/settings_modal/admin_tabs/emoji_tab.vue
@@ -387,12 +387,11 @@
               ref="emojiPopovers"
               :key="shortcode"
               placement="top"
-              :title="$t(`admin_dash.emoji.${pack.remote === undefined ? 'editing' : 'copying'}`, [shortcode])"
+              :title="$t('admin_dash.emoji.editing', [shortcode])"
+              :disabled="pack.remote !== undefined"
               :shortcode="shortcode"
               :file="file"
               :pack-name="packName"
-              :remote="pack.remote"
-              :known-local-packs="knownLocalPacks"
               @update-pack-files="updatePackFiles"
               @display-error="displayError"
             >
diff --git a/src/components/settings_modal/helpers/emoji_editing_popover.vue b/src/components/settings_modal/helpers/emoji_editing_popover.vue
index e466822b3..33c52da4d 100644
--- a/src/components/settings_modal/helpers/emoji_editing_popover.vue
+++ b/src/components/settings_modal/helpers/emoji_editing_popover.vue
@@ -7,6 +7,7 @@
     popover-class="emoji-tab-edit-popover popover-default"
     :bound-to="{ x: 'container' }"
     :offset="{ y: 5 }"
+    :disabled="disabled"
     :class="{'emoji-unsaved': isEdited}"
   >
     <template #trigger>
@@ -27,26 +28,17 @@
         class="emoji"
       />
 
-      <div v-if="newUpload" class="emoji-tab-popover-new-upload">
-        <h4>{{ $t('admin_dash.emoji.emoji_source') }}</h4>
-
-        <div class="emoji-tab-popover-input">
-          <input
-            type="file"
-            accept="image/*"
-            class="emoji-tab-popover-file input"
-            @change="uploadFile = $event.target.files"
-          >
-        </div>
-        <div class="emoji-tab-popover-input ">
-          <input
-            v-model="uploadURL"
-            :placeholder="$t('admin_dash.emoji.upload_url')"
-            class="emoji-data-input input"
-          >
-        </div>
+      <div
+        v-if="newUpload"
+        class="emoji-tab-popover-input"
+      >
+        <input
+          type="file"
+          accept="image/*"
+          class="emoji-tab-popover-file input"
+          @change="uploadFile = $event.target.files"
+        >
       </div>
-
       <div>
         <div class="emoji-tab-popover-input">
           <label>
@@ -71,50 +63,16 @@
           </label>
         </div>
 
-        <div
-          v-if="remote !== undefined"
-          class="emoji-tab-popover-input"
-        >
-          <label>
-            {{ $t('admin_dash.emoji.copy_to') }}
-
-            <SelectComponent
-              v-model="copyToPack"
-              class="form-control"
-            >
-              <option
-                value=""
-                disabled
-                hidden
-              >
-                {{ $t('admin_dash.emoji.emoji_pack') }}
-              </option>
-              <option
-                v-for="(pack, listPackName) in knownLocalPacks"
-                :key="listPackName"
-                :label="listPackName"
-              >
-                {{ listPackName }}
-              </option>
-            </SelectComponent>
-          </label>
-        </div>
-
-        <!--
-             For local emojis, disable the button if nothing was edited.
-             For remote emojis, also disable it if a local pack is not selected.
-             Remote emojis are processed by the same function that uploads new ones, as that is effectively what it does
-        -->
         <button
           class="button button-default btn"
           type="button"
-          :disabled="saveButtonDisabled"
-          @click="(newUpload || remote !== undefined) ? uploadEmoji() : saveEditedEmoji()"
+          :disabled="newUpload ? uploadFile.length == 0 : !isEdited"
+          @click="newUpload ? uploadEmoji() : saveEditedEmoji()"
         >
           {{ $t('admin_dash.emoji.save') }}
         </button>
 
-        <template v-if="!newUpload && remote === undefined">
+        <template v-if="!newUpload">
           <button
             class="button button-default btn emoji-tab-popover-button"
             type="button"
@@ -149,16 +107,19 @@
 import Popover from 'components/popover/popover.vue'
 import ConfirmModal from 'components/confirm_modal/confirm_modal.vue'
 import StillImage from 'components/still-image/still-image.vue'
-import SelectComponent from 'components/select/select.vue'
 
 export default {
-  components: { Popover, ConfirmModal, StillImage, SelectComponent },
+  components: { Popover, ConfirmModal, StillImage },
   inject: ['emojiAddr'],
   props: {
     placement: {
       type: String,
       required: true
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
 
     newUpload: Boolean,
 
@@ -179,35 +140,21 @@ export default {
       type: String,
       // Only exists when this is not a new upload
       default: ''
-    },
-
-    // Only exists for emojis from remote packs
-    remote: {
-      type: Object,
-      default: undefined
-    },
-    knownLocalPacks: {
-      type: Object,
-      default: undefined
     }
   },
   emits: ['updatePackFiles', 'displayError'],
   data () {
     return {
       uploadFile: [],
-      uploadURL: '',
       editedShortcode: this.shortcode,
       editedFile: this.file,
-      deleteModalVisible: false,
-      copyToPack: ''
+      deleteModalVisible: false
     }
   },
   computed: {
     emojiPreview () {
       if (this.newUpload && this.uploadFile.length > 0) {
         return URL.createObjectURL(this.uploadFile[0])
-      } else if (this.newUpload && this.uploadURL !== '') {
-        return this.uploadURL
       } else if (!this.newUpload) {
         return this.emojiAddr(this.file)
       }
@@ -216,12 +163,6 @@ export default {
     },
     isEdited () {
       return !this.newUpload && (this.editedShortcode !== this.shortcode || this.editedFile !== this.file)
-    },
-    saveButtonDisabled() {
-      if (this.remote === undefined)
-        return this.newUpload ? (this.uploadURL === "" && this.uploadFile.length == 0) : !this.isEdited
-      else
-        return this.copyToPack === ""
     }
   },
   methods: {
@@ -240,12 +181,9 @@ export default {
       }).then(resp => this.$emit('updatePackFiles', resp))
     },
     uploadEmoji () {
-      let packName = this.remote === undefined ? this.packName : this.copyToPack
       this.$store.state.api.backendInteractor.addNewEmojiFile({
-        packName: packName,
-        file: this.remote === undefined
-            ? (this.uploadURL !== "" ? this.uploadURL : this.uploadFile[0])
-            : this.emojiAddr(this.file),
+        packName: this.packName,
+        file: this.uploadFile[0],
         shortcode: this.editedShortcode,
         filename: this.editedFile
       }).then(resp => resp.json()).then(resp => {
@@ -254,7 +192,7 @@ export default {
           return
         }
 
-        this.$emit('updatePackFiles', resp, packName)
+        this.$emit('updatePackFiles', resp)
         this.$refs.emojiPopover.hidePopover()
 
         this.editedFile = ''
@@ -277,7 +215,7 @@ export default {
           return
         }
 
-        this.$emit('updatePackFiles', resp, this.packName)
+        this.$emit('updatePackFiles', resp)
       })
     }
   }
@@ -290,22 +228,9 @@ export default {
     padding-right: 0.5em;
     padding-bottom: 0.5em;
 
-    .emoji-tab-popover-new-upload {
-      margin-bottom: 2em;
-    }
-
     .emoji {
       width: 2.3em;
       height: 2.3em;
     }
-
-    .Select {
-      display: inline-block;
-    }
-
-    h4 {
-      margin-bottom: 1em;
-      margin-top: 1em;
-    }
   }
 </style>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index fbc455ee6..d0af91aef 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -79,7 +79,6 @@
               <RichContent
                 :html="retweeterHtml"
                 :emoji="retweeterUser.emoji"
-                :is-local="retweeterUser.is_local"
               />
             </router-link>
             <router-link
@@ -140,7 +139,6 @@
                   <RichContent
                     :html="status.user.name"
                     :emoji="status.user.emoji"
-                    :is-local="status.user.is_local"
                   />
                 </h4>
                 <h4
diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js
index 8739fd0d5..e89d1d173 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -18,8 +18,8 @@ library.add(
   faPollH
 )
 
-const StatusBody = {
-  name: 'StatusBody',
+const StatusContent = {
+  name: 'StatusContent',
   props: [
     'compact',
     'collapse', // replaces newlines with spaces
@@ -149,4 +149,4 @@ const StatusBody = {
   }
 }
 
-export default StatusBody
+export default StatusContent
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index ae2bdf206..1035d04c6 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -14,7 +14,6 @@
           :faint="compact"
           :html="status.summary_raw_html"
           :emoji="status.emojis"
-          :is-local="status.isLocal"
         />
         <button
           v-show="longSubject && showingLongSubject"
@@ -45,7 +44,6 @@
           :faint="compact"
           :greentext="mergedConfig.greentext"
           :attentions="status.attentions"
-          :is-local="status.is_local"
           @parse-ready="onParseReady"
         />
         <div
diff --git a/src/components/still-image/still-image-emoji-popover.vue b/src/components/still-image/still-image-emoji-popover.vue
deleted file mode 100644
index 5224168c2..000000000
--- a/src/components/still-image/still-image-emoji-popover.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<template>
-  <Popover
-    ref="emojiPopover"
-    trigger="click"
-    placement="top"
-    :bound-to="{ x: 'container' }"
-    :offset="{ y: 10 }"
-    @show="fetchEmojiPacksIfAdmin"
-  >
-    <template #trigger>
-      <StillImage v-bind="$attrs" />
-    </template>
-    <template #content>
-      <div class="emoji-popover">
-        <h3>{{ $attrs.title }}</h3>
-
-        <div class="emoji-popover-centered">
-          <StillImage
-            class="emoji"
-            v-bind="$attrs"
-          />
-        </div>
-
-        <div v-if="isUserAdmin && !isLocal">
-          <button
-            class="button button-default btn emoji-popover-button"
-            type="button"
-            @click="copyToLocalPack"
-            :disabled="packName == ''"
-          >
-            {{ $t('admin_dash.emoji.copy_to_pack') }}
-          </button>
-
-          <SelectComponent
-            v-model="packName"
-          >
-            <option
-              value=""
-              disabled
-              hidden
-            >
-              {{ $t('admin_dash.emoji.emoji_pack') }}
-            </option>
-            <option
-              v-for="(pack, listPackName) in knownLocalPacks"
-              :key="listPackName"
-              :label="listPackName"
-            >
-              {{ listPackName }}
-            </option>
-          </SelectComponent>
-        </div>
-      </div>
-    </template>
-  </Popover>
-</template>
-
-<script>
-  import { assign } from 'lodash'
-
-  import StillImage from './still-image.vue'
-  import Popover from 'components/popover/popover.vue'
-  import SelectComponent from 'components/select/select.vue'
-  import { useInterfaceStore } from 'src/stores/interface'
-
-  export default {
-    components: { StillImage, Popover, SelectComponent },
-    props: {
-      shortcode: {
-        type: String,
-        required: true
-      },
-      isLocal: {
-        type: Boolean,
-        required: true
-      }
-    },
-    data() {
-      return {
-        knownLocalPacks: { },
-        packName: ""
-      }
-    },
-    computed: {
-      isUserAdmin () {
-        return this.$store.state.users.currentUser.rights.admin
-      }
-    },
-    methods: {
-      displayError (msg) {
-        useInterfaceStore().pushGlobalNotice({
-          messageKey: 'admin_dash.emoji.error',
-          messageArgs: [msg],
-          level: 'error'
-        })
-      },
-      copyToLocalPack() {
-        this.$store.state.api.backendInteractor.addNewEmojiFile({
-          packName: this.packName,
-          file: this.$attrs.src,
-          shortcode: this.$attrs.shortcode,
-          filename: ""
-        }).then(resp => resp.json()).then(resp => {
-          if (resp.error !== undefined) {
-            this.displayError(resp.error)
-            return
-          }
-
-          this.$refs.emojiPopover.hidePopover()
-          this.packName = ''
-        })
-      },
-
-      // Copied from emoji_tab.js
-      loadPacksPaginated (listFunction) {
-        const pageSize = 25
-        const allPacks = {}
-
-        return listFunction({ instance: this.$store.state.instance.server, page: 1, pageSize: 0 })
-          .then(data => data.json())
-          .then(data => {
-            if (data.error !== undefined) { return Promise.reject(data.error) }
-
-            let resultingPromise = Promise.resolve({})
-            for (let i = 0; i < Math.ceil(data.count / pageSize); i++) {
-              resultingPromise = resultingPromise.then(() => listFunction({ instance: this.$store.state.instance.server, page: i, pageSize })
-              ).then(data => data.json()).then(pageData => {
-                if (pageData.error !== undefined) { return Promise.reject(pageData.error) }
-
-                assign(allPacks, pageData.packs)
-              })
-            }
-
-            return resultingPromise
-          })
-          .then(() => allPacks)
-          .catch(data => {
-            this.displayError(data)
-          })
-      },
-      fetchEmojiPacksIfAdmin() {
-        if (!this.isUserAdmin) return
-
-        this.loadPacksPaginated(this.$store.state.api.backendInteractor.listEmojiPacks)
-            .then(allPacks => {
-              this.knownLocalPacks = allPacks
-
-              for (const name of Object.keys(this.knownLocalPacks)) {
-                this.sortPackFiles(name)
-              }
-            })
-      },
-      sortPackFiles (nameOfPack) {
-        // Sort by key
-        const sorted = Object.keys(this.knownLocalPacks[nameOfPack].files).sort().reduce((acc, key) => {
-          if (key.length === 0) return acc
-          acc[key] = this.knownLocalPacks[nameOfPack].files[key]
-          return acc
-        }, {})
-        this.knownLocalPacks[nameOfPack].files = sorted
-      }
-    }
-  }
-</script>
-
-<style>
-  .emoji-popover {
-    margin: 0 0.5em 0.5em;
-    text-align: center;
-
-    .emoji {
-      width: 4.6em;
-      height: 4.6em;
-    }
-
-    .emoji-popover-centered {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .emoji-popover-button {
-      width: 100%;
-      margin-top: 0.5em;
-    }
-
-    .Select {
-      width: 100%;
-    }
-  }
-</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4a3df9472..5363eda98 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1205,8 +1205,6 @@
       "adding_new": "Adding new emoji",
       "shortcode": "Shortcode",
       "filename": "Filename",
-      "emoji_source": "Emoji file source",
-      "upload_url": "Upload from URL",
       "new_shortcode": "Shortcode, leave blank to infer",
       "new_filename": "Filename, leave blank to infer",
       "delete_confirm": "Are you sure you want to delete {0}?",
@@ -1217,9 +1215,6 @@
       "download_as_name_full": "New name, leave blank to reuse",
       "files": "Files",
       "editing": "Editing {0}",
-      "copying": "Copying {0}",
-      "copy_to": "Copy to",
-      "copy_to_pack": "Copy to local pack",
       "delete_title": "Delete?",
       "metadata_changed": "Metadata different from saved",
       "emoji_changed": "Unsaved emoji file changes, check highlighted emoji",
diff --git a/test/unit/specs/components/rich_content.spec.js b/test/unit/specs/components/rich_content.spec.js
index 3234edba0..37d8bcbfa 100644
--- a/test/unit/specs/components/rich_content.spec.js
+++ b/test/unit/specs/components/rich_content.spec.js
@@ -218,7 +218,7 @@ describe('RichContent', () => {
     const html = p('Ebin :DDDD :spurdo:')
     const expected = p(
       'Ebin :DDDD ',
-      '<anonymous-stub shortcode="spurdo" islocal="true" class="emoji img" src="about:blank" title=":spurdo:" alt=":spurdo:"></anonymous-stub>'
+      '<anonymous-stub src="about:blank" alt=":spurdo:" class="emoji img" title=":spurdo:"></anonymous-stub>'
     )
 
     const wrapper = shallowMount(RichContent, {