diff --git a/src/components/AddressField.vue b/src/components/AddressField.vue
index cc066829..bcb728f0 100644
--- a/src/components/AddressField.vue
+++ b/src/components/AddressField.vue
@@ -1,19 +1,15 @@
 <!-- eslint-disable @typescript-eslint/no-explicit-any -->
 <script setup lang="ts">
-import { ref, watch, onMounted } from 'vue';
+import { ref, watch, onMounted, computed } from 'vue';
 
 import { contractManager } from 'src/boot/telosApi';
 import { getIcon } from 'src/lib/token-utils';
 import { toChecksumAddress } from 'src/lib/utils';
 
 import CopyButton from 'components/CopyButton.vue';
+import { useStore } from 'vuex';
 
 const props = defineProps({
-    highlightAddress: {
-        type: String,
-        required: false,
-        default: '',
-    },
     address: {
         type: String,
         required: true,
@@ -38,9 +34,12 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
+    useHighlight: {
+        type: Boolean,
+        default: true,
+    },
 });
 
-const emit = defineEmits(['highlight']);
 
 const displayName = ref('');
 const fullName = ref(toChecksumAddress(props.address));
@@ -60,7 +59,9 @@ const restart = async () => {
     await getDisplay();
 };
 
-
+const $store = useStore();
+const setHighlightAddress = (method: string) => props.useHighlight ? $store.dispatch('general/setHighlightAddress', method) : null;
+const highlightAddress = computed(() => props.useHighlight ? $store.state.general.highlightAddress : '');
 
 watch(() => props.address, async () => {
     restart();
@@ -124,18 +125,14 @@ const loadContract = async () => {
     }
 };
 
-function emitHighlight(val: string) {
-    emit('highlight', val);
-}
-
 </script>
 
 <template>
 <div
     :key="displayName + checksum"
     :class="['c-address-field', props.class]"
-    @mouseover="emitHighlight(checksum)"
-    @mouseleave="emitHighlight('')"
+    @mouseover="setHighlightAddress(checksum)"
+    @mouseleave="setHighlightAddress('')"
 >
     <router-link
         :to="`/address/${checksum}`"
diff --git a/src/components/AddressOverview.vue b/src/components/AddressOverview.vue
index 2276f1cf..9f087b91 100644
--- a/src/components/AddressOverview.vue
+++ b/src/components/AddressOverview.vue
@@ -51,6 +51,11 @@ onBeforeMount(() => {
                     width="18"
                 >
                 {{ getBalanceDisplay(tokenQty) }}
+                <ValueField
+                    :value="tokenQty"
+                    :symbol="'TLOS'"
+                    :decimals="WEI_PRECISION"
+                />
             </div>
         </q-card-section>
         <q-card-section v-if="!loadingComplete" >
diff --git a/src/components/ContractMoreInfo.vue b/src/components/ContractMoreInfo.vue
index c7d1286b..332772b8 100644
--- a/src/components/ContractMoreInfo.vue
+++ b/src/components/ContractMoreInfo.vue
@@ -36,6 +36,7 @@ const props = defineProps({
         <AddressField
             :address="props.address"
             :truncate="18"
+            :useHighlight="false"
         />
         <CopyButton
             :text="props.address"
diff --git a/src/components/InternalTransactionFlatTable.vue b/src/components/InternalTransactionFlatTable.vue
new file mode 100644
index 00000000..e65c8ee0
--- /dev/null
+++ b/src/components/InternalTransactionFlatTable.vue
@@ -0,0 +1,563 @@
+<script>
+import BlockField from 'components/BlockField';
+import DateField from 'components/DateField';
+import TransactionField from 'components/TransactionField';
+import AddressField from 'components/AddressField';
+import InternalTxns from 'components/Transaction/InternalTxns';
+import ValueField from 'components/ValueField.vue';
+import { WEI_PRECISION, formatWei } from 'src/lib/utils';
+import { TRANSFER_SIGNATURES } from 'src/lib/abi/signature/transfer_signatures';
+
+export default {
+    name: 'InternalTransactionFlatTable',
+    components: {
+        TransactionField,
+        AddressField,
+        DateField,
+        BlockField,
+        ValueField,
+        InternalTxns,
+    },
+    props: {
+        page: {
+            type: Number,
+        },
+        pagesize: {
+            type: Number,
+        },
+        title: {
+            type: String,
+            required: true,
+        },
+        filter: {
+            type: Object,
+            default: () => ({}),
+        },
+        initialPageSize: {
+            type: Number,
+            default: 1,
+        },
+        usePagination: {
+            type: Boolean,
+            default: true,
+        },
+    },
+    computed: {
+        address() {
+            return this.filter?.address ?? '';
+        },
+    },
+    data() {
+        const columns = [
+            {
+                name: 'hash',
+                label: '',
+                align: 'left',
+            },
+            {
+                name: 'block',
+                label: '',
+                align: 'left',
+            },
+            {
+                name: 'date',
+                label: '',
+                align: 'left',
+            },
+            {
+                name: 'from',
+                label: '',
+                align: 'left',
+            },
+            {
+                name: 'to',
+                label: '',
+                align: 'left',
+            },
+            {
+                name: 'value',
+                label: '',
+                align: 'right',
+            },
+        ];
+
+        return {
+            rows: [],
+            loadingRows: [],
+            columns,
+            transactions: [],
+            pageSize: this.initialPageSize,
+            loading: false,
+            pagination: {
+                sortBy: 'date',
+                descending: true,
+                page: 1,
+                rowsPerPage: 10,
+                rowsNumber: 0,
+            },
+            page_size_options: [10, 20, 50],
+            showDateAge: true,
+        };
+    },
+    async created() {
+        // initialization of the translated texts
+        this.columns[0].label = this.$t('components.tx_hash');
+        this.columns[1].label = this.$t('components.block');
+        this.columns[2].label = this.$t('components.age');
+        this.columns[3].label = this.$t('pages.from');
+        this.columns[4].label = this.$t('pages.to');
+        this.columns[5].label = this.$t('pages.value');
+        if (!this.usePagination) {
+            this.pagination.rowsPerPage = 25;
+        }
+        this.updateLoadingRows();
+    },
+    watch: {
+        '$route.query.page': {
+            handler(_pag) {
+                let pag = _pag;
+                let page = 1;
+                let size = this.page_size_options[0];
+
+                // we also allow to pass a single number as the page number
+                if (typeof pag === 'number') {
+                    page = pag;
+                } else if (typeof pag === 'string') {
+                    // we also allow to pass a string of two numbers: 'page,rowsPerPage'
+                    const [p, s] = pag.split(',');
+                    page = p;
+                    size = s;
+                }
+
+                this.setPagination(page, size);
+            },
+            immediate: true,
+        },
+    },
+    methods: {
+        updateLoadingRows() {
+            this.loadingRows = [];
+            for (var i = 1; i <= this.pagination.rowsPerPage; i++) {
+                this.loadingRows.push(i);
+            }
+        },
+        popstate(event) {
+            const page = event.state.pagination.page;
+            const size = event.state.pagination.size;
+            this.setPagination(page, size);
+        },
+        setPagination(page, size) {
+            if (page) {
+                this.pagination.page = Number(page);
+            }
+
+            if (this.usePagination) {
+                if (size) {
+                    this.pagination.rowsPerPage = Number(size);
+                }
+            } else {
+                this.pagination.rowsPerPage = 0;
+            }
+
+            this.updateLoadingRows();
+            this.onRequest({
+                pagination: this.pagination,
+            });
+        },
+        async onPaginationChange(props) {
+            const { page, rowsPerPage } = props.pagination;
+
+            // we need to change the URL to keep the pagination state by changing the this.$route.query.page
+            // with a string like 'page,rowsPerPage'
+            this.$router.push({
+                // taking care to preserve the current #hash anchor and the current query parameters
+                hash: window.location.hash,
+                query: {
+                    ...this.$route.query,
+                    page: `${page},${rowsPerPage}`,
+                },
+            });
+        },
+        async onRequest(props) {
+            this.loading = true;
+            // this line cleans the table for a second and the components have to be created again (clean)
+            this.rows = [];
+            const { page, rowsPerPage, sortBy, descending } = props.pagination;
+            const path = this.getPath(props);
+            let result = await this.$indexerApi.get(path);
+            if (!this.pagination.rowsNumber) {
+                this.pagination.rowsNumber = result.data.total_count;
+            }
+            this.pagination.page = page;
+            this.pagination.rowsPerPage = rowsPerPage;
+            this.pagination.sortBy = sortBy;
+            this.pagination.descending = descending;
+            this.transactions = [...result.data.results];
+            let totalTraces = 0;
+            let processedTransactions = 0;
+            for (const transaction of this.transactions) {
+                try {
+                    transaction.transfer = false;
+                    transaction.value = formatWei(transaction.value.toLocaleString(0, { useGrouping: false }), 18);
+                    if (transaction.input === '0x') {
+                        continue;
+                    }
+                    if(!transaction.to) {
+                        continue;
+                    }
+                    const contract = await this.$contractManager.getContract(
+                        transaction.to,
+                    );
+                    if (!contract) {
+                        continue;
+                    }
+                    if (totalTraces >= 25 && !props.usePagination) {
+                        // we already have enough data
+                        break;
+                    }
+                    let traces = await this.$indexerApi.get(
+                        '/transaction/' + transaction.hash + '/internal?limit=1000&sort=ASC&offset=0&includeAbi=1',
+                    );
+                    for(const trace of [...traces.data.results]){
+                        trace.hash = trace.transactionHash;
+                    }
+                    transaction.traces = traces.data?.results;
+                    totalTraces += +transaction.traces?.length;
+                    transaction.contract = contract;
+                    transaction.contractAddress = contract.address;
+                    const parsedTransaction = await this.$contractManager.parseContractTransaction(
+                        transaction,
+                        transaction.input,
+                        contract,
+                    );
+                    transaction.parsedTransaction = parsedTransaction;
+                    // Get ERC20 transfer from main function call
+                    let signature = transaction.input.substring(0, 10);
+                    if (
+                        signature &&
+                        TRANSFER_SIGNATURES.includes(signature) &&
+                        transaction.parsedTransaction.args['amount']
+                    ) {
+                        let decimals = transaction.contract.properties?.decimals;
+                        if(transaction.contract && decimals){
+                            transaction.transfer = {
+                                'value': `${formatWei(transaction.parsedTransaction.args['amount'], decimals)}`,
+                                'symbol': transaction.contract.properties.symbol,
+                            };
+                        }
+                    }
+
+
+                    processedTransactions++;
+                    transaction.traces.forEach((trace) => {
+                        const entry = {
+                            trx: processedTransactions % 2 === 0 ? 'even' : 'odd',
+                            hash: transaction.hash,
+                            blockNumber: transaction.blockNumber,
+                            timestamp: transaction.timestamp,
+                            from: trace.action.from,
+                            to: trace.action.to,
+                            value: trace.action.value,
+                            symbol: 'TLOS',
+                            decimals: WEI_PRECISION,
+                        };
+                        this.rows.push(entry);
+                    });
+
+                    // TODO: if we want to crop in exactly 25 rows, we need to uncomment this
+                    // if (!this.usePagination) {
+                    //     // we make sure there are no more than 25 rows.
+                    //     // If we have more than 25 rows, we discard the rest
+                    //     if (this.rows.length > 25) {
+                    //         this.rows = this.rows.slice(0, 25);
+                    //     }
+                    // }
+
+                } catch (e) {
+                    console.error(
+                        `Failed to parse data for transaction, error was: ${e.message}`,
+                    );
+                    // notifiy user
+                    this.$q.notify({
+                        message: this.$t('components.failed_to_parse_transaction', { message: e.message }),
+                        color: 'negative',
+                        position: 'top',
+                        timeout: 5000,
+                    });
+                }
+            }
+            this.loading = false;
+        },
+        getPath(props) {
+            const { page, rowsPerPage, descending } = props.pagination;
+            let path;
+            const filter = Object.assign({}, this.filter ? this.filter : {});
+            if (filter.address) {
+                path = `/address/${filter.address}/transactions`;
+            } else {
+                path = '/transactions';
+            }
+            path += `?limit=${
+                rowsPerPage === 0 ? 25 : rowsPerPage
+            }`;
+
+            if (filter.block) {
+                path += `&block=${filter.block}`;
+            }
+
+            if (filter.hash) {
+                path += `&hash=${filter.hash}`;
+            }
+
+            path += `&offset=${(page - 1) * rowsPerPage}`;
+            path += `&sort=${descending ? 'desc' : 'asc'}`;
+            path += '&includeAbi=1&full=1';
+
+            path += (!this.pagination.rowsNumber) ? '&includePagination=true' : '';  // We only need the count once
+
+            return path;
+        },
+        toggleDateFormat() {
+            this.showDateAge = !this.showDateAge;
+        },
+    },
+};
+</script>
+
+<template>
+<q-table
+    v-if="!loading"
+    v-model:pagination="pagination"
+    class="c-inttrx-flat__table"
+    :rows="rows"
+    :row-key="row => row.hash"
+    :columns="columns"
+    :rows-per-page-options="page_size_options"
+    @request="onPaginationChange"
+>
+    <template v-if="!usePagination" v-slot:bottom>
+        <q-card-actions
+            align="center"
+            class="c-inttrx-flat__footer"
+        >
+            <router-link class="c-inttrx-flat__footer-container" :to="{ name: 'txsInternal', query: { a: address } }">
+                <span class="c-inttrx-flat__footer-text"> See all transactions </span>
+                <q-icon name="arrow_forward" class="c-inttrx-flat__footer-icon" />
+            </router-link>
+        </q-card-actions>
+    </template>
+    <template v-slot:header="props">
+        <q-tr :props="props">
+            <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <div :class="[ 'c-inttrx-flat__header-age', 'u-flex--center-y', { 'u-flex--right': col.align === 'right' } ]" @click="toggleDateFormat">
+                    <template
+                        v-if="col.name === 'date'"
+                    >
+                        <a>{{ showDateAge ? col.label: $t('components.date') }}</a>
+                        <q-icon
+                            class="info-icon"
+                            name="far fa-question-circle"
+                        >
+                            <q-tooltip anchor="bottom middle" self="bottom middle" :offset="[0, 36]">
+                                {{ $t('components.click_to_change_format') }}
+                            </q-tooltip>
+                        </q-icon>
+                    </template>
+                    <div v-else-if="col.name === 'method'">
+                        {{ col.label }}
+                        <q-icon class="info-icon" name="far fa-question-circle" />
+                        <q-tooltip anchor="bottom middle" self="top middle" max-width="10rem">
+                            {{ $t('components.executed_based_on_decoded_data') }}
+                        </q-tooltip>
+                    </div>
+                    <div v-else>
+                        {{ col.label }}
+                    </div>
+                </div>
+            </q-th>
+            <q-td v-if="usePagination" auto-width/>
+        </q-tr>
+    </template>
+    <template v-slot:body="props">
+        <q-tr :props="props" :class="props.row.trx">
+            <q-td key="hash" :props="props">
+                <TransactionField :transaction-hash="props.row.hash" :useHighlight="true"/>
+            </q-td>
+            <q-td key="block" :props="props">
+                <BlockField :block="props.row.blockNumber"/>
+            </q-td>
+            <q-td key="date" :props="props">
+                <DateField :epoch="(props.row.timestamp / 1000)" :force-show-age="showDateAge"/>
+            </q-td>
+            <q-td key="from" :props="props">
+                <AddressField
+                    v-if="props.row.from"
+                    :key="props.row.from"
+                    :address="props.row.from"
+                    :truncate="12"
+                />
+            </q-td>
+            <q-td key="to" :props="props">
+                <AddressField
+                    v-if="props.row.to"
+                    :key="props.row.to"
+                    :address="props.row.to"
+                    :truncate="12"
+                />
+            </q-td>
+            <q-td key="value" :props="props">
+                <ValueField
+                    :value="props.row.value"
+                    :symbol="props.row.symbol"
+                    :decimals="props.row.decimals"
+                />
+            </q-td>
+        </q-tr>
+        <q-tr
+            v-show="props.expand"
+            v-if="props.row.traces?.length > 0"
+            :props="props"
+            class="q-virtual-scroll--with-prev"
+        >
+            <q-td colspan="100%">
+                <InternalTxns :traces="props.row.traces" :transaction="props.row" />
+            </q-td>
+        </q-tr>
+    </template>
+</q-table>
+<q-table
+    v-else
+    v-model:pagination="pagination"
+    class="c-inttrx-flat__table"
+    :rows="loadingRows"
+    :row-key="row => row.hash"
+    :columns="columns"
+    :rows-per-page-options="page_size_options"
+>
+    <template v-if="!usePagination" v-slot:bottom>
+        <q-card-actions
+            align="center"
+            class="c-inttrx-flat__footer"
+        >
+            <router-link class="c-inttrx-flat__footer-container" :to="{ name: 'txsInternal' }">
+                <span class="c-inttrx-flat__footer-text"> See all transactions </span>
+                <q-icon name="arrow_forward" class="c-inttrx-flat__footer-icon" />
+            </router-link>
+        </q-card-actions>
+    </template>
+    <template v-slot:header="props">
+        <q-tr :props="props">
+            <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <div :class="[ 'c-inttrx-flat__header-age', 'u-flex--center-y', { 'u-flex--right': col.align === 'right' } ]" @click="toggleDateFormat">
+                    <template
+                        v-if="col.name === 'date'"
+                    >
+                        <a>{{ showDateAge ? col.label: $t('components.date') }}</a>
+                        <q-icon
+                            class="info-icon"
+                            name="far fa-question-circle"
+                        >
+                            <q-tooltip anchor="bottom middle" self="bottom middle" :offset="[0, 36]">
+                                {{ $t('components.click_to_change_format') }}
+                            </q-tooltip>
+                        </q-icon>
+                    </template>
+                    <div v-else-if="col.name === 'method'">
+                        {{ col.label }}
+                        <q-icon class="info-icon" name="far fa-question-circle" />
+                        <q-tooltip anchor="bottom middle" self="top middle" max-width="10rem">
+                            {{ $t('components.executed_based_on_decoded_data') }}
+                        </q-tooltip>
+                    </div>
+                    <div v-else>
+                        {{ col.label }}
+                    </div>
+                </div>
+            </q-th>
+            <q-td auto-width/>
+        </q-tr>
+    </template>
+    <template v-slot:body="">
+        <q-tr>
+            <q-td key="hash" >
+                <q-skeleton type="text" class="c-trx-overview__skeleton" />
+            </q-td>
+            <q-td key="block" >
+                <q-skeleton type="text" class="c-trx-overview__skeleton" />
+            </q-td>
+            <q-td key="date" >
+                <q-skeleton type="text" class="c-trx-overview__skeleton" />
+            </q-td>
+            <q-td key="method" >
+                <q-skeleton type="text" class="c-trx-overview__skeleton" />
+            </q-td>
+            <q-td key="int_txns" >
+                <q-skeleton type="text" class="c-trx-overview__skeleton" />
+            </q-td>
+            <q-td key="value" >
+                <q-skeleton type="text" class="c-trx-overview__skeleton" />
+            </q-td>
+            <q-td v-if="usePagination" auto-width>
+                <q-skeleton type="text" class="c-trx-overview__skeleton" />
+            </q-td>
+        </q-tr>
+    </template>
+</q-table>
+</template>
+<style lang="scss">
+
+.odd {
+        background-color: var(--scrollbar-track-bg-color);
+}
+
+.c-inttrx-flat {
+    .info-icon{
+        margin-left: .25rem;
+        padding-bottom: 0.2rem;
+    }
+
+
+
+    &__table {
+        .q-table__bottom {
+            position: relative;
+        }
+    }
+    &__header-age {
+        gap: 5px;
+    }
+    &__footer {
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        top: 0;
+        cursor: pointer;
+        display: flex;
+        gap: 5px;
+        background-color: color-mix(in srgb, white, black 5%);
+
+        &-container {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex: 1;
+        }
+
+        body.body--dark & {
+            background-color: color-mix(in srgb, $dark, white 5%);
+        }
+
+        &-text {
+            font-size: 0.7rem;
+            text-transform: uppercase;
+        }
+        &:hover {
+            color: var(--q-primary);
+        }
+    }
+
+}
+
+
+</style>
diff --git a/src/components/InternalTransactionTable.vue b/src/components/InternalTransactionTable.vue
index 8a992698..4e16c2ee 100644
--- a/src/components/InternalTransactionTable.vue
+++ b/src/components/InternalTransactionTable.vue
@@ -187,7 +187,7 @@ export default {
                         '/transaction/' + transaction.hash + '/internal?limit=1000&sort=ASC&offset=0&includeAbi=1',
                     );
                     for(const trace of [...traces.data.results]){
-                        trace.hash = trace.transaction_hash;
+                        trace.hash = trace.transactionHash;
                     }
                     transaction.traces = traces.data?.results;
                     transaction.contract = contract;
diff --git a/src/components/MethodField.vue b/src/components/MethodField.vue
index 3459ad1c..faa92f0b 100644
--- a/src/components/MethodField.vue
+++ b/src/components/MethodField.vue
@@ -3,15 +3,11 @@ import { computed, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import { ZERO_ADDRESSES } from 'src/lib/utils';
+import { useStore } from 'vuex';
 
 const { t: $t } = useI18n();
 
 const props = defineProps({
-    highlightMethod: {
-        type: String,
-        required: false,
-        default: '',
-    },
     trx: {
         type: Object as () => {
             parsedTransaction?: {
@@ -38,13 +34,19 @@ const props = defineProps({
         type: Object,
         default: () => null,
     },
+    useHighlight: {
+        type: Boolean,
+        default: true,
+    },
 });
 
-const emit = defineEmits(['highlight']);
-
 const methodName = ref('');
 const nativeTooltipText = ref('');
 
+const $store = useStore();
+const setHighlightMethod = (method: string) => props.useHighlight ? $store.dispatch('general/setHighlightMethod', method) : null;
+const highlightMethod = computed(() => props.useHighlight ? $store.state.general.highlightMethod : '');
+
 const methodSignature = computed(() => {
     if (props.trx.input && props.trx.input !== '0x') {
         // the first 10 characters of the input data are the method signature, including leading '0x'
@@ -108,10 +110,6 @@ const setValues = async () => {
         methodName.value = props.trx.parsedTransaction.name;
     }
 };
-
-function emitHighlight(val: string) {
-    emit('highlight', val);
-}
 </script>
 
 <template>
@@ -121,8 +119,8 @@ function emitHighlight(val: string) {
         'c-method--highlight': [methodName, methodSignature].includes(highlightMethod) && highlightMethod !== '',
         'c-method--full-text': fullText,
     }"
-    @mouseenter="emitHighlight(methodName || methodSignature)"
-    @mouseleave="emitHighlight('')"
+    @mouseenter="setHighlightMethod(methodName || methodSignature)"
+    @mouseleave="setHighlightMethod('')"
 >
     {{ displayText }}
 
diff --git a/src/components/NftTransfersTable.vue b/src/components/NftTransfersTable.vue
index 7892f5d9..f67c82d8 100644
--- a/src/components/NftTransfersTable.vue
+++ b/src/components/NftTransfersTable.vue
@@ -162,11 +162,6 @@ const truncatedId = (id: string) => {
     }
 };
 
-const highlightAddress = ref('');
-function setHighlightAddress(val: string) {
-    highlightAddress.value = val;
-}
-
 const getPath = (settings: { pagination: Pagination }) => {
     const { page, rowsPerPage, descending } = settings.pagination;
     let path = `/account/${props.address}/transfers?limit=${
@@ -394,8 +389,6 @@ onMounted(() => {
                     :key="props.row.from"
                     :address="props.row.from"
                     :truncate="12"
-                    :highlightAddress="highlightAddress"
-                    @highlight="setHighlightAddress"
                 />
             </q-td>
             <q-td key="to" :props="props">
@@ -404,8 +397,6 @@ onMounted(() => {
                     :key="props.row.to"
                     :address="props.row.to"
                     :truncate="12"
-                    :highlightAddress="highlightAddress"
-                    @highlight="setHighlightAddress"
                 />
             </q-td>
             <q-td key="id" :props="props">
@@ -432,8 +423,6 @@ onMounted(() => {
                     :key="props.row.contract.address"
                     :address="props.row.contract.address"
                     :truncate="16"
-                    :highlightAddress="highlightAddress"
-                    @highlight="setHighlightAddress"
                 />
             </q-td>
             <q-td key="item" :props="props" class="flex items-center">
diff --git a/src/components/Token/ApprovalList.vue b/src/components/Token/ApprovalList.vue
index d45c9803..66aa1c61 100644
--- a/src/components/Token/ApprovalList.vue
+++ b/src/components/Token/ApprovalList.vue
@@ -490,7 +490,12 @@ export default {
         <template v-slot:body="props">
             <q-tr :props="props">
                 <q-td key="spender" :props="props">
-                    <AddressField :key="props.row.spender + 'c'" :address="props.row.spender" :truncate="18" />
+                    <AddressField
+                        :key="props.row.spender + 'c'"
+                        :address="props.row.spender"
+                        :truncate="18"
+                        :useHighlight="false"
+                    />
                 </q-td>
                 <q-td key="amount" :props="props" >
                     <div v-if="!this.isNFT()">
@@ -553,6 +558,7 @@ export default {
                         :key="props.row.contract.address + 'contract'"
                         :address="props.row.contract.address"
                         :truncate="18"
+                        :useHighlight="false"
                     />
                 </q-td>
                 <q-td key="updated" :props="props">
diff --git a/src/components/Token/HolderList.vue b/src/components/Token/HolderList.vue
index fbd1ce44..d574ba99 100644
--- a/src/components/Token/HolderList.vue
+++ b/src/components/Token/HolderList.vue
@@ -165,7 +165,12 @@ export default {
     <template v-slot:body="props">
         <q-tr :props="props">
             <q-td key="holder" :props="props">
-                <AddressField :key="props.row.address + 'c'" :address="props.row.address" :truncate="18" />
+                <AddressField
+                    :key="props.row.address + 'c'"
+                    :address="props.row.address"
+                    :truncate="18"
+                    :useHighlight="false"
+                />
             </q-td>
             <q-td key="balance" :props="props">
                 <span v-if="contract?.properties?.decimals">
diff --git a/src/components/Token/TokenGridElement.vue b/src/components/Token/TokenGridElement.vue
index aa160ac0..8b124edf 100644
--- a/src/components/Token/TokenGridElement.vue
+++ b/src/components/Token/TokenGridElement.vue
@@ -41,6 +41,7 @@ export default {
                     :address="element.address"
                     :name="symbol"
                     class="q-mb-sm"
+                    :useHighlight="false"
                 />
                 <div>
                     <div class="flex">
diff --git a/src/components/Token/TokenTable.vue b/src/components/Token/TokenTable.vue
index 760e1b72..bcba408e 100644
--- a/src/components/Token/TokenTable.vue
+++ b/src/components/Token/TokenTable.vue
@@ -99,7 +99,12 @@ export default {
                 <q-img :src="props.row.logoURI" class="c-token-icon" />
             </q-td>
             <q-td key="name" :props="props">
-                <AddressField :address="props.row.address" :name="props.row.name" :truncate="32"/>
+                <AddressField
+                    :address="props.row.address"
+                    :name="props.row.name"
+                    :truncate="32"
+                    :useHighlight="false"
+                />
             </q-td>
             <q-td key="symbol" :props="props">
                 {{ props.row.symbol }}
diff --git a/src/components/Transaction/ERCTransferList.vue b/src/components/Transaction/ERCTransferList.vue
index 417e4a8f..00c8b408 100644
--- a/src/components/Transaction/ERCTransferList.vue
+++ b/src/components/Transaction/ERCTransferList.vue
@@ -141,10 +141,6 @@ const loadTransfers = async () => {
     emit('transfers-count', count);
 };
 
-function setHighlightAddress(val: string) {
-    emit('highlight', val);
-}
-
 watch(() => props.logs, async (newTrx) => {
     if (newTrx) {
         await loadTransfers();
@@ -169,8 +165,6 @@ watch(() => props.logs, async (newTrx) => {
                 copy
                 :address="transfer.from"
                 :truncate="15"
-                :highlightAddress="props.highlightAddress"
-                @highlight="setHighlightAddress"
             />
         </div>
         <div class="c-erc-transfers__cell c-erc-transfers__cell--b">
@@ -179,8 +173,6 @@ watch(() => props.logs, async (newTrx) => {
                 copy
                 :address="transfer.to"
                 :truncate="15"
-                :highlightAddress="props.highlightAddress"
-                @highlight="setHighlightAddress"
             />
         </div>
         <div class="c-erc-transfers__cell c-erc-transfers__cell--c">
@@ -192,8 +184,6 @@ watch(() => props.logs, async (newTrx) => {
             <AddressField
                 :address="transfer.token.address"
                 :truncate="15"
-                :highlightAddress="props.highlightAddress"
-                @highlight="setHighlightAddress"
             />
         </div>
     </div>
diff --git a/src/components/Transaction/TLOSTransferList.vue b/src/components/Transaction/TLOSTransferList.vue
index 6fd66ad4..45008921 100644
--- a/src/components/Transaction/TLOSTransferList.vue
+++ b/src/components/Transaction/TLOSTransferList.vue
@@ -65,10 +65,6 @@ const loadTransfers = async () => {
     emit('transfers-count', tlos_transfers.value.length);
 };
 
-function setHighlightAddress(val: string) {
-    emit('highlight', val);
-}
-
 watch(() => props.transaction, async (newTrx) => {
     if (newTrx) {
         await loadTransfers();
@@ -93,8 +89,6 @@ watch(() => props.transaction, async (newTrx) => {
                 copy
                 :address="transfer.from"
                 :truncate="15"
-                :highlightAddress="props.highlightAddress"
-                @highlight="setHighlightAddress"
             />
         </div>
         <div class="c-tlos-transfers__cell c-tlos-transfers__cell--b">
@@ -103,8 +97,6 @@ watch(() => props.transaction, async (newTrx) => {
                 copy
                 :address="transfer.to"
                 :truncate="15"
-                :highlightAddress="props.highlightAddress"
-                @highlight="setHighlightAddress"
             />
         </div>
         <div class="c-tlos-transfers__cell c-tlos-transfers__cell--c">
diff --git a/src/components/TransactionAction.vue b/src/components/TransactionAction.vue
index a7693817..20fa0631 100644
--- a/src/components/TransactionAction.vue
+++ b/src/components/TransactionAction.vue
@@ -30,8 +30,6 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['highlight']);
-
 const methodName = ref('');
 const nativeTooltipText = ref('');
 
@@ -67,9 +65,6 @@ const setValues = async () => {
     }
 };
 
-function setHighlightAddress(val: string) {
-    emit('highlight', val);
-}
 </script>
 
 <template>
@@ -89,19 +84,15 @@ function setHighlightAddress(val: string) {
     <span class="c-trx-action__text">Function by</span>
 
     <AddressField
-        :address="props.trx.from"
+        :address="props.trx.from ?? ''"
         :truncate="12"
-        :highlightAddress="props.highlightAddress"
-        @highlight="setHighlightAddress"
     />
 
     <span class="c-trx-action__text">on</span>
 
     <AddressField
-        :address="props.trx.to"
+        :address="props.trx.to ?? ''"
         :truncate="12"
-        :highlightAddress="props.highlightAddress"
-        @highlight="setHighlightAddress"
     />
 </div>
 </template>
diff --git a/src/components/TransactionField.vue b/src/components/TransactionField.vue
index 30358179..a97dbe34 100644
--- a/src/components/TransactionField.vue
+++ b/src/components/TransactionField.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import CopyButton from 'components/CopyButton.vue';
 import { computed } from 'vue';
+import { useStore } from 'vuex';
 
 const props = defineProps({
     transactionHash: {
@@ -26,8 +27,16 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
+    useHighlight: {
+        type: Boolean,
+        default: false,
+    },
 });
 
+const $store = useStore();
+const setHighlightTx = (Trx: string) => props.useHighlight ? $store.dispatch('general/setHighlightTx', Trx) : null;
+const highlightTx = computed(() => props.useHighlight ? $store.state.general.highlightTx : '');
+
 const text = computed(() => {
     if (props.transactionHash) {
         const cropped = props.transactionHash.slice(0, props.truncate);
@@ -40,14 +49,27 @@ const text = computed(() => {
 </script>
 
 <template>
-<div class="c-transaction-field">
+<div
+    class="c-transaction-field"
+
+    @mouseover="setHighlightTx(transactionHash)"
+    @mouseleave="setHighlightTx('')"
+>
     <!-- only evaluate icon conditional if prop is passed -->
     <q-icon v-if="props.status !== null && !props.status" class="c-transaction-field__icon text-negative" name="far fa-times-circle">
         <q-tooltip anchor="bottom right" self="top start">
             {{ $t('components.txn_failed') }}
         </q-tooltip>
     </q-icon>
-    <router-link :key="$route.path" :class="`text-${color}`" :to="`/tx/${transactionHash}`">
+    <router-link
+        :key="$route.path"
+        :class="{
+            [`text-${color}`]: true,
+            'c-transaction-field__link': true,
+            'c-transaction-field__link--highlight': highlightTx === transactionHash && highlightTx !== ''
+        }"
+        :to="`/tx/${transactionHash}`"
+    >
         {{ text }}
         <q-tooltip>{{ transactionHash }}</q-tooltip>
     </router-link>
@@ -59,9 +81,24 @@ const text = computed(() => {
 .c-transaction-field{
     display: inline-flex;
     align-items: center;
+
     &__icon{
         margin-right: .1rem;
         padding-bottom: .05rem;
     }
+
+    &__link {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        position: relative;
+
+        &--highlight {
+            background: rgba($secondary, 0.2);
+            outline: 1px dashed $secondary;
+            border-radius: 5px;
+        }
+    }
+
 }
 </style>
diff --git a/src/components/TransactionOverview.vue b/src/components/TransactionOverview.vue
index f8ca8aca..9f499741 100644
--- a/src/components/TransactionOverview.vue
+++ b/src/components/TransactionOverview.vue
@@ -31,7 +31,6 @@ const blockNumber = computed(() => props.trx?.blockNumber);
 const timestamp = computed(() => props.trx?.timestamp || 0);
 const blockData = ref<BlockData | null>(null);
 const transactionIndex = ref<number>(-1);
-const highlightAddress = ref('');
 const toAddress = ref('');
 const isAContractDeployment = ref(false);
 
@@ -52,10 +51,6 @@ const loadBlockData = async () => {
     }
 };
 
-function setHighlightAddress(val: string) {
-    highlightAddress.value = val;
-}
-
 function setERC20TransfersCount(count: number) {
     showErc20Transfers.value = count > 0;
 }
@@ -170,7 +165,7 @@ watch(() => showMoreDetails.value, (newShowMoreDetails) => {
         <div class="c-trx-overview__col-val">
             <div class="c-trx-overview__row-value">
                 <q-skeleton v-if="loading" type="text" class="c-trx-overview__skeleton" />
-                <BlockField v-else :block="blockNumber" />
+                <BlockField v-else :block="blockNumber ?? 0" />
             </div>
         </div>
     </div>
@@ -224,8 +219,6 @@ watch(() => showMoreDetails.value, (newShowMoreDetails) => {
                 <TransactionAction
                     v-else
                     :trx="trx"
-                    :highlightAddress="highlightAddress"
-                    @highlight="setHighlightAddress"
                 />
             </template>
         </div>
@@ -250,8 +243,6 @@ watch(() => showMoreDetails.value, (newShowMoreDetails) => {
                 :key="'trx-from-'+ trx.from"
                 copy
                 :address="trx.from"
-                :highlightAddress="highlightAddress"
-                @highlight="setHighlightAddress"
             />
         </div>
     </div>
@@ -276,8 +267,6 @@ watch(() => showMoreDetails.value, (newShowMoreDetails) => {
                     copy
                     :address="toAddress"
                     :is-contract-trx="true"
-                    :highlightAddress="highlightAddress"
-                    @highlight="setHighlightAddress"
                 />
                 Created ]
             </template>
@@ -287,8 +276,6 @@ watch(() => showMoreDetails.value, (newShowMoreDetails) => {
                     copy
                     :address="toAddress"
                     :is-contract-trx="!!trx?.contract"
-                    :highlightAddress="highlightAddress"
-                    @highlight="setHighlightAddress"
                 />
             </template>
         </div>
@@ -315,8 +302,6 @@ watch(() => showMoreDetails.value, (newShowMoreDetails) => {
             <ERCTransferList
                 :logs="trx?.logsArray ?? []"
                 :type="'erc20'"
-                :highlightAddress="highlightAddress"
-                @highlight="setHighlightAddress"
                 @transfers-count="setERC20TransfersCount"
             />
         </div>
@@ -343,8 +328,6 @@ watch(() => showMoreDetails.value, (newShowMoreDetails) => {
             <TLOSTransferList
                 v-if="trx"
                 :transaction="trx"
-                :highlightAddress="highlightAddress"
-                @highlight="setHighlightAddress"
                 @transfers-count="setTLOSTransfersCount"
             />
         </div>
diff --git a/src/components/TransactionTable.vue b/src/components/TransactionTable.vue
index b34294cb..d271247b 100644
--- a/src/components/TransactionTable.vue
+++ b/src/components/TransactionTable.vue
@@ -51,7 +51,6 @@ const loading =  ref(false);
 const showDateAge = ref(true);
 const showTotalGasFee = ref(true);
 const highlightMethod = ref('');
-const highlightAddress = ref('');
 const totalRows = ref(0);
 
 const transactions: any[] = [];
@@ -302,10 +301,6 @@ function setHighlightMethod(val: string) {
     highlightMethod.value = val;
 }
 
-function setHighlightAddress(val: string) {
-    highlightAddress.value = val;
-}
-
 const updateLoadingRows = () => {
     loadingRows.value = [];
     for (var i = 1; i <= pagination.value.rowsPerPage; i++) {
@@ -438,8 +433,6 @@ onBeforeMount(() => {
                         :address="props.row.from"
                         :truncate="12"
                         :copy="true"
-                        :highlightAddress="highlightAddress"
-                        @highlight="setHighlightAddress"
                     />
                 </q-td>
                 <q-td key="to" :props="props" class="c-transaction-table__cell">
@@ -449,8 +442,6 @@ onBeforeMount(() => {
                         :address="props.row.to"
                         :truncate="12"
                         :copy="true"
-                        :highlightAddress="highlightAddress"
-                        @highlight="setHighlightAddress"
                     />
                 </q-td>
                 <q-td key='value' :props="props" class="c-transaction-table__cell">
diff --git a/src/pages/AccountPage.vue b/src/pages/AccountPage.vue
index a0faba1b..5f8744e7 100644
--- a/src/pages/AccountPage.vue
+++ b/src/pages/AccountPage.vue
@@ -13,7 +13,7 @@ import { BalanceQueryResponse, BalanceResult } from 'src/types/BalanceResult';
 import { Token } from 'src/types/Token';
 
 import TransactionTable from 'components/TransactionTable.vue';
-import InternalTransactionTable from 'components/InternalTransactionTable.vue';
+import InternalTransactionFlatTable from 'components/InternalTransactionFlatTable.vue';
 import NftTransfersTable from 'components/NftTransfersTable.vue';
 import TokenList from 'components/Token/TokenList.vue';
 import ApprovalList from 'components/Token/ApprovalList.vue';
@@ -312,7 +312,11 @@ async function loadAccount() {
                 <HolderList :contract="contract" />
             </q-tab-panel>
             <q-tab-panel v-else name="internaltx">
-                <InternalTransactionTable :title="accountAddress" :filter="{address:accountAddress}"/>
+                <InternalTransactionFlatTable
+                    :title="accountAddress"
+                    :filter="{address:accountAddress}"
+                    :usePagination="false"
+                />
             </q-tab-panel>
             <q-tab-panel
                 v-if="
diff --git a/src/router/routes.js b/src/router/routes.js
index 091f5904..44fd06d9 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -104,6 +104,15 @@ const routes = [
             component: () => import('pages/ErrorNotFoundPage.vue'),
         }],
     },
+    {
+        path: '/txsInternal',
+        component: () => import('layouts/MainLayout.vue'),
+        children: [{
+            path: '',
+            name: 'txsInternal',
+            component: () => import('pages/ErrorNotFoundPage.vue'),
+        }],
+    },
     {
         path: '/endpoints',
         redirect: () => ({ path: '/health' }),
diff --git a/src/store/general/actions.js b/src/store/general/actions.js
index da6d020f..3859c14f 100644
--- a/src/store/general/actions.js
+++ b/src/store/general/actions.js
@@ -4,3 +4,14 @@ export const toggleDisplayDecimals = async function({ commit }) {
     commit('setDisplayDecimals', displayDecimals);
 };
 
+export const setHighlightAddress = async function({ commit }, address) {
+    commit('setHighlightAddress', address);
+};
+
+export const setHighlightMethod = async function({ commit }, method) {
+    commit('setHighlightMethod', method);
+};
+
+export const setHighlightTx = async function({ commit }, tx) {
+    commit('setHighlightTx', tx);
+};
diff --git a/src/store/general/getters.js b/src/store/general/getters.js
index 66d77ae2..439ef3fa 100644
--- a/src/store/general/getters.js
+++ b/src/store/general/getters.js
@@ -3,5 +3,6 @@ export const successMsg = ({ successMsg }) => successMsg;
 export const isLoading = ({ isLoading }) => isLoading;
 export const highlightAddress = ({ highlightAddress }) => highlightAddress;
 export const highlightMethod = ({ highlightMethod }) => highlightMethod;
+export const highlightTx = ({ highlightTx }) => highlightTx;
 export const displayDecimals = ({ displayDecimals }) => displayDecimals;
 
diff --git a/src/store/general/mutations.js b/src/store/general/mutations.js
index 4d7c85c6..b436335f 100644
--- a/src/store/general/mutations.js
+++ b/src/store/general/mutations.js
@@ -18,6 +18,10 @@ export const setHighlightMethod = (state, highlightMethod) => {
     state.highlightMethod = highlightMethod;
 };
 
+export const setHighlightTx = (state, highlightTx) => {
+    state.highlightTx = highlightTx;
+};
+
 export const setDisplayDecimals = (state, displayDecimals) => {
     state.displayDecimals = displayDecimals;
 };
diff --git a/src/store/general/state.js b/src/store/general/state.js
index 168ee239..a535e9f9 100644
--- a/src/store/general/state.js
+++ b/src/store/general/state.js
@@ -4,5 +4,6 @@ export default () => ({
     isLoading: null,
     highlightAddress: '',
     highlightMethod: '',
-    displayDecimals: 'fixed', // fixed, dynamic
+    highlightTx: '',
+    displayDecimals: 'dynamic', // fixed, dynamic
 });