diff --git a/plugins/provider/sip/sip-account-widget.ui b/plugins/provider/sip/sip-account-widget.ui
index 3e1fec1..290eba9 100644
--- a/plugins/provider/sip/sip-account-widget.ui
+++ b/plugins/provider/sip/sip-account-widget.ui
@@ -8,8 +8,6 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="AdwHeaderBar" id="header_add">
-            <property name="title" translatable="yes">Add Account</property>
-            <property name="show-close-button">True</property>
             <child type="end">
               <object class="GtkButton" id="login_btn">
                 <property name="use-underline">True</property>
@@ -28,8 +26,6 @@
         <child>
           <object class="AdwHeaderBar" id="header_edit">
             <property name="visible">True</property>
-            <property name="show-close-button">True</property>
-            <property name="title" translatable="yes">Manage Account</property>
             <child type="end">
               <object class="GtkButton" id="apply_btn">
                 <property name="use-underline">True</property>
diff --git a/src/calls-account-overview.c b/src/calls-account-overview.c
index fcec6cb..e170b68 100644
--- a/src/calls-account-overview.c
+++ b/src/calls-account-overview.c
@@ -441,7 +441,7 @@ calls_account_overview_init (CallsAccountOverview *self)
                     G_CALLBACK (on_key_pressed),
                     self->account_window);
 
-  gtk_window_set_title (GTK_WINDOW (self), _("Account overview"));
+  gtk_window_set_title (GTK_WINDOW (self), _("VoIP Accounts"));
 }
 
 
diff --git a/src/calls-main-window.c b/src/calls-main-window.c
index cf1b8dd..2e8cc63 100644
--- a/src/calls-main-window.c
+++ b/src/calls-main-window.c
@@ -177,6 +177,7 @@ window_ussd_added_cb (CallsMainWindow *self,
   g_object_set_data_full (G_OBJECT (self->ussd_dialog), "ussd",
                           g_object_ref (ussd), g_object_unref);
   window_update_ussd_state (self, ussd);
+  gtk_window_set_title (GTK_WINDOW (self->ussd_dialog), _("USSD"));
   gtk_window_present (GTK_WINDOW (self->ussd_dialog));
 }
 
diff --git a/src/ui/account-overview.ui b/src/ui/account-overview.ui
index 33be508..09377a9 100644
--- a/src/ui/account-overview.ui
+++ b/src/ui/account-overview.ui
@@ -12,8 +12,6 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="AdwHeaderBar">
-            <property name="title" translatable="yes">VoIP Accounts</property>
-            <property name="show-close-button">True</property>
             <property name="visible">True</property>
             <child type="end">
               <object class="GtkSpinner" id="spinner"/>
diff --git a/src/ui/main-window.ui b/src/ui/main-window.ui
index f3ef2d7..ba4a589 100644
--- a/src/ui/main-window.ui
+++ b/src/ui/main-window.ui
@@ -14,8 +14,6 @@
           <object class="AdwHeaderBar">
             <property name="visible">True</property>
             <property name="centering_policy">strict</property>
-            <property name="show_close_button">True</property>
-            <property name="title" bind-source="CallsMainWindow" bind-property="title" bind-flags="sync-create"/>
             <child type="title">
               <object class="AdwViewSwitcherTitle" id="title_switcher">
                 <property name="visible">True</property>
@@ -90,8 +88,8 @@
     <child type="titlebar">
       <object class="AdwHeaderBar">
         <property name="visible">True</property>
-        <property name="show-close-button">False</property>
-        <property name="title" translatable="yes">USSD</property>
+        <property name="show-start-title-buttons">False</property>
+        <property name="show-end-title-buttons">False</property>
         <child type="start">
           <object class="GtkButton" id="ussd_cancel_button">
             <property name="has-default">True</property>