diff --git a/core/lib/presentation/views/color/color_picker_modal.dart b/core/lib/presentation/views/color/color_picker_modal.dart
index 18ea919fc..35ba1c5d3 100644
--- a/core/lib/presentation/views/color/color_picker_modal.dart
+++ b/core/lib/presentation/views/color/color_picker_modal.dart
@@ -320,7 +320,12 @@ class _ColorPickerModalState extends State<ColorPickerModal> {
   }
 
   void _onHexColorChanged(String value) {
-    _hsvColorNotifier.value = HSVColor.fromColor(value.toColor);
+    final hex = value.trim();
+    if (hex.isEmpty) return;
+
+    try {
+      _hsvColorNotifier.value = HSVColor.fromColor(hex.toColor);
+    } catch (_) {}
   }
 
   @override
diff --git a/labels/lib/extensions/list_label_extension.dart b/labels/lib/extensions/list_label_extension.dart
index 9a3c0c504..0f00c2574 100644
--- a/labels/lib/extensions/list_label_extension.dart
+++ b/labels/lib/extensions/list_label_extension.dart
@@ -11,6 +11,6 @@ extension ListLabelExtension on List<Label> {
   }
 
   List<String> get displayNameNotNullList => map((label) => label.safeDisplayName)
-      .where((name) => name.isNotEmpty)
+      .where((name) => name.trim().isNotEmpty)
       .toList();
 }
diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb
index 3bbd82477..9554246ba 100644
--- a/lib/l10n/intl_messages.arb
+++ b/lib/l10n/intl_messages.arb
@@ -5250,7 +5250,7 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "createLabelSuccessfullyMessage": "You successfully created {labelName} label",
+  "createLabelSuccessfullyMessage": "You successfully created the {labelName} label",
   "@createLabelSuccessfullyMessage": {
     "type": "text",
     "placeholders_order": [
diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart
index afa79b8ba..9a0b19f4a 100644
--- a/lib/main/localizations/app_localizations.dart
+++ b/lib/main/localizations/app_localizations.dart
@@ -5579,7 +5579,7 @@ class AppLocalizations {
 
   String createLabelSuccessfullyMessage(String labelName) {
     return Intl.message(
-      'You successfully created $labelName label',
+      'You successfully created the $labelName label',
       name: 'createLabelSuccessfullyMessage',
       args: [labelName],
     );