diff --git a/packages/siera-desktop/src/ui/App.tsx b/packages/siera-desktop/src/ui/App.tsx
index 0fc8b72..01c27c8 100644
--- a/packages/siera-desktop/src/ui/App.tsx
+++ b/packages/siera-desktop/src/ui/App.tsx
@@ -68,7 +68,7 @@ export const App = () => {
     >
       <UpdateInformationProvider checkUpdate={checkForUpdates}>
         <ConfigProvider configRepository={configRepository}>
-          <AgentManagerProvider>
+          <AgentManagerProvider agentDependenciesProvider={agentDependenciesProvider}>
             <AgentContextWrapper>
               <SieraUiApp router={router} />
             </AgentContextWrapper>
diff --git a/packages/siera-ui/src/SieraUiApp.tsx b/packages/siera-ui/src/SieraUiApp.tsx
index 667377a..3dd32e0 100644
--- a/packages/siera-ui/src/SieraUiApp.tsx
+++ b/packages/siera-ui/src/SieraUiApp.tsx
@@ -11,7 +11,9 @@ import { sieraUiTheme } from './SieraUiTheme'
 import { GlobalErrorHandler } from './components/GlobalErrorHandler'
 import { UpdateNotifierModal } from './components/UpdateNotifierModal'
 import { useConfigUnsafe } from './contexts/ConfigProvider'
-import { CreateAgentModal, PresentInviteModal, ConfirmActionModal } from './modals'
+import { ConfirmActionModal } from './modals/ConfirmActionModal'
+import { CreateAgentModal } from './modals/CreateAgentModal'
+import { PresentInviteModal } from './modals/PresentInviteModal'
 
 interface SieraUiAppProps {
   router: RouterProviderProps['router']
diff --git a/packages/siera-ui/src/SieraUiTheme.ts b/packages/siera-ui/src/SieraUiTheme.ts
index 5a1a072..172b527 100644
--- a/packages/siera-ui/src/SieraUiTheme.ts
+++ b/packages/siera-ui/src/SieraUiTheme.ts
@@ -30,6 +30,10 @@ export const sieraUiTheme = (colorScheme: ColorScheme): MantineThemeOverride =>
         dropdown: {
           backgroundColor: theme.colorScheme === 'dark' ? theme.colors.backgroundOne[7] : '#ffffff',
         },
+        item: {
+          padding: '0.4rem 0.6rem',
+          minWidth: '8rem',
+        },
       }),
     },
 
@@ -39,6 +43,7 @@ export const sieraUiTheme = (colorScheme: ColorScheme): MantineThemeOverride =>
           fontWeight: 700,
           fontSize: '1.7rem',
           padding: `0 ${theme.spacing.xl}px`,
+          color: theme.colors.textOne[7],
         },
         modal: {
           border: `1px solid ${theme.colors.backgroundOne[6]}`,
diff --git a/packages/siera-ui/src/components/RecordActions.tsx b/packages/siera-ui/src/components/RecordActions.tsx
index 47dffb3..649782b 100644
--- a/packages/siera-ui/src/components/RecordActions.tsx
+++ b/packages/siera-ui/src/components/RecordActions.tsx
@@ -2,7 +2,7 @@ import { ActionIcon, createStyles, Group, Loader } from '@mantine/core'
 import { IconTrash } from '@tabler/icons'
 import React from 'react'
 
-import { openConfirmActionModal } from '../modals'
+import { openConfirmActionModal } from '../modals/ConfirmActionModal'
 
 import { PrimaryButton, SecondaryButton } from './generic'
 
@@ -28,9 +28,14 @@ export const RecordActions = ({ onAccept, onDecline, onDelete, isLoading, propag
     returnFn()
   }
 
-  const dangerAction = (returnFn: () => void) => (event: React.MouseEvent<HTMLButtonElement>) => {
+  const dangerAction = (confirmMethod: () => void) => (event: React.MouseEvent<HTMLButtonElement>) => {
     !propagateEvent && event.stopPropagation()
-    openConfirmActionModal('Delete record', 'Are you sure you want to delete this record?', returnFn)
+    openConfirmActionModal({
+      title: 'Delete record',
+      description: 'Are you sure you want to delete this record?',
+      confirmLabel: 'Delete',
+      onConfirm: confirmMethod,
+    })
   }
 
   const actions = [
diff --git a/packages/siera-ui/src/components/generic/buttons/Buttons.tsx b/packages/siera-ui/src/components/generic/buttons/Buttons.tsx
index 1de982a..35c3ea3 100644
--- a/packages/siera-ui/src/components/generic/buttons/Buttons.tsx
+++ b/packages/siera-ui/src/components/generic/buttons/Buttons.tsx
@@ -2,6 +2,7 @@ import type { ButtonProps } from '@mantine/core'
 import type { ButtonHTMLAttributes } from 'react'
 
 import { Button, createStyles } from '@mantine/core'
+import { useColorScheme } from '@mantine/hooks'
 import { IconArrowLeft, IconPlus } from '@tabler/icons'
 import React from 'react'
 
@@ -43,12 +44,22 @@ type PrimaryButtonProps = StandardButton & {
 }
 
 export const PrimaryButton = (props: PrimaryButtonProps) => {
+  const colorScheme = useColorScheme()
   const { classes, cx } = useStyles()
   const { withPlusIcon } = props
 
   const plusButton = withPlusIcon && <IconPlus size={16} stroke={3} />
 
-  return <Button leftIcon={plusButton} {...props} className={cx(classes.primary, props.className)} />
+  return (
+    <Button
+      leftIcon={plusButton}
+      loaderProps={{
+        stroke: colorScheme === 'dark' ? 'black' : 'white',
+      }}
+      {...props}
+      className={cx(classes.primary, props.className)}
+    />
+  )
 }
 
 export const SecondaryButton = (props: StandardButton) => {
diff --git a/packages/siera-ui/src/contexts/AgentManagerContext.tsx b/packages/siera-ui/src/contexts/AgentManagerContext.tsx
index a4b1e20..b1a13f2 100644
--- a/packages/siera-ui/src/contexts/AgentManagerContext.tsx
+++ b/packages/siera-ui/src/contexts/AgentManagerContext.tsx
@@ -1,8 +1,12 @@
-import type { AgentConfigRecord } from '@animo/siera-core'
+import type { AgentConfigRecord, AgentDependenciesProvider } from '@animo/siera-core'
 import type { ReactNode } from 'react'
 
+import { agentInitializer } from '@animo/siera-core/src/agent/AgentInitializer'
+import { showNotification } from '@mantine/notifications'
 import React, { createContext, useContext, useMemo, useState } from 'react'
 
+import { openConfirmActionModal } from '../modals/ConfirmActionModal'
+
 import { useConfigUnsafe } from './ConfigProvider'
 
 export interface IAgentContext {
@@ -10,6 +14,7 @@ export interface IAgentContext {
   currentAgentId?: string
   setCurrentAgentId: (id: string | undefined) => void
   addAgent: (agent: AgentConfigRecord) => Promise<void>
+  removeAgent: (agentId: string) => Promise<void>
   loading: boolean
   logout: () => void
 }
@@ -30,16 +35,45 @@ export const useCurrentAgentRecord = (): AgentConfigRecord | undefined => {
 
 interface AgentManagerProviderProps {
   children?: ReactNode
+  agentDependenciesProvider: AgentDependenciesProvider
 }
 
-export const AgentManagerProvider = ({ children }: AgentManagerProviderProps) => {
-  const { config, addAgent, loading } = useConfigUnsafe()
+export const AgentManagerProvider = ({ children, agentDependenciesProvider }: AgentManagerProviderProps) => {
+  const { config, addAgent, removeAgent: removeAgentFromConfig, loading } = useConfigUnsafe()
   const [currentAgentId, setCurrentAgentId] = useState<string>()
 
   const logout = () => {
     setCurrentAgentId(undefined)
   }
 
+  const removeAgent = async (agentId: string) => {
+    const agentRecord = config?.agents.find((agent) => agent.id === agentId)
+    if (!agentRecord) {
+      showNotification({
+        title: 'Error',
+        message: `Agent with id ${agentId} not found`,
+      })
+      return
+    }
+
+    try {
+      const loadedAgent = await agentInitializer(agentRecord.agentConfig, agentDependenciesProvider)
+      await loadedAgent.wallet.delete()
+      await loadedAgent.shutdown()
+    } catch (error) {
+      openConfirmActionModal({
+        title: 'Error while removing agent',
+        description: 'Do you want to continue? The agent wallet will not be deleted.',
+        onConfirm: async () => {
+          await removeAgentFromConfig(agentId)
+        },
+      })
+      return
+    }
+
+    await removeAgentFromConfig(agentId)
+  }
+
   return (
     <AgentManagerContext.Provider
       value={{
@@ -47,6 +81,7 @@ export const AgentManagerProvider = ({ children }: AgentManagerProviderProps) =>
         currentAgentId,
         agents: config?.agents || [],
         addAgent,
+        removeAgent,
         loading,
         logout,
       }}
diff --git a/packages/siera-ui/src/contexts/ConfigProvider.tsx b/packages/siera-ui/src/contexts/ConfigProvider.tsx
index 6d8745b..f4a72eb 100644
--- a/packages/siera-ui/src/contexts/ConfigProvider.tsx
+++ b/packages/siera-ui/src/contexts/ConfigProvider.tsx
@@ -7,6 +7,7 @@ type ConfigContext = {
   config?: SieraUiConfig
   loading: boolean
   addAgent: (agent: AgentConfigRecord) => Promise<void>
+  removeAgent: (agentId: string) => Promise<void>
   setColorScheme: (colorScheme: 'dark' | 'light') => Promise<void>
 }
 
@@ -62,6 +63,14 @@ export const ConfigProvider = ({ children, configRepository }: ConfigProviderPro
     setConfig(updatedConfig)
   }
 
+  const removeAgent = async (agentId: string) => {
+    if (!config) return
+
+    const updatedConfig = { ...config, agents: config.agents.filter((a) => a.id !== agentId) }
+    await saveConfig(updatedConfig)
+    setConfig(updatedConfig)
+  }
+
   const setColorScheme = async (colorScheme: 'dark' | 'light') => {
     if (!config) return
 
@@ -76,6 +85,7 @@ export const ConfigProvider = ({ children, configRepository }: ConfigProviderPro
         config,
         loading,
         addAgent,
+        removeAgent,
         setColorScheme,
       }}
     >
diff --git a/packages/siera-ui/src/layout/LayoutNavBar.tsx b/packages/siera-ui/src/layout/LayoutNavBar.tsx
index 3a37669..58c6bf4 100644
--- a/packages/siera-ui/src/layout/LayoutNavBar.tsx
+++ b/packages/siera-ui/src/layout/LayoutNavBar.tsx
@@ -1,7 +1,7 @@
 import type { Agent } from '@aries-framework/core'
 
 import { ActionIcon, createStyles, Flex, Menu, Navbar, useMantineColorScheme } from '@mantine/core'
-import { IconChevronDown } from '@tabler/icons'
+import { IconDotsVertical } from '@tabler/icons'
 import React, { useState } from 'react'
 
 import { useAgentManager } from '../contexts/AgentManagerContext'
@@ -71,10 +71,10 @@ export const LayoutNavBar = ({ navigationItems, agent }: LayoutNavigationProps)
       <Navbar.Section mx="md" className={classes.layoutAvatar}>
         <Flex gap="xs" justify="space-between">
           <LayoutAvatar agent={agent} />
-          <Menu shadow="md" width={200} position="bottom-end">
+          <Menu shadow="md" position="bottom-end" withArrow>
             <Menu.Target>
               <ActionIcon mt="xs">
-                <IconChevronDown />
+                <IconDotsVertical size={20} />
               </ActionIcon>
             </Menu.Target>
 
diff --git a/packages/siera-ui/src/modals/ConfirmActionModal.tsx b/packages/siera-ui/src/modals/ConfirmActionModal.tsx
index 3d0ea20..c9f2695 100644
--- a/packages/siera-ui/src/modals/ConfirmActionModal.tsx
+++ b/packages/siera-ui/src/modals/ConfirmActionModal.tsx
@@ -2,44 +2,62 @@ import type { ContextModalProps } from '@mantine/modals'
 
 import { Divider, Group, Stack, Text } from '@mantine/core'
 import { openContextModal } from '@mantine/modals'
-import React from 'react'
+import React, { useState } from 'react'
 
 import { PrimaryButton, SecondaryButton } from '../components/generic'
 
 type InnerProps = {
-  message: string
-  onConfirm: () => void
+  description: string
+  onConfirm: () => Promise<void> | void
+  confirmLabel?: string
 }
 
 export const ConfirmActionModal = ({
   id,
   context,
-  innerProps: { message, onConfirm },
+  innerProps: { description, onConfirm, confirmLabel },
 }: ContextModalProps<InnerProps>) => {
+  const [isSubmitting, setIsSubmitting] = useState(false)
+  const onConfirmClick = async () => {
+    setIsSubmitting(true)
+    try {
+      await onConfirm()
+      setIsSubmitting(false)
+      context.closeModal(id)
+    } catch (error) {
+      setIsSubmitting(false)
+      throw error
+    }
+  }
+
   return (
     <Stack mt="md">
-      <Text px="xl">{message}</Text>
+      <Text px="xl">{description}</Text>
       <Divider mt="md" mb="xs" />
       <Group position="right" px="xl">
         <SecondaryButton onClick={() => context.closeModal(id)}>Cancel</SecondaryButton>
-        <PrimaryButton
-          onClick={() => {
-            onConfirm()
-            context.closeModal(id)
-          }}
-        >
-          Confirm
+        <PrimaryButton onClick={onConfirmClick} loading={isSubmitting}>
+          {confirmLabel}
         </PrimaryButton>
       </Group>
     </Stack>
   )
 }
 
-export const openConfirmActionModal = (title: string, message: string, onConfirm: () => void) => {
+interface OpenConfirmActionModalProps extends InnerProps {
+  title: string
+}
+
+export const openConfirmActionModal = ({
+  title,
+  description,
+  onConfirm,
+  confirmLabel = 'Confirm',
+}: OpenConfirmActionModalProps) => {
   openContextModal({
     modal: ConfirmActionModal.name,
     title,
-    innerProps: { message, onConfirm },
+    innerProps: { description: description, onConfirm, confirmLabel },
     centered: true,
     withCloseButton: false,
   })
diff --git a/packages/siera-ui/src/modals/index.ts b/packages/siera-ui/src/modals/index.ts
deleted file mode 100644
index eb39700..0000000
--- a/packages/siera-ui/src/modals/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './CreateAgentModal'
-export * from './PresentInviteModal'
-export * from './ConfirmActionModal'
diff --git a/packages/siera-ui/src/pages/AgentSelectionScreen.tsx b/packages/siera-ui/src/pages/AgentSelectionScreen.tsx
index f8c86b4..7e4d6d9 100644
--- a/packages/siera-ui/src/pages/AgentSelectionScreen.tsx
+++ b/packages/siera-ui/src/pages/AgentSelectionScreen.tsx
@@ -1,4 +1,7 @@
-import { Box, Card, Container, createStyles, Flex, Text, Title, UnstyledButton } from '@mantine/core'
+import type { AgentConfigRecord } from '@animo/siera-core'
+
+import { ActionIcon, Box, Card, Container, createStyles, Flex, Menu, Text, Title, UnstyledButton } from '@mantine/core'
+import { IconDotsVertical } from '@tabler/icons'
 import React from 'react'
 
 import { Loading } from '../components/Loading'
@@ -6,7 +9,8 @@ import { SmartAvatar } from '../components/SmartAvatar'
 import { PrimaryButton } from '../components/generic'
 import { useAgentManager } from '../contexts/AgentManagerContext'
 import { useNavigation } from '../hooks/useNavigation'
-import { openCreateAgentModal } from '../modals'
+import { openConfirmActionModal } from '../modals/ConfirmActionModal'
+import { openCreateAgentModal } from '../modals/CreateAgentModal'
 
 import { WelcomeScreen } from './agent/WelcomeScreen'
 
@@ -14,6 +18,7 @@ const useStyles = createStyles((theme) => ({
   card: {
     backgroundColor: theme.colorScheme === 'dark' ? theme.colors.backgroundOne[7] : '#ffffff',
     border: `2px solid ${theme.colors.backgroundOne[6]}`,
+    overflow: 'unset',
 
     '&:hover': {
       border: `2px solid ${theme.colors.backgroundOne[5]}`,
@@ -33,13 +38,24 @@ const useStyles = createStyles((theme) => ({
 export const AgentSelectionScreen = () => {
   const { classes } = useStyles()
   const navigation = useNavigation()
-  const { agents, setCurrentAgentId, loading } = useAgentManager()
+  const { agents, setCurrentAgentId, removeAgent, loading } = useAgentManager()
 
   const switchToAgent = (agentId: string) => {
     setCurrentAgentId(agentId)
     navigation.navigate('/agent/connections')
   }
 
+  const stopPropagation = (event: React.MouseEvent<HTMLButtonElement | HTMLDivElement>) => event.stopPropagation()
+
+  const onDeleteAgent = (agentConfigRecord: AgentConfigRecord) => {
+    openConfirmActionModal({
+      title: 'Delete agent',
+      description: `Are you sure you want to delete '${agentConfigRecord.name}' ?`,
+      confirmLabel: 'Delete',
+      onConfirm: async () => await removeAgent(agentConfigRecord.id),
+    })
+  }
+
   if (loading) {
     return <Loading description="Loading configuration" />
   }
@@ -64,8 +80,8 @@ export const AgentSelectionScreen = () => {
       <Flex gap="md" wrap="wrap" mt="xl">
         {agents.map((agent) => (
           <UnstyledButton key={agent.id} onClick={() => switchToAgent(agent.id)}>
-            <Card h={80} w={220} className={classes.card} radius="md">
-              <Flex gap="sm" maw="100%" wrap="nowrap">
+            <Card h={80} w={220} className={classes.card} radius="md" p={0}>
+              <Flex gap="sm" maw="100%" align="center" wrap="nowrap" pl="sm" mih="100%">
                 <SmartAvatar src={agent.agentConfig.connectionImageUrl} size={38} radius="xl">
                   {agent.agentConfig.label}
                 </SmartAvatar>
@@ -77,6 +93,19 @@ export const AgentSelectionScreen = () => {
                     Native (AFJ)
                   </Text>
                 </Box>
+                <Flex style={{ flex: 'auto', alignSelf: 'start' }} justify="end">
+                  <Menu shadow="md" position="bottom-end" withArrow>
+                    <Menu.Target>
+                      <ActionIcon mt={2} onClick={stopPropagation} variant="transparent">
+                        <IconDotsVertical size={16} />
+                      </ActionIcon>
+                    </Menu.Target>
+
+                    <Menu.Dropdown onClick={stopPropagation}>
+                      <Menu.Item onClick={() => onDeleteAgent(agent)}>Delete</Menu.Item>
+                    </Menu.Dropdown>
+                  </Menu>
+                </Flex>
               </Flex>
             </Card>
           </UnstyledButton>
diff --git a/packages/siera-ui/src/pages/agent/WelcomeScreen.tsx b/packages/siera-ui/src/pages/agent/WelcomeScreen.tsx
index 6171ca6..4673c2d 100644
--- a/packages/siera-ui/src/pages/agent/WelcomeScreen.tsx
+++ b/packages/siera-ui/src/pages/agent/WelcomeScreen.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 
 import { PrimaryButton } from '../../components/generic'
 import { SieraLogo } from '../../logos/SieraLogo'
-import { openCreateAgentModal } from '../../modals'
+import { openCreateAgentModal } from '../../modals/CreateAgentModal'
 
 export const WelcomeScreen = () => {
   const { colorScheme } = useMantineColorScheme()
diff --git a/packages/siera-ui/src/pages/agent/connections/ConnectionsScreen.tsx b/packages/siera-ui/src/pages/agent/connections/ConnectionsScreen.tsx
index 047983f..e8c8c07 100644
--- a/packages/siera-ui/src/pages/agent/connections/ConnectionsScreen.tsx
+++ b/packages/siera-ui/src/pages/agent/connections/ConnectionsScreen.tsx
@@ -10,7 +10,7 @@ import { Loading } from '../../../components/Loading'
 import { ConnectionsTable } from '../../../components/connections/ConnectionsTable'
 import { PrimaryButton, SecondaryButton } from '../../../components/generic'
 import { EmptyState } from '../../../components/generic/table/EmptyState'
-import { openPresentInviteModal } from '../../../modals'
+import { openPresentInviteModal } from '../../../modals/PresentInviteModal'
 
 interface ConnectionInviteValues {
   url: string