diff --git a/app/lish/[did]/[publication]/UpgradeModal.tsx b/app/lish/[did]/[publication]/UpgradeModal.tsx
index 436acea7..138b4a22 100644
--- a/app/lish/[did]/[publication]/UpgradeModal.tsx
+++ b/app/lish/[did]/[publication]/UpgradeModal.tsx
@@ -98,7 +98,7 @@ export const InlineUpgradeToPro = (props: { compact?: boolean }) => {
       <div
         className={`${props.compact ? `text-sm` : "text-base"} leading-snug text-tertiary pt-2`}
       >
-        Analytics for all your pubs! <br /> Emails and membership coming soon.
+        Analytics and Emails for all your pubs! <br /> Membership coming soon.
       </div>
     </div>
   );
diff --git a/components/Icons/EmailTiny.tsx b/components/Icons/EmailTiny.tsx
index b6f448f7..9fa33417 100644
--- a/components/Icons/EmailTiny.tsx
+++ b/components/Icons/EmailTiny.tsx
@@ -1,18 +1,17 @@
 import { Props } from "./Props";
+
 export const EmailTiny = (props: Props) => {
   return (
     <svg
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
+      width="16"
+      height="16"
+      viewBox="0 0 16 16"
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
       <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M8.26788 2.26052C8.76343 1.73099 9.53423 1.56198 10.2059 1.83559L11.7491 2.46429L16.6025 2.20414C17.4868 2.15673 18.2463 2.82619 18.3102 3.7095L18.4144 5.14935L20.0677 6.01329C20.6659 6.32586 21.0921 6.89045 21.229 7.55135L23.019 16.1987C23.2697 17.4099 22.4958 18.5964 21.2863 18.8551L5.44248 22.2436C4.22165 22.5047 3.02167 21.7219 2.76862 20.4994L0.980561 11.8611C0.845583 11.209 1.0064 10.5306 1.41972 10.0085L3.56607 7.29716L3.40145 4.5493C3.34755 3.64946 4.0364 2.8777 4.93657 2.82945L7.88327 2.6715L8.26788 2.26052ZM18.6163 7.93856L18.5417 6.90833L19.373 7.34272C19.5724 7.44691 19.7145 7.63511 19.7601 7.85541L21.5501 16.5028C21.6337 16.9065 21.3757 17.302 20.9725 17.3882L5.12877 20.7767C4.72183 20.8638 4.32183 20.6028 4.23748 20.1953L2.44942 11.557C2.40443 11.3397 2.45804 11.1135 2.59581 10.9395L3.70066 9.54382L3.80512 11.2874L3.64416 11.2345C3.31624 11.1267 2.96303 11.3051 2.85524 11.6331C2.74745 11.961 2.9259 12.3142 3.25381 12.422L12.2571 15.3814L19.2176 8.99821C19.472 8.76491 19.4891 8.36956 19.2558 8.11516C19.0886 7.93292 18.8384 7.87245 18.6163 7.93856ZM17.4353 8.93663L17.0635 3.79974C17.0487 3.5959 16.8735 3.4414 16.6694 3.45234L5.00347 4.07766C4.79574 4.0888 4.63678 4.26689 4.64922 4.47455L5.08251 11.7073L11.9518 13.9653L17.4353 8.93663Z"
+        d="M10.2968 1.38656C11.8028 0.80632 13.494 1.56199 14.0663 3.07099L15.6289 7.19072C16.1004 8.43493 15.5479 9.48369 14.9401 10.5127C14.704 10.9123 14.3405 11.2228 13.9088 11.3933L5.77871 14.6014C4.27234 15.182 2.58108 14.4256 2.00909 12.916L0.376959 8.79207C-0.311673 7.05234 0.893538 5.01138 2.51263 4.38692L10.2968 1.38656ZM12.7699 3.56314C12.4701 2.77272 11.5834 2.37608 10.7946 2.68007L3.01153 5.68126C2.22925 5.98309 1.8366 6.85946 2.1335 7.64358L3.6961 11.7633C3.99584 12.5538 4.88156 12.9504 5.67038 12.6465L13.4554 9.64503C14.2374 9.34305 14.6292 8.46681 14.3325 7.68286L12.7699 3.56314ZM11.6941 3.08949C11.975 3.12161 12.1765 3.37631 12.1446 3.65718C12.1068 3.9877 11.9114 4.67708 11.654 5.39907C11.3917 6.13504 11.0397 6.97653 10.6613 7.61556C10.1369 8.50088 9.10711 8.5289 8.36595 8.23365C7.26493 7.79507 5.99091 7.3727 4.38605 7.11939C4.1821 7.08727 4.00762 7.10478 3.88416 7.15439C3.77387 7.19877 3.69513 7.27044 3.64773 7.39444C3.54663 7.65849 3.25068 7.79062 2.98654 7.68966C2.72237 7.58865 2.59036 7.29267 2.69131 7.02848C3.02311 6.16072 3.90148 6.00603 4.54572 6.10756C6.24683 6.37607 7.59633 6.82477 8.74486 7.28228C9.24839 7.48286 9.622 7.36111 9.7805 7.0938C10.1105 6.53641 10.436 5.76436 10.6889 5.05475C10.9465 4.33209 11.1045 3.74232 11.1275 3.54089C11.1597 3.26006 11.4133 3.05764 11.6941 3.08949Z"
         fill="currentColor"
       />
     </svg>
diff --git a/components/Icons/PopoverArrow.tsx b/components/Icons/PopoverArrow.tsx
index 82bfee19..06d0a8eb 100644
--- a/components/Icons/PopoverArrow.tsx
+++ b/components/Icons/PopoverArrow.tsx
@@ -11,7 +11,7 @@ export const PopoverArrow = (
       height="8"
       viewBox="0 0 16 8"
       fill="none"
-      className=""
+      className="-mt-[1px]"
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
diff --git a/components/IdentityProvider.tsx b/components/IdentityProvider.tsx
index bf873ec9..d0ef2dc9 100644
--- a/components/IdentityProvider.tsx
+++ b/components/IdentityProvider.tsx
@@ -10,7 +10,7 @@ export type InterfaceState = {
   dashboards: { [id: string]: DashboardState | undefined };
 };
 export type Identity = Awaited<ReturnType<typeof getIdentityData>>;
-let IdentityContext = createContext({
+export let IdentityContext = createContext({
   identity: null as Identity,
   mutate: (() => {}) as KeyedMutator<Identity>,
 });
diff --git a/components/Menu.tsx b/components/Menu.tsx
index 721283dc..328ea837 100644
--- a/components/Menu.tsx
+++ b/components/Menu.tsx
@@ -81,6 +81,7 @@ export const RadioMenuGroup = (props: {
 }) => {
   return (
     <DropdownMenu.RadioGroup
+      className="flex flex-col gap-0.5"
       value={props.value}
       onValueChange={props.onValueChange}
     >
diff --git a/components/Subscribe/HandleSubscribe.tsx b/components/Subscribe/HandleSubscribe.tsx
index 1cb35254..ae1075e3 100644
--- a/components/Subscribe/HandleSubscribe.tsx
+++ b/components/Subscribe/HandleSubscribe.tsx
@@ -37,8 +37,6 @@ const apps = [
   { name: "Graze", logo: "/logos/graze.svg" },
 ];
 
-import { Separator } from "components/Layout";
-
 export const SubscribeWithHandle = (props: {
   autoFocus?: boolean;
   publicationUri: string;
@@ -79,9 +77,8 @@ export const SubscribeWithHandle = (props: {
 
   if (props.user.loggedIn && props.user.handle) {
     return (
-      <div className="flex flex-col gap-2">
+      <div className="flex flex-col gap-2 w-max mx-auto">
         <div className="flex items-center gap-2">
-          {props.leading}
           <ButtonPrimary
             className="mx-auto max-w-full grow"
             disabled={subscribing}
@@ -117,6 +114,7 @@ export const SubscribeWithHandle = (props: {
               <DotLoader />
             ) : (
               <>
+                {props.leading}
                 <span className="shrink-0">Subscribe as</span>
                 <span className="flex gap-1 items-center max-w-full grow min-w-0">
                   <Avatar
diff --git a/components/Subscribe/SubscribeButton.tsx b/components/Subscribe/SubscribeButton.tsx
index 52df92f4..ceb6d46f 100644
--- a/components/Subscribe/SubscribeButton.tsx
+++ b/components/Subscribe/SubscribeButton.tsx
@@ -19,6 +19,8 @@ import {
 } from "actions/publications/subscribeEmail";
 
 import { useViewerSubscription } from "./viewerSubscription";
+import { Separator } from "components/Layout";
+import { ArrowDownTiny } from "components/Icons/ArrowDownTiny";
 
 type SubscribeMode = "email" | "atproto";
 
@@ -276,35 +278,35 @@ export const SubscribeInput = (props: SubscribeProps) => {
             }}
           >
             {confirmState === "success" ? (
-            <EmailSubscribeSuccess email={email} handle={user.handle} />
-          ) : (
-            <EmailConfirm
-              autoFocus
-              loading={confirming}
-              onBack={() => setConfirmOpen(false)}
-              emailValue={email}
-              onSubmit={async (code) => {
-                if (confirming) return;
-                setConfirming(true);
-                let res = await confirmPublicationEmailSubscription(
-                  props.publicationUri,
-                  email,
-                  code,
-                  linkToCurrent,
-                );
-                setConfirming(false);
-                if (!res.ok) {
-                  toaster({
-                    type: "error",
-                    content: ERROR_MESSAGES[res.error],
-                  });
-                  return;
-                }
-                setConfirmState("success");
-                router.refresh();
-              }}
-            />
-          )}
+              <EmailSubscribeSuccess email={email} handle={user.handle} />
+            ) : (
+              <EmailConfirm
+                autoFocus
+                loading={confirming}
+                onBack={() => setConfirmOpen(false)}
+                emailValue={email}
+                onSubmit={async (code) => {
+                  if (confirming) return;
+                  setConfirming(true);
+                  let res = await confirmPublicationEmailSubscription(
+                    props.publicationUri,
+                    email,
+                    code,
+                    linkToCurrent,
+                  );
+                  setConfirming(false);
+                  if (!res.ok) {
+                    toaster({
+                      type: "error",
+                      content: ERROR_MESSAGES[res.error],
+                    });
+                    return;
+                  }
+                  setConfirmState("success");
+                  router.refresh();
+                }}
+              />
+            )}
           </Modal>
         </>
       )}
@@ -317,35 +319,42 @@ const SubscribeModeMenu = (props: {
   onChange: (mode: SubscribeMode) => void;
 }) => {
   return (
-    <Menu
-      align="start"
-      asChild
-      trigger={
-        <button
-          type="button"
-          aria-label="Choose subscribe method"
-          className="text-tertiary hover:text-accent-contrast flex items-center"
-        >
-          {props.mode === "email" ? <EmailTiny /> : <AtmosphereAccount />}
-        </button>
-      }
-    >
-      <RadioMenuGroup
-        value={props.mode}
-        onValueChange={(v) => props.onChange(v as SubscribeMode)}
+    <div className="flex gap-1">
+      <Menu
+        align="start"
+        asChild
+        trigger={
+          <button
+            type="button"
+            aria-label="Choose subscribe method"
+            className="text-inherit  flex items-center gap-1"
+          >
+            {props.mode === "email" ? <EmailTiny /> : <AtmosphereAccount />}
+            <ArrowDownTiny className="scale-90" />
+          </button>
+        }
       >
-        <RadioMenuItem value="email" selected={props.mode === "email"}>
-          <span className="flex items-center gap-2">
-            <EmailTiny /> Email
-          </span>
-        </RadioMenuItem>
-        <RadioMenuItem value="atproto" selected={props.mode === "atproto"}>
-          <span className="flex items-center gap-2">
-            <AtmosphereAccount /> Atmosphere handle
-          </span>
-        </RadioMenuItem>
-      </RadioMenuGroup>
-    </Menu>
+        <div className="text-tertiary text-sm px-1 pt-0.5 -mb-0.5">
+          Subscribe via…
+        </div>
+        <RadioMenuGroup
+          value={props.mode}
+          onValueChange={(v) => props.onChange(v as SubscribeMode)}
+        >
+          <RadioMenuItem value="email" selected={props.mode === "email"}>
+            <span className="flex items-center gap-2 shrink-0">
+              <EmailTiny /> Email
+            </span>
+          </RadioMenuItem>
+          <RadioMenuItem value="atproto" selected={props.mode === "atproto"}>
+            <span className="flex items-center gap-2">
+              <AtmosphereAccount /> Atmosphere
+            </span>
+          </RadioMenuItem>
+        </RadioMenuGroup>
+      </Menu>
+      <Separator classname="h-5! " />
+    </div>
   );
 };