1 files changed, 35 insertions, 22 deletions
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"/>