diff --git a/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCard.tsx b/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCard.tsx
index 7c32959920..bf979e2c32 100644
--- a/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCard.tsx
+++ b/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCard.tsx
@@ -1,6 +1,5 @@
 import type { VideoMetadata } from "@cap/database/types";
 import {
-	Button,
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuItem,
@@ -11,7 +10,9 @@ import { HttpClient } from "@effect/platform";
 import {
 	faCheck,
 	faCopy,
+	faDownload,
 	faEllipsis,
+	faLink,
 	faLock,
 	faTrash,
 	faUnlock,
@@ -25,20 +26,18 @@ import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { type PropsWithChildren, useState } from "react";
 import { toast } from "sonner";
-import { downloadVideo } from "@/actions/videos/download";
 import { ConfirmationDialog } from "@/app/(org)/dashboard/_components/ConfirmationDialog";
 import { useDashboardContext } from "@/app/(org)/dashboard/Contexts";
 import ProgressCircle, {
 	useUploadProgress,
 } from "@/app/s/[videoId]/_components/ProgressCircle";
-import { Tooltip } from "@/components/Tooltip";
 import { VideoThumbnail } from "@/components/VideoThumbnail";
 import { useEffectMutation } from "@/lib/EffectRuntime";
 import { withRpc } from "@/lib/Rpcs";
 import { PasswordDialog } from "../PasswordDialog";
 import { SharingDialog } from "../SharingDialog";
 import { CapCardAnalytics } from "./CapCardAnalytics";
-import { CapCardButtons } from "./CapCardButtons";
+import { CapCardButton } from "./CapCardButton";
 import { CapCardContent } from "./CapCardContent";
 
 export interface CapCardProps extends PropsWithChildren {
@@ -305,51 +304,102 @@ export const CapCard = ({
 				{anyCapSelected && !sharedCapCard && (
 					<div className="absolute inset-0 z-10" onClick={handleCardClick} />
 				)}
-				{!sharedCapCard && (
-					<div
-						className={clsx(
-							"flex absolute duration-200",
-							anyCapSelected
-								? "opacity-0"
-								: isDropdownOpen
-									? "opacity-100"
-									: "opacity-0 group-hover:opacity-100",
-							"top-2 right-2 flex-col gap-2 z-[20]",
-						)}
-					>
-						<CapCardButtons
-							capId={cap.id}
-							copyPressed={copyPressed}
-							isDownloading={downloadMutation.isPending}
-							customDomain={customDomain}
-							domainVerified={domainVerified}
-							handleCopy={handleCopy}
-							handleDownload={handleDownload}
-						/>
 
-						<DropdownMenu modal={false} onOpenChange={setIsDropdownOpen}>
-							<Tooltip content="More options">
-								<DropdownMenuTrigger asChild>
-									<Button
-										onClick={(e) => {
-											e.stopPropagation();
-										}}
-										className={clsx(
-											"!size-8 hover:bg-gray-5 hover:border-gray-7 rounded-full min-w-fit !p-0 delay-75",
-											isDropdownOpen ? "bg-gray-5 border-gray-7" : "",
-										)}
-										variant="white"
-										size="sm"
-										aria-label="More options"
+				<div
+					className={clsx(
+						"flex absolute duration-200",
+						anyCapSelected
+							? "opacity-0"
+							: isDropdownOpen
+								? "opacity-100"
+								: "opacity-0 group-hover:opacity-100",
+						"top-2 right-2 flex-col gap-2 z-[20]",
+					)}
+				>
+					<CapCardButton
+						tooltipContent="Copy link"
+						onClick={(e) => {
+							e.stopPropagation();
+							handleCopy(cap.id);
+						}}
+						className="delay-0"
+						icon={() => {
+							return !copyPressed ? (
+								<FontAwesomeIcon
+									className="text-gray-12 size-4"
+									icon={faLink}
+								/>
+							) : (
+								<svg
+									xmlns="http://www.w3.org/2000/svg"
+									width="24"
+									height="24"
+									viewBox="0 0 24 24"
+									fill="none"
+									stroke="currentColor"
+									strokeWidth="2"
+									strokeLinecap="round"
+									strokeLinejoin="round"
+									className="text-gray-12 size-5 svgpathanimation"
+								>
+									<path d="M20 6 9 17l-5-5" />
+								</svg>
+							);
+						}}
+					/>
+					<CapCardButton
+						tooltipContent="Download Cap"
+						onClick={(e) => {
+							e.stopPropagation();
+							handleDownload();
+						}}
+						disabled={downloadMutation.isPending}
+						className="delay-25"
+						icon={() => {
+							return downloadMutation.isPending ? (
+								<div className="animate-spin size-3">
+									<svg
+										className="size-3"
+										xmlns="http://www.w3.org/2000/svg"
+										fill="none"
+										viewBox="0 0 24 24"
+										aria-hidden="true"
 									>
-										<FontAwesomeIcon
-											className="text-gray-12 size-4"
-											icon={faEllipsis}
-										/>
-									</Button>
-								</DropdownMenuTrigger>
-							</Tooltip>
+										<circle
+											className="opacity-25"
+											cx="12"
+											cy="12"
+											r="10"
+											stroke="currentColor"
+											strokeWidth="4"
+										></circle>
+										<path
+											className="opacity-75"
+											fill="currentColor"
+											d="m2 12c0-5.523 4.477-10 10-10v3c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7c0-1.457-.447-2.808-1.208-3.926l2.4-1.6c1.131 1.671 1.808 3.677 1.808 5.526 0 5.523-4.477 10-10 10s-10-4.477-10-10z"
+										></path>
+									</svg>
+								</div>
+							) : (
+								<FontAwesomeIcon
+									className="text-gray-12 size-3"
+									icon={faDownload}
+								/>
+							);
+						}}
+					/>
 
+					{isOwner && (
+						<DropdownMenu modal={false} onOpenChange={setIsDropdownOpen}>
+							<DropdownMenuTrigger>
+								<CapCardButton
+									tooltipContent="More options"
+									className="delay-75"
+									icon={() => (
+										<FontAwesomeIcon className="size-4" icon={faEllipsis} />
+									)}
+								/>
+							</DropdownMenuTrigger>
 							<DropdownMenuContent align="end" sideOffset={5}>
 								<DropdownMenuItem
 									onClick={() => {
@@ -392,19 +442,21 @@ export const CapCard = ({
 								</DropdownMenuItem>
 							</DropdownMenuContent>
 						</DropdownMenu>
-						<ConfirmationDialog
-							open={confirmOpen}
-							icon={<FontAwesomeIcon icon={faVideo} />}
-							title="Delete Cap"
-							description={`Are you sure you want to delete the cap "${cap.name}"? This action cannot be undone.`}
-							confirmLabel={deleteMutation.isPending ? "Deleting..." : "Delete"}
-							cancelLabel="Cancel"
-							loading={deleteMutation.isPending}
-							onConfirm={() => deleteMutation.mutate()}
-							onCancel={() => setConfirmOpen(false)}
-						/>
-					</div>
-				)}
+					)}
+
+					<ConfirmationDialog
+						open={confirmOpen}
+						icon={<FontAwesomeIcon icon={faVideo} />}
+						title="Delete Cap"
+						description={`Are you sure you want to delete the cap "${cap.name}"? This action cannot be undone.`}
+						confirmLabel={deleteMutation.isPending ? "Deleting..." : "Delete"}
+						cancelLabel="Cancel"
+						loading={deleteMutation.isPending}
+						onConfirm={() => deleteMutation.mutate()}
+						onCancel={() => setConfirmOpen(false)}
+					/>
+				</div>
+
 				{!sharedCapCard && onSelectToggle && (
 					<div
 						className={clsx(
diff --git a/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButton.tsx b/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButton.tsx
new file mode 100644
index 0000000000..6489430682
--- /dev/null
+++ b/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButton.tsx
@@ -0,0 +1,38 @@
+import { Button } from "@cap/ui";
+import clsx from "clsx";
+import type { MouseEvent, ReactNode } from "react";
+import { Tooltip } from "@/components/Tooltip";
+
+interface CapCardButtonProps {
+	tooltipContent: string;
+	onClick?: (e: MouseEvent) => void;
+	disabled?: boolean;
+	className: string;
+	icon: () => ReactNode;
+}
+
+export const CapCardButton = ({
+	tooltipContent,
+	onClick = () => {},
+	disabled,
+	className,
+	icon,
+}: CapCardButtonProps) => {
+	return (
+		<Tooltip key={tooltipContent} content={tooltipContent}>
+			<Button
+				onClick={(e) => onClick?.(e)}
+				disabled={disabled}
+				className={clsx(
+					`!size-8 hover:bg-gray-5 hover:border-gray-7 rounded-full min-w-fit !p-0`,
+					className,
+				)}
+				variant="white"
+				size="sm"
+				aria-label={tooltipContent}
+			>
+				{icon()}
+			</Button>
+		</Tooltip>
+	);
+};
diff --git a/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButtons.tsx b/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButtons.tsx
deleted file mode 100644
index 3232c92b92..0000000000
--- a/apps/web/app/(org)/dashboard/caps/components/CapCard/CapCardButtons.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import { buildEnv, NODE_ENV } from "@cap/env";
-import { Button } from "@cap/ui";
-import { faDownload, faLink } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import clsx from "clsx";
-import type { ReactNode } from "react";
-import { Tooltip } from "@/components/Tooltip";
-import { usePublicEnv } from "@/utils/public-env";
-
-interface ButtonConfig {
-	tooltipContent: string;
-	onClick: (e: React.MouseEvent) => void;
-	className: string;
-	disabled: boolean;
-	icon: () => ReactNode;
-}
-
-export interface CapCardButtonsProps {
-	capId: string;
-	copyPressed: boolean;
-	isDownloading: boolean;
-	handleCopy: (url: string) => void;
-	handleDownload: () => void;
-	customDomain?: string | null;
-	domainVerified?: boolean;
-}
-
-export const CapCardButtons: React.FC<CapCardButtonsProps> = ({
-	capId,
-	copyPressed,
-	isDownloading,
-	handleCopy,
-	handleDownload,
-	customDomain,
-	domainVerified,
-}) => {
-	const { webUrl } = usePublicEnv();
-	return (
-		<>
-			{buttons(
-				capId,
-				copyPressed,
-				isDownloading,
-				handleCopy,
-				handleDownload,
-				webUrl,
-				customDomain,
-				domainVerified,
-			).map((button, index) => (
-				<Tooltip key={index} content={button.tooltipContent}>
-					<Button
-						onClick={button.onClick}
-						disabled={button.disabled}
-						className={clsx(
-							`!size-8 hover:bg-gray-5 hover:border-gray-7 rounded-full min-w-fit !p-0`,
-							button.className,
-						)}
-						variant="white"
-						size="sm"
-						aria-label={button.tooltipContent}
-					>
-						{button.icon()}
-					</Button>
-				</Tooltip>
-			))}
-		</>
-	);
-};
-
-const buttons = (
-	capId: string,
-	copyPressed: boolean,
-	isDownloading: boolean,
-	handleCopy: (url: string) => void,
-	handleDownload: () => void,
-	webUrl: string,
-	customDomain?: string | null,
-	domainVerified?: boolean,
-): ButtonConfig[] => [
-	{
-		tooltipContent: "Copy link",
-		onClick: (e: React.MouseEvent) => {
-			e.stopPropagation();
-
-			const getVideoLink = () => {
-				if (NODE_ENV === "development" && customDomain && domainVerified) {
-					return `https://${customDomain}/s/${capId}`;
-				} else if (
-					NODE_ENV === "development" &&
-					!customDomain &&
-					!domainVerified
-				) {
-					return `${webUrl}/s/${capId}`;
-				} else if (
-					buildEnv.NEXT_PUBLIC_IS_CAP &&
-					customDomain &&
-					domainVerified
-				) {
-					return `https://${customDomain}/s/${capId}`;
-				} else if (
-					buildEnv.NEXT_PUBLIC_IS_CAP &&
-					!customDomain &&
-					!domainVerified
-				) {
-					return `https://cap.link/${capId}`;
-				} else {
-					return `${webUrl}/s/${capId}`;
-				}
-			};
-
-			handleCopy(getVideoLink());
-		},
-		className: "delay-0",
-		disabled: false,
-		icon: () => {
-			return !copyPressed ? (
-				<FontAwesomeIcon className="text-gray-12 size-4" icon={faLink} />
-			) : (
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					width="24"
-					height="24"
-					viewBox="0 0 24 24"
-					fill="none"
-					stroke="currentColor"
-					strokeWidth="2"
-					strokeLinecap="round"
-					strokeLinejoin="round"
-					className="text-gray-12 size-5 svgpathanimation"
-				>
-					<path d="M20 6 9 17l-5-5" />
-				</svg>
-			);
-		},
-	},
-	{
-		tooltipContent: "Download Cap",
-		onClick: (e: React.MouseEvent) => {
-			e.stopPropagation();
-			handleDownload();
-		},
-		className: "delay-25",
-		disabled: isDownloading,
-		icon: () => {
-			return isDownloading ? (
-				<div className="animate-spin size-3">
-					<svg
-						className="size-3"
-						xmlns="http://www.w3.org/2000/svg"
-						fill="none"
-						viewBox="0 0 24 24"
-					>
-						<circle
-							className="opacity-25"
-							cx="12"
-							cy="12"
-							r="10"
-							stroke="currentColor"
-							strokeWidth="4"
-						></circle>
-						<path
-							className="opacity-75"
-							fill="currentColor"
-							d="m2 12c0-5.523 4.477-10 10-10v3c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7c0-1.457-.447-2.808-1.208-3.926l2.4-1.6c1.131 1.671 1.808 3.677 1.808 5.526 0 5.523-4.477 10-10 10s-10-4.477-10-10z"
-						></path>
-					</svg>
-				</div>
-			) : (
-				<FontAwesomeIcon className="text-gray-12 size-3" icon={faDownload} />
-			);
-		},
-	},
-];
diff --git a/apps/web/app/(org)/dashboard/folder/[id]/components/FolderVideosSection.tsx b/apps/web/app/(org)/dashboard/folder/[id]/components/FolderVideosSection.tsx
index 07ad8214e4..ae33089287 100644
--- a/apps/web/app/(org)/dashboard/folder/[id]/components/FolderVideosSection.tsx
+++ b/apps/web/app/(org)/dashboard/folder/[id]/components/FolderVideosSection.tsx
@@ -14,21 +14,16 @@ import type { VideoData } from "../../../caps/Caps";
 import { CapCard } from "../../../caps/components/CapCard/CapCard";
 import { SelectedCapsBar } from "../../../caps/components/SelectedCapsBar";
 import { UploadPlaceholderCard } from "../../../caps/components/UploadPlaceholderCard";
-import {
-	useUploadingContext,
-	useUploadingStatus,
-} from "../../../caps/UploadingContext";
+import { useUploadingStatus } from "../../../caps/UploadingContext";
 
 interface FolderVideosSectionProps {
 	initialVideos: VideoData;
 	dubApiKeyEnabled: boolean;
-	cardType?: "shared" | "default";
 }
 
 export default function FolderVideosSection({
 	initialVideos,
 	dubApiKeyEnabled,
-	cardType = "default",
 }: FolderVideosSectionProps) {
 	const router = useRouter();
 	const { user } = useDashboardContext();
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/SharedCapCard.tsx b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/SharedCapCard.tsx
index 9bbab65427..943c3484a0 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/SharedCapCard.tsx
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/SharedCapCard.tsx
@@ -50,7 +50,6 @@ export const SharedCapCard: React.FC<SharedCapCardProps> = ({
 				isLoadingAnalytics={isLoadingAnalytics}
 				cap={cap}
 				analytics={displayCount}
-				sharedCapCard
 				userId={userId}
 			>
 				<div className="mb-2 space-y-1">
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/folder/[folderId]/page.tsx b/apps/web/app/(org)/dashboard/spaces/[spaceId]/folder/[folderId]/page.tsx
index ab4b63ec61..41e602b598 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/folder/[folderId]/page.tsx
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/folder/[folderId]/page.tsx
@@ -70,7 +70,6 @@ const FolderPage = async (props: {
 			)}
 			{/* Display Videos */}
 			<FolderVideosSection
-				cardType="shared"
 				initialVideos={videosData}
 				dubApiKeyEnabled={!!serverEnv().DUB_API_KEY}
 			/>
diff --git a/apps/web/app/api/settings/onboarding/route.ts b/apps/web/app/api/settings/onboarding/route.ts
index 3f9255021d..5036599a3d 100644
--- a/apps/web/app/api/settings/onboarding/route.ts
+++ b/apps/web/app/api/settings/onboarding/route.ts
@@ -47,12 +47,8 @@ export async function POST(request: NextRequest) {
 		)
 		.limit(1);
 
-	console.log("memberButNotOwner", memberButNotOwner);
-
 	const isMemberOfOrganization = memberButNotOwner.length > 0;
 
-	console.log("isMemberOfOrganization", isMemberOfOrganization);
-
 	const [organization] = await db()
 		.select()
 		.from(organizations)