diff --git a/services/web/frontend/js/features/source-editor/components/figure-modal/file-relocator.tsx b/services/web/frontend/js/features/source-editor/components/figure-modal/file-relocator.tsx
index 762ea5e4a3..49b1205f00 100644
--- a/services/web/frontend/js/features/source-editor/components/figure-modal/file-relocator.tsx
+++ b/services/web/frontend/js/features/source-editor/components/figure-modal/file-relocator.tsx
@@ -49,7 +49,10 @@ export const FileRelocator = ({
 
   return (
     <>
-      <label htmlFor="figure-modal-relocated-file-name">
+      <label
+        htmlFor="figure-modal-relocated-file-name"
+        className="figure-modal-input-label"
+      >
         {t('file_name_in_this_project_figure_modal')}
       </label>
       <FileNameInput
diff --git a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-other-project-source.tsx b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-other-project-source.tsx
index f6d846e300..1ada346b1e 100644
--- a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-other-project-source.tsx
+++ b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-other-project-source.tsx
@@ -161,7 +161,7 @@ export const FigureModalOtherProjectSource: FC = () => {
       <div>
         or{' '}
         <Button
-          className="px-0"
+          className="p-0"
           bsStyle="link"
           type="button"
           onClick={() => setUsingOutputFiles(value => !value)}
diff --git a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-url-source.tsx b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-url-source.tsx
index c222e2551e..c6aa8cbe44 100644
--- a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-url-source.tsx
+++ b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-url-source.tsx
@@ -72,7 +72,12 @@ export const FigureModalUrlSource: FC = () => {
 
   return (
     <>
-      <label htmlFor="figure-modal-url-url">{t('image_url')}</label>
+      <label
+        htmlFor="figure-modal-url-url"
+        className="figure-modal-input-label"
+      >
+        {t('image_url')}
+      </label>
       <input
         id="figure-modal-url-url"
         type="text"
diff --git a/services/web/frontend/stylesheets/app/editor/figure-modal.less b/services/web/frontend/stylesheets/app/editor/figure-modal.less
index 648597aad7..a6b0514fea 100644
--- a/services/web/frontend/stylesheets/app/editor/figure-modal.less
+++ b/services/web/frontend/stylesheets/app/editor/figure-modal.less
@@ -98,10 +98,6 @@
   cursor: pointer;
 }
 
-.figure-modal-upload {
-  margin-bottom: 16px;
-}
-
 .figure-modal-source-button-row {
   display: flex;
   justify-content: space-between;
@@ -143,3 +139,8 @@
     margin-right: 6px;
   }
 }
+
+.figure-modal-input-label:not(:first-child),
+.figure-modal .select-wrapper:not(:first-child) {
+  margin-top: 16px;
+}