diff --git a/packages/ui-components/src/lib/components/ButtonsPagination.svelte b/packages/ui-components/src/lib/components/ButtonsPagination.svelte
deleted file mode 100644
index 19e213016..000000000
--- a/packages/ui-components/src/lib/components/ButtonsPagination.svelte
+++ /dev/null
@@ -1,39 +0,0 @@
-<script lang="ts">
-	import { ArrowLeftOutline, ArrowRightOutline } from 'flowbite-svelte-icons';
-	import { createEventDispatcher } from 'svelte';
-	import { Button, Spinner } from 'flowbite-svelte';
-
-	const dispatch = createEventDispatcher();
-
-	export let index: number = 1;
-	export let loading = false;
-</script>
-
-<div class="flex items-center">
-	{#if loading}
-		<Spinner class="mr-4 h-5 w-5" color="white" />
-	{/if}
-	<Button
-		class="border-1 rounded-none rounded-l-lg"
-		disabled={loading || index == 1}
-		on:click={() => dispatch('previous')}
-		color="light"
-	>
-		<ArrowLeftOutline class="me-2 h-3.5 w-3.5" />
-		Previous
-	</Button>
-	<div
-		class="justify-center border border-gray-300 bg-white px-5 py-2.5 text-center text-sm font-medium dark:border-gray-600 dark:bg-gray-800 dark:text-white"
-	>
-		{index}
-	</div>
-	<Button
-		class="border-1 rounded-none rounded-r-lg"
-		disabled={loading}
-		on:click={() => dispatch('next')}
-		color="light"
-	>
-		Next
-		<ArrowRightOutline class="ms-2 h-3.5 w-3.5" />
-	</Button>
-</div>
diff --git a/packages/ui-components/src/lib/index.ts b/packages/ui-components/src/lib/index.ts
index 7c92dc972..7278e5b90 100644
--- a/packages/ui-components/src/lib/index.ts
+++ b/packages/ui-components/src/lib/index.ts
@@ -34,7 +34,6 @@ export { default as Heading } from './components/Heading.svelte';
 export { default as Text } from './components/Text.svelte';
 export { default as DropdownProperty } from './components/DropdownProperty.svelte';
 export { default as IconError } from './components/IconError.svelte';
-export { default as ButtonsPagination } from './components/ButtonsPagination.svelte';
 
 //Types
 export type { AppStoresInterface } from './types/appStores.ts';
diff --git a/tauri-app/src/lib/components/AppTable.svelte b/tauri-app/src/lib/components/AppTable.svelte
deleted file mode 100644
index 744cfd805..000000000
--- a/tauri-app/src/lib/components/AppTable.svelte
+++ /dev/null
@@ -1,66 +0,0 @@
-<script lang="ts" generics="T">
-  import { Spinner, Table, TableBody, TableBodyRow, TableHead } from 'flowbite-svelte';
-  import { FileCsvOutline } from 'flowbite-svelte-icons';
-  import { ButtonsPagination } from '@rainlanguage/ui-components';
-  import type { ListStore } from '$lib/storesGeneric/listStore';
-  import ButtonLoading from './ButtonLoading.svelte';
-  import { createEventDispatcher } from 'svelte';
-
-  const dispatch = createEventDispatcher();
-
-  // eslint-disable-next-line no-undef
-  export let listStore: ListStore<T>;
-  export let emptyMessage: string = 'None found';
-  export let rowHoverable = true;
-  export let enableCsvExport = true;
-
-  listStore.fetchFirst();
-</script>
-
-{#if $listStore.isFetchingFirst}
-  <div class="flex h-16 w-full items-center justify-center">
-    <Spinner class="h-8 w-8" color="white" />
-  </div>
-{:else if $listStore.currentPage.length === 0}
-  <div class="text-center text-gray-900 dark:text-white">{emptyMessage}</div>
-{:else}
-  <Table
-    divClass="cursor-pointer rounded-lg overflow-hidden dark:border-none border"
-    hoverable={rowHoverable}
-  >
-    <TableHead>
-      <slot name="head" {listStore} />
-    </TableHead>
-    <TableBody>
-      {#each $listStore.currentPage as item}
-        <TableBodyRow
-          on:click={() => {
-            dispatch('clickRow', { item });
-          }}
-        >
-          <slot name="bodyRow" {item} />
-        </TableBodyRow>
-      {/each}
-    </TableBody>
-  </Table>
-
-  {#if enableCsvExport}
-    <div class="mt-2 flex justify-between">
-      <ButtonLoading
-        size="xs"
-        color="light"
-        on:click={() => listStore.exportCsv()}
-        loading={$listStore.isExporting}
-      >
-        <FileCsvOutline class="mr-2 h-4 w-4" />
-        Export to CSV
-      </ButtonLoading>
-      <ButtonsPagination
-        index={$listStore.index + 1}
-        on:previous={listStore.fetchPrev}
-        on:next={listStore.fetchNext}
-        loading={$listStore.isFetching}
-      />
-    </div>
-  {/if}
-{/if}
diff --git a/tauri-app/src/lib/components/TradesTable.svelte b/tauri-app/src/lib/components/TradesTable.svelte
deleted file mode 100644
index bbb52ffa6..000000000
--- a/tauri-app/src/lib/components/TradesTable.svelte
+++ /dev/null
@@ -1,67 +0,0 @@
-<script lang="ts">
-  import { TableBodyCell, TableHeadCell } from 'flowbite-svelte';
-  import { formatTimestampSecondsAsLocal } from '@rainlanguage/ui-components';
-  import { Hash, HashType } from '@rainlanguage/ui-components';
-
-  import AppTable from '$lib/components/AppTable.svelte';
-  import type { ListStore } from '$lib/storesGeneric/listStore';
-  import type { Trade } from '$lib/typeshare/subgraphTypes';
-  import { formatUnits } from 'viem';
-
-  export let orderTradesList: ListStore<Trade>;
-</script>
-
-<AppTable listStore={orderTradesList} emptyMessage="No trades found" rowHoverable={false}>
-  <svelte:fragment slot="head">
-    <TableHeadCell padding="p-4">Date</TableHeadCell>
-    <TableHeadCell padding="p-0">Sender</TableHeadCell>
-    <TableHeadCell padding="p-0">Transaction Hash</TableHeadCell>
-    <TableHeadCell padding="p-0">Input</TableHeadCell>
-    <TableHeadCell padding="p-0">Output</TableHeadCell>
-    <TableHeadCell padding="p-0">IO Ratio</TableHeadCell>
-  </svelte:fragment>
-
-  <svelte:fragment slot="bodyRow" let:item>
-    <TableBodyCell tdClass="px-4 py-2">
-      {formatTimestampSecondsAsLocal(BigInt(item.timestamp))}
-    </TableBodyCell>
-    <TableBodyCell tdClass="break-all py-2 min-w-32">
-      <Hash type={HashType.Wallet} value={item.tradeEvent.transaction.from} />
-    </TableBodyCell>
-    <TableBodyCell tdClass="break-all py-2 min-w-32">
-      <Hash type={HashType.Transaction} value={item.tradeEvent.transaction.id} />
-    </TableBodyCell>
-    <TableBodyCell tdClass="break-all py-2">
-      {formatUnits(
-        BigInt(item.inputVaultBalanceChange.amount),
-        Number(item.inputVaultBalanceChange.vault.token.decimals ?? 0),
-      )}
-      {item.inputVaultBalanceChange.vault.token.symbol}
-    </TableBodyCell>
-    <TableBodyCell tdClass="break-all py-2">
-      {formatUnits(
-        BigInt(item.outputVaultBalanceChange.amount),
-        Number(item.outputVaultBalanceChange.vault.token.decimals ?? 0),
-      )}
-      {item.outputVaultBalanceChange.vault.token.symbol}
-    </TableBodyCell>
-    <TableBodyCell tdClass="break-all py-2" data-testid="io-ratio">
-      {Math.abs(
-        Number(
-          formatUnits(
-            BigInt(item.inputVaultBalanceChange.amount),
-            Number(item.inputVaultBalanceChange.vault.token.decimals ?? 0),
-          ),
-        ) /
-          Number(
-            formatUnits(
-              BigInt(item.outputVaultBalanceChange.amount),
-              Number(item.outputVaultBalanceChange.vault.token.decimals ?? 0),
-            ),
-          ),
-      )}
-      {item.inputVaultBalanceChange.vault.token.symbol}/{item.outputVaultBalanceChange.vault.token
-        .symbol}
-    </TableBodyCell>
-  </svelte:fragment>
-</AppTable>