diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
index 5484aaed28..34015f71ad 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
@@ -469,20 +469,12 @@
           </tb-rate-limits>
         </div>
         <div fxFlex fxLayout="row"  fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
-          <mat-form-field fxFlex class="mat-block">
-            <mat-label translate>tenant-profile.tenant-entity-export-rate-limit</mat-label>
-            <input matInput formControlName="tenantEntityExportRateLimit">
-          </mat-form-field>
-          <mat-form-field fxFlex class="mat-block">
-            <mat-label translate>tenant-profile.tenant-entity-import-rate-limit</mat-label>
-            <input matInput formControlName="tenantEntityImportRateLimit">
-          </mat-form-field>
-          <!--          <tb-rate-limits fxFlex="50" formControlName="tenantEntityExportRateLimit"
-                                    [type]="rateLimitsType.TENANT_ENTITY_EXPORT_RATE_LIMIT">
-                    </tb-rate-limits>
-                    <tb-rate-limits fxFlex="50" formControlName="tenantEntityImportRateLimit"
-                                    [type]="rateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT">
-                    </tb-rate-limits>-->
+          <tb-rate-limits fxFlex="50" formControlName="tenantEntityExportRateLimit"
+                          [type]="rateLimitsType.TENANT_ENTITY_EXPORT_RATE_LIMIT">
+          </tb-rate-limits>
+          <tb-rate-limits fxFlex="50" formControlName="tenantEntityImportRateLimit"
+                          [type]="rateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT">
+          </tb-rate-limits>
         </div>
       </ng-template>
     </mat-expansion-panel>
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
index ac2702ca43..5652f7dd71 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
@@ -71,8 +71,8 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       transportDeviceMsgRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
       transportDeviceTelemetryMsgRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
       transportDeviceTelemetryDataPointsRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
-      tenantEntityExportRateLimit: [null, []],
-      tenantEntityImportRateLimit: [null, []],
+      tenantEntityExportRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
+      tenantEntityImportRateLimit: [null, [Validators.pattern(this.rateLimitsPattern)]],
       maxTransportMessages: [null, [Validators.required, Validators.min(0)]],
       maxTransportDataPoints: [null, [Validators.required, Validators.min(0)]],
       maxREExecutions: [null, [Validators.required, Validators.min(0)]],
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-details-dialog.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-details-dialog.component.html
index 911b44ecd8..751ffe0e2c 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-details-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-details-dialog.component.html
@@ -15,9 +15,9 @@
     limitations under the License.
 
 -->
-<form [formGroup]="editDetailsFormGroup" style="width: 800px;">
+<form [formGroup]="editDetailsFormGroup">
   <mat-toolbar color="primary">
-    <h2 translate>{{ title }}</h2>
+    <h2>{{ title | translate }}</h2>
     <span fxFlex></span>
     <button mat-icon-button
             (click)="cancel()"
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.html
index c0923927d8..7d1f3e4561 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.html
@@ -28,6 +28,9 @@
         <mat-error *ngIf="rateLimit.get('value').hasError('required')">
           {{ 'tenant-profile.rate-limits.number-of-messages-required' | translate }}
         </mat-error>
+        <mat-error *ngIf="rateLimit.get('value').hasError('min')">
+          {{ 'tenant-profile.rate-limits.number-of-messages-min' | translate }}
+        </mat-error>
       </mat-form-field>
       <mat-form-field fxFlex hideRequiredMarker appearance="fill" class="mat-block">
         <mat-label translate>tenant-profile.rate-limits.per-seconds</mat-label>
@@ -36,8 +39,12 @@
         <mat-error *ngIf="rateLimit.get('time').hasError('required')">
           {{ 'tenant-profile.rate-limits.per-seconds-required' | translate }}
         </mat-error>
+        <mat-error *ngIf="rateLimit.get('time').hasError('min')">
+          {{ 'tenant-profile.rate-limits.per-seconds-min' | translate }}
+        </mat-error>
       </mat-form-field>
       <button mat-icon-button type="button" color="primary"
+              class="tb-rate-limits-button"
               *ngIf="!rateLimitsFormArray().disabled"
               (click)="removeRateLimits($index)"
               [matTooltip]="'tenant-profile.rate-limits.remove-limit' | translate" matTooltipPosition="above">
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.scss b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.scss
index 0db3694166..a1222761cd 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.scss
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits-list.component.scss
@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 :host {
-  button {
-    min-width: 40px;
-    mat-icon {
-      margin-top: 0.6em;
-    }
-  }
   .tb-rate-limits-preview {
     margin-top: 1.5em;
     span {
@@ -36,6 +30,9 @@
     color: rgba(0,0,0,.54);
     margin-bottom: 16px;
   }
+  .tb-rate-limits-button {
+    margin-top: 0.5em;
+  }
 }
 
 :host ::ng-deep {
@@ -43,5 +40,8 @@
     .mat-form-field-wrapper {
       padding-bottom: 1em;
     }
+    .mat-form-field-infix {
+      width: 100%;
+    }
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.component.html
index 3f1b698553..2c4b82e4ab 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.component.html
@@ -24,11 +24,10 @@
       <tb-rate-limits-text formControlName="rateLimits"></tb-rate-limits-text>
     </div>
   </fieldset>
-  <div style="padding-top: 12px">
-    <button mat-icon-button color="primary" type="button" *ngIf="!disabled"
-            (click)="onClick($event, 'add')"
-            [matTooltip]="'tenant-profile.rate-limits.add-limit' | translate" matTooltipPosition="above">
-      <mat-icon>add_circle_outline</mat-icon>
-    </button>
-  </div>
+  <button mat-icon-button color="primary" type="button" *ngIf="!disabled"
+          class="tb-rate-limits-button"
+          (click)="onClick($event, 'add')"
+          [matTooltip]="'tenant-profile.rate-limits.add-limit' | translate" matTooltipPosition="above">
+    <mat-icon>add_circle_outline</mat-icon>
+  </button>
 </div>
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.component.scss b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.component.scss
index 6d45b33b73..1d7e817839 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.component.scss
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.component.scss
@@ -28,4 +28,8 @@
       font-size: 12px;
     }
   }
+
+  .tb-rate-limits-button {
+    margin-top: 0.5em;
+  }
 }
diff --git a/ui-ngx/src/app/shared/models/rate-limits.models.ts b/ui-ngx/src/app/shared/models/rate-limits.models.ts
index e6b4218773..ffde8a3c87 100644
--- a/ui-ngx/src/app/shared/models/rate-limits.models.ts
+++ b/ui-ngx/src/app/shared/models/rate-limits.models.ts
@@ -32,6 +32,8 @@ export enum RateLimitsType {
   CUSTOMER_SERVER_REST_LIMITS_CONFIGURATION = 'CUSTOMER_SERVER_REST_LIMITS_CONFIGURATION',
   WS_UPDATE_PER_SESSION_RATE_LIMIT = 'WS_UPDATE_PER_SESSION_RATE_LIMIT',
   CASSANDRA_QUERY_TENANT_RATE_LIMITS_CONFIGURATION = 'CASSANDRA_QUERY_TENANT_RATE_LIMITS_CONFIGURATION',
+  TENANT_ENTITY_EXPORT_RATE_LIMIT = 'TENANT_ENTITY_EXPORT_RATE_LIMIT',
+  TENANT_ENTITY_IMPORT_RATE_LIMIT = 'TENANT_ENTITY_IMPORT_RATE_LIMIT'
 }
 
 export const rateLimitLabelTranslationMap = new Map<RateLimitsType, string>(
@@ -46,6 +48,8 @@ export const rateLimitLabelTranslationMap = new Map<RateLimitsType, string>(
     [RateLimitsType.CUSTOMER_SERVER_REST_LIMITS_CONFIGURATION, 'tenant-profile.customer-rest-limits'],
     [RateLimitsType.WS_UPDATE_PER_SESSION_RATE_LIMIT, 'tenant-profile.ws-limit-updates-per-session'],
     [RateLimitsType.CASSANDRA_QUERY_TENANT_RATE_LIMITS_CONFIGURATION, 'tenant-profile.cassandra-tenant-limits-configuration'],
+    [RateLimitsType.TENANT_ENTITY_EXPORT_RATE_LIMIT, 'tenant-profile.tenant-entity-export-rate-limit'],
+    [RateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT, 'tenant-profile.tenant-entity-import-rate-limit'],
   ]
 );
 
@@ -61,6 +65,8 @@ export const editRateLimitTranslationMap = new Map<RateLimitsType, string>(
     [RateLimitsType.CUSTOMER_SERVER_REST_LIMITS_CONFIGURATION, 'tenant-profile.rate-limits.edit-customer-rest-limits-title'],
     [RateLimitsType.WS_UPDATE_PER_SESSION_RATE_LIMIT, 'tenant-profile.rate-limits.edit-ws-limit-updates-per-session-title'],
     [RateLimitsType.CASSANDRA_QUERY_TENANT_RATE_LIMITS_CONFIGURATION, 'tenant-profile.rate-limits.edit-cassandra-tenant-limits-configuration-title'],
+    [RateLimitsType.TENANT_ENTITY_EXPORT_RATE_LIMIT, 'tenant-profile.rate-limits.edit-tenant-entity-export-rate-limit-title'],
+    [RateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT, 'tenant-profile.rate-limits.edit-tenant-entity-import-rate-limit-title'],
   ]
 );
 
@@ -76,6 +82,8 @@ export const addRateLimitTranslationMap = new Map<RateLimitsType, string>(
     [RateLimitsType.CUSTOMER_SERVER_REST_LIMITS_CONFIGURATION, 'tenant-profile.rate-limits.add-customer-rest-limits-title'],
     [RateLimitsType.WS_UPDATE_PER_SESSION_RATE_LIMIT, 'tenant-profile.rate-limits.add-ws-limit-updates-per-session-title'],
     [RateLimitsType.CASSANDRA_QUERY_TENANT_RATE_LIMITS_CONFIGURATION, 'tenant-profile.rate-limits.add-cassandra-tenant-limits-configuration-title'],
+    [RateLimitsType.TENANT_ENTITY_EXPORT_RATE_LIMIT, 'tenant-profile.rate-limits.add-tenant-entity-export-rate-limit-title'],
+    [RateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT, 'tenant-profile.rate-limits.add-tenant-entity-import-rate-limit-title'],
   ]
 );
 
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 8cd65a139e..371ade779c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -3200,6 +3200,8 @@
             "add-customer-rest-limits-title": "Add REST requests for customer rate limits",
             "add-ws-limit-updates-per-session-title": "Add WS updates per session rate limits",
             "add-cassandra-tenant-limits-configuration-title": "Add Cassandra query for tenant rate limits",
+            "add-tenant-entity-export-rate-limit-title": "Add entity version creation rate limits",
+            "add-tenant-entity-import-rate-limit-title": "Add entity version load rate limits",
             "advanced-settings": "Advanced settings",
             "edit-limit": "Edit limit",
             "but-less-than": "but less than",
@@ -3213,13 +3215,17 @@
             "edit-customer-rest-limits-title": "Edit REST requests for customer rate limits",
             "edit-ws-limit-updates-per-session-title": "Edit WS updates per session rate limits",
             "edit-cassandra-tenant-limits-configuration-title": "Edit Cassandra query for tenant rate limits",
+            "edit-tenant-entity-export-rate-limit-title": "Edit entity version creation rate limits",
+            "edit-tenant-entity-import-rate-limit-title": "Edit entity version load rate limits",
             "messages-per": "messages per",
             "not-set": "Not set",
             "number-of-messages": "Number of messages",
             "number-of-messages-required": "Number of messages is required.",
+            "number-of-messages-min": "Minimum value is 1.",
             "preview": "Preview",
             "per-seconds": "Per seconds",
             "per-seconds-required": "Time rate is required.",
+            "per-seconds-min": "Minimum value is 1.",
             "rate-limits": "Rate limits",
             "remove-limit": "Remove limit",
             "transport-tenant-msg": "Transport tenant messages",