diff --git a/src/app/components/RoomForm.svelte b/src/app/components/RoomForm.svelte
index 0f855bd9..358d5ffc 100644
--- a/src/app/components/RoomForm.svelte
+++ b/src/app/components/RoomForm.svelte
@@ -125,13 +125,11 @@
             <span class="text-sm opacity-75">No icon selected</span>
           {/if}
           <div class="flex gap-2">
-            <IconPickerButton onSelect={handleIconSelect} class="btn btn-primary btn-xs">
+            <IconPickerButton onSelect={handleIconSelect} class="btn btn-primary btn-sm">
               <Icon icon={StickerSmileSquare} size={4} />
-              <span class="hidden sm:inline">Select</span>
             </IconPickerButton>
-            <label class="btn btn-neutral btn-xs cursor-pointer">
+            <label class="btn btn-neutral btn-sm cursor-pointer">
               <Icon icon={UploadMinimalistic} size={4} />
-              <span class="hidden sm:inline">Upload</span>
               <input type="file" accept="image/*" class="hidden" onchange={handleImageUpload} />
             </label>
           </div>
diff --git a/src/app/components/SpaceEdit.svelte b/src/app/components/SpaceEdit.svelte
index 28797345..5c993281 100644
--- a/src/app/components/SpaceEdit.svelte
+++ b/src/app/components/SpaceEdit.svelte
@@ -134,27 +134,23 @@
         <p>Icon</p>
       {/snippet}
       {#snippet input()}
-        <div class="flex items-center justify-between">
-          <div class="flex items-center gap-4">
-            {#if imagePreview}
-              <div class="flex items-center gap-2">
-                <span class="text-sm opacity-75">Selected:</span>
-                <ImageIcon src={imagePreview} alt="" />
-              </div>
-            {:else}
-              <span class="text-sm opacity-75">No icon selected</span>
-            {/if}
-            <div class="flex gap-2">
-              <IconPickerButton onSelect={handleIconSelect} class="btn btn-primary btn-xs">
-                <Icon icon={StickerSmileSquare} size={4} />
-                Select
-              </IconPickerButton>
-              <label class="btn btn-neutral btn-xs cursor-pointer">
-                <Icon icon={UploadMinimalistic} size={4} />
-                Upload
-                <input type="file" accept="image/*" class="hidden" onchange={handleImageUpload} />
-              </label>
+        <div class="flex items-center gap-4 justify-between flex-grow">
+          {#if imagePreview}
+            <div class="flex items-center gap-2">
+              <span class="text-sm opacity-75">Selected:</span>
+              <ImageIcon src={imagePreview} alt="" />
             </div>
+          {:else}
+            <span class="text-sm opacity-75">No icon selected</span>
+          {/if}
+          <div class="flex gap-2">
+            <IconPickerButton onSelect={handleIconSelect} class="btn btn-primary btn-sm">
+              <Icon icon={StickerSmileSquare} size={4} />
+            </IconPickerButton>
+            <label class="btn btn-neutral btn-sm cursor-pointer">
+              <Icon icon={UploadMinimalistic} size={4} />
+              <input type="file" accept="image/*" class="hidden" onchange={handleImageUpload} />
+            </label>
           </div>
         </div>
       {/snippet}