diff --git a/lib/widgets/text_line.dart b/lib/widgets/text_line.dart
index 53bb07f8..a90a6883 100644
--- a/lib/widgets/text_line.dart
+++ b/lib/widgets/text_line.dart
@@ -60,7 +60,7 @@ class TextLine extends StatelessWidget {
         textAlign,
         textDirection,
         1.0,
-        Localizations.localeOf(context),
+        Localizations.localeOf(context, nullOk: true),
         strutStyle,
         TextWidthBasis.parent,
         null);
diff --git a/lib/widgets/toolbar.dart b/lib/widgets/toolbar.dart
index 1f54bd79..6818803a 100644
--- a/lib/widgets/toolbar.dart
+++ b/lib/widgets/toolbar.dart
@@ -446,13 +446,7 @@ Widget _selectHeadingStyleButtonBuilder(
     height: iconSize * 1.77,
     fillColor: Theme.of(context).canvasColor,
     child: Text(
-      _valueToText[value.key == "header"
-          ? Attribute.header
-          : (value.key == "h1")
-              ? Attribute.h1
-              : (value.key == "h2")
-                  ? Attribute.h2
-                  : Attribute.h3],
+      _valueToText[value],
       style: TextStyle(fontSize: 13, fontWeight: FontWeight.w600),
     ),
     initialValue: value,