diff --git a/assets/css/global.css b/assets/css/global.css
index 84f817b9..f04ac2ed 100644
--- a/assets/css/global.css
+++ b/assets/css/global.css
@@ -44,10 +44,6 @@ html {
 	background: linear-gradient(to left, var(--dark-800), transparent);
 }
 
-.nuxt-icon svg {
-	margin-bottom: 0 !important;
-}
-
 .no-scrollbar::-webkit-scrollbar {
 	display: none;
 }
diff --git a/components/AdminPanel.vue b/components/AdminPanel.vue
index c288f14c..3b2ec540 100644
--- a/components/AdminPanel.vue
+++ b/components/AdminPanel.vue
@@ -91,7 +91,7 @@
 			impersonationList.value = users as (User & { github_username: string })[];
 
 			if (impersonationList.value.length === 1) {
-				applyImpersonation(impersonationList.value[0]);
+				applyImpersonation(impersonationList.value[0]!);
 			}
 		} catch (error) {
 			console.error('Error during impersonation:', error instanceof Error ? error.message : 'Unknown error');
diff --git a/components/AdoptProbe.vue b/components/AdoptProbe.vue
index 60273201..4fd22562 100644
--- a/components/AdoptProbe.vue
+++ b/components/AdoptProbe.vue
@@ -81,7 +81,7 @@
 						<div class="w-80 p-4 text-left sm:p-6">
 							<p class="font-bold">Software probe</p>
 							<p class="mt-2">A Docker container that runs on your own hardware.</p>
-							<nuxt-icon class="mt-2 inline-block text-6xl text-[#099CEC]" name="docker"/>
+							<NuxtIcon class="mt-2 inline-block text-6xl text-[#099CEC]" name="docker" aria-hidden="true"/>
 						</div>
 					</button>
 					<button class="group relative flex flex-row items-stretch overflow-hidden rounded-xl border hover:border-[#17d4a7] dark:bg-dark-900" @click="() => { probeType = 'hardware'; activateCallback('3'); }">
@@ -186,7 +186,7 @@
 					</div>
 					<div class="mt-6 text-right">
 						<Button class="mr-2" label="Back" severity="secondary" text @click="probeType === 'software' ? activateCallback('0') : activateCallback('3')"/>
-						<Button label="Send adoption code" :loading="sendAdoptionCodeLoading" :disabled="!ip.length" @click="sendAdoptionCode(activateCallback)"/>
+						<Button :label="isResendingCode ? 'Resend code' : 'Send adoption code'" :loading="sendAdoptionCodeLoading" :disabled="!ip.length" @click="sendAdoptionCode(activateCallback)"/>
 					</div>
 				</div>
 			</StepPanel>
@@ -273,54 +273,49 @@
 
 	// STEP 2
 
-	const { data: initialProbes } = await useLazyAsyncData(
+	const { data: initialIds } = await useLazyAsyncData(
 		'initial_user_probes',
 		() => $directus.request(readItems('gp_probes', {
 			filter: getUserFilter('userId'),
 		})),
-		{ default: () => [] },
+		{ default: () => new Set(), transform: probes => new Set(probes.map(probe => probe.id)) },
 	);
 
+	const searchCanceled = ref(false);
+
+	onBeforeUnmount(() => { searchCanceled.value = true; });
+
 	const searchNewProbes = async (activateCallback: (step: string | number) => void) => {
 		activateCallback('2');
 		const startTime = Date.now();
 
-		try {
-			await new Promise<void>((resolve) => {
-				const checkProbes = async () => {
-					const currentProbes = await $directus.request(readItems('gp_probes', {
-						filter: getUserFilter('userId'),
-					}));
-
-					if (currentProbes.length > initialProbes.value.length) {
-						newProbesFound(currentProbes);
-						resolve();
-						return;
-					}
-
-					if (Date.now() - startTime > 10_000) {
-						newProbesNotFound();
-						resolve();
-						return;
-					}
-
-					setTimeout(checkProbes, 1000);
-				};
-
-				checkProbes();
-			});
-		} catch (e: any) {
-			const detail = e.errors ?? 'Request failed';
-			isIpValid.value = false;
-			invalidIpMessage.value = detail;
+		while (Date.now() - startTime <= 10_000) {
+			if (searchCanceled.value) {
+				return;
+			}
+
+			try {
+				const currentProbes = await $directus.request(readItems('gp_probes', {
+					filter: getUserFilter('userId'),
+				}));
+
+				const newProbes = currentProbes.filter(probe => !initialIds.value.has(probe.id));
+
+				if (newProbes.length) { newProbesFound(newProbes); return; }
+
+				await new Promise(resolve => setTimeout(resolve, 1000));
+			} catch (e: any) {
+				sendErrorToast(e);
+				newProbesNotFound();
+				return;
+			}
 		}
 
-		sendAdoptionCodeLoading.value = false;
+		newProbesNotFound();
 	};
 
-	const newProbesFound = (currentProbes: Probe[]) => {
-		const initialProbesIds = new Set(initialProbes.value.map(probe => probe.id));
-		newProbes.value = currentProbes.filter(probe => !initialProbesIds.has(probe.id));
+	const newProbesFound = (freshProbes: Probe[]) => {
+		newProbes.value = freshProbes;
 		isSuccess.value = true;
 
 		const wrapper = stepPanels.value.$el;
@@ -341,6 +336,7 @@
 	const ip = ref('');
 	const isIpValid = ref(true);
 	const invalidIpMessage = ref('');
+	const isResendingCode = ref(false);
 
 	const resetIsIpValid = () => {
 		isIpValid.value = true;
@@ -372,9 +368,11 @@
 
 			activateCallback('5');
 		} catch (e: any) {
+			console.error(e);
 			const detail = e.errors ?? 'Request failed';
 			isIpValid.value = false;
 			invalidIpMessage.value = detail;
+			isResendingCode.value = true;
 		}
 
 		sendAdoptionCodeLoading.value = false;
@@ -407,9 +405,6 @@
 
 			sendToast('info', 'The code has been resent', 'Paste it to the input to adopt the probe');
 		} catch (e: any) {
-			const detail = e.errors ?? 'Request failed';
-			isIpValid.value = false;
-			invalidIpMessage.value = detail;
 			sendErrorToast(e);
 		}
 	};
@@ -436,6 +431,7 @@
 
 			emit('adopted');
 		} catch (e: any) {
+			console.error(e);
 			const detail = e.errors ?? 'Request failed';
 			isCodeValid.value = false;
 			invalidCodeMessage.value = detail;
diff --git a/components/BigIcon.vue b/components/BigIcon.vue
index 51f3e34f..9923dacd 100644
--- a/components/BigIcon.vue
+++ b/components/BigIcon.vue
@@ -1,6 +1,6 @@
 <template>
 	<div :class="{'flex size-10 shrink-0 items-center justify-center rounded-full border bg-surface-0 dark:bg-dark-900': border}" class="relative">
-		<nuxt-icon class="text-base text-primary" :class="{'text-xl': border}" :name="name" :filled="filled"/>
+		<NuxtIcon class="text-base text-primary" :class="{'text-xl': border}" :name="name" :filled="filled"/>
 		<slot/>
 	</div>
 </template>
diff --git a/components/CreditsChart.vue b/components/CreditsChart.vue
index 7d8e8148..98eff85a 100644
--- a/components/CreditsChart.vue
+++ b/components/CreditsChart.vue
@@ -56,7 +56,7 @@
 		}[] = [];
 
 		for (let i = 0; i < last30Days.length; i++) {
-			const day = last30Days[i];
+			const day = last30Days[i]!;
 			const addition = dayToAddition.get(day) ?? 0;
 			const deduction = dayToDeduction.get(day) ?? 0;
 			let total;
@@ -64,7 +64,7 @@
 			if (i === 0) {
 				total = props.start + addition - deduction;
 			} else {
-				total = data[i - 1].total + addition - deduction;
+				total = data[i - 1]!.total + addition - deduction;
 			}
 
 			data.push({
@@ -135,9 +135,18 @@
 				callbacks: {
 					title: () => null,
 					label: () => null,
-					afterBody: (ctx: any) => `Total credits: ${changes.value[ctx[0].dataIndex].total.toLocaleString('en-US')}
-Generated: ${changes.value[ctx[0].dataIndex].generated.toLocaleString('en-US')}
-Spent: ${changes.value[ctx[0].dataIndex].spent.toLocaleString('en-US')}`,
+					afterBody: (ctx: any) => {
+						const dataIndex = ctx[0]?.dataIndex;
+						const change = changes.value[dataIndex];
+
+						if (change) {
+							return `Total credits: ${change.total.toLocaleString('en-US')}
+Generated: ${change.generated.toLocaleString('en-US')}
+Spent: ${change.spent.toLocaleString('en-US')}`;
+						}
+
+						return '';
+					},
 				},
 				bodyFont: {
 					weight: 400,
diff --git a/components/DeleteProbes.vue b/components/DeleteProbes.vue
index c79118be..72c686e5 100644
--- a/components/DeleteProbes.vue
+++ b/components/DeleteProbes.vue
@@ -14,7 +14,7 @@
 				<p>Are you sure you want to delete these probes? You will not be able to undo this action.</p>
 			</div>
 			<div v-else class="flex flex-col">
-				<p>You are about to delete the probe <span class="font-bold">{{ probes[0].name || probes[0].city }}</span> ({{ probes[0].ip }}).</p>
+				<p>You are about to delete the probe <span class="font-bold">{{ probes[0]!.name || probes[0]!.city }}</span> ({{ probes[0]!.ip }}).</p>
 				<p>Are you sure you want to delete this probe? You will not be able to undo this action.</p>
 			</div>
 		</div>
diff --git a/components/NuxtIcon.vue b/components/NuxtIcon.vue
new file mode 100644
index 00000000..4361d2b7
--- /dev/null
+++ b/components/NuxtIcon.vue
@@ -0,0 +1,59 @@
+<!-- This component is a copy of nuxt-icons lib, but with fixed "noUncheckedIndexedAccess" errors. Source: https://github.com/gitFoxCode/nuxt-icons/issues/60 -->
+
+<template>
+	<!-- eslint-disable-next-line vue/no-v-html -->
+	<span class="nuxt-icon" :class="{ 'nuxt-icon--fill': !filled, 'nuxt-icon--stroke': hasStroke && !filled }" v-html="icon"/>
+</template>
+
+  <script setup lang="ts">
+	import { ref, watchEffect } from '#imports';
+
+	const props = withDefaults(defineProps<{
+		name: string;
+		filled?: boolean;
+	}>(), { filled: false });
+
+
+	const icon = ref<string | Record<string, any>>('');
+	let hasStroke = false;
+
+	async function getIcon () {
+		try {
+			const iconsImport = import.meta.glob('assets/icons/**/**.svg', {
+				eager: false,
+				query: '?raw',
+				import: 'default',
+			});
+			const iconPath = `/assets/icons/${props.name}.svg`;
+			const rawIcon = await iconsImport[iconPath]!() as string;
+
+			if (rawIcon.includes('stroke')) { hasStroke = true; }
+
+			icon.value = rawIcon;
+		} catch {
+			console.error(`[nuxt-icons] Icon '${props.name}' doesn't exist in 'assets/icons'`);
+		}
+	}
+
+	await getIcon();
+
+	watchEffect(getIcon);
+  </script>
+
+  <style>
+	.nuxt-icon svg {
+		width: 1em;
+		height: 1em;
+		vertical-align: middle;
+	}
+
+	.nuxt-icon.nuxt-icon--fill,
+	.nuxt-icon.nuxt-icon--fill * {
+		fill: currentColor !important;
+	}
+
+	.nuxt-icon.nuxt-icon--stroke,
+	.nuxt-icon.nuxt-icon--stroke * {
+		stroke: currentColor !important;
+	}
+  </style>
diff --git a/components/TagsList.vue b/components/TagsList.vue
index 05459122..ea1e8dc5 100644
--- a/components/TagsList.vue
+++ b/components/TagsList.vue
@@ -34,11 +34,11 @@
 			let length = 0;
 
 			for (let i = 0; i < props.tags.length; i++) {
-				if (length + props.tags[i].length > maxChars) {
+				if (length + props.tags[i]!.length > maxChars) {
 					return Math.max(1, i);
 				}
 
-				length += props.tags[i].length;
+				length += props.tags[i]!.length;
 			}
 
 			return props.tags.length;
diff --git a/components/probe/LogLoader.vue b/components/probe/LogLoader.vue
new file mode 100644
index 00000000..5bfa1bb7
--- /dev/null
+++ b/components/probe/LogLoader.vue
@@ -0,0 +1,7 @@
+<template>
+	<span class="flex flex-nowrap gap-1">
+		<span class="size-1.5 animate-dot-pulse rounded-full bg-gray-500 opacity-50"/>
+		<span class="size-1.5 animate-dot-pulse rounded-full bg-gray-500 opacity-50 animate-delay-200"/>
+		<span class="size-1.5 animate-dot-pulse rounded-full bg-gray-500 opacity-50 animate-delay-400"/>
+	</span>
+</template>
diff --git a/components/probe/TabLogs.vue b/components/probe/TabLogs.vue
new file mode 100644
index 00000000..59052bb5
--- /dev/null
+++ b/components/probe/TabLogs.vue
@@ -0,0 +1,169 @@
+<template>
+	<div class="flex min-h-[400px] flex-1 flex-col pb-6">
+		<div class="relative flex min-h-[300px] flex-1 flex-col overflow-hidden rounded-md border bg-surface-0 dark:bg-dark-950">
+			<div class="flex w-full flex-nowrap items-center justify-between gap-4 border-b bg-surface-0 px-3 py-1.5 text-gray-700 dark:bg-dark-800 dark:text-gray-300">
+				<span v-if="logs.length" class="font-bold">
+					Showing <span class="hidden sm:inline">the latest</span> {{logs.length}} {{pluralize('log', logs.length)}}.
+				</span>
+				<LogLoader v-else-if="enabled && !showLargeLoader"/>
+				<label
+					class="ml-auto flex cursor-pointer select-none items-center justify-end gap-2 whitespace-nowrap rounded-md border border-gray-500 px-2 py-1 duration-200 dark:border-gray-400"
+					:class="{
+						'border-primary text-primary dark:border-primary': enabled,
+					}"
+				>
+					<input v-model="enabled" type="checkbox" class="peer sr-only">
+					<i v-if="enabled" class="pi pi-pause-circle text-[16px]"/>
+					<i v-else class="pi pi-play-circle text-[16px]"/>
+					Live tail
+				</label>
+			</div>
+			<div v-if="logs.length" class="h-4 max-lg:h-2"/>
+			<div
+				ref="logContainer"
+				class="relative flex flex-1 flex-col overflow-y-auto p-4 pt-0 font-mono max-lg:p-2 max-lg:pt-0"
+				@scroll="onScrollThrottled"
+			>
+				<div
+					v-for="(log, index) in logs"
+					:key="index"
+					class="whitespace-nowrap text-gray-800 dark:text-gray-300"
+				>
+					<span v-if="log.timestamp" class="text-gray-600 dark:text-gray-500">[{{ log.timestamp.toUpperCase() }}] </span>
+					<span v-if="log.scope" class="text-green-600 dark:text-green-500">[{{ log.scope }}] </span>
+					<span
+						:class="{
+							'text-red-600 dark:text-red-500': log.level?.toLowerCase() === 'error',
+							'text-yellow-600 dark:text-yellow-300': log.level?.toLowerCase() === 'warn',
+							'text-cyan-600 dark:text-cyan-300': log.level?.toLowerCase() === 'info',
+							'text-blue-600 dark:text-blue-400': log.level?.toLowerCase() === 'debug',
+						}"
+					>
+						<span v-if="log.level">[{{ log.level.toUpperCase() }}] </span>
+						<span class="whitespace-pre">{{ log.message }}</span>
+					</span>
+				</div>
+				<span v-if="logs.length === 0" class="inset-0 m-auto p-2 text-center text-gray-600 dark:text-gray-400">
+					<span v-if="pending && showLargeLoader">
+						<span class="pi pi-spinner animate-spin text-2xl dark:text-gray-500"/>
+					</span>
+					<span v-else>
+						No logs available. A newly adopted probe may take a few minutes to sync the logs.
+					</span>
+				</span>
+				<span v-if="logs.length" class="h-fit px-1 py-2">
+					<LogLoader v-if="enabled"/>
+					<span v-else class="inline-block size-1.5"/>
+				</span>
+			</div>
+		</div>
+	</div>
+
+</template>
+
+<script setup lang="ts">
+	import throttle from 'lodash/throttle';
+	import LogLoader from '~/components/probe/LogLoader.vue';
+	import { useErrorToast } from '~/composables/useErrorToast';
+	import { pluralize } from '~/utils/pluralize';
+
+	const REFRESH_INTERVAL = 2000; // ms
+	const MAX_DISPLAYED_LOGS = 5000;
+
+	const props = defineProps({
+		probeId: {
+			type: String,
+			required: true,
+		},
+	});
+
+	const config = useRuntimeConfig();
+	const refreshTimeout = ref<NodeJS.Timeout>();
+	const logContainer = ref<HTMLDivElement | null>(null);
+	const autoScroll = ref(true);
+	const logs = ref<ProbeLog[]>([]);
+	const lastFetchedId = ref('-'); // redis ID
+	const showLargeLoader = ref(true);
+	const enabled = ref(true);
+
+	const { data, refresh, pending, error } = await useLazyAsyncData<{ logs: ProbeLog[]; lastId: string }>(
+		() => $fetch(`${config.public.gpApiUrl}/v1/probes/${props.probeId}/logs`, {
+			params: {
+				after: lastFetchedId.value,
+			},
+			credentials: 'include',
+		}),
+		{
+			default: () => { return { logs: [], lastId: '-' }; },
+			immediate: false,
+		},
+	);
+
+	useErrorToast(error);
+
+	const refreshLogs = async () => {
+		return refresh().then(() => {
+			if (!error.value && enabled.value && data.value.lastId) {
+				lastFetchedId.value = data.value.lastId;
+			}
+		}).finally(() => {
+			// do not show the large loader on further refetches
+			showLargeLoader.value = false;
+
+			if (enabled.value) {
+				refreshTimeout.value = setTimeout(() => {
+					refreshLogs();
+				}, REFRESH_INTERVAL);
+			}
+		});
+	};
+
+	const onScroll = () => {
+		const scrollHeight = logContainer.value?.scrollHeight ?? 0;
+		const scrollTop = logContainer.value?.scrollTop ?? 0;
+		const containerHeight = logContainer.value?.clientHeight ?? 0;
+		const scrolledTo = scrollTop + containerHeight;
+
+		// if the user scrolled down enough, enable autoscroll
+		autoScroll.value = scrollHeight - scrolledTo < 10;
+	};
+
+	const onScrollThrottled = throttle(() => onScroll(), 10);
+
+	const scrollToBottom = () => {
+		nextTick(() => {
+			if (logContainer.value && autoScroll.value) {
+				logContainer.value.scrollTop = logContainer.value.scrollHeight;
+			}
+		});
+	};
+
+	// append new logs to the already stored ones
+	watch(data, () => {
+		if (!enabled.value) {
+			return;
+		}
+
+		logs.value.push(...data.value.logs);
+
+		if (logs.value.length > MAX_DISPLAYED_LOGS) {
+			logs.value = logs.value.slice(-MAX_DISPLAYED_LOGS);
+		}
+
+		scrollToBottom();
+	});
+
+
+	watch(enabled, (isEnabled) => {
+		if (isEnabled) {
+			refreshLogs();
+		} else {
+			clearTimeout(refreshTimeout.value);
+		}
+	}, { immediate: true });
+
+	onUnmounted(() => {
+		clearTimeout(refreshTimeout.value);
+		onScrollThrottled.cancel();
+	});
+</script>
diff --git a/components/probe/UserTagsBlock.vue b/components/probe/UserTagsBlock.vue
index 8ea171c4..4879240e 100644
--- a/components/probe/UserTagsBlock.vue
+++ b/components/probe/UserTagsBlock.vue
@@ -184,7 +184,7 @@
 	const tagsToEdit = ref<{ uPrefix: string; value: string; format?: string }[]>([]);
 	const isEditingTags = ref<boolean>(false);
 	const popoverContentRef = ref<HTMLElement>();
-	const getDefaultEmptyTags = () => [{ uPrefix: uPrefixes[0], value: '' }];
+	const getDefaultEmptyTags = () => [{ uPrefix: uPrefixes[0]!, value: '' }];
 
 	const openEditTagsPopover = (event: Event) => {
 		editTags();
diff --git a/composables/useProbeDetailTabs.ts b/composables/useProbeDetailTabs.ts
new file mode 100644
index 00000000..cc381748
--- /dev/null
+++ b/composables/useProbeDetailTabs.ts
@@ -0,0 +1,33 @@
+export const useProbeDetailTabs = () => {
+	const route = useRoute();
+	const router = useRouter();
+
+	type TabName = 'details' | 'logs';
+	const TAB_NAMES = [ 'details', 'logs' ];
+	const DEFAULT_TAB = 'details';
+
+	const activeTab = ref<TabName>(DEFAULT_TAB);
+
+	watch(activeTab, (val) => {
+		if (val === DEFAULT_TAB) {
+			const { tab, ...rest } = route.query;
+			router.push({ query: { ...rest } });
+			return;
+		}
+
+		router.push({ query: { ...route.query, tab: val } });
+	});
+
+	watch(() => route.query.tab, (newTab) => {
+		if (typeof newTab === 'string' && TAB_NAMES.includes(newTab)) {
+			activeTab.value = newTab as TabName;
+			return;
+		}
+
+		const { tab, ...rest } = route.query;
+		router.push({ query: { ...rest } });
+		activeTab.value = DEFAULT_TAB;
+	}, { immediate: true });
+
+	return activeTab;
+};
diff --git a/composables/useProbeFilters.ts b/composables/useProbeFilters.ts
index 7bbabb05..2a4022b5 100644
--- a/composables/useProbeFilters.ts
+++ b/composables/useProbeFilters.ts
@@ -23,7 +23,7 @@ const DEFAULT_FILTER: Filter = { search: '', status: 'all', by: 'name', desc: fa
 
 export const SORTABLE_FIELDS: string[] = [ 'name', 'location', 'tags' ] as const;
 
-export const STATUS_MAP: Record<string, StatusOption> = {
+export const STATUS_MAP: Record<StatusCode, StatusOption> = {
 	'all': { name: 'All', options: [ ...ONLINE_STATUSES, ...OFFLINE_STATUSES ] },
 	'online': { name: 'Online', options: ONLINE_STATUSES },
 	'online-outdated': { name: 'Online - outdated', options: ONLINE_STATUSES, outdatedOnly: true },
diff --git a/layouts/default.vue b/layouts/default.vue
index cd4c8d8e..da9ebb26 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -73,8 +73,8 @@
 					</template>
 
 					<NuxtLink active-class="active" class="sidebar-link" to="/" @click="mobileSidebar = false"><i class="pi pi-home sidebar-link-icon"/>Overview</NuxtLink>
-					<NuxtLink active-class="active" class="sidebar-link" :class="{'active': $route.path.startsWith('/probes')}" to="/probes" @click="mobileSidebar = false"><nuxt-icon class="pi sidebar-link-icon" name="probe"/>Probes</NuxtLink>
-					<NuxtLink active-class="active" class="sidebar-link" to="/credits" @click="mobileSidebar = false"><nuxt-icon class="pi sidebar-link-icon" name="coin"/>Credits</NuxtLink>
+					<NuxtLink active-class="active" class="sidebar-link" :class="{'active': $route.path.startsWith('/probes')}" to="/probes" @click="mobileSidebar = false"><NuxtIcon class="pi sidebar-link-icon" name="probe"/>Probes</NuxtLink>
+					<NuxtLink active-class="active" class="sidebar-link" to="/credits" @click="mobileSidebar = false"><NuxtIcon class="pi sidebar-link-icon" name="coin"/>Credits</NuxtLink>
 					<NuxtLink active-class="active" class="sidebar-link" to="/tokens" @click="mobileSidebar = false"><i class="pi pi-database sidebar-link-icon"/>Tokens</NuxtLink>
 					<NuxtLink active-class="active" class="sidebar-link" to="/settings" @click="mobileSidebar = false"><i class="pi pi-cog sidebar-link-icon"/>Settings</NuxtLink>
 					<button active-class="active" class="sidebar-link" @click="auth.logout"><i class="pi pi-power-off sidebar-link-icon"/>Sign out</button>
@@ -188,8 +188,8 @@
 
 		<aside class="flex flex-col border-r bg-surface-100 p-4 max-lg:hidden dark:bg-dark-700">
 			<NuxtLink active-class="active" class="sidebar-link" to="/"><i class="pi pi-home sidebar-link-icon"/>Overview</NuxtLink>
-			<NuxtLink active-class="active" class="sidebar-link" :class="{'active': $route.path.startsWith('/probes')}" to="/probes"><nuxt-icon class="pi sidebar-link-icon" name="probe"/>Probes</NuxtLink>
-			<NuxtLink active-class="active" class="sidebar-link" to="/credits"><nuxt-icon class="pi sidebar-link-icon" name="coin"/>Credits</NuxtLink>
+			<NuxtLink active-class="active" class="sidebar-link" :class="{'active': $route.path.startsWith('/probes')}" to="/probes"><NuxtIcon class="pi sidebar-link-icon" name="probe"/>Probes</NuxtLink>
+			<NuxtLink active-class="active" class="sidebar-link" to="/credits"><NuxtIcon class="pi sidebar-link-icon" name="coin"/>Credits</NuxtLink>
 			<NuxtLink active-class="active" class="sidebar-link" to="/tokens"><i class="pi pi-database sidebar-link-icon"/>Tokens</NuxtLink>
 			<div class="mt-auto rounded-xl border bg-surface-0 p-6 dark:border-dark-400 dark:bg-dark-500">
 				<p class="mb-2 font-bold">Sponsorship</p>
@@ -201,7 +201,7 @@
 		</aside>
 
 		<div class="overflow-auto">
-			<div class="mx-auto max-w-[1664px]">
+			<div class="mx-auto h-full max-w-[1664px]">
 				<slot/>
 			</div>
 		</div>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 100a2ad2..89178458 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -3,8 +3,9 @@ export default defineNuxtConfig({
 	runtimeConfig: {
 		serverUrl: process.env.DASH_URL || 'https://dash.globalping.io',
 		public: {
-			gpAuthUrl: process.env.GP_API_URL || 'https://auth.globalping.io',
+			gpAuthUrl: process.env.GP_AUTH_URL || 'https://auth.globalping.io',
 			directusUrl: process.env.DIRECTUS_URL || 'https://dash-directus.globalping.io',
+			gpApiUrl: process.env.GP_API_URL || 'https://api.globalping.io',
 			itemsPerTablePage: 10,
 		},
 	},
@@ -12,11 +13,13 @@ export default defineNuxtConfig({
 		runtimeConfig: {
 			serverUrl: process.env.DASH_URL || 'http://localhost:13010',
 			public: {
-				gpAuthUrl: process.env.GP_API_URL || 'http://localhost:13110',
+				gpAuthUrl: process.env.GP_AUTH_URL || 'http://localhost:13110',
 				directusUrl: process.env.DIRECTUS_URL || 'http://localhost:18055',
+				gpApiUrl: process.env.GP_API_URL || 'http://localhost:3000',
 			},
 		},
 		devtools: { enabled: true },
+		ignore: [ 'node_modules' ],
 	},
 	app: {
 		head: {
@@ -44,7 +47,6 @@ export default defineNuxtConfig({
 		'@primevue/nuxt-module',
 		'@pinia/nuxt',
 		'@vueuse/nuxt',
-		'nuxt-icons',
 		'nuxt3-interpolation',
 	],
 	css: [ 'primeicons/primeicons.css', '~/assets/css/base.css', '~/assets/css/global.css' ],
diff --git a/package.json b/package.json
index 32177645..2a1fb9f0 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
 		"chart.js": "^4.5.0",
 		"lodash": "^4.17.21",
 		"nuxt": "^3.17.5",
-		"nuxt-icons": "^3.2.1",
 		"nuxt3-interpolation": "^1.0.16",
 		"pinia": "^3.0.3",
 		"primeicons": "^7.0.0",
diff --git a/pages/credits.vue b/pages/credits.vue
index ef2f8ef4..a69b04aa 100644
--- a/pages/credits.vue
+++ b/pages/credits.vue
@@ -46,10 +46,10 @@
 				<Column header="Amount" field="amount" class="md:w-44 2xl:w-64">
 					<template #body="slotProps">
 						<Tag v-if="slotProps.data.type === 'addition'" class="flex items-center !text-sm" severity="success">
-							<nuxt-icon class="mr-2 mt-0.5" name="coin"/>+{{ (slotProps.data.amount || 0).toLocaleString('en-US') }}
+							<NuxtIcon class="mr-2" name="coin" aria-hidden="true"/>+{{ (slotProps.data.amount || 0).toLocaleString('en-US') }}
 						</Tag>
 						<Tag v-else class="flex items-center !text-sm" severity="danger">
-							<nuxt-icon class="mr-2 mt-0.5" name="coin"/>-{{ (slotProps.data.amount || 0).toLocaleString('en-US') }}
+							<NuxtIcon class="mr-2" name="coin" aria-hidden="true"/>-{{ (slotProps.data.amount || 0).toLocaleString('en-US') }}
 						</Tag>
 					</template>
 				</Column>
diff --git a/pages/index.vue b/pages/index.vue
index 955d0de6..44f33c33 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -40,7 +40,7 @@
 							:outlined="!!adoptedProbes.length"
 							@click="adoptProbeDialog = true"
 						>
-							<nuxt-icon class="pi" name="capture"/>
+							<NuxtIcon class="pi" name="capture" aria-hidden="true"/>
 							<span class="font-bold">{{ adoptedProbes.length ? "Adopt a probe" : "Adopt your first probe" }}</span>
 						</Button>
 					</div>
diff --git a/pages/probes/[id].vue b/pages/probes/[id].vue
index 02fc6075..09605315 100644
--- a/pages/probes/[id].vue
+++ b/pages/probes/[id].vue
@@ -1,9 +1,9 @@
 <template>
-	<div class="min-h-full p-6">
-		<div class="flex flex-col gap-4">
+	<div class="flex h-full flex-col p-6 pb-0">
+		<div class="flex min-h-0 flex-1 flex-col gap-4">
 			<div class="flex gap-2">
 				<NuxtLink
-					:to="getBackToProbesHref()"
+					:to="probePageLink"
 					class="mr-auto flex cursor-pointer items-center gap-2 focus-visible:rounded-md focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary focus-visible:ring-offset-2"
 					aria-label="Go back to the list of probes"
 				>
@@ -49,7 +49,7 @@
 					</span>
 
 					<span class="flex h-[30px] items-center gap-2 rounded-md border border-surface-300 px-2 dark:border-dark-600">
-						<nuxt-icon class="text-green-500" name="coin"/>
+						<NuxtIcon class="text-green-500" name="coin" aria-hidden="true"/>
 						<span class="font-bold text-green-500">+{{ probeCreditsPerMonth }}</span>
 					</span>
 				</div>
@@ -96,20 +96,19 @@
 				Your probe container is running an outdated software and we couldn't update it automatically. Please follow <NuxtLink class="font-semibold" to="#" @click="updateProbeDialog = true">our guide</NuxtLink> to update it manually.
 			</Message>
 
-			<Tabs value="0">
+			<Tabs v-if="probeDetails" v-model:value="activeTab" lazy class="flex min-h-0 flex-1 flex-col">
 				<TabList ref="tabListRef" class="!border-b !border-surface-300 dark:!border-dark-600 [&_[data-pc-section='tablist']]:!border-none">
-					<Tab value="0" tabindex="0" class="!w-1/2 border-none !px-6 !py-2 !text-[14px] !font-bold sm:!w-auto">Details</Tab>
-					<!-- temporarily hide Logs tab while it's under construction -->
-					<!-- <Tab value="1" tabindex="0" class="!w-1/2 border-none !px-6 !py-2 !text-[14px] !font-bold sm:!w-auto">Logs</Tab> -->
+					<Tab value="details" tabindex="0" class="!w-1/2 border-none !px-6 !py-2 !text-[14px] !font-bold sm:!w-auto">Details</Tab>
+					<Tab v-if="auth.isAdmin" value="logs" tabindex="0" class="!w-1/2 border-none !px-6 !py-2 !text-[14px] !font-bold sm:!w-auto">Logs</Tab>
 				</TabList>
 
-				<TabPanels class="mt-6 !bg-transparent !p-0">
-					<TabPanel v-if="probeDetails" value="0" tabindex="-1">
+				<TabPanels class="mt-6 flex min-h-0 flex-1 flex-col !bg-transparent !p-0">
+					<TabPanel value="details" tabindex="-1">
 						<ProbeTabDetails v-model:probe-details-updating="probeDetailsUpdating" v-model:probe="probeDetails"/>
 					</TabPanel>
 
-					<TabPanel value="1" tabindex="-1">
-						NO LOGS FOR NOW
+					<TabPanel class="flex min-h-0 flex-1 flex-col" value="logs" tabindex="-1">
+						<ProbeTabLogs :probe-id="probeDetails.id"/>
 					</TabPanel>
 				</TabPanels>
 			</Tabs>
@@ -128,6 +127,7 @@
 <script setup lang="ts">
 	import { readItem, aggregate } from '@directus/sdk';
 	import { useErrorToast } from '~/composables/useErrorToast';
+	import { useProbeDetailTabs } from '~/composables/useProbeDetailTabs';
 	import { useAuth } from '~/store/auth';
 	import { useMetadata } from '~/store/metadata.js';
 	import { getProbeStatusColor, getProbeStatusText, isOutdated } from '~/utils/probe-status';
@@ -145,6 +145,8 @@
 	const showMoreIps = ref(false);
 	const windowSize = useWindowSize();
 	const tabListRef = useTemplateRef('tabListRef');
+	const activeTab = useProbeDetailTabs();
+	const probePageLink = ref('/probes');
 
 	const { data: probeDetails, error: probeDetailsError } = await useAsyncData<Probe>(() => $directus.request(readItem('gp_probes', probeId)));
 
@@ -184,7 +186,7 @@
 
 	// HANDLE CREDITS
 	const { data: probeCreditsPerMonth, error: creditsError } = await useAsyncData(
-		() => $directus.request<[{ sum: { amount: number }; adopted_probe: string }]>(aggregate('gp_credits_additions', {
+		() => $directus.request<{ sum: { amount: number }; adopted_probe: string }[]>(aggregate('gp_credits_additions', {
 			query: {
 				filter: {
 					github_id: { _eq: user.value.external_identifier || 'admin' },
@@ -195,17 +197,16 @@
 			groupBy: [ 'adopted_probe' ],
 			aggregate: { sum: 'amount' },
 		})),
-		{ watch: [ probeDetails ], transform: data => data?.[0].sum.amount ?? 0 },
+		{ watch: [ probeDetails ], transform: data => data[0]?.sum.amount ?? 0 },
 	);
 
 	useErrorToast(creditsError);
 
-	// HANDLE GO BACK TO PROBES
-	const getBackToProbesHref = () => {
-		const defaultPath = '/probes';
-		const prevPath = typeof router.options.history.state.back === 'string' ? router.options.history.state.back : defaultPath;
-		const isPrevPathValid = prevPath.startsWith(defaultPath);
+	onMounted(() => {
+		const prevPage = router.options.history.state.back;
 
-		return isPrevPathValid ? prevPath : defaultPath;
-	};
+		if (typeof prevPage === 'string' && prevPage?.startsWith('/probes?')) {
+			probePageLink.value = prevPage;
+		}
+	});
 </script>
diff --git a/pages/probes/index.vue b/pages/probes/index.vue
index f4d7eef5..adf3c68f 100644
--- a/pages/probes/index.vue
+++ b/pages/probes/index.vue
@@ -15,7 +15,7 @@
 			<span class="ml-auto max-md:inline-block" :class="{ 'hidden': selectedProbes.length }"/>
 
 			<Button class="ml-2" @click="adoptProbeDialog = true">
-				<nuxt-icon class="pi" name="capture"/>
+				<NuxtIcon class="pi" name="capture" aria-hidden="true"/>
 				<span class="font-bold">Adopt a probe</span>
 			</Button>
 		</div>
@@ -52,12 +52,12 @@
 									class="min-w-64"
 									@change="onStatusChange"
 								>
-									<template #option="{option}">
+									<template #option="{option}: {option: StatusCode}">
 										<span class="flex h-full items-center gap-2">
 											<span
 												:class="{
 													'font-bold text-bluegray-900 dark:text-white': option === filter.status,
-													'text-bluegray-400': option.code !== filter.status
+													'text-bluegray-400': option !== filter.status
 												}">
 												{{ STATUS_MAP[option].name }}
 											</span>
@@ -72,7 +72,7 @@
 										</span>
 									</template>
 
-									<template #value="{value}">
+									<template #value="{value}: {value: StatusCode}">
 										<span class="flex h-full items-center gap-2">
 											<span class="text-bluegray-400">{{ STATUS_MAP[value].name }}</span>
 											<Tag class="-my-1 border ">{{ statusCounts[value] }}</Tag>
@@ -147,7 +147,7 @@
 							<div class="flex items-center">
 								<span>Credits gained past month:</span>
 								<Tag v-tooltip.top="'Credits are assigned once a day for probes that have been up for at least 20 hours.'" class="ml-2 flex items-center border bg-surface-0 !text-sm" severity="success">
-									<nuxt-icon class="mr-2" name="coin"/>+{{ totalCredits.toLocaleString('en-US') }}
+									<NuxtIcon class="mr-2" name="coin" aria-hidden="true"/>+{{ totalCredits.toLocaleString('en-US') }}
 								</Tag>
 							</div>
 
@@ -226,7 +226,7 @@
 								<div class="flex items-center justify-between">
 									<span class="text-xs font-bold">Credits gained past month:</span>
 									<Tag v-tooltip.top="'Credits are assigned once a day for probes that have been up for at least 20 hours.'" class="flex items-center border bg-surface-0 !text-sm" severity="success">
-										<nuxt-icon class="mr-2" name="coin"/>+{{ totalCredits.toLocaleString('en-US') }}
+										<NuxtIcon class="mr-2" name="coin" aria-hidden="true"/>+{{ totalCredits.toLocaleString('en-US') }}
 									</Tag>
 								</div>
 								<div class="mt-2 flex items-center justify-between">
@@ -363,7 +363,7 @@
 	const filterDeps = computed(() => { return { ...filter.value }; });
 
 	const { data: totalCredits, error: creditError } = await useLazyAsyncData(
-		() => $directus.request<[{ sum: { amount: number } }]>(aggregate('gp_credits_additions', {
+		() => $directus.request<{ sum: { amount: number } }[]>(aggregate('gp_credits_additions', {
 			query: {
 				filter: {
 					...getUserFilter('github_id'),
@@ -375,7 +375,7 @@
 		})),
 		{
 			default: () => 0,
-			transform: data => data[0]?.sum?.amount ?? 0,
+			transform: data => data[0]?.sum.amount ?? 0,
 		},
 	);
 
@@ -469,7 +469,7 @@
 	});
 
 	watch(statusCounts, (newStatusCounts) => {
-		paginatedRecords.value = newStatusCounts[filter.value.status];
+		paginatedRecords.value = newStatusCounts[filter.value.status]!;
 		hasAnyProbes.value = hasAnyProbes.value || !!newStatusCounts['all'];
 	}, { deep: true, immediate: true });
 
@@ -520,9 +520,9 @@
 		columns.at(-1)!.width += dataTableWidth.value - usedWidth;
 
 		return {
-			name: columns[2].width,
-			location: columns[3].width,
-			tags: columns[4].width,
+			name: columns[2]!.width,
+			location: columns[3]!.width,
+			tags: columns[4]!.width,
 		};
 	});
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 66284000..bf024a58 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -52,9 +52,6 @@ importers:
       nuxt:
         specifier: ^3.17.5
         version: 3.17.5(@parcel/watcher@2.5.1)(@types/node@24.0.3)(db0@0.3.2)(encoding@0.1.13)(eslint@9.29.0(jiti@2.4.2))(ioredis@5.6.1)(lightningcss@1.30.1)(magicast@0.3.5)(meow@13.2.0)(optionator@0.9.4)(rollup@4.44.0)(sass@1.77.0)(stylelint@14.16.1)(terser@5.43.1)(typescript@5.8.3)(vite@6.3.5(@types/node@24.0.3)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.77.0)(terser@5.43.1)(yaml@2.8.0))(vue-tsc@2.2.10(typescript@5.8.3))(yaml@2.8.0)
-      nuxt-icons:
-        specifier: ^3.2.1
-        version: 3.2.1(magicast@0.3.5)
       nuxt3-interpolation:
         specifier: ^1.0.16
         version: 1.0.16(magicast@0.3.5)(rollup@4.44.0)
@@ -3780,9 +3777,6 @@ packages:
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
-  nuxt-icons@3.2.1:
-    resolution: {integrity: sha512-trvAFq9oWYwWEQ0qZDHVxvLK+TwOdFnoXYOXQvN1CRUlp1DBJdxC8vXO3mED2Kb+Suag+bpWLC6eXGrRwhfffQ==}
-
   nuxt3-interpolation@1.0.16:
     resolution: {integrity: sha512-au72cD+Iq6chaMQsaN+C1D0yckyxiipU30hYf5j1Ea37XVuCHU0MfbGhuYZ2QFNXM7K8eV5kOTAczEwZerKBzQ==}
 
@@ -9567,12 +9561,6 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nuxt-icons@3.2.1(magicast@0.3.5):
-    dependencies:
-      '@nuxt/kit': 3.17.5(magicast@0.3.5)
-    transitivePeerDependencies:
-      - magicast
-
   nuxt3-interpolation@1.0.16(magicast@0.3.5)(rollup@4.44.0):
     dependencies:
       '@nuxt/kit': 0.8.1-edge(magicast@0.3.5)(rollup@4.44.0)
diff --git a/tailwind.config.js b/tailwind.config.js
index 8cdc5189..c2ead137 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -72,6 +72,16 @@ export default {
 				'2xs': [ '0.7rem', '0.85rem' ],
 				'3xs': [ '0.6rem', '0.7rem' ],
 			},
+			keyframes: {
+				'dot-pulse': {
+					'0%': { opacity: '.5' },
+					'30%': { opacity: '1' },
+					'60%,100%': { opacity: '.5' },
+				},
+			},
+			animation: {
+				'dot-pulse': 'dot-pulse 1.2s ease-in-out infinite',
+			},
 		},
 	},
 };
diff --git a/tsconfig.json b/tsconfig.json
index d42b37aa..76c3f882 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,7 +4,8 @@
 	"compilerOptions": {
 		"types": [
 			"@types/google.maps"
-		]
+		],
+		"noUncheckedIndexedAccess": true
 	},
 	"exclude": [
 		"test/e2e/globalping-dash-directus"
diff --git a/types.ts b/types.ts
index f434eae7..6f19d00a 100644
--- a/types.ts
+++ b/types.ts
@@ -82,8 +82,8 @@ declare global {
 		asn: number;
 		city: string;
 		country: TCountry;
-		state: TCountry extends 'US' ? string | null : null;
-		stateName: TCountry extends 'US' ? string | null : null;
+		state: TCountry extends 'US' ? string : null;
+		stateName: TCountry extends 'US' ? string : null;
 		date_created: string;
 		date_updated: string;
 		ip: string;
@@ -201,4 +201,11 @@ declare global {
 		creditsPerDollar: number;
 		creditsPerAdoptedProbe: number;
 	};
+
+	type ProbeLog = {
+		message: string;
+		scope?: string;
+		level?: string;
+		timestamp?: string;
+	};
 }
diff --git a/utils/date-formatters.ts b/utils/date-formatters.ts
index 9ba0e15f..172e32ee 100644
--- a/utils/date-formatters.ts
+++ b/utils/date-formatters.ts
@@ -16,7 +16,7 @@ export const formatDate = (date: string | Date | null, format: 'long' | 'short'
 	return date.toLocaleDateString('en-US', { day: 'numeric', month: 'short', year: 'numeric' });
 };
 
-export const formatDateForTable = (date: string | Date | null) => {
+export const formatDateForTable = (date: string | Date | null): string => {
 	if (!date) {
 		return '';
 	}
@@ -25,7 +25,7 @@ export const formatDateForTable = (date: string | Date | null) => {
 		date = new Date(date);
 	}
 
-	return date.toISOString().split('T')[0];
+	return date.toISOString().split('T')[0]!;
 };
 
 /**
@@ -64,11 +64,11 @@ export function getRelativeTimeString (date: Date | string, noTime: boolean = fa
 
 	// Get the divisor to divide from the seconds. E.g. if our unit is "day" our divisor
 	// is one day in seconds, so we can divide our seconds by this to get the # of days
-	const divisor = unitIndex ? cutoffs[unitIndex - 1] : 1;
+	const divisor = unitIndex ? cutoffs[unitIndex - 1]! : 1;
 
 	// Intl.RelativeTimeFormat do its magic
 	const rtf = new Intl.RelativeTimeFormat('en-US', { numeric: 'auto' });
-	return capitalize(rtf.format(Math.ceil(deltaSeconds / divisor), units[unitIndex]));
+	return capitalize(rtf.format(Math.ceil(deltaSeconds / divisor), units[unitIndex]!));
 }
 
 /**
diff --git a/utils/send-toast.ts b/utils/send-toast.ts
index 7df50d97..039f49f2 100644
--- a/utils/send-toast.ts
+++ b/utils/send-toast.ts
@@ -7,6 +7,7 @@ export const sendToast = (severity: ToastMessageOptions['severity'], summary: st
 };
 
 export const sendErrorToast = (error: unknown) => {
+	console.error(error);
 	const toastService = useToastService();
 	const e = error as DashboardError;