6 files changed, 14 insertions, 41 deletions

diff --git a/client/e2e/src/po/video-upload.po.ts b/client/e2e/src/po/video-upload.po.ts
index 7de715a95..942025b6b 100644
--- a/client/e2e/src/po/video-upload.po.ts
+++ b/client/e2e/src/po/video-upload.po.ts
@@ -40,6 +40,6 @@ export class VideoUploadPage {
   }
 
   private getSecondStepSubmitButton () {
-    return element(by.css('.submit-button:not(.disabled)'))
+    return element(by.css('.submit-container my-button'))
   }
 }
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
index c2fbb46f9..0b70b0270 100644
--- a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
@@ -126,24 +126,6 @@ my-peertube-checkbox {
     color: pvar(--greyForegroundColor);
     font-size: 15px;
   }
-
-  .submit-button {
-    @include peertube-button;
-    @include orange-button;
-    @include button-with-icon(20px, 1px);
-
-    display: inline-block;
-
-    input {
-      cursor: inherit;
-      background-color: inherit;
-      border: none;
-      padding: 0;
-      outline: 0;
-      color: inherit;
-      font-weight: $font-semibold;
-    }
-  }
 }
 
 p-calendar {
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html
index 136048455..17c37d42b 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html
@@ -42,12 +42,9 @@
   ></my-video-edit>
 
   <div class="submit-container">
-    <div class="submit-button"
-       (click)="updateSecondStep()"
-       [ngClass]="{ disabled: !form.valid }"
-    >
-      <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
-      <input type="button" i18n-value value="Update" />
-    </div>
+    <my-button className="orange-button" i18n-label label="Update" icon="circle-tick"
+      (click)="updateSecondStep()"
+      [disabled]="!form.valid"
+    ></my-button>
   </div>
 </form>
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
index 211acc6f6..20a7538db 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
@@ -65,12 +65,9 @@
   ></my-video-edit>
 
   <div class="submit-container">
-    <div class="submit-button"
-       (click)="updateSecondStep()"
-       [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }"
-    >
-      <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
-      <input type="button" i18n-value value="Update" />
-    </div>
+    <my-button className="orange-button" i18n-label label="Update" icon="circle-tick"
+      (click)="updateSecondStep()"
+      [disabled]="!form.valid || isUpdatingVideo === true"
+    ></my-button>
   </div>
 </form>
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
index 3e4eb5fbc..93d3c6b5f 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
@@ -58,12 +58,9 @@
   ></my-video-edit>
 
   <div class="submit-container">
-    <div class="submit-button"
-       (click)="updateSecondStep()"
-       [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }"
-    >
-      <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
-      <input type="button" i18n-value value="Update" />
-    </div>
+    <my-button className="orange-button" i18n-label label="Update" icon="circle-tick"
+      (click)="updateSecondStep()"
+      [disabled]="!form.valid || isUpdatingVideo === true"
+    ></my-button>
   </div>
 </form>
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
index 51e16150e..deea3daf9 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
@@ -91,7 +91,7 @@
   <div class="submit-container">
     <div i18n *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div>
 
-    <my-button className="submit-button orange-button" i18n-label label="Publish" icon="circle-tick"
+    <my-button className="orange-button" i18n-label label="Publish" icon="circle-tick"
                (click)="updateSecondStep()" (keydown.enter)="updateSecondStep()"
                [disabled]="isPublishingButtonDisabled()"
     ></my-button>