diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
index b25809ac82..4b7e516db0 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
@@ -80,7 +80,7 @@
                             </mat-chip>
                         </mat-chip-listbox>
                     </ng-container>
-                    <div class="flex">
+                    <div class="tb-form-table-row-cell-buttons flex">
                         <button type="button"
                                 mat-icon-button
                                 #button
@@ -93,8 +93,7 @@
                                   && calculatedFieldType() === CalculatedFieldType.SIMPLE)"
                               matBadgeColor="warn"
                               matBadgeSize="small"
-                              matBadge="!"
-                              class="field-action"
+                              matBadge="*"
                             >
                               edit
                             </mat-icon>
@@ -104,7 +103,7 @@
                                 (click)="onDelete($index)"
                                 [matTooltip]="'action.delete' | translate"
                                 matTooltipPosition="above">
-                            <mat-icon class="field-action">delete</mat-icon>
+                            <mat-icon>delete</mat-icon>
                         </button>
                     </div>
                 </div>
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
index 3a1f1fbe25..188371b0d8 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
@@ -13,6 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+:host {
+  .tb-form-table-row-cell-buttons{
+    --mat-badge-legacy-small-size-container-size: 8px;
+    --mat-badge-small-size-container-overlap-offset: -5px;
+    --mat-badge-small-size-text-size: 0;
+  }
+}
+
 :host ::ng-deep {
   .tb-inline-field {
     a {
@@ -20,9 +28,3 @@
     }
   }
 }
-
-:host {
-  .field-action {
-    color: rgba(0, 0, 0, 0.54);
-  }
-}