diff --git a/src/assets/images/thanks-page/hands-plant-v3.png b/src/assets/images/thanks-page/hands-plant-v3.png
new file mode 100644
index 00000000000..4b9d34b99b2
Binary files /dev/null and b/src/assets/images/thanks-page/hands-plant-v3.png differ
diff --git a/src/assets/images/thanks-page/hands-plant.gif b/src/assets/images/thanks-page/hands-plant.gif
deleted file mode 100644
index e3c066a682d..00000000000
Binary files a/src/assets/images/thanks-page/hands-plant.gif and /dev/null differ
diff --git a/src/components/GoalSetting/GoalSettingContainer.vue b/src/components/GoalSetting/GoalSettingContainer.vue
index cfc67c84e4c..f98fb47245c 100644
--- a/src/components/GoalSetting/GoalSettingContainer.vue
+++ b/src/components/GoalSetting/GoalSettingContainer.vue
@@ -83,6 +83,7 @@
 					:goal-progress="goalProgress"
 					:is-goal-completed="isGoalCompleted"
 					show-goal-value-props-copy
+					use-direct-question-title
 					@set-goal-target="setTarget($event)"
 					@set-goal="setGoal($event)"
 					@update-goal="updateGoal($event)"
diff --git a/src/components/MyKiva/FeaturedGoalCard.vue b/src/components/MyKiva/FeaturedGoalCard.vue
index 470f1b0ae21..024d4784a23 100644
--- a/src/components/MyKiva/FeaturedGoalCard.vue
+++ b/src/components/MyKiva/FeaturedGoalCard.vue
@@ -28,8 +28,10 @@
 			>
 				<div class="tw-flex tw-flex-col md:tw-w-full">
 					<h3 class="tw-text-title tw-pb-1" v-html="noGoalTitle"></h3>
-					<p class="tw-text-small md:tw-text-base tw-pb-3 md:tw-pb-2">
-						{{ goalCopy.TITLE_HOW_MANY_LOANS_GENERIC }}
+					<p
+						class="tw-text-small md:tw-text-base tw-pb-3 md:tw-pb-2"
+						v-html="noGoalSubtitle"
+					>
 					</p>
 					<KvButton
 						class="featured-goal-card__cta featured-goal-card__cta--set-goal tw-w-full"
@@ -197,6 +199,10 @@ const props = defineProps({
 		type: String,
 		default: '',
 	},
+	prevYearLoans: {
+		type: Number,
+		default: 0,
+	},
 	suppressCompletionConfetti: {
 		type: Boolean,
 		default: false,
@@ -213,7 +219,8 @@ const resolvedState = computed(() => (
 	VALID_STATES.includes(props.state) ? props.state : STATE_NO_GOAL
 ));
 
-const noGoalTitle = computed(() => goalCopy.titleNoGoalYetWomensDefault());
+const noGoalTitle = computed(() => goalCopy.titleGoalSignupWomensLastYear(props.prevYearLoans));
+const noGoalSubtitle = goalCopy.subtitleNoGoalYetEntrypoint();
 
 const visibleProgress = computed(() => Math.min(props.goalProgress, props.goalTarget));
 
diff --git a/src/components/MyKiva/GoalSetting/GoalSelector.vue b/src/components/MyKiva/GoalSetting/GoalSelector.vue
index b6908c5b1b4..704aca6109b 100644
--- a/src/components/MyKiva/GoalSetting/GoalSelector.vue
+++ b/src/components/MyKiva/GoalSetting/GoalSelector.vue
@@ -1,5 +1,8 @@
 <template>
-	<div class="tw-flex tw-flex-col tw-justify-center tw-gap-0 lg:tw-gap-1.5 tw-items-center">
+	<div
+		class="tw-flex tw-flex-col tw-justify-center tw-gap-0 lg:tw-gap-1.5 tw-items-center"
+		:class="{ 'goal-selector--compact': compactLayout }"
+	>
 		<!-- Goal Progress Ring (shown after goal is set) -->
 		<GoalProgressRing
 			v-if="isGoalSet && !editGoalFromSettings"
@@ -21,7 +24,7 @@
 			<img
 				v-if="!isGoalTileExperimentEnabled"
 				:src="HandsPlant"
-				class="lg:tw-mb-1 tw-w-10 lg:tw-w-12.5"
+				class="goal-selector__image lg:tw-mb-1 tw-w-10 lg:tw-w-12.5"
 			>
 			<KvLoadingPlaceholder
 				v-if="isLoadingData"
@@ -33,11 +36,10 @@
 				<img
 					v-if="isGoalTileExperimentEnabled && !isGoalSet && !isLarge"
 					:src="HandsPlant"
-					class="lg:tw-mb-1 tw-w-10 lg:tw-w-12.5 tw-mx-auto"
+					class="goal-selector__image lg:tw-mb-1 tw-w-10 lg:tw-w-12.5 tw-mx-auto"
 				>
 				<h2
-					class="tw-text-headline tw-px-4 lg:tw-px-7 tw-text-center"
-					style="line-height: 125%;"
+					class="goal-selector__title tw-text-headline tw-px-4 lg:tw-px-7 tw-text-center"
 					v-html="titleText"
 				>
 				</h2>
@@ -50,20 +52,31 @@
 
 			<p
 				v-if="showLoanQuestionPrompt"
-				class="tw-text-base lg:tw-text-subhead tw-my-1.5 lg:tw-mb-1 lg:tw-mt-2 tw-text-center"
+				v-html="loanQuestionPrompt"
+				class="goal-selector__prompt tw-text-base lg:tw-text-subhead tw-my-1.5 lg:tw-mb-1 lg:tw-mt-2
+					tw-text-center"
 			>
-				How many loans will you make this year?
 			</p>
 
 			<p
 				v-if="showGoalValuePropsCopy"
 				v-html="subtitleText"
-				class="tw-text-base lg:tw-text-subhead tw-my-1.5 lg:tw-mb-1 lg:tw-mt-2 tw-text-center"
+				class="goal-selector__prompt tw-text-base lg:tw-text-subhead tw-my-1.5 lg:tw-mb-1 lg:tw-mt-2
+					tw-text-center"
+			>
+			</p>
+
+			<p
+				v-if="subtitleText && !showGoalValuePropsCopy && progressSubtitleBeforeOptions"
+				v-html="subtitleText"
+				class="goal-selector__prompt tw-text-base lg:tw-text-subhead tw-my-1.5 lg:tw-mb-1 lg:tw-mt-2
+					tw-text-center"
 			>
 			</p>
 
 			<div
-				class="tw-w-full tw-flex tw-flex-col lg:tw-flex-row tw-gap-1 lg:tw-gap-1.5 tw-my-1"
+				class="goal-selector__options tw-w-full tw-flex tw-flex-col lg:tw-flex-row tw-gap-1 lg:tw-gap-1.5
+					tw-my-1"
 			>
 				<template v-if="loadingCurrentYear || isLoadingData">
 					<KvLoadingPlaceholder
@@ -212,7 +225,7 @@
 			</template>
 
 			<p
-				v-if="subtitleText && !showGoalValuePropsCopy"
+				v-if="subtitleText && !showGoalValuePropsCopy && !progressSubtitleBeforeOptions"
 				v-html="subtitleText"
 				class="tw-my-1.5 lg:tw-mb-1 lg:tw-mt-2 tw-text-center"
 			>
@@ -257,8 +270,8 @@ import {
 	KvButton, KvMaterialIcon, KvLoadingPlaceholder, KvAccordionItem
 } from '@kiva/kv-components';
 
-import { ID_WOMENS_EQUALITY, ID_SUPPORT_ALL, ID_US_ECONOMIC_EQUALITY } from '#src/composables/useBadgeData';
-import HandsPlant from '#src/assets/images/thanks-page/hands-plant.gif';
+import { ID_WOMENS_EQUALITY, ID_SUPPORT_ALL } from '#src/composables/useBadgeData';
+import HandsPlant from '#src/assets/images/thanks-page/hands-plant-v3.png';
 import LoanNumberSelector from '#src/components/MyKiva/GoalSetting/LoanNumberSelector';
 import GoalProgressRing from '#src/components/MyKiva/GoalProgressRing';
 import GoalCustomAmountInput from '#src/components/MyKiva/GoalSetting/GoalCustomAmountInput';
@@ -385,6 +398,34 @@ const props = defineProps({
 		type: Boolean,
 		default: false,
 	},
+	/**
+	 * Whether the selector should use the direct loan question instead of entrypoint-style headline copy.
+	 */
+	useDirectQuestionTitle: {
+		type: Boolean,
+		default: false,
+	},
+	/**
+	 * Whether the no-goal-yet intro line should render smaller than the main title.
+	 */
+	compactNoGoalYetTitle: {
+		type: Boolean,
+		default: false,
+	},
+	/**
+	 * Whether to use the tighter thank-you page goal selector spacing.
+	 */
+	compactLayout: {
+		type: Boolean,
+		default: false,
+	},
+	/**
+	 * Whether the current-year progress subtitle should render before the loan options.
+	 */
+	progressSubtitleBeforeOptions: {
+		type: Boolean,
+		default: false,
+	},
 });
 
 const emit = defineEmits([
@@ -441,11 +482,19 @@ const loansLastYear = computed(() => {
 });
 
 const showLoanQuestionPrompt = computed(() => {
+	if (props.useDirectQuestionTitle) return false;
 	return goalSignupCopyVariant === GOAL_SIGNUP_COPY_NO_GOAL_YET
 		|| (!props.showGoalValuePropsCopy
 			&& (loansLastYear.value > 0 || props.selectedCategoryId === ID_WOMENS_EQUALITY));
 });
 
+const loanQuestionPrompt = computed(() => {
+	if (goalSignupCopyVariant === GOAL_SIGNUP_COPY_NO_GOAL_YET && !props.useDirectQuestionTitle) {
+		return goalCopy.titleLoanQuestionForCategory(props.selectedCategoryId, props.selectedCategoryName);
+	}
+	return goalCopy.TITLE_HOW_MANY_LOANS_GENERIC;
+});
+
 // Use progressForCurrentYear from tieredAchievements if available (set on Thanks page),
 // otherwise use fetched current year data (for MyKiva goal-setting page and modal)
 const loansThisYear = computed(() => {
@@ -485,8 +534,14 @@ const loadLoansThisYear = async () => {
 };
 
 const titleText = computed(() => {
+	if (props.useDirectQuestionTitle) {
+		return goalCopy.titleLoanQuestionForCategory(props.selectedCategoryId, props.selectedCategoryName, {
+			splitQuestion: true,
+		});
+	}
+
 	if (goalSignupCopyVariant === GOAL_SIGNUP_COPY_NO_GOAL_YET) {
-		return goalCopy.CARD_NO_GOAL_YET_EXPERIMENT;
+		return goalCopy.titleNoGoalYetSelectorEntrypoint({ compactIntro: props.compactNoGoalYetTitle });
 	}
 
 	// Default title if no lending history and category is ID_WOMENS_EQUALITY
@@ -503,14 +558,7 @@ const titleText = computed(() => {
 		return goalCopy.titleLastYearForCategory(loansLastYear.value, props.selectedCategoryId, props.selectedCategoryName);
 	}
 
-	// Support All is not a specific category, so use generic language
-	if (props.selectedCategoryId === ID_SUPPORT_ALL) {
-		return goalCopy.TITLE_HOW_MANY_LOANS_GENERIC;
-	}
-	if (props.selectedCategoryId === ID_US_ECONOMIC_EQUALITY) {
-		return goalCopy.TITLE_US_ENTREPRENEURS_HOW_MANY_LOANS;
-	}
-	return goalCopy.titleCategoryHowManyLoans(props.selectedCategoryName?.toLowerCase());
+	return goalCopy.titleLoanQuestionForCategory(props.selectedCategoryId, props.selectedCategoryName);
 });
 
 const subtitleText = computed(() => {
@@ -778,6 +826,50 @@ watch(() => props.selectedCategoryId, async newCategory => {
 </script>
 
 <style lang="postcss" scoped>
+.goal-selector__title {
+	line-height: 1.25;
+
+	@screen lg {
+		font-size: 2rem;
+		line-height: 1.2;
+	}
+}
+
+.goal-selector--compact {
+	@apply lg:tw-gap-0.5;
+}
+
+.goal-selector--compact .goal-selector__image {
+	width: 4.5rem;
+}
+
+.goal-selector--compact .goal-selector__title {
+	/* Same values as the @screen lg rule above, applied at all breakpoints in compact mode */
+	font-size: 2rem;
+	line-height: 1.2;
+}
+
+.goal-selector--compact .goal-selector__prompt {
+	@apply tw-my-1;
+
+	font-size: 0.875rem;
+	line-height: 1.25;
+}
+
+.goal-selector--compact .goal-selector__options {
+	@apply tw-my-1.5 lg:tw-gap-1;
+}
+
+.goal-selector--compact .buttons {
+	@apply tw-gap-1;
+
+	max-width: 19rem;
+}
+
+.goal-selector--compact .buttons :deep(button:first-child) {
+	@apply tw-mt-1;
+}
+
 .edit-goal-button :deep(span) {
 	@apply tw-flex;
 }
diff --git a/src/components/MyKiva/GoalSetting/LoanNumberSelector.vue b/src/components/MyKiva/GoalSetting/LoanNumberSelector.vue
index 4a2806c774c..6f0e3ba8d1a 100644
--- a/src/components/MyKiva/GoalSetting/LoanNumberSelector.vue
+++ b/src/components/MyKiva/GoalSetting/LoanNumberSelector.vue
@@ -19,7 +19,7 @@
 						tw-text-eco-green-3 lg:!tw-flex-row lg:!tw-items-baseline lg:tw-gap-0.5"
 		>
 			<span
-				class="tw-text-display tw-text-center !tw-text-headline"
+				class="loan-number-selector__number tw-text-display tw-text-center !tw-text-headline"
 				style="line-height: 1;"
 			>
 				{{ loansNumber }}
@@ -33,7 +33,7 @@
 			>
 				{{ highlightedText }}
 			</div>
-			<div class="tw-text-primary !tw-font-medium tw-text-label tw-text-center">
+			<div class="tw-text-primary !tw-font-medium tw-text-label tw-text-center lg:tw-whitespace-nowrap">
 				{{ optionText }}
 			</div>
 		</div>
diff --git a/src/components/MyKiva/GoalSettingModal.vue b/src/components/MyKiva/GoalSettingModal.vue
index 2d3889fabdc..19fb2123070 100644
--- a/src/components/MyKiva/GoalSettingModal.vue
+++ b/src/components/MyKiva/GoalSettingModal.vue
@@ -5,6 +5,7 @@
 			'goal-tile-modal': showGoalTile && !showRecommendLoanArea,
 			'goal-tile-modal-expanded': showGoalTile && showCategories && !showRecommendLoanArea,
 			'goal-tile-modal-recommend-loan': showRecommendLoanArea,
+			'goal-selector-modal-compact': showGoalSelector && !showGoalTile && !showRecommendLoanArea && !isThanksPage,
 		}"
 		title=""
 		:visible="show"
@@ -204,6 +205,9 @@
 					:is-loading-data="isLoadingData || isLoadingRecommendedLoan"
 					:is-goal-tile-experiment-enabled="isGoalTileExperimentEnabled"
 					:show-goal-value-props-copy="showGoalValuePropsCopy && !isGoalTileExperimentEnabled"
+					:compact-layout="isStandardSelectorLayout"
+					:progress-subtitle-before-options="isStandardSelectorLayout"
+					use-direct-question-title
 					@set-goal-target="setGoalTarget"
 					@set-goal="onGoalSelectorSetGoal"
 					@update-goal="onGoalSelectorUpdateGoal"
@@ -305,7 +309,7 @@ import GoalSelector from '#src/components/MyKiva/GoalSetting/GoalSelector';
 import RecommendLoanForGoalContent from '#src/components/LoanCards/RecommendLoanForGoal/RecommendLoanForGoalContent';
 import RecommendLoanForGoalFooter from '#src/components/LoanCards/RecommendLoanForGoal/RecommendLoanForGoalFooter';
 import RecommendLoanForGoalHeader from '#src/components/LoanCards/RecommendLoanForGoal/RecommendLoanForGoalHeader';
-import HandsPlant from '#src/assets/images/thanks-page/hands-plant.gif';
+import HandsPlant from '#src/assets/images/thanks-page/hands-plant-v3.png';
 import { mdiCheckBold, mdiCheckCircle, mdiClose } from '@mdi/js';
 
 const CategoryForm = defineAsyncComponent(() => import('#src/components/MyKiva/GoalSetting/CategoryForm'));
@@ -528,6 +532,10 @@ const showGoalTile = computed(() => {
 	return props.isGoalTileExperimentEnabled && isLarge.value;
 });
 
+const isStandardSelectorLayout = computed(
+	() => !showGoalTile.value && !showRecommendLoanArea.value && !props.isThanksPage
+);
+
 const recommendLoanForGoalContentRef = ref(null);
 
 const addToBasket = () => {
@@ -689,6 +697,62 @@ watch(show, async newVal => {
 	@apply tw-text-headline;
 }
 
+.goal-selector-modal-compact :deep {
+	[data-test=kv-lightbox],
+	[data-testid=kv-lightbox] {
+		@screen lg {
+			width: 44rem !important;
+			max-width: 44rem !important;
+		}
+	}
+
+	#kvLightboxBody {
+		@apply lg:!tw-px-4 lg:!tw-pt-0 lg:!tw-pb-2;
+
+		overflow: visible !important;
+	}
+
+	.goal-selector-container {
+		@apply lg:tw-mx-auto;
+
+		max-width: 40rem !important;
+
+		@screen lg {
+			transform: translateY(-1.75rem);
+		}
+	}
+
+	/* compact-layout prop handles image width; only modal-specific margins remain */
+	.goal-selector__image {
+		@screen lg {
+			margin-top: 0;
+			margin-bottom: 0.25rem;
+		}
+	}
+
+	.goal-selector__options > div {
+		@apply lg:tw-min-h-8;
+
+		@screen lg {
+			padding-right: 1rem;
+			padding-left: 1rem;
+		}
+	}
+
+	.goal-selector__options :deep(.loan-number-selector__number) {
+		@screen lg {
+			font-size: 2.375rem;
+		}
+	}
+
+	/* compact-layout handles gap and mt; only modal-specific sizing remains */
+	.buttons {
+		@apply lg:tw-mx-auto;
+
+		max-width: 31rem;
+	}
+}
+
 /* Style for components when Goal Tile experiment is enabled */
 :deep(.goal-modal-controls) {
 	@apply tw-mx-auto tw-my-0;
diff --git a/src/components/MyKiva/MyKivaFeaturedSlot.vue b/src/components/MyKiva/MyKivaFeaturedSlot.vue
index 8d37b7a7bf0..195acf40434 100644
--- a/src/components/MyKiva/MyKivaFeaturedSlot.vue
+++ b/src/components/MyKiva/MyKivaFeaturedSlot.vue
@@ -19,6 +19,7 @@
 			:goal-progress-percentage="goalProgressPercentageValue"
 			:category-name="categoryName"
 			:user-name="userFirstName"
+			:prev-year-loans="womenLoansLastYear"
 			:suppress-completion-confetti="suppressCompletionConfetti"
 			@set-goal-click="handleSetGoalClick"
 			@cta-click="handleCtaClick"
@@ -33,7 +34,7 @@ import {
 } from 'vue';
 import { useRouter } from 'vue-router';
 import FeaturedGoalCard from '#src/components/MyKiva/FeaturedGoalCard';
-import {
+import useGoalData, {
 	GOAL_STATUS,
 	GOALS_CURRENT_YEAR,
 	COMPLETED_GOAL_THRESHOLD,
@@ -50,11 +51,15 @@ const SLOT_TITLES = {
 	completed: 'Goal Achieved!',
 };
 
-defineProps({
+const props = defineProps({
 	userFirstName: {
 		type: String,
 		default: '',
 	},
+	heroTieredAchievements: {
+		type: Array,
+		default: () => [],
+	},
 });
 
 const emit = defineEmits(['set-goal-click', 'cta-click', 'edit-click']);
@@ -62,12 +67,14 @@ const emit = defineEmits(['set-goal-click', 'cta-click', 'edit-click']);
 const router = useRouter();
 const goalData = inject('goalData');
 const $kvTrackEvent = inject('$kvTrackEvent');
+const { getCategoryLoansLastYear } = useGoalData();
 
 const cardLoading = computed(() => Boolean(goalData?.loading?.value));
 const goalStatus = computed(() => goalData?.userGoal?.value?.status || null);
 const goalTarget = computed(() => goalData?.userGoal?.value?.target || 0);
 const goalProgressValue = computed(() => goalData?.goalProgress?.value || 0);
 const goalProgressPercentageValue = computed(() => goalData?.goalProgressPercentage?.value || 0);
+const womenLoansLastYear = computed(() => getCategoryLoansLastYear(props.heroTieredAchievements));
 
 const categoryName = computed(() => {
 	const target = goalData?.userGoal?.value?.target;
diff --git a/src/components/MyKiva/NextYearGoalCard.vue b/src/components/MyKiva/NextYearGoalCard.vue
index 2e90ec3d6ea..b9caf295cb8 100644
--- a/src/components/MyKiva/NextYearGoalCard.vue
+++ b/src/components/MyKiva/NextYearGoalCard.vue
@@ -64,7 +64,7 @@ import goalCopy from '#src/util/goalCopy';
 import { useRouter } from 'vue-router';
 import confetti from 'canvas-confetti';
 import GoalProgressRing from '#src/components/MyKiva/GoalProgressRing';
-import HandsPlant from '#src/assets/images/thanks-page/hands-plant.gif';
+import HandsPlant from '#src/assets/images/thanks-page/hands-plant-v3.png';
 
 const props = defineProps({
 	userGoal: {
diff --git a/src/components/Thanks/SingleVersion/GoalEntrypoint.vue b/src/components/Thanks/SingleVersion/GoalEntrypoint.vue
index 4458e4b4cdb..1b0de1dba35 100644
--- a/src/components/Thanks/SingleVersion/GoalEntrypoint.vue
+++ b/src/components/Thanks/SingleVersion/GoalEntrypoint.vue
@@ -22,7 +22,7 @@
 				v-else
 				class="
 					tw-shadow-lg
-					tw-p-2.5 tw-py-2.5 md:tw-px-2.5 md:tw-py-4"
+					tw-p-2.5 tw-py-2.5 md:tw-px-2.5 md:tw-py-3"
 			>
 				<GoalSelector
 					:is-goal-set="isGoalSet"
@@ -35,6 +35,8 @@
 					:goal-progress="goalProgress"
 					:goal-progress-percentage="goalProgressPercentage"
 					:go-to-url="goToUrl"
+					compact-no-goal-yet-title
+					compact-layout
 					@set-goal-target="$emit('set-goal-target', $event)"
 					@set-goal="$emit('set-goal', $event)"
 					@edit-goal="$emit('edit-goal')"
diff --git a/src/components/Thanks/ThanksPageSingleVersion.vue b/src/components/Thanks/ThanksPageSingleVersion.vue
index a7f5cbf11fa..f9bb5e8e4dc 100644
--- a/src/components/Thanks/ThanksPageSingleVersion.vue
+++ b/src/components/Thanks/ThanksPageSingleVersion.vue
@@ -572,7 +572,9 @@ onMounted(async () => {
 	goalSignupThanksViewCapped.value = !props.isGuest
 		&& isEmptyGoal.value
 		&& isGoalSignupThanksViewCapped(cookieStore);
-	if (!props.isGuest && isEmptyGoal.value && !goalSignupThanksViewCapped.value) {
+	if (!props.isGuest
+		&& isEmptyGoal.value
+		&& !goalSignupThanksViewCapped.value) {
 		incrementGoalSignupThanksViewCount(cookieStore);
 	}
 
diff --git a/src/pages/MyKiva/MyKivaPageContent.vue b/src/pages/MyKiva/MyKivaPageContent.vue
index 2c123a99ad4..029fc380dbe 100644
--- a/src/pages/MyKiva/MyKivaPageContent.vue
+++ b/src/pages/MyKiva/MyKivaPageContent.vue
@@ -22,6 +22,7 @@
 			v-if="goalsRowEnabled && shouldRenderFeaturedSlot"
 			:key="`featured-slot-${goalRefreshKey}`"
 			:user-first-name="userInfo?.userAccount?.firstName"
+			:hero-tiered-achievements="heroTieredAchievements"
 			@set-goal-click="openGoalSettingModal"
 			@edit-click="openEditGoalSettingModal"
 		/>
diff --git a/src/pages/Portfolio/ImpactDashboard/GoalEntrypoint.vue b/src/pages/Portfolio/ImpactDashboard/GoalEntrypoint.vue
index 9834e52d6dd..b012e809eb3 100644
--- a/src/pages/Portfolio/ImpactDashboard/GoalEntrypoint.vue
+++ b/src/pages/Portfolio/ImpactDashboard/GoalEntrypoint.vue
@@ -1,42 +1,33 @@
 <template>
 	<AsyncPortfolioSection
 		@visible="fetchUserAchievementProgress"
-		class="tw-flex tw-flex-col lg:tw-flex-row tw-items-center tw-justify-between tw-gap-4 !tw-px-2 !tw-py-3
-            lg:!tw-p-3"
+		class="goal-entrypoint !tw-px-2 !tw-py-3 lg:!tw-px-3 lg:!tw-py-3"
 	>
 		<div
-			class="tw-flex tw-flex-col lg:tw-flex-row tw-items-center tw-gap-3"
+			class="goal-entrypoint__content tw-flex tw-flex-col tw-justify-center tw-gap-1 tw-z-base"
 		>
-			<img
-				:src="HandsPlant"
-				class="tw-w-10"
+			<KvLoadingPlaceholder
+				v-if="loading"
+				class="!tw-w-full !tw-h-2.5"
+			/>
+			<h3
+				v-else
+				v-html="title"
+				class="goal-entrypoint__title tw-font-medium"
+			></h3>
+			<p
+				class="goal-entrypoint__subtitle"
+				v-html="subtitle"
 			>
-			<div
-				class="tw-flex tw-flex-col tw-gap-1"
+			</p>
+			<KvButton
+				variant="secondary"
+				class="goal-button tw-z-base tw-mt-0.5"
+				@click="goToGoalPage"
 			>
-				<KvLoadingPlaceholder
-					v-if="loading"
-					class="!tw-w-full !tw-h-5"
-				/>
-				<h3
-					v-else
-					v-html="title"
-					class="tw-text-title tw-text-center md:tw-text-left"
-				></h3>
-				<p
-					class="tw-text-base !tw-font-medium tw-text-center lg:tw-text-left"
-				>
-					{{ goalCopy.TITLE_HOW_MANY_LOANS_GENERIC }}
-				</p>
-			</div>
+				{{ goalCopy.BUTTON_SET_GOAL }}
+			</KvButton>
 		</div>
-		<KvButton
-			variant="secondary"
-			class="goal-button tw-whitespace-nowrap tw-mt-2 md:tw-mt-0 tw-w-full lg:tw-w-auto"
-			@click="goToGoalPage"
-		>
-			{{ goalCopy.BUTTON_SET_GOAL }}
-		</KvButton>
 	</AsyncPortfolioSection>
 </template>
 
@@ -50,7 +41,6 @@ import { useRouter } from 'vue-router';
 import userAchievementProgressQuery from '#src/graphql/query/userAchievementProgress.graphql';
 import useGoalData, { LAST_YEAR_KEY } from '#src/composables/useGoalData';
 import goalCopy from '#src/util/goalCopy';
-import HandsPlant from '#src/assets/images/thanks-page/hands-plant.gif';
 import AsyncPortfolioSection from './AsyncPortfolioSection';
 
 const { getCategoryLoansLastYear } = useGoalData();
@@ -62,6 +52,7 @@ const router = useRouter();
 const womenLoansLastYear = ref(0);
 
 const title = computed(() => goalCopy.titleGoalSignupWomensLastYear(womenLoansLastYear.value));
+const subtitle = goalCopy.subtitleNoGoalYetEntrypoint();
 
 const goToGoalPage = () => {
 	$kvTrackEvent('portfolio', 'click', 'set-goal-portfolio');
@@ -90,7 +81,37 @@ onMounted(() => {
 </script>
 
 <style lang="postcss" scoped>
-.goal-button :deep(span) {
-	@apply tw-px-4 tw-py-0.5;
+.goal-entrypoint {
+	background-image: url('/src/assets/images/my-kiva/featured-goal-card/mobile-no-goal-state.png');
+	background-position: right bottom;
+	background-repeat: no-repeat;
+	background-size: auto 100%;
+	box-shadow: inset 0 0 0 4px #fff;
+	min-height: 112px;
+	overflow: hidden;
+}
+
+.goal-entrypoint__content {
+	max-width: 28rem;
+}
+
+.goal-entrypoint__title {
+	font-size: 1.125rem;
+	line-height: 1.2;
+}
+
+.goal-entrypoint__subtitle {
+	font-size: 0.8125rem;
+	line-height: 1.25;
+}
+
+.goal-button {
+	width: min(100%, 14rem);
+}
+
+@screen md {
+	.goal-entrypoint {
+		background-image: url('/src/assets/images/my-kiva/featured-goal-card/no-goal-state.png');
+	}
 }
 </style>
diff --git a/src/util/goalCopy.js b/src/util/goalCopy.js
index 56673c2c21b..5d783e8c809 100644
--- a/src/util/goalCopy.js
+++ b/src/util/goalCopy.js
@@ -40,6 +40,14 @@ const goalCopy = {
 		return this.titleNoHistoryWomensDefault(cssClass);
 	},
 
+	/** Date-aware no-goal subtitle for goal card entrypoints */
+	subtitleNoGoalYetEntrypoint() {
+		if (this.getGoalSignupCopyVariant() === GOAL_SIGNUP_COPY_NO_GOAL_YET) {
+			return this.CARD_HABIT_PROMPT_SINGLE_LINE;
+		}
+		return this.TITLE_HOW_MANY_LOANS_GENERIC;
+	},
+
 	/** User helped exactly 1 woman last year */
 	// eslint-disable-next-line max-len
 	titleLastYearSingleWoman: (count, cssClass = 'tw-text-eco-green-3') => `Last year, you helped ${highlight(`${count} woman`, cssClass)} shape her future!`,
@@ -82,7 +90,32 @@ const goalCopy = {
 	TITLE_US_ENTREPRENEURS_HOW_MANY_LOANS: `How many loans to ${ecoGreen('U.S. entrepreneurs')} will you make this year?`,
 
 	/** Specific named category */
-	titleCategoryHowManyLoans: categoryName => `How many loans to ${ecoGreen(categoryName)} will you make this year?`,
+	titleCategoryHowManyLoans(categoryName, { splitQuestion = false } = {}) {
+		const separator = splitQuestion ? '<br>' : ' ';
+		return `How many loans to ${ecoGreen(categoryName)}${separator}will you make this year?`;
+	},
+
+	/** Direct no-goal-yet title used by selector entrypoints */
+	titleNoGoalYetSelectorEntrypoint({ compactIntro = false } = {}) {
+		const intro = compactIntro
+			? `<span class="tw-text-base tw-font-book">${this.CARD_NO_GOAL_YET_EXPERIMENT}</span>`
+			: this.CARD_NO_GOAL_YET_EXPERIMENT;
+		return `${intro}<br>${this.CARD_HABIT_PROMPT_SHORT}`;
+	},
+
+	/** Generic category question used by direct goal-selector flows */
+	titleLoanQuestionForCategory(categoryId, categoryName, options = {}) {
+		if (categoryId === ID_SUPPORT_ALL) {
+			return this.TITLE_HOW_MANY_LOANS_GENERIC;
+		}
+		if (categoryId === ID_US_ECONOMIC_EQUALITY) {
+			if (options.splitQuestion) {
+				return this.titleCategoryHowManyLoans('U.S. entrepreneurs', options);
+			}
+			return this.TITLE_US_ENTREPRENEURS_HOW_MANY_LOANS;
+		}
+		return this.titleCategoryHowManyLoans(categoryName?.toLowerCase(), options);
+	},
 
 	// ─── Goal selector subtitle ────────────────────────────────────────────────
 
@@ -124,6 +157,12 @@ const goalCopy = {
 	/** Experiment: motivational subtitle in the empty goal tile */
 	CARD_HABIT_PROMPT_EXPERIMENT: "Make helping others a habit.<br>We'll help you make it happen.",
 
+	/** Single-line habit prompt used where the subtitle should not force a line break */
+	CARD_HABIT_PROMPT_SINGLE_LINE: "Make helping others a habit. We'll help you make it happen.",
+
+	/** Short habit prompt used inside the goal selector title */
+	CARD_HABIT_PROMPT_SHORT: 'Make helping others a habit.',
+
 	// ─── GoalProgressRing — modal description text ───────────────────────────────
 
 	/** Modal: goal completed — "Thank you for supporting X [category]..." */
diff --git a/test/unit/specs/components/MyKiva/FeaturedGoalCard.spec.js b/test/unit/specs/components/MyKiva/FeaturedGoalCard.spec.js
index 6acfe40ca34..33659af81fb 100644
--- a/test/unit/specs/components/MyKiva/FeaturedGoalCard.spec.js
+++ b/test/unit/specs/components/MyKiva/FeaturedGoalCard.spec.js
@@ -4,6 +4,8 @@ import FeaturedGoalCard from '#src/components/MyKiva/FeaturedGoalCard';
 import { GOALS_CURRENT_YEAR } from '#src/composables/useGoalData';
 import goalCopy from '#src/util/goalCopy';
 
+const stripHtml = html => html.replace(/<[^>]*>/g, '');
+
 vi.mock('#src/util/animation/confettiUtils', () => ({
 	showConfetti: vi.fn(),
 }));
@@ -89,23 +91,36 @@ describe('FeaturedGoalCard copy', () => {
 			vi.setSystemTime(new Date('2026-03-31T12:00:00'));
 
 			const wrapper = buildNoGoal();
-			expect(wrapper.html()).toContain('Lenders like you help');
-			expect(wrapper.html()).toContain('3 women');
-			expect(wrapper.html()).toContain('a year!');
+			expect(wrapper.text()).toContain(stripHtml(goalCopy.titleNoHistoryWomensDefault()));
 			expect(wrapper.text()).not.toContain(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT);
 		});
 
-		it('renders the no-goal-yet title starting April 1', () => {
+		it('renders the last-year women title from January 1 through March 31 when previous-year loans exist', () => {
+			vi.useFakeTimers();
+			vi.setSystemTime(new Date('2026-03-31T12:00:00'));
+
+			const wrapper = mountCard({ state: 'no-goal', prevYearLoans: 2 });
+			expect(wrapper.text()).toContain('Last year, you helped 2 women shape their futures!');
+			expect(wrapper.text()).not.toContain(stripHtml(goalCopy.titleNoHistoryWomensDefault()));
+		});
+
+		it('renders the no-goal-yet title and habit prompt starting April 1', () => {
 			vi.useFakeTimers();
 			vi.setSystemTime(new Date('2026-04-01T12:00:00'));
 
 			const wrapper = buildNoGoal();
 			expect(wrapper.text()).toContain(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT);
-			expect(wrapper.html()).not.toContain('Lenders like you help');
+			expect(wrapper.text()).toContain(goalCopy.CARD_HABIT_PROMPT_SINGLE_LINE);
+			expect(wrapper.html()).not.toContain('<br>');
+			expect(wrapper.text()).not.toContain(stripHtml(goalCopy.titleNoHistoryWomensDefault()));
+			expect(wrapper.text()).not.toContain(goalCopy.TITLE_HOW_MANY_LOANS_GENERIC);
 		});
 
-		it('renders the generic loans-this-year subtitle', () => {
-			expect(buildNoGoal().text()).toContain('How many loans will you make this year?');
+		it('renders the generic loans-this-year subtitle from January 1 through March 31', () => {
+			vi.useFakeTimers();
+			vi.setSystemTime(new Date('2026-03-31T12:00:00'));
+
+			expect(buildNoGoal().text()).toContain(goalCopy.TITLE_HOW_MANY_LOANS_GENERIC);
 		});
 
 		it('renders the year-stamped Set Goal CTA', () => {
@@ -322,8 +337,11 @@ describe('FeaturedGoalCard copy', () => {
 
 	describe('state validator fallback', () => {
 		it('renders no-goal copy when an unrecognized state value is passed', () => {
+			vi.useFakeTimers();
+			vi.setSystemTime(new Date('2026-03-31T12:00:00'));
+
 			const wrapper = mountCard({ state: 'something-unsupported' });
-			expect(wrapper.text()).toContain('How many loans will you make this year?');
+			expect(wrapper.text()).toContain(goalCopy.TITLE_HOW_MANY_LOANS_GENERIC);
 			expect(wrapper.text()).toContain(`Set ${GOALS_CURRENT_YEAR} goal`);
 		});
 	});
diff --git a/test/unit/specs/components/MyKiva/GoalSelector.spec.js b/test/unit/specs/components/MyKiva/GoalSelector.spec.js
index c8732bfa4c4..378ce7d645b 100644
--- a/test/unit/specs/components/MyKiva/GoalSelector.spec.js
+++ b/test/unit/specs/components/MyKiva/GoalSelector.spec.js
@@ -56,6 +56,22 @@ describe('GoalSelector', () => {
 				type: Array,
 				default: () => [],
 			},
+			useDirectQuestionTitle: {
+				type: Boolean,
+				default: false,
+			},
+			compactNoGoalYetTitle: {
+				type: Boolean,
+				default: false,
+			},
+			compactLayout: {
+				type: Boolean,
+				default: false,
+			},
+			progressSubtitleBeforeOptions: {
+				type: Boolean,
+				default: false,
+			},
 		},
 		data() {
 			return {
@@ -104,6 +120,10 @@ describe('GoalSelector', () => {
 					:tiered-achievements="tieredAchievements"
 					:selected-category-id="selectedCategoryId"
 					:selected-category-name="selectedCategoryName"
+					:use-direct-question-title="useDirectQuestionTitle"
+					:compact-no-goal-yet-title="compactNoGoalYetTitle"
+					:compact-layout="compactLayout"
+					:progress-subtitle-before-options="progressSubtitleBeforeOptions"
 				/>
 			</div>
 		`,
@@ -177,6 +197,38 @@ describe('GoalSelector', () => {
 		await expectCategoryOptions('category-support-all', getExpectedGoalOptions({ useDefault: true }));
 	});
 
+	it('can render current-year progress copy before loan number options', async () => {
+		const tieredAchievements = [
+			{
+				id: ID_WOMENS_EQUALITY,
+				progressForCurrentYear: 1,
+				progressForYear: 0,
+			},
+		];
+
+		const { container } = render(TestWrapper, {
+			global: {
+				...globalOptions,
+				provide: {
+					...globalOptions.provide,
+					$kvTrackEvent: vi.fn(),
+				},
+			},
+			props: {
+				tieredAchievements,
+				progressSubtitleBeforeOptions: true,
+			},
+		});
+
+		await flushPromises();
+
+		const progressCopy = Array.from(container.querySelectorAll('p'))
+			.find(el => el.textContent.includes('You’ve already made 1 loan that will count!'));
+		const options = container.querySelector('.goal-selector__options');
+
+		expect(progressCopy.compareDocumentPosition(options)).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
+	});
+
 	it('renders the selected category name in the title when the user changes category', async () => {
 		vi.useFakeTimers();
 		vi.setSystemTime(new Date('2026-01-15T12:00:00'));
@@ -263,11 +315,11 @@ describe('GoalSelector', () => {
 		await vi.runAllTimersAsync();
 
 		expect(getByRole('heading', { level: 2 }).textContent)
-			.toContain('Last year, you helped 2 women shape their futures!');
+			.toContain(stripHtml(goalCopy.titleLastYearForCategory(2, ID_WOMENS_EQUALITY, 'Women')));
 		expect(queryByText(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT)).toBeNull();
 	});
 
-	it('shows no-goal-yet copy starting April 1', async () => {
+	it('keeps the selector question starting April 1', async () => {
 		vi.useFakeTimers();
 		vi.setSystemTime(new Date('2026-04-01T12:00:00'));
 
@@ -287,18 +339,19 @@ describe('GoalSelector', () => {
 					$kvTrackEvent: vi.fn(),
 				},
 			},
-			props: { tieredAchievements },
+			props: { tieredAchievements, useDirectQuestionTitle: true },
 		});
 
 		await vi.runAllTimersAsync();
 
-		expect(getByRole('heading', { level: 2 }).textContent)
-			.toBe(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT);
-		expect(container.textContent).toContain('How many loans will you make this year?');
+		expect(getByRole('heading', { level: 2 }).innerHTML)
+			.toContain(goalCopy.titleLoanQuestionForCategory(ID_WOMENS_EQUALITY, 'Women', { splitQuestion: true }));
+		expect(container.textContent).not.toContain(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT);
+		expect(container.textContent).not.toContain(goalCopy.TITLE_HOW_MANY_LOANS_GENERIC);
 		expect(container.textContent).toContain(stripHtml(goalCopy.subtitleLoansAlreadyMade(1)));
 	});
 
-	it('shows requested goal question and current-year progress copy', async () => {
+	it('shows no-goal-yet entrypoint title and category question starting April 1', async () => {
 		vi.useFakeTimers();
 		vi.setSystemTime(new Date('2026-04-01T12:00:00'));
 
@@ -342,11 +395,53 @@ describe('GoalSelector', () => {
 		await vi.runAllTimersAsync();
 
 		expect(getByRole('heading', { level: 2 }).textContent)
-			.toBe(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT);
-		expect(container.textContent).toContain('How many loans will you make this year?');
+			.toContain(stripHtml(goalCopy.titleNoGoalYetSelectorEntrypoint()));
+		expect(container.textContent).toContain(stripHtml(
+			goalCopy.titleLoanQuestionForCategory(ID_WOMENS_EQUALITY, 'Women')
+		));
 		expect(container.textContent).toContain(stripHtml(goalCopy.subtitleLoansAlreadyMade(1)));
 	});
 
+	it('can render a compact no-goal-yet intro line starting April 1', async () => {
+		vi.useFakeTimers();
+		vi.setSystemTime(new Date('2026-04-01T12:00:00'));
+
+		const { container } = render(TestWrapper, {
+			global: {
+				...globalOptions,
+				provide: {
+					...globalOptions.provide,
+					$kvTrackEvent: vi.fn(),
+				},
+			},
+			props: { compactNoGoalYetTitle: true },
+		});
+
+		await vi.runAllTimersAsync();
+
+		const heading = container.querySelector('h2');
+		expect(heading.innerHTML).toContain('tw-text-base');
+		expect(heading.textContent).toContain(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT);
+		expect(heading.textContent).toContain(goalCopy.CARD_HABIT_PROMPT_SHORT);
+	});
+
+	it('can render the compact layout class for thank-you page spacing', async () => {
+		const { container } = render(TestWrapper, {
+			global: {
+				...globalOptions,
+				provide: {
+					...globalOptions.provide,
+					$kvTrackEvent: vi.fn(),
+				},
+			},
+			props: { compactLayout: true },
+		});
+
+		await flushPromises();
+
+		expect(container.querySelector('.goal-selector--compact')).toBeTruthy();
+	});
+
 	it('shows current-year progress copy after the user selects a new category', async () => {
 		const tieredAchievements = [
 			{ id: ID_WOMENS_EQUALITY, progressForYear: 0, progressForCurrentYear: 1 },
diff --git a/test/unit/specs/components/MyKiva/GoalSettingModal.spec.js b/test/unit/specs/components/MyKiva/GoalSettingModal.spec.js
index 1671909d4d0..fd58bba3746 100644
--- a/test/unit/specs/components/MyKiva/GoalSettingModal.spec.js
+++ b/test/unit/specs/components/MyKiva/GoalSettingModal.spec.js
@@ -87,6 +87,14 @@ const GoalSelectorStub = {
 			type: Boolean,
 			default: false,
 		},
+		compactLayout: {
+			type: Boolean,
+			default: false,
+		},
+		progressSubtitleBeforeOptions: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	template: '<div data-testid="goal-selector"></div>',
 };
@@ -145,4 +153,36 @@ describe('GoalSettingModal', () => {
 		expect(selector.exists()).toBe(true);
 		expect(selector.props('showGoalValuePropsCopy')).toBe(false);
 	});
+
+	it('passes compact-layout to GoalSelector in the standard selector state', () => {
+		const wrapper = mountModal({
+			showGoalTile: false,
+			showRecommendLoanArea: false,
+			isThanksPage: false,
+		});
+
+		expect(wrapper.findComponent(GoalSelectorStub).props('compactLayout')).toBe(true);
+	});
+
+	it('places the progress subtitle before options in the standard selector state', () => {
+		const wrapper = mountModal({
+			showGoalTile: false,
+			showRecommendLoanArea: false,
+			isThanksPage: false,
+		});
+
+		expect(wrapper.findComponent(GoalSelectorStub).props('progressSubtitleBeforeOptions')).toBe(true);
+	});
+
+	it('does not pass compact-layout when on the thanks page', () => {
+		const wrapper = mountModal({ isThanksPage: true });
+
+		expect(wrapper.findComponent(GoalSelectorStub).props('compactLayout')).toBe(false);
+	});
+
+	it('keeps the progress subtitle below options on the thanks page', () => {
+		const wrapper = mountModal({ isThanksPage: true });
+
+		expect(wrapper.findComponent(GoalSelectorStub).props('progressSubtitleBeforeOptions')).toBe(false);
+	});
 });
diff --git a/test/unit/specs/components/MyKiva/MyKivaFeaturedSlot.spec.js b/test/unit/specs/components/MyKiva/MyKivaFeaturedSlot.spec.js
index 5720ac1a3e6..990b9be73a6 100644
--- a/test/unit/specs/components/MyKiva/MyKivaFeaturedSlot.spec.js
+++ b/test/unit/specs/components/MyKiva/MyKivaFeaturedSlot.spec.js
@@ -3,7 +3,7 @@ import { mount } from '@vue/test-utils';
 import { nextTick, ref } from 'vue';
 import MyKivaFeaturedSlot from '#src/components/MyKiva/MyKivaFeaturedSlot';
 import { GOAL_STATUS, GOALS_CURRENT_YEAR } from '#src/composables/useGoalData';
-import { ID_US_ECONOMIC_EQUALITY } from '#src/composables/useBadgeData';
+import { ID_US_ECONOMIC_EQUALITY, ID_WOMENS_EQUALITY } from '#src/composables/useBadgeData';
 
 vi.mock('vue-router', () => ({
 	useRouter: () => ({}),
@@ -15,8 +15,9 @@ vi.mock('#src/util/logReadQueryError', () => ({
 
 const FEATURED_CARD_STUB = {
 	name: 'FeaturedGoalCard',
-	props: ['state', 'loading', 'suppressCompletionConfetti'],
+	props: ['state', 'loading', 'prevYearLoans', 'suppressCompletionConfetti'],
 	template: '<div data-testid="featured-goal-card" :data-state="state" '
+		+ ':data-prev-year-loans="String(prevYearLoans)" '
 		+ ':data-suppress-confetti="String(suppressCompletionConfetti)" />',
 };
 
@@ -46,6 +47,7 @@ const mountSlot = ({ goalData = buildGoalData(), props = {}, trackEvent = vi.fn(
 		},
 		global: {
 			provide: {
+				apollo: {},
 				goalData,
 				$kvTrackEvent: trackEvent,
 			},
@@ -71,6 +73,19 @@ describe('MyKivaFeaturedSlot', () => {
 			expect(card.attributes('data-state')).toBe('no-goal');
 		});
 
+		it('passes previous-year women loan count to the no-goal card', () => {
+			const { wrapper } = mountSlot({
+				goalData: buildGoalData({ status: null }),
+				props: {
+					heroTieredAchievements: [
+						{ id: ID_WOMENS_EQUALITY, progressForYear: 2 },
+					],
+				},
+			});
+			const card = wrapper.find('[data-testid="featured-goal-card"]');
+			expect(card.attributes('data-prev-year-loans')).toBe('2');
+		});
+
 		it('renders active-goal state when the lender has an in-progress goal', () => {
 			const { wrapper } = mountSlot({
 				goalData: buildGoalData({ status: GOAL_STATUS.IN_PROGRESS, progress: 2, percentage: 40 }),
diff --git a/test/unit/specs/components/Thanks/SingleVersion/GoalEntrypoint.spec.js b/test/unit/specs/components/Thanks/SingleVersion/GoalEntrypoint.spec.js
index 2dadb28a6aa..1dc581c1c8a 100644
--- a/test/unit/specs/components/Thanks/SingleVersion/GoalEntrypoint.spec.js
+++ b/test/unit/specs/components/Thanks/SingleVersion/GoalEntrypoint.spec.js
@@ -29,6 +29,16 @@ const RecommendLoanForGoalContainerStub = {
 
 const GoalSelectorStub = {
 	name: 'GoalSelector',
+	props: {
+		compactNoGoalYetTitle: {
+			type: Boolean,
+			default: false,
+		},
+		compactLayout: {
+			type: Boolean,
+			default: false,
+		},
+	},
 	emits: ['set-goal', 'set-goal-target', 'edit-goal'],
 	template: '<div />',
 };
@@ -65,6 +75,14 @@ describe('GoalEntrypoint', () => {
 			expect(wrapper.findComponent(RecommendLoanForGoalContainerStub).exists()).toBe(false);
 		});
 
+		it('requests compact thank-you page selector styling', () => {
+			const wrapper = mountComponent({ loading: false, showRecommendLoanAfterGoalView: false });
+			const selector = wrapper.findComponent(GoalSelectorStub);
+
+			expect(selector.props('compactNoGoalYetTitle')).toBe(true);
+			expect(selector.props('compactLayout')).toBe(true);
+		});
+
 		it('renders the recommended loan container when the view is on and loans are available', () => {
 			const wrapper = mountComponent({
 				loading: false,
diff --git a/test/unit/specs/components/Thanks/ThanksPageSingleVersion.spec.js b/test/unit/specs/components/Thanks/ThanksPageSingleVersion.spec.js
index 12c5f731106..73b1764588b 100644
--- a/test/unit/specs/components/Thanks/ThanksPageSingleVersion.spec.js
+++ b/test/unit/specs/components/Thanks/ThanksPageSingleVersion.spec.js
@@ -3,7 +3,10 @@ import { ref } from 'vue';
 import { createRouter, createMemoryHistory } from 'vue-router';
 import ThanksPageSingleVersion from '#src/components/Thanks/ThanksPageSingleVersion';
 import { GOAL_STATUS } from '#src/composables/useGoalData';
-import { GOAL_SIGNUP_THANKS_VIEWS_COOKIE } from '#src/util/myKivaUtils';
+import {
+	GOAL_SIGNUP_THANKS_VIEWS_COOKIE,
+	incrementGoalSignupThanksViewCount,
+} from '#src/util/myKivaUtils';
 import { globalOptions } from '../../../specUtils';
 
 const router = createRouter({
@@ -525,6 +528,7 @@ describe('ThanksPageSingleVersion', () => {
 
 		it('increments the thank you goal signup view counter when the ask renders', async () => {
 			mockUserGoal.value = null;
+			incrementGoalSignupThanksViewCount.mockClear();
 
 			const { cookieStore, getByTestId } = renderComponent({
 				badgesAchieved: [],
@@ -532,6 +536,7 @@ describe('ThanksPageSingleVersion', () => {
 
 			await vi.waitFor(() => {
 				expect(getByTestId('goal-entrypoint')).toBeTruthy();
+				expect(incrementGoalSignupThanksViewCount).toHaveBeenCalledTimes(1);
 				expect(cookieStore.set).toHaveBeenCalledWith(GOAL_SIGNUP_THANKS_VIEWS_COOKIE, '1', {
 					path: '/',
 					expires: expect.any(Date),
diff --git a/test/unit/specs/pages/Portfolio/ImpactDashboard/GoalEntrypoint.spec.js b/test/unit/specs/pages/Portfolio/ImpactDashboard/GoalEntrypoint.spec.js
index f6b12fdda30..ab3cf7149ed 100644
--- a/test/unit/specs/pages/Portfolio/ImpactDashboard/GoalEntrypoint.spec.js
+++ b/test/unit/specs/pages/Portfolio/ImpactDashboard/GoalEntrypoint.spec.js
@@ -84,6 +84,7 @@ describe('Portfolio GoalEntrypoint', () => {
 		await flushPromises();
 
 		expect(wrapper.text()).toContain('Lenders like you help 3 women a year!');
+		expect(wrapper.text()).toContain(goalCopy.TITLE_HOW_MANY_LOANS_GENERIC);
 		expect(wrapper.text()).toContain(goalCopy.BUTTON_SET_GOAL);
 		expect(wrapper.text()).not.toContain(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT);
 	});
@@ -97,6 +98,7 @@ describe('Portfolio GoalEntrypoint', () => {
 		await flushPromises();
 
 		expect(wrapper.text()).toContain('Last year, you helped 2 women shape their futures!');
+		expect(wrapper.text()).toContain(goalCopy.TITLE_HOW_MANY_LOANS_GENERIC);
 		expect(wrapper.text()).toContain(goalCopy.BUTTON_SET_GOAL);
 		expect(wrapper.text()).not.toContain(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT);
 	});
@@ -110,8 +112,10 @@ describe('Portfolio GoalEntrypoint', () => {
 		await flushPromises();
 
 		expect(wrapper.text()).toContain(goalCopy.CARD_NO_GOAL_YET_EXPERIMENT);
+		expect(wrapper.text()).toContain(goalCopy.CARD_HABIT_PROMPT_SINGLE_LINE);
 		expect(wrapper.text()).toContain(goalCopy.BUTTON_SET_GOAL);
 		expect(wrapper.text()).not.toContain('Last year, you helped');
 		expect(wrapper.text()).not.toContain('Lenders like you');
+		expect(wrapper.text()).not.toContain(goalCopy.TITLE_HOW_MANY_LOANS_GENERIC);
 	});
 });
diff --git a/test/unit/specs/util/goalCopy.spec.js b/test/unit/specs/util/goalCopy.spec.js
index 54b15fb86c9..1fb77ec6aee 100644
--- a/test/unit/specs/util/goalCopy.spec.js
+++ b/test/unit/specs/util/goalCopy.spec.js
@@ -52,6 +52,26 @@ describe('goalCopy', () => {
 		});
 	});
 
+	describe('subtitleNoGoalYetEntrypoint', () => {
+		afterEach(() => {
+			vi.useRealTimers();
+		});
+
+		it('uses the loan question from January 1 through March 31', () => {
+			vi.useFakeTimers();
+			vi.setSystemTime(new Date('2026-03-31T12:00:00'));
+
+			expect(goalCopy.subtitleNoGoalYetEntrypoint()).toBe(goalCopy.TITLE_HOW_MANY_LOANS_GENERIC);
+		});
+
+		it('uses the habit prompt starting April 1', () => {
+			vi.useFakeTimers();
+			vi.setSystemTime(new Date('2026-04-01T12:00:00'));
+
+			expect(goalCopy.subtitleNoGoalYetEntrypoint()).toBe(goalCopy.CARD_HABIT_PROMPT_SINGLE_LINE);
+		});
+	});
+
 	describe('getGoalSignupCopyVariant', () => {
 		it('uses last-year copy from January 1 through March 31', () => {
 			expect(goalCopy.getGoalSignupCopyVariant(new Date('2026-01-01T12:00:00'))).toBe(GOAL_SIGNUP_COPY_LAST_YEAR);
@@ -134,7 +154,59 @@ describe('goalCopy', () => {
 		it('wraps the category name in an eco-green span', () => {
 			const result = goalCopy.titleCategoryHowManyLoans('refugees');
 			expect(result).toContain('<span class="tw-text-eco-green-3">refugees</span>');
-			expect(result).toContain('will you make this year?');
+			expect(result).toContain(' will you make this year?');
+			expect(result).not.toContain('<br>');
+		});
+
+		it('can split the category question after the category name', () => {
+			const result = goalCopy.titleCategoryHowManyLoans('women', { splitQuestion: true });
+
+			expect(result).toContain('<span class="tw-text-eco-green-3">women</span><br>will you make this year?');
+		});
+	});
+
+	describe('titleNoGoalYetSelectorEntrypoint', () => {
+		it('combines the no-goal-yet title with the short habit prompt', () => {
+			expect(stripHtml(goalCopy.titleNoGoalYetSelectorEntrypoint()))
+				.toBe(`${goalCopy.CARD_NO_GOAL_YET_EXPERIMENT}${goalCopy.CARD_HABIT_PROMPT_SHORT}`);
+		});
+
+		it('can render a compact intro line', () => {
+			const result = goalCopy.titleNoGoalYetSelectorEntrypoint({ compactIntro: true });
+
+			expect(result).toContain(`>${goalCopy.CARD_NO_GOAL_YET_EXPERIMENT}</span>`);
+			expect(result).toContain('tw-text-base');
+			expect(result).toContain(goalCopy.CARD_HABIT_PROMPT_SHORT);
+		});
+	});
+
+	describe('titleLoanQuestionForCategory', () => {
+		it('uses generic copy for Support All', () => {
+			expect(goalCopy.titleLoanQuestionForCategory(ID_SUPPORT_ALL, 'Choose as I go'))
+				.toBe(goalCopy.TITLE_HOW_MANY_LOANS_GENERIC);
+		});
+
+		it('uses the U.S. Entrepreneurs copy for US Economic Equality', () => {
+			expect(goalCopy.titleLoanQuestionForCategory(ID_US_ECONOMIC_EQUALITY, 'U.S. Entrepreneurs'))
+				.toBe(goalCopy.TITLE_US_ENTREPRENEURS_HOW_MANY_LOANS);
+			expect(goalCopy.TITLE_US_ENTREPRENEURS_HOW_MANY_LOANS).toContain(' will you make this year?');
+			expect(goalCopy.TITLE_US_ENTREPRENEURS_HOW_MANY_LOANS).not.toContain('<br>');
+		});
+
+		it('can split the U.S. Entrepreneurs copy after the category name', () => {
+			const result = goalCopy.titleLoanQuestionForCategory(
+				ID_US_ECONOMIC_EQUALITY,
+				'U.S. Entrepreneurs',
+				{ splitQuestion: true }
+			);
+
+			expect(result)
+				.toContain('<span class="tw-text-eco-green-3">U.S. entrepreneurs</span><br>will you make this year?');
+		});
+
+		it('uses category-specific copy for other categories', () => {
+			expect(stripHtml(goalCopy.titleLoanQuestionForCategory(ID_WOMENS_EQUALITY, 'Women')))
+				.toBe(stripHtml(goalCopy.titleCategoryHowManyLoans('women')));
 		});
 	});