From 7e7dcedaf31ee35499875491c9f569c575d28435 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Mon, 14 Feb 2022 14:55:59 +0100
Subject: Port from GTK3 to GTK4

---
 main/data/add_conversation/add_contact_dialog.ui   | 112 +--
 main/data/add_conversation/add_groupchat_dialog.ui | 198 ++---
 .../conference_details_fragment.ui                 | 301 +++----
 main/data/add_conversation/list_row.ui             |  89 +-
 main/data/add_conversation/select_jid_fragment.ui  |  80 +-
 main/data/call_widget.ui                           |  11 +-
 main/data/chat_input.ui                            |  57 +-
 main/data/contact_details_dialog.ui                | 103 +--
 main/data/conversation_content_view/view.ui        | 175 ++--
 main/data/conversation_item_widget.ui              |  73 ++
 main/data/conversation_list_titlebar_csd.ui        |  25 +-
 main/data/conversation_row.ui                      |  14 +-
 main/data/conversation_view.ui                     | 105 +--
 main/data/emojichooser.ui                          | 410 ----------
 main/data/file_default_widget.ui                   | 191 ++---
 main/data/file_send_overlay.ui                     |  56 +-
 main/data/global_search.ui                         | 246 +++---
 main/data/icons/dino-changes-allowed-symbolic.svg  |  10 -
 main/data/icons/dino-changes-prevent-symbolic.svg  |  67 --
 main/data/icons/dino-device-desktop-symbolic.svg   |   5 -
 main/data/icons/dino-device-phone-symbolic.svg     |   6 -
 main/data/icons/dino-double-tick-symbolic.svg      |   7 -
 main/data/icons/dino-emoticon-symbolic.svg         |   4 -
 main/data/icons/dino-file-document-symbolic.svg    |   6 -
 main/data/icons/dino-file-download-symbolic.svg    |   5 -
 main/data/icons/dino-file-image-symbolic.svg       |   6 -
 main/data/icons/dino-file-music-symbolic.svg       |   7 -
 main/data/icons/dino-file-symbolic.svg             |   4 -
 main/data/icons/dino-file-table-symbolic.svg       |  10 -
 main/data/icons/dino-file-video-symbolic.svg       |   5 -
 main/data/icons/dino-microphone-off-symbolic.svg   |   1 -
 main/data/icons/dino-microphone-symbolic.svg       |   1 -
 main/data/icons/dino-phone-hangup-symbolic.svg     |   1 -
 main/data/icons/dino-phone-in-talk-symbolic.svg    |   1 -
 main/data/icons/dino-phone-missed-symbolic.svg     |   1 -
 main/data/icons/dino-phone-ring-symbolic.svg       |   1 -
 main/data/icons/dino-phone-symbolic.svg            |   1 -
 main/data/icons/dino-security-high-symbolic.svg    |   5 -
 main/data/icons/dino-tick-symbolic.svg             |   6 -
 main/data/icons/dino-video-off-symbolic.svg        |   1 -
 main/data/icons/dino-video-symbolic.svg            |   1 -
 main/data/icons/im.dino.Dino-symbolic.svg          |   6 -
 .../icons/scalable/apps/im.dino.Dino-symbolic.svg  |   6 +
 .../devices/dino-device-desktop-symbolic.svg       |   5 +
 .../devices/dino-device-phone-symbolic.svg         |   6 +
 .../devices/dino-phone-hangup-symbolic.svg         |   1 +
 .../devices/dino-phone-in-talk-symbolic.svg        |   1 +
 .../devices/dino-phone-missed-symbolic.svg         |   1 +
 .../scalable/devices/dino-phone-ring-symbolic.svg  |   1 +
 .../icons/scalable/devices/dino-phone-symbolic.svg |   1 +
 .../scalable/emotes/dino-emoticon-symbolic.svg     |   4 +
 .../mimetypes/dino-file-document-symbolic.svg      |   6 +
 .../mimetypes/dino-file-download-symbolic.svg      |   5 +
 .../mimetypes/dino-file-image-symbolic.svg         |   6 +
 .../mimetypes/dino-file-music-symbolic.svg         |   7 +
 .../scalable/mimetypes/dino-file-symbolic.svg      |   4 +
 .../mimetypes/dino-file-table-symbolic.svg         |  10 +
 .../mimetypes/dino-file-video-symbolic.svg         |   5 +
 .../status/dino-changes-allowed-symbolic.svg       |  10 +
 .../status/dino-changes-prevent-symbolic.svg       |  67 ++
 .../scalable/status/dino-double-tick-symbolic.svg  |   7 +
 .../status/dino-microphone-off-symbolic.svg        |   1 +
 .../scalable/status/dino-microphone-symbolic.svg   |   1 +
 .../status/dino-security-high-symbolic.svg         |   5 +
 .../icons/scalable/status/dino-tick-symbolic.svg   |   6 +
 .../scalable/status/dino-video-off-symbolic.svg    |   1 +
 .../icons/scalable/status/dino-video-symbolic.svg  |   1 +
 main/data/manage_accounts/account_row.ui           |  14 +-
 main/data/manage_accounts/add_account_dialog.ui    | 906 +++++++++------------
 main/data/manage_accounts/dialog.ui                | 212 ++---
 main/data/menu_encryption.ui                       |  33 +-
 main/data/message_item_widget_edit_mode.ui         |  14 +-
 main/data/occupant_list.ui                         |  17 +-
 main/data/occupant_list_item.ui                    |  64 +-
 main/data/search_autocomplete.ui                   |   5 +-
 main/data/settings_dialog.ui                       |  70 +-
 main/data/theme.css                                |  47 +-
 main/data/unified_main_content.ui                  | 189 ++---
 main/data/unified_window_placeholder.ui            |  22 +-
 79 files changed, 1726 insertions(+), 2449 deletions(-)
 create mode 100644 main/data/conversation_item_widget.ui
 delete mode 100644 main/data/emojichooser.ui
 delete mode 100644 main/data/icons/dino-changes-allowed-symbolic.svg
 delete mode 100644 main/data/icons/dino-changes-prevent-symbolic.svg
 delete mode 100644 main/data/icons/dino-device-desktop-symbolic.svg
 delete mode 100644 main/data/icons/dino-device-phone-symbolic.svg
 delete mode 100644 main/data/icons/dino-double-tick-symbolic.svg
 delete mode 100644 main/data/icons/dino-emoticon-symbolic.svg
 delete mode 100644 main/data/icons/dino-file-document-symbolic.svg
 delete mode 100644 main/data/icons/dino-file-download-symbolic.svg
 delete mode 100644 main/data/icons/dino-file-image-symbolic.svg
 delete mode 100644 main/data/icons/dino-file-music-symbolic.svg
 delete mode 100644 main/data/icons/dino-file-symbolic.svg
 delete mode 100644 main/data/icons/dino-file-table-symbolic.svg
 delete mode 100644 main/data/icons/dino-file-video-symbolic.svg
 delete mode 100644 main/data/icons/dino-microphone-off-symbolic.svg
 delete mode 100644 main/data/icons/dino-microphone-symbolic.svg
 delete mode 100644 main/data/icons/dino-phone-hangup-symbolic.svg
 delete mode 100644 main/data/icons/dino-phone-in-talk-symbolic.svg
 delete mode 100644 main/data/icons/dino-phone-missed-symbolic.svg
 delete mode 100644 main/data/icons/dino-phone-ring-symbolic.svg
 delete mode 100644 main/data/icons/dino-phone-symbolic.svg
 delete mode 100644 main/data/icons/dino-security-high-symbolic.svg
 delete mode 100644 main/data/icons/dino-tick-symbolic.svg
 delete mode 100644 main/data/icons/dino-video-off-symbolic.svg
 delete mode 100644 main/data/icons/dino-video-symbolic.svg
 delete mode 100644 main/data/icons/im.dino.Dino-symbolic.svg
 create mode 100644 main/data/icons/scalable/apps/im.dino.Dino-symbolic.svg
 create mode 100644 main/data/icons/scalable/devices/dino-device-desktop-symbolic.svg
 create mode 100644 main/data/icons/scalable/devices/dino-device-phone-symbolic.svg
 create mode 100644 main/data/icons/scalable/devices/dino-phone-hangup-symbolic.svg
 create mode 100644 main/data/icons/scalable/devices/dino-phone-in-talk-symbolic.svg
 create mode 100644 main/data/icons/scalable/devices/dino-phone-missed-symbolic.svg
 create mode 100644 main/data/icons/scalable/devices/dino-phone-ring-symbolic.svg
 create mode 100644 main/data/icons/scalable/devices/dino-phone-symbolic.svg
 create mode 100644 main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg
 create mode 100644 main/data/icons/scalable/mimetypes/dino-file-document-symbolic.svg
 create mode 100644 main/data/icons/scalable/mimetypes/dino-file-download-symbolic.svg
 create mode 100644 main/data/icons/scalable/mimetypes/dino-file-image-symbolic.svg
 create mode 100644 main/data/icons/scalable/mimetypes/dino-file-music-symbolic.svg
 create mode 100644 main/data/icons/scalable/mimetypes/dino-file-symbolic.svg
 create mode 100644 main/data/icons/scalable/mimetypes/dino-file-table-symbolic.svg
 create mode 100644 main/data/icons/scalable/mimetypes/dino-file-video-symbolic.svg
 create mode 100644 main/data/icons/scalable/status/dino-changes-allowed-symbolic.svg
 create mode 100644 main/data/icons/scalable/status/dino-changes-prevent-symbolic.svg
 create mode 100644 main/data/icons/scalable/status/dino-double-tick-symbolic.svg
 create mode 100644 main/data/icons/scalable/status/dino-microphone-off-symbolic.svg
 create mode 100644 main/data/icons/scalable/status/dino-microphone-symbolic.svg
 create mode 100644 main/data/icons/scalable/status/dino-security-high-symbolic.svg
 create mode 100644 main/data/icons/scalable/status/dino-tick-symbolic.svg
 create mode 100644 main/data/icons/scalable/status/dino-video-off-symbolic.svg
 create mode 100644 main/data/icons/scalable/status/dino-video-symbolic.svg

(limited to 'main/data')

diff --git a/main/data/add_conversation/add_contact_dialog.ui b/main/data/add_conversation/add_contact_dialog.ui
index 6185c5ba..1abc9a7a 100644
--- a/main/data/add_conversation/add_contact_dialog.ui
+++ b/main/data/add_conversation/add_contact_dialog.ui
@@ -1,128 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiAddContactDialog">
+        <property name="title" translatable="1">Add Contact</property>
         <property name="valign">center</property>
         <property name="modal">True</property>
         <child type="titlebar">
             <object class="GtkHeaderBar">
-                <property name="title" translatable="yes">Add Contact</property>
-                <property name="visible">True</property>
+                <property name="show-title-buttons">False</property>
                 <child>
                     <object class="GtkButton" id="cancel_button">
-                        <property name="label" translatable="yes">Cancel</property>
-                        <property name="sensitive">True</property>
-                        <property name="visible">True</property>
+                        <property name="label" translatable="1">Cancel</property>
                     </object>
-                    <packing>
-                        <property name="pack_type">start</property>
-                    </packing>
                 </child>
-                <child>
+                <child type="end">
                     <object class="GtkButton" id="ok_button">
-                        <property name="has_default">True</property>
-                        <property name="can_default">True</property>
-                        <property name="label" translatable="yes">Add</property>
-                        <property name="sensitive">False</property>
-                        <property name="visible">True</property>
+                        <property name="label" translatable="1">Add</property>
+                        <property name="sensitive">0</property>
                         <style>
                             <class name="suggested-action"/>
                         </style>
                     </object>
-                    <packing>
-                        <property name="pack_type">end</property>
-                    </packing>
                 </child>
             </object>
         </child>
-        <child internal-child="vbox">
+        <child internal-child="content_area">
             <object class="GtkBox">
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkGrid" id="info_grid">
                         <property name="orientation">vertical</property>
-                        <property name="margin">20</property>
+                        <property name="margin-start">20</property>
+                        <property name="margin-end">20</property>
+                        <property name="margin-top">20</property>
+                        <property name="margin-bottom">20</property>
                         <property name="row-spacing">7</property>
                         <property name="column-spacing">10</property>
-                        <property name="visible">True</property>
                         <child>
                             <object class="GtkLabel">
-                                <property name="label" translatable="yes">Account</property>
+                                <property name="label" translatable="1">Account</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">0</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="DinoUiAccountComboBox" id="account_combobox">
                                 <property name="hexpand">True</property>
                                 <property name="width_request">200</property>
                                 <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">0</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel">
                                 <property name="label">JID</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">1</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkEntry" id="jid_entry">
-                                <property name="activates_default">True</property>
-                                <property name="hexpand">True</property>
+                                <property name="activates_default">1</property>
+                                <property name="hexpand">1</property>
                                 <property name="width_request">200</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">1</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel">
-                                <property name="label" translatable="yes">Alias</property>
+                                <property name="label" translatable="1">Alias</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">2</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkEntry" id="alias_entry">
-                                <property name="activates_default">True</property>
-                                <property name="hexpand">True</property>
+                                <property name="activates_default">1</property>
+                                <property name="hexpand">1</property>
                                 <property name="width_request">200</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">2</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                     </object>
                 </child>
@@ -133,4 +107,4 @@
             <action-widget response="ok" default="true">ok_button</action-widget>
         </action-widgets>
     </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/main/data/add_conversation/add_groupchat_dialog.ui b/main/data/add_conversation/add_groupchat_dialog.ui
index 29638f53..5acd6891 100644
--- a/main/data/add_conversation/add_groupchat_dialog.ui
+++ b/main/data/add_conversation/add_groupchat_dialog.ui
@@ -1,201 +1,165 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiAddGroupchatDialog">
         <property name="valign">center</property>
         <property name="modal">True</property>
         <child type="titlebar">
             <object class="GtkHeaderBar">
-                <property name="visible">True</property>
+                <property name="show-title-buttons">False</property>
                 <child>
                     <object class="GtkButton" id="cancel_button">
-                        <property name="label" translatable="yes">Cancel</property>
-                        <property name="sensitive">True</property>
-                        <property name="visible">True</property>
+                        <property name="label" translatable="1">Cancel</property>
                     </object>
-                    <packing>
-                        <property name="pack_type">start</property>
-                    </packing>
                 </child>
-                <child>
+                <child type="end">
                     <object class="GtkButton" id="ok_button">
-                        <property name="can_default">True</property>
-                        <property name="has_default">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="visible">True</property>
+                        <property name="sensitive">0</property>
                         <style>
                             <class name="suggested-action"/>
                         </style>
                     </object>
-                    <packing>
-                        <property name="pack_type">end</property>
-                    </packing>
                 </child>
             </object>
         </child>
-        <child internal-child="vbox">
+        <child internal-child="content_area">
             <object class="GtkBox" id="main">
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkGrid">
                         <property name="orientation">vertical</property>
-                        <property name="margin">20</property>
+                        <property name="margin-start">20</property>
+                        <property name="margin-end">20</property>
+                        <property name="margin-top">20</property>
+                        <property name="margin-bottom">20</property>
                         <property name="margin-start">40</property>
                         <property name="margin-end">40</property>
                         <property name="row-spacing">7</property>
                         <property name="column-spacing">10</property>
-                        <property name="visible">True</property>
                         <child>
                             <object class="GtkLabel">
-                                <property name="label" translatable="yes">Account</property>
+                                <property name="label" translatable="1">Account</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">0</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkStack" id="accounts_stack">
-                                <property name="visible">True</property>
                                 <child>
-                                    <object class="DinoUiAccountComboBox" id="account_combobox">
-                                        <property name="hexpand">True</property>
-                                        <property name="width_request">200</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">combobox</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="DinoUiAccountComboBox" id="account_combobox">
+                                                <property name="hexpand">True</property>
+                                                <property name="width_request">200</property>
+                                                <property name="visible">True</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
                                 <child>
-                                    <object class="GtkLabel" id="account_label">
-                                        <property name="xalign">0</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">label</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="GtkLabel" id="account_label">
+                                                <property name="xalign">0</property>
+                                                <property name="focusable">1</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">0</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel">
                                 <property name="label">JID</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">1</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkEntry" id="jid_entry">
-                                <property name="activates_default">True</property>
-                                <property name="hexpand">True</property>
+                                <property name="activates_default">1</property>
+                                <property name="hexpand">1</property>
                                 <property name="width_request">200</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">1</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel">
-                                <property name="label" translatable="yes">Nick</property>
+                                <property name="label" translatable="1">Nick</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">2</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkEntry" id="nick_entry">
-                                <property name="activates_default">True</property>
-                                <property name="hexpand">True</property>
+                                <property name="activates_default">1</property>
+                                <property name="hexpand">1</property>
                                 <property name="width_request">200</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">2</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel">
-                                <property name="label" translatable="yes">Password</property>
+                                <property name="label" translatable="1">Password</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">3</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkEntry" id="password_entry">
-                                <property name="activates_default">True</property>
-                                <property name="visibility">False</property>
-                                <property name="hexpand">True</property>
+                                <property name="activates_default">1</property>
+                                <property name="visibility">0</property>
+                                <property name="hexpand">1</property>
                                 <property name="width_request">200</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">3</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel" id="alias_label">
-                                <property name="label" translatable="yes">Alias</property>
+                                <property name="label" translatable="1">Alias</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">5</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">5</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkEntry" id="alias_entry">
-                                <property name="activates_default">True</property>
-                                <property name="hexpand">True</property>
+                                <property name="activates_default">1</property>
+                                <property name="hexpand">1</property>
                                 <property name="width_request">200</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">5</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">5</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                     </object>
                 </child>
@@ -206,4 +170,4 @@
             <action-widget response="ok" default="true">ok_button</action-widget>
         </action-widgets>
     </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/main/data/add_conversation/conference_details_fragment.ui b/main/data/add_conversation/conference_details_fragment.ui
index a4f6f5d3..0fdf2b8e 100644
--- a/main/data/add_conversation/conference_details_fragment.ui
+++ b/main/data/add_conversation/conference_details_fragment.ui
@@ -1,272 +1,238 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiConferenceDetailsFragment">
         <property name="visible">True</property>
         <child>
             <object class="GtkOverlay">
-                <property name="visible">True</property>
-                <child>
+                <property name="child">
                     <object class="GtkGrid">
                         <property name="orientation">vertical</property>
-                        <property name="margin">20</property>
+                        <property name="margin-start">20</property>
+                        <property name="margin-end">20</property>
+                        <property name="margin-top">20</property>
+                        <property name="margin-bottom">20</property>
                         <property name="margin_end">40</property>
                         <property name="margin_start">40</property>
                         <property name="row-spacing">7</property>
                         <property name="column-spacing">10</property>
-                        <property name="visible">True</property>
                         <child>
                             <object class="GtkLabel">
-                                <property name="label" translatable="yes">Account</property>
+                                <property name="label" translatable="1">Account</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
                                 <style>
                                     <class name="dim-label"/>
                                 </style>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">0</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkStack" id="accounts_stack">
-                                <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkButton" id="accounts_button">
-                                        <property name="relief">none</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkLabel" id="accounts_label">
-                                                <property name="xalign">0</property>
-                                                <property name="visible">True</property>
+                                    <object class="GtkStackPage">
+                                        <property name="name">label</property>
+                                        <property name="child">
+                                            <object class="GtkButton" id="accounts_button">
+                                                <property name="has-frame">False</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="accounts_label">
+                                                        <property name="xalign">0</property>
+                                                    </object>
+                                                </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                    <packing>
-                                        <property name="name">label</property>
-                                    </packing>
                                 </child>
                                 <child>
-                                    <object class="DinoUiAccountComboBox" id="account_combobox">
-                                        <property name="hexpand">True</property>
-                                        <property name="width_request">200</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">entry</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="DinoUiAccountComboBox" id="account_combobox">
+                                                <property name="hexpand">True</property>
+                                                <property name="width_request">200</property>
+                                                <property name="visible">True</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">0</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel">
                                 <property name="label">JID</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
                                 <style>
                                     <class name="dim-label"/>
                                 </style>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">1</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkStack" id="jid_stack">
-                                <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkButton" id="jid_button">
-                                        <property name="relief">none</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkLabel" id="jid_label">
-                                                <property name="xalign">0</property>
-                                                <property name="visible">True</property>
+                                    <object class="GtkStackPage">
+                                        <property name="name">label</property>
+                                        <property name="child">
+                                            <object class="GtkButton" id="jid_button">
+                                                <property name="has-frame">False</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="jid_label">
+                                                        <property name="xalign">0</property>
+                                                    </object>
+                                                </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                    <packing>
-                                        <property name="name">label</property>
-                                    </packing>
                                 </child>
                                 <child>
-                                    <object class="GtkEntry" id="jid_entry">
-                                        <property name="hexpand">True</property>
-                                        <property name="width_request">200</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">entry</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="GtkEntry" id="jid_entry">
+                                                <property name="hexpand">1</property>
+                                                <property name="width_request">200</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">1</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel">
-                                <property name="label" translatable="yes">Nick</property>
+                                <property name="label" translatable="1">Nick</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
                                 <style>
                                     <class name="dim-label"/>
                                 </style>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">2</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkStack" id="nick_stack">
-                                <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkButton" id="nick_button">
-                                        <property name="relief">none</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkLabel" id="nick_label">
-                                                <property name="xalign">0</property>
-                                                <property name="visible">True</property>
+                                    <object class="GtkStackPage">
+                                        <property name="name">label</property>
+                                        <property name="child">
+                                            <object class="GtkButton" id="nick_button">
+                                                <property name="has-frame">False</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="nick_label">
+                                                        <property name="xalign">0</property>
+                                                    </object>
+                                                </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                    <packing>
-                                        <property name="name">label</property>
-                                    </packing>
                                 </child>
                                 <child>
-                                    <object class="GtkEntry" id="nick_entry">
-                                        <property name="hexpand">True</property>
-                                        <property name="width_request">200</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">entry</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="GtkEntry" id="nick_entry">
+                                                <property name="hexpand">1</property>
+                                                <property name="width_request">200</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">2</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel" id="password_text_label">
-                                <property name="label" translatable="yes">Password</property>
+                                <property name="visible">0</property>
+                                <property name="label" translatable="1">Password</property>
                                 <property name="xalign">1</property>
                                 <style>
                                     <class name="dim-label"/>
                                 </style>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">3</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkStack" id="password_stack">
+                                <property name="visible">0</property>
                                 <child>
-                                    <object class="GtkButton" id="password_button">
-                                        <property name="relief">none</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkLabel" id="password_label">
-                                                <property name="xalign">0</property>
-                                                <property name="visible">True</property>
+                                    <object class="GtkStackPage">
+                                        <property name="name">label</property>
+                                        <property name="child">
+                                            <object class="GtkButton" id="password_button">
+                                                <property name="has-frame">False</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="password_label">
+                                                        <property name="xalign">0</property>
+                                                    </object>
+                                                </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                    <packing>
-                                        <property name="name">label</property>
-                                    </packing>
                                 </child>
                                 <child>
-                                    <object class="GtkEntry" id="password_entry">
-                                        <property name="hexpand">True</property>
-                                        <property name="width_request">200</property>
-                                        <property name="visibility">False</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">entry</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="GtkEntry" id="password_entry">
+                                                <property name="hexpand">1</property>
+                                                <property name="width_request">200</property>
+                                                <property name="visibility">0</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">3</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                     </object>
-                    <packing>
-                        <property name="index">-1</property>
-                    </packing>
-                </child>
+                </property>
                 <child type="overlay">
                     <object class="GtkRevealer" id="notification_revealer">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="halign">center</property>
                         <property name="valign">start</property>
-                        <child>
+                        <property name="child">
                             <object class="GtkFrame" id="frame2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+<!--                                <property name="shadow_type">none</property>-->
                                 <style>
                                     <class name="app-notification"/>
                                 </style>
-                                <child>
+                                <property name="child">
                                     <object class="GtkBox" id="box2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="spacing">20</property>
                                         <child>
-                                            <object class="GtkLabel" id="notification_label">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                            </object>
-                                            <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                            </packing>
+                                            <object class="GtkLabel" id="notification_label"/>
                                         </child>
                                         <child>
                                             <object class="GtkButton" id="notification_button">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="relief">none</property>
+                                                <property name="focusable">1</property>
+                                                <property name="receives_default">1</property>
+                                                <property name="has-frame">False</property>
                                                 <child>
                                                     <object class="GtkImage" id="image2">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="icon_name">window-close-symbolic</property>
                                                     </object>
                                                 </child>
@@ -274,19 +240,14 @@
                                                     <class name="image-button"/>
                                                 </style>
                                             </object>
-                                            <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                            </packing>
                                         </child>
                                     </object>
-                                </child>
+                                </property>
                                 <child type="label_item">
                                     <placeholder/>
                                 </child>
                             </object>
-                        </child>
+                        </property>
                     </object>
                 </child>
             </object>
diff --git a/main/data/add_conversation/list_row.ui b/main/data/add_conversation/list_row.ui
index 2eabec11..06b6dc7f 100644
--- a/main/data/add_conversation/list_row.ui
+++ b/main/data/add_conversation/list_row.ui
@@ -1,62 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiListRow" parent="GtkListBoxRow">
-        <property name="visible">True</property>
+    <requires lib="gtk" version="4.0"/>
+    <object class="GtkGrid" id="outer_grid">
+        <property name="margin-start">3</property>
+        <property name="margin-end">3</property>
+        <property name="margin-top">3</property>
+        <property name="margin-bottom">3</property>
+        <property name="column-spacing">10</property>
         <child>
-            <object class="GtkGrid" id="outer_grid">
-                <property name="orientation">horizontal</property>
-                <property name="margin">3</property>
-                <property name="column-spacing">10</property>
-                <property name="visible">True</property>
+            <object class="DinoUiAvatarImage" id="image">
+                <property name="allow_gray">False</property>
+                <property name="height">30</property>
+                <property name="width">30</property>
+                <property name="valign">center</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkGrid">
+                <property name="orientation">vertical</property>
                 <child>
-                    <object class="DinoUiAvatarImage" id="image">
-                        <property name="allow_gray">False</property>
-                        <property name="height">30</property>
-                        <property name="width">30</property>
-                        <property name="valign">center</property>
-                        <property name="visible">True</property>
+                    <object class="GtkLabel" id="name_label">
+                        <property name="max_width_chars">1</property>
+                        <property name="ellipsize">end</property>
+                        <property name="hexpand">1</property>
+                        <property name="xalign">0</property>
+                        <layout>
+                            <property name="column">0</property>
+                            <property name="row">0</property>
+                        </layout>
                     </object>
                 </child>
                 <child>
-                    <object class="GtkGrid">
-                        <property name="orientation">vertical</property>
-                        <property name="visible">True</property>
-                        <child>
-                            <object class="GtkLabel" id="name_label">
-                                <property name="max_width_chars">1</property>
-                                <property name="ellipsize">end</property>
-                                <property name="expand">True</property>
-                                <property name="xalign">0</property>
-                                <property name="visible">True</property>
-                            </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
-                        </child>
-                        <child>
-                            <object class="GtkLabel" id="via_label">
-                                <property name="max_width_chars">1</property>
-                                <property name="ellipsize">end</property>
-                                <property name="expand">True</property>
-                                <property name="xalign">0</property>
-                                <property name="visible">True</property>
-                                <attributes>
-                                    <attribute name="scale" value="0.8"/>
-                                </attributes>
-                            </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
-                        </child>
+                    <object class="GtkLabel" id="via_label">
+                        <property name="max_width_chars">1</property>
+                        <property name="ellipsize">end</property>
+                        <property name="hexpand">1</property>
+                        <property name="xalign">0</property>
+                        <attributes>
+                            <attribute name="scale" value="0.8"></attribute>
+                        </attributes>
+                        <layout>
+                            <property name="column">0</property>
+                            <property name="row">1</property>
+                        </layout>
                     </object>
                 </child>
             </object>
         </child>
-    </template>
+    </object>
 </interface>
diff --git a/main/data/add_conversation/select_jid_fragment.ui b/main/data/add_conversation/select_jid_fragment.ui
index 50bc0e36..8ead3207 100644
--- a/main/data/add_conversation/select_jid_fragment.ui
+++ b/main/data/add_conversation/select_jid_fragment.ui
@@ -1,86 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiSelectJidFragment">
         <property name="height_request">500</property>
         <property name="width_request">460</property>
         <property name="visible">True</property>
         <child>
             <object class="GtkGrid">
-                <property name="expand">True</property>
+                <property name="hexpand">1</property>
                 <property name="margin-top">20</property>
-                <property name="margin-right">80</property>
+                <property name="margin-end">80</property>
                 <property name="margin-bottom">20</property>
-                <property name="margin-left">80</property>
+                <property name="margin-start">80</property>
                 <property name="orientation">vertical</property>
                 <property name="row-spacing">10</property>
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkEntry" id="entry">
-                        <property name="activates_default">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="visible">True</property>
+                        <property name="activates_default">1</property>
+                        <property name="hexpand">1</property>
                     </object>
                 </child>
                 <child>
                     <object class="GtkBox">
-                        <property name="expand">True</property>
+                        <property name="hexpand">1</property>
+                        <property name="vexpand">1</property>
                         <property name="orientation">vertical</property>
-                        <property name="visible">True</property>
                         <child>
                             <object class="GtkFrame">
-                                <property name="visible">True</property>
-                                <child>
+                                <property name="child">
                                     <object class="GtkScrolledWindow" id="scrolled_window">
                                         <property name="hscrollbar_policy">never</property>
-                                        <property name="expand">True</property>
-                                        <property name="visible">True</property>
-                                        <child>
+                                        <property name="hexpand">1</property>
+                                        <property name="vexpand">1</property>
+                                        <property name="child">
                                             <object class="GtkBox" id="box">
                                                 <property name="orientation">vertical</property>
-                                                <property name="visible">True</property>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                </child>
+                                </property>
                             </object>
                         </child>
                         <child>
-                            <object class="GtkToolbar">
-                                <property name="visible">True</property>
+                            <object class="GtkBox">
+                                <property name="css-classes">toolbar</property>
                                 <style>
+                                    <class name="toolbar"/>
                                     <class name="inline-toolbar"/>
                                 </style>
                                 <child>
-                                    <object class="GtkToolItem">
-                                        <property name="visible">True</property>
+                                    <object class="GtkButton" id="add_button">
+                                        <child>
+                                            <object class="GtkImage">
+                                                <property name="icon-name">list-add-symbolic</property>
+                                                <property name="icon-size">normal</property>
+                                            </object>
+                                        </child>
+                                    </object>
+                                </child>
+                                <child>
+                                    <object class="GtkButton" id="remove_button">
+                                        <property name="sensitive">0</property>
                                         <child>
-                                            <object class="GtkBox">
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkButton" id="add_button">
-                                                        <property name="visible">True</property>
-                                                        <child>
-                                                            <object class="GtkImage">
-                                                                <property name="icon-name">list-add-symbolic</property>
-                                                                <property name="icon-size">1</property>
-                                                                <property name="visible">True</property>
-                                                            </object>
-                                                        </child>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkButton" id="remove_button">
-                                                        <property name="sensitive">False</property>
-                                                        <property name="visible">True</property>
-                                                        <child>
-                                                            <object class="GtkImage">
-                                                                <property name="icon-name">list-remove-symbolic</property>
-                                                                <property name="icon-size">1</property>
-                                                                <property name="visible">True</property>
-                                                            </object>
-                                                        </child>
-                                                    </object>
-                                                </child>
+                                            <object class="GtkImage">
+                                                <property name="icon-name">list-remove-symbolic</property>
+                                                <property name="icon-size">normal</property>
                                             </object>
                                         </child>
                                     </object>
diff --git a/main/data/call_widget.ui b/main/data/call_widget.ui
index 0c5d8bfa..41df8cfb 100644
--- a/main/data/call_widget.ui
+++ b/main/data/call_widget.ui
@@ -27,7 +27,6 @@
                                 </style>
                                 <child>
                                     <object class="GtkImage" id="image">
-                                        <property name="icon-size">5</property>
                                         <property name="opacity">0.7</property>
                                         <property name="visible">True</property>
                                     </object>
@@ -73,7 +72,10 @@
                                                 <property name="halign">end</property>
                                                 <property name="orientation">horizontal</property>
                                                 <property name="spacing">5</property>
-                                                <property name="margin">10</property>
+                                                <property name="margin_top">10</property>
+                                                <property name="margin_bottom">10</property>
+                                                <property name="margin_start">10</property>
+                                                <property name="margin_end">10</property>
                                                 <property name="hexpand">True</property>
                                                 <child>
                                                     <object class="GtkButton" id="reject_call_button">
@@ -97,7 +99,10 @@
                                         </child>
                                         <child>
                                             <object class="GtkBox" id="multiparty_peer_box">
-                                                <property name="margin">10</property>
+                                                <property name="margin_top">10</property>
+                                                <property name="margin_bottom">10</property>
+                                                <property name="margin_start">10</property>
+                                                <property name="margin_end">10</property>
                                                 <property name="spacing">7</property>
                                                 <property name="hexpand">True</property>
                                             </object>
diff --git a/main/data/chat_input.ui b/main/data/chat_input.ui
index 3ddb29b9..9abd7eeb 100644
--- a/main/data/chat_input.ui
+++ b/main/data/chat_input.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.22"/>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiChatInputView">
         <property name="hexpand">True</property>
         <property name="orientation">vertical</property>
@@ -12,46 +12,60 @@
             <object class="GtkFrame" id="frame">
                 <property name="margin_start">14</property>
                 <property name="margin_end">14</property>
-                <property name="visible">True</property>
-                <child>
+                <property name="child">
                     <object class="GtkBox" id="outer_box">
-                        <property name="orientation">horizontal</property>
-                        <property name="visible">True</property>
                         <child>
                             <object class="GtkButton" id="file_button">
-                                <property name="tooltip-text" translatable="yes">Send a file</property>
-                                <property name="can-focus">False</property>
-                                <property name="margin-top">3</property>
-                                <property name="relief">none</property>
+                                <property name="icon-name">mail-attachment-symbolic</property>
+                                <property name="tooltip-text" translatable="1">Send a file</property>
+                                <property name="margin-top">2</property>
                                 <property name="valign">start</property>
-                                <property name="visible">True</property>
                                 <style>
                                     <class name="flat"/>
                                     <class name="dino-chatinput-button"/>
+                                    <class name="dino-attach-button"/>
                                     <class name="image-button"/>
                                 </style>
-                                <child>
-                                    <object class="GtkImage">
-                                        <property name="icon-name">mail-attachment-symbolic</property>
-                                        <property name="icon-size">1</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                </child>
                             </object>
                         </child>
                         <child>
                             <object class="GtkSeparator" id="file_separator">
                                 <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
                             </object>
                         </child>
                         <child>
                             <object class="DinoUiChatTextView" id="chat_text_view">
-                                <property name="visible">True</property>
+                                <property name="margin_start">7</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkMenuButton" id="emoji_button">
+                                <property name="icon-name">dino-emoticon-symbolic</property>
+                                <property name="has-frame">False</property>
+                                <property name="margin-top">2</property>
+                                <property name="valign">start</property>
+                                <style>
+                                    <class name="flat"/>
+                                    <class name="dino-chatinput-button"/>
+                                    <class name="image-button"/>
+                                </style>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkMenuButton" id="encryption_button">
+                                <property name="icon-name">changes-allow-symbolic</property>
+                                <property name="has-frame">False</property>
+                                <property name="margin-top">2</property>
+                                <property name="valign">start</property>
+                                <style>
+                                    <class name="flat"/>
+                                    <class name="dino-chatinput-button"/>
+                                    <class name="image-button"/>
+                                </style>
                             </object>
                         </child>
                     </object>
-                </child>
+                </property>
             </object>
         </child>
         <child>
@@ -60,9 +74,8 @@
                 <property name="margin_bottom">3</property>
                 <property name="margin_start">14</property>
                 <property name="margin_end">14</property>
-                <property name="visible">True</property>
                 <attributes>
-                    <attribute name="scale" value="0.8"/>
+                    <attribute name="scale" value="0.8"></attribute>
                 </attributes>
                 <style>
                     <class name="chat-input-status"/>
diff --git a/main/data/contact_details_dialog.ui b/main/data/contact_details_dialog.ui
index 4058bc77..322cd2df 100644
--- a/main/data/contact_details_dialog.ui
+++ b/main/data/contact_details_dialog.ui
@@ -1,122 +1,109 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiContactDetailsDialog">
+        <property name="title">Conversation Details</property>
         <property name="modal">True</property>
         <child type="titlebar">
             <object class="GtkHeaderBar">
-                <property name="title">Conversation Details</property>
-                <property name="show_close_button">True</property>
-                <property name="visible">True</property>
             </object>
         </child>
-        <child internal-child="vbox">
+        <child internal-child="content_area">
             <object class="GtkBox">
-                <property name="expand">True</property>
-                <property name="visible">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <child>
                     <object class="GtkScrolledWindow">
-                        <property name="propagate_natural_height">True</property>
+                        <property name="propagate_natural_height">1</property>
                         <property name="max_content_height">500</property>
                         <property name="hscrollbar_policy">never</property>
-                        <property name="expand">True</property>
-                        <property name="visible">True</property>
-                        <child>
+                        <property name="hexpand">1</property>
+                        <property name="vexpand">1</property>
+                        <property name="child">
                             <object class="GtkBox">
                                 <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
                                 <child>
                                     <object class="GtkGrid">
                                         <property name="margin-top">20</property>
                                         <property name="margin-bottom">12</property>
-                                        <property name="margin-right">100</property>
-                                        <property name="margin-left">100</property>
+                                        <property name="margin-end">100</property>
+                                        <property name="margin-start">100</property>
                                         <property name="column-spacing">10</property>
-                                        <property name="visible">True</property>
                                         <child>
                                             <object class="DinoUiAvatarImage" id="avatar">
                                                 <property name="height">50</property>
                                                 <property name="width">50</property>
                                                 <property name="visible">True</property>
                                                 <property name="allow_gray">False</property>
+                                                <layout>
+                                                    <property name="column">0</property>
+                                                    <property name="row">0</property>
+                                                    <property name="row-span">2</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">0</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="width">1</property>
-                                                <property name="height">2</property>
-                                            </packing>
                                         </child>
                                         <child>
                                             <object class="DinoUiUtilEntryLabelHybrid" id="name_hybrid">
                                                 <property name="xalign">0</property>
-                                                <property name="expand">True</property>
+                                                <property name="hexpand">True</property>
                                                 <property name="visible">True</property>
+                                                <layout>
+                                                    <property name="column">1</property>
+                                                    <property name="row">0</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                            </packing>
                                         </child>
                                         <child>
                                             <object class="GtkLabel" id="name_label">
                                                 <property name="xalign">0</property>
-                                                <property name="expand">True</property>
-                                                <property name="visible">True</property>
+                                                <property name="hexpand">1</property>
                                                 <attributes>
-                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                                 </attributes>
+                                                <layout>
+                                                    <property name="column">1</property>
+                                                    <property name="row">0</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                            </packing>
                                         </child>
                                         <child>
                                             <object class="GtkLabel" id="jid_label">
                                                 <property name="xalign">0</property>
                                                 <property name="yalign">0</property>
-                                                <property name="selectable">True</property>
-                                                <property name="expand">True</property>
-                                                <property name="visible">True</property>
+                                                <property name="selectable">1</property>
+                                                <property name="hexpand">1</property>
+                                                <layout>
+                                                    <property name="column">1</property>
+                                                    <property name="row">1</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                            </packing>
                                         </child>
                                         <child>
                                             <object class="GtkLabel" id="account_label">
                                                 <property name="xalign">1</property>
                                                 <property name="yalign">1</property>
-                                                <property name="margin">5</property>
-                                                <property name="expand">True</property>
-                                                <property name="visible">True</property>
+                                                <property name="margin-start">5</property>
+                                                <property name="margin-end">5</property>
+                                                <property name="margin-top">5</property>
+                                                <property name="margin-bottom">5</property>
+                                                <property name="hexpand">1</property>
+                                                <layout>
+                                                    <property name="column">2</property>
+                                                    <property name="row">1</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                            </packing>
                                         </child>
                                     </object>
                                 </child>
                                 <child>
                                     <object class="GtkBox" id="main_box">
                                         <property name="orientation">vertical</property>
-                                        <property name="margin-right">100</property>
-                                        <property name="margin-left">100</property>
-                                        <property name="visible">True</property>
+                                        <property name="margin-end">100</property>
+                                        <property name="margin-start">100</property>
                                     </object>
                                 </child>
                             </object>
-                        </child>
+                        </property>
                     </object>
                 </child>
             </object>
diff --git a/main/data/conversation_content_view/view.ui b/main/data/conversation_content_view/view.ui
index 17f753f5..638129ec 100644
--- a/main/data/conversation_content_view/view.ui
+++ b/main/data/conversation_content_view/view.ui
@@ -1,117 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiConversationSummaryConversationView">
-        <property name="expand">True</property>
-        <property name="homogeneous">False</property>
-        <property name="spacing">0</property>
-        <property name="visible">True</property>
         <child>
             <object class="GtkStack" id="stack">
                 <property name="transition_type">crossfade</property>
-                <property name="visible">True</property>
                 <child>
-                    <object class="GtkOverlay">
-                        <property name="visible">True</property>
-                        <child>
-                            <object class="GtkScrolledWindow" id="scrolled">
-                                <property name="hscrollbar_policy">never</property>
-                                <property name="expand">True</property>
-                                <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkEventBox" id="main_wrap_event_box">
-                                        <property name="valign">end</property>
-                                        <property name="visible">True</property>
-                                            <child>
-                                                <object class="GtkOverlay">
-                                                    <property name="visible">True</property>
-                                                    <child>
-                                                        <object class="GtkEventBox" id="main_event_box">
-                                                            <property name="visible">True</property>
-                                                            <child>
-                                                                <object class="DinoUiSizeRequestBox" id="main">
-                                                                    <property name="margin-bottom">15</property>
-                                                                    <property name="expand">False</property>
-                                                                    <property name="orientation">vertical</property>
-                                                                    <property name="visible">True</property>
-                                                                    <property name="size-request-mode">height-for-width</property>
-                                                                </object>
-                                                            </child>
-                                                        </object>
-                                                    </child>
-                                                    <child type="overlay">
-                                                        <object class="GtkBox" id="message_menu_box">
-                                                            <property name="margin-right">10</property>
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="halign">end</property>
-                                                            <property name="valign">start</property>
-                                                            <child>
-                                                                <object class="GtkButton" id="button1">
-                                                                    <property name="vexpand">False</property>
-                                                                    <property name="halign">end</property>
-                                                                    <property name="valign">end</property>
-                                                                    <child>
-                                                                        <object class="GtkImage" id="button1_icon">
-                                                                            <property name="icon-size">1</property>
-                                                                            <property name="visible">True</property>
-                                                                        </object>
-                                                                    </child>
-                                                                </object>
-                                                            </child>
-                                                        </object>
-                                                    </child>
+                    <object class="GtkStackPage">
+                        <property name="name">main</property>
+                        <property name="child">
+                            <object class="GtkOverlay">
+                                <property name="child">
+                                    <object class="GtkScrolledWindow" id="scrolled">
+                                        <property name="hscrollbar_policy">never</property>
+                                        <property name="hexpand">1</property>
+                                        <property name="vexpand">1</property>
+                                        <property name="child">
+                                            <object class="GtkBox" id="main_wrap_box">
+                                                <property name="valign">end</property>
+                                                <child>
+                                                    <object class="GtkOverlay">
+                                                        <child>
+                                                            <object class="GtkBox" id="main_event_box">
+                                                                <property name="visible">True</property>
+                                                                <child>
+                                                                    <object class="DinoUiSizeRequestBox" id="main">
+                                                                        <property name="margin-bottom">15</property>
+                                                                        <property name="orientation">vertical</property>
+                                                                        <property name="visible">True</property>
+                                                                        <property name="size-request-mode">height-for-width</property>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
+                                                        <child type="overlay">
+                                                            <object class="GtkBox" id="message_menu_box">
+                                                                <property name="margin-end">10</property>
+                                                                <property name="halign">end</property>
+                                                                <property name="valign">start</property>
+                                                                <child>
+                                                                    <object class="GtkButton" id="button1">
+                                                                        <property name="visible">0</property>
+                                                                        <property name="vexpand">0</property>
+                                                                        <property name="halign">end</property>
+                                                                        <property name="valign">end</property>
+                                                                        <child>
+                                                                            <object class="GtkImage" id="button1_icon">
+                                                                                <property name="icon-size">normal</property>
+                                                                            </object>
+                                                                        </child>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
+                                                    </object>
+                                                </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                </child>
-                            </object>
-                            <packing>
-                                <property name="index">-1</property>
-                            </packing>
-                        </child>
-                        <child type="overlay">
-                            <object class="GtkRevealer" id="notification_revealer">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">center</property>
-                                <property name="valign">start</property>
-                                <child>
-                                    <object class="GtkFrame" id="frame2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
-                                        <style>
-                                            <class name="app-notification"/>
-                                        </style>
-                                        <child>
-                                            <object class="GtkBox" id="notifications">
-                                                <property name="expand">False</property>
-                                                <property name="orientation">vertical</property>
-                                                <property name="visible">True</property>
+                                </property>
+                                <child type="overlay">
+                                    <object class="GtkRevealer" id="notification_revealer">
+                                        <property name="halign">center</property>
+                                        <property name="valign">start</property>
+                                        <property name="child">
+                                            <object class="GtkFrame" id="frame2">
+                                                <style>
+                                                    <class name="app-notification"/>
+                                                </style>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="notifications">
+                                                        <property name="hexpand">0</property>
+                                                        <property name="vexpand">0</property>
+                                                        <property name="orientation">vertical</property>
+                                                    </object>
+                                                </property>
+                                                <child type="label_item">
+                                                    <placeholder/>
+                                                </child>
                                             </object>
-                                        </child>
-                                        <child type="label_item">
-                                            <placeholder/>
-                                        </child>
+                                        </property>
                                     </object>
                                 </child>
                             </object>
-                        </child>
+                        </property>
                     </object>
-                    <packing>
-                        <property name="name">main</property>
-                    </packing>
                 </child>
                 <child>
-                    <object class="GtkBox">
-                        <property name="visible">True</property>
-                    </object>
-                    <packing>
+                    <object class="GtkStackPage">
                         <property name="name">void</property>
-                    </packing>
+                        <property name="child">
+                            <object class="GtkBox"/>
+                        </property>
+                    </object>
                 </child>
             </object>
         </child>
     </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/main/data/conversation_item_widget.ui b/main/data/conversation_item_widget.ui
new file mode 100644
index 00000000..e796006e
--- /dev/null
+++ b/main/data/conversation_item_widget.ui
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkGrid" id="main_grid">
+    <property name="column-spacing">7</property>
+    <property name="row-spacing">2</property>
+    <child>
+      <object class="DinoUiAvatarImage" id="avatar_image">
+        <property name="height">35</property>
+        <property name="width">35</property>
+        <property name="valign">start</property>
+        <property name="margin-top">2</property>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">0</property>
+          <property name="row-span">2</property>
+        </layout>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id="name_label">
+        <property name="ellipsize">end</property>
+        <property name="xalign">0</property>
+        <property name="valign">baseline</property>
+        <attributes>
+          <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+        </attributes>
+        <layout>
+          <property name="column">1</property>
+          <property name="row">0</property>
+        </layout>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id="time_label">
+        <property name="xalign">0</property>
+        <property name="valign">baseline</property>
+        <attributes>
+          <attribute name="scale" value="0.8"/>
+        </attributes>
+        <style>
+          <class name="dim-label"/>
+        </style>
+        <layout>
+          <property name="column">2</property>
+          <property name="row">0</property>
+        </layout>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImage" id="encrypted_image">
+        <property name="opacity">0.4</property>
+        <property name="pixel-size">14</property>
+        <layout>
+          <property name="column">3</property>
+          <property name="row">0</property>
+        </layout>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImage" id="marked_image">
+        <property name="opacity">0.4</property>
+        <property name="pixel-size">14</property>
+        <property name="halign">start</property>
+        <property name="hexpand">True</property>
+        <layout>
+          <property name="column">4</property>
+          <property name="row">0</property>
+        </layout>
+      </object>
+    </child>
+  </object>
+</interface>
\ No newline at end of file
diff --git a/main/data/conversation_list_titlebar_csd.ui b/main/data/conversation_list_titlebar_csd.ui
index 073f0a05..c99c302a 100644
--- a/main/data/conversation_list_titlebar_csd.ui
+++ b/main/data/conversation_list_titlebar_csd.ui
@@ -1,42 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiConversationListTitlebarCsd" parent="GtkHeaderBar">
+    <requires lib="gtk" version="4.0"/>
+    <object class="GtkHeaderBar" id="header_bar">
         <property name="hexpand">False</property>
-        <property name="show_close_button">True</property>
-        <property name="visible">True</property>
         <style>
             <class name="dino-left"/>
         </style>
         <child>
             <object class="GtkMenuButton" id="add_button">
-                <property name="tooltip_text" translatable="yes">Start Conversation</property>
-                <property name="visible">True</property>
+                <property name="tooltip_text" translatable="True">Start Conversation</property>
                 <child>
                     <object class="GtkImage">
-                        <property name="visible">True</property>
                         <property name="icon-name">list-add-symbolic</property>
-                        <property name="icon-size">1</property>
+                        <property name="icon-size">normal</property>
                     </object>
                 </child>
             </object>
-            <packing>
-                <property name="pack_type">start</property>
-            </packing>
         </child>
-        <child>
+        <child type="end">
             <object class="GtkMenuButton" id="menu_button">
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkImage">
-                        <property name="visible">True</property>
                         <property name="icon-name">open-menu-symbolic</property>
-                        <property name="icon-size">1</property>
+                        <property name="icon-size">normal</property>
                     </object>
                 </child>
             </object>
-            <packing>
-                <property name="pack_type">end</property>
-            </packing>
         </child>
-    </template>
+    </object>
 </interface>
diff --git a/main/data/conversation_row.ui b/main/data/conversation_row.ui
index ff08eac2..c164a7b5 100644
--- a/main/data/conversation_row.ui
+++ b/main/data/conversation_row.ui
@@ -6,12 +6,13 @@
             <object class="GtkRevealer" id="main_revealer">
                 <property name="transition-type">slide-down</property>
                 <property name="transition-duration">200</property>
-                <property name="reveal-child">False</property>
+                <property name="reveal-child">True</property>
                 <property name="visible">True</property>
                 <child>
                     <object class="GtkBox">
                         <property name="orientation">horizontal</property>
-                        <property name="margin">10</property>
+                        <property name="margin-top">10</property>
+                        <property name="margin-bottom">10</property>
                         <property name="margin-start">7</property>
                         <property name="margin-end">14</property>
                         <property name="visible">True</property>
@@ -25,7 +26,7 @@
                         </child>
                         <child>
                             <object class="GtkBox">
-                                <property name="margin-left">10</property>
+                                <property name="margin-start">10</property>
                                 <property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <child>
@@ -37,8 +38,8 @@
                                             <object class="GtkLabel" id="name_label">
                                                 <property name="max_width_chars">1</property>
                                                 <property name="ellipsize">end</property>
-                                                <property name="expand">True</property>
-                                                <property name="margin-right">7</property>
+                                                <property name="hexpand">True</property>
+                                                <property name="margin-end">7</property>
                                                 <property name="xalign">0</property>
                                                 <property name="visible">True</property>
                                             </object>
@@ -86,7 +87,8 @@
                                             <object class="GtkLabel" id="message_label">
                                                 <property name="max_width_chars">1</property>
                                                 <property name="ellipsize">end</property>
-                                                <property name="expand">True</property>
+                                                <property name="hexpand">True</property>
+                                                <property name="vexpand">True</property>
                                                 <property name="valign">end</property>
                                                 <property name="xalign">0</property>
                                                 <attributes>
diff --git a/main/data/conversation_view.ui b/main/data/conversation_view.ui
index c968f992..9515a7bd 100644
--- a/main/data/conversation_view.ui
+++ b/main/data/conversation_view.ui
@@ -1,75 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiConversationView" parent="GtkOverlay">
+    <template class="DinoUiConversationView">
         <property name="visible">True</property>
         <child>
-            <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <property name="visible">True</property>
-                <style>
-                    <class name="dino-conversation"/>
-                </style>
+            <object class="GtkOverlay" id="overlay">
                 <child>
-                    <object class="GtkOverlay">
-                        <property name="visible">True</property>
+                    <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+                        <style>
+                            <class name="dino-conversation"/>
+                        </style>
                         <child>
-                            <object class="DinoUiConversationSummaryConversationView" id="conversation_frame">
-                                <property name="visible">True</property>
-                            </object>
-                        </child>
-                        <child type="overlay">
-                            <object class="GtkRevealer" id="goto_end_revealer">
-                                <property name="halign">end</property>
-                                <property name="valign">end</property>
-                                <property name="transition-type">crossfade</property>
-                                <property name="visible">True</property>
-                                <property name="margin-end">30</property>
-                                <property name="margin-bottom">30</property>
+                            <object class="GtkOverlay" id="conversation_overlay">
+                                <property name="vexpand">True</property>
                                 <child>
-                                    <object class="GtkButton" id="goto_end_button">
-                                        <property name="width-request">30</property>
-                                        <property name="height-request">30</property>
-                                        <property name="vexpand">False</property>
+                                    <object class="DinoUiConversationSummaryConversationView" id="conversation_frame">
+                                    </object>
+                                </child>
+                                <child type="overlay">
+                                    <object class="GtkRevealer" id="goto_end_revealer">
                                         <property name="halign">end</property>
                                         <property name="valign">end</property>
+                                        <property name="transition-type">crossfade</property>
                                         <property name="visible">True</property>
-                                        <style>
-                                            <class name="circular-button"/>
-                                        </style>
+                                        <property name="margin-end">30</property>
+                                        <property name="margin-bottom">30</property>
                                         <child>
-                                            <object class="GtkImage">
-                                                <property name="icon-name">go-down-symbolic</property>
-                                                <property name="icon-size">1</property>
+                                            <object class="GtkButton" id="goto_end_button">
+                                                <property name="width-request">30</property>
+                                                <property name="height-request">30</property>
+                                                <property name="vexpand">False</property>
+                                                <property name="halign">end</property>
+                                                <property name="valign">end</property>
                                                 <property name="visible">True</property>
+                                                <style>
+                                                    <class name="circular-button"/>
+                                                </style>
+                                                <child>
+                                                    <object class="GtkImage">
+                                                        <property name="icon-name">go-down-symbolic</property>
+                                                        <property name="icon-size">1</property>
+                                                        <property name="visible">True</property>
+                                                    </object>
+                                                </child>
                                             </object>
                                         </child>
                                     </object>
                                 </child>
                             </object>
-
+                        </child>
+                        <child>
+                            <object class="DinoUiChatInputView" id="chat_input">
+                                <property name="visible">True</property>
+                            </object>
                         </child>
                     </object>
                 </child>
-                <child>
-                    <object class="DinoUiChatInputView" id="chat_input">
-                        <property name="visible">True</property>
-                    </object>
-                </child>
-            </object>
-        </child>
-        <child type="overlay">
-            <object class="GtkRevealer" id="white_revealer">
-                <property name="transition-type">crossfade</property>
-                <property name="transition-duration">200</property>
-                <property name="reveal-child">False</property>
-                <property name="visible">False</property>
-                <child>
-                    <object class="GtkBox">
-                        <property name="opacity">0.7</property>
-                        <property name="visible">true</property>
-                        <style>
-                            <class name="dino-white-overlay"/>
-                        </style>
+                <child type="overlay">
+                    <object class="GtkRevealer" id="white_revealer">
+                        <property name="transition-type">crossfade</property>
+                        <property name="transition-duration">200</property>
+                        <property name="reveal-child">False</property>
+                        <property name="visible">False</property>
+                        <child>
+                            <object class="GtkBox">
+                                <property name="opacity">0.7</property>
+                                <property name="visible">true</property>
+                                <style>
+                                    <class name="dino-white-overlay"/>
+                                </style>
+                            </object>
+                        </child>
                     </object>
                 </child>
             </object>
diff --git a/main/data/emojichooser.ui b/main/data/emojichooser.ui
deleted file mode 100644
index d47a2c22..00000000
--- a/main/data/emojichooser.ui
+++ /dev/null
@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
-  <template class="DinoEmojiChooser" parent="GtkPopover">
-    <property name="modal">1</property>
-    <style>
-      <class name="emoji-picker"/>
-    </style>
-    <child>
-      <object class="GtkBox" id="box">
-        <property name="orientation">vertical</property>
-        <property name="visible">1</property>
-        <child>
-          <object class="GtkSearchEntry" id="search_entry">
-            <property name="visible">1</property>
-            <property name="input-hints">no-emoji</property>
-            <signal name="search-changed" handler="search_changed"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkStack" id="stack">
-            <property name="visible">1</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">1</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolled_window">
-                    <property name="visible">1</property>
-                    <property name="vexpand">1</property>
-                    <property name="hscrollbar-policy">never</property>
-                    <property name="min-content-height">250</property>
-                    <style>
-                      <class name="view"/>
-                    </style>
-                    <child>
-                      <object class="GtkBox" id="emoji_box">
-                        <property name="visible">1</property>
-                        <property name="orientation">vertical</property>
-                        <property name="margin">6</property>
-                        <property name="spacing">6</property>
-                        <!-- Remember to keep headings here in sync with button tooltips below -->
-                        <child>
-                          <object class="GtkFlowBox" id="recent.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="people.heading">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Smileys &amp; People</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="people.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="body.heading">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Body &amp; Clothing</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="body.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="nature.heading">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Animals &amp; Nature</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="nature.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="food.heading">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Food &amp; Drink</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="food.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="travel.heading">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Travel &amp; Places</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="travel.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="activities.heading">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Activities</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="activities.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="objects.heading">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes" context="emoji category">Objects</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="objects.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="symbols.heading">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Symbols</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="symbols.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="flags.heading">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Flags</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkFlowBox" id="flags.box">
-                            <property name="visible">1</property>
-                            <property name="homogeneous">1</property>
-                            <property name="selection-mode">none</property>
-                            <signal name="child-activated" handler="emoji_activated"/>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">1</property>
-                    <!-- Remember to keep tooltips here in sync with section headings above -->
-                    <child>
-                      <object class="GtkButton" id="recent.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes">Recent</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="recent.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="people.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes">Smileys &amp; People</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="people.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="body.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes">Body &amp; Clothing</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="body.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="nature.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes">Animals &amp; Nature</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="nature.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="food.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes">Food &amp; Drink</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="food.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="travel.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes">Travel &amp; Places</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="travel.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="activities.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes">Activities</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="activities.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="objects.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                         <property name="tooltip-text" translatable="yes" context="emoji category">Objects</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="objects.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="symbols.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes">Symbols</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="symbols.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="flags.button">
-                        <property name="visible">1</property>
-                        <property name="relief">none</property>
-                        <property name="tooltip-text" translatable="yes">Flags</property>
-                        <style>
-                          <class name="emoji-section"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="flags.icon">
-                            <property name="visible">1</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="name">list</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">1</property>
-                <property name="row-spacing">12</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">1</property>
-                    <property name="icon-name">edit-find-symbolic</property>
-                    <property name="pixel-size">72</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">1</property>
-                    <property name="label" translatable="yes">No Results Found</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="scale" value="1.44"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">1</property>
-                    <property name="label" translatable="yes">Try a different search</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">empty</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/main/data/file_default_widget.ui b/main/data/file_default_widget.ui
index 6315e230..77ddebd1 100644
--- a/main/data/file_default_widget.ui
+++ b/main/data/file_default_widget.ui
@@ -1,110 +1,93 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiFileDefaultWidget" parent="GtkEventBox">
-        <property name="halign">start</property>
-        <style>
-            <class name="file-box-outer"/>
-        </style>
+  <requires lib="gtk" version="4.0"/>
+  <template class="DinoUiFileDefaultWidget">
+    <property name="halign">start</property>
+    <style>
+      <class name="file-box-outer"/>
+    </style>
+    <child>
+      <object class="DinoUiSizingBin">
+        <property name="target-width">500</property>
+        <property name="max-width">500</property>
+        <property name="hexpand">True</property>
         <child>
-            <object class="DinoUiSizingBin">
-                <property name="target-width">500</property>
-                <property name="max-width">500</property>
-                <property name="hexpand">True</property>
-                <property name="visible">True</property>
+          <object class="GtkBox">
+            <property name="hexpand">1</property>
+            <property name="spacing">10</property>
+            <style>
+              <class name="file-box"/>
+            </style>
+            <child>
+              <object class="GtkStack" id="image_stack">
+                <property name="transition-type">crossfade</property>
+                <property name="transition-duration">50</property>
+                <property name="valign">center</property>
                 <child>
-                    <object class="GtkBox">
-                        <property name="orientation">horizontal</property>
-                        <property name="halign">fill</property>
-                        <property name="hexpand">true</property>
-                        <property name="spacing">10</property>
-                        <property name="visible">True</property>
-                        <style>
-                            <class name="file-box"/>
-                        </style>
-                        <child>
-                            <object class="GtkEventBox" id="stack_event_box">
-                                <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkStack" id="image_stack">
-                                        <property name="transition-type">crossfade</property>
-                                        <property name="transition-duration">50</property>
-                                        <property name="valign">center</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkImage">
-                                                <property name="icon-name">dino-file-download-symbolic</property>
-                                                <property name="icon-size">5</property>
-                                                <property name="opacity">0.7</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="name">download_image</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkImage" id="content_type_image">
-                                                <property name="icon-size">5</property>
-                                                <property name="opacity">0.7</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="name">content_type_image</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkSpinner" id="spinner">
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="name">spinner</property>
-                                            </packing>
-                                        </child>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <property name="hexpand">True</property>
-                                <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkLabel" id="name_label">
-                                        <property name="ellipsize">middle</property>
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">0</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel" id="mime_label">
-                                        <property name="xalign">0</property>
-                                        <property name="yalign">1</property>
-                                        <property name="visible">True</property>
-                                        <attributes>
-                                            <attribute name="scale" value="0.8"/>
-                                        </attributes>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkMenuButton" id="file_menu">
-                                <property name="visible">True</property>
-                                <property name="opacity">0</property>
-                                <property name="relief">none</property>
-                                <child>
-                                    <object class="GtkImage">
-                                        <property name="visible">True</property>
-                                        <property name="icon-name">open-menu-symbolic</property>
-                                        <property name="icon-size">1</property>
-                                    </object>
-                                </child>
-                            </object>
-                        </child>
-                    </object>
+                  <object class="GtkStackPage">
+                    <property name="name">download_image</property>
+                    <property name="child">
+                      <object class="GtkImage">
+                        <property name="icon-name">dino-file-download-symbolic</property>
+                        <property name="pixel-size">30</property>
+                        <property name="opacity">0.7</property>
+                      </object>
+                    </property>
+                  </object>
                 </child>
-            </object>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">content_type_image</property>
+                    <property name="child">
+                      <object class="GtkImage" id="content_type_image">
+                        <property name="pixel-size">30</property>
+                        <property name="opacity">0.7</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">spinner</property>
+                    <property name="child">
+                      <object class="GtkSpinner" id="spinner"/>
+                    </property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <property name="hexpand">1</property>
+                <child>
+                  <object class="GtkLabel" id="name_label">
+                    <property name="ellipsize">middle</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="mime_label">
+                    <property name="xalign">0</property>
+                    <property name="yalign">1</property>
+                    <attributes>
+                      <attribute name="scale" value="0.8"></attribute>
+                    </attributes>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuButton" id="file_menu">
+                <property name="icon-name">open-menu-symbolic</property>
+                <property name="opacity">0</property>
+                <property name="has_frame">False</property>
+              </object>
+            </child>
+          </object>
         </child>
-    </template>
-</interface>
+      </object>
+    </child>
+  </template>
+</interface>
\ No newline at end of file
diff --git a/main/data/file_send_overlay.ui b/main/data/file_send_overlay.ui
index 00cc649b..15ff35ef 100644
--- a/main/data/file_send_overlay.ui
+++ b/main/data/file_send_overlay.ui
@@ -1,67 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiFileSendOverlay">
-        <property name="hexpand">False</property>
-        <property name="vexpand">False</property>
+    <requires lib="gtk" version="4.0"/>
+    <object class="GtkBox" id="main_box">
+        <property name="hexpand">0</property>
+        <property name="vexpand">0</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
-        <property name="visible">True</property>
         <style>
             <class name="background"/>
             <class name="dino-file-overlay"/>
         </style>
         <child>
-            <object class="DinoUiSizeRequestBox">
-                <property name="size-request-mode">height-for-width</property>
+            <object class="GtkBox">
                 <property name="orientation">vertical</property>
-                <property name="margin-right">20</property>
-                <property name="margin-left">20</property>
-                <property name="visible">True</property>
+                <property name="margin-end">20</property>
+                <property name="margin-start">20</property>
                 <child>
                     <object class="GtkBox">
                         <property name="margin-top">10</property>
                         <property name="margin-bottom">10</property>
-                        <property name="orientation">horizontal</property>
-                        <property name="visible">True</property>
                         <child>
                             <object class="GtkLabel">
-                                <property name="label" translatable="yes">Send a file</property>
-                                <property name="hexpand">True</property>
-                                <property name="visible">True</property>
+                                <property name="label" translatable="1">Send a file</property>
+                                <property name="hexpand">1</property>
                                 <attributes>
-                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                 </attributes>
                             </object>
-                            <packing>
-                                <property name="pack_type">start</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkButton" id="close_button">
-                                <property name="can_default">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="visible">True</property>
+                                <property name="focusable">1</property>
                                 <style>
                                     <class name="titlebutton"/>
                                     <class name="close"/>
                                 </style>
                                 <child>
                                     <object class="GtkImage">
-                                        <property name="visible">True</property>
                                         <property name="icon-name">window-close-symbolic</property>
-                                        <property name="icon-size">1</property>
                                     </object>
                                 </child>
                             </object>
-                            <packing>
-                                <property name="pack_type">end</property>
-                            </packing>
                         </child>
                     </object>
                 </child>
                 <child>
                     <object class="DinoUiSizingBin" id="file_widget_insert">
-                        <property name="visible">True</property>
                     </object>
                 </child>
                 <child>
@@ -69,29 +53,21 @@
                         <property name="margin-top">15</property>
                         <property name="margin-bottom">15</property>
                         <property name="spacing">5</property>
-                        <property name="visible">True</property>
                         <child>
-                            <object class="GtkLabel" id="info_label">
-                                <property name="visible">True</property>
-                            </object>
+                            <object class="GtkLabel" id="info_label"/>
                         </child>
                         <child>
                             <object class="GtkButton" id="send_button">
-                                <property name="label" translatable="yes">Send</property>
-                                <property name="can_default">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="visible">True</property>
+                                <property name="label" translatable="1">Send</property>
+                                <property name="focusable">1</property>
                                 <style>
                                     <class name="suggested-action"/>
                                 </style>
                             </object>
-                            <packing>
-                                <property name="pack_type">end</property>
-                            </packing>
                         </child>
                     </object>
                 </child>
             </object>
         </child>
-    </template>
-</interface>
+    </object>
+</interface>
\ No newline at end of file
diff --git a/main/data/global_search.ui b/main/data/global_search.ui
index 4814f236..a29c48de 100644
--- a/main/data/global_search.ui
+++ b/main/data/global_search.ui
@@ -1,170 +1,158 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiGlobalSearch" parent="GtkOverlay">
-        <property name="visible">True</property>
-        <child>
+    <requires lib="gtk" version="4.0"/>
+    <object class="GtkOverlay" id="overlay">
+        <property name="child">
             <object class="GtkBox">
                 <property name="orientation">vertical</property>
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkSearchEntry" id="search_entry">
-                        <property name="visible">True</property>
-                        <property name="margin">12</property>
+                        <property name="margin-start">12</property>
+                        <property name="margin-end">12</property>
+                        <property name="margin-top">12</property>
+                        <property name="margin-bottom">12</property>
                     </object>
                 </child>
                 <child>
                     <object class="GtkStack" id="results_empty_stack">
-                        <property name="visible">True</property>
                         <child>
-                            <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <property name="spacing">10</property>
-                                <property name="valign">center</property>
-                                <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkImage">
-                                        <property name="visible">True</property>
-                                        <property name="icon-name">system-search-symbolic</property>
-                                        <property name="icon-size">4</property>
-                                        <property name="pixel-size">72</property>
-                                        <style>
-                                            <class name="dim-label"/>
-                                        </style>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel">
-                                        <property name="label" translatable="yes">No active search</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="visible">True</property>
-                                        <attributes>
-                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                                            <attribute name="scale" value="1.3"/>
-                                        </attributes>
-                                        <style>
-                                            <class name="dim-label"/>
-                                        </style>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel">
-                                        <property name="label" translatable="yes">Type to start a search</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="visible">True</property>
-                                        <style>
-                                            <class name="dim-label"/>
-                                        </style>
+                            <object class="GtkStackPage">
+                                <property name="name">empty</property>
+                                <property name="child">
+                                    <object class="GtkBox">
+                                        <property name="orientation">vertical</property>
+                                        <property name="spacing">10</property>
+                                        <property name="valign">center</property>
+                                        <child>
+                                            <object class="GtkImage">
+                                                <property name="icon-name">system-search-symbolic</property>
+                                                <property name="icon-size">large</property>
+                                                <property name="pixel-size">72</property>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkLabel">
+                                                <property name="label" translatable="1">No active search</property>
+                                                <attributes>
+                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
+                                                    <attribute name="scale" value="1.3"></attribute>
+                                                </attributes>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkLabel">
+                                                <property name="label" translatable="1">Type to start a search</property>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                            </object>
+                                        </child>
                                     </object>
-                                </child>
+                                </property>
                             </object>
-                            <packing>
-                                <property name="name">empty</property>
-                            </packing>
                         </child>
                         <child>
-                            <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <property name="spacing">10</property>
-                                <property name="valign">center</property>
-                                <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkImage">
-                                        <property name="visible">True</property>
-                                        <property name="icon-name">face-uncertain-symbolic</property>
-                                        <property name="icon-size">4</property>
-                                        <property name="pixel-size">72</property>
-                                        <style>
-                                            <class name="dim-label"/>
-                                        </style>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel">
-                                        <property name="label" translatable="yes">No matching messages</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="visible">True</property>
-                                        <attributes>
-                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                                            <attribute name="scale" value="1.3"/>
-                                        </attributes>
-                                        <style>
-                                            <class name="dim-label"/>
-                                        </style>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel">
-                                        <property name="label" translatable="yes">Check the spelling or try to remove filters</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="visible">True</property>
-                                        <style>
-                                            <class name="dim-label"/>
-                                        </style>
+                            <object class="GtkStackPage">
+                                <property name="name">no-result</property>
+                                <property name="child">
+                                    <object class="GtkBox">
+                                        <property name="orientation">vertical</property>
+                                        <property name="spacing">10</property>
+                                        <property name="valign">center</property>
+                                        <child>
+                                            <object class="GtkImage">
+                                                <property name="icon-name">face-uncertain-symbolic</property>
+                                                <property name="icon-size">large</property>
+                                                <property name="pixel-size">72</property>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkLabel">
+                                                <property name="label" translatable="1">No matching messages</property>
+                                                <attributes>
+                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
+                                                    <attribute name="scale" value="1.3"></attribute>
+                                                </attributes>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkLabel">
+                                                <property name="label" translatable="1">Check the spelling or try to remove filters</property>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                            </object>
+                                        </child>
                                     </object>
-                                </child>
+                                </property>
                             </object>
-                            <packing>
-                                <property name="name">no-result</property>
-                            </packing>
                         </child>
                         <child>
-                            <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkLabel" id="entry_number_label">
-                                        <property name="xalign">0</property>
-                                        <property name="use-markup">True</property>
-                                        <property name="margin-left">17</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkScrolledWindow" id="results_scrolled">
-                                        <property name="hscrollbar-policy">never</property>
-                                        <property name="expand">True</property>
-                                        <property name="visible">True</property>
+                            <object class="GtkStackPage">
+                                <property name="name">results</property>
+                                <property name="child">
+                                    <object class="GtkBox">
+                                        <property name="orientation">vertical</property>
+                                        <child>
+                                            <object class="GtkLabel" id="entry_number_label">
+                                                <property name="xalign">0</property>
+                                                <property name="use-markup">1</property>
+                                                <property name="margin-start">17</property>
+                                            </object>
+                                        </child>
                                         <child>
-                                            <object class="GtkBox" id="results_box">
-                                                <property name="orientation">vertical</property>
-                                                <property name="spacing">25</property>
-                                                <property name="margin">10</property>
-                                                <property name="valign">start</property>
-                                                <property name="visible">True</property>
+                                            <object class="GtkScrolledWindow" id="results_scrolled">
+                                                <property name="hscrollbar-policy">never</property>
+                                                <property name="hexpand">1</property>
+                                                <property name="vexpand">1</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="results_box">
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="spacing">25</property>
+                                                        <property name="margin-start">10</property>
+                                                        <property name="margin-end">10</property>
+                                                        <property name="margin-top">10</property>
+                                                        <property name="margin-bottom">10</property>
+                                                        <property name="valign">start</property>
+                                                    </object>
+                                                </property>
                                             </object>
                                         </child>
                                     </object>
-                                </child>
+                                </property>
                             </object>
-                            <packing>
-                                <property name="name">results</property>
-                            </packing>
                         </child>
                     </object>
                 </child>
             </object>
-        </child>
+        </property>
         <child type="overlay">
             <object class="GtkFrame" id="auto_complete_overlay">
-                <property name="visible">True</property>
                 <property name="margin-top">42</property>
-                <property name="margin-left">12</property>
-                <property name="margin-right">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">12</property>
                 <property name="valign">start</property>
                 <style>
                     <class name="auto-complete"/>
                 </style>
-                <child>
+                <property name="child">
                     <object class="GtkListBox" id="auto_complete_list">
-                        <property name="visible">True</property>
                         <property name="selection-mode">browse</property>
                     </object>
-                </child>
+                </property>
             </object>
         </child>
-    </template>
+    </object>
 </interface>
diff --git a/main/data/icons/dino-changes-allowed-symbolic.svg b/main/data/icons/dino-changes-allowed-symbolic.svg
deleted file mode 100644
index 46f4487c..00000000
--- a/main/data/icons/dino-changes-allowed-symbolic.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 12" xmlns="http://www.w3.org/2000/svg">
-  <g transform="translate(-154.64 -256.66)">
-    <g transform="matrix(.74332 0 0 .74332 157.02 256.73)" fill="#000000">
-      <path d="m3 9h10c0.554 0 1 0.446 1 1v3c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-3c0-0.554 0.446-1 1-1z" overflow="visible"/>
-      <path d="M 7,0 C 7,0 6.291,-0.014 5.553,0.356 4.814,0.725 4,1.666 4,3 V 4.4127188 H 6 V 3 C 6,2.333 6.186,2.275 6.447,2.145 6.71,2.014 7,2 7,2 H 9 C 9,2 9.291,2.014 9.553,2.145 9.814,2.275 10,2.333 10,3 v 8 h 2 V 3 C 12,1.667 11.186,0.725 10.447,0.356 9.71,-0.014 9,0 9,0 Z" font-family="sans-serif" font-weight="400" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
-      <path d="m2 12h12v4h-12z" overflow="visible"/>
-    </g>
-  </g>
-</svg>
diff --git a/main/data/icons/dino-changes-prevent-symbolic.svg b/main/data/icons/dino-changes-prevent-symbolic.svg
deleted file mode 100644
index 56312122..00000000
--- a/main/data/icons/dino-changes-prevent-symbolic.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="16"
-   version="1.1"
-   id="svg7384"
-   height="12">
-  <metadata
-     id="metadata90">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386" />
-  <g
-     transform="translate(-181.0002,-241)"
-     style="display:inline"
-     id="layer9">
-    <path
-       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76307714;marker:none"
-       id="rect4063"
-       d="m 188.13566,241.5 c -1.44483,0 -2.63542,1.19893 -2.63542,2.65384 v 2.65385 h -0.87847 c -0.48668,0 -0.87847,0.39453 -0.87847,0.88462 V 248.16225 253 h 4.39236 1.75695 4.39235 v -4.83775 -0.46994 c 0,-0.49009 -0.39179,-0.88462 -0.87846,-0.88462 h -0.87848 v -2.65385 c 0,-1.45491 -1.19059,-2.65384 -2.63541,-2.65384 z m 0,1.76922 h 1.75695 c 0.50187,0 0.87848,0.37925 0.87848,0.88462 v 2.65385 h -3.5139 v -2.65385 c 0,-0.50537 0.3766,-0.88462 0.87847,-0.88462 z" />
-  </g>
-  <g
-     transform="translate(-181.0002,-241)"
-     style="display:inline"
-     id="layer10" />
-  <g
-     transform="translate(-181.0002,-241)"
-     id="layer11" />
-  <g
-     transform="translate(-181.0002,-241)"
-     style="display:inline"
-     id="layer13" />
-  <g
-     transform="translate(-181.0002,-241)"
-     id="layer14" />
-  <g
-     transform="translate(-181.0002,-241)"
-     style="display:inline"
-     id="layer15" />
-  <g
-     transform="translate(-181.0002,-241)"
-     style="display:inline"
-     id="g71291" />
-  <g
-     transform="translate(-181.0002,-241)"
-     style="display:inline"
-     id="g4953" />
-  <g
-     transform="translate(-181.0002,-241)"
-     style="display:inline"
-     id="layer12" />
-</svg>
diff --git a/main/data/icons/dino-device-desktop-symbolic.svg b/main/data/icons/dino-device-desktop-symbolic.svg
deleted file mode 100644
index 4e4e02ab..00000000
--- a/main/data/icons/dino-device-desktop-symbolic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path d="m3 4h18a1 1 0 0 1 1 1v11a1 1 0 0 1-1 1h1l2 3v1h-24v-1l2-3h1a1 1 0 0 1-1-1v-11a1 1 0 0 1 1-1m1 2v9h16v-9h-16z"/>
-  <rect x="4" y="6" width="16" height="9" opacity=".3" stroke-linecap="round" stroke-width="1.8898"/>
-</svg>
diff --git a/main/data/icons/dino-device-phone-symbolic.svg b/main/data/icons/dino-device-phone-symbolic.svg
deleted file mode 100644
index 64a69e17..00000000
--- a/main/data/icons/dino-device-phone-symbolic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path d="M17.25,18H6.75V4H17.25M14,21H10V20H14M16,1H8A3,3 0 0,0 5,4V20A3,3 0 0,0 8,23H16A3,3 0 0,0 19,20V4A3,3 0 0,0 16,1Z"/>
-  <rect x="6.75" y="4" width="10.5" height="14" fill="#030202" opacity=".3" stroke-linecap="round" stroke-width="1.8898"/>
-  <rect x="10" y="20" width="4" height="1" fill="#070504" opacity=".3" stroke-linecap="round" stroke-width="1.8898"/>
-</svg>
diff --git a/main/data/icons/dino-double-tick-symbolic.svg b/main/data/icons/dino-double-tick-symbolic.svg
deleted file mode 100644
index abbf5142..00000000
--- a/main/data/icons/dino-double-tick-symbolic.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" style="enable-background:new" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
- <g transform="translate(-345 -121)">
-  <path d="m356.03 124.03c-0.21888 0.0473-0.42059 0.17053-0.5625 0.34375l-6.2812 7.1875-2.25-2.25c-0.37633-0.37638-1.0612-0.3764-1.4376-5e-5 -0.37635 0.37636-0.37633 1.0612 5e-5 1.4376l3 3 0.78125 0.75 0.6875-0.8125 7-8c0.56742-0.61773-0.11583-1.8248-0.9375-1.6562z" style="color:#000000;enable-background:accumulate;fill:#555;text-decoration-line:none;text-indent:0;text-transform:none"/>
-  <path d="m359.75 124.03c-0.23347 0.0504-0.44863 0.1819-0.6 0.36667l-6.7 7.6667-0.34583-0.34583-1.4259 1.6187 1.0384 1.0605 0.83333 0.8 0.73334-0.86667 7.4667-8.5333c0.60525-0.65892-0.12355-1.9465-1-1.7667z" style="color:#000000;enable-background:accumulate;fill:#555;text-decoration-line:none;text-indent:0;text-transform:none"/>
- </g>
-</svg>
diff --git a/main/data/icons/dino-emoticon-symbolic.svg b/main/data/icons/dino-emoticon-symbolic.svg
deleted file mode 100644
index 5656303d..00000000
--- a/main/data/icons/dino-emoticon-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg">
-  <path d="m7 0c-3.866 0-7 3.134-7 7 0 3.866 3.134 7 7 7 3.866 0 7-3.0493 7-6.9153s-3.134-7.0847-7-7.0847zm-2 4c0.558 0 1.031 0.473 1.031 1.031v0.61307c0 0.558-0.473 1-1.031 1s-1-0.442-1-1v-0.61307c0-0.558 0.442-1.031 1-1.031zm4 0c0.558 0 1 0.473 1 1.031v0.63002c0 0.558-0.442 1-1 1s-1-0.442-1-1v-0.63002c0-0.558 0.442-1.031 1-1.031zm-6.5 4.1157c2 1.304 6.956 1.304 9 0-0.70196 2.8903-2.5245 3.853-4.499 3.8533-1.975 2.17e-4 -3.7981-1.1706-4.501-3.8533z" fill="#474747"/>
-</svg>
diff --git a/main/data/icons/dino-file-document-symbolic.svg b/main/data/icons/dino-file-document-symbolic.svg
deleted file mode 100644
index 8901a817..00000000
--- a/main/data/icons/dino-file-document-symbolic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
-  <path d="m4 11v2h8v-2h-8"/>
-  <path d="m4 15v2h5v-2z"/>
-  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
-</svg>
diff --git a/main/data/icons/dino-file-download-symbolic.svg b/main/data/icons/dino-file-download-symbolic.svg
deleted file mode 100644
index 5dada23d..00000000
--- a/main/data/icons/dino-file-download-symbolic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
-  <path d="m8 18-4-4h2.5v-3h3v3h2.5z"/>
-  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
-</svg>
diff --git a/main/data/icons/dino-file-image-symbolic.svg b/main/data/icons/dino-file-image-symbolic.svg
deleted file mode 100644
index 0cae7f18..00000000
--- a/main/data/icons/dino-file-image-symbolic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
-  <path d="m11.71 12 1.2899 1.8428v4.1572h-10l3.7101-5 2 2.0944"/>
-  <path d="m6.0629 9.4685a1.5315 1.5315 0 0 1 -1.5315 1.5315 1.5315 1.5315 0 0 1 -1.5315 -1.5315 1.5315 1.5315 0 0 1 1.5315 -1.5315 1.5315 1.5315 0 0 1 1.5315 1.5315z" stroke-width="1.021"/>
-  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
-</svg>
diff --git a/main/data/icons/dino-file-music-symbolic.svg b/main/data/icons/dino-file-music-symbolic.svg
deleted file mode 100644
index ef7ae56c..00000000
--- a/main/data/icons/dino-file-music-symbolic.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
-  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
-  <path d="m4.6934 13.773a1.3501 1.3501 0 0 0 -1.3301 1.3691v1.377a1.3506 1.3506 0 1 0 2.7012 0v-1.377a1.3501 1.3501 0 0 0 -1.3711 -1.3691z"/>
-  <path d="m11.115 13.773a1.3501 1.3501 0 0 0 -1.3281 1.3691v1.377a1.3501 1.3501 0 1 0 2.6992 0v-1.377a1.3501 1.3501 0 0 0 -1.3711 -1.3691z"/>
-  <path d="m7.9238 9.4824c-1.538 0-2.7575 0.64459-3.5059 1.6621-0.74838 1.0175-1.0547 2.347-1.0547 3.7617a0.65006 0.65006 0 1 0 1.2988 0c0-1.2218 0.27974-2.2792 0.80273-2.9902 0.52299-0.71108 1.2596-1.1348 2.459-1.1348 1.1288 0 1.8725 0.42826 2.4121 1.1504 0.53958 0.72213 0.8418 1.78 0.8418 2.9746a0.65039 0.65039 0 1 0 1.3008 0c0-1.4089-0.34141-2.7372-1.0996-3.752s-1.9667-1.6719-3.4551-1.6719z"/>
-</svg>
diff --git a/main/data/icons/dino-file-symbolic.svg b/main/data/icons/dino-file-symbolic.svg
deleted file mode 100644
index 748c4e7b..00000000
--- a/main/data/icons/dino-file-symbolic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
-  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
-</svg>
diff --git a/main/data/icons/dino-file-table-symbolic.svg b/main/data/icons/dino-file-table-symbolic.svg
deleted file mode 100644
index c04b1244..00000000
--- a/main/data/icons/dino-file-table-symbolic.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
-  <path d="m6 12h-3v-2h3v2"/>
-  <path d="m10 12h-3v-2h3v2"/>
-  <path d="m6 15h-3v-2h3v2"/>
-  <path d="m10 15h-3v-2h3v2"/>
-  <path d="m6 18h-3v-2h3v2"/>
-  <path d="m10 18h-3v-2h3z"/>
-  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
-</svg>
diff --git a/main/data/icons/dino-file-video-symbolic.svg b/main/data/icons/dino-file-video-symbolic.svg
deleted file mode 100644
index c4afc836..00000000
--- a/main/data/icons/dino-file-video-symbolic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
-  <path d="m6.4377 10.018c-0.24578 0.01348-0.43806 0.21689-0.43771 0.46303v5.5564c8.196e-4 0.38151 0.43677 0.59842 0.74158 0.36898l4.074-2.7782c0.24595-0.18526 0.24595-0.55451 0-0.73977l-4.074-2.7782c-0.08725-0.0656-0.19487-0.09827-0.30387-0.09225z"/>
-  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
-</svg>
diff --git a/main/data/icons/dino-microphone-off-symbolic.svg b/main/data/icons/dino-microphone-off-symbolic.svg
deleted file mode 100644
index 7e5b853d..00000000
--- a/main/data/icons/dino-microphone-off-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,11C19,12.19 18.66,13.3 18.1,14.28L16.87,13.05C17.14,12.43 17.3,11.74 17.3,11H19M15,11.16L9,5.18V5A3,3 0 0,1 12,2A3,3 0 0,1 15,5V11L15,11.16M4.27,3L21,19.73L19.73,21L15.54,16.81C14.77,17.27 13.91,17.58 13,17.72V21H11V17.72C7.72,17.23 5,14.41 5,11H6.7C6.7,14 9.24,16.1 12,16.1C12.81,16.1 13.6,15.91 14.31,15.58L12.65,13.92L12,14A3,3 0 0,1 9,11V10.28L3,4.27L4.27,3Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/dino-microphone-symbolic.svg b/main/data/icons/dino-microphone-symbolic.svg
deleted file mode 100644
index fbf0784a..00000000
--- a/main/data/icons/dino-microphone-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,2A3,3 0 0,1 15,5V11A3,3 0 0,1 12,14A3,3 0 0,1 9,11V5A3,3 0 0,1 12,2M19,11C19,14.53 16.39,17.44 13,17.93V21H11V17.93C7.61,17.44 5,14.53 5,11H7A5,5 0 0,0 12,16A5,5 0 0,0 17,11H19Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/dino-phone-hangup-symbolic.svg b/main/data/icons/dino-phone-hangup-symbolic.svg
deleted file mode 100644
index ecd230ac..00000000
--- a/main/data/icons/dino-phone-hangup-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,9C10.4,9 8.85,9.25 7.4,9.72V12.82C7.4,13.22 7.17,13.56 6.84,13.72C5.86,14.21 4.97,14.84 4.17,15.57C4,15.75 3.75,15.86 3.5,15.86C3.2,15.86 2.95,15.74 2.77,15.56L0.29,13.08C0.11,12.9 0,12.65 0,12.38C0,12.1 0.11,11.85 0.29,11.67C3.34,8.77 7.46,7 12,7C16.54,7 20.66,8.77 23.71,11.67C23.89,11.85 24,12.1 24,12.38C24,12.65 23.89,12.9 23.71,13.08L21.23,15.56C21.05,15.74 20.8,15.86 20.5,15.86C20.25,15.86 20,15.75 19.82,15.57C19.03,14.84 18.14,14.21 17.16,13.72C16.83,13.56 16.6,13.22 16.6,12.82V9.72C15.15,9.25 13.6,9 12,9Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/dino-phone-in-talk-symbolic.svg b/main/data/icons/dino-phone-in-talk-symbolic.svg
deleted file mode 100644
index 351035da..00000000
--- a/main/data/icons/dino-phone-in-talk-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M15,12H17A5,5 0 0,0 12,7V9A3,3 0 0,1 15,12M19,12H21C21,7 16.97,3 12,3V5C15.86,5 19,8.13 19,12M20,15.5C18.75,15.5 17.55,15.3 16.43,14.93C16.08,14.82 15.69,14.9 15.41,15.18L13.21,17.38C10.38,15.94 8.06,13.62 6.62,10.79L8.82,8.59C9.1,8.31 9.18,7.92 9.07,7.57C8.7,6.45 8.5,5.25 8.5,4A1,1 0 0,0 7.5,3H4A1,1 0 0,0 3,4A17,17 0 0,0 20,21A1,1 0 0,0 21,20V16.5A1,1 0 0,0 20,15.5Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/dino-phone-missed-symbolic.svg b/main/data/icons/dino-phone-missed-symbolic.svg
deleted file mode 100644
index 228f073e..00000000
--- a/main/data/icons/dino-phone-missed-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M23.71,16.67C20.66,13.77 16.54,12 12,12C7.46,12 3.34,13.77 0.29,16.67C0.11,16.85 0,17.1 0,17.38C0,17.65 0.11,17.9 0.29,18.08L2.77,20.56C2.95,20.74 3.2,20.86 3.5,20.86C3.75,20.86 4,20.75 4.18,20.57C4.97,19.83 5.86,19.21 6.84,18.72C7.17,18.56 7.4,18.22 7.4,17.82V14.72C8.85,14.25 10.39,14 12,14C13.6,14 15.15,14.25 16.6,14.72V17.82C16.6,18.22 16.83,18.56 17.16,18.72C18.14,19.21 19.03,19.83 19.82,20.57C20,20.75 20.25,20.86 20.5,20.86C20.8,20.86 21.05,20.74 21.23,20.56L23.71,18.08C23.89,17.9 24,17.65 24,17.38C24,17.1 23.89,16.85 23.71,16.67M6.5,5.5L12,11L19,4L18,3L12,9L7.5,4.5H11V3H5V9H6.5V5.5Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/dino-phone-ring-symbolic.svg b/main/data/icons/dino-phone-ring-symbolic.svg
deleted file mode 100644
index 06b8dcbf..00000000
--- a/main/data/icons/dino-phone-ring-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M23.71 16.67C20.66 13.78 16.54 12 12 12S3.34 13.78.29 16.67c-.18.18-.29.43-.29.71 0 .28.11.53.29.71l2.48 2.48c.18.18.43.29.71.29.27 0 .52-.11.7-.28.79-.74 1.69-1.36 2.66-1.85.33-.16.56-.5.56-.9v-3.1c1.45-.48 3-.73 4.6-.73s3.15.25 4.6.72v3.1c0 .39.23.74.56.9.98.49 1.87 1.12 2.66 1.85.18.18.43.28.7.28.28 0 .53-.11.71-.29l2.48-2.48c.18-.18.29-.43.29-.71a.99.99 0 0 0-.29-.7zM21.16 6.26l-1.41-1.41-3.56 3.55 1.41 1.41s3.45-3.52 3.56-3.55zM13 2h-2v5h2V2zM6.4 9.81L7.81 8.4 4.26 4.84 2.84 6.26c.11.03 3.56 3.55 3.56 3.55z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/dino-phone-symbolic.svg b/main/data/icons/dino-phone-symbolic.svg
deleted file mode 100644
index 0020dddc..00000000
--- a/main/data/icons/dino-phone-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M6.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0 0,1 21,16.5V20A1,1 0 0,1 20,21A17,17 0 0,1 3,4A1,1 0 0,1 4,3H7.5A1,1 0 0,1 8.5,4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/dino-security-high-symbolic.svg b/main/data/icons/dino-security-high-symbolic.svg
deleted file mode 100644
index d930b901..00000000
--- a/main/data/icons/dino-security-high-symbolic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 16 12" xmlns="http://www.w3.org/2000/svg">
-  <path d="m2.9174 0v5.9297c0 1.7552 1.269 3.13 2.399 4.1415a15.807 15.807 0 0 0 2.2533 1.6705l0.4371 0.25836 0.43371-0.2626s1.1182-0.67768 2.2448-1.6959c1.1266-1.0199 2.3973-2.3803 2.3973-4.1118v-5.9297zm1.6942 1.6942h6.7768v4.2355c0 0.77933-0.8471 1.9593-1.8382 2.8547-0.7734 0.69886-1.2512 0.97755-1.5553 1.1741-0.30326-0.19144-0.77764-0.45997-1.5485-1.1504-0.98772-0.88352-1.8348-2.0483-1.8348-2.8784z" color="#bebebe" fill="#474747" font-family="sans-serif" font-weight="400" overflow="visible" stroke-width=".8471" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
-  <path d="m5.8658 3.0501v2.8457c0 0.25398 0.53712 1.1674 1.3118 1.8675 0.40906 0.36994 0.5236 0.41262 0.8224 0.62249 0.29879-0.20916 0.41333-0.25255 0.8224-0.62249 0.77544-0.70003 1.3118-1.6135 1.3118-1.8675v-2.8457z" color="#bebebe" fill="#474747" overflow="visible" stroke-width=".71142"/>
-</svg>
diff --git a/main/data/icons/dino-tick-symbolic.svg b/main/data/icons/dino-tick-symbolic.svg
deleted file mode 100644
index bc067e02..00000000
--- a/main/data/icons/dino-tick-symbolic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" style="enable-background:new" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
- <g transform="translate(-345 -121)">
-  <path d="m356.03 124.03c-0.21888 0.0473-0.42059 0.17053-0.5625 0.34375l-6.2812 7.1875-2.25-2.25c-0.37633-0.37638-1.0612-0.3764-1.4376-5e-5 -0.37635 0.37636-0.37633 1.0612 5e-5 1.4376l3 3 0.78125 0.75 0.6875-0.8125 7-8c0.56742-0.61773-0.11583-1.8248-0.9375-1.6562z" style="color:#000000;enable-background:accumulate;fill:#555;text-decoration-line:none;text-indent:0;text-transform:none"/>
- </g>
-</svg>
diff --git a/main/data/icons/dino-video-off-symbolic.svg b/main/data/icons/dino-video-off-symbolic.svg
deleted file mode 100644
index d438e065..00000000
--- a/main/data/icons/dino-video-off-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M3.27,2L2,3.27L4.73,6H4A1,1 0 0,0 3,7V17A1,1 0 0,0 4,18H16C16.2,18 16.39,17.92 16.54,17.82L19.73,21L21,19.73M21,6.5L17,10.5V7A1,1 0 0,0 16,6H9.82L21,17.18V6.5Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/dino-video-symbolic.svg b/main/data/icons/dino-video-symbolic.svg
deleted file mode 100644
index 60a1c742..00000000
--- a/main/data/icons/dino-video-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M17,10.5V7A1,1 0 0,0 16,6H4A1,1 0 0,0 3,7V17A1,1 0 0,0 4,18H16A1,1 0 0,0 17,17V13.5L21,17.5V6.5L17,10.5Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/im.dino.Dino-symbolic.svg b/main/data/icons/im.dino.Dino-symbolic.svg
deleted file mode 100644
index 00680734..00000000
--- a/main/data/icons/im.dino.Dino-symbolic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="84.557mm" height="85.895mm" version="1.1" viewBox="0 0 84.557434 85.894989" xmlns="http://www.w3.org/2000/svg">
- <path d="m81.221 84.142s4.1401-7.3953 3.1966-9.0296c-0.82944-1.4366-8.4437-1.0846-8.4437-1.0846s4.1831-7.7568 3.1622-9.525c-1.0051-1.7408-9.6749-1.8226-9.6749-1.8226s10.726-5.3798 11.068-7.3725c0.35889-2.0885-9.4824-9.6358-9.4824-9.6358s10.44-13.588 9.6703-15.442c-0.96601-2.3265-16.818-3.8351-16.818-3.8351s1.7332-17.52-0.39677-18.89c-1.7897-1.1506-16.236 6.9991-16.236 6.9991s-5.9396-14.504-9.2468-14.504c-3.328 0-10.359 14.525-10.359 14.525s-11.671-8.0128-13.832-6.765c-1.9105 1.103-1.2591 15.252-1.2591 15.252z" style="fill-rule:evenodd;opacity:.65"/>
- <path d="m36.287 11.792c-20.04 0-36.286 16.246-36.286 36.286 0 1.9247 0.15111 3.8139 0.43977 5.6575 1.4023 6.7619 6.6874 9.3881 6.6874 9.3881 1.1074 0.90879 2.4837 1.8364 4.0731 2.7523l-0.13074-4e-3s3.3315 18.563 9.4439 18.41c4.6229-0.11575 8.2505-9.4523 14.128-9.2646 5.8724 0.18755 8.2564 9.1509 14.1 9.2129 3.3748 0.0358 6.3071-5.7438 8.1597-10.528 0.58645-0.11985 1.1699-0.24995 1.7492-0.39222 5.5562 5.2542 18.398 10.599 23.871 12.412 0.0748-0.0397 0.13499-0.0861 0.17674-0.14056 1.3957-1.8189-7.9538-16.01-12.983-23.371 1.8385-4.3435 2.8556-9.1191 2.8556-14.132 0-20.04-16.246-36.286-36.286-36.286zm-18.351 23.567a2.9104 2.9104 0 0 1 2.9104 2.9104 2.9104 2.9104 0 0 1 -2.9104 2.9104 2.9104 2.9104 0 0 1 -2.9104 -2.9104 2.9104 2.9104 0 0 1 2.9104 -2.9104z" style="fill-rule:evenodd"/>
- <path d="m36.286 11.792c-20.04 0-36.286 16.246-36.286 36.286 0 17.981 13.079 32.907 30.242 35.785 1.9655 0.32953 3.9844 0.50074 6.0436 0.50074 2.131 0 4.2195-0.18345 6.2497-0.53588 4.6558-0.80822 9.0061-2.5054 12.873-4.9077 10.413 3.4298 26.069 8.2534 27.291 6.6616 1.3957-1.8189-7.9538-16.01-12.983-23.371 1.8384-4.3435 2.8556-9.1191 2.8556-14.132-1e-5 -20.04-16.246-36.286-36.286-36.286zm-18.353 23.567a2.9104 2.9104 0 0 1 2.9104 2.9104 2.9104 2.9104 0 0 1 -2.9104 2.9104 2.9104 2.9104 0 0 1 -2.9104 -2.9104 2.9104 2.9104 0 0 1 2.9104 -2.9104z" style="fill-rule:evenodd;opacity:.55"/>
-</svg>
diff --git a/main/data/icons/scalable/apps/im.dino.Dino-symbolic.svg b/main/data/icons/scalable/apps/im.dino.Dino-symbolic.svg
new file mode 100644
index 00000000..00680734
--- /dev/null
+++ b/main/data/icons/scalable/apps/im.dino.Dino-symbolic.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="84.557mm" height="85.895mm" version="1.1" viewBox="0 0 84.557434 85.894989" xmlns="http://www.w3.org/2000/svg">
+ <path d="m81.221 84.142s4.1401-7.3953 3.1966-9.0296c-0.82944-1.4366-8.4437-1.0846-8.4437-1.0846s4.1831-7.7568 3.1622-9.525c-1.0051-1.7408-9.6749-1.8226-9.6749-1.8226s10.726-5.3798 11.068-7.3725c0.35889-2.0885-9.4824-9.6358-9.4824-9.6358s10.44-13.588 9.6703-15.442c-0.96601-2.3265-16.818-3.8351-16.818-3.8351s1.7332-17.52-0.39677-18.89c-1.7897-1.1506-16.236 6.9991-16.236 6.9991s-5.9396-14.504-9.2468-14.504c-3.328 0-10.359 14.525-10.359 14.525s-11.671-8.0128-13.832-6.765c-1.9105 1.103-1.2591 15.252-1.2591 15.252z" style="fill-rule:evenodd;opacity:.65"/>
+ <path d="m36.287 11.792c-20.04 0-36.286 16.246-36.286 36.286 0 1.9247 0.15111 3.8139 0.43977 5.6575 1.4023 6.7619 6.6874 9.3881 6.6874 9.3881 1.1074 0.90879 2.4837 1.8364 4.0731 2.7523l-0.13074-4e-3s3.3315 18.563 9.4439 18.41c4.6229-0.11575 8.2505-9.4523 14.128-9.2646 5.8724 0.18755 8.2564 9.1509 14.1 9.2129 3.3748 0.0358 6.3071-5.7438 8.1597-10.528 0.58645-0.11985 1.1699-0.24995 1.7492-0.39222 5.5562 5.2542 18.398 10.599 23.871 12.412 0.0748-0.0397 0.13499-0.0861 0.17674-0.14056 1.3957-1.8189-7.9538-16.01-12.983-23.371 1.8385-4.3435 2.8556-9.1191 2.8556-14.132 0-20.04-16.246-36.286-36.286-36.286zm-18.351 23.567a2.9104 2.9104 0 0 1 2.9104 2.9104 2.9104 2.9104 0 0 1 -2.9104 2.9104 2.9104 2.9104 0 0 1 -2.9104 -2.9104 2.9104 2.9104 0 0 1 2.9104 -2.9104z" style="fill-rule:evenodd"/>
+ <path d="m36.286 11.792c-20.04 0-36.286 16.246-36.286 36.286 0 17.981 13.079 32.907 30.242 35.785 1.9655 0.32953 3.9844 0.50074 6.0436 0.50074 2.131 0 4.2195-0.18345 6.2497-0.53588 4.6558-0.80822 9.0061-2.5054 12.873-4.9077 10.413 3.4298 26.069 8.2534 27.291 6.6616 1.3957-1.8189-7.9538-16.01-12.983-23.371 1.8384-4.3435 2.8556-9.1191 2.8556-14.132-1e-5 -20.04-16.246-36.286-36.286-36.286zm-18.353 23.567a2.9104 2.9104 0 0 1 2.9104 2.9104 2.9104 2.9104 0 0 1 -2.9104 2.9104 2.9104 2.9104 0 0 1 -2.9104 -2.9104 2.9104 2.9104 0 0 1 2.9104 -2.9104z" style="fill-rule:evenodd;opacity:.55"/>
+</svg>
diff --git a/main/data/icons/scalable/devices/dino-device-desktop-symbolic.svg b/main/data/icons/scalable/devices/dino-device-desktop-symbolic.svg
new file mode 100644
index 00000000..4e4e02ab
--- /dev/null
+++ b/main/data/icons/scalable/devices/dino-device-desktop-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="m3 4h18a1 1 0 0 1 1 1v11a1 1 0 0 1-1 1h1l2 3v1h-24v-1l2-3h1a1 1 0 0 1-1-1v-11a1 1 0 0 1 1-1m1 2v9h16v-9h-16z"/>
+  <rect x="4" y="6" width="16" height="9" opacity=".3" stroke-linecap="round" stroke-width="1.8898"/>
+</svg>
diff --git a/main/data/icons/scalable/devices/dino-device-phone-symbolic.svg b/main/data/icons/scalable/devices/dino-device-phone-symbolic.svg
new file mode 100644
index 00000000..64a69e17
--- /dev/null
+++ b/main/data/icons/scalable/devices/dino-device-phone-symbolic.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M17.25,18H6.75V4H17.25M14,21H10V20H14M16,1H8A3,3 0 0,0 5,4V20A3,3 0 0,0 8,23H16A3,3 0 0,0 19,20V4A3,3 0 0,0 16,1Z"/>
+  <rect x="6.75" y="4" width="10.5" height="14" fill="#030202" opacity=".3" stroke-linecap="round" stroke-width="1.8898"/>
+  <rect x="10" y="20" width="4" height="1" fill="#070504" opacity=".3" stroke-linecap="round" stroke-width="1.8898"/>
+</svg>
diff --git a/main/data/icons/scalable/devices/dino-phone-hangup-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-hangup-symbolic.svg
new file mode 100644
index 00000000..ecd230ac
--- /dev/null
+++ b/main/data/icons/scalable/devices/dino-phone-hangup-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,9C10.4,9 8.85,9.25 7.4,9.72V12.82C7.4,13.22 7.17,13.56 6.84,13.72C5.86,14.21 4.97,14.84 4.17,15.57C4,15.75 3.75,15.86 3.5,15.86C3.2,15.86 2.95,15.74 2.77,15.56L0.29,13.08C0.11,12.9 0,12.65 0,12.38C0,12.1 0.11,11.85 0.29,11.67C3.34,8.77 7.46,7 12,7C16.54,7 20.66,8.77 23.71,11.67C23.89,11.85 24,12.1 24,12.38C24,12.65 23.89,12.9 23.71,13.08L21.23,15.56C21.05,15.74 20.8,15.86 20.5,15.86C20.25,15.86 20,15.75 19.82,15.57C19.03,14.84 18.14,14.21 17.16,13.72C16.83,13.56 16.6,13.22 16.6,12.82V9.72C15.15,9.25 13.6,9 12,9Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/scalable/devices/dino-phone-in-talk-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-in-talk-symbolic.svg
new file mode 100644
index 00000000..351035da
--- /dev/null
+++ b/main/data/icons/scalable/devices/dino-phone-in-talk-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M15,12H17A5,5 0 0,0 12,7V9A3,3 0 0,1 15,12M19,12H21C21,7 16.97,3 12,3V5C15.86,5 19,8.13 19,12M20,15.5C18.75,15.5 17.55,15.3 16.43,14.93C16.08,14.82 15.69,14.9 15.41,15.18L13.21,17.38C10.38,15.94 8.06,13.62 6.62,10.79L8.82,8.59C9.1,8.31 9.18,7.92 9.07,7.57C8.7,6.45 8.5,5.25 8.5,4A1,1 0 0,0 7.5,3H4A1,1 0 0,0 3,4A17,17 0 0,0 20,21A1,1 0 0,0 21,20V16.5A1,1 0 0,0 20,15.5Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/scalable/devices/dino-phone-missed-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-missed-symbolic.svg
new file mode 100644
index 00000000..228f073e
--- /dev/null
+++ b/main/data/icons/scalable/devices/dino-phone-missed-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M23.71,16.67C20.66,13.77 16.54,12 12,12C7.46,12 3.34,13.77 0.29,16.67C0.11,16.85 0,17.1 0,17.38C0,17.65 0.11,17.9 0.29,18.08L2.77,20.56C2.95,20.74 3.2,20.86 3.5,20.86C3.75,20.86 4,20.75 4.18,20.57C4.97,19.83 5.86,19.21 6.84,18.72C7.17,18.56 7.4,18.22 7.4,17.82V14.72C8.85,14.25 10.39,14 12,14C13.6,14 15.15,14.25 16.6,14.72V17.82C16.6,18.22 16.83,18.56 17.16,18.72C18.14,19.21 19.03,19.83 19.82,20.57C20,20.75 20.25,20.86 20.5,20.86C20.8,20.86 21.05,20.74 21.23,20.56L23.71,18.08C23.89,17.9 24,17.65 24,17.38C24,17.1 23.89,16.85 23.71,16.67M6.5,5.5L12,11L19,4L18,3L12,9L7.5,4.5H11V3H5V9H6.5V5.5Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/scalable/devices/dino-phone-ring-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-ring-symbolic.svg
new file mode 100644
index 00000000..06b8dcbf
--- /dev/null
+++ b/main/data/icons/scalable/devices/dino-phone-ring-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M23.71 16.67C20.66 13.78 16.54 12 12 12S3.34 13.78.29 16.67c-.18.18-.29.43-.29.71 0 .28.11.53.29.71l2.48 2.48c.18.18.43.29.71.29.27 0 .52-.11.7-.28.79-.74 1.69-1.36 2.66-1.85.33-.16.56-.5.56-.9v-3.1c1.45-.48 3-.73 4.6-.73s3.15.25 4.6.72v3.1c0 .39.23.74.56.9.98.49 1.87 1.12 2.66 1.85.18.18.43.28.7.28.28 0 .53-.11.71-.29l2.48-2.48c.18-.18.29-.43.29-.71a.99.99 0 0 0-.29-.7zM21.16 6.26l-1.41-1.41-3.56 3.55 1.41 1.41s3.45-3.52 3.56-3.55zM13 2h-2v5h2V2zM6.4 9.81L7.81 8.4 4.26 4.84 2.84 6.26c.11.03 3.56 3.55 3.56 3.55z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/scalable/devices/dino-phone-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-symbolic.svg
new file mode 100644
index 00000000..0020dddc
--- /dev/null
+++ b/main/data/icons/scalable/devices/dino-phone-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M6.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0 0,1 21,16.5V20A1,1 0 0,1 20,21A17,17 0 0,1 3,4A1,1 0 0,1 4,3H7.5A1,1 0 0,1 8.5,4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg b/main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg
new file mode 100644
index 00000000..5656303d
--- /dev/null
+++ b/main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg">
+  <path d="m7 0c-3.866 0-7 3.134-7 7 0 3.866 3.134 7 7 7 3.866 0 7-3.0493 7-6.9153s-3.134-7.0847-7-7.0847zm-2 4c0.558 0 1.031 0.473 1.031 1.031v0.61307c0 0.558-0.473 1-1.031 1s-1-0.442-1-1v-0.61307c0-0.558 0.442-1.031 1-1.031zm4 0c0.558 0 1 0.473 1 1.031v0.63002c0 0.558-0.442 1-1 1s-1-0.442-1-1v-0.63002c0-0.558 0.442-1.031 1-1.031zm-6.5 4.1157c2 1.304 6.956 1.304 9 0-0.70196 2.8903-2.5245 3.853-4.499 3.8533-1.975 2.17e-4 -3.7981-1.1706-4.501-3.8533z" fill="#474747"/>
+</svg>
diff --git a/main/data/icons/scalable/mimetypes/dino-file-document-symbolic.svg b/main/data/icons/scalable/mimetypes/dino-file-document-symbolic.svg
new file mode 100644
index 00000000..8901a817
--- /dev/null
+++ b/main/data/icons/scalable/mimetypes/dino-file-document-symbolic.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
+  <path d="m4 11v2h8v-2h-8"/>
+  <path d="m4 15v2h5v-2z"/>
+  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
+</svg>
diff --git a/main/data/icons/scalable/mimetypes/dino-file-download-symbolic.svg b/main/data/icons/scalable/mimetypes/dino-file-download-symbolic.svg
new file mode 100644
index 00000000..5dada23d
--- /dev/null
+++ b/main/data/icons/scalable/mimetypes/dino-file-download-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
+  <path d="m8 18-4-4h2.5v-3h3v3h2.5z"/>
+  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
+</svg>
diff --git a/main/data/icons/scalable/mimetypes/dino-file-image-symbolic.svg b/main/data/icons/scalable/mimetypes/dino-file-image-symbolic.svg
new file mode 100644
index 00000000..0cae7f18
--- /dev/null
+++ b/main/data/icons/scalable/mimetypes/dino-file-image-symbolic.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
+  <path d="m11.71 12 1.2899 1.8428v4.1572h-10l3.7101-5 2 2.0944"/>
+  <path d="m6.0629 9.4685a1.5315 1.5315 0 0 1 -1.5315 1.5315 1.5315 1.5315 0 0 1 -1.5315 -1.5315 1.5315 1.5315 0 0 1 1.5315 -1.5315 1.5315 1.5315 0 0 1 1.5315 1.5315z" stroke-width="1.021"/>
+  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
+</svg>
diff --git a/main/data/icons/scalable/mimetypes/dino-file-music-symbolic.svg b/main/data/icons/scalable/mimetypes/dino-file-music-symbolic.svg
new file mode 100644
index 00000000..ef7ae56c
--- /dev/null
+++ b/main/data/icons/scalable/mimetypes/dino-file-music-symbolic.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
+  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
+  <path d="m4.6934 13.773a1.3501 1.3501 0 0 0 -1.3301 1.3691v1.377a1.3506 1.3506 0 1 0 2.7012 0v-1.377a1.3501 1.3501 0 0 0 -1.3711 -1.3691z"/>
+  <path d="m11.115 13.773a1.3501 1.3501 0 0 0 -1.3281 1.3691v1.377a1.3501 1.3501 0 1 0 2.6992 0v-1.377a1.3501 1.3501 0 0 0 -1.3711 -1.3691z"/>
+  <path d="m7.9238 9.4824c-1.538 0-2.7575 0.64459-3.5059 1.6621-0.74838 1.0175-1.0547 2.347-1.0547 3.7617a0.65006 0.65006 0 1 0 1.2988 0c0-1.2218 0.27974-2.2792 0.80273-2.9902 0.52299-0.71108 1.2596-1.1348 2.459-1.1348 1.1288 0 1.8725 0.42826 2.4121 1.1504 0.53958 0.72213 0.8418 1.78 0.8418 2.9746a0.65039 0.65039 0 1 0 1.3008 0c0-1.4089-0.34141-2.7372-1.0996-3.752s-1.9667-1.6719-3.4551-1.6719z"/>
+</svg>
diff --git a/main/data/icons/scalable/mimetypes/dino-file-symbolic.svg b/main/data/icons/scalable/mimetypes/dino-file-symbolic.svg
new file mode 100644
index 00000000..748c4e7b
--- /dev/null
+++ b/main/data/icons/scalable/mimetypes/dino-file-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
+  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
+</svg>
diff --git a/main/data/icons/scalable/mimetypes/dino-file-table-symbolic.svg b/main/data/icons/scalable/mimetypes/dino-file-table-symbolic.svg
new file mode 100644
index 00000000..c04b1244
--- /dev/null
+++ b/main/data/icons/scalable/mimetypes/dino-file-table-symbolic.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
+  <path d="m6 12h-3v-2h3v2"/>
+  <path d="m10 12h-3v-2h3v2"/>
+  <path d="m6 15h-3v-2h3v2"/>
+  <path d="m10 15h-3v-2h3v2"/>
+  <path d="m6 18h-3v-2h3v2"/>
+  <path d="m10 18h-3v-2h3z"/>
+  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
+</svg>
diff --git a/main/data/icons/scalable/mimetypes/dino-file-video-symbolic.svg b/main/data/icons/scalable/mimetypes/dino-file-video-symbolic.svg
new file mode 100644
index 00000000..c4afc836
--- /dev/null
+++ b/main/data/icons/scalable/mimetypes/dino-file-video-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 21" xmlns="http://www.w3.org/2000/svg">
+  <path d="m6.4377 10.018c-0.24578 0.01348-0.43806 0.21689-0.43771 0.46303v5.5564c8.196e-4 0.38151 0.43677 0.59842 0.74158 0.36898l4.074-2.7782c0.24595-0.18526 0.24595-0.55451 0-0.73977l-4.074-2.7782c-0.08725-0.0656-0.19487-0.09827-0.30387-0.09225z"/>
+  <path d="m2 1.25c-1.2632 0-1.9836 0.78574-2 2v15.75c0 1.1966 0.68685 1.9999 2 2h12c1.2965 0 2-0.73406 2-2v-11.5c4.8e-4 -0.1991-0.07822-0.39022-0.21875-0.53125l-5.5-5.5c-0.14103-0.14053-0.33215-0.21923-0.53125-0.21875zm-0.5 1.5h7.75v4.75c2.7e-5 0.27613 0.22387 0.49997 0.5 0.5h4.75v11.5h-13z"/>
+</svg>
diff --git a/main/data/icons/scalable/status/dino-changes-allowed-symbolic.svg b/main/data/icons/scalable/status/dino-changes-allowed-symbolic.svg
new file mode 100644
index 00000000..46f4487c
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-changes-allowed-symbolic.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 12" xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(-154.64 -256.66)">
+    <g transform="matrix(.74332 0 0 .74332 157.02 256.73)" fill="#000000">
+      <path d="m3 9h10c0.554 0 1 0.446 1 1v3c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-3c0-0.554 0.446-1 1-1z" overflow="visible"/>
+      <path d="M 7,0 C 7,0 6.291,-0.014 5.553,0.356 4.814,0.725 4,1.666 4,3 V 4.4127188 H 6 V 3 C 6,2.333 6.186,2.275 6.447,2.145 6.71,2.014 7,2 7,2 H 9 C 9,2 9.291,2.014 9.553,2.145 9.814,2.275 10,2.333 10,3 v 8 h 2 V 3 C 12,1.667 11.186,0.725 10.447,0.356 9.71,-0.014 9,0 9,0 Z" font-family="sans-serif" font-weight="400" overflow="visible" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
+      <path d="m2 12h12v4h-12z" overflow="visible"/>
+    </g>
+  </g>
+</svg>
diff --git a/main/data/icons/scalable/status/dino-changes-prevent-symbolic.svg b/main/data/icons/scalable/status/dino-changes-prevent-symbolic.svg
new file mode 100644
index 00000000..56312122
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-changes-prevent-symbolic.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   version="1.1"
+   id="svg7384"
+   height="12">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     transform="translate(-181.0002,-241)"
+     style="display:inline"
+     id="layer9">
+    <path
+       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76307714;marker:none"
+       id="rect4063"
+       d="m 188.13566,241.5 c -1.44483,0 -2.63542,1.19893 -2.63542,2.65384 v 2.65385 h -0.87847 c -0.48668,0 -0.87847,0.39453 -0.87847,0.88462 V 248.16225 253 h 4.39236 1.75695 4.39235 v -4.83775 -0.46994 c 0,-0.49009 -0.39179,-0.88462 -0.87846,-0.88462 h -0.87848 v -2.65385 c 0,-1.45491 -1.19059,-2.65384 -2.63541,-2.65384 z m 0,1.76922 h 1.75695 c 0.50187,0 0.87848,0.37925 0.87848,0.88462 v 2.65385 h -3.5139 v -2.65385 c 0,-0.50537 0.3766,-0.88462 0.87847,-0.88462 z" />
+  </g>
+  <g
+     transform="translate(-181.0002,-241)"
+     style="display:inline"
+     id="layer10" />
+  <g
+     transform="translate(-181.0002,-241)"
+     id="layer11" />
+  <g
+     transform="translate(-181.0002,-241)"
+     style="display:inline"
+     id="layer13" />
+  <g
+     transform="translate(-181.0002,-241)"
+     id="layer14" />
+  <g
+     transform="translate(-181.0002,-241)"
+     style="display:inline"
+     id="layer15" />
+  <g
+     transform="translate(-181.0002,-241)"
+     style="display:inline"
+     id="g71291" />
+  <g
+     transform="translate(-181.0002,-241)"
+     style="display:inline"
+     id="g4953" />
+  <g
+     transform="translate(-181.0002,-241)"
+     style="display:inline"
+     id="layer12" />
+</svg>
diff --git a/main/data/icons/scalable/status/dino-double-tick-symbolic.svg b/main/data/icons/scalable/status/dino-double-tick-symbolic.svg
new file mode 100644
index 00000000..abbf5142
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-double-tick-symbolic.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" style="enable-background:new" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+ <g transform="translate(-345 -121)">
+  <path d="m356.03 124.03c-0.21888 0.0473-0.42059 0.17053-0.5625 0.34375l-6.2812 7.1875-2.25-2.25c-0.37633-0.37638-1.0612-0.3764-1.4376-5e-5 -0.37635 0.37636-0.37633 1.0612 5e-5 1.4376l3 3 0.78125 0.75 0.6875-0.8125 7-8c0.56742-0.61773-0.11583-1.8248-0.9375-1.6562z" style="color:#000000;enable-background:accumulate;fill:#555;text-decoration-line:none;text-indent:0;text-transform:none"/>
+  <path d="m359.75 124.03c-0.23347 0.0504-0.44863 0.1819-0.6 0.36667l-6.7 7.6667-0.34583-0.34583-1.4259 1.6187 1.0384 1.0605 0.83333 0.8 0.73334-0.86667 7.4667-8.5333c0.60525-0.65892-0.12355-1.9465-1-1.7667z" style="color:#000000;enable-background:accumulate;fill:#555;text-decoration-line:none;text-indent:0;text-transform:none"/>
+ </g>
+</svg>
diff --git a/main/data/icons/scalable/status/dino-microphone-off-symbolic.svg b/main/data/icons/scalable/status/dino-microphone-off-symbolic.svg
new file mode 100644
index 00000000..7e5b853d
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-microphone-off-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,11C19,12.19 18.66,13.3 18.1,14.28L16.87,13.05C17.14,12.43 17.3,11.74 17.3,11H19M15,11.16L9,5.18V5A3,3 0 0,1 12,2A3,3 0 0,1 15,5V11L15,11.16M4.27,3L21,19.73L19.73,21L15.54,16.81C14.77,17.27 13.91,17.58 13,17.72V21H11V17.72C7.72,17.23 5,14.41 5,11H6.7C6.7,14 9.24,16.1 12,16.1C12.81,16.1 13.6,15.91 14.31,15.58L12.65,13.92L12,14A3,3 0 0,1 9,11V10.28L3,4.27L4.27,3Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/scalable/status/dino-microphone-symbolic.svg b/main/data/icons/scalable/status/dino-microphone-symbolic.svg
new file mode 100644
index 00000000..fbf0784a
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-microphone-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,2A3,3 0 0,1 15,5V11A3,3 0 0,1 12,14A3,3 0 0,1 9,11V5A3,3 0 0,1 12,2M19,11C19,14.53 16.39,17.44 13,17.93V21H11V17.93C7.61,17.44 5,14.53 5,11H7A5,5 0 0,0 12,16A5,5 0 0,0 17,11H19Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/scalable/status/dino-security-high-symbolic.svg b/main/data/icons/scalable/status/dino-security-high-symbolic.svg
new file mode 100644
index 00000000..d930b901
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-security-high-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 12" xmlns="http://www.w3.org/2000/svg">
+  <path d="m2.9174 0v5.9297c0 1.7552 1.269 3.13 2.399 4.1415a15.807 15.807 0 0 0 2.2533 1.6705l0.4371 0.25836 0.43371-0.2626s1.1182-0.67768 2.2448-1.6959c1.1266-1.0199 2.3973-2.3803 2.3973-4.1118v-5.9297zm1.6942 1.6942h6.7768v4.2355c0 0.77933-0.8471 1.9593-1.8382 2.8547-0.7734 0.69886-1.2512 0.97755-1.5553 1.1741-0.30326-0.19144-0.77764-0.45997-1.5485-1.1504-0.98772-0.88352-1.8348-2.0483-1.8348-2.8784z" color="#bebebe" fill="#474747" font-family="sans-serif" font-weight="400" overflow="visible" stroke-width=".8471" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
+  <path d="m5.8658 3.0501v2.8457c0 0.25398 0.53712 1.1674 1.3118 1.8675 0.40906 0.36994 0.5236 0.41262 0.8224 0.62249 0.29879-0.20916 0.41333-0.25255 0.8224-0.62249 0.77544-0.70003 1.3118-1.6135 1.3118-1.8675v-2.8457z" color="#bebebe" fill="#474747" overflow="visible" stroke-width=".71142"/>
+</svg>
diff --git a/main/data/icons/scalable/status/dino-tick-symbolic.svg b/main/data/icons/scalable/status/dino-tick-symbolic.svg
new file mode 100644
index 00000000..bc067e02
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-tick-symbolic.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" style="enable-background:new" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+ <g transform="translate(-345 -121)">
+  <path d="m356.03 124.03c-0.21888 0.0473-0.42059 0.17053-0.5625 0.34375l-6.2812 7.1875-2.25-2.25c-0.37633-0.37638-1.0612-0.3764-1.4376-5e-5 -0.37635 0.37636-0.37633 1.0612 5e-5 1.4376l3 3 0.78125 0.75 0.6875-0.8125 7-8c0.56742-0.61773-0.11583-1.8248-0.9375-1.6562z" style="color:#000000;enable-background:accumulate;fill:#555;text-decoration-line:none;text-indent:0;text-transform:none"/>
+ </g>
+</svg>
diff --git a/main/data/icons/scalable/status/dino-video-off-symbolic.svg b/main/data/icons/scalable/status/dino-video-off-symbolic.svg
new file mode 100644
index 00000000..d438e065
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-video-off-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M3.27,2L2,3.27L4.73,6H4A1,1 0 0,0 3,7V17A1,1 0 0,0 4,18H16C16.2,18 16.39,17.92 16.54,17.82L19.73,21L21,19.73M21,6.5L17,10.5V7A1,1 0 0,0 16,6H9.82L21,17.18V6.5Z" /></svg>
\ No newline at end of file
diff --git a/main/data/icons/scalable/status/dino-video-symbolic.svg b/main/data/icons/scalable/status/dino-video-symbolic.svg
new file mode 100644
index 00000000..60a1c742
--- /dev/null
+++ b/main/data/icons/scalable/status/dino-video-symbolic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M17,10.5V7A1,1 0 0,0 16,6H4A1,1 0 0,0 3,7V17A1,1 0 0,0 4,18H16A1,1 0 0,0 17,17V13.5L21,17.5V6.5L17,10.5Z" /></svg>
\ No newline at end of file
diff --git a/main/data/manage_accounts/account_row.ui b/main/data/manage_accounts/account_row.ui
index 965171a7..6cacbeaf 100644
--- a/main/data/manage_accounts/account_row.ui
+++ b/main/data/manage_accounts/account_row.ui
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiManageAccountsAccountRow">
         <property name="visible">True</property>
         <child>
             <object class="GtkGrid">
-                <property name="orientation">horizontal</property>
-                <property name="margin">6</property>
+                <property name="margin-start">6</property>
+                <property name="margin-end">6</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
                 <property name="column-spacing">6</property>
-                <property name="visible">True</property>
                 <child>
                     <object class="DinoUiAvatarImage" id="image">
                         <property name="height">40</property>
                         <property name="width">40</property>
-                        <property name="visible">True</property>
                     </object>
                 </child>
                 <child>
                     <object class="GtkLabel" id="jid_label">
-                        <property name="halign">0.5</property>
                         <property name="xalign">0</property>
-                        <property name="expand">True</property>
-                        <property name="visible">True</property>
+                        <property name="hexpand">1</property>
                     </object>
                 </child>
                 <child>
                     <object class="GtkImage" id="icon">
+                        <property name="visible">False</property>
                         <property name="icon-name">dialog-warning-symbolic</property>
                     </object>
                 </child>
diff --git a/main/data/manage_accounts/add_account_dialog.ui b/main/data/manage_accounts/add_account_dialog.ui
index ad141b4a..d37a98f5 100644
--- a/main/data/manage_accounts/add_account_dialog.ui
+++ b/main/data/manage_accounts/add_account_dialog.ui
@@ -1,640 +1,548 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiManageAccountsAddAccountDialog">
         <property name="default_width">400</property>
         <property name="modal">True</property>
-        <child internal-child="vbox">
+        <child internal-child="content_area">
             <object class="GtkBox">
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkOverlay">
-                        <property name="visible">True</property>
-                        <child>
+                        <property name="child">
                             <object class="GtkBox">
-                                <property name="expand">True</property>
-                                <property name="visible">True</property>
+                                <property name="hexpand">1</property>
+                                <property name="vexpand">1</property>
                                 <child>
                                     <object class="GtkStack" id="stack">
                                         <property name="transition_type">slide-left</property>
-                                        <property name="expand">True</property>
-                                        <property name="visible">True</property>
+                                        <property name="hexpand">1</property>
+                                        <property name="vexpand">1</property>
                                         <child>
-                                            <object class="GtkBox" id="sign_in_jid_box">
-                                                <property name="orientation">vertical</property>
-                                                <property name="margin">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="spacing">20</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">Sign in</property>
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox" id="info_grid">
+                                            <object class="GtkStackPage">
+                                                <property name="name">login_jid</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="sign_in_jid_box">
                                                         <property name="orientation">vertical</property>
-                                                        <property name="visible">True</property>
+                                                        <property name="margin-start">20</property>
+                                                        <property name="margin-end">20</property>
+                                                        <property name="margin-top">20</property>
+                                                        <property name="margin-bottom">20</property>
+                                                        <property name="margin-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="spacing">20</property>
                                                         <child>
                                                             <object class="GtkLabel">
-                                                                <property name="label">JID</property>
-                                                                <property name="xalign">0</property>
-                                                                <property name="visible">True</property>
+                                                                <property name="label" translatable="1">Sign in</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="0.9"/>
+                                                                    <attribute name="scale" value="1.3"></attribute>
                                                                 </attributes>
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkEntry" id="jid_entry">
-                                                                <property name="activates_default">True</property>
-                                                                <property name="hexpand">True</property>
-                                                                <property name="width_request">200</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkBox" id="info_grid">
+                                                                <property name="orientation">vertical</property>
+                                                                <child>
+                                                                    <object class="GtkLabel">
+                                                                        <property name="label">JID</property>
+                                                                        <property name="xalign">0</property>
+                                                                        <attributes>
+                                                                            <attribute name="scale" value="0.9"></attribute>
+                                                                        </attributes>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkEntry" id="jid_entry">
+                                                                        <property name="activates_default">1</property>
+                                                                        <property name="hexpand">1</property>
+                                                                        <property name="width_request">200</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkLabel" id="sign_in_jid_error_label">
+                                                                        <property name="xalign">0</property>
+                                                                        <property name="margin-top">7</property>
+                                                                        <attributes>
+                                                                            <attribute name="scale" value="0.9"></attribute>
+                                                                        </attributes>
+                                                                    </object>
+                                                                </child>
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkLabel" id="sign_in_jid_error_label">
-                                                                <property name="xalign">0</property>
-                                                                <property name="margin-top">7</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkBox">
+                                                                <child>
+                                                                    <object class="GtkButton" id="sign_in_jid_serverlist_button">
+                                                                        <property name="label" translatable="1">Create account</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkButton" id="sign_in_jid_continue_button">
+                                                                        <property name="halign">end</property>
+                                                                        <property name="hexpand">True</property>
+                                                                        <property name="sensitive">0</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
+                                                                        <child>
+                                                                            <object class="GtkStack" id="sign_in_jid_continue_stack">
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">label</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkLabel">
+                                                                                                <property name="label" translatable="1">Next</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">spinner</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkSpinner">
+                                                                                                <property name="spinning">True</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                            </object>
+                                                                        </child>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
+                                                    </object>
+                                                </property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkStackPage">
+                                                <property name="name">tls_error</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="sign_in_tls_box">
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="margin-top">30</property>
+                                                        <property name="margin-bottom">20</property>
+                                                        <property name="margin-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="spacing">20</property>
+                                                        <child>
+                                                            <object class="GtkImage">
+                                                                <property name="icon-name">channel-insecure-symbolic</property>
+                                                                <property name="pixel-size">72</property>
+                                                                <property name="margin-top">10</property>
+                                                                <style>
+                                                                    <class name="dim-label"/>
+                                                                </style>
+                                                            </object>
+                                                        </child>
+                                                        <child>
+                                                            <object class="GtkLabel">
+                                                                <property name="label" translatable="1">Could not establish a secure connection</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="0.9"/>
+                                                                    <attribute name="scale" value="1.1"></attribute>
                                                                 </attributes>
                                                             </object>
                                                         </child>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="orientation">horizontal</property>
-                                                        <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_jid_serverlist_button">
-                                                                <property name="label" translatable="yes">Create account</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkLabel" id="sign_in_tls_label">
+                                                                <property name="justify">fill</property>
+                                                                <property name="wrap">1</property>
+                                                                <property name="use-markup">1</property>
+                                                                <property name="hexpand">1</property>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_jid_continue_button">
-                                                                <property name="sensitive">False</property>
-                                                                <property name="can_default">True</property>
-                                                                <property name="visible">True</property>
-                                                                <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
-                                                                </style>
+                                                            <object class="GtkBox">
                                                                 <child>
-                                                                    <object class="GtkStack" id="sign_in_jid_continue_stack">
-                                                                        <property name="visible">True</property>
-                                                                        <child>
-                                                                            <object class="GtkLabel">
-                                                                                <property name="label" translatable="yes">Next</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">label</property>
-                                                                            </packing>
-                                                                        </child>
-                                                                        <child>
-                                                                            <object class="GtkSpinner">
-                                                                                <property name="active">True</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">spinner</property>
-                                                                            </packing>
-                                                                        </child>
+                                                                    <object class="GtkButton" id="sign_in_tls_back_button">
+                                                                        <property name="label" translatable="1">Back</property>
                                                                     </object>
-
                                                                 </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">end</property>
-                                                            </packing>
                                                         </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">login_jid</property>
-                                            </packing>
                                         </child>
                                         <child>
-                                            <object class="GtkBox" id="sign_in_tls_box">
-                                                <property name="orientation">vertical</property>
-                                                <property name="margin-top">30</property>
-                                                <property name="margin-bottom">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="spacing">20</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkImage">
-                                                        <property name="visible">True</property>
-                                                        <property name="icon-name">channel-insecure-symbolic</property>
-                                                        <property name="icon-size">4</property>
-                                                        <property name="pixel-size">72</property>
-                                                        <property name="margin-top">10</property>
-                                                        <style>
-                                                            <class name="dim-label"/>
-                                                        </style>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">Could not establish a secure connection</property>
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.1"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel" id="sign_in_tls_label">
-                                                        <property name="justify">fill</property>
-                                                        <property name="wrap">True</property>
-                                                        <property name="use-markup">True</property>
-                                                        <property name="hexpand">True</property>
-                                                        <property name="visible">True</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="orientation">horizontal</property>
-                                                        <property name="visible">True</property>
+                                            <object class="GtkStackPage">
+                                                <property name="name">login_password</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="sign_in_password_box">
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="margin-start">20</property>
+                                                        <property name="margin-end">20</property>
+                                                        <property name="margin-top">20</property>
+                                                        <property name="margin-bottom">20</property>
+                                                        <property name="margin-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="spacing">20</property>
+                                                        <child>
+                                                            <object class="GtkLabel" id="sign_in_password_title">
+                                                                <attributes>
+                                                                    <attribute name="scale" value="1.3"></attribute>
+                                                                </attributes>
+                                                            </object>
+                                                        </child>
+                                                        <child>
+                                                            <object class="GtkBox">
+                                                                <property name="orientation">vertical</property>
+                                                                <child>
+                                                                    <object class="GtkLabel">
+                                                                        <property name="label" translatable="1">Password</property>
+                                                                        <property name="xalign">0</property>
+                                                                        <property name="margin-top">7</property>
+                                                                        <attributes>
+                                                                            <attribute name="scale" value="0.9"></attribute>
+                                                                        </attributes>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkEntry" id="password_entry">
+                                                                        <property name="activates_default">1</property>
+                                                                        <property name="hexpand">1</property>
+                                                                        <property name="input_purpose">password</property>
+                                                                        <property name="width_request">200</property>
+                                                                        <property name="visibility">0</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkLabel" id="sign_in_password_error_label">
+                                                                        <property name="xalign">0</property>
+                                                                        <property name="margin-top">7</property>
+                                                                        <attributes>
+                                                                            <attribute name="scale" value="0.9"></attribute>
+                                                                        </attributes>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_tls_back_button">
-                                                                <property name="label" translatable="yes">Back</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkBox">
+                                                                <child>
+                                                                    <object class="GtkButton" id="sign_in_password_back_button">
+                                                                        <property name="label" translatable="1">Back</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkButton" id="sign_in_password_continue_button">
+                                                                        <property name="halign">end</property>
+                                                                        <property name="hexpand">True</property>
+                                                                        <property name="sensitive">0</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
+                                                                        <child>
+                                                                            <object class="GtkStack" id="sign_in_password_continue_stack">
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">label</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkLabel">
+                                                                                                <property name="label" translatable="1">Connect</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">spinner</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkSpinner">
+                                                                                                <property name="spinning">True</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                            </object>
+                                                                        </child>
+                                                                    </object>
+                                                                </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">tls_error</property>
-                                            </packing>
                                         </child>
                                         <child>
-                                            <object class="GtkBox" id="sign_in_password_box">
-                                                <property name="orientation">vertical</property>
-                                                <property name="margin">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="spacing">20</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkLabel" id="sign_in_password_title">
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
+                                            <object class="GtkStackPage">
+                                                <property name="name">server</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="create_account_box">
                                                         <property name="orientation">vertical</property>
-                                                        <property name="visible">True</property>
+                                                        <property name="margin-start">20</property>
+                                                        <property name="margin-end">20</property>
+                                                        <property name="margin-top">20</property>
+                                                        <property name="margin-bottom">20</property>
+                                                        <property name="margin-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <child>
+                                                            <object class="GtkLabel">
+                                                                <property name="label" translatable="1">Create account</property>
+                                                                <property name="margin-bottom">20</property>
+                                                                <attributes>
+                                                                    <attribute name="scale" value="1.3"></attribute>
+                                                                </attributes>
+                                                            </object>
+                                                        </child>
                                                         <child>
                                                             <object class="GtkLabel">
-                                                                <property name="label" translatable="yes">Password</property>
                                                                 <property name="xalign">0</property>
-                                                                <property name="margin-top">7</property>
-                                                                <property name="visible">True</property>
+                                                                <property name="label" translatable="1">Choose a public server</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="0.9"/>
+                                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                                                 </attributes>
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkEntry" id="password_entry">
-                                                                <property name="activates_default">True</property>
-                                                                <property name="hexpand">True</property>
-                                                                <property name="input_purpose">password</property>
-                                                                <property name="width_request">200</property>
-                                                                <property name="visible">True</property>
-                                                                <property name="visibility">False</property>
+                                                            <object class="GtkFrame">
+                                                                <property name="child">
+                                                                    <object class="GtkScrolledWindow">
+                                                                        <property name="max_content_height">300</property>
+                                                                        <property name="propagate_natural_height">1</property>
+                                                                        <property name="hscrollbar_policy">never</property>
+                                                                        <property name="child">
+                                                                            <object class="GtkListBox" id="server_list_box"/>
+                                                                        </property>
+                                                                    </object>
+                                                                </property>
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkLabel" id="sign_in_password_error_label">
+                                                            <object class="GtkLabel">
                                                                 <property name="xalign">0</property>
-                                                                <property name="margin-top">7</property>
-                                                                <property name="visible">True</property>
+                                                                <property name="margin-top">20</property>
+                                                                <property name="label" translatable="1">Or specify a server address</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="0.9"/>
+                                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                                                 </attributes>
                                                             </object>
                                                         </child>
-                                                        <!--<child>-->
-                                                            <!--<object class="GtkLabel">-->
-                                                                <!--<property name="label" translatable="yes">Local alias</property>-->
-                                                                <!--<property name="xalign">0</property>-->
-                                                                <!--<property name="margin-top">7</property>-->
-                                                                <!--<property name="visible">True</property>-->
-                                                                <!--<attributes>-->
-                                                                    <!--<attribute name="scale" value="0.9"/>-->
-                                                                <!--</attributes>-->
-                                                            <!--</object>-->
-                                                        <!--</child>-->
-                                                        <!--<child>-->
-                                                            <!--<object class="GtkEntry" id="alias_entry">-->
-                                                                <!--<property name="activates_default">True</property>-->
-                                                                <!--<property name="hexpand">True</property>-->
-                                                                <!--<property name="width_request">200</property>-->
-                                                                <!--<property name="visible">True</property>-->
-                                                            <!--</object>-->
-                                                        <!--</child>-->
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="orientation">horizontal</property>
-                                                        <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_password_back_button">
-                                                                <property name="label" translatable="yes">Back</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkEntry" id="server_entry">
+                                                                <property name="activates_default">1</property>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_password_continue_button">
-                                                                <property name="sensitive">False</property>
-                                                                <property name="can_default">True</property>
-                                                                <property name="visible">True</property>
-                                                                <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
-                                                                </style>
+                                                            <object class="GtkBox">
+                                                                <property name="margin-top">30</property>
                                                                 <child>
-                                                                    <object class="GtkStack" id="sign_in_password_continue_stack">
-                                                                        <property name="visible">True</property>
-                                                                        <child>
-                                                                            <object class="GtkLabel">
-                                                                                <property name="label" translatable="yes">Connect</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">label</property>
-                                                                            </packing>
-                                                                        </child>
+                                                                    <object class="GtkButton" id="login_button">
+                                                                        <property name="label" translatable="1">Sign in instead</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkButton" id="select_server_continue">
+                                                                        <property name="halign">end</property>
+                                                                        <property name="hexpand">True</property>
+                                                                        <property name="sensitive">0</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
                                                                         <child>
-                                                                            <object class="GtkSpinner">
-                                                                                <property name="active">True</property>
-                                                                                <property name="visible">True</property>
+                                                                            <object class="GtkStack" id="select_server_continue_stack">
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">label</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkLabel">
+                                                                                                <property name="label" translatable="1">Next</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">spinner</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkSpinner">
+                                                                                                <property name="spinning">True</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
                                                                             </object>
-                                                                            <packing>
-                                                                                <property name="name">spinner</property>
-                                                                            </packing>
                                                                         </child>
                                                                     </object>
-
                                                                 </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">end</property>
-                                                            </packing>
                                                         </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">login_password</property>
-                                            </packing>
                                         </child>
                                         <child>
-                                            <object class="GtkBox" id="create_account_box">
-                                                <property name="orientation">vertical</property>
-                                                <property name="margin">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">Create account</property>
+                                            <object class="GtkStackPage">
+                                                <property name="name">form</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="register_box">
+                                                        <property name="margin-start">20</property>
+                                                        <property name="margin-end">20</property>
+                                                        <property name="margin-top">20</property>
                                                         <property name="margin-bottom">20</property>
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="visible">True</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">Choose a public server</property>
-                                                        <attributes>
-                                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkFrame">
-                                                        <property name="visible">True</property>
+                                                        <property name="margin-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="orientation">vertical</property>
                                                         <child>
-                                                            <object class="GtkScrolledWindow">
-                                                                <property name="max_content_height">300</property>
-                                                                <property name="propagate_natural_height">True</property>
-                                                                <property name="hscrollbar_policy">never</property>
-                                                                <property name="visible">True</property>
-                                                                <child>
-                                                                    <object class="GtkListBox" id="server_list_box">
-                                                                        <property name="visible">True</property>
-                                                                    </object>
-                                                                </child>
+                                                            <object class="GtkLabel" id="register_title">
+                                                                <property name="margin-bottom">10</property>
+                                                                <attributes>
+                                                                    <attribute name="scale" value="1.3"></attribute>
+                                                                </attributes>
                                                             </object>
                                                         </child>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="visible">True</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="margin-top">20</property>
-                                                        <property name="label" translatable="yes">Or specify a server address</property>
-                                                        <attributes>
-                                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkEntry" id="server_entry">
-                                                        <property name="activates_default">True</property>
-                                                        <property name="can_default">True</property>
-                                                        <property name="visible">True</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="visible">True</property>
-                                                        <property name="margin-top">30</property>
-                                                        <property name="orientation">horizontal</property>
                                                         <child>
-                                                            <object class="GtkButton" id="login_button">
-                                                                <property name="label" translatable="yes">Sign in instead</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkBox" id="form_box">
+                                                                <property name="orientation">vertical</property>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkButton" id="select_server_continue">
-                                                                <property name="sensitive">False</property>
-                                                                <property name="can_default">True</property>
-                                                                <property name="visible">True</property>
-                                                                <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
-                                                                </style>
+                                                            <object class="GtkBox">
+                                                                <property name="margin-top">30</property>
                                                                 <child>
-                                                                    <object class="GtkStack" id="select_server_continue_stack">
-                                                                        <property name="visible">True</property>
-                                                                        <child>
-                                                                            <object class="GtkLabel">
-                                                                                <property name="label" translatable="yes">Next</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">label</property>
-                                                                            </packing>
-                                                                        </child>
+                                                                    <object class="GtkButton" id="register_form_back">
+                                                                        <property name="label" translatable="1">Pick another server</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkButton" id="register_form_continue">
+                                                                        <property name="halign">end</property>
+                                                                        <property name="hexpand">True</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
                                                                         <child>
-                                                                            <object class="GtkSpinner">
-                                                                                <property name="active">True</property>
-                                                                                <property name="visible">True</property>
+                                                                            <object class="GtkStack" id="register_form_continue_stack">
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">label</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkLabel" id="register_form_continue_label">
+                                                                                                <property name="label" translatable="1">Next</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">spinner</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkSpinner">
+                                                                                                <property name="spinning">True</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
                                                                             </object>
-                                                                            <packing>
-                                                                                <property name="name">spinner</property>
-                                                                            </packing>
                                                                         </child>
                                                                     </object>
-
                                                                 </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">end</property>
-                                                            </packing>
                                                         </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">server</property>
-                                            </packing>
                                         </child>
                                         <child>
-                                            <object class="GtkBox" id="register_box">
-                                                <property name="margin">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="orientation">vertical</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkLabel" id="register_title">
+                                            <object class="GtkStackPage">
+                                                <property name="name">success</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="success_box">
+                                                        <property name="margin-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="margin-top">50</property>
+                                                        <property name="margin-bottom">50</property>
+                                                        <property name="margin-top">10</property>
                                                         <property name="margin-bottom">10</property>
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox" id="form_box">
                                                         <property name="orientation">vertical</property>
-                                                        <property name="visible">True</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="visible">True</property>
-                                                        <property name="margin-top">30</property>
-                                                        <property name="orientation">horizontal</property>
+                                                        <property name="valign">center</property>
                                                         <child>
-                                                            <object class="GtkButton" id="register_form_back">
-                                                                <property name="label" translatable="yes">Pick another server</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkImage">
+                                                                <property name="icon-name">dino-party-popper-symbolic</property>
+                                                                <property name="pixel-size">72</property>
+                                                                <property name="margin-bottom">10</property>
+                                                                <style>
+                                                                    <class name="dim-label"/>
+                                                                </style>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkButton" id="register_form_continue">
-                                                                <property name="can_default">True</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkLabel">
+                                                                <property name="label" translatable="1">All set up!</property>
+                                                                <attributes>
+                                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
+                                                                    <attribute name="scale" value="1.3"></attribute>
+                                                                </attributes>
                                                                 <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
+                                                                    <class name="dim-label"/>
                                                                 </style>
-                                                                <child>
-                                                                    <object class="GtkStack" id="register_form_continue_stack">
-                                                                        <property name="visible">True</property>
-                                                                        <child>
-                                                                            <object class="GtkLabel" id="register_form_continue_label">
-                                                                                <property name="label" translatable="yes">Next</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">label</property>
-                                                                            </packing>
-                                                                        </child>
-                                                                        <child>
-                                                                            <object class="GtkSpinner">
-                                                                                <property name="active">True</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">spinner</property>
-                                                                            </packing>
-                                                                        </child>
-                                                                    </object>
-                                                                </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">end</property>
-                                                            </packing>
                                                         </child>
-                                                    </object>
-                                                </child>
-                                            </object>
-                                            <packing>
-                                                <property name="name">form</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkBox" id="success_box">
-                                                <property name="margin">50</property>
-                                                <property name="margin-top">10</property>
-                                                <property name="margin-bottom">10</property>
-                                                <property name="orientation">vertical</property>
-                                                <property name="valign">center</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkImage">
-                                                        <property name="visible">True</property>
-                                                        <property name="icon-name">dino-party-popper-symbolic</property>
-                                                        <property name="icon-size">4</property>
-                                                        <property name="pixel-size">72</property>
-                                                        <property name="margin-bottom">10</property>
-                                                        <style>
-                                                            <class name="dim-label"/>
-                                                        </style>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">All set up!</property>
-                                                        <property name="xalign">0.5</property>
-                                                        <property name="yalign">0.5</property>
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                        <style>
-                                                            <class name="dim-label"/>
-                                                        </style>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel" id="success_description">
-                                                        <property name="wrap">True</property>
-                                                        <property name="margin">5</property>
-                                                        <property name="xalign">0.5</property>
-                                                        <property name="yalign">0.5</property>
-                                                        <property name="use-markup">True</property>
-                                                        <property name="justify">center</property>
-                                                        <property name="visible">True</property>
-                                                        <style>
-                                                            <class name="dim-label"/>
-                                                        </style>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="orientation">horizontal</property>
-                                                        <property name="halign">center</property>
-                                                        <property name="margin-top">20</property>
-                                                        <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkButton" id="success_continue_button">
-                                                                <property name="can_default">True</property>
-                                                                <property name="label" translatable="yes">Finish</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkLabel" id="success_description">
+                                                                <property name="wrap">1</property>
+                                                                <property name="margin-start">5</property>
+                                                                <property name="margin-end">5</property>
+                                                                <property name="margin-top">5</property>
+                                                                <property name="margin-bottom">5</property>
+                                                                <property name="use-markup">1</property>
+                                                                <property name="justify">center</property>
                                                                 <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
+                                                                    <class name="dim-label"/>
                                                                 </style>
                                                             </object>
                                                         </child>
+                                                        <child>
+                                                            <object class="GtkBox">
+                                                                <property name="halign">center</property>
+                                                                <property name="margin-top">20</property>
+                                                                <child>
+                                                                    <object class="GtkButton" id="success_continue_button">
+                                                                        <property name="label" translatable="1">Finish</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">success</property>
-                                            </packing>
                                         </child>
                                     </object>
                                 </child>
                             </object>
-                            <packing>
-                                <property name="index">-1</property>
-                            </packing>
-                        </child>
+                        </property>
                         <child type="overlay">
                             <object class="GtkRevealer" id="notification_revealer">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="halign">center</property>
                                 <property name="valign">start</property>
-                                <child>
+                                <property name="child">
                                     <object class="GtkFrame" id="frame2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label_xalign">0</property>
-                                        <property name="shadow_type">none</property>
+<!--                                        <property name="shadow_type">none</property>-->
                                         <style>
                                             <class name="app-notification"/>
                                         </style>
-                                        <child>
+                                        <property name="child">
                                             <object class="GtkBox" id="box2">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="spacing">20</property>
                                                 <child>
-                                                    <object class="GtkLabel" id="notification_label">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                    </object>
-                                                    <packing>
-                                                        <property name="expand">False</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">0</property>
-                                                    </packing>
+                                                    <object class="GtkLabel" id="notification_label"/>
                                                 </child>
                                             </object>
-                                        </child>
+                                        </property>
                                         <child type="label_item">
                                             <placeholder/>
                                         </child>
                                     </object>
-                                </child>
+                                </property>
                             </object>
                         </child>
                     </object>
@@ -642,4 +550,4 @@
             </object>
         </child>
     </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/main/data/manage_accounts/dialog.ui b/main/data/manage_accounts/dialog.ui
index 8d50d449..9077c69e 100644
--- a/main/data/manage_accounts/dialog.ui
+++ b/main/data/manage_accounts/dialog.ui
@@ -1,78 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiManageAccountsDialog">
+        <property name="title" translatable="1">Accounts</property>
         <property name="width-request">700</property>
         <property name="height-request">400</property>
         <property name="modal">True</property>
         <child type="titlebar">
-            <object class="GtkHeaderBar">
-                <property name="title" translatable="yes">Accounts</property>
-                <property name="show_close_button">True</property>
-                <property name="visible">True</property>
-            </object>
+            <object class="GtkHeaderBar"/>
         </child>
-        <child internal-child="vbox">
-            <object class="GtkBox">
-                <property name="visible">True</property>
+        <child internal-child="content_area">
+        <object class="GtkBox">
+            <property name="visible">True</property>
+            <child>
+            <object class="GtkStack" id="main_stack">
                 <child>
-                    <object class="GtkStack" id="main_stack">
-                    <property name="visible">True</property>
-                        <child>
+                    <object class="GtkStackPage">
+                        <property name="name">accounts_exist</property>
+                        <property name="child">
                             <object class="GtkBox">
-                                <property name="can_focus">True</property>
-                                <property name="expand">True</property>
-                                <property name="visible">True</property>
+                                <property name="focusable">1</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
                                 <child>
                                     <object class="GtkBox">
-                                        <property name="expand">True</property>
-                                        <property name="orientation">horizontal</property>
-                                        <property name="margin">15</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="vexpand">True</property>
+                                        <property name="margin-start">15</property>
+                                        <property name="margin-end">15</property>
+                                        <property name="margin-top">15</property>
+                                        <property name="margin-bottom">15</property>
                                         <property name="spacing">20</property>
-                                        <property name="visible">True</property>
                                         <child>
                                             <object class="GtkBox">
                                                 <property name="orientation">vertical</property>
                                                 <property name="width-request">250</property>
-                                                <property name="vexpand">True</property>
-                                                <property name="hexpand">False</property>
-                                                <property name="visible">True</property>
+                                                <property name="vexpand">1</property>
+                                                <property name="hexpand">0</property>
                                                 <child>
                                                     <object class="GtkScrolledWindow">
-                                                        <property name="shadow-type">in</property>
-                                                        <property name="expand">True</property>
-                                                        <property name="visible">True</property>
-                                                        <child>
+<!--                                                        <property name="shadow-type">in</property>-->
+                                                        <property name="hexpand">1</property>
+                                                        <property name="vexpand">1</property>
+                                                        <property name="child">
                                                             <object class="GtkBox">
                                                                 <property name="orientation">vertical</property>
-                                                                <property name="visible">True</property>
                                                                 <child>
                                                                     <object class="GtkListBox" id="account_list">
-                                                                        <property name="expand">True</property>
-                                                                        <property name="visible">True</property>
+                                                                        <property name="hexpand">1</property>
+                                                                        <property name="vexpand">1</property>
                                                                     </object>
                                                                 </child>
                                                             </object>
-                                                        </child>
+                                                        </property>
                                                     </object>
                                                 </child>
                                                 <child>
-                                                    <object class="GtkToolbar">
+                                                    <object class="GtkBox">
+                                                        <property name="css-classes">toolbar</property>
                                                         <style>
                                                             <class name="inline-toolbar"/>
                                                         </style>
-                                                        <property name="icon-size">menu</property>
-                                                        <property name="toolbar-style">icons</property>
-                                                        <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkToolButton" id="add_account_button">
+                                                            <object class="GtkButton" id="add_account_button">
                                                                 <property name="icon-name">list-add-symbolic</property>
-                                                                <property name="visible">True</property>
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkToolButton" id="remove_account_button">
+                                                            <object class="GtkButton" id="remove_account_button">
                                                                 <property name="icon-name">list-remove-symbolic</property>
-                                                                <property name="visible">True</property>
                                                             </object>
                                                         </child>
                                                     </object>
@@ -81,23 +77,19 @@
                                         </child>
                                         <child>
                                             <object class="GtkGrid" id="settings_list">
-                                                <property name="expand">True</property>
+                                                <property name="hexpand">1</property>
+                                                <property name="vexpand">1</property>
                                                 <property name="column-spacing">10</property>
                                                 <property name="row-spacing">5</property>
-                                                <property name="visible">True</property>
                                                 <child>
                                                     <object class="GtkBox">
-                                                        <property name="visible">True</property>
                                                         <property name="halign">end</property>
                                                         <child>
-                                                            <object class="GtkBox">
-                                                                <property name="visible">True</property>
-                                                            </object>
+                                                            <object class="GtkBox"/>
                                                         </child>
                                                         <child>
                                                             <object class="GtkButton" id="image_button">
-                                                                <property name="relief">none</property>
-                                                                <property name="visible">True</property>
+                                                                <property name="has-frame">False</property>
                                                                 <style>
                                                                     <class name="image-button"/>
                                                                 </style>
@@ -105,145 +97,124 @@
                                                                     <object class="DinoUiAvatarImage" id="image">
                                                                         <property name="height">50</property>
                                                                         <property name="width">50</property>
-                                                                        <property name="xalign">1</property>
-                                                                        <property name="visible">True</property>
+<!--                                                                        <property name="xalign">1</property>-->
                                                                         <property name="allow_gray">False</property>
                                                                     </object>
                                                                 </child>
                                                             </object>
                                                         </child>
+                                                        <layout>
+                                                            <property name="column">0</property>
+                                                            <property name="row">0</property>
+                                                            <property name="row-span">2</property>
+                                                        </layout>
                                                     </object>
-                                                    <packing>
-                                                        <property name="left_attach">0</property>
-                                                        <property name="top_attach">0</property>
-                                                        <property name="width">1</property>
-                                                        <property name="height">2</property>
-                                                    </packing>
                                                 </child>
                                                 <child>
                                                     <object class="GtkLabel" id="jid_label">
                                                         <property name="xalign">0</property>
                                                         <property name="yalign">1</property>
-                                                        <property name="visible">True</property>
                                                         <attributes>
-                                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                                         </attributes>
+                                                        <layout>
+                                                            <property name="column">1</property>
+                                                            <property name="row">0</property>
+                                                        </layout>
                                                     </object>
-                                                    <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="top_attach">0</property>
-                                                        <property name="width">1</property>
-                                                        <property name="height">1</property>
-                                                    </packing>
                                                 </child>
                                                 <child>
                                                     <object class="GtkLabel" id="state_label">
                                                         <property name="xalign">0</property>
                                                         <property name="yalign">0</property>
-                                                        <property name="visible">True</property>
                                                         <style>
                                                             <class name="dim-label"/>
                                                         </style>
+                                                        <layout>
+                                                            <property name="column">1</property>
+                                                            <property name="row">1</property>
+                                                        </layout>
                                                     </object>
-                                                    <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="top_attach">1</property>
-                                                        <property name="width">1</property>
-                                                        <property name="height">1</property>
-                                                    </packing>
                                                 </child>
                                                 <child>
                                                     <object class="GtkSwitch" id="active_switch">
-                                                        <property name="visible">True</property>
                                                         <property name="halign">end</property>
                                                         <property name="valign">center</property>
+                                                        <layout>
+                                                            <property name="column">2</property>
+                                                            <property name="row">0</property>
+                                                            <property name="row-span">2</property>
+                                                        </layout>
                                                     </object>
-                                                    <packing>
-                                                        <property name="left_attach">2</property>
-                                                        <property name="top_attach">0</property>
-                                                        <property name="width">1</property>
-                                                        <property name="height">2</property>
-                                                    </packing>
                                                 </child>
                                                 <child>
                                                     <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">Password</property>
+                                                        <property name="label" translatable="1">Password</property>
                                                         <property name="xalign">1</property>
-                                                        <property name="visible">True</property>
                                                         <style>
                                                             <class name="dim-label"/>
                                                         </style>
+                                                        <layout>
+                                                            <property name="column">0</property>
+                                                            <property name="row">2</property>
+                                                        </layout>
                                                     </object>
-                                                    <packing>
-                                                        <property name="left_attach">0</property>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="width">1</property>
-                                                        <property name="height">1</property>
-                                                    </packing>
                                                 </child>
                                                 <child>
                                                     <object class="DinoUiUtilEntryLabelHybrid" id="password_hybrid">
                                                         <property name="xalign">0</property>
                                                         <property name="width_request">200</property>
                                                         <property name="visibility">False</property>
-                                                        <property name="visible">True</property>
+                                                        <layout>
+                                                            <property name="column">1</property>
+                                                            <property name="row">2</property>
+                                                            <property name="column-span">2</property>
+                                                        </layout>
                                                     </object>
-                                                    <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="top_attach">2</property>
-                                                        <property name="width">2</property>
-                                                        <property name="height">1</property>
-                                                    </packing>
                                                 </child>
                                                 <child>
                                                     <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">Local alias</property>
+                                                        <property name="label" translatable="1">Local alias</property>
                                                         <property name="xalign">1</property>
-                                                        <property name="visible">True</property>
                                                         <style>
                                                             <class name="dim-label"/>
                                                         </style>
+                                                        <layout>
+                                                            <property name="column">0</property>
+                                                            <property name="row">3</property>
+                                                        </layout>
                                                     </object>
-                                                    <packing>
-                                                        <property name="left_attach">0</property>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="width">1</property>
-                                                        <property name="height">1</property>
-                                                    </packing>
                                                 </child>
                                                 <child>
                                                     <object class="DinoUiUtilEntryLabelHybrid" id="alias_hybrid">
                                                         <property name="xalign">0</property>
                                                         <property name="width_request">200</property>
-                                                        <property name="visible">True</property>
+`                                                       <layout>
+                                                            <property name="column">1</property>
+                                                            <property name="row">3</property>
+                                                            <property name="column-span">2</property>
+                                                        </layout>
                                                     </object>
-                                                    <packing>
-                                                        <property name="left_attach">1</property>
-                                                        <property name="top_attach">3</property>
-                                                        <property name="width">2</property>
-                                                        <property name="height">1</property>
-                                                    </packing>
                                                 </child>
                                             </object>
                                         </child>
                                     </object>
                                 </child>
                             </object>
-                            <packing>
-                                <property name="name">accounts_exist</property>
-                            </packing>
-                        </child>
-                        <child>
+                        </property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkStackPage">
+                        <property name="name">no_accounts</property>
+                        <property name="child">
                             <object class="GtkBox">
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">10</property>
                                 <property name="valign">center</property>
-                                <property name="visible">True</property>
                                 <child>
                                     <object class="GtkImage">
-                                        <property name="visible">True</property>
                                         <property name="icon-name">system-users-symbolic</property>
-                                        <property name="icon-size">4</property>
                                         <property name="pixel-size">72</property>
                                         <style>
                                             <class name="dim-label"/>
@@ -252,10 +223,7 @@
                                 </child>
                                 <child>
                                     <object class="GtkLabel">
-                                        <property name="label" translatable="yes">No accounts configured</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">0.5</property>
-                                        <property name="visible">True</property>
+                                        <property name="label" translatable="1">No accounts configured</property>
                                         <style>
                                             <class name="dim-label"/>
                                         </style>
@@ -263,9 +231,8 @@
                                 </child>
                                 <child>
                                     <object class="GtkButton" id="no_accounts_add">
-                                        <property name="label" translatable="yes">Add an account</property>
+                                        <property name="label" translatable="1">Add an account</property>
                                         <property name="halign">center</property>
-                                        <property name="visible">True</property>
                                         <style>
                                             <class name="text-button"/>
                                             <class name="suggested-action"/>
@@ -273,13 +240,12 @@
                                     </object>
                                 </child>
                             </object>
-                            <packing>
-                                <property name="name">no_accounts</property>
-                            </packing>
-                        </child>
+                        </property>
                     </object>
                 </child>
             </object>
+            </child>
+        </object>
         </child>
     </template>
 </interface>
diff --git a/main/data/menu_encryption.ui b/main/data/menu_encryption.ui
index 9e63b17d..5f478fe2 100644
--- a/main/data/menu_encryption.ui
+++ b/main/data/menu_encryption.ui
@@ -2,32 +2,21 @@
 <interface>
     <requires lib="gtk+" version="3.16"/>
     <object class="GtkPopoverMenu" id="menu_encryption">
-        <property name="can_focus">False</property>
-        <child>
+        <property name="child">
             <object class="GtkBox" id="encryption_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
-                <property name="margin">10</property>
+                <property name="margin-start">10</property>
+                <property name="margin-end">10</property>
+                <property name="margin-top">10</property>
+                <property name="margin-bottom">10</property>
                 <child>
-                    <object class="GtkRadioButton" id="button_unencrypted">
-                        <property name="label" translatable="yes">Unencrypted</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                    <object class="GtkCheckButton" id="button_unencrypted">
+                        <property name="label" translatable="1">Unencrypted</property>
+                        <property name="focusable">1</property>
+                        <property name="active">1</property>
                     </object>
-                    <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                    </packing>
                 </child>
             </object>
-            <packing>
-                <property name="submenu">main</property>
-            </packing>
-        </child>
+        </property>
     </object>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/main/data/message_item_widget_edit_mode.ui b/main/data/message_item_widget_edit_mode.ui
index b33d8aa3..907dbbf0 100644
--- a/main/data/message_item_widget_edit_mode.ui
+++ b/main/data/message_item_widget_edit_mode.ui
@@ -6,27 +6,21 @@
         <property name="spacing">5</property>
         <property name="margin_top">5</property>
         <property name="margin_bottom">5</property>
-        <property name="visible">True</property>
         <child>
             <object class="GtkFrame" id="frame">
-                <property name="visible">True</property>
                 <style>
                     <class name="dino-chatinput"/>
                 </style>
                 <child>
                     <object class="GtkBox">
-                        <property name="visible">True</property>
                         <child>
-                            <object class="DinoUiChatTextView" id="chat_text_view">
-                                <property name="visible">True</property>
-                            </object>
+                            <object class="DinoUiChatTextView" id="chat_text_view" />
                         </child>
                         <child>
                             <object class="GtkMenuButton" id="emoji_button">
-                                <property name="relief">none</property>
+                                <property name="has-frame">False</property>
                                 <property name="margin-top">3</property>
                                 <property name="valign">start</property>
-                                <property name="visible">True</property>
                                 <style>
                                     <class name="dino-chatinput-button"/>
                                     <class name="flat"/>
@@ -35,7 +29,6 @@
                                     <object class="GtkImage">
                                         <property name="icon-name">dino-emoticon-symbolic</property>
                                         <property name="icon-size">1</property>
-                                        <property name="visible">True</property>
                                     </object>
                                 </child>
                             </object>
@@ -48,17 +41,14 @@
             <object class="GtkBox">
                 <property name="spacing">5</property>
                 <property name="halign">end</property>
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkButton" id="cancel_button">
                         <property name="label" translatable="yes">Cancel</property>
-                        <property name="visible">True</property>
                     </object>
                 </child>
                 <child>
                     <object class="GtkButton" id="send_button">
                         <property name="label" translatable="yes">Update message</property>
-                        <property name="visible">True</property>
                         <style>
                             <class name="suggested-action"/>
                         </style>
diff --git a/main/data/occupant_list.ui b/main/data/occupant_list.ui
index d899eb5f..6cbf5910 100644
--- a/main/data/occupant_list.ui
+++ b/main/data/occupant_list.ui
@@ -2,30 +2,23 @@
 <interface>
     <requires lib="gtk+" version="3.22"/>
     <template class="DinoUiOccupantMenuList">
-        <property name="visible">True</property>
         <child>
             <object class="GtkBox">
                 <property name="orientation">vertical</property>
-                <property name="visible">True</property>
                 <child>
-                    <object class="GtkToolItem">
-                        <property name="visible">True</property>
-                        <child>
-                            <object class="GtkSearchEntry" id="search_entry">
-                                <property name="margin">8</property>
-                                <property name="visible">True</property>
-                            </object>
-                        </child>
+                    <object class="GtkSearchEntry" id="search_entry">
+                        <property name="margin_top">8</property>
+                        <property name="margin_bottom">8</property>
+                        <property name="margin_start">8</property>
+                        <property name="margin_end">8</property>
                     </object>
                 </child>
                 <child>
                     <object class="GtkScrolledWindow">
                         <property name="max_content_height">500</property>
                         <property name="propagate_natural_height">True</property>
-                        <property name="visible">True</property>
                         <child>
                             <object class="GtkListBox" id="list_box">
-                                <property name="visible">True</property>
                             </object>
                         </child>
                     </object>
diff --git a/main/data/occupant_list_item.ui b/main/data/occupant_list_item.ui
index e2b35ad6..1915aee6 100644
--- a/main/data/occupant_list_item.ui
+++ b/main/data/occupant_list_item.ui
@@ -1,45 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiOccupantMenuListRow" parent="GtkListBoxRow">
-        <property name="visible">True</property>
+    <requires lib="gtk" version="4.0"/>
+    <object class="GtkGrid" id="main_grid">
+        <property name="margin-top">3</property>
+        <property name="margin-start">7</property>
+        <property name="margin-bottom">3</property>
+        <property name="margin-end">7</property>
+        <property name="column-spacing">10</property>
         <child>
-            <object class="GtkGrid">
-                <property name="orientation">horizontal</property>
-                <property name="margin-top">3</property>
-                <property name="margin-left">7</property>
-                <property name="margin-bottom">3</property>
-                <property name="margin-right">7</property>
-                <property name="column-spacing">10</property>
-                <property name="visible">True</property>
-                <child>
-                    <object class="DinoUiAvatarImage" id="image">
-                        <property name="height">30</property>
-                        <property name="width">30</property>
-                        <property name="visible">True</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkGrid">
-                        <property name="orientation">vertical</property>
-                        <property name="visible">True</property>
-                        <child>
-                            <object class="GtkLabel" id="name_label">
-                                <property name="max_width_chars">1</property>
-                                <property name="ellipsize">end</property>
-                                <property name="expand">True</property>
-                                <property name="xalign">0</property>
-                                <property name="visible">True</property>
-                            </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
-                        </child>
-                    </object>
-                </child>
+            <object class="DinoUiAvatarImage" id="image">
+                <property name="height">30</property>
+                <property name="width">30</property>
             </object>
         </child>
-    </template>
-</interface>
+        <child>
+            <object class="GtkLabel" id="name_label">
+                <property name="max_width_chars">1</property>
+                <property name="ellipsize">end</property>
+                <property name="hexpand">1</property>
+                <property name="xalign">0</property>
+                <layout>
+                    <property name="column">1</property>
+                    <property name="row">0</property>
+                </layout>
+            </object>
+        </child>
+    </object>
+</interface>
\ No newline at end of file
diff --git a/main/data/search_autocomplete.ui b/main/data/search_autocomplete.ui
index 94ec5d7f..5146ac5a 100644
--- a/main/data/search_autocomplete.ui
+++ b/main/data/search_autocomplete.ui
@@ -5,18 +5,17 @@
         <property name="visible">True</property>
         <child>
             <object class="DinoUiAvatarImage" id="image">
-                <property name="margin">4</property>
+                <property name="margin-top">4</property>
+                <property name="margin-bottom">4</property>
                 <property name="margin-start">6</property>
                 <property name="margin-end">6</property>
                 <property name="height">24</property>
                 <property name="width">24</property>
-                <property name="visible">True</property>
                 <property name="allow_gray">False</property>
             </object>
         </child>
         <child>
             <object class="GtkLabel" id="label">
-                <property name="visible">True</property>
                 <property name="ellipsize">end</property>
             </object>
         </child>
diff --git a/main/data/settings_dialog.ui b/main/data/settings_dialog.ui
index d5b7ac92..84d56c1d 100644
--- a/main/data/settings_dialog.ui
+++ b/main/data/settings_dialog.ui
@@ -1,81 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <template class="DinoUiSettingsDialog">
+        <property name="title" translatable="yes">Settings</property>
         <property name="modal">True</property>
         <child type="titlebar">
             <object class="GtkHeaderBar">
-                <property name="title" translatable="yes">Settings</property>
-                <property name="show_close_button">True</property>
-                <property name="visible">True</property>
             </object>
         </child>
-        <child internal-child="vbox">
+        <child internal-child="content_area">
             <object class="GtkBox">
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkGrid">
-                        <property name="margin">10</property>
+                        <property name="margin_top">10</property>
+                        <property name="margin_bottom">10</property>
+                        <property name="margin_start">10</property>
+                        <property name="margin_end">10</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
                         <property name="row-spacing">10</property>
-                        <property name="visible">True</property>
                         <child>
                             <object class="GtkCheckButton" id="typing_checkbutton">
                                 <property name="label" translatable="yes">Send typing notifications</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">0</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkCheckButton" id="marker_checkbutton">
                                 <property name="label" translatable="yes">Send read receipts</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">1</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkCheckButton" id="notification_checkbutton">
                                 <property name="label" translatable="yes">Notify when a new message arrives</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">2</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkCheckButton" id="emoji_checkbutton">
                                 <property name="label" translatable="yes">Convert smileys to emojis</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">3</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkCheckButton" id="check_spelling_checkbutton">
                                 <property name="label" translatable="yes">Check spelling</property>
-                                <property name="visible">True</property>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">4</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">4</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                     </object>
                 </child>
diff --git a/main/data/theme.css b/main/data/theme.css
index 059585b7..3bdbb19f 100644
--- a/main/data/theme.css
+++ b/main/data/theme.css
@@ -27,8 +27,8 @@ window.dino-main .dino-conversation viewport /* Some themes set this */ {
 }
 
 @keyframes highlight {
-    from { background: alpha(@warning_color, 0.5) }
-    to { background: transparent }
+    from { background: alpha(@warning_color, 0.5); }
+    to { background: transparent; }
 }
 
 window.dino-main .dino-conversation .highlight-once {
@@ -38,10 +38,23 @@ window.dino-main .dino-conversation .highlight-once {
     animation-name: highlight;
 }
 
-window.dino-main .dino-conversation .message-box:hover {
+window.dino-main .dino-conversation .message-box.highlight {
     background: alpha(@theme_fg_color, 0.04);
 }
 
+window.dino-main .dino-conversation .message-box {
+    padding: 4px 15px 4px 15px;
+}
+
+window.dino-main .dino-conversation .message-box:not(.has-skeleton) {
+    padding-left: 58px;
+}
+
+window.dino-main .dino-conversation .message-box.has-skeleton.last-group-item {
+    padding-top: 8px;
+    padding-bottom: 8px;
+}
+
 window.dino-main .unread-count-notify {
     background-color: alpha(@theme_fg_color, 0.8);
     color: @theme_base_color;
@@ -142,7 +155,7 @@ window.dino-main .incoming-call-box {
 
 window.dino-main .multiparty-participants {
     border-top: 1px solid alpha(@theme_fg_color, 0.05);
-    background: alpha(@theme_fg_color, 0.04)
+    background: alpha(@theme_fg_color, 0.04);
 }
 
 window.dino-main .dino-sidebar > frame.collapsed {
@@ -171,34 +184,40 @@ window.dino-main .dino-chatinput frame box {
     background: transparent;
 }
 
-window.dino-main button.dino-attach-button {
-    min-width: 24px; /* Make button the same with as avatars */
+window.dino-main .dino-attach-button {
+    min-width: 24px; /* Make button the same width as avatars */
 }
 
-window.dino-main button.dino-chatinput-button {
+window.dino-main .dino-attach-button,
+window.dino-main .dino-chatinput-button button {
     border: none;
     background: transparent;
     box-shadow: none;
     min-height: 0;
     padding: 7px 5px;
-    color: alpha(@theme_fg_color, 0.6);
+    color: alpha(@theme_fg_color, 0.7);
     outline: none;
 }
 
-window.dino-main button.dino-chatinput-button:hover {
+window.dino-main .dino-attach-button:hover,
+window.dino-main .dino-chatinput-button button:hover {
     color: @theme_selected_bg_color;
 }
 
-window.dino-main button.dino-chatinput-button:backdrop {
+window.dino-main .dino-attach-button:backdrop,
+window.dino-main .dino-chatinput-button button:backdrop {
     color: alpha(@theme_unfocused_fg_color, 0.6);
 }
 
-window.dino-main button.dino-chatinput-button:active,
-window.dino-main button.dino-chatinput-button:checked {
+window.dino-main .dino-attach-button:active,
+window.dino-main .dino-attach-button:checked,
+window.dino-main .dino-chatinput-button button:active,
+window.dino-main .dino-chatinput-button button:checked {
     color: alpha(@theme_selected_bg_color, 0.8);
 }
 
-window.dino-main button.dino-chatinput-button:checked:backdrop {
+window.dino-main .dino-attach-button:backdrop,
+window.dino-main .dino-chatinput-button button:checked:backdrop {
     color: alpha(@theme_unfocused_selected_bg_color, 0.8);
 }
 
@@ -357,7 +376,7 @@ box.dino-input-error label.input-status-highlight-once {
 
 .dino-call-window .participant-name {
     color: white;
-    text-shadow: black;
+    text-shadow: 1px 1px 2px black;
 }
 
 .dino-call-window .text-no-controls {
diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui
index 03c206c1..3fb7b6e5 100644
--- a/main/data/unified_main_content.ui
+++ b/main/data/unified_main_content.ui
@@ -1,94 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <object class="GtkPaned" id="paned">
+        <property name="shrink-start-child">False</property>
+        <property name="shrink-end-child">False</property>
+        <property name="resize-start-child">False</property>
         <property name="position">300</property>
-        <property name="orientation">horizontal</property>
-        <property name="visible">True</property>
         <child>
             <object class="GtkStack" id="left_stack">
-                <property name="visible">True</property>
                 <child>
-                    <object class="GtkScrolledWindow" id="scrolled">
-                        <property name="expand">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="visible">True</property>
-                        <child>
-                            <object class="DinoUiConversationSelector" id="conversation_list">
-                                <property name="visible">True</property>
-                            </object>
-                        </child>
-                    </object>
-                    <packing>
+                    <object class="GtkStackPage">
                         <property name="name">content</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkBox">
-                        <property name="margin">20</property>
-                        <property name="spacing">10</property>
-                        <property name="valign">start</property>
-                        <property name="halign">start</property>
-                        <property name="visible">True</property>
-                        <child>
-                            <object class="GtkImage" id="conversation_list_placeholder_image">
-                                <property name="visible">True</property>
-                                <property name="valign">start</property>
-                                <style>
-                                    <class name="dim-label"/>
-                                </style>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkLabel">
-                                <property name="wrap">True</property>
-                                <property name="margin-top">70</property>
-                                <property name="margin-right">50</property>
-                                <property name="visible">True</property>
-                                <property name="valign">end</property>
-                                <property name="label" translatable="yes">Click here to start a conversation or join a channel.</property>
-                                <style>
-                                    <class name="dim-label"/>
-                                </style>
+                        <property name="child">
+                            <object class="GtkScrolledWindow">
+                                <property name="hscrollbar_policy">never</property>
+                                <child>
+                                    <object class="DinoUiConversationSelector" id="conversation_list">
+                                    </object>
+                                </child>
                             </object>
-                        </child>
+                        </property>
                     </object>
-                    <packing>
-                        <property name="name">placeholder</property>
-                    </packing>
                 </child>
-            </object>
-            <packing>
-                <property name="resize">False</property>
-                <property name="shrink">False</property>
-            </packing>
-        </child>
-        <child>
-            <object class="GtkOverlay">
-                <property name="visible">True</property>
                 <child>
-                    <object class="GtkStack" id="right_stack">
-                        <property name="visible">True</property>
-                        <child>
-                            <object class="DinoUiConversationView" id="conversation_view">
-                                <property name="visible">True</property>
-                            </object>
-                            <packing>
-                                <property name="name">content</property>
-                            </packing>
-                        </child>
-                        <child>
+                    <object class="GtkStackPage">
+                        <property name="name">placeholder</property>
+                        <property name="child">
                             <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <property name="expand">True</property>
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <property name="visible">True</property>
+                                <property name="margin-start">20</property>
+                                <property name="margin-end">20</property>
+                                <property name="margin-top">20</property>
+                                <property name="margin-bottom">20</property>
+                                <property name="spacing">10</property>
+                                <property name="valign">start</property>
+                                <property name="halign">start</property>
                                 <child>
-                                    <object class="GtkImage">
-                                        <property name="icon-name">im.dino.Dino-symbolic</property>
-                                        <property name="pixel-size">144</property>
-                                        <property name="margin-bottom">30</property>
-                                        <property name="visible">True</property>
+                                    <object class="GtkImage" id="conversation_list_placeholder_image">
+                                        <property name="valign">start</property>
                                         <style>
                                             <class name="dim-label"/>
                                         </style>
@@ -96,52 +44,87 @@
                                 </child>
                                 <child>
                                     <object class="GtkLabel">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes">You have no open chats</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="yalign">0.5</property>
+                                        <property name="wrap">1</property>
+                                        <property name="margin-top">70</property>
+                                        <property name="margin-end">50</property>
+                                        <property name="valign">end</property>
+                                        <property name="label" translatable="1">Click here to start a conversation or join a channel.</property>
                                         <style>
                                             <class name="dim-label"/>
                                         </style>
-                                        <attributes>
-                                            <attribute name="scale" value="1.2"/>
-                                        </attributes>
                                     </object>
                                 </child>
                             </object>
-                            <packing>
+                        </property>
+                    </object>
+                </child>
+            </object>
+        </child>
+        <child>
+            <object class="GtkOverlay">
+                <property name="child">
+                    <object class="GtkStack" id="right_stack">
+                        <child>
+                            <object class="GtkStackPage">
+                                <property name="name">content</property>
+                                <property name="child">
+                                    <object class="DinoUiConversationView" id="conversation_view">
+                                    </object>
+                                </property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkStackPage">
                                 <property name="name">placeholder</property>
-                            </packing>
+                                <property name="child">
+                                    <object class="GtkBox">
+                                        <property name="orientation">vertical</property>
+                                        <property name="hexpand">1</property>
+                                        <property name="vexpand">1</property>
+                                        <property name="halign">center</property>
+                                        <property name="valign">center</property>
+                                        <child>
+                                            <object class="GtkImage">
+                                                <property name="icon-name">im.dino.Dino-symbolic</property>
+                                                <property name="pixel-size">144</property>
+                                                <property name="margin-bottom">30</property>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkLabel">
+                                                <property name="label" translatable="1">You have no open chats</property>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                                <attributes>
+                                                    <attribute name="scale" value="1.2"></attribute>
+                                                </attributes>
+                                            </object>
+                                        </child>
+                                    </object>
+                                </property>
+                            </object>
                         </child>
                     </object>
-                </child>
+                </property>
                 <child type="overlay">
                     <object class="GtkRevealer" id="search_revealer">
-                        <property name="visible">True</property>
                         <property name="halign">end</property>
                         <property name="transition-type">slide-left</property>
                         <style>
                             <class name="dino-sidebar"/>
                         </style>
-                        <child>
-                            <object class="GtkFrame">
-                                <property name="visible">True</property>
+                        <property name="child">
+                            <object class="GtkFrame" id="search_frame">
                                 <property name="width-request">400</property>
-                                <property name="shadow-type">none</property>
-                                <child>
-                                    <object class="DinoUiGlobalSearch" id="search_box">
-                                        <property name="visible">True</property>
-                                    </object>
-                                </child>
                             </object>
-                        </child>
+                        </property>
                     </object>
                 </child>
             </object>
-            <packing>
-                <property name="resize">True</property>
-                <property name="shrink">False</property>
-            </packing>
         </child>
     </object>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/main/data/unified_window_placeholder.ui b/main/data/unified_window_placeholder.ui
index 88186f62..32fcd819 100644
--- a/main/data/unified_window_placeholder.ui
+++ b/main/data/unified_window_placeholder.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiMainWindowPlaceholder">
         <property name="valign">center</property>
         <property name="visible">True</property>
@@ -8,14 +9,15 @@
                 <property name="orientation">vertical</property>
                 <property name="valign">center</property>
                 <property name="halign">center</property>
-                <property name="hexpand">True</property>
-                <property name="visible">True</property>
+                <property name="hexpand">1</property>
                 <child>
                     <object class="GtkImage">
                         <property name="icon-name">im.dino.Dino-symbolic</property>
                         <property name="pixel-size">144</property>
-                        <property name="margin">30</property>
-                        <property name="visible">True</property>
+                        <property name="margin-start">30</property>
+                        <property name="margin-end">30</property>
+                        <property name="margin-top">30</property>
+                        <property name="margin-bottom">30</property>
                         <style>
                             <class name="dim-label"/>
                         </style>
@@ -23,22 +25,18 @@
                 </child>
                 <child>
                     <object class="GtkLabel" id="title_label">
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
+                        <property name="visible">0</property>
                         <style>
                             <class name="dim-label"/>
                         </style>
                         <attributes>
-                            <attribute name="scale" value="1.3"/>
+                            <attribute name="scale" value="1.3"></attribute>
                         </attributes>
                     </object>
                 </child>
                 <child>
                     <object class="GtkLabel" id="label">
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
                         <property name="margin-top">5</property>
-                        <property name="visible">True</property>
                         <style>
                             <class name="dim-label"/>
                         </style>
@@ -48,7 +46,6 @@
                     <object class="GtkButton" id="primary_button">
                         <property name="margin-top">15</property>
                         <property name="halign">center</property>
-                        <property name="visible">True</property>
                         <style>
                             <class name="text-button"/>
                             <class name="suggested-action"/>
@@ -57,8 +54,9 @@
                 </child>
                 <child>
                     <object class="GtkButton" id="secondary_button">
+                        <property name="visible">0</property>
                         <property name="halign">center</property>
-                        <property name="no_show_all">True</property>
+<!--                        <property name="no_show_all">True</property>-->
                         <style>
                             <class name="text-button"/>
                         </style>
-- 
cgit v1.2.3-70-g09d2