diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 11b8f3d..2ff67e6 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -18,6 +18,8 @@ add_subdirectory(widgets)
 
 set(squawkUI_SRC
   squawk.cpp
+  squawk.h
+  squawk.ui
   models/accounts.cpp
   models/roster.cpp
   models/item.cpp
diff --git a/ui/squawk.ui b/ui/squawk.ui
index f6cb300..cb48de6 100644
--- a/ui/squawk.ui
+++ b/ui/squawk.ui
@@ -162,14 +162,24 @@
      <x>0</x>
      <y>0</y>
      <width>718</width>
-     <height>27</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSettings">
     <property name="title">
      <string>Settings</string>
     </property>
+    <widget class="QMenu" name="menuOMEMO">
+     <property name="title">
+      <string>OMEMO</string>
+     </property>
+     <property name="icon">
+      <iconset theme="security-high"/>
+     </property>
+     <addaction name="actionDeviceList"/>
+    </widget>
     <addaction name="actionAccounts"/>
+    <addaction name="menuOMEMO"/>
    </widget>
    <widget class="QMenu" name="menuFile">
     <property name="title">
@@ -224,6 +234,14 @@
     <string>Add conference</string>
    </property>
   </action>
+  <action name="actionDeviceList">
+   <property name="icon">
+    <iconset theme="computer-laptop"/>
+   </property>
+   <property name="text">
+    <string>Device list</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>
diff --git a/ui/widgets/conversation.ui b/ui/widgets/conversation.ui
index bb38666..36b74a4 100644
--- a/ui/widgets/conversation.ui
+++ b/ui/widgets/conversation.ui
@@ -292,6 +292,19 @@
            </property>
           </spacer>
          </item>
+         <item>
+          <widget class="QPushButton" name="encryptionButton">
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset theme="security-low"/>
+           </property>
+           <property name="flat">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QPushButton" name="attachButton">
            <property name="text">
@@ -400,8 +413,8 @@ background-color: transparent
          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Liberation Sans';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="acceptRichText">
          <bool>false</bool>