diff --git a/assets/styles/configuration.scss b/assets/styles/configuration.scss
index c310ca63..a3059d7e 100644
--- a/assets/styles/configuration.scss
+++ b/assets/styles/configuration.scss
@@ -298,6 +298,21 @@ livechat-dynamic-table-form {
     text-align: left;
   }
 
+  .dynamic-table-add-row,
+  .dynamic-table-remove-row {
+    // Peertube rounded-line-height-1-5 mixins
+    line-height: $button-calc-line-height;
+
+    // Peertube peertube-button mixin (but with less horizontal padding)
+    padding: 4px;
+    border: 0;
+    font-weight: $font-semibold;
+    border-radius: 3px !important;
+    text-align: center;
+    cursor: pointer;
+    font-size: $button-font-size;
+  }
+
   .dynamic-table-add-row {
     background-color: var(--bs-green);
 
@@ -328,6 +343,30 @@ livechat-dynamic-table-form {
 
   .dynamic-table-remove-row {
     background-color: var(--bs-orange);
+
+    &,
+    &:active,
+    &:focus {
+      color: #fff;
+      background-color: var(--mainColor);
+    }
+
+    &:focus,
+    &.focus-visible {
+      box-shadow: 0 0 0 0.2rem var(--mainHoverColor);
+    }
+
+    &:hover {
+      color: #fff;
+      background-color: var(--mainHoverColor);
+    }
+
+    &[disabled],
+    &.disabled {
+      cursor: default;
+      color: #fff;
+      background-color: var(--inputBorderColor);
+    }
   }
 }
 
diff --git a/client/common/lib/elements/dynamic-table-form.ts b/client/common/lib/elements/dynamic-table-form.ts
index b8d93904..ae7df63e 100644
--- a/client/common/lib/elements/dynamic-table-form.ts
+++ b/client/common/lib/elements/dynamic-table-form.ts
@@ -269,7 +269,7 @@ export class DynamicTableFormElement extends LivechatElement {
               rowData._originalIndex))}
       <td class="form-group">
         <button type="button"
-          class="peertube-button-link orange-button dynamic-table-remove-row"
+          class="dynamic-table-remove-row"
           .title=${ptTr(LOC_ACTION_REMOVE_ENTRY) as any}
           @click=${async () => this._removeRow(rowData._id)}
         >
@@ -288,7 +288,7 @@ export class DynamicTableFormElement extends LivechatElement {
     <tr>
       <td class="dynamic-table-add-row-cell">
         <button type="button"
-          class="peertube-button-link orange-button dynamic-table-add-row"
+          class="dynamic-table-add-row"
           .title=${ptTr(LOC_ACTION_ADD_ENTRY) as any}
           @click=${this._addRow}
         >