diff --git a/src-web/components/ExportDataDialog.tsx b/src-web/components/ExportDataDialog.tsx
index 0e5c16dd..c75dfcf6 100644
--- a/src-web/components/ExportDataDialog.tsx
+++ b/src-web/components/ExportDataDialog.tsx
@@ -10,6 +10,7 @@ import { invokeCmd } from '../lib/tauri';
 import { Button } from './core/Button';
 import { Checkbox } from './core/Checkbox';
 import { DetailsBanner } from './core/DetailsBanner';
+import { Link } from './core/Link';
 import { HStack, VStack } from './core/Stacks';
 
 interface Props {
@@ -131,21 +132,26 @@ function ExportDataDialogContent({
           help='Environments marked as "sharable" will be exported by default'
         />
       </DetailsBanner>
-      <HStack space={2} justifyContent="end">
-        <Button className="focus" variant="border" onClick={onHide}>
-          Cancel
-        </Button>
-        <Button
-          type="submit"
-          className="focus"
-          color="primary"
-          disabled={noneSelected}
-          onClick={() => handleExport()}
-        >
-          Export{' '}
-          {pluralizeCount('Workspace', numSelected, { omitSingle: true, noneWord: 'Nothing' })}
-        </Button>
-      </HStack>
+      <div className="grid grid-cols-[1fr_auto] items-center mt-6 pb-1.5">
+        <div>
+          <Link href="https://yaak.app/button/new" noUnderline className="text-text-subtle">Create Run Button</Link>
+        </div>
+        <HStack space={2} justifyContent="end">
+          <Button className="focus" variant="border" onClick={onHide}>
+            Cancel
+          </Button>
+          <Button
+            type="submit"
+            className="focus"
+            color="primary"
+            disabled={noneSelected}
+            onClick={() => handleExport()}
+          >
+            Export{' '}
+            {pluralizeCount('Workspace', numSelected, { omitSingle: true, noneWord: 'Nothing' })}
+          </Button>
+        </HStack>
+      </div>
     </VStack>
   );
 }
diff --git a/src-web/components/Settings/SettingsPlugins.tsx b/src-web/components/Settings/SettingsPlugins.tsx
index f0ad0b43..c135d2ea 100644
--- a/src-web/components/Settings/SettingsPlugins.tsx
+++ b/src-web/components/Settings/SettingsPlugins.tsx
@@ -46,7 +46,7 @@ export function SettingsPlugins() {
         addBorders
         tabListClassName="!-ml-3"
         tabs={[
-          { label: 'Marketplace', value: 'search' },
+          { label: 'Discover', value: 'search' },
           {
             label: 'Installed',
             value: 'installed',
diff --git a/src-web/components/SettingsDropdown.tsx b/src-web/components/SettingsDropdown.tsx
index 473647ae..f0b07cfe 100644
--- a/src-web/components/SettingsDropdown.tsx
+++ b/src-web/components/SettingsDropdown.tsx
@@ -43,10 +43,11 @@ export function SettingsDropdown() {
           },
         },
         {
-          label: 'Create Run Button',
-          leftSlot: <Icon icon="rocket" />,
-          onSelect: () => openUrl("https://yaak.app/button/new"),
+          label: 'Plugins',
+          leftSlot: <Icon icon="puzzle" />,
+          onSelect: () => openSettings.mutate('plugins'),
         },
+        { type: 'separator', label: 'Share Workspace(s)' },
         {
           label: 'Import Data',
           leftSlot: <Icon icon="folder_input" />,
@@ -57,6 +58,11 @@ export function SettingsDropdown() {
           leftSlot: <Icon icon="folder_output" />,
           onSelect: () => exportData.mutate(),
         },
+        {
+          label: 'Create Run Button',
+          leftSlot: <Icon icon="rocket" />,
+          onSelect: () => openUrl('https://yaak.app/button/new'),
+        },
         { type: 'separator', label: `Yaak v${appInfo.version}` },
         {
           label: 'Purchase License',
diff --git a/src-web/components/core/Icon.tsx b/src-web/components/core/Icon.tsx
index c59b4f3d..4e0b1b28 100644
--- a/src-web/components/core/Icon.tsx
+++ b/src-web/components/core/Icon.tsx
@@ -92,6 +92,7 @@ const icons = {
   plug: lucide.Plug,
   plus: lucide.PlusIcon,
   plus_circle: lucide.PlusCircleIcon,
+  puzzle: lucide.PuzzleIcon,
   refresh: lucide.RefreshCwIcon,
   rocket: lucide.RocketIcon,
   save: lucide.SaveIcon,