diff --git a/ui/component/publishFile/view.jsx b/ui/component/publishFile/view.jsx
index 001479b04..fbb35cbcf 100644
--- a/ui/component/publishFile/view.jsx
+++ b/ui/component/publishFile/view.jsx
@@ -36,6 +36,7 @@ type Props = {
   setPublishMode: string => void,
   setPrevFileText: string => void,
   setAutoPopulateName: boolean => void,
+  header: any,
 };
 
 function PublishFile(props: Props) {
@@ -62,6 +63,7 @@ function PublishFile(props: Props) {
     setPrevFileText,
     autoPopulateName,
     setAutoPopulateName,
+    header,
   } = props;
 
   const ffmpegAvail = ffmpegStatus.available;
@@ -324,28 +326,17 @@ function PublishFile(props: Props) {
     updatePublishForm(publishFormParams);
   }
 
-  let cardTitle;
-  if (publishing) {
-    cardTitle = (
-      <span>
-        {__('Uploading')}
-        <Spinner type={'small'} />
-      </span>
-    );
-  } else {
-    cardTitle = isStillEditing ? __('Edit') : __('Upload');
-  }
-
   const isPublishFile = mode === PUBLISH_MODES.FILE;
   const isPublishPost = mode === PUBLISH_MODES.POST;
 
   return (
     <Card
-      icon={ICONS.PUBLISH}
+      //   icon={ICONS.PUBLISH}
       disabled={disabled || balance === 0}
       title={
         <React.Fragment>
-          {cardTitle}{' '}
+          {header}
+          {publishing && <Spinner type={'small'} />}
           {inProgress && <Button button="close" label={__('Cancel')} icon={ICONS.REMOVE} onClick={clearPublish} />}
         </React.Fragment>
       }
diff --git a/ui/component/publishForm/view.jsx b/ui/component/publishForm/view.jsx
index 928f4b4ba..c1b82a9eb 100644
--- a/ui/component/publishForm/view.jsx
+++ b/ui/component/publishForm/view.jsx
@@ -291,20 +291,6 @@ function PublishForm(props: Props) {
   // Editing claim uri
   return (
     <div className="card-stack">
-      <div className="button-tab-group">
-        {MODES.map((modeName, index) => (
-          <Button
-            key={index}
-            icon={modeName}
-            label={modeName}
-            button="alt"
-            onClick={() => {
-              setMode(modeName);
-            }}
-            className={classnames('button-toggle', { 'button-toggle--active': mode === modeName })}
-          />
-        ))}
-      </div>
       <PublishFile
         uri={uri}
         mode={mode}
@@ -315,6 +301,22 @@ function PublishForm(props: Props) {
         setPrevFileText={setPrevFileText}
         autoPopulateName={autoPopulateNameFromTitle}
         setAutoPopulateName={setAutoPopulateNameFromTitle}
+        header={
+          <div>
+            {MODES.map((modeName, index) => (
+              <Button
+                key={index}
+                icon={modeName}
+                label={modeName}
+                button="alt"
+                onClick={() => {
+                  setMode(modeName);
+                }}
+                className={classnames('button-toggle', { 'button-toggle--active': mode === modeName })}
+              />
+            ))}
+          </div>
+        }
       />
       {!publishing && (
         <div className={classnames({ 'card--disabled': formDisabled })}>