6 files changed, 12 insertions, 6 deletions
diff --git a/main/data/settings_dialog.ui b/main/data/settings_dialog.ui
index 0fec0e1e..c76f347e 100644
--- a/main/data/settings_dialog.ui
+++ b/main/data/settings_dialog.ui
@@ -4,7 +4,7 @@
         <property name="modal">True</property>
         <child type="titlebar">
             <object class="GtkHeaderBar">
-                <property name="title" translatable="yes">Preferences</property>
+                <property name="title" translatable="yes">Settings</property>
                 <property name="show_close_button">True</property>
                 <property name="visible">True</property>
             </object>
diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index e63caff8..132705cf 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -134,6 +134,10 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
         set_accels_for_action("app.add_conference", new string[]{"<Ctrl>G"});
     }
 
+    public bool use_csd() {
+        return Environment.get_variable("GTK_CSD") != "0";
+    }
+
     private void show_accounts_window() {
         ManageAccounts.Dialog dialog = new ManageAccounts.Dialog(stream_interactor, db);
         dialog.set_transient_for(get_active_window());
diff --git a/main/src/ui/contact_details/dialog.vala b/main/src/ui/contact_details/dialog.vala
index fd3b4751..8cbd8c54 100644
--- a/main/src/ui/contact_details/dialog.vala
+++ b/main/src/ui/contact_details/dialog.vala
@@ -30,12 +30,14 @@ public class Dialog : Gtk.Dialog {
     }
 
     public Dialog(StreamInteractor stream_interactor, Conversation conversation) {
-        Object(use_header_bar : 1);
+        Object(use_header_bar : Util.use_csd() ? 1 : 0);
         this.stream_interactor = stream_interactor;
         this.conversation = conversation;
 
         title = conversation.type_ == Conversation.Type.GROUPCHAT ? _("Conference Details") : _("Contact Details");
-        (get_header_bar() as HeaderBar).set_subtitle(Util.get_conversation_display_name(stream_interactor, conversation));
+        if (Util.use_csd()) {
+            (get_header_bar() as HeaderBar).set_subtitle(Util.get_conversation_display_name(stream_interactor, conversation));
+        }
         setup_top();
 
         contact_details.add.connect(add_entry);
diff --git a/main/src/ui/manage_accounts/dialog.vala b/main/src/ui/manage_accounts/dialog.vala
index 07656f3a..bcc0f017 100644
--- a/main/src/ui/manage_accounts/dialog.vala
+++ b/main/src/ui/manage_accounts/dialog.vala
@@ -78,7 +78,7 @@ public class Dialog : Gtk.Dialog {
     }
 
     public Dialog(StreamInteractor stream_interactor, Database db) {
-        Object(use_header_bar : 1);
+        Object(use_header_bar : Util.use_csd() ? 1 : 0);
         this.db = db;
         this.stream_interactor = stream_interactor;
         foreach (Account account in db.get_accounts()) {
diff --git a/main/src/ui/settings_dialog.vala b/main/src/ui/settings_dialog.vala
index e40b2993..68c711dc 100644
--- a/main/src/ui/settings_dialog.vala
+++ b/main/src/ui/settings_dialog.vala
@@ -13,7 +13,7 @@ class SettingsDialog : Dialog {
     Dino.Entities.Settings settings = Dino.Application.get_default().settings;
 
     public SettingsDialog() {
-        Object(use_header_bar : 1);
+        Object(use_header_bar : Util.use_csd() ? 1 : 0);
 
         typing_checkbutton.active = settings.send_typing;
         marker_checkbutton.active = settings.send_marker;
diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala
index 5feda242..de05d753 100644
--- a/main/src/ui/util/helper.vala
+++ b/main/src/ui/util/helper.vala
@@ -265,7 +265,7 @@ public int get_only_emoji_count(string markup_text) {
 }
 
 public bool use_csd() {
-    return Environment.get_variable("GTK_CSD") != "0";
+    return (GLib.Application.get_default() as Application).use_csd();
 }
 
 }