diff --git a/lib/ui/routes/account_settings/account_settings_route.dart b/lib/ui/routes/account_settings/account_settings_route.dart
index 5af235e..0fc6789 100644
--- a/lib/ui/routes/account_settings/account_settings_route.dart
+++ b/lib/ui/routes/account_settings/account_settings_route.dart
@@ -1,5 +1,5 @@
 import 'package:comunic/ui/routes/account_settings/account_image_settings.dart';
-import 'package:comunic/ui/routes/account_settings/emojies_account_settings.dart';
+import 'package:comunic/ui/routes/account_settings/custom_emojies_account_settings.dart';
 import 'package:comunic/ui/routes/account_settings/general_account_settings.dart';
 import 'package:comunic/utils/intl_utils.dart';
 import 'package:flutter/material.dart';
@@ -47,7 +47,7 @@ class __AccountSettingsBodyState extends State<_AccountSettingsBody> {
               title: tr("Custom emojis"),
               subtitle: tr("Set your own emoticon shorcuts"),
               leading: Icon(Icons.insert_emoticon),
-              onTap: () => _openSection(EmojisAccountSettings()),
+              onTap: () => _openSection(CustomEmojisAccountSettings()),
             ),
 
             // Account image
diff --git a/lib/ui/routes/account_settings/emojies_account_settings.dart b/lib/ui/routes/account_settings/custom_emojies_account_settings.dart
similarity index 85%
rename from lib/ui/routes/account_settings/emojies_account_settings.dart
rename to lib/ui/routes/account_settings/custom_emojies_account_settings.dart
index 78334d3..b34985c 100644
--- a/lib/ui/routes/account_settings/emojies_account_settings.dart
+++ b/lib/ui/routes/account_settings/custom_emojies_account_settings.dart
@@ -17,24 +17,25 @@ import 'package:flutter/material.dart';
 ///
 /// @author Pierre Hubert
 
-class EmojisAccountSettings extends StatelessWidget {
+class CustomEmojisAccountSettings extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(tr("Emojies settings")),
+        title: Text(tr("Custom emojies settings")),
       ),
-      body: _EmojiesAccountBody(),
+      body: _CustomEmojiesAccountBody(),
     );
   }
 }
 
-class _EmojiesAccountBody extends StatefulWidget {
+class _CustomEmojiesAccountBody extends StatefulWidget {
   @override
-  __EmojiesAccountBodyState createState() => __EmojiesAccountBodyState();
+  _CustomEmojiesAccountBodyState createState() =>
+      _CustomEmojiesAccountBodyState();
 }
 
-class __EmojiesAccountBodyState extends State<_EmojiesAccountBody> {
+class _CustomEmojiesAccountBodyState extends State<_CustomEmojiesAccountBody> {
   User _user;
 
   final _key = GlobalKey<AsyncScreenWidgetState>();
@@ -89,9 +90,11 @@ class __EmojiesAccountBodyState extends State<_EmojiesAccountBody> {
     try {
       final newEmoji = await showDialog<NewEmoji>(
         context: context,
-        builder: (c) => _NewEmojiDialog(),
+        builder: (c) => _NewCustomEmojiDialog(),
       );
 
+      if (newEmoji == null) return;
+
       await SettingsHelper.uploadNewCustomEmoji(newEmoji);
     } catch (e, stack) {
       print("Could not add a new emoji: $e\n$stack");
@@ -102,12 +105,13 @@ class __EmojiesAccountBodyState extends State<_EmojiesAccountBody> {
   }
 }
 
-class _NewEmojiDialog extends StatefulWidget {
+/// Dialog used to upload new custom emojies
+class _NewCustomEmojiDialog extends StatefulWidget {
   @override
-  __NewEmojiDialogState createState() => __NewEmojiDialogState();
+  _NewCustomEmojiDialogState createState() => _NewCustomEmojiDialogState();
 }
 
-class __NewEmojiDialogState extends State<_NewEmojiDialog> {
+class _NewCustomEmojiDialogState extends State<_NewCustomEmojiDialog> {
   final _controller = TextEditingController();
   File _file;