4 files changed, 5 insertions, 4 deletions
diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index f91e951d..33208786 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -8,6 +8,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
     private UnifiedWindow window;
 
     public Database db { get; set; }
+    public Dino.Entities.Settings settings { get; set; }
     public StreamInteractor stream_interaction { get; set; }
     public Plugins.Registry plugin_registry { get; set; default = new Plugins.Registry(); }
     public SearchPathGenerator? search_path_generator { get; set; }
diff --git a/main/src/ui/chat_input/smiley_converter.vala b/main/src/ui/chat_input/smiley_converter.vala
index 849745f9..f8d29225 100644
--- a/main/src/ui/chat_input/smiley_converter.vala
+++ b/main/src/ui/chat_input/smiley_converter.vala
@@ -42,7 +42,7 @@ class SmileyConverter {
     }
 
     private void check_convert() {
-        if (Dino.Settings.instance().convert_utf8_smileys) {
+        if (Dino.Application.get_default().settings.convert_utf8_smileys) {
             foreach (string smiley in smiley_translations.keys) {
                 if (text_input.buffer.text.has_suffix(smiley)) {
                     if (text_input.buffer.text.length == smiley.length ||
@@ -55,4 +55,4 @@ class SmileyConverter {
     }
 }
 
-}
-\ No newline at end of file
+}
diff --git a/main/src/ui/contact_details/settings_provider.vala b/main/src/ui/contact_details/settings_provider.vala
index 64d4598c..47cdb795 100644
--- a/main/src/ui/contact_details/settings_provider.vala
+++ b/main/src/ui/contact_details/settings_provider.vala
@@ -100,4 +100,4 @@ public class SettingsProvider : Plugins.ContactDetailsProvider, Object {
     }
 }
 
-}
-\ No newline at end of file
+}
diff --git a/main/src/ui/settings_dialog.vala b/main/src/ui/settings_dialog.vala
index 6d4daf3b..e4b2a95f 100644
--- a/main/src/ui/settings_dialog.vala
+++ b/main/src/ui/settings_dialog.vala
@@ -10,7 +10,7 @@ class SettingsDialog : Dialog {
     [GtkChild] private CheckButton notification_checkbutton;
     [GtkChild] private CheckButton emoji_checkbutton;
 
-    Dino.Settings settings = Dino.Settings.instance();
+    Dino.Entities.Settings settings = Dino.Application.get_default().settings;
 
     public SettingsDialog() {
         Object(use_header_bar : 1);