diff --git a/external/components b/external/components
index 5e6e4a09..fd7ad8b8 160000
--- a/external/components
+++ b/external/components
@@ -1 +1 @@
-Subproject commit 5e6e4a09c45baf18dcc44925f0113bad1d732e9c
+Subproject commit fd7ad8b8712d24977c1c47dc5705a32487ace0ed
diff --git a/external/lang b/external/lang
index 8ec1e557..429734c3 160000
--- a/external/lang
+++ b/external/lang
@@ -1 +1 @@
-Subproject commit 8ec1e5571e3d29a93500c0199f6823d16056b6f8
+Subproject commit 429734c32b3584dd9c23124bd0682bba31834eb8
diff --git a/src/components/settings/customisation/EmojiUploader.tsx b/src/components/settings/customisation/EmojiUploader.tsx
index 4a1b42c5..108fc27c 100644
--- a/src/components/settings/customisation/EmojiUploader.tsx
+++ b/src/components/settings/customisation/EmojiUploader.tsx
@@ -1,8 +1,9 @@
 import { Server } from "revolt.js";
 
+import { Text } from "preact-i18n";
 import { useState } from "preact/hooks";
 
-import { Form } from "@revoltchat/ui";
+import { Button, Column, Form, FormElement, Row } from "@revoltchat/ui";
 
 import { FileUploader } from "../../../controllers/client/jsx/legacy/FileUploads";
 
@@ -15,7 +16,9 @@ export function EmojiUploader({ server }: Props) {
 
     return (
         <>
-            <h3>Upload Emoji</h3>
+            <h3>
+                <Text id="app.settings.server_pages.emojis.upload" />
+            </h3>
             <Form
                 schema={{
                     name: "text",
@@ -42,11 +45,6 @@ export function EmojiUploader({ server }: Props) {
                         ),
                     },
                 }}
-                submitBtn={{
-                    children: "Save",
-                    palette: "secondary",
-                    disabled: !fileId,
-                }}
                 onSubmit={async ({ name }) => {
                     await server.client.api.put(`/custom/emoji/${fileId}`, {
                         name,
@@ -54,8 +52,20 @@ export function EmojiUploader({ server }: Props) {
                     });
 
                     setFileId("");
-                }}
-            />
+                }}>
+                <Row>
+                    <FormElement id="file" />
+                    <Column>
+                        <FormElement id="name" />
+                        <Button
+                            type="submit"
+                            palette="secondary"
+                            disabled={!fileId}>
+                            <Text id="app.special.modals.actions.save" />
+                        </Button>
+                    </Column>
+                </Row>
+            </Form>
         </>
     );
 }