diff --git a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html
index d80892664d..716722d795 100644
--- a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html
@@ -38,7 +38,7 @@
               <mat-expansion-panel class="entity-type-config flex-1" [formGroup]="entityTypeFormGroup" [expanded]="entityTypesFormGroupExpanded(entityTypeFormGroup)">
                 <mat-expansion-panel-header>
                   <div class="flex flex-1 flex-row items-center justify-start">
-                    <mat-panel-title>
+                    <mat-panel-title  class="basis-auto">
                       <div class="flex flex-1 flex-row items-center justify-start">
                         <div [innerHTML]="entityTypeText(entityTypeFormGroup)"></div>
                       </div>
@@ -56,7 +56,7 @@
                 <ng-template matExpansionPanelContent>
                   <div class="entity-type-config-content flex flex-col gap-2">
                     <mat-divider></mat-divider>
-                    <div class="flex flex-col gt-lg:flex-row gt-lg:gap-4">
+                    <div class="flex flex-col gt-xs:flex-row gap-1 gt-xs:gap-4">
                       <div class="flex flex-row gap-4 xs:flex-col xs:gap-0">
                         <tb-entity-type-select
                           showLabel
@@ -73,7 +73,7 @@
                           </tb-branch-autocomplete>
                         </div>
                       </div>
-                      <div class="flex flex-1 flex-row items-center justify-start gap-4 xs:flex-col xs:items-start xs:justify-start xs:gap-0"
+                      <div class="flex flex-1 flex-col gt-xs:flex-row items-start gt-xs:items-center justify-start gap-1 gt-xs:gap-4"
                            formGroupName="config">
                         <mat-checkbox *ngIf="entityTypeFormGroup.get('entityType').value === entityTypes.DEVICE" formControlName="saveCredentials">
                           {{ 'version-control.export-credentials' | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html b/ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html
index e97e02190a..2621979b89 100644
--- a/ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html
@@ -49,6 +49,7 @@
       <mat-hint [innerHTML]="(syncStrategyHints.get(createVersionFormGroup.get('syncStrategy').value) | translate) | safe:'html'"></mat-hint>
     </mat-form-field>
     <tb-entity-types-version-create
+      class="mt-5"
       formControlName="entityTypes">
     </tb-entity-types-version-create>
   </form>
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss
index 0dd9996b6a..24d07b59d5 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss
@@ -233,3 +233,13 @@
     }
   }
 }
+
+:host ::ng-deep .mdc-evolution-chip-set__chips {
+  max-width: 100%;
+}
+
+:host ::ng-deep .mat-mdc-standard-chip .mdc-evolution-chip__cell--primary,
+:host ::ng-deep .mat-mdc-standard-chip .mdc-evolution-chip__action--primary,
+:host ::ng-deep .mat-mdc-standard-chip .mat-mdc-chip-action-label {
+  overflow: hidden;
+}
diff --git a/ui-ngx/src/app/shared/components/file-input.component.html b/ui-ngx/src/app/shared/components/file-input.component.html
index 105257dd24..1f46ea1e34 100644
--- a/ui-ngx/src/app/shared/components/file-input.component.html
+++ b/ui-ngx/src/app/shared/components/file-input.component.html
@@ -39,11 +39,13 @@
            [flow]="flow.flowJs">
         <div class="upload-label">
           <mat-icon class="tb-mat-32 drop-label-icon">cloud_upload</mat-icon>
-          <span class="drop-label-text">{{ dropLabel }}</span>
-          <button type="button" mat-button color="primary" class="browse-file" [class]="uploadButtonClass">
-            <label
-              for="{{inputId}}">{{ uploadButtonText ? uploadButtonText : ((multipleFile ? 'file-input.browse-files' : 'file-input.browse-file') | translate) }}</label>
-          </button>
+          <div>
+            <span class="drop-label-text">{{ dropLabel }}</span>
+            <button type="button" mat-button color="primary" class="browse-file" [class]="uploadButtonClass">
+              <label
+                for="{{inputId}}">{{ uploadButtonText ? uploadButtonText : ((multipleFile ? 'file-input.browse-files' : 'file-input.browse-file') | translate) }}</label>
+            </button>
+          </div>
           <input class="file-input" flowButton #flowInput type="file" [flow]="flow.flowJs"
                  [flowAttributes]="{accept: accept}" id="{{inputId}}">
         </div>