diff --git a/components/dashboard/project/add-template.tsx b/components/dashboard/project/add-template.tsx
index 9e0fc0857..80774207e 100644
--- a/components/dashboard/project/add-template.tsx
+++ b/components/dashboard/project/add-template.tsx
@@ -54,7 +54,7 @@ export const AddTemplate = ({ projectId }: Props) => {
 				</DropdownMenuItem>
 			</DialogTrigger>
 			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-7xl p-0">
-				<div className="sticky top-0 z-10 flex flex-col gap-4 dark:bg-black p-6 border-b">
+				<div className="sticky top-0 z-10 flex flex-col gap-4 bg-background p-6 border-b">
 					<DialogHeader>
 						<DialogTitle>Create Template</DialogTitle>
 						<DialogDescription>
diff --git a/components/dashboard/settings/github/github-setup.tsx b/components/dashboard/settings/github/github-setup.tsx
index 0119ebfe2..2b20fa872 100644
--- a/components/dashboard/settings/github/github-setup.tsx
+++ b/components/dashboard/settings/github/github-setup.tsx
@@ -93,8 +93,18 @@ export const GithubSetup = () => {
 							</span>
 							<BadgeCheck className="size-4 text-green-700" />
 						</div>
-						<div className="flex items-end">
+						<div className="flex items-end gap-4 flex-wrap">
 							<RemoveGithubApp />
+							<Link
+								href={`https://github.com/settings/apps/${data?.githubAppName}`}
+								target="_blank"
+								className={buttonVariants({
+									className: "w-fit",
+									variant: "secondary",
+								})}
+							>
+								<span className="text-sm">Manage Github App</span>
+							</Link>
 						</div>
 					</div>
 				) : (
diff --git a/components/dashboard/settings/github/remove-github-app.tsx b/components/dashboard/settings/github/remove-github-app.tsx
index ec1aa538c..8ab7ea790 100644
--- a/components/dashboard/settings/github/remove-github-app.tsx
+++ b/components/dashboard/settings/github/remove-github-app.tsx
@@ -13,6 +13,13 @@ import {
 } from "@/components/ui/alert-dialog";
 import { Button } from "@/components/ui/button";
 import { toast } from "sonner";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipTrigger,
+	TooltipProvider,
+} from "@/components/ui/tooltip";
+import { InfoIcon } from "lucide-react";
 
 export const RemoveGithubApp = () => {
 	const { refetch } = api.auth.get.useQuery();
@@ -22,7 +29,20 @@ export const RemoveGithubApp = () => {
 	return (
 		<AlertDialog>
 			<AlertDialogTrigger asChild>
-				<Button variant="destructive">Remove Current Github App</Button>
+				<Button variant="destructive">
+					Remove Current Github App
+					<TooltipProvider delayDuration={0}>
+						<Tooltip>
+							<TooltipTrigger asChild>
+								<InfoIcon className="size-4 fill-muted-destructive text-muted-destructive" />
+							</TooltipTrigger>
+							<TooltipContent>
+								We recommend deleting the GitHub app first, and then removing
+								the current one from here.
+							</TooltipContent>
+						</Tooltip>
+					</TooltipProvider>
+				</Button>
 			</AlertDialogTrigger>
 			<AlertDialogContent>
 				<AlertDialogHeader>