diff --git a/src/app/features/admin/license/components/presentationals/admin-license-form/admin-license-form.presentational.html b/src/app/features/admin/license/components/presentationals/admin-license-form/admin-license-form.presentational.html
index 099117bd76a0b5cf45104331a42c2d4f6f24f3f8..e95cdd698113c207b88467f4daba296f591b0733 100644
--- a/src/app/features/admin/license/components/presentationals/admin-license-form/admin-license-form.presentational.html
+++ b/src/app/features/admin/license/components/presentationals/admin-license-form/admin-license-form.presentational.html
@@ -83,9 +83,11 @@
       <mat-error #errors></mat-error>
     </mat-form-field>
 
-    <mat-checkbox [formControlName]="formDefinition.isGeneric"
-                  color="primary"
-    >{{labelTranslateEnum.isGeneric | translate }}</mat-checkbox>
+    <div class="checkbox-wrapper is-generic">
+      <mat-checkbox [formControlName]="formDefinition.isGeneric"
+                    color="primary"
+      >{{labelTranslateEnum.isGeneric | translate }}</mat-checkbox>
+    </div>
 
     <mat-form-field *ngIf="getFormControl(formDefinition.family) as fd"
                     [appearance]="appearanceInputMaterial"
@@ -121,17 +123,19 @@
       <mat-error #errors></mat-error>
     </mat-form-field>
 
-    <mat-checkbox [formControlName]="formDefinition.domainContent"
-                  color="primary"
-    >{{labelTranslateEnum.domainContent | translate }}</mat-checkbox>
+    <div class="checkbox-wrapper">
+      <mat-checkbox [formControlName]="formDefinition.domainContent"
+                    color="primary"
+      >{{labelTranslateEnum.domainContent | translate }}</mat-checkbox>
 
-    <mat-checkbox [formControlName]="formDefinition.domainData"
-                  color="primary"
-    >{{labelTranslateEnum.domainData | translate }}</mat-checkbox>
+      <mat-checkbox [formControlName]="formDefinition.domainData"
+                    color="primary"
+      >{{labelTranslateEnum.domainData | translate }}</mat-checkbox>
 
-    <mat-checkbox [formControlName]="formDefinition.domainSoftware"
-                  color="primary"
-    >{{labelTranslateEnum.domainSoftware | translate }}</mat-checkbox>
+      <mat-checkbox [formControlName]="formDefinition.domainSoftware"
+                    color="primary"
+      >{{labelTranslateEnum.domainSoftware | translate }}</mat-checkbox>
+    </div>
 
   </ng-template>
 
diff --git a/src/app/features/admin/license/components/presentationals/admin-license-form/admin-license-form.presentational.scss b/src/app/features/admin/license/components/presentationals/admin-license-form/admin-license-form.presentational.scss
index 6c8812f066f5ca5ad1ba1f9c83d14b0e4b2b9709..8f4b0c32fa34c9905f1d8af0f6fc61a41e33dd7b 100644
--- a/src/app/features/admin/license/components/presentationals/admin-license-form/admin-license-form.presentational.scss
+++ b/src/app/features/admin/license/components/presentationals/admin-license-form/admin-license-form.presentational.scss
@@ -1 +1,15 @@
 @import "~solidify-frontend/lib/components/presentationals/abstract-form/abstract-form.presentational.scss";
+
+:host {
+  .checkbox-wrapper {
+    display: grid;
+
+    @include respond-to-smaller-than-breakpoint('sm') {
+      grid-gap: 10px;
+    }
+  }
+
+  .is-generic {
+    margin-bottom: 20px;
+  }
+}