diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts
index 2e010417ce..55b7b187d1 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts
@@ -5,7 +5,7 @@ export * from './confirmation/confirmation.component';
 export * from './loading/loading.component';
 export * from './loader-bar/loader-bar.component';
 export * from './modal/modal.component';
-export * from './paginator/paginator.component';
+export * from './pagination/pagination.component';
 export * from './sort-order-icon/sort-order-icon.component';
 export * from './table-empty-message/table-empty-message.component';
 export * from './table/table.component';
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/paginator/paginator.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/pagination/pagination.component.html
similarity index 100%
rename from npm/ng-packs/packages/theme-shared/src/lib/components/paginator/paginator.component.html
rename to npm/ng-packs/packages/theme-shared/src/lib/components/pagination/pagination.component.html
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/paginator/paginator.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/pagination/pagination.component.ts
similarity index 85%
rename from npm/ng-packs/packages/theme-shared/src/lib/components/paginator/paginator.component.ts
rename to npm/ng-packs/packages/theme-shared/src/lib/components/pagination/pagination.component.ts
index 2f3d763a28..69fcdf31ff 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/paginator/paginator.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/pagination/pagination.component.ts
@@ -1,18 +1,16 @@
 import { Component, Input, OnInit, Output, EventEmitter, TrackByFunction } from '@angular/core';
 
 @Component({
-  selector: 'abp-paginator',
-  templateUrl: 'paginator.component.html',
+  selector: 'abp-pagination',
+  templateUrl: 'pagination.component.html',
 })
-export class PaginatorComponent implements OnInit {
+export class PaginationComponent implements OnInit {
   private _value = 1;
   @Input()
   get value(): number {
     return this._value;
   }
   set value(newValue: number) {
-    if (newValue < 1 || newValue > this.totalPages || newValue === this._value) return;
-
     this._value = newValue;
     this.valueChange.emit(newValue);
   }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.html
index aa6a5519be..05396cf320 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.html
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.html
@@ -3,11 +3,11 @@
     <ng-container
       *ngTemplateOutlet="scrollable ? scrollableTemplate : defaultTemplate"
     ></ng-container>
-    <abp-paginator
+    <abp-pagination
       *ngIf="rows"
       [totalPages]="totalPages"
       (valueChange)="page = $event; pageChange.emit($event)"
-    ></abp-paginator>
+    ></abp-pagination>
   </div>
 </div>
 
@@ -57,15 +57,14 @@
 
 <ng-template #body>
   <tbody class="ui-table-tbody">
-    <ng-container
-      *ngTemplateOutlet="value && value.length ? container : emptyTemplate"
-    ></ng-container>
-    <ng-template
-      #container
-      *ngFor="let val of slicedValue; trackBy: trackByFn"
-      [ngTemplateOutlet]="bodyTemplate"
-      [ngTemplateOutletContext]="{ $implicit: val }"
-    ></ng-template>
+    <ng-container *ngIf="value && value.length; else emptyTemplate">
+      <ng-template
+        #bodyTemplateWrapper
+        *ngFor="let val of slicedValue; trackBy: trackByFn"
+        [ngTemplateOutlet]="bodyTemplate"
+        [ngTemplateOutletContext]="{ $implicit: val }"
+      ></ng-template>
+    </ng-container>
   </tbody>
 </ng-template>
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts
index 12084c9ae1..48cddbd1f4 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts
@@ -64,7 +64,7 @@ export class TableComponent implements AfterViewInit {
 
   bodyScrollLeft = 0;
 
-  colspan = 1;
+  colspan = 0;
 
   trackByFn: TrackByFunction<any> = (_, value) => {
     return typeof value === 'object' ? value[this.trackingProp] || value : value;
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
index 6132f01a25..c67f553d37 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
@@ -23,7 +23,7 @@ import { RootParams } from './models/common';
 import { httpErrorConfigFactory, HTTP_ERROR_CONFIG } from './tokens/http-error.token';
 import { DateParserFormatter } from './utils/date-parser-formatter';
 import { chartJsLoaded$ } from './utils/widget-utils';
-import { PaginatorComponent } from './components/paginator/paginator.component';
+import { PaginationComponent } from './components/pagination/pagination.component';
 import { LoadingComponent } from './components/loading/loading.component';
 import { LoadingDirective } from './directives/loading.directive';
 
@@ -49,7 +49,7 @@ export function appendScript(injector: Injector) {
     LoaderBarComponent,
     LoadingComponent,
     ModalComponent,
-    PaginatorComponent,
+    PaginationComponent,
     TableComponent,
     TableEmptyMessageComponent,
     ToastComponent,
@@ -65,7 +65,7 @@ export function appendScript(injector: Injector) {
     LoaderBarComponent,
     LoadingComponent,
     ModalComponent,
-    PaginatorComponent,
+    PaginationComponent,
     TableComponent,
     TableEmptyMessageComponent,
     ToastComponent,