diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 825790a7..5fcdd9f4 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -8000,6 +8000,7 @@ dependencies = [
  "tauri-plugin-yaak-license",
  "tokio",
  "tokio-stream",
+ "ts-rs",
  "urlencoding",
  "uuid",
  "yaak_grpc",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index eedeb2a8..9a2b6b15 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -63,6 +63,7 @@ tauri-plugin-updater = "2.0.2"
 tauri-plugin-window-state = "2.0.1"
 tokio = { version = "1.36.0", features = ["sync"] }
 tokio-stream = "0.1.15"
+ts-rs = { workspace = true }
 uuid = "1.7.0"
 mime_guess = "2.0.5"
 urlencoding = "2.1.3"
diff --git a/src-tauri/bindings/analytics.ts b/src-tauri/bindings/analytics.ts
new file mode 100644
index 00000000..23e21581
--- /dev/null
+++ b/src-tauri/bindings/analytics.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AnalyticsAction = "cancel" | "click" | "commit" | "create" | "delete" | "delete_many" | "duplicate" | "export" | "hide" | "import" | "launch" | "launch_first" | "launch_update" | "send" | "show" | "toggle" | "update" | "upsert";
+
+export type AnalyticsResource = "app" | "appearance" | "button" | "checkbox" | "cookie_jar" | "dialog" | "environment" | "folder" | "grpc_connection" | "grpc_event" | "grpc_request" | "http_request" | "http_response" | "link" | "key_value" | "plugin" | "select" | "setting" | "sidebar" | "tab" | "theme" | "workspace";
diff --git a/src-tauri/src/analytics.rs b/src-tauri/src/analytics.rs
index dda9a053..284f64b8 100644
--- a/src-tauri/src/analytics.rs
+++ b/src-tauri/src/analytics.rs
@@ -4,7 +4,7 @@ use log::{debug, info};
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use tauri::{Manager, Runtime, WebviewWindow};
-
+use ts_rs::TS;
 use yaak_models::queries::{generate_id, get_key_value_int, get_key_value_string, get_or_create_settings, set_key_value_int, set_key_value_string};
 
 use crate::is_dev;
@@ -13,11 +13,14 @@ const NAMESPACE: &str = "analytics";
 const NUM_LAUNCHES_KEY: &str = "num_launches";
 
 // serializable
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, TS)]
 #[serde(rename_all = "snake_case")]
+#[ts(export, export_to = "analytics.ts")]
 pub enum AnalyticsResource {
     App,
     Appearance,
+    Button,
+    Checkbox,
     CookieJar,
     Dialog,
     Environment,
@@ -27,10 +30,13 @@ pub enum AnalyticsResource {
     GrpcRequest,
     HttpRequest,
     HttpResponse,
+    Link,
     KeyValue,
     Plugin,
+    Select,
     Setting,
     Sidebar,
+    Tab,
     Theme,
     Workspace,
 }
@@ -51,10 +57,12 @@ impl Display for AnalyticsResource {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, TS)]
 #[serde(rename_all = "snake_case")]
+#[ts(export, export_to = "analytics.ts")]
 pub enum AnalyticsAction {
     Cancel,
+    Click,
     Commit,
     Create,
     Delete,
@@ -156,7 +164,7 @@ pub async fn track_event<R: Runtime>(
     action: AnalyticsAction,
     attributes: Option<Value>,
 ) {
-    
+
     let id = get_id(w).await;
     let event = format!("{}.{}", resource, action);
     let attributes_json = attributes.unwrap_or("{}".to_string().into()).to_string();
diff --git a/src-tauri/yaak_license/bindings/license.ts b/src-tauri/yaak_license/bindings/license.ts
index 6f847f63..0232d424 100644
--- a/src-tauri/yaak_license/bindings/license.ts
+++ b/src-tauri/yaak_license/bindings/license.ts
@@ -8,4 +8,4 @@ export type ActivateLicenseResponsePayload = { activationId: string, };
 
 export type CheckActivationResponsePayload = { active: boolean, };
 
-export type LicenseCheckStatus = { "type": "personal_use" } | { "type": "commercial_use" } | { "type": "trialing", end: string, } | { "type": "trial_ended", end: string, };
+export type LicenseCheckStatus = { "type": "personal_use", trial_ended: string, } | { "type": "commercial_use" } | { "type": "invalid_license" } | { "type": "trialing", end: string, };
diff --git a/src-web/components/LicenseBadge.tsx b/src-web/components/LicenseBadge.tsx
index 3850e561..7712eaa7 100644
--- a/src-web/components/LicenseBadge.tsx
+++ b/src-web/components/LicenseBadge.tsx
@@ -10,9 +10,9 @@ const details: Record<
   { label: string; color: ButtonProps['color'] } | null
 > = {
   commercial_use: null,
-  invalid_license: { label: 'Invalid License', color: 'danger' },
-  personal_use: { label: 'Personal Use', color: 'success' },
-  trialing: { label: 'Personal Use', color: 'success' },
+  invalid_license: { label: 'License Error', color: 'danger' },
+  personal_use: { label: 'Personal Use', color: 'primary' },
+  trialing: { label: 'Personal Use', color: 'primary' },
 };
 
 export function LicenseBadge() {
@@ -35,6 +35,7 @@ export function LicenseBadge() {
       className="!rounded-full mx-1"
       onClick={() => openSettings.mutate()}
       color={detail.color}
+      event={{ id: 'license-badge', status: check.data.type }}
     >
       {detail.label}
     </Button>
diff --git a/src-web/components/Settings/SettingsAppearance.tsx b/src-web/components/Settings/SettingsAppearance.tsx
index 443fe6c6..097edd0c 100644
--- a/src-web/components/Settings/SettingsAppearance.tsx
+++ b/src-web/components/Settings/SettingsAppearance.tsx
@@ -4,7 +4,6 @@ import { useResolvedAppearance } from '../../hooks/useResolvedAppearance';
 import { useResolvedTheme } from '../../hooks/useResolvedTheme';
 import { useSettings } from '../../hooks/useSettings';
 import { useUpdateSettings } from '../../hooks/useUpdateSettings';
-import { trackEvent } from '../../lib/analytics';
 import { clamp } from '../../lib/clamp';
 import { getThemes } from '../../lib/theme/themes';
 import { isThemeDark } from '../../lib/theme/window';
@@ -89,6 +88,7 @@ export function SettingsAppearance() {
         value={`${settings.interfaceFontSize}`}
         options={fontSizes}
         onChange={(v) => updateSettings.mutate({ interfaceFontSize: parseInt(v) })}
+        event="font-size.interface"
       />
       <Select
         size="sm"
@@ -98,11 +98,13 @@ export function SettingsAppearance() {
         value={`${settings.editorFontSize}`}
         options={fontSizes}
         onChange={(v) => updateSettings.mutate({ editorFontSize: clamp(parseInt(v) || 14, 8, 30) })}
+        event="font-size.editor"
       />
       <Checkbox
         checked={settings.editorSoftWrap}
         title="Wrap Editor Lines"
         onChange={(editorSoftWrap) => updateSettings.mutate({ editorSoftWrap })}
+        event="wrap-lines"
       />
 
       <Separator className="my-4" />
@@ -113,10 +115,8 @@ export function SettingsAppearance() {
         labelPosition="top"
         size="sm"
         value={settings.appearance}
-        onChange={(appearance) => {
-          trackEvent('appearance', 'update', { appearance });
-          updateSettings.mutateAsync({ appearance });
-        }}
+        onChange={(appearance) => updateSettings.mutate({ appearance })}
+        event="appearance"
         options={[
           { label: 'Automatic', value: 'system' },
           { label: 'Light', value: 'light' },
@@ -134,10 +134,8 @@ export function SettingsAppearance() {
             className="flex-1"
             value={activeTheme.light.id}
             options={lightThemes}
-            onChange={(themeLight) => {
-              trackEvent('theme', 'update', { theme: themeLight, appearance: 'light' });
-              updateSettings.mutateAsync({ ...settings, themeLight });
-            }}
+            event="theme.light"
+            onChange={(themeLight) => updateSettings.mutate({ ...settings, themeLight })}
           />
         )}
         {(settings.appearance === 'system' || settings.appearance === 'dark') && (
@@ -150,10 +148,8 @@ export function SettingsAppearance() {
             size="sm"
             value={activeTheme.dark.id}
             options={darkThemes}
-            onChange={(themeDark) => {
-              trackEvent('theme', 'update', { theme: themeDark, appearance: 'dark' });
-              updateSettings.mutateAsync({ ...settings, themeDark });
-            }}
+            event="theme.dark"
+            onChange={(themeDark) => updateSettings.mutate({ ...settings, themeDark })}
           />
         )}
       </HStack>
diff --git a/src-web/components/Settings/SettingsGeneral.tsx b/src-web/components/Settings/SettingsGeneral.tsx
index d68d5509..31e86701 100644
--- a/src-web/components/Settings/SettingsGeneral.tsx
+++ b/src-web/components/Settings/SettingsGeneral.tsx
@@ -37,6 +37,7 @@ export function SettingsGeneral() {
           size="sm"
           value={settings.updateChannel}
           onChange={(updateChannel) => updateSettings.mutate({ updateChannel })}
+          event="update-channel"
           options={[
             { label: 'Stable (less frequent)', value: 'stable' },
             { label: 'Beta (more frequent)', value: 'beta' },
@@ -57,6 +58,7 @@ export function SettingsGeneral() {
         labelPosition="left"
         labelClassName="w-[12rem]"
         size="sm"
+        event="workspace-open"
         value={
           settings.openWorkspaceNewWindow === true
             ? 'new'
@@ -80,6 +82,7 @@ export function SettingsGeneral() {
         className="mt-3"
         checked={settings.telemetry}
         title="Send Usage Statistics"
+        event="usage-statistics"
         onChange={(telemetry) => updateSettings.mutate({ telemetry })}
       />
 
@@ -107,6 +110,7 @@ export function SettingsGeneral() {
         <Checkbox
           checked={workspace.settingValidateCertificates}
           title="Validate TLS Certificates"
+          event="validate-certs"
           onChange={(settingValidateCertificates) =>
             updateWorkspace.mutate({ settingValidateCertificates })
           }
@@ -115,6 +119,7 @@ export function SettingsGeneral() {
         <Checkbox
           checked={workspace.settingFollowRedirects}
           title="Follow Redirects"
+          event="follow-redirects"
           onChange={(settingFollowRedirects) => updateWorkspace.mutate({ settingFollowRedirects })}
         />
       </VStack>
diff --git a/src-web/components/Settings/SettingsLicense.tsx b/src-web/components/Settings/SettingsLicense.tsx
index cd957229..060b52af 100644
--- a/src-web/components/Settings/SettingsLicense.tsx
+++ b/src-web/components/Settings/SettingsLicense.tsx
@@ -21,29 +21,27 @@ export function SettingsLicense() {
 
   return (
     <div className="flex flex-col gap-6">
-      {check.data?.type === 'commercial_use' && (
+      {check.data?.type === 'commercial_use' ? (
         <Banner color="success">
           <strong>License active!</strong> Enjoy using Yaak for commercial use.
         </Banner>
-      )}
-      {check.data?.type === 'trialing' && (
-        <Banner color="success">
-          <strong>Your trial ends in {formatDistanceToNow(check.data.end)}</strong>. If you&apos;re
-          using Yaak for commercial use, please purchase a commercial use license.
-        </Banner>
-      )}
-      {check.data?.type === 'personal_use' && (
+      ) : (
         <Banner color="primary" className="flex flex-col gap-2">
-          <h2 className="text-lg font-semibold">Commercial License</h2>
+          {check.data?.type === 'trialing' && (
+            <p>
+              <strong>Your trial ends in {formatDistanceToNow(check.data.end)}.</strong>
+            </p>
+          )}
           <p>
-            A commercial license is required if you use Yaak within a for-profit organization of two
-            or more people.
-          </p>
-          <p>
-            <Link href="https://yaak.app/pricing" className="text-sm">
-              Learn More
-            </Link>
+            A commercial license is required if using Yaak within a for-profit organization of two
+            or more people. This helps support the ongoing development of Yaak and ensures continued
+            growth and improvement.
           </p>
+          <p>If you&#39;re using Yaak for personal use, no action is needed.</p>
+          <p>~ Gregory</p>
+          <Link href="https://yaak.app/pricing" className="text-sm text-text-subtle">
+            Learn More
+          </Link>
         </Banner>
       )}
 
@@ -52,7 +50,13 @@ export function SettingsLicense() {
 
       {check.data?.type === 'commercial_use' ? (
         <HStack space={2}>
-          <Button variant="border" color="secondary" size="sm" onClick={toggleActivateFormVisible}>
+          <Button
+            variant="border"
+            color="secondary"
+            size="sm"
+            onClick={toggleActivateFormVisible}
+            event="license.another"
+          >
             Activate Another License
           </Button>
           <Button
@@ -60,20 +64,27 @@ export function SettingsLicense() {
             size="sm"
             onClick={() => open('https://yaak.app/dashboard')}
             rightSlot={<Icon icon="external_link" />}
+            event="license.support"
           >
             Direct Support
           </Button>
         </HStack>
       ) : (
         <HStack space={2}>
-          <Button color="primary" size="sm" onClick={toggleActivateFormVisible}>
-            Activate License
+          <Button
+            color="primary"
+            size="sm"
+            onClick={toggleActivateFormVisible}
+            event="license.activate"
+          >
+            Activate
           </Button>
           <Button
             color="secondary"
             size="sm"
-            onClick={() => open('https://yaak.app/pricing')}
+            onClick={() => open('https://yaak.app/pricing?ref=app.yaak.desktop')}
             rightSlot={<Icon icon="external_link" />}
+            event="license.purchase"
           >
             Purchase
           </Button>
@@ -98,7 +109,13 @@ export function SettingsLicense() {
             onChange={setKey}
             placeholder="YK1-XXXXX-XXXXX-XXXXX-XXXXX"
           />
-          <Button type="submit" color="primary" size="sm" isLoading={activate.isPending}>
+          <Button
+            type="submit"
+            color="primary"
+            size="sm"
+            isLoading={activate.isPending}
+            event="license.submit"
+          >
             Submit
           </Button>
         </VStack>
diff --git a/src-web/components/Settings/SettingsPlugins.tsx b/src-web/components/Settings/SettingsPlugins.tsx
index 7ce6d6fc..9555fc36 100644
--- a/src-web/components/Settings/SettingsPlugins.tsx
+++ b/src-web/components/Settings/SettingsPlugins.tsx
@@ -61,7 +61,7 @@ export function SettingsPlugins() {
           />
           <HStack>
             {directory && (
-              <Button size="xs" type="submit" color="primary" className="ml-auto">
+              <Button size="xs" type="submit" color="primary" className="ml-auto" event="plugin.add">
                 Add Plugin
               </Button>
             )}
@@ -70,12 +70,14 @@ export function SettingsPlugins() {
               icon="refresh"
               title="Reload plugins"
               spin={refreshPlugins.isPending}
+              event="plugin.reload"
               onClick={() => refreshPlugins.mutate()}
             />
             <IconButton
               size="sm"
               icon="help"
               title="View documentation"
+              event="plugin.docs"
               onClick={() => open('https://feedback.yaak.app/help/articles/6911763-quick-start')}
             />
           </HStack>
@@ -100,6 +102,7 @@ function PluginInfo({ plugin }: { plugin: Plugin }) {
           icon="trash"
           title="Uninstall plugin"
           className="text-text-subtlest"
+          event="plugin.delete"
           onClick={() => deletePlugin.mutate()}
         />
       </td>
diff --git a/src-web/components/Settings/SettingsProxy.tsx b/src-web/components/Settings/SettingsProxy.tsx
index a90e13ba..748459b4 100644
--- a/src-web/components/Settings/SettingsProxy.tsx
+++ b/src-web/components/Settings/SettingsProxy.tsx
@@ -19,6 +19,7 @@ export function SettingsProxy() {
         hideLabel
         size="sm"
         value={settings.proxy?.type ?? 'automatic'}
+        event="proxy"
         onChange={(v) => {
           if (v === 'automatic') {
             updateSettings.mutate({ proxy: undefined });
diff --git a/src-web/components/core/Button.tsx b/src-web/components/core/Button.tsx
index 002d89bb..1360c659 100644
--- a/src-web/components/core/Button.tsx
+++ b/src-web/components/core/Button.tsx
@@ -3,6 +3,7 @@ import type { HTMLAttributes, ReactNode } from 'react';
 import { forwardRef, useImperativeHandle, useRef } from 'react';
 import type { HotkeyAction } from '../../hooks/useHotKey';
 import { useFormattedHotkey, useHotKey } from '../../hooks/useHotKey';
+import { trackEvent } from '../../lib/analytics';
 import { Icon } from './Icon';
 
 export type ButtonProps = Omit<HTMLAttributes<HTMLButtonElement>, 'color' | 'onChange'> & {
@@ -28,6 +29,7 @@ export type ButtonProps = Omit<HTMLAttributes<HTMLButtonElement>, 'color' | 'onC
   leftSlot?: ReactNode;
   rightSlot?: ReactNode;
   hotkeyAction?: HotkeyAction;
+  event?: string | { id: string; [attr: string]: number | string };
 };
 
 export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button(
@@ -48,6 +50,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
     hotkeyAction,
     title,
     onClick,
+    event,
     ...props
   }: ButtonProps,
   ref,
@@ -107,7 +110,12 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
       type={type}
       className={classes}
       disabled={disabled || isLoading}
-      onClick={onClick}
+      onClick={(e) => {
+        onClick?.(e);
+        if (event != null) {
+          trackEvent('button', 'click', typeof event === 'string' ? { id: event } : event);
+        }
+      }}
       onDoubleClick={(e) => {
         // Kind of a hack? This prevents double-clicks from going through buttons. For example, when
         // double-clicking the workspace header to toggle window maximization
diff --git a/src-web/components/core/Checkbox.tsx b/src-web/components/core/Checkbox.tsx
index 3f6ecd6f..81c78947 100644
--- a/src-web/components/core/Checkbox.tsx
+++ b/src-web/components/core/Checkbox.tsx
@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
+import { trackEvent } from '../../lib/analytics';
 import { Icon } from './Icon';
 import { HStack } from './Stacks';
 
@@ -11,6 +12,7 @@ export interface CheckboxProps {
   disabled?: boolean;
   inputWrapperClassName?: string;
   hideLabel?: boolean;
+  event?: string;
 }
 
 export function Checkbox({
@@ -21,6 +23,7 @@ export function Checkbox({
   disabled,
   title,
   hideLabel,
+  event,
 }: CheckboxProps) {
   return (
     <HStack
@@ -37,7 +40,12 @@ export function Checkbox({
           )}
           type="checkbox"
           disabled={disabled}
-          onChange={() => onChange(checked === 'indeterminate' ? true : !checked)}
+          onChange={() => {
+            onChange(checked === 'indeterminate' ? true : !checked);
+            if (event != null) {
+              trackEvent('button', 'click', { id: event, checked: checked ? 'on' : 'off' });
+            }
+          }}
         />
         <div className="absolute inset-0 flex items-center justify-center">
           <Icon
diff --git a/src-web/components/core/Link.tsx b/src-web/components/core/Link.tsx
index af4c6608..6eeec22a 100644
--- a/src-web/components/core/Link.tsx
+++ b/src-web/components/core/Link.tsx
@@ -1,13 +1,15 @@
 import classNames from 'classnames';
 import type { HTMLAttributes } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
+import { trackEvent } from '../../lib/analytics';
 import { Icon } from './Icon';
 
 interface Props extends HTMLAttributes<HTMLAnchorElement> {
   href: string;
+  event?: string;
 }
 
-export function Link({ href, children, className, ...other }: Props) {
+export function Link({ href, children, className, event, ...other }: Props) {
   const isExternal = href.match(/^https?:\/\//);
 
   className = classNames(className, 'relative underline hover:text-violet-600');
@@ -19,6 +21,12 @@ export function Link({ href, children, className, ...other }: Props) {
         target="_blank"
         rel="noopener noreferrer"
         className={classNames(className, 'pr-4 inline-flex items-center')}
+        onClick={(e) => {
+          e.preventDefault();
+          if (event != null) {
+            trackEvent('link', 'click', { id: event });
+          }
+        }}
         {...other}
       >
         <span className="underline">{children}</span>
diff --git a/src-web/components/core/Select.tsx b/src-web/components/core/Select.tsx
index 76418bb1..3ca7ee50 100644
--- a/src-web/components/core/Select.tsx
+++ b/src-web/components/core/Select.tsx
@@ -2,6 +2,7 @@ import classNames from 'classnames';
 import type { CSSProperties, ReactNode } from 'react';
 import { useState } from 'react';
 import { useOsInfo } from '../../hooks/useOsInfo';
+import { trackEvent } from '../../lib/analytics';
 import type { ButtonProps } from './Button';
 import { Button } from './Button';
 import type { RadioDropdownItem } from './RadioDropdown';
@@ -20,6 +21,7 @@ export interface SelectProps<T extends string> {
   onChange: (value: T) => void;
   size?: ButtonProps['size'];
   className?: string;
+  event?: string;
 }
 
 export function Select<T extends string>({
@@ -33,6 +35,7 @@ export function Select<T extends string>({
   leftSlot,
   onChange,
   className,
+  event,
   size = 'md',
 }: SelectProps<T>) {
   const osInfo = useOsInfo();
@@ -40,6 +43,13 @@ export function Select<T extends string>({
   const id = `input-${name}`;
   const isInvalidSelection = options.find((o) => 'value' in o && o.value === value) == null;
 
+  const handleChange = (value: T) => {
+    onChange?.(value);
+    if (event != null) {
+      trackEvent('select', 'click', { id: event, value });
+    }
+  };
+
   return (
     <div
       className={classNames(
@@ -79,7 +89,7 @@ export function Select<T extends string>({
           <select
             value={value}
             style={selectBackgroundStyles}
-            onChange={(e) => onChange(e.target.value as T)}
+            onChange={(e) => handleChange(e.target.value as T)}
             onFocus={() => setFocused(true)}
             onBlur={() => setFocused(false)}
             className={classNames('pr-7 w-full outline-none bg-transparent')}
@@ -98,7 +108,7 @@ export function Select<T extends string>({
       ) : (
         // Use custom "select" component until Tauri can be configured to have select menus not always appear in
         // light mode
-        <RadioDropdown value={value} onChange={onChange} items={options}>
+        <RadioDropdown value={value} onChange={handleChange} items={options}>
           <Button
             className="w-full text-sm font-mono"
             justify="start"
diff --git a/src-web/components/core/Tabs/Tabs.tsx b/src-web/components/core/Tabs/Tabs.tsx
index 6e73086d..870e439f 100644
--- a/src-web/components/core/Tabs/Tabs.tsx
+++ b/src-web/components/core/Tabs/Tabs.tsx
@@ -1,6 +1,7 @@
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
 import { memo, useEffect, useRef } from 'react';
+import { trackEvent } from '../../../lib/analytics';
 import { Icon } from '../Icon';
 import type { RadioDropdownProps } from '../RadioDropdown';
 import { RadioDropdown } from '../RadioDropdown';
@@ -95,7 +96,14 @@ export function Tabs({
                   onChange={t.options.onChange}
                 >
                   <button
-                    onClick={isActive ? undefined : () => onChangeValue(t.value)}
+                    onClick={
+                      isActive
+                        ? undefined
+                        : () => {
+                            trackEvent('tab', 'click', { label, tab: t.value });
+                            onChangeValue(t.value);
+                          }
+                    }
                     className={btnClassName}
                   >
                     {option && 'shortLabel' in option
@@ -113,7 +121,14 @@ export function Tabs({
               return (
                 <button
                   key={t.value}
-                  onClick={() => onChangeValue(t.value)}
+                  onClick={
+                    isActive
+                      ? undefined
+                      : () => {
+                          trackEvent('tab', 'click', { label, tab: t.value });
+                          onChangeValue(t.value);
+                        }
+                  }
                   className={btnClassName}
                 >
                   {t.label}
diff --git a/src-web/hooks/useOpenSettings.tsx b/src-web/hooks/useOpenSettings.tsx
index 9cf7f61c..7d61db33 100644
--- a/src-web/hooks/useOpenSettings.tsx
+++ b/src-web/hooks/useOpenSettings.tsx
@@ -1,10 +1,11 @@
 import { useMutation } from '@tanstack/react-query';
-import type { SettingsTab } from '../components/Settings/Settings';
+import { SettingsTab } from '../components/Settings/Settings';
+import { trackEvent } from '../lib/analytics';
 import { invokeCmd } from '../lib/tauri';
 import { useActiveWorkspace } from './useActiveWorkspace';
 import { useAppRoutes } from './useAppRoutes';
 
-export function useOpenSettings(tab?: SettingsTab) {
+export function useOpenSettings(tab = SettingsTab.General) {
   const routes = useAppRoutes();
   const workspace = useActiveWorkspace();
   return useMutation({
@@ -12,6 +13,7 @@ export function useOpenSettings(tab?: SettingsTab) {
     mutationFn: async () => {
       if (workspace == null) return;
 
+      trackEvent('dialog', 'show', { id: 'settings', tab: `${tab}` });
       await invokeCmd('cmd_new_child_window', {
         url: routes.paths.workspaceSettings({ workspaceId: workspace.id, tab }),
         label: 'settings',
diff --git a/src-web/lib/analytics.ts b/src-web/lib/analytics.ts
index f3c1b029..14925291 100644
--- a/src-web/lib/analytics.ts
+++ b/src-web/lib/analytics.ts
@@ -1,41 +1,9 @@
+import type { AnalyticsAction, AnalyticsResource } from '../../src-tauri/bindings/analytics';
 import { invokeCmd } from './tauri';
 
-export type TrackResource =
-  | 'appearance'
-  | 'app'
-  | 'cookie_jar'
-  | 'dialog'
-  | 'environment'
-  | 'folder'
-  | 'grpc_connection'
-  | 'grpc_event'
-  | 'grpc_request'
-  | 'http_request'
-  | 'http_response'
-  | 'key_value'
-  | 'plugin'
-  | 'setting'
-  | 'sidebar'
-  | 'theme'
-  | 'workspace';
-
-export type TrackAction =
-  | 'cancel'
-  | 'commit'
-  | 'create'
-  | 'delete'
-  | 'delete_many'
-  | 'duplicate'
-  | 'hide'
-  | 'launch'
-  | 'send'
-  | 'show'
-  | 'toggle'
-  | 'update';
-
 export function trackEvent(
-  resource: TrackResource,
-  action: TrackAction,
+  resource: AnalyticsResource,
+  action: AnalyticsAction,
   attributes: Record<string, string | number> = {},
 ) {
   invokeCmd('cmd_track_event', {