diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0ed3de261..d6008de0b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -369,7 +369,7 @@ function handleOnDataSaved(_) {
@on-fetch="(...args) => emit('onFetch', ...args)"
:search-url="searchUrl"
:disable-infinite-scroll="
- $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+ $attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
"
@save-changes="reload"
:has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
@@ -507,11 +507,8 @@ function handleOnDataSaved(_) {
:key="index"
:title="btn.title"
:icon="btn.icon"
- class="q-px-sm"
+ class="q-px-sm text-primary-light"
flat
- :class="
- btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
- "
:style="`visibility: ${
(btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
}`"
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 441a8ff48..79a79c383 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -224,13 +224,20 @@ defineExpose({ fetch, addFilter, paginate });
v-bind="$attrs"
>