diff --git a/lib/screens/onboarding.dart b/lib/screens/onboarding.dart
index ada0d233..780b0232 100644
--- a/lib/screens/onboarding.dart
+++ b/lib/screens/onboarding.dart
@@ -96,7 +96,7 @@ class OnboardingScreen extends View<OnboardingViewModel> {
               foregroundColor: Colors.white,
               minimumSize: const Size(150, 36),
               elevation: 0.0,
-              padding: const EdgeInsets.only(left: 14.0, right: 8.0),
+              padding: const EdgeInsetsDirectional.only(start: 14.0, end: 8.0),
               shape: RoundedRectangleBorder(
                 borderRadius: BorderRadius.circular(12.0),
               ),
@@ -206,14 +206,12 @@ class OnboardingPage extends StatelessWidget {
             image,
             fit: BoxFit.fitWidth,
             excludeFromSemantics: true,
+            matchTextDirection: true,
           ),
           Flexible(
             flex: 12,
             child: Padding(
-              padding: const EdgeInsets.only(
-                left: 40.0,
-                right: 40.0,
-              ),
+              padding: const EdgeInsets.symmetric(horizontal: 40),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
diff --git a/lib/widgets/map_overlay/map_overlay.dart b/lib/widgets/map_overlay/map_overlay.dart
index 75b00431..f4ca3073 100644
--- a/lib/widgets/map_overlay/map_overlay.dart
+++ b/lib/widgets/map_overlay/map_overlay.dart
@@ -64,10 +64,8 @@ class MapOverlay extends ViewFragment<HomeViewModel> {
                       container: true,
                       sortKey: const OrdinalSortKey(2.0),
                       child: AttributionText(
-                        alignment: TextAlign.left,
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 10,
-                        ),
+                        alignment: TextAlign.start,
+                        padding: const EdgeInsets.symmetric(horizontal: 10),
                         children: [
                           AttributionTextPart(
                             AppLocalizations.of(context)!.osmAttributionText,
diff --git a/lib/widgets/question_dialog/question_summary.dart b/lib/widgets/question_dialog/question_summary.dart
index 8e6ec799..d22815bd 100644
--- a/lib/widgets/question_dialog/question_summary.dart
+++ b/lib/widgets/question_dialog/question_summary.dart
@@ -108,7 +108,7 @@ class QuestionSummary extends StatelessWidget {
                 Expanded(
                   child: Text(
                     answer,
-                    textAlign: TextAlign.right,
+                    textAlign: TextAlign.end,
                     maxLines: 2,
                     overflow: TextOverflow.ellipsis,
                   ),
diff --git a/lib/widgets/question_dialog/question_text_header.dart b/lib/widgets/question_dialog/question_text_header.dart
index 9d3d0e63..3f5d73b3 100644
--- a/lib/widgets/question_dialog/question_text_header.dart
+++ b/lib/widgets/question_dialog/question_text_header.dart
@@ -138,7 +138,7 @@ class _QuestionTextHeaderState extends State<QuestionTextHeader>
                           animation: _fillColorAnimation,
                           builder: (context, child) {
                             return Container(
-                              margin: const EdgeInsets.only(left: 10),
+                              margin: const EdgeInsetsDirectional.only(start: 10),
                               padding: const EdgeInsets.all(4),
                               decoration: BoxDecoration(
                                 color: _fillColorAnimation.value,
diff --git a/lib/widgets/question_inputs/list_input.dart b/lib/widgets/question_inputs/list_input.dart
index 995e33fd..6f575f9e 100644
--- a/lib/widgets/question_inputs/list_input.dart
+++ b/lib/widgets/question_inputs/list_input.dart
@@ -118,10 +118,10 @@ class _ListInputItemState extends State<ListInputItem> with SingleTickerProvider
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
                   Padding(
-                    padding: const EdgeInsets.only(
-                      left: 16.0,
+                    padding: const EdgeInsetsDirectional.only(
+                      start: 16.0,
                       top: 8.0,
-                      right: 8.0,
+                      end: 8.0,
                       bottom: 8.0,
                     ),
                     child: Semantics(
@@ -132,7 +132,6 @@ class _ListInputItemState extends State<ListInputItem> with SingleTickerProvider
                       child: Text(
                         semanticsLabel: '${widget.label} - ${widget.description ?? ''}',
                         widget.label,
-                        textAlign: TextAlign.left,
                       ),
                     ),
                   ),
@@ -144,9 +143,9 @@ class _ListInputItemState extends State<ListInputItem> with SingleTickerProvider
                         child: FadeTransition(
                           opacity: _animation,
                           child: Padding(
-                            padding: const EdgeInsets.only(
-                              left: 16.0,
-                              right: 8.0,
+                            padding: const EdgeInsetsDirectional.only(
+                              start: 16.0,
+                              end: 8.0,
                               bottom: 8.0,
                             ),
                             child: Text(
@@ -169,10 +168,7 @@ class _ListInputItemState extends State<ListInputItem> with SingleTickerProvider
                 // HeroViewer cannot be wrapped around since the returned error widget
                 // represents a different widget wherefore the hero transition would fail.
                 child: Padding(
-                  padding: EdgeInsets.fromLTRB(
-                    0,
-                    widget.imagePadding,
-                    widget.imagePadding,
+                  padding: EdgeInsets.all(
                     widget.imagePadding,
                   ),
                   child: ClipRRect(