diff --git a/src/components/home/SubscriptionList.tsx b/src/components/home/SubscriptionList.tsx
index da4f76f4..27d3d6e0 100644
--- a/src/components/home/SubscriptionList.tsx
+++ b/src/components/home/SubscriptionList.tsx
@@ -1,10 +1,11 @@
 import React, { useCallback } from 'react';
-import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
+import { View, Text, StyleSheet } from 'react-native';
 import { FlashList } from '@shopify/flash-list';
 import { colors, spacing, typography, borderRadius, shadows } from '../../utils/constants';
 import { SubscriptionCard } from '../subscription/SubscriptionCard';
 import { Subscription } from '../../types/subscription';
 import { usePerformanceProfiler } from '../../hooks/usePerformanceProfiler';
+import { EmptyState } from '../common/EmptyState';
 
 interface SubscriptionListProps {
   subscriptions: Subscription[];
@@ -97,7 +98,7 @@ export const SubscriptionList: React.FC<SubscriptionListProps> = React.memo(
             <Text style={styles.sectionTitle} accessibilityRole="header">
               Your Subscriptions
             </Text>
-            {hasSubscriptions && (
+            {hasSubscriptions && activeSubscriptions.length > 0 && (
               <View
                 style={styles.sectionHeaderRight}
                 accessibilityElementsHidden={true}
@@ -115,7 +116,23 @@ export const SubscriptionList: React.FC<SubscriptionListProps> = React.memo(
             )}
           </View>
 
-          {hasSubscriptions ? (
+          {!hasSubscriptions ? (
+            /* Context 1: Absolute empty state (no tracking items exist) */
+            <EmptyState
+              icon="📱"
+              title="No subscriptions yet"
+              message="Add your first subscription to start tracking your automated expenses and recurring logs."
+              actionText="Add Subscription"
+              onAction={onAddFirstPress}
+            />
+          ) : activeSubscriptions.length === 0 ? (
+            /* Context 2: Active filter empty state (subscriptions exist but filtered out) */
+            <EmptyState
+              icon="🔍"
+              title="No matches found"
+              message="No subscriptions correspond to your active filter or search query parameters."
+            />
+          ) : (
             <View style={styles.subscriptionsList}>
               <FlashList
                 data={activeSubscriptions}
@@ -126,38 +143,6 @@ export const SubscriptionList: React.FC<SubscriptionListProps> = React.memo(
                 showsVerticalScrollIndicator={false}
               />
             </View>
-          ) : (
-            <View
-              style={styles.emptyState}
-              accessible={true}
-              accessibilityLabel="No subscriptions yet. Add your first subscription to start tracking your spending.">
-              <Text
-                style={styles.emptyIcon}
-                accessibilityElementsHidden={true}
-                importantForAccessibility="no">
-                📱
-              </Text>
-              <Text
-                style={styles.emptyText}
-                accessibilityElementsHidden={true}
-                importantForAccessibility="no">
-                No subscriptions yet
-              </Text>
-              <Text
-                style={styles.emptySubtext}
-                accessibilityElementsHidden={true}
-                importantForAccessibility="no">
-                Add your first subscription to start tracking your spending
-              </Text>
-              <TouchableOpacity
-                style={styles.addFirstButton}
-                onPress={onAddFirstPress}
-                testID="add-subscription-button"
-                accessibilityRole="button"
-                accessibilityLabel="Add your first subscription">
-                <Text style={styles.addFirstButtonText}>Add Subscription</Text>
-              </TouchableOpacity>
-            </View>
           )}
         </View>
       </View>
@@ -226,37 +211,4 @@ const styles = StyleSheet.create({
   subscriptionsList: {
     marginBottom: spacing.lg,
   },
-  emptyState: {
-    alignItems: 'center',
-    paddingVertical: spacing.xl,
-    paddingHorizontal: spacing.lg,
-  },
-  emptyIcon: {
-    fontSize: 48,
-    marginBottom: spacing.md,
-  },
-  emptyText: {
-    ...typography.h3,
-    color: colors.text,
-    marginBottom: spacing.xs,
-    textAlign: 'center',
-  },
-  emptySubtext: {
-    ...typography.body,
-    color: colors.textSecondary,
-    textAlign: 'center',
-    marginBottom: spacing.lg,
-    lineHeight: 22,
-  },
-  addFirstButton: {
-    backgroundColor: colors.primary,
-    paddingVertical: spacing.md,
-    paddingHorizontal: spacing.lg,
-    borderRadius: borderRadius.md,
-  },
-  addFirstButtonText: {
-    ...typography.body,
-    color: colors.text,
-    fontWeight: '600',
-  },
 });
diff --git a/src/screens/HomeScreen.tsx b/src/screens/HomeScreen.tsx
index a9f20d63..49c8db5d 100644
--- a/src/screens/HomeScreen.tsx
+++ b/src/screens/HomeScreen.tsx
@@ -46,8 +46,7 @@ const HomeScreen: React.FC = () => {
   const [upcomingSubscriptions, setUpcomingSubscriptions] = useState<Subscription[]>([]);
   const [showFilterModal, setShowFilterModal] = useState(false);
 
-
-  // Use the new hook
+  // Use the filter tracking hook
   const { filters, filteredAndSorted, activeFilterCount, hasActiveFilters, clearAllFilters } =
     useFilteredSubscriptions(subscriptions);
 
@@ -66,7 +65,6 @@ const HomeScreen: React.FC = () => {
     if (subscriptions) setUpcomingSubscriptions(getUpcomingSubscriptions(subscriptions));
   }, [subscriptions, calculateStats, preferredCurrency, exchangeRates]);
 
-
   const onRefresh = async () => {
     await refresh({
       fetcher: refreshSubscriptions,
@@ -160,7 +158,6 @@ const HomeScreen: React.FC = () => {
           currency={preferredCurrency}
         />
 
-
         {!isOnline && (
           <View style={styles.offlineBanner}>
             <Text style={styles.offlineText}>
@@ -304,4 +301,4 @@ function createStyles(colors: ReturnType<typeof useThemeColors>) {
   });
 }
 
-export default HomeScreen;
+export default HomeScreen;
\ No newline at end of file
diff --git a/src/screens/InvoiceListScreen.tsx b/src/screens/InvoiceListScreen.tsx
index 716c5fdd..7daac30e 100644
--- a/src/screens/InvoiceListScreen.tsx
+++ b/src/screens/InvoiceListScreen.tsx
@@ -66,8 +66,10 @@ const InvoiceListScreen: React.FC = () => {
         {sortedInvoices.length === 0 ? (
           <EmptyState
             title="No invoices yet"
-            message="Invoices are created automatically after successful billing events."
+            message="Invoices are created automatically after successful billing events occur on tracked plans."
             icon="🧾"
+            actionText="Go to Dashboard"
+            onAction={() => navigation.navigate('Home')}
           />
         ) : (
           sortedInvoices.map((invoice) => (
@@ -87,14 +89,16 @@ const InvoiceListScreen: React.FC = () => {
                 </View>
 
                 <View style={styles.detailsRow}>
-                  <Text style={styles.detailLabel}>Total</Text>
-                  <Text style={styles.totalValue}>
-                    {formatCurrency(invoice.total, invoice.currency)}
-                  </Text>
-                </View>
-                <View style={styles.detailsRow}>
-                  <Text style={styles.detailLabel}>Due</Text>
-                  <Text style={styles.detailValue}>{formatDate(invoice.dueDate)}</Text>
+                  <View>
+                    <Text style={styles.detailLabel}>Total</Text>
+                    <Text style={styles.totalValue}>
+                      {formatCurrency(invoice.total, invoice.currency)}
+                    </Text>
+                  </View>
+                  <View style={{ alignItems: 'flex-end' }}>
+                    <Text style={styles.detailLabel}>Due</Text>
+                    <Text style={styles.detailValue}>{formatDate(invoice.dueDate)}</Text>
+                  </View>
                 </View>
               </Card>
             </TouchableOpacity>
@@ -130,7 +134,12 @@ function createStyles(colors: ReturnType<typeof useThemeColors>) {
     alignItems: 'center',
     marginTop: spacing.sm,
   },
-  detailLabel: { ...typography.caption, color: colors.textSecondary, textTransform: 'uppercase' },
+  detailLabel: {
+    ...typography.caption,
+    color: colors.textSecondary,
+    textTransform: 'uppercase',
+    marginBottom: 2,
+  },
   detailValue: { ...typography.body, color: colors.text },
   totalValue: { ...typography.h3, color: colors.accent },
   });
diff --git a/src/store/subscriptionStore.ts b/src/store/subscriptionStore.ts
index ee568fc8..f3c7fa2b 100644
--- a/src/store/subscriptionStore.ts
+++ b/src/store/subscriptionStore.ts
@@ -608,7 +608,6 @@ export const useSubscriptionStore = create<SubscriptionState>()(
       fetchSubscriptions: async () => {
         set({ isLoading: true, error: null });
         try {
-          // TODO: Replace with remote sync; local storage remains source-of-truth offline.
           await new Promise((resolve) => setTimeout(resolve, 1000));
           set({ isLoading: false });
           get().calculateStats();