diff --git a/app/lib/drug/widgets/annotation_cards/disclaimer.dart b/app/lib/drug/widgets/annotation_cards/disclaimer.dart
index 6cd159fc..7f45d301 100644
--- a/app/lib/drug/widgets/annotation_cards/disclaimer.dart
+++ b/app/lib/drug/widgets/annotation_cards/disclaimer.dart
@@ -29,12 +29,8 @@ class Disclaimer extends StatelessWidget {
           ),
           TextSpan(text: ' '),
           TextSpan(
-            text: context.l10n.drugs_page_disclaimer_description,
-            style: TextStyle(fontWeight: FontWeight.bold),
-          ),
-          TextSpan(
-            text: context.l10n.drugs_page_disclaimer_text_part_0,
-            style: TextStyle(fontWeight: FontWeight.w500),
+            text: context.l10n.drugs_page_main_disclaimer_text,
+            style: TextStyle(fontWeight: FontWeight.w600),
           ),
           TextSpan(
             children: [
@@ -47,7 +43,7 @@ class Disclaimer extends StatelessWidget {
                 ),
               ),
               TextSpan(text: ' '),
-              TextSpan(text: context.l10n.onboarding_1_disclaimer),
+              TextSpan(text: context.l10n.drugs_page_puzzle_disclaimer_text),
             ],
           )
         ]),
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
index f35d6708..62338945 100644
--- a/app/lib/l10n/app_en.arb
+++ b/app/lib/l10n/app_en.arb
@@ -129,10 +129,10 @@
         }
     }
   },
-  "drugs_page_disclaimer_description": "Please note: ",
-  "@drugs_page_disclaimer_description": {},
-  "drugs_page_disclaimer_text_part_0": "Never stop taking or change the dose of your medications without consulting your pharmacist or doctor.",
-  "@drugs_page_disclaimer_text_part_0": {},
+  "drugs_page_main_disclaimer_text": "Never stop taking or change the dose of your medications without consulting your pharmacist or doctor.",
+  "@drugs_page_main_disclaimer_text": {},
+  "drugs_page_puzzle_disclaimer_text": "The information from PharMe is like one puzzle piece in the big picture of how well a medicine works for you.\n\nThe information provided in this app is based ONLY on your DNA and certain medications that may interact with your genetic result. Other important factors like weight, age, pre-existing conditions, and further medication interactions are not considered.",
+  "@drugs_page_puzzle_disclaimer_text": {},
   "drugs_page_is_inhibitor": "{geneNumber, plural, =1{Taking {drugName} can interact with your results for the following gene: {genes}} other{Taking {drugName} can interact with your results for the following genes: {genes}}}",
   "@drugs_page_is_inhibitor": {
     "placeholders": {
@@ -481,31 +481,29 @@
   "@onboarding_prev": {},
   "onboarding_1_header": "Welcome to PharMe",
   "@onboarding_1_header": {},
-  "onboarding_1_text": "Your genome influences your health more than you might think, including how you react to medications.\n\nMore than 90 percent of people are vulnerable to unintended medication reactions.\n\nUse PharMe to find out about yours.",
+  "onboarding_1_text": "Your genes affect your health more than you might think, including how you respond to medications.\n\nIn fact, over 90 percent of people can have unexpected reactions to medicines.\n\nUse PharMe to find out about yours.",
   "@onboarding_1_text": {},
   "onboarding_2_header": "One size does not fit all",
   "@onboarding_2_header": {},
-  "onboarding_1_disclaimer": "The information from PharMe is like one puzzle piece in the big picture of how well a medicine works for you.\n\nThe information provided here is based ONLY on your DNA and certain medications that may interact with your genetic result. Other important factors like weight, age, pre-existing conditions, and further medication interactions are not considered.",
-  "@onboarding_1_disclaimer": {},
   "onboarding_2_text": "Each person’s body reacts to medications differently.\n\nMedications that are effective for a majority of people can have adverse side effects for you.",
   "@onboarding_2_text": {},
-  "onboarding_3_header": "Genome power unlocked to improve human health",
+  "onboarding_3_header": "Genome power unlocked to improve your health",
   "@onboarding_3_header": {},
-  "onboarding_3_text": "PharMe informs you if your genome makes you more likely to experience an unintended medication response.\n\nThis enables you to avoid medications that are ineffective or have side effects.",
+  "onboarding_3_text": "PharMe tells you if your genes make you more likely to have an unexpected reaction to a medication.\n\nThis way, you can avoid medications that might not work or could cause side effects.",
   "@onboarding_3_text": {},
-  "onboarding_3_disclaimer": "Please note that this app does not provide recommendations for medications or dosages. Always consult your pharmacist or doctor for personalized advice.",
-  "@onboarding_3_disclaimer": {},
-  "onboarding_4_header": "Tailored to your genome",
+  "onboarding_4_header": "Personalized for you",
   "@onboarding_4_header": {},
   "onboarding_4_text": "For PharMe to work, you need to get your genetics (DNA) tested at a lab. You don't need an account to use PharMe: You can just sign in to the lab's website through our app.",
   "@onboarding_4_text": {},
   "onboarding_4_button": "Find out more about gene tests here.",
   "@onboarding_4_button": {},
-  "onboarding_4_already_tested_text": "PharMe works by matching your genetic data with known information about interactions between certain genes and medications.\n\nThe information presented in PharMe is based on scientifically proven guidelines published by the Clinical Pharmacogenetics Implementation Consortium (CPIC®) and the U.S. Food and Drug Administration (FDA).",
+  "onboarding_4_already_tested_text": "PharMe matches your genetic information with what scientists know about how certain genes and medications interact.\n\nThe information provided by PharMe is based on proven guidelines from trusted organizations like the Clinical Pharmacogenetics Implementation Consortium (CPIC®) and the U.S. Food and Drug Administration (FDA).",
   "@onboarding_4_already_tested_text": {},
-  "onboarding_5_header": "We care about your data protection",
+  "onboarding_4_disclaimer": "PharMe ONLY includes medications that are known to have meaningful interactions with genes. If you cannot find a medication in PharMe, there may not be enough evidence for gene interactions.",
+  "@onboarding_4_disclaimer": {},
+  "onboarding_5_header": "We care about your privacy",
   "@onboarding_5_header": {},
-  "onboarding_5_text": "After downloading your genetic data from your data provider, it is solely kept on your phone in encrypted form.\n\nOur servers know nothing about you, neither your identity nor your DNA.",
+  "onboarding_5_text": "Once you download your genetic information, it is stored safely on your phone.\n\nOur system does not collect any information about you, including your name or DNA.",
   "@onboarding_5_text": {},
 
     
diff --git a/app/lib/onboarding/pages/onboarding.dart b/app/lib/onboarding/pages/onboarding.dart
index 9add4079..6642c1bb 100644
--- a/app/lib/onboarding/pages/onboarding.dart
+++ b/app/lib/onboarding/pages/onboarding.dart
@@ -20,7 +20,7 @@ class OnboardingPage extends HookWidget {
         text: context.l10n.onboarding_1_text,
         color: PharMeTheme.sinaiCyan,
         bottom: DisclaimerCard(
-          text: context.l10n.onboarding_3_disclaimer,
+          text: context.l10n.drugs_page_main_disclaimer_text,
         ),
       ),
       OnboardingSubPage(
@@ -40,7 +40,8 @@ class OnboardingPage extends HookWidget {
         color: PharMeTheme.sinaiPurple,
         bottom: DisclaimerCard(
           icon: FontAwesomeIcons.puzzlePiece,
-          text: context.l10n.onboarding_1_disclaimer,
+          iconPadding: EdgeInsets.all(PharMeTheme.smallSpace * 0.5),
+          text: context.l10n.drugs_page_puzzle_disclaimer_text,
         ),
       ),
       OnboardingSubPage(
@@ -50,6 +51,11 @@ class OnboardingPage extends HookWidget {
         header: context.l10n.onboarding_4_header,
         text: context.l10n.onboarding_4_already_tested_text,
         color: Colors.grey.shade600,
+        bottom: DisclaimerCard(
+          icon: FontAwesomeIcons.pills,
+          iconPadding: EdgeInsets.all(PharMeTheme.smallSpace * 0.5),
+          text: context.l10n.onboarding_4_disclaimer,
+        ),
       ),
       OnboardingSubPage(
         availableHeight:
@@ -480,12 +486,14 @@ class DisclaimerCard extends StatelessWidget {
     required this.text,
     this.secondLineText,
     this.onClick,
+    this.iconPadding,
   });
 
   final IconData? icon;
   final String text;
   final String? secondLineText;
   final GestureTapCallback? onClick;
+  final EdgeInsets? iconPadding;
 
   @override
   Widget build(BuildContext context) {
@@ -499,7 +507,10 @@ class DisclaimerCard extends StatelessWidget {
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Icon(icon ?? Icons.warning_rounded, size: 32),
+            Padding(
+              padding: iconPadding ?? EdgeInsets.zero,
+              child: Icon(icon ?? Icons.warning_rounded, size: 32),
+            ),
             SizedBox(width: PharMeTheme.smallSpace),
             Expanded(
               child: Column(